From b0dd10f8171945e0c1f3527dd1e9d18b043e01a7 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 25 Aug 2006 17:25:49 +0000 Subject: [PATCH 0001/2544] Initial Import --- index.php | 81 + license.txt | 52 + system/application/config/autoload.php | 101 + system/application/config/config.php | 244 +++ system/application/config/database.php | 57 + system/application/config/index.html | 15 + system/application/config/mimes.php | 103 + system/application/config/routes.php | 49 + system/application/controllers/index.html | 15 + system/application/controllers/welcome.php | 15 + system/application/errors/error_404.php | 35 + system/application/errors/error_db.php | 34 + system/application/errors/error_general.php | 34 + system/application/errors/error_php.php | 10 + system/application/errors/index.html | 15 + system/application/models/index.html | 15 + system/application/scripts/index.html | 15 + system/application/views/index.html | 15 + system/application/views/welcome_message.php | 62 + system/cache/index.html | 15 + system/codeigniter/Base4.php | 58 + system/codeigniter/Base5.php | 62 + system/codeigniter/CodeIgniter.php | 256 +++ system/codeigniter/Common.php | 238 +++ system/codeigniter/index.html | 15 + system/drivers/DB_active_record.php | 875 +++++++++ system/drivers/DB_driver.php | 948 +++++++++ system/drivers/DB_mssql.php | 472 +++++ system/drivers/DB_mysql.php | 495 +++++ system/drivers/DB_mysqli.php | 496 +++++ system/drivers/DB_odbc.php | 468 +++++ system/drivers/DB_postgre.php | 476 +++++ system/drivers/DB_sqlite.php | 501 +++++ system/drivers/index.html | 15 + system/fonts/index.html | 15 + system/fonts/texb.ttf | Bin 0 -> 143830 bytes system/helpers/array_helper.php | 47 + system/helpers/cookie_helper.php | 77 + system/helpers/date_helper.php | 530 +++++ system/helpers/directory_helper.php | 69 + system/helpers/file_helper.php | 139 ++ system/helpers/form_helper.php | 382 ++++ system/helpers/html_helper.php | 76 + system/helpers/index.html | 15 + system/helpers/security_helper.php | 112 ++ system/helpers/string_helper.php | 154 ++ system/helpers/text_helper.php | 386 ++++ system/helpers/typography_helper.php | 490 +++++ system/helpers/url_helper.php | 487 +++++ system/helpers/xml_helper.php | 55 + system/init/index.html | 15 + system/init/init_calendar.php | 19 + system/init/init_email.php | 24 + system/init/init_encrypt.php | 18 + system/init/init_image_lib.php | 24 + system/init/init_pagination.php | 24 + system/init/init_parser.php | 19 + system/init/init_session.php | 18 + system/init/init_trackback.php | 18 + system/init/init_unit_test.php | 18 + system/init/init_upload.php | 24 + system/init/init_validation.php | 18 + system/init/init_xmlrpc.php | 24 + system/init/init_xmlrpcs.php | 27 + system/language/english/calendar_lang.php | 49 + system/language/english/date_lang.php | 49 + system/language/english/db_lang.php | 15 + system/language/english/email_lang.php | 21 + system/language/english/imglib_lang.php | 21 + system/language/english/index.html | 15 + system/language/english/scaffolding_lang.php | 15 + system/language/english/unit_test_lang.php | 22 + system/language/english/upload_lang.php | 16 + system/language/english/validation_lang.php | 15 + system/language/index.html | 15 + system/libraries/Benchmark.php | 117 ++ system/libraries/Calendar.php | 473 +++++ system/libraries/Config.php | 181 ++ system/libraries/Controller.php | 445 +++++ system/libraries/Email.php | 1740 +++++++++++++++++ system/libraries/Encrypt.php | 378 ++++ system/libraries/Exceptions.php | 165 ++ system/libraries/Hooks.php | 237 +++ system/libraries/Image_lib.php | 1550 +++++++++++++++ system/libraries/Input.php | 585 ++++++ system/libraries/Language.php | 113 ++ system/libraries/Loader.php | 611 ++++++ system/libraries/Log.php | 117 ++ system/libraries/Model.php | 72 + system/libraries/Output.php | 241 +++ system/libraries/Pagination.php | 207 ++ system/libraries/Parser.php | 178 ++ system/libraries/Router.php | 318 +++ system/libraries/Session.php | 499 +++++ system/libraries/Sha1.php | 254 +++ system/libraries/Trackback.php | 561 ++++++ system/libraries/URI.php | 243 +++ system/libraries/Unit_test.php | 331 ++++ system/libraries/Upload.php | 775 ++++++++ system/libraries/Validation.php | 692 +++++++ system/libraries/Xmlrpc.php | 1409 +++++++++++++ system/libraries/Xmlrpcs.php | 492 +++++ system/libraries/index.html | 15 + system/logs/index.html | 15 + system/plugins/captcha_pi.php | 346 ++++ system/plugins/index.html | 15 + system/plugins/js_calendar_pi.php | 604 ++++++ system/scaffolding/Scaffolding.php | 285 +++ system/scaffolding/images/background.jpg | Bin 0 -> 410 bytes system/scaffolding/images/index.html | 15 + system/scaffolding/images/logo.jpg | Bin 0 -> 4518 bytes system/scaffolding/index.html | 15 + system/scaffolding/views/add.php | 30 + system/scaffolding/views/delete.php | 7 + system/scaffolding/views/edit.php | 31 + system/scaffolding/views/footer.php | 10 + system/scaffolding/views/header.php | 31 + system/scaffolding/views/index.html | 15 + system/scaffolding/views/no_data.php | 6 + system/scaffolding/views/stylesheet.css | 143 ++ system/scaffolding/views/view.php | 25 + user_guide/general/alternative_php.html | 142 ++ user_guide/general/ancillary_classes.html | 122 ++ user_guide/general/autoloader.html | 106 + user_guide/general/base_classes.html | 127 ++ user_guide/general/caching.html | 119 ++ user_guide/general/changelog.html | 248 +++ user_guide/general/controllers.html | 317 +++ user_guide/general/creating_libraries.html | 222 +++ user_guide/general/credits.html | 96 + user_guide/general/errors.html | 142 ++ user_guide/general/helpers.html | 140 ++ user_guide/general/hooks.html | 184 ++ user_guide/general/index.html | 95 + user_guide/general/libraries.html | 111 ++ user_guide/general/models.html | 256 +++ user_guide/general/multiple_apps.html | 116 ++ user_guide/general/plugins.html | 125 ++ user_guide/general/quick_reference.html | 83 + user_guide/general/requirements.html | 88 + user_guide/general/routing.html | 163 ++ user_guide/general/scaffolding.html | 153 ++ user_guide/general/scripts.html | 115 ++ user_guide/general/security.html | 159 ++ user_guide/general/urls.html | 159 ++ user_guide/general/views.html | 249 +++ user_guide/helpers/array_helper.html | 111 ++ user_guide/helpers/cookie_helper.html | 133 ++ user_guide/helpers/date_helper.html | 340 ++++ user_guide/helpers/directory_helper.html | 145 ++ user_guide/helpers/file_helper.html | 144 ++ user_guide/helpers/form_helper.html | 343 ++++ user_guide/helpers/html_helper.html | 117 ++ user_guide/helpers/index.html | 131 ++ user_guide/helpers/security_helper.html | 131 ++ user_guide/helpers/string_helper.html | 144 ++ user_guide/helpers/text_helper.html | 197 ++ user_guide/helpers/typography_helper.html | 129 ++ user_guide/helpers/url_helper.html | 269 +++ user_guide/helpers/xml_helper.html | 110 ++ user_guide/images/appflowchart.gif | Bin 0 -> 25276 bytes user_guide/images/arrow.gif | Bin 0 -> 123 bytes user_guide/images/ci_logo.jpg | Bin 0 -> 5602 bytes user_guide/images/ci_logo_mini.jpg | Bin 0 -> 2198 bytes user_guide/images/ci_quick_ref.png | Bin 0 -> 94476 bytes user_guide/images/file.gif | Bin 0 -> 370 bytes user_guide/images/folder.gif | Bin 0 -> 570 bytes user_guide/images/nav_bg.jpg | Bin 0 -> 441 bytes user_guide/images/nav_separator.jpg | Bin 0 -> 305 bytes user_guide/images/nav_toggle.jpg | Bin 0 -> 3076 bytes user_guide/images/transparent.gif | Bin 0 -> 43 bytes user_guide/index.html | 106 + user_guide/installation/downloads.html | 97 + user_guide/installation/index.html | 116 ++ user_guide/installation/upgrade_120.html | 98 + user_guide/installation/upgrade_130.html | 209 ++ user_guide/installation/upgrade_131.html | 108 + user_guide/installation/upgrade_132.html | 106 + user_guide/installation/upgrade_133.html | 118 ++ user_guide/installation/upgrade_140.html | 111 ++ user_guide/installation/upgrade_b11.html | 150 ++ user_guide/installation/upgrading.html | 95 + user_guide/libraries/benchmark.html | 160 ++ user_guide/libraries/calendar.html | 258 +++ user_guide/libraries/config.html | 158 ++ .../libraries/database/active_record.html | 610 ++++++ .../libraries/database/call_function.html | 123 ++ .../libraries/database/configuration.html | 144 ++ user_guide/libraries/database/connecting.html | 172 ++ user_guide/libraries/database/examples.html | 183 ++ user_guide/libraries/database/fields.html | 144 ++ user_guide/libraries/database/index.html | 99 + user_guide/libraries/database/queries.html | 180 ++ user_guide/libraries/database/results.html | 235 +++ user_guide/libraries/database/table_data.html | 116 ++ user_guide/libraries/email.html | 294 +++ user_guide/libraries/encryption.html | 187 ++ user_guide/libraries/file_uploading.html | 429 ++++ user_guide/libraries/image_lib.html | 669 +++++++ user_guide/libraries/input.html | 207 ++ user_guide/libraries/language.html | 130 ++ user_guide/libraries/loader.html | 171 ++ user_guide/libraries/output.html | 112 ++ user_guide/libraries/pagination.html | 218 +++ user_guide/libraries/parser.html | 214 ++ user_guide/libraries/sessions.html | 283 +++ user_guide/libraries/trackback.html | 251 +++ user_guide/libraries/unit_testing.html | 210 ++ user_guide/libraries/uri.html | 220 +++ user_guide/libraries/validation.html | 674 +++++++ user_guide/libraries/xmlrpc.html | 485 +++++ user_guide/license.html | 113 ++ user_guide/overview/appflow.html | 101 + user_guide/overview/at_a_glance.html | 168 ++ user_guide/overview/features.html | 122 ++ user_guide/overview/goals.html | 103 + user_guide/overview/index.html | 89 + user_guide/overview/mvc.html | 105 + user_guide/scripts/hacks.txt | 9 + user_guide/scripts/moo.fx.js | 119 ++ user_guide/scripts/moo.fx.pack.js | 241 +++ user_guide/scripts/nav.js | 116 ++ user_guide/scripts/prototype.lite.js | 127 ++ user_guide/toc.html | 182 ++ user_guide/userguide.css | 406 ++++ 225 files changed, 41458 insertions(+) create mode 100644 index.php create mode 100644 license.txt create mode 100644 system/application/config/autoload.php create mode 100644 system/application/config/config.php create mode 100644 system/application/config/database.php create mode 100644 system/application/config/index.html create mode 100644 system/application/config/mimes.php create mode 100644 system/application/config/routes.php create mode 100644 system/application/controllers/index.html create mode 100644 system/application/controllers/welcome.php create mode 100644 system/application/errors/error_404.php create mode 100644 system/application/errors/error_db.php create mode 100644 system/application/errors/error_general.php create mode 100644 system/application/errors/error_php.php create mode 100644 system/application/errors/index.html create mode 100644 system/application/models/index.html create mode 100644 system/application/scripts/index.html create mode 100644 system/application/views/index.html create mode 100644 system/application/views/welcome_message.php create mode 100644 system/cache/index.html create mode 100644 system/codeigniter/Base4.php create mode 100644 system/codeigniter/Base5.php create mode 100644 system/codeigniter/CodeIgniter.php create mode 100644 system/codeigniter/Common.php create mode 100644 system/codeigniter/index.html create mode 100644 system/drivers/DB_active_record.php create mode 100644 system/drivers/DB_driver.php create mode 100644 system/drivers/DB_mssql.php create mode 100644 system/drivers/DB_mysql.php create mode 100644 system/drivers/DB_mysqli.php create mode 100644 system/drivers/DB_odbc.php create mode 100644 system/drivers/DB_postgre.php create mode 100644 system/drivers/DB_sqlite.php create mode 100644 system/drivers/index.html create mode 100644 system/fonts/index.html create mode 100644 system/fonts/texb.ttf create mode 100644 system/helpers/array_helper.php create mode 100644 system/helpers/cookie_helper.php create mode 100644 system/helpers/date_helper.php create mode 100644 system/helpers/directory_helper.php create mode 100644 system/helpers/file_helper.php create mode 100644 system/helpers/form_helper.php create mode 100644 system/helpers/html_helper.php create mode 100644 system/helpers/index.html create mode 100644 system/helpers/security_helper.php create mode 100644 system/helpers/string_helper.php create mode 100644 system/helpers/text_helper.php create mode 100644 system/helpers/typography_helper.php create mode 100644 system/helpers/url_helper.php create mode 100644 system/helpers/xml_helper.php create mode 100644 system/init/index.html create mode 100644 system/init/init_calendar.php create mode 100644 system/init/init_email.php create mode 100644 system/init/init_encrypt.php create mode 100644 system/init/init_image_lib.php create mode 100644 system/init/init_pagination.php create mode 100644 system/init/init_parser.php create mode 100644 system/init/init_session.php create mode 100644 system/init/init_trackback.php create mode 100644 system/init/init_unit_test.php create mode 100644 system/init/init_upload.php create mode 100644 system/init/init_validation.php create mode 100644 system/init/init_xmlrpc.php create mode 100644 system/init/init_xmlrpcs.php create mode 100644 system/language/english/calendar_lang.php create mode 100644 system/language/english/date_lang.php create mode 100644 system/language/english/db_lang.php create mode 100644 system/language/english/email_lang.php create mode 100644 system/language/english/imglib_lang.php create mode 100644 system/language/english/index.html create mode 100644 system/language/english/scaffolding_lang.php create mode 100644 system/language/english/unit_test_lang.php create mode 100644 system/language/english/upload_lang.php create mode 100644 system/language/english/validation_lang.php create mode 100644 system/language/index.html create mode 100644 system/libraries/Benchmark.php create mode 100644 system/libraries/Calendar.php create mode 100644 system/libraries/Config.php create mode 100644 system/libraries/Controller.php create mode 100644 system/libraries/Email.php create mode 100644 system/libraries/Encrypt.php create mode 100644 system/libraries/Exceptions.php create mode 100644 system/libraries/Hooks.php create mode 100644 system/libraries/Image_lib.php create mode 100644 system/libraries/Input.php create mode 100644 system/libraries/Language.php create mode 100644 system/libraries/Loader.php create mode 100644 system/libraries/Log.php create mode 100644 system/libraries/Model.php create mode 100644 system/libraries/Output.php create mode 100644 system/libraries/Pagination.php create mode 100644 system/libraries/Parser.php create mode 100644 system/libraries/Router.php create mode 100644 system/libraries/Session.php create mode 100644 system/libraries/Sha1.php create mode 100644 system/libraries/Trackback.php create mode 100644 system/libraries/URI.php create mode 100644 system/libraries/Unit_test.php create mode 100644 system/libraries/Upload.php create mode 100644 system/libraries/Validation.php create mode 100644 system/libraries/Xmlrpc.php create mode 100644 system/libraries/Xmlrpcs.php create mode 100644 system/libraries/index.html create mode 100644 system/logs/index.html create mode 100644 system/plugins/captcha_pi.php create mode 100644 system/plugins/index.html create mode 100644 system/plugins/js_calendar_pi.php create mode 100644 system/scaffolding/Scaffolding.php create mode 100644 system/scaffolding/images/background.jpg create mode 100644 system/scaffolding/images/index.html create mode 100644 system/scaffolding/images/logo.jpg create mode 100644 system/scaffolding/index.html create mode 100644 system/scaffolding/views/add.php create mode 100644 system/scaffolding/views/delete.php create mode 100644 system/scaffolding/views/edit.php create mode 100644 system/scaffolding/views/footer.php create mode 100644 system/scaffolding/views/header.php create mode 100644 system/scaffolding/views/index.html create mode 100644 system/scaffolding/views/no_data.php create mode 100644 system/scaffolding/views/stylesheet.css create mode 100644 system/scaffolding/views/view.php create mode 100644 user_guide/general/alternative_php.html create mode 100644 user_guide/general/ancillary_classes.html create mode 100644 user_guide/general/autoloader.html create mode 100644 user_guide/general/base_classes.html create mode 100644 user_guide/general/caching.html create mode 100644 user_guide/general/changelog.html create mode 100644 user_guide/general/controllers.html create mode 100644 user_guide/general/creating_libraries.html create mode 100644 user_guide/general/credits.html create mode 100644 user_guide/general/errors.html create mode 100644 user_guide/general/helpers.html create mode 100644 user_guide/general/hooks.html create mode 100644 user_guide/general/index.html create mode 100644 user_guide/general/libraries.html create mode 100644 user_guide/general/models.html create mode 100644 user_guide/general/multiple_apps.html create mode 100644 user_guide/general/plugins.html create mode 100644 user_guide/general/quick_reference.html create mode 100644 user_guide/general/requirements.html create mode 100644 user_guide/general/routing.html create mode 100644 user_guide/general/scaffolding.html create mode 100644 user_guide/general/scripts.html create mode 100644 user_guide/general/security.html create mode 100644 user_guide/general/urls.html create mode 100644 user_guide/general/views.html create mode 100644 user_guide/helpers/array_helper.html create mode 100644 user_guide/helpers/cookie_helper.html create mode 100644 user_guide/helpers/date_helper.html create mode 100644 user_guide/helpers/directory_helper.html create mode 100644 user_guide/helpers/file_helper.html create mode 100644 user_guide/helpers/form_helper.html create mode 100644 user_guide/helpers/html_helper.html create mode 100644 user_guide/helpers/index.html create mode 100644 user_guide/helpers/security_helper.html create mode 100644 user_guide/helpers/string_helper.html create mode 100644 user_guide/helpers/text_helper.html create mode 100644 user_guide/helpers/typography_helper.html create mode 100644 user_guide/helpers/url_helper.html create mode 100644 user_guide/helpers/xml_helper.html create mode 100644 user_guide/images/appflowchart.gif create mode 100644 user_guide/images/arrow.gif create mode 100644 user_guide/images/ci_logo.jpg create mode 100644 user_guide/images/ci_logo_mini.jpg create mode 100644 user_guide/images/ci_quick_ref.png create mode 100644 user_guide/images/file.gif create mode 100644 user_guide/images/folder.gif create mode 100644 user_guide/images/nav_bg.jpg create mode 100644 user_guide/images/nav_separator.jpg create mode 100644 user_guide/images/nav_toggle.jpg create mode 100644 user_guide/images/transparent.gif create mode 100644 user_guide/index.html create mode 100644 user_guide/installation/downloads.html create mode 100644 user_guide/installation/index.html create mode 100644 user_guide/installation/upgrade_120.html create mode 100644 user_guide/installation/upgrade_130.html create mode 100644 user_guide/installation/upgrade_131.html create mode 100644 user_guide/installation/upgrade_132.html create mode 100644 user_guide/installation/upgrade_133.html create mode 100644 user_guide/installation/upgrade_140.html create mode 100644 user_guide/installation/upgrade_b11.html create mode 100644 user_guide/installation/upgrading.html create mode 100644 user_guide/libraries/benchmark.html create mode 100644 user_guide/libraries/calendar.html create mode 100644 user_guide/libraries/config.html create mode 100644 user_guide/libraries/database/active_record.html create mode 100644 user_guide/libraries/database/call_function.html create mode 100644 user_guide/libraries/database/configuration.html create mode 100644 user_guide/libraries/database/connecting.html create mode 100644 user_guide/libraries/database/examples.html create mode 100644 user_guide/libraries/database/fields.html create mode 100644 user_guide/libraries/database/index.html create mode 100644 user_guide/libraries/database/queries.html create mode 100644 user_guide/libraries/database/results.html create mode 100644 user_guide/libraries/database/table_data.html create mode 100644 user_guide/libraries/email.html create mode 100644 user_guide/libraries/encryption.html create mode 100644 user_guide/libraries/file_uploading.html create mode 100644 user_guide/libraries/image_lib.html create mode 100644 user_guide/libraries/input.html create mode 100644 user_guide/libraries/language.html create mode 100644 user_guide/libraries/loader.html create mode 100644 user_guide/libraries/output.html create mode 100644 user_guide/libraries/pagination.html create mode 100644 user_guide/libraries/parser.html create mode 100644 user_guide/libraries/sessions.html create mode 100644 user_guide/libraries/trackback.html create mode 100644 user_guide/libraries/unit_testing.html create mode 100644 user_guide/libraries/uri.html create mode 100644 user_guide/libraries/validation.html create mode 100644 user_guide/libraries/xmlrpc.html create mode 100644 user_guide/license.html create mode 100644 user_guide/overview/appflow.html create mode 100644 user_guide/overview/at_a_glance.html create mode 100644 user_guide/overview/features.html create mode 100644 user_guide/overview/goals.html create mode 100644 user_guide/overview/index.html create mode 100644 user_guide/overview/mvc.html create mode 100644 user_guide/scripts/hacks.txt create mode 100755 user_guide/scripts/moo.fx.js create mode 100755 user_guide/scripts/moo.fx.pack.js create mode 100644 user_guide/scripts/nav.js create mode 100755 user_guide/scripts/prototype.lite.js create mode 100644 user_guide/toc.html create mode 100644 user_guide/userguide.css diff --git a/index.php b/index.php new file mode 100644 index 00000000..7c910e1e --- /dev/null +++ b/index.php @@ -0,0 +1,81 @@ + \ No newline at end of file diff --git a/license.txt b/license.txt new file mode 100644 index 00000000..cd779972 --- /dev/null +++ b/license.txt @@ -0,0 +1,52 @@ +Copyright (c) 2006, pMachine, Inc. +All rights reserved. + +This license is a legal agreement between you and pMachine Inc. for the use +of Code Igniter Software (the "Software"). By obtaining the Software you +agree to comply with the terms and conditions of this license. + +PERMITTED USE +You are permitted to use, copy, modify, and distribute the Software and its +documentation, with or without modification, for any purpose, provided that +the following conditions are met: + +1. A copy of this license agreement must be included with the distribution. + +2. Redistributions of source code must retain the above copyright notice in + all source code files. + +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 + of the change and the names of those who changed them. + +5. Products derived from the Software must include an acknowledgment that + they are derived from Code Igniter in their documentation and/or other + 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 + 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 +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. + +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 +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. diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php new file mode 100644 index 00000000..a3ce4108 --- /dev/null +++ b/system/application/config/autoload.php @@ -0,0 +1,101 @@ + \ No newline at end of file diff --git a/system/application/config/config.php b/system/application/config/config.php new file mode 100644 index 00000000..0b4f33f4 --- /dev/null +++ b/system/application/config/config.php @@ -0,0 +1,244 @@ + \ No newline at end of file diff --git a/system/application/config/database.php b/system/application/config/database.php new file mode 100644 index 00000000..610f6081 --- /dev/null +++ b/system/application/config/database.php @@ -0,0 +1,57 @@ + \ No newline at end of file diff --git a/system/application/config/index.html b/system/application/config/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/application/config/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/application/config/mimes.php b/system/application/config/mimes.php new file mode 100644 index 00000000..06bfcc67 --- /dev/null +++ b/system/application/config/mimes.php @@ -0,0 +1,103 @@ + 'application/mac-binhex40', + 'cpt' => 'application/mac-compactpro', + 'csv' => array('text/x-comma-separated-values', 'application/vnd.ms-excel'), + 'doc' => 'application/msword', + 'bin' => 'application/macbinary', + 'dms' => 'application/octet-stream', + 'lha' => 'application/octet-stream', + 'lzh' => 'application/octet-stream', + 'exe' => 'application/octet-stream', + 'class' => 'application/octet-stream', + 'psd' => 'application/x-photoshop', + 'so' => 'application/octet-stream', + 'sea' => 'application/octet-stream', + 'dll' => 'application/octet-stream', + 'oda' => 'application/oda', + 'pdf' => 'application/pdf', + 'ai' => 'application/postscript', + 'eps' => 'application/postscript', + 'ps' => 'application/postscript', + 'smi' => 'application/smil', + 'smil' => 'application/smil', + 'mif' => 'application/vnd.mif', + 'xls' => array('application/excel', 'application/vnd.ms-excel'), + 'ppt' => 'application/powerpoint', + 'wbxml' => 'application/wbxml', + 'wmlc' => 'application/wmlc', + 'dcr' => 'application/x-director', + 'dir' => 'application/x-director', + 'dxr' => 'application/x-director', + 'dvi' => 'application/x-dvi', + 'gtar' => 'application/x-gtar', + 'php' => 'application/x-httpd-php', + 'php4' => 'application/x-httpd-php', + 'php3' => 'application/x-httpd-php', + 'phtml' => 'application/x-httpd-php', + 'phps' => 'application/x-httpd-php-source', + 'js' => 'application/x-javascript', + 'swf' => 'application/x-shockwave-flash', + 'sit' => 'application/x-stuffit', + 'tar' => 'application/x-tar', + 'tgz' => 'application/x-tar', + 'xhtml' => 'application/xhtml+xml', + 'xht' => 'application/xhtml+xml', + 'zip' => array('application/zip', 'application/x-zip-compressed'), + 'zip' => 'application/zip', + 'mid' => 'audio/midi', + 'midi' => 'audio/midi', + 'mpga' => 'audio/mpeg', + 'mp2' => 'audio/mpeg', + 'mp3' => 'audio/mpeg', + 'aif' => 'audio/x-aiff', + 'aiff' => 'audio/x-aiff', + 'aifc' => 'audio/x-aiff', + 'ram' => 'audio/x-pn-realaudio', + 'rm' => 'audio/x-pn-realaudio', + 'rpm' => 'audio/x-pn-realaudio-plugin', + 'ra' => 'audio/x-realaudio', + 'rv' => 'video/vnd.rn-realvideo', + 'wav' => 'audio/x-wav', + 'bmp' => 'image/bmp', + 'gif' => 'image/gif', + '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'), + 'tiff' => 'image/tiff', + 'tif' => 'image/tiff', + 'css' => 'text/css', + 'html' => 'text/html', + 'htm' => 'text/html', + 'shtml' => 'text/html', + 'txt' => 'text/plain', + 'text' => 'text/plain', + 'log' => array('text/plain', 'text/x-log'), + 'rtx' => 'text/richtext', + 'rtf' => 'text/rtf', + 'xml' => 'text/xml', + 'xsl' => 'text/xml', + 'mpeg' => 'video/mpeg', + 'mpg' => 'video/mpeg', + 'mpe' => 'video/mpeg', + 'qt' => 'video/quicktime', + 'mov' => 'video/quicktime', + 'avi' => 'video/x-msvideo', + 'movie' => 'video/x-sgi-movie', + 'doc' => 'application/msword', + 'word' => 'application/msword', + 'xl' => 'application/excel', + 'eml' => 'message/rfc822' + ); + + +?> \ No newline at end of file diff --git a/system/application/config/routes.php b/system/application/config/routes.php new file mode 100644 index 00000000..622bf88e --- /dev/null +++ b/system/application/config/routes.php @@ -0,0 +1,49 @@ + \ No newline at end of file diff --git a/system/application/controllers/index.html b/system/application/controllers/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/application/controllers/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/application/controllers/welcome.php b/system/application/controllers/welcome.php new file mode 100644 index 00000000..7f7296d8 --- /dev/null +++ b/system/application/controllers/welcome.php @@ -0,0 +1,15 @@ +load->view('welcome_message'); + } +} +?> \ No newline at end of file diff --git a/system/application/errors/error_404.php b/system/application/errors/error_404.php new file mode 100644 index 00000000..e5fa8f9d --- /dev/null +++ b/system/application/errors/error_404.php @@ -0,0 +1,35 @@ + + + +404 Page Not Found + + + +

+

+ +
+ + \ No newline at end of file diff --git a/system/application/errors/error_db.php b/system/application/errors/error_db.php new file mode 100644 index 00000000..5aab8907 --- /dev/null +++ b/system/application/errors/error_db.php @@ -0,0 +1,34 @@ + + +Database Error + + + +
+

+ +
+ + \ No newline at end of file diff --git a/system/application/errors/error_general.php b/system/application/errors/error_general.php new file mode 100644 index 00000000..213b8353 --- /dev/null +++ b/system/application/errors/error_general.php @@ -0,0 +1,34 @@ + + +Error + + + +
+

+ +
+ + \ No newline at end of file diff --git a/system/application/errors/error_php.php b/system/application/errors/error_php.php new file mode 100644 index 00000000..2fb3f2b2 --- /dev/null +++ b/system/application/errors/error_php.php @@ -0,0 +1,10 @@ +
+ +

A PHP Error was encountered

+ +

Severity:

+

Message:

+

Filename:

+

Line Number:

+ +
diff --git a/system/application/errors/index.html b/system/application/errors/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/application/errors/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/application/models/index.html b/system/application/models/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/application/models/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/application/scripts/index.html b/system/application/scripts/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/application/scripts/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/application/views/index.html b/system/application/views/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/application/views/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/application/views/welcome_message.php b/system/application/views/welcome_message.php new file mode 100644 index 00000000..815bef4d --- /dev/null +++ b/system/application/views/welcome_message.php @@ -0,0 +1,62 @@ + + +Welcome to Code Igniter + + + + + +

Welcome to Code Igniter!

+ +

The page you are looking at is being generated dynamically by Code Igniter.

+ +

If you would like to edit this page you'll find it located at:

+system/application/views/welcome_message.php + +

The corresponding controller for this page is found at:

+system/application/controllers/welcome.php + +

If you are exploring Code Igniter for the very first time, you should start by reading the User Guide.

+ + +


Page rendered in {elapsed_time} seconds

+ + + \ No newline at end of file diff --git a/system/cache/index.html b/system/cache/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/cache/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php new file mode 100644 index 00000000..5d945c26 --- /dev/null +++ b/system/codeigniter/Base4.php @@ -0,0 +1,58 @@ +load =& $this; + $OBJ = $this->load; + } +} + +function &get_instance() +{ + global $OBJ, $CI; + + if (is_object($CI)) + { + return $CI; + } + else + { + return $OBJ->load; + } +} + +?> \ No newline at end of file diff --git a/system/codeigniter/Base5.php b/system/codeigniter/Base5.php new file mode 100644 index 00000000..ef3fc67f --- /dev/null +++ b/system/codeigniter/Base5.php @@ -0,0 +1,62 @@ +set_instance($this); + } +} + +class Instance { + public static $instance; + + public function set_instance(&$object) + { + self::$instance =& $object; + } + + public function &get_instance() + { + return self::$instance; + } +} + +function &get_instance() +{ + $instance =& _load_class('Instance'); + return $instance->get_instance(); +} + +?> \ No newline at end of file diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php new file mode 100644 index 00000000..aef7618e --- /dev/null +++ b/system/codeigniter/CodeIgniter.php @@ -0,0 +1,256 @@ +mark('code_igniter_start'); + +/* + * ------------------------------------------------------ + * Instantiate the hooks classe + * ------------------------------------------------------ + */ + +$EXT =& _load_class('CI_Hooks'); + +/* + * ------------------------------------------------------ + * Is there a "pre_system" hook? + * ------------------------------------------------------ + */ +if ($EXT->_hook_exists('pre_system')) +{ + $EXT->_call_hook('pre_system'); +} + +/* + * ------------------------------------------------------ + * Instantiate the base classes + * ------------------------------------------------------ + */ + +$CFG =& _load_class('CI_Config'); +$RTR =& _load_class('CI_Router'); +$OUT =& _load_class('CI_Output'); + +/* + * ------------------------------------------------------ + * Is there a valid cache file? If so, we're done... + * ------------------------------------------------------ + */ + +if ($EXT->_hook_exists('cache_override')) +{ + $EXT->_call_hook('cache_override'); +} +else +{ + if ($OUT->_display_cache() == TRUE) + { + exit; + } +} + +/* + * ------------------------------------------------------ + * Does the requested controller exist? + * ------------------------------------------------------ + */ +if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_class().EXT)) +{ + show_404(); +} + +/* + * ------------------------------------------------------ + * Load the remaining base classes + * ------------------------------------------------------ + */ + +$IN =& _load_class('CI_Input'); +$URI =& _load_class('CI_URI'); +$LANG =& _load_class('CI_Language'); + +/* + * ------------------------------------------------------ + * Load the app controller and local controller + * ------------------------------------------------------ + * + * Note: Due to the poor object handling in PHP 4 we'll + * contditionally load different versions of the base + * class. Retaining PHP 4 compatibility requires a bit of a hack. + * + * Note: The Loader class needs to be included first + * + */ + + +_load_class('CI_Loader'); + +if (floor(phpversion()) < 5) +{ + require(BASEPATH.'codeigniter/Base4'.EXT); +} +else +{ + require(BASEPATH.'codeigniter/Base5'.EXT); +} + +_load_class('CI_Controller'); + +require(APPPATH.'controllers/'.$RTR->fetch_class().EXT); + +/* + * ------------------------------------------------------ + * 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 + */ +$class = $RTR->fetch_class(); +$method = $RTR->fetch_method(); + +if ( ! class_exists($class) + OR $method == 'controller' + OR substr($method, 0, 1) == '_' + OR in_array($method, get_class_methods('Controller')) + ) +{ + show_404(); +} + +/* + * ------------------------------------------------------ + * Is there a "pre_controller" hook? + * ------------------------------------------------------ + */ +if ($EXT->_hook_exists('pre_controller')) +{ + $EXT->_call_hook('pre_controller'); +} + +/* + * ------------------------------------------------------ + * Instantiate the controller and call requested method + * ------------------------------------------------------ + */ +$CI = new $class(); + +if ($RTR->scaffolding_request === TRUE) +{ + if ($EXT->_hook_exists('scaffolding_override')) + { + $EXT->_call_hook('scaffolding_override'); + } + else + { + $CI->_ci_scaffolding(); + } +} +else +{ + if ( ! method_exists($CI, $method)) + { + show_404(); + } + + $CI->$method(); +} + +/* + * ------------------------------------------------------ + * Is there a "post_controller" hook? + * ------------------------------------------------------ + */ +if ($EXT->_hook_exists('post_controller')) +{ + $EXT->_call_hook('post_controller'); +} + +/* + * ------------------------------------------------------ + * Send the final rendered output to the browser + * ------------------------------------------------------ + */ + +if ($EXT->_hook_exists('display_override')) +{ + $EXT->_call_hook('display_override'); +} +else +{ + $OUT->_display(); +} + +/* + * ------------------------------------------------------ + * Is there a "post_system" hook? + * ------------------------------------------------------ + */ +if ($EXT->_hook_exists('post_system')) +{ + $EXT->_call_hook('post_system'); +} + +/* + * ------------------------------------------------------ + * Close the DB connection of one exists + * ------------------------------------------------------ + */ +if ($CI->_ci_is_loaded('db')) +{ + $CI->db->close(); +} + + +?> \ No newline at end of file diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php new file mode 100644 index 00000000..2ec1c3d3 --- /dev/null +++ b/system/codeigniter/Common.php @@ -0,0 +1,238 @@ +show_error('An Error Was Encountered', $message); + exit; +} + + +/** +* 404 Page Handler +* +* This function is similar to the show_error() function above +* However, instead of the standard error template it displays +* 404 errors. +* +* @access public +* @return void +*/ +function show_404($page = '') +{ + if ( ! class_exists('CI_Exceptions')) + { + include_once(BASEPATH.'libraries/Exceptions.php'); + } + + $error = new CI_Exceptions(); + $error->show_404($page); + exit; +} + + +/** +* Error Logging Interface +* +* We use this as a simple mechanism to access the logging +* class and send messages to be logged. +* +* @access public +* @return void +*/ +function log_message($level = 2, $message, $php_error = FALSE) +{ + $config =& _get_config(); + if ($config['log_errors'] === FALSE) + { + return; + } + + if ( ! class_exists('CI_Log')) + { + include_once(BASEPATH.'libraries/Log.php'); + } + + if ( ! isset($LOG)) + { + $LOG = new CI_Log( + $config['log_path'], + $config['log_threshold'], + $config['log_date_format'] + ); + } + + $LOG->write_log($level, $message, $php_error); +} + + +/** +* Exception Handler +* +* This is the custom exception handler we defined at the +* top of this file. The main reason we use this is permit +* PHP errors to be logged in our own log files since we may +* not have access to server logs. Since this function +* effectively intercepts PHP errors, however, we also need +* to display errors based on the current error_reporting level. +* We do that with the use of a PHP error template. +* +* @access private +* @return void +*/ +function _exception_handler($severity, $message, $filepath, $line) +{ + // We don't bother with "strict" notices since they will fill up + // the log file with information that isn't normally very + // helpful. For example, if you are running PHP 5 and you + // use version 4 style class functions (without prefixes + // like "public", "private", etc.) you'll get notices telling + // you that these have been deprecated. + + if ($severity == E_STRICT) + { + return; + } + + // Send the PHP error to the log file... + if ( ! class_exists('CI_Exceptions')) + { + include_once(BASEPATH.'libraries/Exceptions.php'); + } + $error = new CI_Exceptions(); + + // Should we display the error? + // We'll get the current error_reporting level and add its bits + // with the severity bits to find out. + + if (($severity & error_reporting()) == $severity) + { + $error->show_php_error($severity, $message, $filepath, $line); + } + + // Should we log the error? No? We're done... + $config =& _get_config(); + if ($config['log_errors'] === FALSE) + { + return; + } + + $error->log_exception($severity, $message, $filepath, $line); +} + + +?> \ No newline at end of file diff --git a/system/codeigniter/index.html b/system/codeigniter/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/codeigniter/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/drivers/DB_active_record.php b/system/drivers/DB_active_record.php new file mode 100644 index 00000000..373c0f62 --- /dev/null +++ b/system/drivers/DB_active_record.php @@ -0,0 +1,875 @@ +ar_select[] = $val; + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * DISTINCT + * + * Sets a flag which tells the query string compiler to add DISTINCT + * + * @access public + * @param bool + * @return object + */ + function distinct($val = TRUE) + { + $this->ar_distinct = (is_bool($val)) ? $val : TRUE; + return $this; + } + + // -------------------------------------------------------------------- + + /** + * From + * + * Generates the FROM portion of the query + * + * @access public + * @param mixed can be a string or array + * @return object + */ + function from($from) + { + foreach ((array)$from as $val) + { + $this->ar_from[] = $this->dbprefix.$val; + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Join + * + * Generates the JOIN portion of the query + * + * @access public + * @param string + * @param string the join condition + * @param string the type of join + * @return object + */ + function join($table, $cond, $type = '') + { + if ($type != '') + { + $type = strtoupper(trim($type)); + + if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER'))) + { + $type = ''; + } + else + { + $type .= ' '; + } + } + + $this->ar_join[] = $type.'JOIN '.$table.' ON '.$cond; + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Where + * + * Generates the WHERE portion of the query. Separates + * multiple calls with AND + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function where($key, $value = NULL) + { + return $this->_where($key, $value, 'AND '); + } + + // -------------------------------------------------------------------- + + /** + * OR Where + * + * Generates the WHERE portion of the query. Separates + * multiple calls with OR + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function orwhere($key, $value = NULL) + { + return $this->_where($key, $value, 'OR '); + } + + // -------------------------------------------------------------------- + + /** + * Where + * + * Called by where() or orwhere() + * + * @access private + * @param mixed + * @param mixed + * @param string + * @return object + */ + function _where($key, $value = NULL, $type = 'AND ') + { + if ( ! is_array($key)) + { + $key = array($key => $value); + } + + foreach ($key as $k => $v) + { + $prefix = (count($this->ar_where) == 0) ? '' : $type; + + if ( ! is_null($v)) + { + if ( ! $this->_has_operator($k)) + { + $k .= ' ='; + } + + $v = ' '.$this->escape($v); + } + + $this->ar_where[] = $prefix.$k.$v; + } + return $this; + } + + + + // -------------------------------------------------------------------- + + /** + * Like + * + * Generates a %LIKE% portion of the query. Separates + * multiple calls with AND + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function like($field, $match = '') + { + return $this->_like($field, $match, 'AND '); + } + + // -------------------------------------------------------------------- + + /** + * OR Like + * + * Generates a %LIKE% portion of the query. Separates + * multiple calls with OR + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function orlike($field, $match = '') + { + return $this->_like($field, $match, 'OR '); + } + + // -------------------------------------------------------------------- + + /** + * Like + * + * Called by like() or olike() + * + * @access private + * @param mixed + * @param mixed + * @param string + * @return object + */ + function _like($field, $match = '', $type = 'AND ') + { + if ( ! is_array($field)) + { + $field = array($field => $match); + } + + foreach ($field as $k => $v) + { + $prefix = (count($this->ar_like) == 0) ? '' : $type; + + $v = $this->escape_str($v); + + $this->ar_like[] = $prefix." $k LIKE '%{$v}%'"; + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * GROUP BY + * + * @access public + * @param string + * @return object + */ + function groupby($by) + { + if (is_string($by)) + { + $by = explode(',', $by); + } + + foreach ($by as $val) + { + $val = trim($val); + + if ($val != '') + $this->ar_groupby[] = $val; + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Sets the HAVING value + * + * Separates multiple calls with AND + * + * @access public + * @param string + * @param string + * @return object + */ + function having($key, $value = '') + { + return $this->_having($key, $value, 'AND '); + } + + // -------------------------------------------------------------------- + + /** + * Sets the OR HAVING value + * + * Separates multiple calls with OR + * + * @access public + * @param string + * @param string + * @return object + */ + function orhaving($key, $value = '') + { + return $this->_having($key, $value, 'OR '); + } + + // -------------------------------------------------------------------- + + /** + * Sets the OR HAVING value + * + * Called by having() or orhaving() + * + * @access private + * @param string + * @param string + * @return object + */ + function _having($key, $value = '', $type = 'AND ') + { + if ( ! is_array($key)) + { + $key = array($key => $value); + } + + foreach ($key as $k => $v) + { + $prefix = (count($this->ar_having) == 0) ? '' : $type; + + if ($v != '') + { + $v = ' '.$this->escape($v); + } + + $this->ar_having[] = $prefix.$k.$v; + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Sets the ORDER BY value + * + * @access public + * @param string + * @param string direction: asc or desc + * @return object + */ + function orderby($orderby, $direction = '') + { + if (trim($direction) != '') + { + $direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC'))) ? ' '.$direction : ' ASC'; + } + + $this->ar_orderby[] = $orderby.$direction; + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Sets the LIMIT value + * + * @access public + * @param integer the limit value + * @param integer the offset value + * @return object + */ + function limit($value, $offset = '') + { + $this->ar_limit = $value; + + if ($offset != '') + $this->ar_offset = $offset; + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Sets the OFFSET value + * + * @access public + * @param integer the offset value + * @return object + */ + function offset($value) + { + $this->ar_offset = $value; + return $this; + } + + // -------------------------------------------------------------------- + + /** + * The "set" function. Allows key/value pairs to be set for inserting or updating + * + * @access public + * @param mixed + * @param string + * @return object + */ + function set($key, $value = '') + { + $key = $this->_object_to_array($key); + + if ( ! is_array($key)) + { + $key = array($key => $value); + } + + foreach ($key as $k => $v) + { + $this->ar_set[$k] = $this->escape($v); + } + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Get + * + * Compiles the select statement based on the other functions called + * and runs the query + * + * @access public + * @param string the limit clause + * @param string the offset clause + * @return object + */ + function get($table = '', $limit = null, $offset = null) + { + if ($table != '') + { + $this->from($table); + } + + if ( ! is_null($limit)) + { + $this->limit($limit, $offset); + } + + $sql = $this->_compile_select(); + + $this->_reset_select(); + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * GetWhere + * + * Allows the where clause, limit and offset to be added directly + * + * @access public + * @param string the where clause + * @param string the limit clause + * @param string the offset clause + * @return object + */ + function getwhere($table = '', $where = null, $limit = null, $offset = null) + { + if ($table != '') + { + $this->from($table); + } + + if ( ! is_null($where)) + { + $this->where($where); + } + + if ( ! is_null($limit)) + { + $this->limit($limit, $offset); + } + + $sql = $this->_compile_select(); + + $this->_reset_select(); + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Insert + * + * Compiles an insert string and runs the query + * + * @access public + * @param string the table to retrieve the results from + * @param array an associative array of insert values + * @return object + */ + function insert($table = '', $set = NULL) + { + if ( ! is_null($set)) + { + $this->set($set); + } + + if (count($this->ar_set) == 0) + { + if ($this->db_debug) + { + return $this->display_error('db_must_use_set'); + } + return FALSE; + } + + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + $sql = $this->_insert($this->dbprefix.$table, array_keys($this->ar_set), array_values($this->ar_set)); + + $this->_reset_write(); + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Update + * + * Compiles an update string and runs the query + * + * @access public + * @param string the table to retrieve the results from + * @param array an associative array of update values + * @param mixed the where clause + * @return object + */ + function update($table = '', $set = NULL, $where = null) + { + if ( ! is_null($set)) + { + $this->set($set); + } + + if (count($this->ar_set) == 0) + { + if ($this->db_debug) + { + return $this->display_error('db_must_use_set'); + } + return FALSE; + } + + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + if ($where != null) + { + $this->where($where); + } + + $sql = $this->_update($this->dbprefix.$table, $this->ar_set, $this->ar_where); + + $this->_reset_write(); + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Delete + * + * Compiles a delete string and runs the query + * + * @access public + * @param string the table to retrieve the results from + * @param mixed the where clause + * @return object + */ + function delete($table = '', $where = '') + { + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + if ($where != '') + { + $this->where($where); + } + + if (count($this->ar_where) == 0) + { + if ($this->debug) + { + return $this->display_error('db_del_must_use_where'); + } + return FALSE; + } + + $sql = $this->_delete($this->dbprefix.$table, $this->ar_where); + + $this->_reset_write(); + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Use Table - DEPRECATED + * + * @deprecated use $this->db->from instead + */ + function use_table($table) + { + return $this->from($table); + return $this; + } + + // -------------------------------------------------------------------- + + /** + * ORDER BY - DEPRECATED + * + * @deprecated use $this->db->orderby() instead + */ + function order_by($orderby, $direction = '') + { + return $this->orderby($orderby, $direction); + } + + // -------------------------------------------------------------------- + + /** + * Tests whether the string has an SQL operator + * + * @access private + * @param string + * @return bool + */ + function _has_operator($str) + { + $str = trim($str); + if ( ! preg_match("/(\s|<|>|!|=|is null|is not null)/i", $str)) + { + return FALSE; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Compile the SELECT statement + * + * Generates a query string based on which functions were used. + * Should not be called directly. The get() function calls it. + * + * @access private + * @return string + */ + function _compile_select() + { + $sql = ( ! $this->ar_distinct) ? 'SELECT ' : 'SELECT DISTINCT '; + + $sql .= (count($this->ar_select) == 0) ? '*' : implode(', ', $this->ar_select); + + if (count($this->ar_from) > 0) + { + $sql .= "\nFROM "; + $sql .= implode(', ', $this->ar_from); + } + + if (count($this->ar_join) > 0) + { + $sql .= "\n"; + $sql .= implode("\n", $this->ar_join); + } + + if (count($this->ar_where) > 0 OR count($this->ar_like) > 0) + { + $sql .= "\nWHERE "; + } + + $sql .= implode("\n", $this->ar_where); + + if (count($this->ar_like) > 0) + { + if (count($this->ar_where) > 0) + { + $sql .= " AND "; + } + + $sql .= implode("\n", $this->ar_like); + } + + if (count($this->ar_groupby) > 0) + { + $sql .= "\nGROUP BY "; + $sql .= implode(', ', $this->ar_groupby); + } + + if (count($this->ar_having) > 0) + { + $sql .= "\nHAVING "; + $sql .= implode("\n", $this->ar_having); + } + + if (count($this->ar_orderby) > 0) + { + $sql .= "\nORDER BY "; + $sql .= implode(', ', $this->ar_orderby); + + if ($this->ar_order !== FALSE) + { + $sql .= ($this->ar_order == 'desc') ? ' DESC' : ' ASC'; + } + } + + if (ctype_digit($this->ar_limit)) + { + $sql .= "\n"; + $sql = $this->_limit($sql, $this->ar_limit, $this->ar_offset); + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Object to Array + * + * Takes an object as input and convers the class variables to array key/vals + * + * @access public + * @param object + * @return array + */ + function _object_to_array($object) + { + if ( ! is_object($object)) + { + return $object; + } + + $array = array(); + foreach (get_object_vars($object) as $key => $val) + { + if ( ! is_object($val) AND ! is_array($val)) + { + $array[$key] = $val; + } + } + + return $array; + } + + // -------------------------------------------------------------------- + + /** + * Resets the active record values. Called by the get() function + * + * @access private + * @return void + */ + function _reset_select() + { + $this->ar_select = array(); + $this->ar_distinct = FALSE; + $this->ar_from = array(); + $this->ar_join = array(); + $this->ar_where = array(); + $this->ar_like = array(); + $this->ar_groupby = array(); + $this->ar_having = array(); + $this->ar_limit = FALSE; + $this->ar_offset = FALSE; + $this->ar_order = FALSE; + $this->ar_orderby = array(); + } + + // -------------------------------------------------------------------- + + /** + * Resets the active record "write" values. + * + * Called by the insert() or update() functions + * + * @access private + * @return void + */ + function _reset_write() + { + $this->ar_set = array(); + $this->ar_from = array(); + $this->ar_where = array(); + } + +} + +?> \ No newline at end of file diff --git a/system/drivers/DB_driver.php b/system/drivers/DB_driver.php new file mode 100644 index 00000000..ed18d54e --- /dev/null +++ b/system/drivers/DB_driver.php @@ -0,0 +1,948 @@ +initialize($params); + log_message('debug', 'Database Driver Class Initialized'); + } + + // -------------------------------------------------------------------- + + /** + * Initialize Database Settings + * + * @access private Called by the constructor + * @param mixed + * @return void + */ + function initialize($params = '') + { + if (is_array($params)) + { + foreach (array('hostname' => '', 'username' => '', 'password' => '', 'database' => '', 'dbdriver' => 'mysql', 'dbprefix' => '', 'pconnect' => FALSE, 'db_debug' => FALSE) as $key => $val) + { + $this->$key = ( ! isset($params[$key])) ? $val : $params[$key]; + } + } + elseif (strpos($params, '://')) + { + if (FALSE === ($dsn = @parse_url($params))) + { + log_message('error', 'Invalid DB Connection String'); + + if ($this->debug) + { + return $this->display_error('db_invalid_connection_str'); + } + return FALSE; + } + + $this->hostname = ( ! isset($dsn['host'])) ? '' : rawurldecode($dsn['host']); + $this->username = ( ! isset($dsn['user'])) ? '' : rawurldecode($dsn['user']); + $this->password = ( ! isset($dsn['pass'])) ? '' : rawurldecode($dsn['pass']); + $this->database = ( ! isset($dsn['path'])) ? '' : rawurldecode(substr($dsn['path'], 1)); + } + + if ($this->pconnect == FALSE) + { + $this->conn_id = $this->db_connect(); + } + else + { + $this->conn_id = $this->db_pconnect(); + } + + if ( ! $this->conn_id) + { + log_message('error', 'Unable to connect to the database'); + + if ($this->db_debug) + { + $this->display_error('db_unable_to_connect'); + } + } + else + { + if ( ! $this->db_select()) + { + log_message('error', 'Unable to select database: '.$this->database); + + if ($this->db_debug) + { + $this->display_error('db_unable_to_select', $this->database); + } + } + } + } + + // -------------------------------------------------------------------- + + /** + * Database Version Number. Returns a string containing the + * version of the database being used + * + * @access public + * @return string + */ + function version() + { + if (FALSE === ($sql = $this->_version())) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + + $query = $this->query($sql); + $row = $query->row(); + return $row->ver; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * Accepts an SQL string as input and returns a result object upon + * successful execution of a "read" type query. Returns boolean TRUE + * upon successful execution of a "write" type query. Returns boolean + * FALSE upon failure, and if the $db_debug variable is set to TRUE + * will raise an error. + * + * @access public + * @param string An SQL query string + * @param array An array of binding data + * @return mixed + */ + function query($sql, $binds = FALSE) + { + if ( ! $this->conn_id) + { + $this->initialize(); + } + + if ($sql == '') + { + if ($this->db_debug) + { + log_message('error', 'Invalid query: '.$sql); + return $this->display_error('db_invalid_query'); + } + return FALSE; + } + + // Compile binds if needed + if ($binds !== FALSE) + { + $sql = $this->compile_binds($sql, $binds); + } + + // Start the Query Timer + $time_start = list($sm, $ss) = explode(' ', microtime()); + + // Save the query for debugging + $this->queries[] = $sql; + + // Run the Query + if (FALSE === ($this->result_id = $this->execute($sql, $this->conn_id))) + { + if ($this->db_debug) + { + log_message('error', 'Query error: '.$this->error_message()); + return $this->display_error( + array( + 'Error Number: '.$this->error_number(), + $this->error_message(), + $sql + ) + ); + } + + return FALSE; + } + + // Stop and aggregate the query time results + $time_end = list($em, $es) = explode(' ', microtime()); + $this->benchmark += ($em + $es) - ($sm + $ss); + + // Increment the query counter + $this->query_count++; + + // Was the query a "write" type? + // If so we'll return simply return true + if ($this->is_write_type($sql) === TRUE) + { + return TRUE; + } + + // Instantiate and return the DB result object + $result = 'CI_DB_'.$this->dbdriver.'_result'; + + $RES = new $result(); + $RES->conn_id = $this->conn_id; + $RES->db_debug = $this->db_debug; + $RES->result_id = $this->result_id; + + return $RES; + } + + // -------------------------------------------------------------------- + + /** + * Enables a native PHP function to be run, using a platform agnostic wrapper. + * + * @access public + * @param string the function name + * @param mixed any parameters needed by the function + * @return mixed + */ + function call_function($function) + { + $driver = ($this->dbdriver == 'postgre') ? 'pg_' : $this->dbdriver.'_'; + + if (FALSE === strpos($driver, $function)) + { + $function = $driver.$function; + } + + if ( ! function_exists($function)) + { + if ($this->debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + else + { + $args = (func_num_args() > 1) ? array_shift(func_get_args()) : null; + + return call_user_func_array($function, $args); + } + } + + // -------------------------------------------------------------------- + + /** + * Determines if a query is a "write" type. + * + * @access public + * @param string An SQL query string + * @return boolean + */ + function is_write_type($sql) + { + if ( ! preg_match('/^\s*"?(INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|LOAD DATA|COPY|ALTER|GRANT|REVOKE|LOCK|UNLOCK)\s+/i', $sql)) + { + return FALSE; + } + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Calculate the aggregate query elapsed time + * + * @access public + * @param intiger The number of decimal places + * @return integer + */ + function elapsed_time($decimals = 6) + { + return number_format($this->benchmark, $decimals); + } + + // -------------------------------------------------------------------- + + /** + * Returns the total number of queries + * + * @access public + * @return integer + */ + function total_queries() + { + return $this->query_count; + } + + // -------------------------------------------------------------------- + + /** + * Returns the last query that was executed + * + * @access public + * @return void + */ + function last_query() + { + return end($this->queries); + } + + // -------------------------------------------------------------------- + + /** + * "Smart" Escape String + * + * Escapes data based on type + * Sets boolean and null types + * + * @access public + * @param string + * @return integer + */ + function escape($str) + { + if ( ! ctype_digit($str)) // bug fix to ensure that numbers are not treated as strings. + { + switch (gettype($str)) + { + case 'string' : $str = "'".$this->escape_str($str)."'"; + break; + case 'boolean' : $str = ($str === FALSE) ? 0 : 1; + break; + default : $str = ($str === NULL) ? 'NULL' : $str; + break; + } + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Returns an array of table names + * + * @access public + * @return array + */ + function tables() + { + if (FALSE === ($sql = $this->_show_tables())) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + + $retval = array(); + $query = $this->query($sql); + + if ($query->num_rows() > 0) + { + foreach($query->result_array() as $row) + { + $retval[] = array_shift($row); + } + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Determine if a particular table exists + * @access public + * @return boolean + */ + function table_exists($table_name) + { + return ( ! in_array($this->dbprefix.$table_name, $this->tables())) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Fetch MySQL Field Names + * + * @access public + * @param string the table name + * @return array + */ + function field_names($table = '') + { + if ($table == '') + { + if ($this->debug) + { + return $this->display_error('db_field_param_missing'); + } + return FALSE; + } + + if (FALSE === ($sql = $this->_show_columns($this->dbprefix.$table))) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + + $query = $this->query($sql); + + $retval = array(); + foreach($query->result_array() as $row) + { + if ($this->dbdriver == 'mssql' AND isset($row['COLUMN_NAME'])) + { + $retval[] = $row['COLUMN_NAME']; + } + else + { + $retval[] = current($row); + } + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Returns an object with field data + * + * @access public + * @param string the table name + * @return object + */ + function field_data($table = '') + { + if ($table == '') + { + if ($this->debug) + { + return $this->display_error('db_field_param_missing'); + } + return FALSE; + } + + return $this->_field_data($this->dbprefix.$table); + } + + // -------------------------------------------------------------------- + + /** + * Primary + * + * Retrieves the primary key. It assumes that the row in the first + * position is the primary key + * + * @access public + * @param string the table name + * @return string + */ + function primary($table = '') + { + $fields = $this->field_names($table); + + if ( ! is_array($fields)) + { + return FALSE; + } + + return current($fields); + } + + // -------------------------------------------------------------------- + + /** + * Compile Bindings + * + * @access public + * @param string the sql statement + * @param array an array of bind data + * @return string + */ + function compile_binds($sql, $binds) + { + if (FALSE === strpos($sql, $this->bind_marker)) + { + return $sql; + } + + if ( ! is_array($binds)) + { + $binds = array($binds); + } + + foreach ($binds as $val) + { + $val = $this->escape($val); + + // Just in case the replacement string contains the bind + // character we'll temporarily replace it with a marker + $val = str_replace($this->bind_marker, '{%bind_marker%}', $val); + $sql = preg_replace("#".preg_quote($this->bind_marker)."#", $val, $sql, 1); + } + + return str_replace('{%bind_marker%}', $this->bind_marker, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Generate an insert string + * + * @access public + * @param string the table upon which the query will be performed + * @param array an associative array data of key/values + * @return string + */ + function insert_string($table, $data) + { + $fields = array(); + $values = array(); + + foreach($data as $key => $val) + { + $fields[] = $key; + $values[] = $this->escape($val); + } + + return $this->_insert($this->dbprefix.$table, $fields, $values); + } + + // -------------------------------------------------------------------- + + /** + * Generate an update string + * + * @access public + * @param string the table upon which the query will be performed + * @param array an associative array data of key/values + * @param mixed the "where" statement + * @return string + */ + function update_string($table, $data, $where) + { + if ($where == '') + return false; + + $fields = array(); + foreach($data as $key => $val) + { + $fields[$key] = $this->escape($val); + } + + if ( ! is_array($where)) + { + $dest = array($where); + } + else + { + $dest = array(); + foreach ($where as $key => $val) + { + $prefix = (count($dest) == 0) ? '' : ' AND '; + + if ($val != '') + { + if ( ! $this->_has_operator($key)) + { + $key .= ' ='; + } + + $val = ' '.$this->escape($val); + } + + $dest[] = $prefix.$key.$val; + } + } + + return $this->_update($this->dbprefix.$table, $fields, $dest); + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @return void + */ + function close() + { + if (is_resource($this->conn_id)) + { + $this->destroy($this->conn_id); + } + $this->conn_id = FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Display an error message + * + * @access public + * @param string the error message + * @param string any "swap" values + * @param boolean whether to localize the message + * @return string sends the application/errror_db.php template + */ + function display_error($error = '', $swap = '', $native = FALSE) + { + $LANG = new CI_Language(); + $LANG->load('db'); + + $heading = 'MySQL Error'; + + if ($native == TRUE) + { + $message = $error; + } + else + { + $message = ( ! is_array($error)) ? array(str_replace('%s', $swap, $LANG->line($error))) : $error; + } + + if ( ! class_exists('CI_Exceptions')) + { + include_once(BASEPATH.'libraries/Exceptions.php'); + } + + $error = new CI_Exceptions(); + echo $error->show_error('An Error Was Encountered', $message, 'error_db'); + exit; + + } + + // -------------------------------------------------------------------- + + /** + * Field Data - old version - DEPRECATED + * + * @deprecated use $this->db->field_data() instead + */ + function fields($table = '') + { + return $this->field_data($table); + } + + // -------------------------------------------------------------------- + + /** + * Smart Escape String - old version - DEPRECATED + * + * @deprecated use $this->db->escape() instead + */ + function smart_escape_str($str) + { + return $this->escape($str); + } +} + + +/** + * Database Result Class + * + * This is the platform-independent result class. + * This class will not be called directly. Rather, the adapter + * class for the specific database will extend and instantiate it. + * + * @category Database + * @author Rick Ellis + * @link http://www.codeigniter.com/user_guide/libraries/database/ + */ +class CI_DB_result { + + var $conn_id = FALSE; + var $result_id = FALSE; + var $db_debug = FALSE; + var $result_array = array(); + var $result_object = array(); + var $current_row = 0; + + /** + * Query result. Acts as a wrapper function for the following functions. + * + * @access public + * @param string can be "object" or "array" + * @return mixed either a result object or array + */ + function result($type = 'object') + { + return ($type == 'object') ? $this->result_object() : $this->result_array(); + } + + // -------------------------------------------------------------------- + + /** + * Query result. "object" version. + * + * @access public + * @return object + */ + function result_object() + { + if (count($this->result_object) > 0) + { + return $this->result_object; + } + + while ($row = $this->_fetch_object()) + { + $this->result_object[] = $row; + } + + if (count($this->result_object) == 0) + { + return FALSE; + } + + return $this->result_object; + } + + // -------------------------------------------------------------------- + + /** + * Query result. "array" version. + * + * @access public + * @return array + */ + function result_array() + { + if (count($this->result_array) > 0) + { + return $this->result_array; + } + + while ($row = $this->_fetch_assoc()) + { + $this->result_array[] = $row; + } + + if (count($this->result_array) == 0) + { + return FALSE; + } + + return $this->result_array; + } + + // -------------------------------------------------------------------- + + /** + * Query result. Acts as a wrapper function for the following functions. + * + * @access public + * @param string can be "object" or "array" + * @return mixed either a result object or array + */ + function row($n = 0, $type = 'object') + { + return ($type == 'object') ? $this->row_object($n) : $this->row_array($n); + } + + // -------------------------------------------------------------------- + + /** + * Returns a single result row - object version + * + * @access public + * @return object + */ + function row_object($n = 0) + { + if (FALSE === ($result = $this->result_object())) + { + return FALSE; + } + + if ($n != $this->current_row AND isset($result[$n])) + { + $this->current_row = $n; + } + + return $result[$this->current_row]; + } + + // -------------------------------------------------------------------- + + /** + * Returns a single result row - array version + * + * @access public + * @return array + */ + function row_array($n = 0) + { + if (FALSE === ($result = $this->result_array())) + { + return FALSE; + } + + if ($n != $this->current_row AND isset($result[$n])) + { + $this->current_row = $n; + } + + return $result[$this->current_row]; + } + + // -------------------------------------------------------------------- + + /** + * Returns the "next" row + * + * @access public + * @return object + */ + function next_row($type = 'object') + { + if (FALSE === ($result = $this->result($type))) + { + return FALSE; + } + + if (isset($result[$this->current_row + 1])) + { + ++$this->current_row; + } + + return $result[$this->current_row]; + } + + // -------------------------------------------------------------------- + + /** + * Returns the "previous" row + * + * @access public + * @return object + */ + function previous_row($type = 'object') + { + if (FALSE === ($result = $this->result($type))) + { + return FALSE; + } + + if (isset($result[$this->current_row - 1])) + { + --$this->current_row; + } + return $result[$this->current_row]; + } + + // -------------------------------------------------------------------- + + /** + * Returns the "first" row + * + * @access public + * @return object + */ + function first_row($type = 'object') + { + if (FALSE === ($result = $this->result($type))) + { + return FALSE; + } + return $result[0]; + } + + // -------------------------------------------------------------------- + + /** + * Returns the "last" row + * + * @access public + * @return object + */ + function last_row($type = 'object') + { + if (FALSE === ($result = $this->result($type))) + { + return FALSE; + } + return $result[count($result) -1]; + } + +} + + + +/** + * Database Field Class + * + * This class will contain the field meta-data. It + * is called by one of the field result functions + * + * @category Database + * @author Rick Ellis + * @link http://www.codeigniter.com/user_guide/libraries/database/ + */ +class CI_DB_field { + var $name; + var $type; + var $default; + var $max_length; + var $primary_key; +} + +?> \ No newline at end of file diff --git a/system/drivers/DB_mssql.php b/system/drivers/DB_mssql.php new file mode 100644 index 00000000..6156ec3c --- /dev/null +++ b/system/drivers/DB_mssql.php @@ -0,0 +1,472 @@ +hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return mssql_pconnect($this->hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return @mssql_select_db($this->database, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function execute($sql) + { + $sql = $this->_prep_query($sql); + return @mssql_query($sql, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function &_prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + // MS SQL doesn't require escaping + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function destroy($conn_id) + { + mssql_close($conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @mssql_rows_affected($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + // Not supported in MS SQL? + return 0; + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access public + * @return string + */ + function error_message() + { + // Are errros even supported in MS SQL? + return ''; + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access public + * @return integer + */ + function error_number() + { + // Are error numbers supported? + return ''; + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access public + * @param string the table name + * @return string + */ + function escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + $sql = "SELECT TOP 1 FROM ".$this->escape_table($table); + $query = $this->query($sql); + return $query->field_data(); + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access public + * @return string + */ + function _show_tables() + { + return "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name"; + } + + // -------------------------------------------------------------------- + + /** + * Show columnn query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _show_columns($table = '') + { + return "SELECT * FROM INFORMATION_SCHEMA.Columns WHERE TABLE_NAME = '".$this->escape_table($table)."'"; + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $i = $limit + $offset; + + return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$i.' ', $sql); + } + +} + + + +/** + * MS SQL Result Class + * + * This class extends the parent result class: CI_DB_result + * + * @category Database + * @author Rick Ellis + * @link http://www.codeigniter.com/user_guide/libraries/database/ + */ +class CI_DB_mssql_result extends CI_DB_result { + + /** + * Number of rows in the result set + * + * @access public + * @return integer + */ + function num_rows() + { + return @mssql_num_rows($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @mssql_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + while ($field = mssql_fetch_field($this->result_id)) + { + $F = new CI_DB_field(); + $F->name = $field->name; + $F->type = $field->type; + $F->max_length = $field->max_length; + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return mssql_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return mssql_fetch_object($this->result_id); + } + +} + +?> \ No newline at end of file diff --git a/system/drivers/DB_mysql.php b/system/drivers/DB_mysql.php new file mode 100644 index 00000000..18c080b2 --- /dev/null +++ b/system/drivers/DB_mysql.php @@ -0,0 +1,495 @@ +hostname, $this->username, $this->password, TRUE); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return mysql_pconnect($this->hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return @mysql_select_db($this->database, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function execute($sql) + { + $sql = $this->_prep_query($sql); + return @mysql_query($sql, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function &_prep_query($sql) + { + // "DELETE FROM TABLE" returns 0 affected rows This hack modifies + // the query so that it returns the number of affected rows + if ($this->delete_hack === TRUE) + { + if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) + { + $sql = preg_replace("/^\s*DELETE\s+FROM\s+(\S+)\s*$/", "DELETE FROM \\1 WHERE 1=1", $sql); + } + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + if (get_magic_quotes_gpc()) + { + $str = stripslashes($str); + } + return mysql_real_escape_string($str); + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function destroy($conn_id) + { + mysql_close($conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @mysql_affected_rows($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @mysql_insert_id($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access public + * @return string + */ + function error_message() + { + return mysql_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access public + * @return integer + */ + function error_number() + { + return mysql_errno($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access public + * @param string the table name + * @return string + */ + function escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + $sql = "SELECT * FROM ".$this->escape_table($table)." LIMIT 1"; + $query = $this->query($sql); + return $query->field_data(); + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access public + * @return string + */ + function _show_tables() + { + return "SHOW TABLES FROM `".$this->database."`"; + } + + // -------------------------------------------------------------------- + + /** + * Show columnn query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _show_columns($table = '') + { + return "SHOW COLUMNS FROM ".$this->escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + if ($offset == 0) + { + $offset = ''; + } + else + { + $offset .= ", "; + } + + return $sql."LIMIT ".$offset.$limit; + } + +} + + +/** + * MySQL Result Class + * + * This class extends the parent result class: CI_DB_result + * + * @category Database + * @author Rick Ellis + * @link http://www.codeigniter.com/user_guide/libraries/database/ + */ +class CI_DB_mysql_result extends CI_DB_result { + + /** + * Number of rows in the result set + * + * @access public + * @return integer + */ + function num_rows() + { + return @mysql_num_rows($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @mysql_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + while ($field = mysql_fetch_field($this->result_id)) + { + $F = new CI_DB_field(); + $F->name = $field->name; + $F->type = $field->type; + $F->default = $field->def; + $F->max_length = $field->max_length; + $F->primary_key = $field->primary_key; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return mysql_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return mysql_fetch_object($this->result_id); + } + +} + +?> \ No newline at end of file diff --git a/system/drivers/DB_mysqli.php b/system/drivers/DB_mysqli.php new file mode 100644 index 00000000..f8cb19db --- /dev/null +++ b/system/drivers/DB_mysqli.php @@ -0,0 +1,496 @@ +hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return $this->db_connect(); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return @mysqli_select_db($this->conn_id, $this->database); + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function execute($sql) + { + $sql = $this->_prep_query($sql); + return @mysqli_query($this->conn_id, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function &_prep_query($sql) + { + // "DELETE FROM TABLE" returns 0 affected rows This hack modifies + // the query so that it returns the number of affected rows + if ($this->delete_hack === TRUE) + { + if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) + { + $sql = preg_replace("/^\s*DELETE\s+FROM\s+(\S+)\s*$/", "DELETE FROM \\1 WHERE 1=1", $sql); + } + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + if (get_magic_quotes_gpc()) + { + $str = stripslashes($str); + } + return mysqli_real_escape_string($this->conn_id, $str); + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function destroy($conn_id) + { + mysqli_close($conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @mysqli_affected_rows($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @mysqli_insert_id($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access public + * @return string + */ + function error_message() + { + return mysqli_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access public + * @return integer + */ + function error_number() + { + return mysqli_errno($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access public + * @param string the table name + * @return string + */ + function escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + $sql = "SELECT * FROM ".$this->escape_table($table)." LIMIT 1"; + $query = $this->query($sql); + return $query->field_data(); + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access public + * @return string + */ + function _show_tables() + { + return "SHOW TABLES FROM `".$this->database."`"; + } + + // -------------------------------------------------------------------- + + /** + * Show columnn query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _show_columns($table = '') + { + return "SHOW COLUMNS FROM ".$this->escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $sql .= "LIMIT ".$limit; + + if ($offset > 0) + { + $sql .= " OFFSET ".$offset; + } + + return $sql; + } + +} + + + +/** + * MySQLi Result Class + * + * This class extends the parent result class: CI_DB_result + * + * @category Database + * @author Rick Ellis + * @link http://www.codeigniter.com/user_guide/libraries/database/ + */ +class CI_DB_mysqli_result extends CI_DB_result { + + /** + * Number of rows in the result set + * + * @access public + * @return integer + */ + function num_rows() + { + return @mysqli_num_rows($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @mysqli_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + while ($field = mysqli_fetch_field($this->result_id)) + { + $F = new CI_DB_field(); + $F->name = $field->name; + $F->type = $field->type; + $F->default = $field->def; + $F->max_length = $field->max_length; + $F->primary_key = 0; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return mysqli_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return mysqli_fetch_object($this->result_id); + } + +} + +?> \ No newline at end of file diff --git a/system/drivers/DB_odbc.php b/system/drivers/DB_odbc.php new file mode 100644 index 00000000..fac44904 --- /dev/null +++ b/system/drivers/DB_odbc.php @@ -0,0 +1,468 @@ +database, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return odbc_pconnect($this->database, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + // Not needed for ODBC + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function execute($sql) + { + $sql = $this->_prep_query($sql); + return @odbc_exec($this->conn_id, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function &_prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + // ODBC doesn't require escaping + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function destroy($conn_id) + { + odbc_close($conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @odbc_num_rows($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @odbc_insert_id($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access public + * @return string + */ + function error_message() + { + return odbc_errormsg($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access public + * @return integer + */ + function error_number() + { + return odbc_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access public + * @param string the table name + * @return string + */ + function escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + $sql = "SELECT TOP 1 FROM ".$this->escape_table($table); + $query = $this->query($sql); + return $query->field_data(); + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access public + * @return string + */ + function _show_tables() + { + return "SHOW TABLES FROM `".$this->database."`"; + } + + // -------------------------------------------------------------------- + + /** + * Show columnn query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _show_columns($table = '') + { + return "SHOW COLUMNS FROM ".$this->escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + // Does ODBC doesn't use the LIMIT clause? + return $sql; + } + +} + + +/** + * ODBC Result Class + * + * This class extends the parent result class: CI_DB_result + * + * @category Database + * @author Rick Ellis + * @link http://www.codeigniter.com/user_guide/libraries/database/ + */ +class CI_DB_odbc_result extends CI_DB_result { + + /** + * Number of rows in the result set + * + * @access public + * @return integer + */ + function num_rows() + { + return @odbc_num_rows($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @odbc_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $F = new CI_DB_field(); + $F->name = odbc_field_name($this->result_id, $i); + $F->type = odbc_field_type($this->result_id, $i); + $F->max_length = odbc_field_len($this->result_id, $i); + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return odbc_fetch_array($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return odbc_fetch_object($this->result_id); + } + +} + +?> \ No newline at end of file diff --git a/system/drivers/DB_postgre.php b/system/drivers/DB_postgre.php new file mode 100644 index 00000000..01d4b3df --- /dev/null +++ b/system/drivers/DB_postgre.php @@ -0,0 +1,476 @@ +hostname." dbname=".$this->database." user=".$this->username." password=".$this->password); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return pg_pconnect("host=".$this->hostname." dbname=".$this->database." user=".$this->username." password=".$this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + // Not needed for Postgre so we'll return TRUE + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function execute($sql) + { + $sql = $this->_prep_query($sql); + return @pg_query($this->conn_id, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function &_prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + if (get_magic_quotes_gpc()) + { + $str = stripslashes($str); + } + return pg_escape_string($str); + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function destroy($conn_id) + { + pg_close($conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @pg_affected_rows($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return pg_last_oid($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access public + * @return string + */ + function error_message() + { + return pg_last_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access public + * @return integer + */ + function error_number() + { + return ''; + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access public + * @param string the table name + * @return string + */ + function escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + $sql = "SELECT * FROM ".$this->escape_table($table)." LIMIT 1"; + $query = $this->query($sql); + return $query->field_data(); + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access public + * @return string + */ + function _show_tables() + { + return "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"; + } + + // -------------------------------------------------------------------- + + /** + * Show columnn query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _show_columns($table = '') + { + return "SELECT column_name FROM information_schema.columns WHERE table_name ='".$this->escape_table($table)."'"; + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $sql .= "LIMIT ".$limit; + + if ($offset > 0) + { + $sql .= " OFFSET ".$offset; + } + + return $sql; + } + +} + + + +/** + * Postgres Result Class + * + * This class extends the parent result class: CI_DB_result + * + * @category Database + * @author Rick Ellis + * @link http://www.codeigniter.com/user_guide/libraries/database/ + */ +class CI_DB_postgre_result extends CI_DB_result { + + /** + * Number of rows in the result set + * + * @access public + * @return integer + */ + function num_rows() + { + return @pg_num_rows($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @pg_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $F = new CI_DB_field(); + $F->name = pg_field_name($this->result_id, $i); + $F->type = pg_field_type($this->result_id, $i); + $F->max_length = pg_field_size($this->result_id, $i); + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return pg_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return pg_fetch_object($this->result_id); + } + +} + +?> \ No newline at end of file diff --git a/system/drivers/DB_sqlite.php b/system/drivers/DB_sqlite.php new file mode 100644 index 00000000..6428dd5b --- /dev/null +++ b/system/drivers/DB_sqlite.php @@ -0,0 +1,501 @@ +database, 0666, $error)) + { + log_message('error', $error); + + if ($this->db_debug) + { + $this->display_error($error, '', TRUE); + } + } + + return $conn_id; + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + if ( ! $conn_id = sqlite_popen($this->database, 0666, $error)) + { + log_message('error', $error); + + if ($this->db_debug) + { + $this->display_error($error, '', TRUE); + } + } + + return $conn_id; + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function execute($sql) + { + $sql = $this->_prep_query($sql); + return @sqlite_query($this->conn_id, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function &_prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + if (get_magic_quotes_gpc()) + { + $str = stripslashes($str); + } + return sqlite_escape_string($str); + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function destroy($conn_id) + { + sqlite_close($conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return sqlite_changes($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @sqlite_last_insert_rowid($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access public + * @return string + */ + function error_message() + { + return sqlite_error_string(sqlite_last_error($this->conn_id)); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access public + * @return integer + */ + function error_number() + { + return sqlite_last_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function version() + { + return sqlite_libversion(); + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access public + * @param string the table name + * @return string + */ + function escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + $sql = "SELECT * FROM ".$this->escape_table($table)." LIMIT 1"; + $query = $this->query($sql); + return $query->field_data(); + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access public + * @return string + */ + function _show_tables() + { + return "SELECT name from sqlite_master WHERE type='table'"; + } + + // -------------------------------------------------------------------- + + /** + * Show columnn query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _show_columns($table = '') + { + // Not supported + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + if ($offset == 0) + { + $offset = ''; + } + else + { + $offset .= ", "; + } + + return $sql."LIMIT ".$offset.$limit; + } + +} + + +/** + * SQLite Result Class + * + * This class extends the parent result class: CI_DB_result + * + * @category Database + * @author Rick Ellis + * @link http://www.codeigniter.com/user_guide/libraries/database/ + */ +class CI_DB_sqlite_result extends CI_DB_result { + + /** + * Number of rows in the result set + * + * @access public + * @return integer + */ + function num_rows() + { + return @sqlite_num_rows($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @sqlite_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $F = new CI_DB_field(); + $F->name = sqlite_field_name($this->result_id, $i); + $F->type = 'varchar'; + $F->max_length = 0; + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return sqlite_fetch_array($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return sqlite_fetch_object($this->result_id); + } + +} + +?> \ No newline at end of file diff --git a/system/drivers/index.html b/system/drivers/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/drivers/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/fonts/index.html b/system/fonts/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/fonts/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/fonts/texb.ttf b/system/fonts/texb.ttf new file mode 100644 index 0000000000000000000000000000000000000000..383c88b86b7c17e2e284732af48b2bfc359647ae GIT binary patch literal 143830 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 z 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 n`i \ No newline at end of file diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php new file mode 100644 index 00000000..24e243dd --- /dev/null +++ b/system/helpers/cookie_helper.php @@ -0,0 +1,77 @@ + 0) + { + $expire = time() + $expire; + } + else + { + $expire = 0; + } + } + + setcookie($prefix.$name, $value, $expire, $path, $domain, 0); +} + +?> \ No newline at end of file diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php new file mode 100644 index 00000000..2a3d5085 --- /dev/null +++ b/system/helpers/date_helper.php @@ -0,0 +1,530 @@ +config->item('time_reference')) == 'gmt') + { + $now = time(); + $system_time = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now)); + + if (strlen($system_time) < 10) + { + $system_time = time(); + log_message('error', 'The Date class could not set a proper GMT timestamp so the local time() value was used.'); + } + + return $system_time; + } + else + { + return time(); + } +} + +// ------------------------------------------------------------------------ + +/** + * Convert MySQL Style Datecodes + * + * This function is identical to PHPs date() function, + * except that it allows date codes to be formatted using + * the MySQL style, where each code letter is preceded + * with a percent sign: %Y %m %d etc... + * + * The benefit of doing dates this way is that you don't + * have to worry about escaping your text letters that + * match the date codes. + * + * @access public + * @param string + * @param integer + * @return integer + */ +function mdate($datestr = '', $time = '') +{ + if ($datestr == '') + return ''; + + if ($time == '') + $time = now(); + + $datestr = str_replace('%\\', '', preg_replace("/([a-z]+?){1}/i", "\\\\\\1", $datestr)); + return date($datestr, $time); +} + +// ------------------------------------------------------------------------ + +/** + * Convert MySQL Style Datecodes + * + * Returns a span of seconds in this format: + * 10 days 14 hours 36 minutes 47 seconds + * + * @access public + * @param integer a number of seconds + * @param integer Unix timestamp + * @return integer + */ +function timespan($seconds = 1, $time = '') +{ + $obj =& get_instance(); + $obj->lang->load('date'); + + if ( ! is_numeric($seconds)) + { + $seconds = 1; + } + + if ( ! is_numeric($time)) + { + $time = time(); + } + + if ($time <= $seconds) + { + $seconds = 1; + } + else + { + $seconds = $time - $seconds; + } + + $str = ''; + $years = floor($seconds / 31536000); + + if ($years > 0) + { + $str .= $years.' '.$obj->lang->line((($years > 1) ? 'date_years' : 'date_year')).', '; + } + + $seconds -= $years * 31536000; + $months = floor($seconds / 2628000); + + if ($years > 0 OR $months > 0) + { + if ($months > 0) + { + $str .= $months.' '.$obj->lang->line((($months > 1) ? 'date_months' : 'date_month')).', '; + } + + $seconds -= $months * 2628000; + } + + $weeks = floor($seconds / 604800); + + if ($years > 0 OR $months > 0 OR $weeks > 0) + { + if ($weeks > 0) + { + $str .= $weeks.' '.$obj->lang->line((($weeks > 1) ? 'date_weeks' : 'date_week')).', '; + } + + $seconds -= $weeks * 604800; + } + + $days = floor($seconds / 86400); + + if ($months > 0 OR $weeks > 0 OR $days > 0) + { + if ($days > 0) + { + $str .= $days.' '.$obj->lang->line((($days > 1) ? 'date_days' : 'date_day')).', '; + } + + $seconds -= $days * 86400; + } + + $hours = floor($seconds / 3600); + + if ($days > 0 OR $hours > 0) + { + if ($hours > 0) + { + $str .= $hours.' '.$obj->lang->line((($hours > 1) ? 'date_hours' : 'date_hour')).', '; + } + + $seconds -= $hours * 3600; + } + + $minutes = floor($seconds / 60); + + if ($days > 0 OR $hours > 0 OR $minutes > 0) + { + if ($minutes > 0) + { + $str .= $minutes.' '.$obj->lang->line((($minutes > 1) ? 'date_minutes' : 'date_minutes')).', '; + } + + $seconds -= $minutes * 60; + } + + if ($str == '') + { + $str .= $seconds.' '.$obj->lang->line((($seconds > 1) ? 'date_seconds' : 'date_second')).', '; + } + + return substr(trim($str), 0, -1); +} + +// ------------------------------------------------------------------------ + +/** + * Number of days in a month + * + * Takes a month/year as input and returns the number of days + * for the given month/year. Takes leap years into consideration. + * + * @access public + * @param integer a numeric month + * @param integer a numeric year + * @return integer + */ +function days_in_month($month = 0, $year = '') +{ + if ($month < 1 OR $month > 12) + { + return 0; + } + + if ( ! ctype_digit($year) OR strlen($year) != 4) + { + $year = date('Y'); + } + + if ($month == 2) + { + if ($year % 400 == 0 OR ($year % 4 == 0 AND $year % 100 != 0)) + { + return 29; + } + } + + $days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); + return $days_in_month[$month - 1]; +} + +// ------------------------------------------------------------------------ + +/** + * Converts a local Unix timestamp to GMT + * + * @access public + * @param integer Unix timestamp + * @return integer + */ +function local_to_gmt($time = '') +{ + if ($time == '') + $time = time(); + + return mktime( gmdate("H", $time), gmdate("i", $time), gmdate("s", $time), gmdate("m", $time), gmdate("d", $time), gmdate("Y", $time)); +} + +// ------------------------------------------------------------------------ + +/** + * Converts GMT time to a localized value + * + * Takes a Unix timestamp (in GMT) as input, and returns + * at the local value based on the timezone and DST setting + * submitted + * + * @access public + * @param integer Unix timestamp + * @param string timezone + * @param bool whether DST is active + * @return integer + */ +function gmt_to_local($time = '', $timezone = 'UTC', $dst = FALSE) +{ + if ($time == '') + { + return now(); + } + + $time += timezones($timezone) * 3600; + + if ($dst == TRUE) + { + $time += 3600; + } + + return $time; +} + +// ------------------------------------------------------------------------ + +/** + * Converts a MySQL Timestamp to Unix + * + * @access public + * @param integer Unix timestamp + * @return integer + */ +function mysql_to_unix($time = '') +{ + // We'll remove certain characters for backward compatibility + // since the formatting changed with MySQL 4.1 + // YYYY-MM-DD HH:MM:SS + + $time = str_replace('-', '', $time); + $time = str_replace(':', '', $time); + $time = str_replace(' ', '', $time); + + // YYYYMMDDHHMMSS + return mktime( + substr($time, 8, 2), + substr($time, 10, 2), + substr($time, 12, 2), + substr($time, 4, 2), + substr($time, 6, 2), + substr($time, 0, 4) + ); +} + +// ------------------------------------------------------------------------ + +/** + * Unix to "Human" + * + * Formats Unix timestamp to the following prototype: 2006-08-21 11:35 PM + * + * @access public + * @param integer Unix timestamp + * @param bool whether to show seconds + * @param string format: us or euro + * @return string + */ +function unix_to_human($time = '', $seconds = FALSE, $fmt = 'us') +{ + $r = date('Y', $time).'-'.date('m', $time).'-'.date('d', $time).' '; + + if ($fmt == 'us') + { + $r .= date('h', $time).':'.date('i', $time); + } + else + { + $r .= date('H', $time).':'.date('i', $time); + } + + if ($seconds) + { + $r .= ':'.date('s', $time); + } + + if ($fmt == 'us') + { + $r .= ' '.date('A', $time); + } + + return $r; +} + +// ------------------------------------------------------------------------ + +/** + * Convert "human" date to GMT + * + * Reverses the above process + * + * @access public + * @param string format: us or euro + * @return integer + */ +function human_to_unix($datestr = '') +{ + if ($datestr == '') + { + return FALSE; + } + + $datestr = trim($datestr); + $datestr = preg_replace("/\040+/", "\040", $datestr); + + if ( ! ereg("^[0-9]{2,4}\-[0-9]{1,2}\-[0-9]{1,2}\040[0-9]{1,2}:[0-9]{1,2}.*$", $datestr)) + { + return FALSE; + } + + $split = preg_split("/\040/", $datestr); + + $ex = explode("-", $split['0']); + + $year = (strlen($ex['0']) == 2) ? '20'.$ex['0'] : $ex['0']; + $month = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; + $day = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; + + $ex = explode(":", $split['1']); + + $hour = (strlen($ex['0']) == 1) ? '0'.$ex['0'] : $ex['0']; + $min = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; + + if (isset($ex['2']) AND ereg("[0-9]{1,2}", $ex['2'])) + { + $sec = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; + } + else + { + // Unless specified, seconds get set to zero. + $sec = '00'; + } + + if (isset($split['2'])) + { + $ampm = strtolower($split['2']); + + if (substr($ampm, 0, 1) == 'p' AND $hour < 12) + $hour = $hour + 12; + + if (substr($ampm, 0, 1) == 'a' AND $hour == 12) + $hour = '00'; + + if (strlen($hour) == 1) + $hour = '0'.$hour; + } + + return mktime($hour, $min, $sec, $month, $day, $year); +} + +// ------------------------------------------------------------------------ + +/** + * Timezone Menu + * + * Generates a drop-down menu of timezones. + * + * @access public + * @param string timezone + * @param string classname + * @param string menu name + * @return string + */ +function timezone_menu($default = 'UTC', $class = "", $name = 'timezones') +{ + $obj =& get_instance(); + $obj->lang->load('date'); + + if ($default == 'GMT') + $default = 'UTC'; + + $menu = '"; + + return $menu; +} + +// ------------------------------------------------------------------------ + +/** + * Timezones + * + * Returns an array of timezones. This is a helper function + * for varios other ones in this library + * + * @access public + * @param string timezone + * @return string + */ +function timezones($tz = '') +{ + // Note: Don't change the order of these even though + // some items appear to be in the wrong order + + $zones = array( + 'UM12' => -12, + 'UM11' => -11, + 'UM10' => -10, + 'UM9' => -9, + 'UM8' => -8, + 'UM7' => -7, + 'UM6' => -6, + 'UM5' => -5, + 'UM4' => -4, + 'UM25' => -2.5, + 'UM3' => -3, + 'UM2' => -2, + 'UM1' => -1, + 'UTC' => 0, + 'UP1' => +1, + 'UP2' => +2, + 'UP3' => +3, + 'UP25' => +2.5, + 'UP4' => +4, + 'UP35' => +3.5, + 'UP5' => +5, + 'UP45' => +4.5, + 'UP6' => +6, + 'UP7' => +7, + 'UP8' => +8, + 'UP9' => +9, + 'UP85' => +8.5, + 'UP10' => +10, + 'UP11' => +11, + 'UP12' => +12 + ); + + if ($tz == '') + { + return $zones; + } + + if ($tz == 'GMT') + $tz = 'UTC'; + + return ( ! isset($zones[$tz])) ? 0 : $zones[$tz]; +} + + +?> \ No newline at end of file diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php new file mode 100644 index 00000000..69eb13d1 --- /dev/null +++ b/system/helpers/directory_helper.php @@ -0,0 +1,69 @@ + \ No newline at end of file diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php new file mode 100644 index 00000000..93bddb02 --- /dev/null +++ b/system/helpers/file_helper.php @@ -0,0 +1,139 @@ + 0) + { + $data = fread($fp, filesize($file)); + } + + flock($fp, LOCK_UN); + fclose($fp); + + return $data; +} + +// ------------------------------------------------------------------------ + +/** + * Write File + * + * Writes data to the file specified in the path. + * Creats a new file if non-existant. + * + * @access public + * @param string path to file + * @param string file data + * @return bool + */ +function write_file($path, $data) +{ + if ( ! $fp = @fopen($path, 'wb')) + { + return FALSE; + } + + flock($fp, LOCK_EX); + fwrite($fp, $data); + flock($fp, LOCK_UN); + fclose($fp); + + return TRUE; +} + +// ------------------------------------------------------------------------ + +/** + * Delete Files + * + * Deletes all files contained in the supplied directory path. + * Files must be writable or owned by the system in order to be deleted. + * If the second parameter is set to TRUE, any direcotries contained + * within the supplied base directory will be nuked as well. + * + * @access public + * @param string path to file + * @param bool whether to delete any directories found in the path + * @return bool + */ +function delete_files($path, $del_dir = FALSE) +{ + // Trim the trailing slahs + $path = preg_replace("|^(.+?)/*$|", "\\1", $path); + + if ( ! $current_dir = @opendir($path)) + return; + + while(FALSE !== ($filename = @readdir($current_dir))) + { + if ($filename != "." and $filename != "..") + { + if (is_dir($path.'/'.$filename)) + { + delete_files($path.'/'.$filename, $del_dir); + } + else + { + unlink($path.'/'.$filename); + } + } + } + @closedir($current_dir); + + if ($del_dir == TRUE) + { + @rmdir($path); + } +} + + +?> \ No newline at end of file diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php new file mode 100644 index 00000000..f82ad01a --- /dev/null +++ b/system/helpers/form_helper.php @@ -0,0 +1,382 @@ +config->site_url($action).'"'; + + if (is_array($attributes) AND count($attributes) > 0) + { + foreach ($attributes as $key => $val) + { + $form .= ' '.$key.'="'.$val.'"'; + } + } + + $form .= '>'; + + if (is_array($hidden) AND count($hidden > 0)) + { + $form .= form_hidden($hidden); + } + + return $form; +} + +// ------------------------------------------------------------------------ + +/** + * Form Declaration - Multipart type + * + * Creates the opening portion of the form, but with "multipart/form-data". + * + * @access public + * @param string the URI segments of the form destination + * @param array a key/value pair of attributes + * @param array a key/value pair hidden data + * @return string + */ +function form_open_multipart($action, $attributes = array(), $hidden = array()) +{ + $attributes['enctype'] = 'multipart/form-data'; + return form_open($action, $attributes, $hidden); +} + +// ------------------------------------------------------------------------ + +/** + * Hidden Input Field + * + * Generates hidden fields. You can pass a simple key/value string or an associative + * array with multiple values. + * + * @access public + * @param mixed + * @param string + * @return string + */ +function form_hidden($name, $value = '') +{ + if ( ! is_array($name)) + { + return ''; + } + + $form = ''; + foreach ($name as $name => $value) + { + $form .= ''; + } + + return $form; +} + +// ------------------------------------------------------------------------ + +/** + * Text Input Field + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_input($data = '', $value = '', $extra = '') +{ + $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value, 'maxlength' => '500', 'size' => '50'); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Password Field + * + * Identical to the input function but adds the "password" type + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_password($data = '', $value = '', $extra = '') +{ + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'password'; + return form_input($data, $value, $extra); +} + +// ------------------------------------------------------------------------ + +/** + * Upload Field + * + * Identical to the input function but adds the "file" type + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_upload($data = '', $value = '', $extra = '') +{ + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'file'; + return form_input($data, $value, $extra); +} + +// ------------------------------------------------------------------------ + +/** + * Textarea field + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_textarea($data = '', $value = '', $extra = '') +{ + $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); + + $val = (( ! is_array($data) OR ! isset($data['value'])) ? $value : $data['value']); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Dropdown Menu + * + * @access public + * @param string + * @param array + * @param string + * @param string + * @return string + */ +function form_dropdown($name = '', $options = array(), $selected = '', $extra = '') +{ + if ($extra != '') $extra = ' '.$extra; + + $form = ''; + + return $form; +} + +// ------------------------------------------------------------------------ + +/** + * Checkbox Field + * + * @access public + * @param mixed + * @param string + * @param bool + * @param string + * @return string + */ +function form_checkbox($data = '', $value = '', $checked = TRUE, $extra = '') +{ + $defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + if (isset($data['checked'])) + { + $checked = $data['checked']; + + if ($checked == FALSE) + unset($data['checked']); + } + + if ($checked == TRUE) + $defaults['checked'] = ' checked="checked"'; + else + unset($defaults['checked']); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Radio Button + * + * @access public + * @param mixed + * @param string + * @param bool + * @param string + * @return string + */ +function form_radio($data = '', $value = '', $checked = TRUE, $extra = '') +{ + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'radio'; + return form_checkbox($data, $value, $checked, $extra); +} + +// ------------------------------------------------------------------------ + +/** + * Submit Button + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_submit($data = '', $value = '', $extra = '') +{ + $defaults = array('type' => 'submit', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Form Close Tag + * + * @access public + * @param string + * @return string + */ +function form_close($extra = '') +{ + return "\n".$extra; +} + +// ------------------------------------------------------------------------ + +/** + * Form Prep + * + * Formats text so that it can be safely placed in a form field in the event it has HTML tags. + * + * @access public + * @param string + * @return string + */ +function form_prep($str = '') +{ + if ($str == '') + { + return ''; + } + + return str_replace(array("'", '"'), array("'", """), htmlspecialchars($str)); +} + +// ------------------------------------------------------------------------ + +/** + * Parse the form attributes + * + * Helper function used by some of the form helpers + * + * @access private + * @param array + * @parm array + * @return string + */ +function parse_form_attributes($attributes, $default) +{ + if (is_array($attributes)) + { + foreach ($default as $key => $val) + { + if (isset($attributes[$key])) + { + $default[$key] = $attributes[$key]; + unset($attributes[$key]); + } + } + + if (count($attributes) > 0) + { + $default = array_merge($default, $attributes); + } + } + + $att = ''; + foreach ($default as $key => $val) + { + if ($key == 'value') + { + $val = form_prep($val); + } + + $att .= $key . '="' . $val . '" '; + } + + return $att; +} + +?> \ No newline at end of file diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php new file mode 100644 index 00000000..1c97dda5 --- /dev/null +++ b/system/helpers/html_helper.php @@ -0,0 +1,76 @@ +".$data.""; +} + +// ------------------------------------------------------------------------ + +/** + * Generates HTML BR tags based on number supplied + * + * @access public + * @param integer + * @return string + */ +function br($num = 1) +{ + return str_repeat("
", $num); +} + +// ------------------------------------------------------------------------ + +/** + * Generates non-breaking space entities based on number supplied + * + * @access public + * @param integer + * @return string + */ +function nbs($num = 1) +{ + return str_repeat(" ", $num); +} + + + +?> \ No newline at end of file diff --git a/system/helpers/index.html b/system/helpers/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/helpers/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

Directory access is forbidden.

+ + + + \ No newline at end of file diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php new file mode 100644 index 00000000..918e4ae9 --- /dev/null +++ b/system/helpers/security_helper.php @@ -0,0 +1,112 @@ +input->xss_clean($str, $charset); +} + +// -------------------------------------------------------------------- + +/** + * Hash encode a string + * + * @access public + * @param string + * @return string + */ +function hash($str, $type = 'sha1') +{ + if ($type == 'sha1') + { + if ( ! function_exists('sha1')) + { + if ( ! function_exists('mhash')) + { + require_once(BASEPATH.'libraries/Sha1'.EXT); + $SH = new CI_SHA; + return $SH->generate($str); + } + else + { + return bin2hex(mhash(MHASH_SHA1, $str)); + } + } + else + { + return sha1($str); + } + } + else + { + return md5($str); + } +} + +// ------------------------------------------------------------------------ + +/** + * Strip Image Tags + * + * @access public + * @parm string + * @return string + */ +function strip_image_tags($str) +{ + $str = preg_replace("##", "\\1", $str); + $str = preg_replace("##", "\\1", $str); + + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Convert PHP tags to entities + * + * @access public + * @parm string + * @return string + */ +function encode_php_tags($str) +{ + return str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); +} + +?> \ No newline at end of file diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php new file mode 100644 index 00000000..d5a3591f --- /dev/null +++ b/system/helpers/string_helper.php @@ -0,0 +1,154 @@ + \ No newline at end of file diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php new file mode 100644 index 00000000..15b5573b --- /dev/null +++ b/system/helpers/text_helper.php @@ -0,0 +1,386 @@ += $n) + { + return trim($out).$end_char; + } + } +} + +// ------------------------------------------------------------------------ + +/** + * High ASCII to Entities + * + * Converts High ascii text and MS Word special characters to character entities + * + * @access public + * @param string + * @return string + */ +function ascii_to_entities($str) +{ + $count = 1; + $out = ''; + $temp = array(); + + for ($i = 0, $s = strlen($str); $i < $s; $i++) + { + $ordinal = ord($str[$i]); + + if ($ordinal < 128) + { + $out .= $str[$i]; + } + else + { + if (count($temp) == 0) + { + $count = ($ordinal < 224) ? 2 : 3; + } + + $temp[] = $ordinal; + + if (count($temp) == $count) + { + $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64); + + $out .= '&#'.$number.';'; + $count = 1; + $temp = array(); + } + } + } + + return $out; +} + +// ------------------------------------------------------------------------ + +/** + * Entities to ASCII + * + * Converts character entities back to ASCII + * + * @access public + * @param string + * @param bool + * @return string + */ +function entities_to_ascii($str, $all = TRUE) +{ + if (preg_match_all('/\&#(\d+)\;/', $str, $matches)) + { + for ($i = 0, $s = count($matches['0']); $i < $s; $i++) + { + $digits = $matches['1'][$i]; + + $out = ''; + + if ($digits < 128) + { + $out .= chr($digits); + + } + elseif ($digits < 2048) + { + $out .= chr(192 + (($digits - ($digits % 64)) / 64)); + $out .= chr(128 + ($digits % 64)); + } + else + { + $out .= chr(224 + (($digits - ($digits % 4096)) / 4096)); + $out .= chr(128 + ((($digits % 4096) - ($digits % 64)) / 64)); + $out .= chr(128 + ($digits % 64)); + } + + $str = str_replace($matches['0'][$i], $out, $str); + } + } + + if ($all) + { + $str = str_replace(array("&", "<", ">", """, "'", "-"), + array("&","<",">","\"", "'", "-"), + $str); + } + + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Word Censoring Function + * + * Supply a string and an array of disallowed words and any + * matched words will be converted to #### or to the replacement + * word you've submitted. + * + * @access public + * @param string the text string + * @param string the array of censoered words + * @param string the optional replacement value + * @return string + */ +function word_censor($str, $censored, $replacement = '') +{ + if ( ! is_array($censored)) + { + return $str; + } + + $str = ' '.$str.' '; + foreach ($censored as $badword) + { + if ($replacement != '') + { + $str = preg_replace("/\b(".str_replace('\*', '\w*?', preg_quote($badword)).")\b/i", $replacement, $str); + } + else + { + $str = preg_replace("/\b(".str_replace('\*', '\w*?', preg_quote($badword)).")\b/ie", "str_repeat('#', strlen('\\1'))", $str); + } + } + + return trim($str); +} + +// ------------------------------------------------------------------------ + +/** + * Code Highlighter + * + * Colorizes code strings + * + * @access public + * @param string the text string + * @return string + */ +function highlight_code($str) +{ + // The highlight string function encodes and highlights + // brackets so we need them to start raw + $str = str_replace(array('<', '>'), array('<', '>'), $str); + + // Replace any existing PHP tags to temporary markers so they don't accidentally + // break the string out of PHP, and thus, thwart the highlighting. + + $str = str_replace(array('<?php', '?>', '\\'), array('phptagopen', 'phptagclose', 'backslashtmp'), $str); + + // The highlight_string function requires that the text be surrounded + // by PHP tags. Since we don't know if A) the submitted text has PHP tags, + // or B) whether the PHP tags enclose the entire string, we will add our + // own PHP tags around the string along with some markers to make replacement easier later + + $str = ''; // '), array(''), $str); + $str = preg_replace('#color="(.*?)"#', 'style="color: \\1"', $str); + } + + // Remove our artificially added PHP + $str = preg_replace("#\.+?//tempstart\
\#is", "\n", $str); + $str = preg_replace("#\.+?//tempstart\
#is", "\n", $str); + $str = preg_replace("#//tempend.+#is", "\n", $str); + + // Replace our markers back to PHP tags. + $str = str_replace(array('phptagopen', 'phptagclose', 'backslashtmp'), array('<?php', '?>', '\\'), $str); //', $tag_close = '') +{ + if ($str == '') + { + return ''; + } + + if ($phrase != '') + { + return preg_replace('/('.preg_quote($phrase).')/i', $tag_open."\\1".$tag_close, $str); + } + + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Word Wrap + * + * Wraps text at the specified character. Maintains the integrity of words. + * + * @access public + * @param string the text string + * @param integer the number of characters to wrap at + * @return string + */ +function word_wrap($str, $chars = '76') +{ + if ( ! ctype_digit($chars)) + $chars = 76; + + $str = preg_replace("/(\r\n|\r|\n)/", "\n", $str); + $lines = split("\n", $str); + + $output = ""; + while (list(, $thisline) = each($lines)) + { + if (strlen($thisline) > $chars) + { + $line = ""; + $words = split(" ", $thisline); + while(list(, $thisword) = each($words)) + { + while((strlen($thisword)) > $chars) + { + $cur_pos = 0; + for($i=0; $i < $chars - 1; $i++) + { + $output .= $thisword[$i]; + $cur_pos++; + } + + $output .= "\n"; + $thisword = substr($thisword, $cur_pos, (strlen($thisword) - $cur_pos)); + } + + if ((strlen($line) + strlen($thisword)) > $chars) + { + $output .= $line."\n"; + $line = $thisword." "; + } + else + { + $line .= $thisword." "; + } + } + + $output .= $line."\n"; + } + else + { + $output .= $thisline."\n"; + } + } + + return $output; +} + +?> \ No newline at end of file diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php new file mode 100644 index 00000000..6a549523 --- /dev/null +++ b/system/helpers/typography_helper.php @@ -0,0 +1,490 @@ +",$str); + $ct = count($ex); + + $newstr = ""; + for ($i = 0; $i < $ct; $i++) + { + if (($i % 2) == 0) + { + $newstr .= nl2br($ex[$i]); + } + else + { + $newstr .= $ex[$i]; + } + + if ($ct - 1 != $i) + $newstr .= "pre>"; + } + + return $newstr; +} + +// ------------------------------------------------------------------------ + +/** + * Auto Typography Wrapper Function + * + * + * @access public + * @parm string + * @return string + */ +function auto_typography($str) +{ + $TYPE = new Auto_typography(); + return $TYPE->convert($str); +} + +// ------------------------------------------------------------------------ + +/** + * Auto Typography Class + * + * + * @access private + * @category Helpers + * @author Rick Ellis + * @author Paul Burdick + * @link http://www.codeigniter.com/user_guide/helpers/ + */ +class Auto_typography { + + // Block level elements that should not be wrapped inside

tags + var $block_elements = 'div|blockquote|pre|code|h\d|script|ol|un'; + + // Elements that should not have

and
tags within them. + var $skip_elements = 'pre|ol|ul'; + + // Tags we want the parser to completely ignore when splitting the string. + var $ignore_elements = 'a|b|i|em|strong|span|img|li'; + + + /** + * Main Processing Function + * + */ + function convert($str) + { + if ($str == '') + { + return ''; + } + + $str = ' '.$str.' '; + + // Standardize Newlines to make matching easier + $str = preg_replace("/(\r\n|\r)/", "\n", $str); + + /* + * Reduce line breaks + * + * If there are more than two consecutive line + * breaks we'll compress them down to a maximum + * of two since there's no benefit to more. + * + */ + $str = preg_replace("/\n\n+/", "\n\n", $str); + + /* + * Convert quotes within tags to tempoarary marker + * + * We don't want quotes converted within + * tags so we'll temporarily convert them to + * {{{DQ}}} and {{{SQ}}} + * + */ + if (preg_match_all("#\<.+?>#si", $str, $matches)) + { + for ($i = 0; $i < count($matches['0']); $i++) + { + $str = str_replace($matches['0'][$i], + str_replace(array("'",'"'), array('{{{SQ}}}', '{{{DQ}}}'), $matches['0'][$i]), + $str); + } + } + + /* + * Convert "ignore" tags to tempoarary marker + * + * The parser splits out the string at every tag + * it encounters. Certain inline tags, like image + * tags, links, span tags, etc. will be adversely + * affected if they are split out so we'll convert + * the opening < temporarily to: {{{tag}}} + * + */ + $str = preg_replace("#<(/*)(".$this->ignore_elements.")#i", "{{{tag}}}\\1\\2", $str); + + /* + * Split the string at every tag + * + * This creates an array with this prototype: + * + * [array] + * { + * [0] = + * [1] = Content contained between the tags + * [2] = + * Etc... + * } + * + */ + $chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY); + + /* + * Build our finalized string + * + * We'll cycle through the array, skipping tags, + * and processing the contained text + * + */ + $str = ''; + $process = TRUE; + foreach ($chunks as $chunk) + { + /* + * Are we dealing with a tag? + * + * If so, we'll skip the processing for this cycle. + * Well also set the "process" flag which allows us + * to skip 

 tags and a few other things.
+			 *
+			 */			
+			if (preg_match("#<(/*)(".$this->block_elements.").*?\>#", $chunk, $match)) 
+			{
+				if (preg_match("#".$this->skip_elements."#", $match['2']))
+				{
+					$process =  ($match['1'] == '/') ? TRUE : FALSE;		
+				}
+		
+				$str .= $chunk;
+				continue;
+			}
+		
+			if ($process == FALSE)
+			{
+				$str .= $chunk;
+				continue;
+			}
+			
+			//  Convert Newlines into 
 and 
 tags
+			$str .= $this->format_newlines($chunk);
+		}
+
+		// Convert Quotes and other characters
+		$str = $this->format_characters($str);
+
+		//  We'll swap our temporary markers back and do some clean up.
+		$str = preg_replace('#(
\n*
)#', '', $str);
+		$str = preg_replace('#()
#', "\\1", $str);
+		
+		$str = str_replace(
+							array('
', '
', '{{{tag}}}', '{{{DQ}}}', '{{{SQ}}}'), 
+							array('
', '
', '<', '"', "'"), 
+							$str
+							);
+		
+		return trim($str);
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Format Characters
+	 *
+	 * This function mainly converts double and single quotes
+	 * to entities, but since these are directional, it does
+	 * it based on some rules.  It also converts em-dashes
+	 * and a couple other things.
+	 */
+	function format_characters($str)
+	{	
+		$table = array(
+						' "'		=> " “",
+						'" '		=> "” ",
+						" '"		=> " ‘",
+						"' "		=> "’ ",
+						
+						'>"'		=> ">“",
+						'"<'		=> "”<",
+						">'"		=> ">‘",
+						"'<"		=> "’<",
+
+						"\"."		=> "”.",
+						"\","		=> "”,",
+						"\";"		=> "”;",
+						"\":"		=> "”:",
+						"\"!"		=> "”!",
+						"\"?"		=> "”?",
+						
+						".  "		=> ".  ",
+						"?  "		=> "?  ",
+						"!  "		=> "!  ",
+						":  "		=> ":  ",
+					);
+
+		// These deal with quotes within quotes, like:  "'hi here'"
+		$start = 0;
+		$space = array("\n", "\t", " ");
+		
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), "\"'");
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+2, 1);
+			
+			if ( ! in_array($one_after, $space) && $one_after != "<")
+			{
+				$str = str_replace(	$one_before."\"'".$one_after,
+									$one_before."“‘".$one_after,
+									$str);
+			}
+			elseif ( ! in_array($one_before, $space) && (in_array($one_after, $space) OR $one_after == '<'))
+			{
+				$str = str_replace(	$one_before."\"'".$one_after,
+									$one_before."”’".$one_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+		
+		$start = 0;
+		
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), "'\"");
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+2, 1);
+			
+			if ( in_array($one_before, $space) && ! in_array($one_after, $space) && $one_after != "<")
+			{
+				$str = str_replace(	$one_before."'\"".$one_after,
+									$one_before."‘“".$one_after,
+									$str);
+			}
+			elseif ( ! in_array($one_before, $space) && $one_before != ">")
+			{
+				$str = str_replace(	$one_before."'\"".$one_after,
+									$one_before."’”".$one_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+		
+		// Are there quotes within a word, as in:  ("something")
+		if (preg_match_all("/(.)\"(\S+?)\"(.)/", $str, $matches))
+		{
+			for ($i=0, $s=sizeof($matches['0']); $i < $s; ++$i)
+			{
+				if ( ! in_array($matches['1'][$i], $space) && ! in_array($matches['3'][$i], $space))
+				{
+					$str = str_replace(	$matches['0'][$i],
+										$matches['1'][$i]."“".$matches['2'][$i]."”".$matches['3'][$i],
+										$str);
+				}
+			}
+		}
+		
+		if (preg_match_all("/(.)\'(\S+?)\'(.)/", $str, $matches))
+		{
+			for ($i=0, $s=sizeof($matches['0']); $i < $s; ++$i)
+			{
+				if ( ! in_array($matches['1'][$i], $space) && ! in_array($matches['3'][$i], $space))
+				{
+					$str = str_replace(	$matches['0'][$i],
+										$matches['1'][$i]."‘".$matches['2'][$i]."’".$matches['3'][$i],
+										$str);
+				}
+			}
+		}
+		
+		// How about one apostrophe, as in Rick's
+		$start = 0;
+		
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), "'");
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+1, 1);
+			
+			if ( ! in_array($one_before, $space) && ! in_array($one_after, $space))
+			{
+				$str = str_replace(	$one_before."'".$one_after,
+									$one_before."’".$one_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+
+		// Em-dashes
+		$start = 0;
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), "--");
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+2, 1);
+			$two_before = substr($str, $start+$current-2, 1);
+			$two_after = substr($str, $start+$current+3, 1);
+			
+			if (( ! in_array($one_before, $space) && ! in_array($one_after, $space))
+				OR
+				( ! in_array($two_before, $space) && ! in_array($two_after, $space) && $one_before == ' ' && $one_after == ' ')
+				)
+			{
+				$str = str_replace(	$two_before.$one_before."--".$one_after.$two_after,
+									$two_before.trim($one_before)."—".trim($one_after).$two_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+		
+		// Ellipsis
+		$str = preg_replace("#(\w)\.\.\.(\s|
|
)#", "\\1…\\2", $str); 
+		$str = preg_replace("#(\s|
|
)\.\.\.(\w)#", "\\1…\\2", $str); 
+		
+		// Run the translation array we defined above		
+		$str = str_replace(array_keys($table), array_values($table), $str);
+		
+		// If there are any stray double quotes we'll catch them here
+		
+		$start = 0;
+		
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), '"');
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+1, 1);
+			
+			if ( ! in_array($one_after, $space))
+			{
+				$str = str_replace(	$one_before.'"'.$one_after,
+									$one_before."“".$one_after,
+									$str);
+			}
+			elseif( ! in_array($one_before, $space))
+			{
+				$str = str_replace(	$one_before."'".$one_after,
+									$one_before."”".$one_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+		
+		$start = 0;
+		
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), "'");
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+1, 1);
+			
+			if ( ! in_array($one_after, $space))
+			{
+				$str = str_replace(	$one_before."'".$one_after,
+									$one_before."‘".$one_after,
+									$str);
+			}
+			elseif( ! in_array($one_before, $space))
+			{
+				$str = str_replace(	$one_before."'".$one_after,
+									$one_before."’".$one_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+		
+		return $str;
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Format Newlines
+	 *
+	 * Converts newline characters into either 
 tags or 

+	 *
+	 */	
+	function format_newlines($str)
+	{
+		if ($str == '')
+		{
+			return $str;
+		}
+
+		if (strpos($str, "\n") === FALSE)
+		{
+			return '
'.$str.'
';
+		}
+			
+		$str = str_replace("\n\n", "
\n\n
", $str);
+		$str = preg_replace("/([^\n])(\n)([^\n])/", "\\1
\\2\\3", $str);
+		
+		return '
'.$str.'
';
+	}	
+}
+
+ 
+?>
\ No newline at end of file
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
new file mode 100644
index 00000000..d2d2a598
--- /dev/null
+++ b/system/helpers/url_helper.php
@@ -0,0 +1,487 @@
+config->site_url($uri);
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Base URL
+ *
+ * Returns the "base_url" item from your config file
+ *
+ * @access	public
+ * @return	string
+ */	
+function base_url()
+{ 
+	$obj =& get_instance();
+	return $obj->config->item('base_url', 1);
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Index page
+ *
+ * Returns the "index_page" from your config file
+ *
+ * @access	public
+ * @return	string
+ */	
+function index_page()
+{ 
+	$obj =& get_instance();
+	return $obj->config->item('index_page');
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Anchor Link
+ *
+ * Creates an anchor based on the local URL.
+ *
+ * @access	public
+ * @param	string	the URL
+ * @param	string	the link title
+ * @param	mixed	any attributes
+ * @return	string
+ */	
+function anchor($uri = '', $title = '', $attributes = '')
+{
+	$site_url = site_url($uri);
+	
+	if ($title == '')
+	{
+		$title = $site_url;
+	}
+
+	if ($attributes == '')
+	{
+		$attributes = ' title="'.$title.'"';
+	}
+	else
+	{
+		if (is_array($attributes))
+		{
+			$attributes = parse_url_attributes($attributes);
+		}
+	}
+
+	return ''.$title.'';
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Anchor Link - Pop-up version
+ *
+ * Creates an anchor based on the local URL. The link
+ * opens a new window based on the attributes specified.
+ *
+ * @access	public
+ * @param	string	the URL
+ * @param	string	the link title
+ * @param	mixed	any attributes
+ * @return	string
+ */
+function anchor_popup($uri = '', $title = '', $attributes = FALSE)
+{	
+	$site_url = site_url($uri);
+	
+	if ($title == '')
+	{
+		$title = $site_url;
+	}
+	
+	if ($attributes === FALSE)
+	{
+		return "".$title."";
+	}
+	
+	if ( ! is_array($attributes))
+	{
+		$attributes = array();
+	}
+		
+	foreach (array('width' => '800', 'height' => '600', 'scrollbars' => 'yes', 'status' => 'yes', 'resizable' => 'yes', 'screenx' => '0', 'screeny' => '0', ) as $key => $val)
+	{
+		$atts[$key] = ( ! isset($attributes[$key])) ? $val : $attributes[$key];
+	}
+
+	return "".$title."";
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Mailto Link
+ *
+ * @access	public
+ * @param	string	the email address
+ * @param	string	the link title
+ * @param	mixed 	any attributes
+ * @return	string
+ */
+function mailto($email, $title = '', $attributes = '')
+{
+	if ($title == "") 
+	{
+		$title = $email;
+	}
+	
+	if (is_array($attributes))
+	{
+		$attributes = parse_url_attributes($attributes);
+	}
+	
+	return ''.$title.'';
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Encoded Mailto Link
+ *
+ * Create a spam-protected mailto link written in Javascript
+ *
+ * @access	public
+ * @param	string	the email address
+ * @param	string	the link title
+ * @param	mixed 	any attributes
+ * @return	string
+ */
+function safe_mailto($email, $title = '', $attributes = '')
+{
+	if ($title == "") 
+	{
+		$title = $email;
+	}
+					
+	for ($i = 0; $i < 16; $i++)
+	{
+		$x[] = substr(' $val)
+			{
+				$x[] =  ' '.$key.'="';
+				for ($i = 0; $i < strlen($val); $i++)
+				{
+					$x[] = "|".ord(substr($val, $i, 1));
+				}
+				$x[] = '"';
+			}
+		}
+		else
+		{	
+			for ($i = 0; $i < strlen($attributes); $i++)
+			{
+				$x[] = substr($attributes, $i, 1);
+			}
+		}
+	}	
+	
+	$x[] = '>';
+	
+	$temp = array();
+	for ($i = 0; $i < strlen($title); $i++)
+	{
+		$ordinal = ord($title[$i]);
+	
+		if ($ordinal < 128)
+		{
+			$x[] = "|".$ordinal;            
+		}
+		else
+		{
+			if (count($temp) == 0)
+			{
+				$count = ($ordinal < 224) ? 2 : 3;
+			}
+		
+			$temp[] = $ordinal;
+			if (count($temp) == $count)
+			{
+				$number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64);
+				$x[] = "|".$number;
+				$count = 1;
+				$temp = array();
+			}   
+		}
+	}
+	
+	$x[] = '<'; $x[] = '/'; $x[] = 'a'; $x[] = '>';
+	
+	$x = array_reverse($x);
+	ob_start();
+	
+?>http'.
+									$matches['4'][$i].'://'.
+									$matches['5'][$i].
+									$matches['6'][$i].''.
+									$period, $str);
+			}
+		}
+	}
+
+	if ($type != 'url')
+	{	
+		if (preg_match_all("/([a-zA-Z0-9_\.\-]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)/i", $str, $matches))
+		{
+			for ($i = 0; $i < sizeof($matches['0']); $i++)
+			{
+				$period = '';
+				if (preg_match("|\.$|", $matches['3'][$i]))
+				{
+					$period = '.';
+					$matches['3'][$i] = substr($matches['3'][$i], 0, -1);
+				}
+			
+				$str = str_replace($matches['0'][$i], safe_mailto($matches['1'][$i].'@'.$matches['2'][$i].'.'.$matches['3'][$i]).$period, $str);
+			}
+		
+		}
+	}
+	return $str;
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Prep URL
+ *
+ * Simply adds the http:// part if missing
+ *
+ * @access	public
+ * @param	string	the URL
+ * @return	string
+ */
+function prep_url($str = '')
+{
+	if ($str == 'http://' OR $str == '')
+	{
+		return '';
+	}
+	
+	if (substr($str, 0, 7) != 'http://' && substr($str, 0, 8) != 'https://')
+	{
+		$str = 'http://'.$str;
+	}
+	
+	return $str;
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Create URL Title
+ *
+ * Takes a "title" string as input and creates a
+ * human-friendly URL string with either a dash
+ * or an underscore as the word separator.
+ *
+ * @access	public
+ * @param	string	the string
+ * @param	string	the separator: dash, or underscore
+ * @return	string
+ */
+function url_title($str, $separator = 'dash')
+{
+	if ($separator == 'dash')
+	{
+		$search		= '_';
+		$replace	= '-';
+	}
+	else
+	{
+		$search		= '-';
+		$replace	= '_';
+	}
+		
+	$trans = array(
+					$search								=> $replace,
+					"\s+"								=> $replace,
+					"[^a-z0-9".$replace."]"				=> '',
+					$replace."+"						=> $replace,
+					$replace."$"						=> '',
+					"^".$replace						=> ''
+				   );
+
+	$str = strip_tags(strtolower($str));
+	
+	foreach ($trans as $key => $val)
+	{
+		$str = preg_replace("#".$key."#", $val, $str);
+	} 
+	
+	return trim(stripslashes($str));
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Header Redirect
+ *
+ * Header redirect in two flavors
+ *
+ * @access	public
+ * @param	string	the URL
+ * @param	string	the method: location or redirect
+ * @return	string
+ */
+function redirect($uri = '', $method = 'location')
+{  
+	switch($method)
+	{
+		case 'refresh' : header("Refresh:0;url=".site_url($uri));
+			break;
+		default        : header("location:".site_url($uri));
+			break;
+	}
+	exit;
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Parse out the attributes
+ *
+ * Some of the functions use this
+ *
+ * @access	private
+ * @param	array
+ * @param	bool
+ * @return	string
+ */
+function parse_url_attributes($attributes, $javascript = FALSE)
+{
+	$att = '';
+	foreach ($attributes as $key => $val)
+	{
+		if ($javascript == TRUE)
+		{
+			$att .= $key . '=' . $val . ',';
+		}
+		else
+		{
+			$att .= ' ' . $key . '="' . $val . '"';
+		}
+	}
+	
+	if ($javascript == TRUE)
+	{
+		$att = substr($att, 0, -1);
+	}
+	
+	return $att;
+}
+
+?>
\ No newline at end of file
diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php
new file mode 100644
index 00000000..ee3fc289
--- /dev/null
+++ b/system/helpers/xml_helper.php
@@ -0,0 +1,55 @@
+","\"", "'", "-"),
+					   array("&", "<", ">", """, "'", "-"),
+					   $str);
+		
+	$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
+	$str = preg_replace("/$temp(\w+);/","&\\1;", $str);
+		
+	return $str;
+}    
+
+
+?>
\ No newline at end of file
diff --git a/system/init/index.html b/system/init/index.html
new file mode 100644
index 00000000..5a1f5d6a
--- /dev/null
+++ b/system/init/index.html
@@ -0,0 +1,15 @@
+
+
+
+
+403 Forbidden
+
+
+
+
+
+
Directory access is forbidden.

+
+
+
+
\ No newline at end of file
diff --git a/system/init/init_calendar.php b/system/init/init_calendar.php
new file mode 100644
index 00000000..5cf66372
--- /dev/null
+++ b/system/init/init_calendar.php
@@ -0,0 +1,19 @@
+calendar = new CI_Calendar();
+$obj->ci_is_loaded[] = 'calendar';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_email.php b/system/init/init_email.php
new file mode 100644
index 00000000..6782310e
--- /dev/null
+++ b/system/init/init_email.php
@@ -0,0 +1,24 @@
+email = new CI_Email($config);
+$obj->ci_is_loaded[] = 'email';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_encrypt.php b/system/init/init_encrypt.php
new file mode 100644
index 00000000..5eae533b
--- /dev/null
+++ b/system/init/init_encrypt.php
@@ -0,0 +1,18 @@
+encrypt = new CI_Encrypt();
+$obj->ci_is_loaded[] = 'encrypt';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_image_lib.php b/system/init/init_image_lib.php
new file mode 100644
index 00000000..dcd702f0
--- /dev/null
+++ b/system/init/init_image_lib.php
@@ -0,0 +1,24 @@
+image_lib = new CI_Image_lib($config);	
+$obj->ci_is_loaded[] = 'image_lib';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_pagination.php b/system/init/init_pagination.php
new file mode 100644
index 00000000..3a7d9361
--- /dev/null
+++ b/system/init/init_pagination.php
@@ -0,0 +1,24 @@
+pagination = new CI_Pagination($config);
+$obj->ci_is_loaded[] = 'pagination';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_parser.php b/system/init/init_parser.php
new file mode 100644
index 00000000..17824b56
--- /dev/null
+++ b/system/init/init_parser.php
@@ -0,0 +1,19 @@
+parser = new CI_Parser();
+$obj->ci_is_loaded[] = 'parser';
+
+
+?>
\ No newline at end of file
diff --git a/system/init/init_session.php b/system/init/init_session.php
new file mode 100644
index 00000000..cf493e53
--- /dev/null
+++ b/system/init/init_session.php
@@ -0,0 +1,18 @@
+session = new CI_Session();
+$obj->ci_is_loaded[] = 'session';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_trackback.php b/system/init/init_trackback.php
new file mode 100644
index 00000000..6a3778bc
--- /dev/null
+++ b/system/init/init_trackback.php
@@ -0,0 +1,18 @@
+trackback = new CI_Trackback();
+$obj->ci_is_loaded[] = 'trackback';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_unit_test.php b/system/init/init_unit_test.php
new file mode 100644
index 00000000..61d5350b
--- /dev/null
+++ b/system/init/init_unit_test.php
@@ -0,0 +1,18 @@
+unit = new CI_Unit_test();
+$obj->ci_is_loaded[] = 'unit';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_upload.php b/system/init/init_upload.php
new file mode 100644
index 00000000..495975c7
--- /dev/null
+++ b/system/init/init_upload.php
@@ -0,0 +1,24 @@
+upload = new CI_Upload($config);
+$obj->ci_is_loaded[] = 'upload';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_validation.php b/system/init/init_validation.php
new file mode 100644
index 00000000..a320c3e5
--- /dev/null
+++ b/system/init/init_validation.php
@@ -0,0 +1,18 @@
+validation = new CI_Validation();
+$obj->ci_is_loaded[] = 'validation';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_xmlrpc.php b/system/init/init_xmlrpc.php
new file mode 100644
index 00000000..b75e9aad
--- /dev/null
+++ b/system/init/init_xmlrpc.php
@@ -0,0 +1,24 @@
+xmlrpc = new CI_XML_RPC($config);
+$obj->ci_is_loaded[] = 'xmlrpc';
+
+?>
\ No newline at end of file
diff --git a/system/init/init_xmlrpcs.php b/system/init/init_xmlrpcs.php
new file mode 100644
index 00000000..7566e382
--- /dev/null
+++ b/system/init/init_xmlrpcs.php
@@ -0,0 +1,27 @@
+xmlrpc  = new CI_XML_RPC();
+$obj->xmlrpcs = new CI_XML_RPC_Server($config);
+$obj->ci_is_loaded[] = 'xmlrpc';
+$obj->ci_is_loaded[] = 'xmlrpcs';
+
+?>
\ No newline at end of file
diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php
new file mode 100644
index 00000000..4a399af8
--- /dev/null
+++ b/system/language/english/calendar_lang.php
@@ -0,0 +1,49 @@
+
\ No newline at end of file
diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php
new file mode 100644
index 00000000..02ebe738
--- /dev/null
+++ b/system/language/english/date_lang.php
@@ -0,0 +1,49 @@
+
\ No newline at end of file
diff --git a/system/language/english/db_lang.php b/system/language/english/db_lang.php
new file mode 100644
index 00000000..b210b61b
--- /dev/null
+++ b/system/language/english/db_lang.php
@@ -0,0 +1,15 @@
+
\ No newline at end of file
diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php
new file mode 100644
index 00000000..430ae4ab
--- /dev/null
+++ b/system/language/english/email_lang.php
@@ -0,0 +1,21 @@
+
\ No newline at end of file
diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php
new file mode 100644
index 00000000..68c5804a
--- /dev/null
+++ b/system/language/english/imglib_lang.php
@@ -0,0 +1,21 @@
+
\ No newline at end of file
diff --git a/system/language/english/index.html b/system/language/english/index.html
new file mode 100644
index 00000000..5a1f5d6a
--- /dev/null
+++ b/system/language/english/index.html
@@ -0,0 +1,15 @@
+
+
+
+
+403 Forbidden
+
+
+
+
+
+
Directory access is forbidden.

+
+
+
+
\ No newline at end of file
diff --git a/system/language/english/scaffolding_lang.php b/system/language/english/scaffolding_lang.php
new file mode 100644
index 00000000..96fe167e
--- /dev/null
+++ b/system/language/english/scaffolding_lang.php
@@ -0,0 +1,15 @@
+
\ No newline at end of file
diff --git a/system/language/english/unit_test_lang.php b/system/language/english/unit_test_lang.php
new file mode 100644
index 00000000..b64ea6de
--- /dev/null
+++ b/system/language/english/unit_test_lang.php
@@ -0,0 +1,22 @@
+
\ No newline at end of file
diff --git a/system/language/english/upload_lang.php b/system/language/english/upload_lang.php
new file mode 100644
index 00000000..6837c8ac
--- /dev/null
+++ b/system/language/english/upload_lang.php
@@ -0,0 +1,16 @@
+
\ No newline at end of file
diff --git a/system/language/english/validation_lang.php b/system/language/english/validation_lang.php
new file mode 100644
index 00000000..326fe557
--- /dev/null
+++ b/system/language/english/validation_lang.php
@@ -0,0 +1,15 @@
+
\ No newline at end of file
diff --git a/system/language/index.html b/system/language/index.html
new file mode 100644
index 00000000..5a1f5d6a
--- /dev/null
+++ b/system/language/index.html
@@ -0,0 +1,15 @@
+
+
+
+
+403 Forbidden
+
+
+
+
+
+
Directory access is forbidden.

+
+
+
+
\ No newline at end of file
diff --git a/system/libraries/Benchmark.php b/system/libraries/Benchmark.php
new file mode 100644
index 00000000..9dd9d4ac
--- /dev/null
+++ b/system/libraries/Benchmark.php
@@ -0,0 +1,117 @@
+marker[$name] = microtime();
+    }
+  	// END mark()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Calculates the time difference between two marked points.
+	 *
+	 * If the first parameter is empty this function instead returns the 
+	 * {elapsed_time} pseudo-variable. This permits the the full system 
+	 * execution time to be shown in a template. The output class will
+	 * swap the real value for this variable.
+	 *
+	 * @access	public
+	 * @param	string	a paricular marked point
+	 * @param	string	a paricular marked point
+	 * @param	integer	the number of decimal places
+	 * @return	mixed
+	 */
+    function elapsed_time($point1 = '', $point2 = '', $decimals = 4)
+    {
+    	if ($point1 == '')
+    	{
+			return '{elapsed_time}';
+    	}
+    	    
+    	if ( ! isset($this->marker[$point2]))
+        	$this->marker[$point2] = microtime();
+        	    
+        list($sm, $ss) = explode(' ', $this->marker[$point1]);
+        list($em, $es) = explode(' ', $this->marker[$point2]);
+                        
+        return number_format(($em + $es) - ($sm + $ss), $decimals);
+    }
+ 	// END elapsed_time()
+ 	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Memory Usage
+	 *
+	 * This function returns the {memory_usage} pseudo-variable.
+	 * This permits it to be put it anywhere in a template 
+	 * without the memory being calculated until the end. 
+	 * The output class will swap the real value for this variable.
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function memory_usage()
+	{
+		return '{memory_usage}';
+	}
+	// END memory_usage()
+
+}
+
+// END CI_Benchmark class
+?>
\ No newline at end of file
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
new file mode 100644
index 00000000..013f0679
--- /dev/null
+++ b/system/libraries/Calendar.php
@@ -0,0 +1,473 @@
+obj =& get_instance();
+		if ( ! in_array('calendar_lang'.EXT, $this->obj->lang->is_loaded))
+		{
+			$this->obj->lang->load('calendar');
+		}
+
+		$this->local_time = time();
+		log_message('debug', "Calendar Class Initialized");
+	}
+	// END CI_Calendar()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Initialize the user preferences
+	 *
+	 * Accepts an associative array as input, containing display preferences
+	 *
+	 * @access	public
+	 * @param	array	config preferences
+	 * @return	void
+	 */	
+	function initialize($config = array())
+	{
+		foreach ($config as $key => $val)
+		{
+			if (isset($this->$key))
+			{
+				$this->$key = $val;
+			}
+		}
+	} 
+	// END initialize()
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Generate the calendar
+	 *
+	 * @access	public
+	 * @param	integer	the year
+	 * @param	integer	the month
+	 * @param	array	the data to be shown in the calendar cells
+	 * @return	string
+	 */
+    function generate($year = '', $month = '', $data = array())
+    {
+		// Set and validate the supplied month/year
+    	if ($year == '')
+    		$year  = date("Y", $this->local_time);
+    		
+    	if ($month == '')
+			$month = date("m", $this->local_time);
+			
+ 		if (strlen($year) == 1)
+			$year = '200'.$year;
+		
+ 		if (strlen($year) == 2)
+			$year = '20'.$year;
+
+ 		if (strlen($month) == 1)
+			$month = '0'.$month;
+		
+		$adjusted_date = $this->adjust_date($month, $year);
+		
+		$month	= $adjusted_date['month'];
+		$year	= $adjusted_date['year'];  
+		
+		// Determine the total days in the month
+		$total_days = $this->get_total_days($month, $year); 
+						
+		// Set the starting day of the week
+		$start_days	= array('sunday' => 0, 'monday' => 1, 'tuesday' => 2, 'wednesday' => 3, 'thursday' => 4, 'friday' => 5, 'saturday' => 6);
+		$start_day = ( ! isset($start_days[$this->start_day])) ? 0 : $start_days[$this->start_day];
+		
+		// Set the starting day number
+		$local_date = mktime(12, 0, 0, $month, 1, $year);
+		$date = getdate($local_date);
+		$day  = $start_day + 1 - $date["wday"];
+		
+		while ($day > 1)
+		{
+			$day -= 7;
+		}
+		
+		// Set the current month/year/day
+		// We use this to determine the "today" date
+		$cur_year	= date("Y", $this->local_time);
+		$cur_month	= date("m", $this->local_time);
+		$cur_day	= date("j", $this->local_time);
+		
+		$is_current_month = ($cur_year == $year AND $cur_month == $month) ? TRUE : FALSE;
+	
+		// Generate the template data array
+		$this->parse_template();
+	
+		// Begin building the calendar output						
+		$out = $this->temp['table_open'];
+		$out .= "\n";	
+
+		$out .= "\n";		
+		$out .= $this->temp['heading_row_start'];
+		$out .= "\n";
+		
+		// "previous" month link
+		if ($this->show_next_prev == TRUE)
+		{
+			$adjusted_date = $this->adjust_date($month - 1, $year);
+			$out .= str_replace('{previous_url}', $this->next_prev_url.$adjusted_date['year'].'/'.$adjusted_date['month'], $this->temp['heading_previous_cell']);
+			$out .= "\n";
+		}
+
+		// Heading containing the month/year
+		$colspan = ($this->show_next_prev == TRUE) ? 5 : 7;
+		
+		$this->temp['heading_title_cell'] = str_replace('{colspan}', $colspan, $this->temp['heading_title_cell']);
+		$this->temp['heading_title_cell'] = str_replace('{heading}', $this->get_month_name($month)." ".$year, $this->temp['heading_title_cell']);
+		
+		$out .= $this->temp['heading_title_cell'];
+		$out .= "\n";
+
+		// "next" month link
+		if ($this->show_next_prev == TRUE)
+		{		
+			$adjusted_date = $this->adjust_date($month + 1, $year);
+			$out .= str_replace('{next_url}', $this->next_prev_url.$adjusted_date['year'].'/'.$adjusted_date['month'], $this->temp['heading_next_cell']);
+		}
+
+		$out .= "\n";		
+		$out .= $this->temp['heading_row_end'];
+		$out .= "\n";
+
+		// Write the cells containing the days of the week
+		$out .= "\n";	
+		$out .= $this->temp['week_row_start'];
+		$out .= "\n";
+
+		$day_names = $this->get_day_names();
+
+		for ($i = 0; $i < 7; $i ++)
+		{
+			$out .= str_replace('{week_day}', $day_names[($start_day + $i) %7], $this->temp['week_day_cell']);
+		}
+
+		$out .= "\n";
+		$out .= $this->temp['week_row_end'];
+		$out .= "\n";
+
+		// Build the main body of the calendar        
+		while ($day <= $total_days)
+		{
+			$out .= "\n";
+			$out .= $this->temp['cal_row_start'];
+			$out .= "\n";
+
+			for ($i = 0; $i < 7; $i++)
+			{ 
+				$out .= ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_start_today'] : $this->temp['cal_cell_start'];
+			
+				if ($day > 0 AND $day <= $total_days)
+				{ 					
+					if (isset($data[$day]))
+					{	
+						// Cells with content
+						$temp = ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_content_today'] : $this->temp['cal_cell_content'];
+						$out .= str_replace('{day}', $day, str_replace('{content}', $data[$day], $temp));
+					}
+					else
+					{
+						// Cells with no content
+						$temp = ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_no_content_today'] : $this->temp['cal_cell_no_content'];
+						$out .= str_replace('{day}', $day, $temp);
+					}
+				}
+				else
+				{
+					// Blank cells
+					$out .= $this->temp['cal_cell_blank'];
+				}
+				
+				$out .= ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_end_today'] : $this->temp['cal_cell_end'];				      	        
+        	    $day++;
+			}
+			
+			$out .= "\n";    	    
+			$out .= $this->temp['cal_row_end'];
+			$out .= "\n";    	    
+		}
+
+		$out .= "\n";    	
+		$out .= $this->temp['table_close'];
+
+		return $out;
+    }
+	// END generate()
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get Month Name
+	 *
+	 * Generates a texual month name based on the numeric 
+	 * month provided.
+	 *
+	 * @access	public
+	 * @parm	integer	the month
+	 * @return	string
+	 */
+	function get_month_name($month)
+	{
+		if ($this->month_type == 'short')
+		{
+			$month_names = array('01' => 'cal_jan', '02' => 'cal_feb', '03' => 'cal_mar', '04' => 'cal_apr', '05' => 'cal_may', '06' => 'cal_jun', '07' => 'cal_jul', '08' => 'cal_aug', '09' => 'cal_sep', '10' => 'cal_oct', '11' => 'cal_nov', '12' => 'cal_dec');
+		}
+		else
+		{
+			$month_names = array('01' => 'cal_january', '02' => 'cal_february', '03' => 'cal_march', '04' => 'cal_april', '05' => 'cal_mayl', '06' => 'cal_june', '07' => 'cal_july', '08' => 'cal_august', '09' => 'cal_september', '10' => 'cal_october', '11' => 'cal_novermber', '12' => 'cal_december');
+		}
+		
+		$month = $month_names[$month];
+		
+		if ($this->obj->lang->line($month) === FALSE)
+		{
+			return ucfirst(str_replace('cal_', '', $month));
+		}
+
+		return $this->obj->lang->line($month);
+	}
+	// END get_month_name()
+	
+	// --------------------------------------------------------------------
+ 
+	/**
+	 * Get Day Names
+	 *
+	 * Returns an array of day names (Sunday, Monday, etc.) based
+	 * on the type.  Options: long, short, abrev 
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	array
+	 */
+	function get_day_names($day_type = '')
+	{
+		if ($day_type != '')
+			$this->day_type = $day_type;
+	
+		if ($this->day_type == 'long')
+		{
+			$day_names = array('sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday');
+		}
+		elseif ($this->day_type == 'short')
+		{
+			$day_names = array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat');
+		}
+		else
+		{
+			$day_names = array('su', 'mo', 'tu', 'we', 'th', 'fr', 'sa');
+		}
+	
+		$days = array();
+		foreach ($day_names as $val)
+		{			
+			$days[] = ($this->obj->lang->line('cal_'.$val) === FALSE) ? ucfirst($val) : $this->obj->lang->line('cal_'.$val);
+		}
+	
+		return $days;
+	}
+ 	// END get_day_names()
+ 	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Adjust Date
+	 *
+	 * This function makes sure that we have a valid month/year.
+	 * For example, if you submit 13 as the month, the year will
+	 * increment and the month will become January.
+	 *
+	 * @access	public
+	 * @param	integer	the month
+	 * @param	integer	the year
+	 * @return	array
+	 */
+    function adjust_date($month, $year)
+    {
+        $date = array(); 
+                
+        $date['month']	= $month;
+        $date['year']	= $year;
+        
+        while ($date['month'] > 12)
+        {
+            $date['month'] -= 12;
+            $date['year']++;
+        }
+        
+        while ($date['month'] <= 0)
+        {
+            $date['month'] += 12;
+            $date['year']--;
+        }
+        
+        if (strlen($date['month']) == 1)
+        {
+        	$date['month'] = '0'.$date['month'];
+        }
+        
+        return $date;
+    }
+ 	// END adjust_date()
+ 	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Total days in a given month
+	 *
+	 * @access	public
+	 * @param	integer	the month
+	 * @param	integer	the year
+	 * @return	integer
+	 */
+    function get_total_days($month, $year)
+    {
+    	$days_in_month	= array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+    
+        if ($month < 1 OR $month > 12)
+        {
+            return 0;
+        }
+        
+        if ($month == 2)
+        {        
+			if ($year % 400 == 0 OR ($year % 4 == 0 AND $year % 100 != 0))
+			{
+				return 29;
+			}
+        }
+    
+        return $days_in_month[$month - 1];
+    }
+	// END get_total_days()
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Default Template Data
+	 *
+	 * This is used in the event that the user has not created their own template
+	 *
+	 * @access	public
+	 * @return array
+	 */
+	function default_template()
+	{
+		return  array (
+						'table_open' => '',
+						'heading_row_start' => '',
+						'heading_previous_cell' => '',
+						'heading_title_cell' => '',
+						'heading_next_cell' => '',
+						'heading_row_end' => '',
+						'week_row_start' => '',
+						'week_day_cell' => '',
+						'week_row_end' => '',
+						'cal_row_start' => '',
+						'cal_cell_start' => '',
+						'cal_cell_end_today' => '',
+						'cal_row_end' => '',
+						'table_close' => '
<<{heading}>>
{week_day}
',
+						'cal_cell_start_today' => '',
+						'cal_cell_content' => '{day}',
+						'cal_cell_content_today' => '{day}',
+						'cal_cell_no_content' => '{day}',
+						'cal_cell_no_content_today' => '{day}',
+						'cal_cell_blank' => ' ',
+						'cal_cell_end' => '
'
+					);	
+	}
+	// END default_template()
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Parse Template
+	 *
+	 * Harvests the data within the template {pseudo-variables}
+	 * used to display the calendar
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+ 	function parse_template()
+ 	{
+		$this->temp = $this->default_template();
+ 	
+ 		if ($this->template == '')
+ 		{
+ 			return;
+ 		}
+ 		
+		$today = array('cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today');
+		
+		foreach (array('table_open', 'table_close', 'heading_row_start', 'heading_previous_cell', 'heading_title_cell', 'heading_next_cell', 'heading_row_end', 'week_row_start', 'week_day_cell', 'week_row_end', 'cal_row_start', 'cal_cell_start', 'cal_cell_content', 'cal_cell_no_content',  'cal_cell_blank', 'cal_cell_end', 'cal_row_end', 'cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today') as $val)
+		{
+			if (preg_match("/\{".$val."\}(.*?)\{\/".$val."\}/si", $this->template, $match))
+			{
+				$this->temp[$val] = $match['1'];
+			}
+			else
+			{
+				if (in_array($val, $today))
+				{
+					$this->temp[$val] = $this->temp[str_replace('_today', '', $val)];
+				}
+			}
+		} 	
+ 	}
+	// END parse_template()
+
+}
+
+// END CI_Calendar class
+?>
\ No newline at end of file
diff --git a/system/libraries/Config.php b/system/libraries/Config.php
new file mode 100644
index 00000000..85b29579
--- /dev/null
+++ b/system/libraries/Config.php
@@ -0,0 +1,181 @@
+config =& _get_config();
+		log_message('debug', "Config Class Initialized");
+	}
+  	// END CI_Config()
+  	
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Load Config File
+	 *
+	 * @access	public
+	 * @param	string	the config file name
+	 * @return	void
+	 */	
+	function load($file = '')
+	{
+		$file = ($file == '') ? 'config' : str_replace(EXT, '', $file);
+	
+		if (in_array($file, $this->is_loaded))
+		{                
+			return;
+		}
+	
+		include_once(APPPATH.'config/'.$file.EXT);
+
+		if ( ! isset($config) OR ! is_array($config))
+		{
+			show_error('Your '.$file.EXT.' file does not appear to contain a valid configuration array.');
+		}
+		
+		$this->config = array_merge($this->config, $config);
+
+		$this->is_loaded[] = $file;
+		unset($config);
+
+		log_message('debug', 'Config file loaded: config/'.$file.EXT);
+	}
+  	// END load()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch a config file item
+	 *
+	 * The second parameter allows a slash to be added to the end of
+	 * the item, in the case of a path.
+	 *
+	 * @access	public
+	 * @param	string	the config item name
+	 * @param	bool
+	 * @return	string
+	 */		
+	function item($item, $slash = FALSE)
+	{
+		if ( ! isset($this->config[$item])) 
+		{
+			return FALSE;
+		}
+		
+		$pref = $this->config[$item];
+		
+		if ($pref == '')
+		{
+			return $pref;
+		}
+			
+        if ($slash !== FALSE AND ereg("/$", $pref) === FALSE)
+        {
+			$pref .= '/';
+        }
+        
+        return $pref;
+	}
+  	// END item()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Site URL
+	 *
+	 * @access	public
+	 * @param	string	the URI string
+	 * @return	string
+	 */		
+	function site_url($uri = '')
+	{
+		if (is_array($uri))
+		{ 
+			$uri = implode('/', $uri);
+		}
+		
+		if ($uri == '')
+		{
+			return $this->item('base_url', 1).$this->item('index_page');
+		}
+		else
+		{
+			$suffix = ($this->item('url_suffix') == FALSE) ? '' : $this->item('url_suffix');		
+			return $this->item('base_url', 1).$this->item('index_page', 1).preg_replace("|^/*(.+?)/*$|", "\\1", $uri).$suffix;
+		}
+	}
+  	// END site_url()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * System URL
+	 *
+	 * @access	public
+	 * @return	string
+	 */		
+	function system_url()
+	{
+		$x = explode("/", preg_replace("|/*(.+?)/*$|", "\\1", BASEPATH));
+		return $this->item('base_url', 1).end($x).'/';
+	}
+  	// END system_url()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set a config file item
+	 *
+	 * @access	public
+	 * @param	string	the config item key
+	 * @param	string	the config item value
+	 * @return	void
+	 */		
+	function set_item($item, $value)
+	{
+		$this->config[$item] = $value;
+	}
+	// END set_item()
+
+}
+
+// END CI_Config class
+?>
\ No newline at end of file
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
new file mode 100644
index 00000000..ec21f8d6
--- /dev/null
+++ b/system/libraries/Controller.php
@@ -0,0 +1,445 @@
+_ci_assign_core();
+		
+		// Load everything specified in the autoload.php file
+		$this->load->_ci_autoloader($this->_ci_autoload());
+
+		// This allows anything loaded using $this->load (viwes, files, etc.)
+		// to become accessible from within the Controller class functions.
+		foreach ($this->ci_is_loaded as $val)
+		{
+			$this->load->$val =& $this->$val;
+		}
+			
+		log_message('debug', "Controller Class Initialized");
+	}
+  	// END Controller()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Initialization Handler
+	 *
+	 * Looks for the existence of a handler method and calls it
+	 *
+	 * @access	private
+	 * @param 	string	the item that is being loaded
+	 * @param	mixed	any additional parameters
+	 * @return 	void
+	 */
+	function _ci_initialize($what, $params = FALSE)
+	{		
+		$method = '_ci_init_'.strtolower(str_replace(EXT, '', $what));
+
+		if ( ! method_exists($this, $method))
+		{
+			$method = substr($method, 4);
+		
+			if ( ! file_exists(APPPATH.'init/'.$method.EXT))
+			{
+				if ( ! file_exists(BASEPATH.'init/'.$method.EXT))
+				{
+					log_message('error', "Unable to load the requested class: ".$what);
+					show_error("Unable to load the class: ".$what);
+				}
+				
+				include(BASEPATH.'init/'.$method.EXT);
+			}
+			else
+			{
+				include(APPPATH.'init/'.$method.EXT);
+			}
+		}
+		else
+		{
+			if ($params === FALSE)
+			{
+				$this->$method();
+			}
+			else
+			{
+				$this->$method($params);
+			}
+		}
+	}
+  	// END _ci_initialize()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Loads and instantiates the requested model class
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	array
+	 */
+	function _ci_load_model($model, $name = '', $db_conn = FALSE)
+	{
+		if ($name == '')
+		{
+			$name = $model;
+		}
+	
+		if (isset($this->$name))
+		{
+			show_error('The model name you are loading is the name of a resource that is already being used: '.$name);
+		}
+	
+		$model = strtolower($model);
+		
+		if ( ! file_exists(APPPATH.'models/'.$model.EXT))
+		{
+			show_error('Unable to locate the model you have specified: '.$model);
+		}
+		
+		if ($db_conn !== FALSE)
+		{
+			if ($db_conn === TRUE)
+				$db_conn = '';
+		
+			$this->_ci_init_database($db_conn, FALSE, TRUE);
+		}
+	
+		if ( ! class_exists('Model'))
+		{
+			require_once(BASEPATH.'libraries/Model'.EXT);
+		}
+
+		require_once(APPPATH.'models/'.$model.EXT);
+
+		$model = ucfirst($model);
+		$this->$name = new $model();
+		$this->_ci_models[] = $name;
+		$this->_ci_assign_to_models();
+	}
+	// END _ci_load_model()
+  	
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Assign to Models
+	 *
+	 * Makes sure that anything loaded by the loader class (libraries, plugins, etc.)
+	 * will be available to modles, if any exist.
+	 *
+	 * @access	public
+	 * @param	object
+	 * @return	array
+	 */
+	function _ci_assign_to_models()
+	{
+		$obj =& get_instance();
+		if (count($obj->_ci_models) == 0)
+		{
+			return;
+		}
+		foreach ($obj->_ci_models as $model)
+		{			
+			$obj->$model->_assign_libraries();			
+		}		
+	}
+	// END _ci_assign_to_models()
+  	
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Auto-initialize Core Classes
+	 *
+	 * This initializes the core systems that are specified in the 
+	 * libraries/autoload.php file, as well as the systems specified in
+	 * the $autoload class array above.
+	 *
+	 * It returns the "autoload" array so we can pass it to the Loader 
+	 * class since it needs to autoload plugins and helper files
+	 *
+	 * The config/autoload.php file contains an array that permits 
+	 * sub-systems to be loaded automatically.
+	 *
+	 * @access	private
+	 * @return	array
+	 */
+	function _ci_autoload()
+	{
+		include_once(APPPATH.'config/autoload'.EXT);
+		
+		if ( ! isset($autoload))
+		{
+			return FALSE;
+		}
+		
+		if (count($autoload['config']) > 0)
+		{
+			foreach ($autoload['config'] as $key => $val)
+			{
+				$this->config->load($val);
+			}
+		}
+		unset($autoload['config']);
+		
+		if ( ! is_array($autoload['core']))
+		{
+			$autoload['core'] = array($autoload['core']);
+		}
+		
+		foreach ($autoload['core'] as $item)
+		{
+			$this->_ci_initialize($item);
+		}
+		
+		return $autoload;
+	}
+  	// END _ci_autoload()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Assign the core classes to the global $CI object
+	 *
+	 * By assigning all the classes instantiated by the front controller
+	 * local class variables we enable everything to be accessible using
+	 * $this->class->function()
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _ci_assign_core()
+	{
+		foreach (array('Config', 'Input', 'Benchmark', 'URI', 'Output') as $val)
+		{
+			$class = strtolower($val);
+			$this->$class =& _load_class('CI_'.$val);
+			$this->ci_is_loaded[] = $class;
+		}
+		
+		$this->lang	=& _load_class('CI_Language');
+		$this->ci_is_loaded[] = 'lang';
+	
+		// In PHP 4 the Controller class is a child of CI_Loader.
+		// In PHP 5 we run it as its own class.
+		if (floor(phpversion()) >= 5)
+		{
+			$this->load = new CI_Loader();
+		}
+		
+		$this->ci_is_loaded[] = 'load';
+	}
+  	// END _ci_assign_core()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Initialize Scaffolding
+	 *
+	 * This initializing function works a bit different than the
+	 * others. It doesn't load the class.  Instead, it simply
+	 * sets a flag indicating that scaffolding is allowed to be
+	 * used.  The actual scaffolding function below is
+	 * called by the front controller based on whether the
+	 * second segment of the URL matches the "secret" scaffolding
+	 * word stored in the application/config/routes.php
+	 *
+	 * @access	private
+	 * @param	string	the table to scaffold
+	 * @return	void
+	 */
+	function _ci_init_scaffolding($table = FALSE)
+	{
+		if ($table === FALSE)
+		{
+			show_error('You must include the name of the table you would like access when you initialize scaffolding');
+		}
+		
+		$this->_ci_scaffolding = TRUE;
+		$this->_ci_scaff_table = $table;
+	}
+  	// END _ci_init_scaffolding()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Initialize Database
+	 *
+	 * @access	private
+	 * @param	mixed	database connection values
+	 * @param	bool	whether to return the object for multiple connections
+	 * @return	void
+	 */
+	function _ci_init_database($params = '', $return = FALSE, $active_record = FALSE)
+	{
+		if ($this->_ci_is_loaded('db') == TRUE AND $return == FALSE AND $active_record == FALSE)
+		{
+			return;
+		}
+	
+		// Load the DB config file if needed
+		if (is_string($params) AND strpos($params, '://') === FALSE)
+		{
+			include(APPPATH.'config/database'.EXT);
+			
+			$group = ($params == '') ? $active_group : $params;
+			
+			if ( ! isset($db[$group]))
+			{
+				show_error('You have specified an invalid database connection group: '.$group);
+			}
+			
+			$params = $db[$group];
+		}
+		
+		// No DB specified yet?  Beat them senseless...
+		if ( ! isset($params['dbdriver']) OR $params['dbdriver'] == '')
+		{
+			show_error('You have not selected a database type to connect to.');
+		}
+
+		// Load the DB classes.  Note: Since the active record class is optional
+		// we need to dynamically create a class that extends proper parent class 
+		// based on whether we're using the active record class or not.
+		// Kudos to Paul for discovering this clever use of eval()
+		
+		if ($active_record == TRUE)
+		{
+			$params['active_r'] = TRUE;
+		}
+		
+		require_once(BASEPATH.'drivers/DB_driver'.EXT);
+
+		if ( ! isset($params['active_r']) OR $params['active_r'] == TRUE) 
+		{
+			require_once(BASEPATH.'drivers/DB_active_record'.EXT);
+			
+			if ( ! class_exists('CI_DB'))
+			{
+				eval('class CI_DB extends CI_DB_active_record { }');
+			}
+		}
+		else
+		{
+			if ( ! class_exists('CI_DB'))
+			{
+				eval('class CI_DB extends CI_DB_driver { }');
+			}
+		}
+		
+		require_once(BASEPATH.'drivers/DB_'.$params['dbdriver'].EXT);
+
+		// Instantiate the DB adapter
+		$driver = 'CI_DB_'. $params['dbdriver'];
+		$DB = new $driver($params);
+		
+		if ($return === TRUE)
+		{
+			return $DB;
+		}
+		
+		$obj =& get_instance();
+		$obj->ci_is_loaded[] = 'db';
+		$obj->db =& $DB;
+	}
+  	// END _ci_init_database()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Returns TRUE if a class is loaded, FALSE if not
+	 *
+	 * @access	public
+	 * @param	string	 the class name
+	 * @return	bool
+	 */
+	function _ci_is_loaded($class)
+	{
+		return ( ! in_array($class, $this->ci_is_loaded)) ? FALSE : TRUE;
+	}
+  	// END _ci_is_loaded()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Scaffolding
+	 *
+	 * Initializes the scaffolding.
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _ci_scaffolding()
+	{
+		if ($this->_ci_scaffolding === FALSE OR $this->_ci_scaff_table === FALSE)
+		{
+			show_404('Scaffolding unavailable');
+		}
+		
+		if (class_exists('Scaffolding')) return;
+			
+		if ( ! in_array($this->uri->segment(3), array('add', 'insert', 'edit', 'update', 'view', 'delete', 'do_delete')))
+		{
+			$method = 'view';
+		}
+		else
+		{
+			$method = $this->uri->segment(3);
+		}
+		
+		$this->_ci_init_database("", FALSE, TRUE);
+		
+		$this->_ci_initialize('pagination');
+		require_once(BASEPATH.'scaffolding/Scaffolding'.EXT);
+		$this->scaff = new Scaffolding($this->_ci_scaff_table);
+		$this->scaff->$method();
+	}
+	// END _ci_scaffolding()
+
+}
+// END _Controller class
+?>
\ No newline at end of file
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
new file mode 100644
index 00000000..96dc0014
--- /dev/null
+++ b/system/libraries/Email.php
@@ -0,0 +1,1740 @@
+ 0)
+		{
+			$this->initialize($config);
+		}	
+
+		log_message('debug', "Email Class Initialized");
+	}
+	// END CI_Email()
+  
+	// --------------------------------------------------------------------
+
+	/**
+	 * Initialize preferences
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	void
+	 */	
+	function initialize($config = array())
+	{
+		$this->clear();
+		foreach ($config as $key => $val)
+		{
+			if (isset($this->$key))
+			{
+				$method = 'set_'.$key;
+				
+				if (method_exists($this, $method))
+				{
+					$this->$method($val);
+				}
+				else
+				{
+					$this->$key = $val;
+				}			
+			}
+		}
+        $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE;			
+		$this->_safe_mode = (@ini_get("safe_mode") == 0) ? FALSE : TRUE;
+	}
+  	// END initialize()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Initialize the Email Data
+	 *
+	 * @access	public
+	 * @return	void
+	 */	
+	function clear()
+	{
+		$this->_subject		= "";
+		$this->_body		= "";
+		$this->_finalbody	= "";
+		$this->_header_str	= "";
+		$this->_replyto_flag = FALSE;
+		$this->_recipients	= array();
+		$this->_headers		= array();
+		$this->_debug_msg	= array();
+		
+		$this->_set_header('User-Agent', $this->useragent);				
+		$this->_set_header('Date', $this->_set_date());
+	}
+  	// END clear()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set FROM
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	void
+	 */	
+	function from($from, $name = '')
+	{
+		if (preg_match( '/\<(.*)\>/', $from, $match))
+			$from = $match['1'];
+
+		if ($this->validate)
+			$this->validate_email($this->_str_to_array($from));
+			
+		if ($name != '' && substr($name, 0, 1) != '"')
+		{
+			$name = '"'.$name.'"';
+		}
+	
+		$this->_set_header('From', $name.' <'.$from.'>');
+		$this->_set_header('Return-Path', '<'.$from.'>');
+	}
+  	// END from()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Reply-to
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	void
+	 */	
+	function reply_to($replyto, $name = '')
+	{
+		if (preg_match( '/\<(.*)\>/', $replyto, $match))
+			$replyto = $match['1'];
+
+		if ($this->validate)
+			$this->validate_email($this->_str_to_array($replyto));	
+
+		if ($name == '')
+		{
+			$name = $replyto;
+		}
+
+		if (substr($name, 0, 1) != '"')
+		{
+			$name = '"'.$name.'"';
+		}
+
+		$this->_set_header('Reply-To', $name.' <'.$replyto.'>');
+		$this->_replyto_flag = TRUE;
+	}
+  	// END reply_to()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Recipients
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function to($to)
+	{
+		$to = $this->_str_to_array($to);
+		$to = $this->clean_email($to);
+	
+		if ($this->validate)
+			$this->validate_email($to);
+			
+		if ($this->_get_protocol() != 'mail')
+			$this->_set_header('To', implode(", ", $to));
+
+		switch ($this->_get_protocol())
+		{
+			case 'smtp'		: $this->_recipients = $to;
+			break;
+			case 'sendmail'	: $this->_recipients = implode(", ", $to);
+			break;
+			case 'mail'		: $this->_recipients = implode(", ", $to);
+			break;
+		}	
+	}
+  	// END to()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set CC
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function cc($cc)
+	{	
+		$cc = $this->_str_to_array($cc);
+		$cc = $this->clean_email($cc);
+
+		if ($this->validate)
+			$this->validate_email($cc);
+
+		$this->_set_header('Cc', implode(", ", $cc));
+		
+		if ($this->_get_protocol() == "smtp")
+			$this->_cc_array = $cc;
+	}
+  	// END cc()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set BCC
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	void
+	 */	
+	function bcc($bcc, $limit = '')
+	{
+		if ($limit != '' && ctype_digit($limit))
+		{
+			$this->bcc_batch_mode = true;
+			$this->bcc_batch_size = $limit;
+		}
+
+		$bcc = $this->_str_to_array($bcc);
+		$bcc = $this->clean_email($bcc);
+		
+		if ($this->validate)
+			$this->validate_email($bcc);
+
+		if (($this->_get_protocol() == "smtp") OR ($this->bcc_batch_mode && count($bcc) > $this->bcc_batch_size))
+			$this->_bcc_array = $bcc;
+		else
+			$this->_set_header('Bcc', implode(", ", $bcc));
+	}
+  	// END bcc()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Email Subject
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function subject($subject)
+	{
+		$subject = preg_replace("/(\r\n)|(\r)|(\n)/", "", $subject);
+		$subject = preg_replace("/(\t)/", " ", $subject);
+		
+		$this->_set_header('Subject', trim($subject));		
+	}
+  	// END subject()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Body
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function message($body)
+	{
+		$body = rtrim(str_replace("\r", "", $body));
+	
+		if ($this->wordwrap === TRUE  AND  $this->mailtype != 'html')
+			$this->_body = $this->word_wrap($body);
+		else
+			$this->_body = $body;	
+			
+		$this->_body = stripslashes($this->_body);
+	}	
+ 	// END message()
+ 	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Assign file attachments
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */		
+	function attach($filename, $disposition = 'attachment')
+	{			
+		$this->_attach_name[] = $filename;
+		$this->_attach_type[] = $this->_mime_types(next(explode('.', basename($filename))));
+		$this->_attach_disp[] = $disposition; // Can also be 'inline'  Not sure if it matters 
+	}
+  	// END attach()
+  
+	// --------------------------------------------------------------------
+
+	/**
+	 * Add a Header Item
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	void
+	 */	
+	function _set_header($header, $value)
+	{
+		$this->_headers[$header] = $value;
+	}
+  	// END _set_header()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Convert a String to an Array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	array
+	 */	
+	function _str_to_array($email)
+	{
+		if ( ! is_array($email))
+		{	
+			if (ereg(',$', $email))
+				$email = substr($email, 0, -1);
+			
+			if (ereg('^,', $email))
+				$email = substr($email, 1);	
+					
+			if (ereg(',', $email))
+			{					
+				$x = explode(',', $email);
+				$email = array();
+				
+				for ($i = 0; $i < count($x); $i ++)
+					$email[] = trim($x[$i]);
+			}
+			else
+			{				
+				$email = trim($email);
+				settype($email, "array");
+			}
+		}
+		return $email;
+	}
+  	// END _str_to_array()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Multipart Value
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_alt_message($str = '')
+	{
+		$this->alt_message = ($str == '') ? '' : $str;
+	}
+  	// END set_alt_message()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Mailtype
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_mailtype($type = 'text')
+	{
+		$this->mailtype = ($type == 'html') ? 'html' : 'text';
+	}
+  	// END set_mailtype()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Wordwrap
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_wordwrap($wordwrap = TRUE)
+	{
+		$this->wordwrap = ($wordwrap === FALSE) ? FALSE : TRUE;
+	}
+  	// END set_wordwrap()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Protocal
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_protocol($protocol = 'mail')
+	{ 
+		$this->protocol = ( ! in_array($protocol, $this->_protocols)) ? 'mail' : strtolower($protocol);
+	}
+  	// END set_protocol()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Priority
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @return	void
+	 */	
+	function set_priority($n = 3)
+	{
+		if ( ! ctype_digit($n))
+		{
+			$this->priority = 3;
+			return;
+		}
+	
+		if ($n < 1 OR $n > 5)
+		{
+			$this->priority = 3;
+			return;
+		}
+	
+		$this->priority = $n;
+	}
+  	// END set_priority()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Newline Character
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_newline($newline = "\n")
+	{
+		if ($newline != "\n" OR $newline != "\r\n" OR $newline != "\r")
+		{
+			$this->newline	= "\n";	
+			return;
+		}
+	
+		$this->newline	= $newline;	
+	}
+  	// END set_newline()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Message Boundry
+	 *
+	 * @access	private
+	 * @return	void
+	 */	
+	function _set_boundaries()
+	{
+		$this->_alt_boundary = "B_ALT_".uniqid(''); // mulipart/alternative
+		$this->_atc_boundary = "B_ATC_".uniqid(''); // attachment boundary
+	}
+  	// END _set_boundaries()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get the Message ID
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+	function _get_message_id()
+	{
+		$from = $this->_headers['Return-Path'];
+		$from = str_replace(">", "", $from);
+		$from = str_replace("<", "", $from);
+	
+        return  "<".uniqid('').strstr($from, '@').">";	        
+	}
+  	// END _get_message_id()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get Mail Protocol
+	 *
+	 * @access	private
+	 * @param	bool
+	 * @return	string
+	 */	
+	function _get_protocol($return = true)
+	{
+		$this->protocol = strtolower($this->protocol);
+		$this->protocol = ( ! in_array($this->protocol, $this->_protocols)) ? 'mail' : $this->protocol;
+		
+		if ($return == true) 
+			return $this->protocol;
+	}
+  	// END _get_protocol()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get Mail Encoding
+	 *
+	 * @access	private
+	 * @param	bool
+	 * @return	string
+	 */	
+	function _get_encoding($return = true)
+	{		
+		$this->_encoding = ( ! in_array($this->_encoding, $this->_bit_depths)) ? '7bit' : $this->_encoding;
+		
+		if ( ! in_array($this->charset, $this->_base_charsets)) 
+			$this->_encoding = "8bit";
+			
+		if ($return == true) 
+			return $this->_encoding;
+	}
+	// END _get_encoding()
+  
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get content type (text/html/attachment)
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+	function _get_content_type()
+	{	
+			if	($this->mailtype == 'html' &&  count($this->_attach_name) == 0)
+				return 'html';
+	
+		elseif	($this->mailtype == 'html' &&  count($this->_attach_name)  > 0)
+				return 'html-attach';				
+				
+		elseif	($this->mailtype == 'text' &&  count($this->_attach_name)  > 0)
+				return 'plain-attach';
+				
+		  else	return 'plain';
+	}
+  	// END _get_content_type()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set RFC 822 Date
+	 *
+	 * @access	public
+	 * @return	string
+	 */	
+	function _set_date()
+	{
+		$timezone = date("Z");
+		$operator = (substr($timezone, 0, 1) == '-') ? '-' : '+';
+		$timezone = abs($timezone);
+		$timezone = ($timezone/3600) * 100 + ($timezone % 3600) /60;
+		
+		return sprintf("%s %s%04d", date("D, j M Y H:i:s"), $operator, $timezone);
+	}
+  	// END _set_date()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Mime message
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+	function _get_mime_message()
+	{
+		return "This is a multi-part message in MIME format.".$this->newline."Your email application may not support this format.";
+	}
+  	// END _get_mime_message()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Validate Email Address
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function validate_email($email)
+	{	
+		if ( ! is_array($email))
+		{
+			$this->_set_error_message('email_must_be_array');		
+			return FALSE;
+		}
+
+		foreach ($email as $val)
+		{
+			if ( ! $this->valid_email($val)) 
+			{
+				$this->_set_error_message('email_invalid_address', $val);				
+				return FALSE;
+			}
+		}
+	}	
+  	// END validate_email()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Email Validation
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function valid_email($address)
+	{
+		if ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $address))
+			return FALSE;
+		else 
+			return TRUE;
+	}
+  	// END valid_email()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Clean Extended Email Address: Joe Smith 
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function clean_email($email)
+	{
+		if ( ! is_array($email))
+		{
+			if (preg_match('/\<(.*)\>/', $email, $match))
+           		return $match['1'];
+           	else
+           		return $email;
+		}
+			
+		$clean_email = array();
+
+		for ($i=0; $i < count($email); $i++) 
+		{
+			if (preg_match( '/\<(.*)\>/', $email[$i], $match))
+           		$clean_email[] = $match['1'];
+           	else
+           		$clean_email[] = $email[$i];
+		}
+		
+		return $clean_email;
+	}
+  	// END clean_email()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Build alternative plain text message
+	 *
+	 * This function provides the raw message for use
+	 * in plain-text headers of HTML-formatted emails.
+	 * If the user hasn't specified his own alternative message  
+	 * it creates one by stripping the HTML
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+	function _get_alt_message()
+	{
+		if (eregi( '\', $this->_body, $match))
+		{
+			$body = $match['1'];
+			$body = substr($body, strpos($body, ">") + 1);
+		}
+		else
+		{
+			$body = $this->_body;
+		}
+		
+		$body = trim(strip_tags($body));
+		$body = preg_replace( '# '.$message. ' '.$filepath.' '.$line, TRUE);
+	}
+	// END log_exception()
+  
+	// --------------------------------------------------------------------
+
+	/**
+	 * 404 Page Not Found Handler
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */
+	function show_404($page = '')
+	{	
+		$heading = "404 Page Not Found";
+		$message = "The page you requested was not found."; 
+
+		log_message('error', '404 Page Not Found --> '.$page);
+		echo $this->show_error($heading, $message, 'error_404');
+		exit;
+	}
+  	// END show_404()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * General Error Page
+	 *
+	 * This function takes an error message as input
+	 * (either as a string or an array) and displayes
+	 * it using the specified template.
+	 *
+	 * @access	private
+	 * @param	string	the heading
+	 * @param	string	the message
+	 * @param	string	the template name
+	 * @return	string
+	 */
+	function show_error($heading, $message, $template = 'error_general')
+	{
+		$message = '
'.implode('
', ( ! is_array($message)) ? array($message) : $message).'
';
+				
+		ob_start();
+		include_once(APPPATH.'errors/'.$template.EXT);
+		$buffer = ob_get_contents();
+		ob_end_clean();
+		return $buffer;
+	}
+	// END show_error()
+
+  
+	// --------------------------------------------------------------------
+
+	/**
+	 * Native PHP error handler
+	 *
+	 * @access	private
+	 * @param	string	the error severity
+	 * @param	string	the error string
+	 * @param	string	the error filepath
+	 * @param	string	the error line number
+	 * @return	string
+	 */
+	function show_php_error($severity, $message, $filepath, $line)
+	{	
+		$severity = ( ! isset($this->levels[$severity])) ? $severity : $this->levels[$severity];
+	
+		$filepath = str_replace("\\", "/", $filepath);
+		
+		// For safety reasons we do not show the full file path
+		if (FALSE !== strpos($filepath, '/'))
+		{
+			$x = explode('/', $filepath);
+			$filepath = $x[count($x)-2].'/'.end($x);
+		}
+	
+		ob_start();
+		include_once(APPPATH.'errors/error_php'.EXT);
+		$buffer = ob_get_contents();
+		ob_end_clean();
+		echo $buffer;
+	}
+  	// END show_php_error()
+
+// END Exceptions Class
+}
+?>
\ No newline at end of file
diff --git a/system/libraries/Hooks.php b/system/libraries/Hooks.php
new file mode 100644
index 00000000..389e7ac1
--- /dev/null
+++ b/system/libraries/Hooks.php
@@ -0,0 +1,237 @@
+item('enable_hooks') == FALSE)
+		{
+			return;
+		}
+		
+		// Grab the "hooks" definition file.
+		// If there are no hooks, we're done.
+		
+		@include(APPPATH.'config/hooks'.EXT);
+		
+		if ( ! isset($hook) OR ! is_array($hook))
+		{
+			return;
+		}
+
+		$this->hooks =& $hook;
+		$this->enabled = TRUE;
+	}
+  	// END CI_Hooks()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Does a given hook exist?
+	 *
+	 * Returns TRUE/FALSE based on whether a given hook exists
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	bool
+	 */
+	function _hook_exists($which = '')
+	{
+		if ( ! $this->enabled)
+		{
+			return FALSE;
+		}
+
+		if ( ! isset($this->hooks[$which]))
+		{
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+  	// END hook_exists()
+  	
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Call Hook
+	 *
+	 * Calls a particular hook
+	 *
+	 * @access	private
+	 * @param	string	the hook name
+	 * @return	mixed
+	 */
+	function _call_hook($which = '')
+	{
+		if (isset($this->hooks[$which][0]) AND is_array($this->hooks[$which][0]))
+		{
+			foreach ($this->hooks[$which] as $val)
+			{
+				$this->_run_hook($val);
+			}
+		}
+		else
+		{
+			$this->_run_hook($this->hooks[$which]);
+		}
+	}
+  	// END hook_exists()
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Run Hook
+	 *
+	 * Runs a particular hook
+	 *
+	 * @access	private
+	 * @param	array	the hook details
+	 * @return	bool
+	 */
+	function _run_hook($data)
+	{
+		if ( ! is_array($data))
+		{
+			return FALSE;
+		}
+		
+		// -----------------------------------
+		// Safety - Prevents run-away loops
+		// -----------------------------------
+	
+		// If the script being called happens to have the same 
+		// extension call within it a loop can happen
+		
+		if ($this->in_progress == TRUE)
+		{
+			return;
+		}
+
+		// -----------------------------------
+		// Set file path
+		// -----------------------------------
+		
+		if ( ! isset($data['filepath']) OR ! isset($data['filename']))
+		{
+			return FALSE;
+		}
+		
+		$filepath = APPPATH.$data['filepath'].'/'.$data['filename'];
+	
+		if ( ! file_exists($filepath))
+		{
+			return FALSE;
+		}
+		
+		// -----------------------------------
+		// Set class/function name
+		// -----------------------------------
+		
+		$class		= FALSE;
+		$function	= FALSE;
+		$params		= '';
+		
+		if (isset($data['class']) AND $data['class'] != '') 
+		{
+			$class = $data['class'];
+		}
+
+		if (isset($data['function'])) 
+		{
+			$function = $data['function'];
+		}
+
+		if (isset($data['params'])) 
+		{
+			$params = $data['params'];
+		}
+		
+		if ($class === FALSE AND $function === FALSE)
+		{
+			return FALSE;
+		}
+		
+		// -----------------------------------
+		// Set the in_progress flag
+		// -----------------------------------
+
+		$this->in_progress = TRUE;
+		
+		// -----------------------------------
+		// Call the requested class and/or function
+		// -----------------------------------
+		
+		if ($class !== FALSE)
+		{
+			if ( ! class_exists($class))
+			{
+				require($filepath);
+			}
+		
+			$HOOK = new $class;
+			$HOOK->$function($params);
+		}
+		else
+		{
+			if ( ! function_exists($function))
+			{
+				require($filepath);
+			}
+		
+			$function($params);
+		}
+	
+		$this->in_progress = FALSE;
+		return TRUE;
+	}
+  	// END _run_hook()
+
+
+}
+
+// END CI_Hooks class
+?>
\ No newline at end of file
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
new file mode 100644
index 00000000..854f0484
--- /dev/null
+++ b/system/libraries/Image_lib.php
@@ -0,0 +1,1550 @@
+ 0)
+		{
+			$this->initialize($props);
+		}
+		
+		log_message('debug', "Image Lib Class Initialized");
+	}
+	// END CI_Image_lib()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Initialize image properties
+	 *
+	 * Resets values in case this class is used in a loop
+	 *
+	 * @access	public
+	 * @return	void
+	 */	
+	function clear()
+	{
+		$props = array('source_folder', 'dest_folder', 'source_image', 'full_src_path', 'full_dst_path', 'new_image', 'image_type', 'size_str', 'quality', 'orig_width', 'orig_height', 'rotation_angle', 'x_axis', 'y_axis', 'create_fnc', 'copy_fnc', 'wm_overlay_path', 'wm_use_truetype', 'dynamic_output', 'wm_font_size', 'wm_text', 'wm_vrt_alignment', 'wm_hor_alignment', 'wm_padding', 'wm_hor_offset', 'wm_vrt_offset', 'wm_font_color', 'wm_use_drop_shadow', 'wm_shadow_color', 'wm_shadow_distance', 'wm_opacity');
+	
+		foreach ($props as $val)
+		{
+			$this->$val = '';
+		}  		
+	}
+	// END clear()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * initialize image preferences
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	void
+	 */	
+	function initialize($props = array())
+	{  
+		/*
+		 * Convert array elements into class variables
+		 */
+		if (count($props) > 0)
+		{
+			foreach ($props as $key => $val)
+			{
+				$this->$key = $val;
+			}
+		}
+
+		/*
+		 * Is there a source image?
+		 *
+		 * If not, there's no reason to continue
+		 *
+		 */
+		if ($this->source_image == '')
+		{
+			$this->set_error('imglib_source_image_required');
+			return FALSE;       	
+		}
+		/*
+		 * Is getimagesize() Available?
+		 *
+		 * We use it to determine the image properties (width/height).
+		 * Note:  We need to figure out how to determine image
+		 * properties using ImageMagick and NetPBM
+		 *
+		 */		
+		if ( ! function_exists('getimagesize')) 
+		{
+			$this->set_error('imglib_gd_required_for_props');
+			return FALSE;		
+		}
+		
+		$this->image_library = strtolower($this->image_library);
+		
+		/*
+		 * Set the full server path
+		 *
+		 * The source image may or may not contain a path.
+		 * Either way, we'll try use realpath to generate the
+		 * full server path in order to more reliably read it.
+		 *
+		 */	
+		if (function_exists('realpath') AND @realpath($this->source_image) !== FALSE)
+		{
+			$full_source_path = str_replace("\\", "/", realpath($this->source_image)); 
+		}
+		else
+		{
+			$full_source_path = $this->source_image;
+		}
+		
+		$x = explode('/', $full_source_path);
+		$this->source_image = end($x);
+		$this->source_folder = str_replace($this->source_image, '', $full_source_path);
+								
+		// Set the Image Propterties
+		if ( ! $this->get_image_properties($this->source_folder.$this->source_image))
+		{
+			return FALSE;       	
+		}				
+
+		/*
+		 * Assign the "new" image name/path
+		 *
+		 * If the user has set a "new_image" name it means
+		 * we are making a copy of the source image. If not
+		 * it means we are altering the original.  We'll
+		 * set the destination filename and path accordingly.
+		 *
+		 */			
+		if ($this->new_image == '')
+		{
+			$this->dest_image = $this->source_image;
+			$this->dest_folder = $this->source_folder;
+		}
+		else
+		{
+			if (strpos($this->new_image, '/') === FALSE)
+			{
+				$this->dest_folder = $this->source_folder;
+				$this->dest_image = $this->new_image;
+			}
+			else
+			{
+				if (function_exists('realpath') AND @realpath($this->new_image) !== FALSE)
+				{
+					$full_dest_path = str_replace("\\", "/", realpath($this->new_image)); 
+				}
+				else
+				{
+					$full_dest_path = $this->new_image; 
+				}
+				
+				// Is there a file name?
+				if ( ! preg_match("#[\.jpg|\.jpeg|\.gif|\.png]$#i", $full_dest_path))
+				{
+					$this->dest_folder = $full_dest_path.'/';
+					$this->dest_image = $this->source_image;
+				}
+				else
+				{
+					$x = explode('/', $full_dest_path);
+					$this->dest_image = end($x);
+					$this->dest_folder = str_replace($this->dest_image, '', $full_dest_path);
+				}
+			}
+		}
+
+		/*
+		 * Compile the finalized filenames/paths
+		 *
+		 * We'll create two master strings containing the
+		 * full server path to the source image and the
+		 * full server path to the destination image.
+		 * We'll also split the destination image name
+		 * so we can insert the thumbnail marker if needed.
+		 *
+		 */	
+		if ($this->create_thumb === FALSE OR $this->thumb_marker == '')
+		{
+			$this->thumb_marker = '';
+		}
+
+		$xp	= $this->explode_name($this->dest_image);
+	
+		$filename = $xp['name'];
+		$file_ext = $xp['ext'];
+				
+		$this->full_src_path = $this->source_folder.$this->source_image;    	
+		$this->full_dst_path = $this->dest_folder.$filename.$this->thumb_marker.$file_ext;
+
+		/*
+		 * Should we maintain image proportions?
+		 *
+		 * When creating thumbs or copies, the target width/height
+		 * might not be in correct proportion with the source
+		 * image's width/height.  We'll recalculate it here.
+		 *
+		 */	
+		if ($this->maintain_ratio === TRUE && ($this->width != '' AND $this->height != ''))
+		{
+			$this->image_reproportion();
+		}
+
+		/*
+		 * Was a width and height specified?
+		 *
+		 * If the destination width/height was
+		 * not submitted we will use the values
+		 * from the actual file
+		 *
+		 */	
+		if ($this->width == '')
+			$this->width = $this->orig_width;
+	
+		if ($this->height == '')
+			$this->height = $this->orig_height;
+	
+		// Set the quality
+		$this->quality = trim(str_replace("%", "", $this->quality));
+		
+		if ($this->quality == '' OR $this->quality == 0 OR ! ctype_digit($this->quality))
+			$this->quality = 90;
+	
+		// Set the x/y coordinates
+		$this->x_axis = ($this->x_axis == '' OR ! is_numeric($this->x_axis)) ? 0 : $this->x_axis;
+		$this->y_axis = ($this->y_axis == '' OR ! is_numeric($this->y_axis)) ? 0 : $this->y_axis;
+	
+		// Watermark-related Stuff...
+		if ($this->wm_font_color != '')
+		{
+			if (strlen($this->wm_font_color) == 6)
+			{
+				$this->wm_font_color = '#'.$this->wm_font_color;
+			}
+		}
+		
+		if ($this->wm_shadow_color != '')
+		{
+			if (strlen($this->wm_shadow_color) == 6)
+			{
+				$this->wm_shadow_color = '#'.$this->wm_shadow_color;
+			}
+		}
+	
+		if ($this->wm_overlay_path != '')
+		{
+			$this->wm_overlay_path = str_replace("\\", "/", realpath($this->wm_overlay_path)); 
+		}
+	
+		if ($this->wm_shadow_color != '')
+		{
+			$this->wm_use_drop_shadow = TRUE;
+		}
+
+		if ($this->wm_font_path != '')
+		{
+			$this->wm_use_truetype = TRUE;
+		}
+
+		return TRUE;
+	} 
+	// END initialize()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Image Resize
+	 *
+	 * This is a wrapper function that chooses the proper
+	 * resize function based on the protocol specified
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function resize()
+	{
+		$protocol = 'image_process_'.$this->image_library;
+		
+		if (eregi("gd2$", $protocol))
+		{
+			$protocol = 'image_process_gd';
+		}
+		
+		return $this->$protocol('resize');
+	}
+	// END resize()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Image Crop
+	 *
+	 * This is a wrapper function that chooses the proper
+	 * cropping function based on the protocol specified
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function crop()
+	{
+		$protocol = 'image_process_'.$this->image_library;
+		
+		if (eregi("gd2$", $protocol))
+		{
+			$protocol = 'image_process_gd';
+		}
+		
+		return $this->$protocol('crop');
+	}
+	// END crop()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Image Rotate
+	 *
+	 * This is a wrapper function that chooses the proper
+	 * rotation function based on the protocol specified
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function rotate()
+	{
+		// Allowed rotation values		
+		$degs = array(90, 180, 270, 'vrt', 'hor');	
+	
+		if ($this->rotation_angle == '' OR ! in_array($this->rotation_angle, $degs))
+		{
+			$this->set_error('imglib_rotation_angle_required');
+			return FALSE;       	
+		}
+	
+		// Reassign the width and height
+		if ($this->rotation_angle == 90 OR $this->rotation_angle == 270)
+		{
+			$this->width	= $this->orig_height;
+			$this->height	= $this->orig_width;
+		}
+		else
+		{
+			$this->width	= $this->orig_width;
+			$this->height	= $this->orig_height;
+		}
+	
+
+		// Choose resizing function
+		if ($this->image_library == 'imagemagick' OR $this->image_library == 'netpbm')
+		{
+			$protocol = 'image_process_'.$this->image_library;
+		
+			return $this->$protocol('rotate');
+		}
+		
+		if ($this->rotation_angle == 'hor' OR $this->rotation_angle == 'vrt')
+		{
+			return $this->image_mirror_gd();
+		}
+		else
+		{		
+			return $this->image_rotate_gd();
+		}
+	}
+	// END rotate()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Image Process Using GD/GD2
+	 *
+	 * This function will resize or crop
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */		
+	function image_process_gd($action = 'resize')
+	{	
+		$v2_override = FALSE;
+			
+		if ($action == 'crop')
+		{
+			// If the target width/height match the source then it's pointless to crop, right?
+			if ($this->width >= $this->orig_width AND $this->height >= $this->orig_width)
+			{
+				// We'll return true so the user thinks the process succeeded.
+				// It'll be our little secret...
+	
+				return TRUE; 
+			}
+			
+			//  Reassign the source width/height if cropping
+			$this->orig_width  = $this->width;
+			$this->orig_height = $this->height;	
+				
+			// GD 2.0 has a cropping bug so we'll test for it
+			if ($this->gd_version() !== FALSE)
+			{
+				$gd_version = str_replace('0', '', $this->gd_version());			
+				$v2_override = ($gd_version == 2) ? TRUE : FALSE;
+			}
+		}
+		else
+		{
+			// If the target width/height match the source, AND if
+			// the new file name is not equal to the old file name
+			// we'll simply make a copy of the original with the new name		
+			if (($this->orig_width == $this->width AND $this->orig_height == $this->height) AND ($this->source_image != $this->dest_image))
+			{
+				if ( ! @copy($this->full_src_path, $this->full_dst_path))
+				{
+					$this->set_error('imglib_copy_failed');
+					return FALSE; 
+				}
+			
+				@chmod($this->full_dst_path, 0777);
+				return TRUE;
+			}
+			
+			// If resizing the x/y axis must be zero
+			$this->x_axis = 0;
+			$this->y_axis = 0;
+		}
+		
+		//  Create the image handle
+		if ( ! ($src_img = $this->image_create_gd()))
+		{		
+			return FALSE;
+		}
+
+		//  Create The Image
+		if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor') AND $v2_override == FALSE)
+		{
+			$create	= 'imagecreatetruecolor';
+			$copy	= 'imagecopyresampled';
+		}
+		else
+		{
+			$create	= 'imagecreate';	
+			$copy	= 'imagecopyresized';
+		}
+			
+		$dst_img = $create($this->width, $this->height); 
+		$copy($dst_img, $src_img, 0, 0, $this->x_axis, $this->y_axis, $this->width, $this->height, $this->orig_width, $this->orig_height); 
+
+		//  Show the image	
+		if ($this->dynamic_output == TRUE)
+		{ 
+			$this->image_display_gd($dst_img);
+		}
+		else
+		{
+			// Or save it
+			if ( ! $this->image_save_gd($dst_img))
+			{
+				return FALSE;
+			}
+		}
+
+		//  Kill the file handles
+		imagedestroy($dst_img); 
+		imagedestroy($src_img);
+		
+		// Set the file to 777
+		@chmod($this->full_dst_path, 0777);            
+		
+		return TRUE;
+	}
+	// END image_process_gd()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Image Process Using ImageMagick
+	 *
+	 * This function will resize, crop or rotate
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */		
+	function image_process_imagemagick($action = 'resize')
+	{
+		//  Do we have a vaild library path?
+		if ($this->library_path == '')
+		{
+			$this->set_error('imglib_libpath_invalid');
+			return FALSE;
+		}
+				
+		if ( ! eregi("convert$", $this->library_path)) 
+		{
+			if ( ! eregi("/$", $this->library_path)) $this->library_path .= "/";
+		
+			$this->library_path .= 'convert';
+		}
+		
+		// Execute the command
+		$cmd = $this->library_path." -quality ".$this->quality;
+	
+		if ($action == 'crop')
+		{
+			$cmd .= " -crop ".$this->width."x".$this->height."+".$this->x_axis."+".$this->y_axis." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1";
+		}
+		elseif ($action == 'rotate')
+		{
+			switch ($this->rotation_angle)
+			{
+				case 'hor' 	: $angle = '-flop';
+					break;
+				case 'vrt' 	: $angle = '-flip';
+					break;
+				default		: $angle = '-rotate '.$this->rotation_angle;
+					break;
+			}			
+		
+			$cmd .= " ".$angle." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1";
+		}
+		else  // Resize
+		{
+			$cmd .= " -resize ".$this->width."x".$this->height." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1";
+		}
+	
+		$retval = 1;
+	
+		@exec($cmd, $output, $retval);
+
+		//	Did it work?	
+		if ($retval > 0) 
+		{
+			$this->set_error('imglib_image_process_failed');
+			return FALSE;
+		}
+		
+		// Set the file to 777
+		@chmod($this->full_dst_path, 0777);            
+		
+		return TRUE;
+	}
+	// END image_process_imagemagick()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Image Process Using NetPBM
+	 *
+	 * This function will resize, crop or rotate
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */		
+	function image_process_netpbm($action = 'resize')
+	{
+		if ($this->library_path == '')
+		{
+			$this->set_error('imglib_libpath_invalid');
+			return FALSE;
+		}
+			
+		//  Build the resizing command
+		switch ($this->image_type)
+		{
+			case 1 :
+						$cmd_in		= 'giftopnm';
+						$cmd_out	= 'ppmtogif';
+				break;
+			case 2 :
+						$cmd_in		= 'jpegtopnm';
+						$cmd_out	= 'ppmtojpeg';			
+				break;
+			case 3 :
+						$cmd_in		= 'pngtopnm';
+						$cmd_out	= 'ppmtopng';
+				break;
+		}
+		
+		if ($action == 'crop')
+		{
+			$cmd_inner = 'pnmcut -left '.$this->x_axis.' -top '.$this->y_axis.' -width '.$this->width.' -height '.$this->height;
+		}
+		elseif ($action == 'rotate')
+		{
+			switch ($this->rotation_angle)
+			{
+				case 90		:	$angle = 'r270';
+					break;
+				case 180	:	$angle = 'r180';
+					break;
+				case 270 	:	$angle = 'r90';
+					break;
+				case 'vrt'	:	$angle = 'tb';
+					break;
+				case 'hor'	:	$angle = 'lr';
+					break;
+			}
+		
+			$cmd_inner = 'pnmflip -'.$angle.' ';
+		}
+		else // Resize
+		{
+			$cmd_inner = 'pnmscale -xysize '.$this->width.' '.$this->height;
+		}
+						
+		$cmd = $this->library_path.$cmd_in.' '.$this->full_src_path.' | '.$cmd_inner.' | '.$cmd_out.' > '.$this->dest_folder.'netpbm.tmp';
+		
+		$retval = 1;
+		
+		@exec($cmd, $output, $retval);
+		
+		//  Did it work?
+		if ($retval > 0) 
+		{
+			$this->set_error('imglib_image_process_failed');
+			return FALSE;
+		}
+		
+		// With NetPBM we have to create a temporary image.
+		// If you try manipulating the original it fails so
+		// we have to rename the temp file.
+		copy ($this->dest_folder.'netpbm.tmp', $this->full_dst_path);
+		unlink ($this->dest_folder.'netpbm.tmp');
+		@chmod($dst_image, 0777);            
+		
+		return TRUE;
+	}
+	// END image_process_netpbm()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Image Rotate Using GD
+	 *
+	 * @access	public
+	 * @return	bool
+	 */		
+	function image_rotate_gd()
+	{	
+		// Is Image Rotation Supported?
+		// this function is only supported as of PHP 4.3
+		if ( ! function_exists('imagerotate'))
+		{ 
+			$this->set_error('imglib_rotate_unsupported');
+			return FALSE;
+		}
+		
+		//  Create the image handle
+		if ( ! ($src_img = $this->image_create_gd()))
+		{		
+			return FALSE;
+		}
+
+		// Set the background color		
+		// This won't work with transparent PNG files so we are
+		// going to have to figure out how to determine the color
+		// of the alpha channel in a future release.
+	
+		$white	= imagecolorallocate($src_img, 255, 255, 255);
+
+		//  Rotate it!
+		$dst_img = imagerotate($src_img, $this->rotation_angle, $white);
+	
+		//  Save the Image
+		if ($this->dynamic_output == TRUE)
+		{ 
+			$this->image_display_gd($dst_img);
+		}
+		else
+		{
+			// Or save it
+			if ( ! $this->image_save_gd($dst_img))
+			{
+				return FALSE;
+			}
+		}
+
+		//  Kill the file handles
+		imagedestroy($dst_img); 
+		imagedestroy($src_img);
+		
+		// Set the file to 777
+		
+		@chmod($this->full_dst_path, 0777);            
+		
+		return true;
+	}
+	// END image_rotate_gd()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Create Mirror Image using GD
+	 *
+	 * This function will flip horizontal or vertical
+	 *
+	 * @access	public
+	 * @return	bool
+	 */			
+	function image_mirror_gd()
+	{		
+		if ( ! $src_img = $this->image_create_gd())
+		{
+			return FALSE;
+		}
+		
+		$width  = $this->orig_width;
+		$height = $this->orig_height;
+	
+		if ($this->rotation_angle == 'hor')
+		{
+			for ($i = 0; $i < $height; $i++)
+			{         
+				$left  = 0; 
+				$right = $width-1; 
+	
+				while ($left < $right)
+				{ 
+					$cl = imagecolorat($src_img, $left, $i); 
+					$cr = imagecolorat($src_img, $right, $i);
+					
+					imagesetpixel($src_img, $left, $i, $cr); 
+					imagesetpixel($src_img, $right, $i, $cl); 
+					
+					$left++; 
+					$right--; 
+				} 
+			}
+		}
+		else
+		{
+			for ($i = 0; $i < $width; $i++)
+			{         
+				$top = 0; 
+				$bot = $height-1; 
+	
+				while ($top < $bot)
+				{ 
+					$ct = imagecolorat($src_img, $i, $top);
+					$cb = imagecolorat($src_img, $i, $bot);
+					
+					imagesetpixel($src_img, $i, $top, $cb); 
+					imagesetpixel($src_img, $i, $bot, $ct); 
+					
+					$top++; 
+					$bot--; 
+				} 
+			}		
+		}		
+
+		//  Show the image
+		if ($this->dynamic_output == TRUE)
+		{ 
+			$this->image_display_gd($src_img);
+		}
+		else
+		{
+			// Or save it
+			if ( ! $this->image_save_gd($src_img))
+			{
+				return FALSE;
+			}
+		}
+		
+		//  Kill the file handles
+		imagedestroy($src_img);
+		
+		// Set the file to 777
+		@chmod($this->full_dst_path, 0777);            
+		
+		return TRUE;
+	}
+	// END image_mirror_gd()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Image Watermark
+	 *
+	 * This is a wrapper function that chooses the type
+	 * of watermarking based on the specified preference.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function watermark()
+	{
+		if ($this->wm_type == 'overlay')
+		{
+			return $this->overlay_watermark();
+		}
+		else
+		{
+			return $this->text_watermark();
+		}
+	}
+	// END image_mirror_gd()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Watermark - Graphic Version
+	 *
+	 * @access	public
+	 * @return	bool
+	 */			
+	function overlay_watermark()
+	{
+		if ( ! function_exists('imagecolortransparent'))
+		{
+			$this->set_error('imglib_gd_required');
+			return FALSE;		
+		}
+	
+		//  Fetch source image properties
+		$this->get_image_properties();
+
+		//  Fetch watermark image properties
+		$props 			= $this->get_image_properties($this->wm_overlay_path, TRUE);	
+		$wm_img_type	= $props['image_type'];
+		$wm_width		= $props['width'];
+		$wm_height		= $props['height'];
+	
+		//  Create two image resources	
+		$wm_img  = $this->image_create_gd($this->wm_overlay_path, $wm_img_type);
+		$src_img = $this->image_create_gd($this->full_src_path);
+		
+		// Reverse the offset if necessary		
+		// When the image is positioned at the bottom
+		// we don't want the vertical offset to push it
+		// further down.  We want the reverse, so we'll
+		// invert the offset.  Same with the horizontal
+		// offset when the image is at the right
+		
+		$this->wm_vrt_alignment = strtoupper(substr($this->wm_vrt_alignment, 0, 1));
+		$this->wm_hor_alignment = strtoupper(substr($this->wm_hor_alignment, 0, 1));
+	
+		if ($this->wm_vrt_alignment == 'B')
+			$this->wm_vrt_offset = $this->wm_vrt_offset * -1;
+	
+		if ($this->wm_hor_alignment == 'R')
+			$this->wm_hor_offset = $this->wm_hor_offset * -1;
+
+		//  Set the base x and y axis values
+		$x_axis = $this->wm_hor_offset + $this->wm_padding;
+		$y_axis = $this->wm_vrt_offset + $this->wm_padding;
+
+		//  Set the vertical position
+		switch ($this->wm_vrt_alignment)
+		{
+			case 'T':
+				break;
+			case 'M':	$y_axis += ($this->orig_height / 2) - ($wm_height / 2);
+				break;
+			case 'B':	$y_axis += $this->orig_height - $wm_height;
+				break;
+		}
+
+		//  Set the horizontal position
+		switch ($this->wm_hor_alignment)
+		{
+			case 'L':
+				break;	
+			case 'C':	$x_axis += ($this->orig_width / 2) - ($wm_width / 2);
+				break;
+			case 'R':	$x_axis += $this->orig_width - $wm_width;
+				break;
+		}
+	
+		//  Build the finalized image			
+		if ($wm_img_type == 3 AND function_exists('imagealphablending')) 
+		{ 
+			@imagealphablending($src_img, TRUE);
+		} 		
+
+		// Set RGB values for text and shadow		
+		imagecolortransparent($wm_img, imagecolorat($wm_img, $this->wm_x_transp, $this->wm_y_transp));
+		imagecopymerge($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height, $this->wm_opacity);
+				
+		//  Output the image
+		if ($this->dynamic_output == TRUE)
+		{ 
+			$this->image_display_gd($src_img);
+		}
+		else
+		{
+			if ( ! $this->image_save_gd($src_img))
+			{
+				return FALSE;
+			}
+		}
+		
+		imagedestroy($src_img);
+		imagedestroy($wm_img);
+				
+		return TRUE;
+	}
+	// END overlay_watermark()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Watermark - Text Version
+	 *
+	 * @access	public
+	 * @return	bool
+	 */			
+	function text_watermark() 
+	{
+		if ( ! ($src_img = $this->image_create_gd()))
+		{		
+			return FALSE;
+		}
+				
+		if ($this->wm_use_truetype == TRUE AND ! file_exists($this->wm_font_path))
+		{
+			$this->set_error('imglib_missing_font');
+			return FALSE;
+		}
+		
+		//  Fetch source image properties		
+		$this->get_image_properties();				
+		
+		// Set RGB values for text and shadow		
+		$this->wm_font_color	= str_replace('#', '', $this->wm_font_color);
+		$this->wm_shadow_color	= str_replace('#', '', $this->wm_shadow_color);
+		
+		$R1 = hexdec(substr($this->wm_font_color, 0, 2));
+		$G1 = hexdec(substr($this->wm_font_color, 2, 2));
+		$B1 = hexdec(substr($this->wm_font_color, 4, 2));
+	
+		$R2 = hexdec(substr($this->wm_shadow_color, 0, 2));
+		$G2 = hexdec(substr($this->wm_shadow_color, 2, 2));
+		$B2 = hexdec(substr($this->wm_shadow_color, 4, 2));
+		
+		$txt_color	= imagecolorclosest($src_img, $R1, $G1, $B1);
+		$drp_color	= imagecolorclosest($src_img, $R2, $G2, $B2);
+
+		// Reverse the vertical offset
+		// When the image is positioned at the bottom
+		// we don't want the vertical offset to push it
+		// further down.  We want the reverse, so we'll
+		// invert the offset.  Note: The horizontal
+		// offset flips itself automatically
+	
+		if ($this->wm_vrt_alignment == 'B')
+			$this->wm_vrt_offset = $this->wm_vrt_offset * -1;
+			
+		if ($this->wm_hor_alignment == 'R')
+			$this->wm_hor_offset = $this->wm_hor_offset * -1;
+
+		// Set font width and height
+		// These are calculated differently depending on
+		// whether we are using the true type font or not
+		if ($this->wm_use_truetype == TRUE)
+		{
+			if ($this->wm_font_size == '')
+				$this->wm_font_size = '17';
+		
+			$fontwidth  = $this->wm_font_size-($this->wm_font_size/4);
+			$fontheight = $this->wm_font_size;
+			$this->wm_vrt_offset += $this->wm_font_size;
+		}
+		else
+		{
+			$fontwidth  = imagefontwidth($this->wm_font_size);
+			$fontheight = imagefontheight($this->wm_font_size);
+		}
+
+		// Set base X and Y axis values
+		$x_axis = $this->wm_hor_offset + $this->wm_padding;
+		$y_axis = $this->wm_vrt_offset + $this->wm_padding;
+
+		// Set verticle alignment
+		if ($this->wm_use_drop_shadow == FALSE)
+			$this->wm_shadow_distance = 0;
+			
+		$this->wm_vrt_alignment = strtoupper(substr($this->wm_vrt_alignment, 0, 1));
+		$this->wm_hor_alignment = strtoupper(substr($this->wm_hor_alignment, 0, 1));
+	
+		switch ($this->wm_vrt_alignment) 
+		{
+			case	 "T" :
+				break;
+			case "M":	$y_axis += ($this->orig_height/2)+($fontheight/2);
+				break;
+			case "B":	$y_axis += ($this->orig_height - $fontheight - $this->wm_shadow_distance - ($fontheight/2));
+				break;
+		}
+	
+		$x_shad = $x_axis + $this->wm_shadow_distance;
+		$y_shad = $y_axis + $this->wm_shadow_distance;
+		
+		// Set horizontal alignment
+		switch ($this->wm_hor_alignment) 
+		{
+			case "L":
+				break;
+			case "R":
+						if ($this->wm_use_drop_shadow)
+							$x_shad += ($this->orig_width - $fontwidth*strlen($this->wm_text));
+							$x_axis += ($this->orig_width - $fontwidth*strlen($this->wm_text));
+				break;
+			case "C":
+						if ($this->wm_use_drop_shadow)
+							$x_shad += floor(($this->orig_width - $fontwidth*strlen($this->wm_text))/2);
+							$x_axis += floor(($this->orig_width  -$fontwidth*strlen($this->wm_text))/2);
+				break;
+		}
+		
+		//  Add the text to the source image
+		if ($this->wm_use_truetype)
+		{	
+			if ($this->wm_use_drop_shadow)
+				imagettftext($src_img, $this->wm_font_size, 0, $x_shad, $y_shad, $drp_color, $this->wm_font_path, $this->wm_text);
+				imagettftext($src_img, $this->wm_font_size, 0, $x_axis, $y_axis, $txt_color, $this->wm_font_path, $this->wm_text);
+		}
+		else
+		{
+			if ($this->wm_use_drop_shadow)
+				imagestring($src_img, $this->wm_font_size, $x_shad, $y_shad, $this->wm_text, $drp_color);
+				imagestring($src_img, $this->wm_font_size, $x_axis, $y_axis, $this->wm_text, $txt_color);
+		}
+	
+		//  Output the final image
+		if ($this->dynamic_output == TRUE)
+		{ 
+			$this->image_display_gd($src_img);
+		}
+		else
+		{
+			$this->image_save_gd($src_img);
+		}
+		
+		imagedestroy($src_img);
+	
+		return TRUE;
+	}
+	// END text_watermark()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Create Image - GD
+	 *
+	 * This simply creates an image resource handle
+	 * based on the type of image being processed
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	resource
+	 */			
+	function image_create_gd($path = '', $image_type = '')
+	{
+		if ($path == '')
+			$path = $this->full_src_path;
+			
+		if ($image_type == '')
+			$image_type = $this->image_type;
+	
+		
+		switch ($image_type)
+		{
+			case	 1 :
+						if ( ! function_exists('imagecreatefromgif'))
+						{
+							$this->set_error(array('imglib_unsupported_imagecreate', 'imglib_gif_not_supported'));
+							return FALSE;
+						}
+					
+						return imagecreatefromgif($path);
+				break;
+			case 2 :
+						if ( ! function_exists('imagecreatefromjpeg'))
+						{
+							$this->set_error(array('imglib_unsupported_imagecreate', 'imglib_jpg_not_supported'));
+							return FALSE;
+						}
+					
+						return imagecreatefromjpeg($path);
+				break;
+			case 3 :
+						if ( ! function_exists('imagecreatefrompng'))
+						{
+							$this->set_error(array('imglib_unsupported_imagecreate', 'imglib_png_not_supported'));				
+							return FALSE;
+						}
+					
+						return imagecreatefrompng($path);
+				break;			
+		
+		}
+		
+		$this->set_error(array('imglib_unsupported_imagecreate'));
+		return FALSE;
+	}
+	// END image_create_gd()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Write imge file to disk - GD
+	 *
+	 * Takes an image resource as input and writes the file 
+	 * to the specified destination
+	 *
+	 * @access	public
+	 * @param	resource
+	 * @return	bool
+	 */			
+	function image_save_gd($resource)
+	{	
+		switch ($this->image_type)
+		{
+			case 1 :
+						if ( ! function_exists('imagegif'))
+						{
+							$this->set_error(array('imglib_unsupported_imagecreate', 'imglib_gif_not_supported'));
+							return FALSE;		
+						}
+						
+						@imagegif($resource, $this->full_dst_path);
+				break;
+			case 2	:
+						if ( ! function_exists('imagejpeg'))
+						{
+							$this->set_error(array('imglib_unsupported_imagecreate', 'imglib_jpg_not_supported'));
+							return FALSE;		
+						}
+						
+						if (phpversion() == '4.4.1')
+						{
+							@touch($this->full_dst_path); // PHP 4.4.1 bug #35060 - workaround
+						}
+						
+						@imagejpeg($resource, $this->full_dst_path, $this->quality);
+				break;
+			case 3	:
+						if ( ! function_exists('imagepng'))
+						{
+							$this->set_error(array('imglib_unsupported_imagecreate', 'imglib_png_not_supported'));
+							return FALSE;		
+						}
+					
+						@imagepng($resource, $this->full_dst_path);
+				break;
+			default		:
+							$this->set_error(array('imglib_unsupported_imagecreate'));
+							return FALSE;		
+				break;		
+		}
+	
+		return TRUE;
+	}	
+	// END image_save_gd()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Dynamically ouputs an image
+	 *
+	 * @access	public
+	 * @param	resource
+	 * @return	void
+	 */			
+	function image_display_gd($resource)
+	{		
+		header("Content-Disposition: filename={$this->source_image};");
+		header("Content-Type: {$this->mime_type}");
+		header('Content-Transfer-Encoding: binary');
+		header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT'); 
+	
+		switch ($this->image_type)
+		{
+			case 1 		:	imagegif($resource);
+				break;
+			case 2		:	imagejpeg($resource, '', $this->quality);
+				break;
+			case 3		:	imagepng($resource);
+				break;
+			default		:	echo 'Unable to display the image';
+				break;		
+		}			
+	}
+	// END image_display_gd()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Reproportion Image Width/Height
+	 *
+	 * When creating thumbs, the desired width/height
+	 * can end up warping the image due to an incorrect 
+	 * ratio between the full-sized image and the thumb. 
+	 * 
+	 * This function lets us reproportion the width/height
+	 * if users choose to maintain the aspect ratio when resizing.
+	 *
+	 * @access	public
+	 * @return	void
+	 */			
+	function image_reproportion()
+	{
+		if ( ! is_numeric($this->width) OR ! is_numeric($this->height) OR $this->width == 0 OR $this->height == 0)
+			return;
+		
+		if ( ! is_numeric($this->orig_width) OR ! is_numeric($this->orig_height) OR $this->orig_width == 0 OR $this->orig_height == 0)
+			return;
+		
+		$new_width	= ceil($this->orig_width*$this->height/$this->orig_height);		
+		$new_height	= ceil($this->width*$this->orig_height/$this->orig_width);
+		
+		$ratio = (($this->orig_height/$this->orig_width) - ($this->height/$this->width));
+	
+		if ($this->master_dim != 'width' AND $this->master_dim != 'height')
+		{
+			$this->master_dim = ($ratio < 0) ? 'width' : 'height';
+		}
+		
+		if (($this->width != $new_width) AND ($this->height != $new_height))
+		{
+			if ($this->master_dim == 'height')
+			{
+				$this->width = $new_width;
+			}
+			else
+			{
+				$this->height = $new_height;
+			}
+		}
+	}	
+	// END image_reproportion()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Get image properties
+	 *
+	 * A helper function that gets info about the file
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	mixed
+	 */			
+	function get_image_properties($path = '', $return = FALSE)
+	{
+		// For now we require GD but we should
+		// find a way to determine this using IM or NetPBM
+		
+		if ($path == '')
+			$path = $this->full_src_path;
+				
+		if ( ! file_exists($path))
+		{
+			$this->set_error('imglib_invalid_path');		
+			return FALSE;				
+		}
+		
+		$vals = @getimagesize($path);
+		
+		$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
+		
+		$mime = (isset($types[$vals['2']])) ? 'image/'.$types[$vals['2']] : 'image/jpg';
+				
+		if ($return == TRUE)
+		{
+			$v['width']			= $vals['0'];
+			$v['height']		= $vals['1'];
+			$v['image_type']	= $vals['2'];
+			$v['size_str']		= $vals['3']; 
+			$v['mime_type']		= $mime;
+			
+			return $v;
+		}
+		
+		$this->orig_width	= $vals['0'];
+		$this->orig_height	= $vals['1'];
+		$this->image_type	= $vals['2'];
+		$this->size_str		= $vals['3']; 
+		$this->mime_type	= $mime; 
+		
+		return TRUE;
+	}
+	// END get_image_properties()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Size calculator
+	 *
+	 * This function takes a known width x height and
+	 * recalculates it to a new size.  Only one
+	 * new variable needs to be known
+	 *
+	 *	$props = array(
+	 *					'width' 		=> $width,
+	 *					'height' 		=> $height,
+	 *					'new_width'		=> 40,
+	 *					'new_height'	=> ''
+	 *				  );    
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	array
+	 */			
+	function size_calculator($vals)
+	{
+		if ( ! is_array($vals))
+			return;
+			
+		$allowed = array('new_width', 'new_height', 'width', 'height');
+	
+		foreach ($allowed as $item)
+		{
+			if ( ! isset($vals[$item]) OR $vals[$item] == '')
+				$vals[$item] = 0;
+		}
+		
+		if ($vals['width'] == 0 OR $vals['height'] == 0)
+		{
+			return $vals;
+		}
+			
+		if ($vals['new_width'] == 0)
+		{
+			$vals['new_width'] = ceil($vals['width']*$vals['new_height']/$vals['height']);
+		}
+		elseif ($vals['new_height'] == 0)
+		{
+			$vals['new_height'] = ceil($vals['new_width']*$vals['height']/$vals['width']);
+		}
+	
+		return $vals;
+	}
+	// END size_calculator()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Explode source_image
+	 *
+	 * This is a helper function that extracts the extension
+	 * from the source_image.  This function lets us deal with
+	 * source_images with multiple periods, like:  my.cool.jpg
+	 * It returns an associative array with two elements:
+	 * $array['ext']  = '.jpg';
+	 * $array['name'] = 'my.cool';
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	array
+	 */	
+	function explode_name($source_image)
+	{
+		$x = explode('.', $source_image);
+		$ret['ext'] = '.'.end($x);
+		
+		$name = '';
+		
+		$ct = count($x)-1;
+		
+		for ($i = 0; $i < $ct; $i++)
+		{
+			$name .= $x[$i];
+			
+			if ($i < ($ct - 1))
+			{
+				$name .= '.';
+			}
+		}
+		
+		$ret['name'] = $name;
+		
+		return $ret;
+	}	
+	// END explode_name()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Is GD Installed?
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function gd_loaded()
+	{
+		if ( ! extension_loaded('gd'))
+		{
+			if ( ! dl('gd.so'))
+			{
+				return FALSE;
+			}
+		}
+		
+		return TRUE;
+	}
+	// END gd_loaded()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Get GD version
+	 *
+	 * @access	public
+	 * @return	mixed
+	 */	
+	function gd_version()
+	{
+		if (function_exists('gd_info'))
+		{
+			$gd_version = @gd_info();
+			$gd_version = preg_replace("/\D/", "", $gd_version['GD Version']);
+			
+			return $gd_version;
+		}
+		
+		return FALSE;
+	}
+	// END gd_version()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set error message
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_error($msg)
+	{
+		$obj =& get_instance();
+		$obj->lang->load('imglib');
+		
+		if (is_array($msg))
+		{
+			foreach ($msg as $val)
+			{
+				
+				$msg = ($obj->lang->line($val) == FALSE) ? $val : $obj->lang->line($val);
+				$this->error_msg[] = $msg;
+				log_message('error', $msg);
+			}		
+		}
+		else
+		{
+			$msg = ($obj->lang->line($msg) == FALSE) ? $msg : $obj->lang->line($msg);
+			$this->error_msg[] = $msg;
+			log_message('error', $msg);
+		}
+	}
+	// END set_error()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Show error messages
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function display_errors($open = '
', $close = '
')
+	{	
+		$str = '';
+		foreach ($this->error_msg as $val)
+		{
+			$str .= $open.$val.$close;
+		}
+	
+		return $str;
+	}
+	// END display_errors()
+}
+// END Image_lib Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Input.php b/system/libraries/Input.php
new file mode 100644
index 00000000..6aba5dd4
--- /dev/null
+++ b/system/libraries/Input.php
@@ -0,0 +1,585 @@
+use_xss_clean	= ($CFG->item('global_xss_filtering') === TRUE) ? TRUE : FALSE;
+		$this->allow_get_array	= ($CFG->item('enable_query_strings') === TRUE) ? TRUE : FALSE;
+		
+		log_message('debug', "Input Class Initialized");
+		$this->_sanitize_globals();
+	}
+	// END CI_Input()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Sanitize Globals
+	 *
+	 * This function does the folowing:
+	 *
+	 * Unsets $_GET data (if query strings are not enabled)
+	 *
+	 * Unsets all globals if register_globals is enabled
+	 *
+	 * Standardizes newline characters to \n
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _sanitize_globals()
+	{
+		// Unset globals. This is effectively the same as register_globals = off
+		foreach (array($_GET, $_POST, $_COOKIE) as $global)
+		{
+			if ( ! is_array($global))
+			{
+				unset($$global);
+			}
+			else
+			{
+				foreach ($global as $key => $val)
+				{
+					unset($$key);
+				}    
+			}
+		}
+
+		// Is $_GET data allowed?
+		if ($this->allow_get_array == FALSE)
+		{
+			$_GET = array();
+		}
+		
+		// Clean $_POST Data
+		if (is_array($_POST) AND count($_POST) > 0)
+		{
+			foreach($_POST as $key => $val)
+			{                
+				if (is_array($val))
+				{ 	
+					foreach($val as $k => $v)
+					{                    
+						$_POST[$this->_clean_input_keys($key)][$this->_clean_input_keys($k)] = $this->_clean_input_data($v);
+					}
+				}
+				else
+				{
+					$_POST[$this->_clean_input_keys($key)] = $this->_clean_input_data($val);
+				}
+			}            
+		}
+	
+		// Clean $_COOKIE Data
+		if (is_array($_COOKIE) AND count($_COOKIE) > 0)
+		{
+			foreach($_COOKIE as $key => $val)
+			{              
+				$_COOKIE[$this->_clean_input_keys($key)] = $this->_clean_input_data($val);
+			}    
+		}
+		
+		log_message('debug', "Global POST and COOKIE data sanitized");
+	}	
+	// END _sanitize_globals()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Clean Intput Data
+	 *
+	 * This is a helper function. It escapes data and 
+	 * standardizes newline characters to \n
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */	
+	function _clean_input_data($str)
+	{
+		if (is_array($str))
+		{
+			$new_array = array();
+			foreach ($str as $key => $val)
+			{
+				$new_array[$key] = $this->_clean_input_data($val);
+			}
+			return $new_array;
+		}
+		
+		if ($this->use_xss_clean === TRUE)
+		{
+			$str = $this->xss_clean($str);
+		}
+		
+		return preg_replace("/\015\012|\015|\012/", "\n", $str);
+	}
+	// END _clean_input_data()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Clean Keys
+	 *
+	 * This is a helper function. To prevent malicious users 
+	 * from trying to exploit keys we make sure that keys are 
+	 * only named with alpha-numeric text and a few other items.
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */
+	function _clean_input_keys($str)
+	{    
+		 if ( ! preg_match("/^[a-z0-9:_\/-]+$/i", $str))
+		 { 
+			exit('Disallowed Key Characters: '.$str);
+		 }
+	
+		if ( ! get_magic_quotes_gpc())
+		{
+		   return addslashes($str);
+		}
+		
+		return $str;
+	}
+	// END _clean_input_keys()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch an item from the POST array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function post($index = '', $xss_clean = FALSE)
+	{		
+		if ( ! isset($_POST[$index]))
+		{
+			return FALSE;
+		}
+		else
+		{
+			if ($xss_clean === TRUE)
+			{
+				return $this->xss_clean($_POST[$index]);
+			}
+			else
+			{
+				return $_POST[$index];
+			}
+		}
+	}
+	// END post()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch an item from the COOKIE array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function cookie($index = '', $xss_clean = FALSE)
+	{
+		if ( ! isset($_COOKIE[$index]))
+		{
+			return FALSE;
+		}
+		else
+		{
+			if ($xss_clean === TRUE)
+			{
+				return $this->xss_clean($_COOKIE[$index]);
+			}
+			else
+			{
+				return $_COOKIE[$index];
+			}
+		}
+	}
+	// END cookie()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch the IP Address
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function ip_address()
+	{
+		if ($this->ip_address !== FALSE)
+		{
+			return $this->ip_address;
+		}
+	
+		$cip = (isset($_SERVER['HTTP_CLIENT_IP']) AND $_SERVER['HTTP_CLIENT_IP'] != "") ? $_SERVER['HTTP_CLIENT_IP'] : FALSE;
+		$rip = (isset($_SERVER['REMOTE_ADDR']) AND $_SERVER['REMOTE_ADDR'] != "") ? $_SERVER['REMOTE_ADDR'] : FALSE;
+		$fip = (isset($_SERVER['HTTP_X_FORWARDED_FOR']) AND $_SERVER['HTTP_X_FORWARDED_FOR'] != "") ? $_SERVER['HTTP_X_FORWARDED_FOR'] : FALSE;
+					
+		if ($cip && $rip)	$this->ip_address = $cip;	
+		elseif ($rip)		$this->ip_address = $rip;
+		elseif ($cip)		$this->ip_address = $cip;
+		elseif ($fip)		$this->ip_address = $fip;
+		
+		if (strstr($this->ip_address, ','))
+		{
+			$x = explode(',', $this->ip_address);
+			$this->ip_address = end($x);
+		}
+		
+		if ( ! $this->valid_ip($this->ip_address))
+		{
+			$this->ip_address = '0.0.0.0';
+		}
+		
+		unset($cip);
+		unset($rip);
+		unset($fip);
+		
+		return $this->ip_address;
+	}
+	// END ip_address()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Validate IP Address
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function valid_ip($ip)
+	{
+		return ( ! preg_match( "/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $ip)) ? FALSE : TRUE;
+	}
+	// END valid_ip()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * User Agent
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function user_agent()
+	{
+		if ($this->user_agent !== FALSE)
+		{
+			return $this->user_agent;
+		}
+	
+		$this->user_agent = ( ! isset($_SERVER['HTTP_USER_AGENT'])) ? FALSE : $_SERVER['HTTP_USER_AGENT'];
+		
+		return $this->user_agent;
+	}
+	// END user_agent()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * XSS Clean
+	 *
+	 * Sanitizes data so that Cross Site Scripting Hacks can be
+	 * prevented.Ê This function does a fair amount of work but
+	 * it is extremely thorough, designed to prevent even the
+	 * most obscure XSS attempts.Ê Nothing is ever 100% foolproof,
+	 * of course, but I haven't been able to get anything passed
+	 * the filter.
+	 *
+	 * Note: This function should only be used to deal with data
+	 * upon submission.Ê It's not something that should
+	 * be used for general runtime processing.
+	 *
+	 * This function was based in part on some code and ideas I
+	 * got from Bitflux: http://blog.bitflux.ch/wiki/XSS_Prevention
+	 *
+	 * To help develop this script I used this great list of
+	 * vulnerabilities along with a few other hacks I've 
+	 * harvested from examining vulnerabilities in other programs:
+	 * http://ha.ckers.org/xss.html
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function xss_clean($str, $charset = 'ISO-8859-1')
+	{	
+		/*
+		 * Remove Null Characters
+		 *
+		 * This prevents sandwiching null characters
+		 * between ascii characters, like Java\0script.
+		 *
+		 */
+		$str = preg_replace('/\0+/', '', $str);
+		$str = preg_replace('/(\\\\0)+/', '', $str);
+
+		/*
+		 * Validate standard character entites
+		 *
+		 * Add a semicolon if missing.  We do this to enable
+		 * the conversion of entities to ASCII later.
+		 *
+		 */
+		$str = preg_replace('#(&\#*\w+)[\x00-\x20]+;#u',"\\1;",$str);
+		
+		/*
+		 * Validate UTF16 two byte encodeing (x00) 
+		 *
+		 * Just as above, adds a semicolon if missing.
+		 *
+		 */
+		$str = preg_replace('#(&\#x*)([0-9A-F]+);*#iu',"\\1\\2;",$str);
+
+		/*
+		 * URL Decode
+		 *
+		 * Just in case stuff like this is submitted:
+		 *
+		 * Google
+		 *
+		 * Note: Normally urldecode() would be easier but it removes plus signs
+		 *
+		 */	
+		$str = preg_replace("/%u0([a-z0-9]{3})/i", "&#x\\1;", $str);
+		$str = preg_replace("/%([a-z0-9]{2})/i", "&#x\\1;", $str);        
+        		
+		/*
+		 * Convert character entities to ASCII 
+		 *
+		 * This permits our tests below to work reliably.
+		 * We only convert entities that are within tags since
+		 * these are the ones that will pose security problems.
+		 *
+		 */
+		 
+        if (preg_match_all("/<(.+?)>/si", $str, $matches))
+        {        
+			for ($i = 0; $i < count($matches['0']); $i++)
+			{
+				$str = str_replace($matches['1'][$i], 
+									$this->_html_entity_decode($matches['1'][$i], $charset), 
+									$str);
+			}
+		}
+	
+		/*
+		 * Convert all tabs to spaces
+		 *
+		 * This prevents strings like this: ja	vascript
+		 * Note: we deal with spaces between characters later.
+		 *
+		 */		
+		$str = preg_replace("#\t+#", " ", $str);
+	
+		/*
+		 * Makes PHP tags safe
+		 *
+		 *  Note: XML tags are inadvertently replaced too:
+		 *
+		 *	'),  array('<?php', '<?PHP', '<?', '?>'), $str); // .*?#si", "", $str);
+		 $str = preg_replace("##si", "", $str);
+		 $str = preg_replace("#<(script|xss).*?\>#si", "", $str);
+
+		/*
+		 * Remove JavaScript Event Handlers
+		 *
+		 * Note: This code is a little blunt.  It removes
+		 * the event handler and anything up to the closing >, 
+		 * but it's unlkely to be a problem.
+		 *
+		 */		
+		 $str = preg_replace('#(<[^>]+.*?)(onblur|onchange|onclick|onfocus|onload|onmouseover|onmouseup|onmousedown|onselect|onsubmit|onunload|onkeypress|onkeydown|onkeyup|onresize)[^>]*>#iU',"\\1>",$str);
+	
+		/*
+		 * Sanitize naughty HTML elements
+		 *
+		 * If a tag containing any of the words in the list 
+		 * below is found, the tag gets converted to entities.
+		 *
+		 * So this: 
+		 * Becomes: <blink>
+		 *
+		 */		
+		$str = preg_replace('#<(/*\s*)(alert|applet|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|layer|link|meta|object|plaintext|style|script|textarea|title|xml|xss)([^>]*)>#is', "<\\1\\2\\3>", $str);
+		
+		/*
+		 * Sanitize naughty scripting elements
+		 *
+		 * Similar to above, only instead of looking for
+		 * tags it looks for PHP and JavaScript commands
+		 * that are disallowed.  Rather than removing the
+		 * code, it simply converts the parenthesis to entities
+		 * rendering the code unexecutable.
+		 *
+		 * For example:	eval('some code')
+		 * Becomes:		eval('some code')
+		 *
+		 */
+		$str = preg_replace('#(alert|cmd|passthru|eval|exec|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str);
+						
+		/*
+		 * Final clean up
+		 *
+		 * This adds a bit of extra precaution in case
+		 * something got through the above filters
+		 *
+		 */	
+		$bad = array(
+						'document.cookie'	=> '',
+						'document.write'	=> '',
+						'window.location'	=> '',
+						"javascript\s*:"	=> '',
+						"Redirect\s+302"	=> '',
+						''				=> '-->'
+					);
+	
+		foreach ($bad as $key => $val)
+		{
+			$str = preg_replace("#".$key."#i", $val, $str);   
+		}
+		
+                        
+		log_message('debug', "XSS Filtering completed");
+		return $str;
+	}
+	// END xss_clean()
+
+
+	/**
+	 * HTML Entities Decode
+	 *
+	 * This function is a replacement for html_entity_decode()
+	 *
+	 * In some versions of PHP the native function does not work
+	 * when UTF-8 is the specified character set, so this gives us
+	 * a work-around.  More info here:
+	 * http://bugs.php.net/bug.php?id=25670
+	 *
+	 * @access	private
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */
+	/* -------------------------------------------------
+    /*  Replacement for html_entity_decode()
+    /* -------------------------------------------------*/
+    
+    /*
+    NOTE: html_entity_decode() has a bug in some PHP versions when UTF-8 is the 
+    character set, and the PHP developers said they were not back porting the
+    fix to versions other than PHP 5.x.
+    */
+	function _html_entity_decode($str, $charset='ISO-8859-1') 
+	{
+		if (stristr($str, '&') === FALSE) return $str;
+	
+		// The reason we are not using html_entity_decode() by itself is because
+		// while it is not technically correct to leave out the semicolon
+		// at the end of an entity most browsers will still interpret the entity
+		// correctly.  html_entity_decode() does not convert entities without
+		// semicolons, so we are left with our own little solution here. Bummer.
+	
+		if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR version_compare(phpversion(), '5.0.0', '>=')))
+		{
+			$str = html_entity_decode($str, ENT_COMPAT, $charset);
+			$str = preg_replace('~&#x([0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str);
+			return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str);
+		}
+		
+		// Numeric Entities
+		$str = preg_replace('~&#x([0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str);
+		$str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str);
+	
+		// Literal Entities - Slightly slow so we do another check
+		if (stristr($str, '&') === FALSE)
+		{
+			$str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES)));
+		}
+		
+		return $str;
+	}
+
+}
+// END Input class
+?>
\ No newline at end of file
diff --git a/system/libraries/Language.php b/system/libraries/Language.php
new file mode 100644
index 00000000..b668aa06
--- /dev/null
+++ b/system/libraries/Language.php
@@ -0,0 +1,113 @@
+is_loaded))
+		{
+			return;
+		}
+		
+		if ($idiom == '')
+		{
+			$obj =& get_instance();
+			$deft_lang = $obj->config->item('language');
+			$idiom = ($deft_lang == '') ? 'english' : $deft_lang;
+		}
+	
+		if ( ! file_exists(BASEPATH.'language/'.$idiom.'/'.$langfile))
+		{
+			show_error('Unable to load the requested language file: language/'.$langfile.EXT);
+		}
+
+		include_once(BASEPATH.'language/'.$idiom.'/'.$langfile);
+		            
+		if ( ! isset($lang))
+		{
+			log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile);
+			return;
+		}
+		
+		if ($return == TRUE)
+		{
+			return $lang;
+		}
+		
+		$this->is_loaded[] = $langfile;
+		$this->language = array_merge($this->language, $lang);
+		unset($lang);
+		
+		log_message('debug', 'Language file loaded: language/'.$idiom.'/'.$langfile);
+		return TRUE;
+	}
+	// END load()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a single line of text from the language array
+	 *
+	 * @access	public
+	 * @param	string	the language line
+	 * @return	string
+	 */
+	function line($line = '')
+	{
+		return ($line == '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line];
+	}
+	// END line()
+
+}
+// END Language Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
new file mode 100644
index 00000000..e2467fa6
--- /dev/null
+++ b/system/libraries/Loader.php
@@ -0,0 +1,611 @@
+view_path = APPPATH.'views/';
+		$this->ob_level = ob_get_level();
+				
+		log_message('debug', "Loader Class Initialized");
+	}
+	// END CI_Loader()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Class Loader
+	 *
+	 * This function lets users load and instantiate classes.
+	 * It is designed to be called from a user's app controllers.
+	 *
+	 * @access	public
+	 * @param	string	the name of the class
+	 * @param	mixed	any initialization parameters
+	 * @return	void
+	 */	
+	function library($class, $param = FALSE)
+	{		
+		if ($class == '')
+			return;
+	
+		$obj =& get_instance();
+		$obj->_ci_initialize($class, $param);
+		$obj->_ci_assign_to_models();
+	}
+	// END library()
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Model Loader
+	 *
+	 * This function lets users load and instantiate models.
+	 *
+	 * @access	public
+	 * @param	string	the name of the class
+	 * @param	mixed	any initialization parameters
+	 * @return	void
+	 */	
+	function model($model, $name = '', $db_conn = FALSE)
+	{		
+		if ($model == '')
+			return;
+	
+		$obj =& get_instance();
+		$obj->_ci_load_model($model, $name, $db_conn);
+	}
+	// END library()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Database Loader
+	 *
+	 * @access	public
+	 * @param	string	the DB credentials
+	 * @param	bool	whether to return the DB object
+	 * @param	bool	whether to enable active record (this allows us to override the config setting)
+	 * @return	mixed
+	 */	
+	function database($db = '', $return = FALSE, $active_record = FALSE)
+	{
+		$obj =& get_instance();
+	
+		if ($return === TRUE)
+		{
+			return $obj->_ci_init_database($db, TRUE, $active_record);
+		}
+		else
+		{
+			$obj->_ci_init_database($db, FALSE, $active_record);
+			$obj->_ci_assign_to_models();			
+		}
+	}
+	// END database()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Scaffolding Loader
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function scaffolding($table = '')
+	{		
+		if ($table == FALSE)
+		{
+			show_error('You must include the name of the table you would like access when you initialize scaffolding');
+		}
+		
+		$obj =& get_instance();
+		$obj->_ci_init_scaffolding($table);
+	}
+	// END scaffolding()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Load View
+	 *
+	 * 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
+	 * some cases it's advantageous to be able to retun data so that
+	 * a developer can process it in some way.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	array
+	 * @param	bool
+	 * @return	void
+	 */
+	function view($view, $vars = array(), $return = FALSE)
+	{
+		return $this->_ci_load(array('view' => $view, 'vars' => $this->_ci_object_to_array($vars), 'return' => $return));
+	}
+	// END view()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Load File
+	 *
+	 * This is a generic file loader
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @return	string
+	 */
+	function file($path, $return = FALSE)
+	{
+		return $this->_ci_load(array('path' => $path, 'return' => $return));
+	}
+	// END file()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Variables
+	 *
+	 * Once variables are set they become availabe within
+	 * the controller class and its "view" files.
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	void
+	 */
+	function vars($vars = array())
+	{
+		$vars = $this->_ci_object_to_array($vars);
+	
+		if (is_array($vars) AND count($vars) > 0)
+		{
+			foreach ($vars as $key => $val)
+			{
+				$this->cached_vars[$key] = $val;
+			}
+		}
+	}
+	// END vars()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Load Helper
+	 *
+	 * This function loads the specified helper file.
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @return	void
+	 */
+	function helper($helpers = array())
+	{
+		if ( ! is_array($helpers))
+		{
+			$helpers = array($helpers);
+		}
+	
+		foreach ($helpers as $helper)
+		{
+			if (isset($this->helpers[$helper]))
+			{
+				continue;
+			}
+		
+			$helper = strtolower(str_replace(EXT, '', str_replace('_helper', '', $helper)).'_helper');
+		
+			if ( ! file_exists(BASEPATH.'helpers/'.$helper.EXT))
+			{
+				show_error('Unable to load the requested file: helpers/'.$helper.EXT);
+			}
+			
+			include_once(BASEPATH.'helpers/'.$helper.EXT);
+
+			$this->helpers[$helper] = TRUE;
+		}
+		
+		log_message('debug', 'Helpers loaded: '.implode(', ', $helpers));
+	}
+	// END helper()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Load Helpers
+	 *
+	 * This is simply an alias to the above function in case the
+	 * user has written the plural form of this function.
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	void
+	 */
+	function helpers($helpers = array())
+	{
+		$this->helper($helpers);
+	}
+	// END helpers()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Load Plugin
+	 *
+	 * This function loads the specified plugin.
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	void
+	 */
+	function plugin($plugins = array())
+	{
+		if ( ! is_array($plugins))
+		{
+			$plugins = array($plugins);
+		}
+	
+		foreach ($plugins as $plugin)
+		{
+			if (isset($this->plugins[$plugin]))
+			{
+				continue;
+			}
+	
+			$plugin = strtolower(str_replace(EXT, '', str_replace('_plugin.', '', $plugin)).'_pi');
+		
+			if ( ! file_exists(BASEPATH.'plugins/'.$plugin.EXT))
+			{
+				show_error('Unable to load the requested file: plugins/'.$plugin.EXT);
+			}
+			
+			include_once(BASEPATH.'plugins/'.$plugin.EXT);	
+			
+			$this->plugins[$plugin] = TRUE;
+		}
+		
+		log_message('debug', 'Plugins loaded: '.implode(', ', $plugins));
+	}
+	// END plugin()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Load Script
+	 *
+	 * This function loads the specified include file from the
+	 * application/scripts/ folder
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	void
+	 */
+	function script($scripts = array())
+	{
+		if ( ! is_array($scripts))
+		{
+			$scripts = array($scripts);
+		}
+	
+		foreach ($scripts as $script)
+		{
+			if (isset($this->scripts[$script]))
+			{
+				continue;
+			}
+	
+			$script = strtolower(str_replace(EXT, '', $script));
+		
+			if ( ! file_exists(APPPATH.'scripts/'.$script.EXT))
+			{
+				show_error('Unable to load the requested script: scripts/'.$script.EXT);
+			}
+			
+			include_once(APPPATH.'scripts/'.$script.EXT);
+			
+			$this->scripts[$script] = TRUE;
+		}
+		
+		log_message('debug', 'Scripts loaded: '.implode(', ', $scripts));
+	}
+	// END script()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Load Plugins
+	 *
+	 * This is simply an alias to the above function in case the
+	 * user has written the plural form of this function.
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	void
+	 */
+	function plugins($plugins = array())
+	{
+		$this->plugin($plugins);
+	}
+	// END plugins()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Loads a language file
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */
+	function language($file = '', $lang = '', $return = FALSE)
+	{
+		$obj =& get_instance();
+		return $obj->lang->load($file, $lang, $return);
+	}
+	// END language()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Loads a config file
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */
+	function config($file = '')
+	{
+		$obj =& get_instance();
+		$obj->config->load($file);
+	}
+	// END config()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set the Path to the "views" folder
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	void
+	 */
+	function _ci_set_view_path($path)
+	{
+		$this->view_path = $path;
+	}
+	// END _ci_set_view_path()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Loader
+	 *
+	 * This function isn't called directly.  It's called from
+	 * the two functions above.  It's used to load views and files
+	 *
+	 * @access	private
+	 * @param	array
+	 * @return	void
+	 */
+	function _ci_load($data)
+	{	
+		$OUT =& _load_class('CI_Output');
+
+		// This allows anything loaded using $this->load (viwes, files, etc.)
+		// to become accessible from within the Controller and Model functions.
+		$obj =& get_instance();
+		foreach ($obj->ci_is_loaded as $val)
+		{
+			if ( ! isset($this->$val))
+			{
+				$this->$val =& $obj->$val;
+			}	
+		}		
+		
+		// Set the default data variables
+		foreach (array('view', 'vars', 'path', 'return') as $val)
+		{
+			$$val = ( ! isset($data[$val])) ? FALSE : $data[$val];
+		}
+		
+		/*
+		 * Extract and cached variables
+		 *
+		 * You can either set variables using the dedicated
+		 * $this->load_vars() function or via the second
+		 * parameter of this function. We'll
+		 * merge the two types and cache them so that
+		 * views that are embedded within other views
+		 * can have access to these variables.
+		 *
+		 */	
+		
+		if (is_array($vars))
+		{
+			$this->cached_vars = array_merge($this->cached_vars, $vars);
+		}
+		extract($this->cached_vars);
+				
+		// Set the path to the requested file
+		if ($path == '')
+		{
+			$ext = pathinfo($view, PATHINFO_EXTENSION);
+			$file = ($ext == '') ? $view.EXT : $view;
+			$path = $this->view_path.$file;
+		}
+		else
+		{
+			$x = explode('/', $path);
+			$file = end($x);
+		}
+
+		/*
+		 * Buffer the output
+		 *
+		 * 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
+		 * can intercept the content right before it's sent to
+		 * the browser and then stop the timer, it won't be acurate.
+		 *
+		 */
+
+		if ( ! file_exists($path))
+		{
+			show_error('Unable to load the requested file: '.$file);
+		}
+
+		ob_start();
+		
+		include($path);
+		log_message('debug', 'File loaded: '.$path);
+		
+		// Return the file data if requested to
+		if ($return === TRUE)
+		{		
+			$buffer = ob_get_contents();
+			ob_end_clean(); 
+			
+			return $buffer;
+		}
+
+		/*
+		 * Flush the buffer... or buff the flusher?
+		 *
+		 * In order to permit templates (views) to be nested within
+		 * other views, we need to flush the content back out whenever 
+		 * we are beyond the first level of output buffering so that 
+		 * it can be seen and included  properly by the first included 
+		 * template and any subsequent ones. Oy!
+		 *
+		 */		
+		if (ob_get_level() > $this->ob_level + 1)
+		{
+			ob_end_flush();
+		}
+		else
+		{
+			$OUT->set_output(ob_get_contents());
+			ob_end_clean();
+		}
+	}
+	// END _load()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Autoloader
+	 *
+	 * The config/autoload.php file contains an array that permits sub-systems, 
+	 * plugins, and helpers to be loaded automatically.
+	 *
+	 * @access	private
+	 * @param	array
+	 * @return	void
+	 */
+	function _ci_autoloader($autoload)
+	{
+		if ($autoload === FALSE)
+		{
+			return;
+		}
+	
+		foreach (array('helper', 'plugin', 'script') as $type)
+		{
+			if (isset($autoload[$type]))
+			{
+				if ( ! is_array($autoload[$type]))
+				{
+					$autoload[$type] = array($autoload[$type]);
+				}
+			
+				foreach ($autoload[$type] as $item)
+				{
+					$this->$type($item);
+				}
+			}
+		}
+	}
+	// END _ci_autoloader()
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Object to Array
+	 *
+	 * Takes an object as input and convers the class variables to array key/vals
+	 *
+	 * @access	public
+	 * @param	object
+	 * @return	array
+	 */
+	function _ci_object_to_array($object)
+	{
+		if ( ! is_object($object))
+		{
+			return $object;
+		}
+		
+		$array = array();
+		foreach (get_object_vars($object) as $key => $val)
+		{
+			$array[$key] = $val;
+		}
+	
+		return $array;
+	}
+	
+}
+// END Loader Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Log.php b/system/libraries/Log.php
new file mode 100644
index 00000000..35e30b64
--- /dev/null
+++ b/system/libraries/Log.php
@@ -0,0 +1,117 @@
+ '1', 'DEBUG' => '2',  'INFO' => '3', 'ALL' => '4');
+
+	/**
+	 * Constructor
+	 *
+	 * @access	public
+	 * @param	string	the log file path
+	 * @param	string	the error threshold
+	 * @param	string	the date formatting codes
+	 */
+	function CI_Log($path = '', $threshold = '', $date_fmt = '')
+	{	
+		$this->log_path = ($path != '') ? $path : BASEPATH.'logs/';
+
+		if ( ! is_dir($this->log_path) OR ! is_writable($this->log_path))
+		{
+			$this->_enabled = FALSE;
+		}
+		
+		if (ctype_digit($threshold))
+		{
+			$this->_threshold = $threshold;
+		}
+			
+		if ($date_fmt != '')
+		{
+			$this->_date_fmt = $date_fmt;
+		}
+	}
+	// END CI_Log()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Write Log File
+	 *
+	 * Generally this function will be called using the global log_message() function
+	 *
+	 * @access	public
+	 * @param	string	the error level
+	 * @param	string	the error message
+	 * @param	bool	whether the error is a native PHP error
+	 * @return	bool
+	 */		
+	function write_log($level = 'error', $msg, $php_error = FALSE)
+	{		
+		if ($this->_enabled === FALSE)
+		{
+			return FALSE;
+		}
+	
+		$level = strtoupper($level);
+		
+		if ( ! isset($this->_levels[$level]) OR ($this->_levels[$level] > $this->_threshold))
+		{
+			return FALSE;
+		}
+	
+		$filepath = $this->log_path.'log-'.date('Y-m-d').'.php';
+		$message  = '';
+		
+		if ( ! file_exists($filepath))
+		{
+			$message .= "<"."?php  if (!defined('BASEPATH')) exit('No direct script access allowed'); ?".">\n\n";
+		}
+			
+		if ( ! $fp = @fopen($filepath, "a"))
+		{
+			return FALSE;
+		}
+
+		$message .= $level.' '.(($level == 'INFO') ? ' -' : '-').' '.date($this->_date_fmt). ' --> '.$msg."\n";
+		
+		flock($fp, LOCK_EX);	
+		fwrite($fp, $message);
+		flock($fp, LOCK_UN);
+		fclose($fp);
+	
+		@chmod($filepath, 0666); 		
+		return TRUE;
+	}
+	// END write_log()
+}
+// END Log Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Model.php b/system/libraries/Model.php
new file mode 100644
index 00000000..9834f827
--- /dev/null
+++ b/system/libraries/Model.php
@@ -0,0 +1,72 @@
+_assign_libraries(FALSE);
+		log_message('debug', "Model Class Initialized");
+	}
+	// END Model()
+
+	/**
+	 * Assign Libraries
+	 *
+	 * Creates local references to all currently instantiated objects
+	 * so that any syntax that can be legally used in a controller 
+	 * can be used within models.
+	 *
+	 * @access private
+	 */	
+	function _assign_libraries($use_reference = TRUE)
+	{
+		$obj =& get_instance();
+		foreach ($obj->ci_is_loaded as $val)
+		{
+			if ( ! isset($this->$val))
+			{
+				if ($use_reference === TRUE)
+				{
+					$this->$val =& $obj->$val;
+				}
+				else
+				{
+					$this->$val = $obj->$val;
+				}
+			}
+		}
+	}
+	// END _assign_libraries()
+
+}
+// END Model Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Output.php b/system/libraries/Output.php
new file mode 100644
index 00000000..f5db3e0d
--- /dev/null
+++ b/system/libraries/Output.php
@@ -0,0 +1,241 @@
+final_output;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Output 
+	 *
+	 * Sets the output string
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_output($output)
+	{
+		$this->final_output = $output;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Cache 
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @return	void
+	 */	
+	function cache($time)
+	{
+		$this->cache_expiration = ( ! ctype_digit($time)) ? 0 : $time;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Display Output
+	 *
+	 * All "view" data is automatically put into this variable 
+	 * by the controller class:
+	 *
+	 * $this->final_output
+	 *
+	 * This function simply echos the variable out.  It also does the following:
+	 * 
+	 * Stops the benchmark timer so the page rendering speed can be shown.
+	 *
+	 * Determines if the "memory_get_usage' function is available so that 
+	 * the memory usage can be shown.
+	 *
+	 * @access	public
+	 * @return	void
+	 */		
+	function _display($output = '')
+	{	
+		$BM =& _load_class('CI_Benchmark');
+		
+		if ($output == '')
+		{
+			$output =& $this->final_output;
+		}
+		
+		if ($this->cache_expiration > 0)
+		{
+			$this->_write_cache($output);
+		}
+
+		$elapsed = $BM->elapsed_time('code_igniter_start', 'code_igniter_end');		
+		$memory	 = ( ! function_exists('memory_get_usage')) ? '0' : round(memory_get_usage()/1024/1024, 2).'MB';
+
+		$output = str_replace('{memory_usage}', $memory, $output);		
+		$output = str_replace('{elapsed_time}', $elapsed, $output);
+		
+		echo $output;
+		
+		log_message('debug', "Final output sent to browser");
+		log_message('debug', "Total execution time: ".$elapsed);		
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Write a Cache File 
+	 *
+	 * @access	public
+	 * @return	void
+	 */	
+	function _write_cache($output)
+	{
+		$obj =& get_instance();	
+		$path = $obj->config->item('cache_path');
+	
+		$cache_path = ($path == '') ? BASEPATH.'cache/' : $path;
+		
+		if ( ! is_dir($cache_path) OR ! is_writable($cache_path))
+		{
+			return;
+		}
+		
+		$uri =	$obj->config->item('base_url', 1).
+				$obj->config->item('index_page').
+				$obj->uri->uri_string();
+		
+		$cache_path .= md5($uri);
+
+        if ( ! $fp = @fopen($cache_path, 'wb'))
+        {
+			log_message('error', "Unable to write ache file: ".$cache_path);
+            return;
+		}
+		
+		$expire = time() + ($this->cache_expiration * 60);
+		
+        flock($fp, LOCK_EX);
+        fwrite($fp, $expire.'TS--->'.$output);
+        flock($fp, LOCK_UN);
+        fclose($fp);
+		@chmod($cache_path, 0777); 
+
+		log_message('debug', "Cache file written: ".$cache_path);
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Update/serve a cached file 
+	 *
+	 * @access	public
+	 * @return	void
+	 */	
+	function _display_cache()
+	{
+		$CFG =& _load_class('CI_Config');
+		$RTR =& _load_class('CI_Router');
+	
+		$cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path');
+			
+		if ( ! is_dir($cache_path) OR ! is_writable($cache_path))
+		{
+			return FALSE;
+		}
+		
+		// Build the file path.  The file name is an MD5 hash of the full URI
+		$uri = $CFG->item('base_url', 1).$CFG->item('index_page').$RTR->uri_string;
+		
+		$filepath = $cache_path.md5($uri);
+		
+		if ( ! @file_exists($filepath))
+		{
+			return FALSE;
+		}
+	
+		if ( ! $fp = @fopen($filepath, 'rb'))
+		{
+			return FALSE;
+		}
+			
+		flock($fp, LOCK_SH);
+		
+		$cache = '';
+		if (filesize($filepath) > 0) 
+		{
+			$cache = fread($fp, filesize($filepath)); 
+		}
+	
+		flock($fp, LOCK_UN);
+		fclose($fp); 
+					
+		// Strip out the embedded timestamp		
+		if ( ! preg_match("/(\d+TS--->)/", $cache, $match))
+		{
+			return FALSE;
+		}
+		
+		// Has the file expired? If so we'll delete it.
+		if (time() >= trim(str_replace('TS--->', '', $match['1'])))
+		{ 		
+			@unlink($filepath);
+			log_message('debug', "Cache file has expired. File deleted");
+			return FALSE;
+		}
+
+		// Display the cache
+		$this->_display(str_replace($match['0'], '', $cache));
+		log_message('debug', "Cache file is current. Sending it to browser.");		
+		return TRUE;
+	}
+
+}
+// END Output Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
new file mode 100644
index 00000000..0bbb577a
--- /dev/null
+++ b/system/libraries/Pagination.php
@@ -0,0 +1,207 @@
+';
+	var $cur_tag_close		= '';
+	var $next_tag_open		= ' ';
+	var $next_tag_close		= ' ';
+	var $prev_tag_open		= ' ';
+	var $prev_tag_close		= '';
+	var $num_tag_open		= ' ';
+	var $num_tag_close		= '';
+
+	/**
+	 * Constructor
+	 *
+	 * @access	public
+	 * @param	array	initialization parameters
+	 */
+    function CI_Pagination($params = array())
+    {    
+		if (count($params) > 0)
+		{
+			$this->initialize($params);		
+		}
+		
+		log_message('debug', "Pagination Class Initialized");
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Initialize Preferences
+	 *
+	 * @access	public
+	 * @param	array	initialization parameters
+	 * @return	void
+	 */
+    function initialize($params = array())
+    {    
+		if (count($params) > 0)
+		{
+			foreach ($params as $key => $val)
+			{
+				if (isset($this->$key))
+				{
+					$this->$key = $val;
+				}
+			}		
+		}
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate the pagination links
+	 *
+	 * @access	public
+	 * @return	string
+	 */	
+    function create_links()
+    {  
+		// If our item count or per-page total is zero there is no need to continue.
+        if ($this->total_rows == 0 OR $this->per_page == 0)
+        {
+           return '';
+    	}
+    	
+		// Calculate the total number of pages
+        $num_pages = intval($this->total_rows / $this->per_page);
+        
+		// Use modulus to see if our division has a remainder.If so, add one to our page number.
+        if ($this->total_rows % $this->per_page) 
+        {
+            $num_pages++;
+        }
+ 
+		// Is there only one page? Hm... nothing more to do here then. 
+        if ($num_pages == 1)
+        {
+            return '';
+        }
+        
+		// Determine the current page number.		
+		$obj =& get_instance();	
+		if ($obj->uri->segment($this->uri_segment) != 0)
+		{
+			$this->cur_page = $obj->uri->segment($this->uri_segment);
+		}
+		
+		if ( ! ctype_digit($this->cur_page))
+		{
+			$this->cur_page = 0;
+		}
+		
+		$uri_page_number = $this->cur_page;
+		$this->cur_page = floor(($this->cur_page/$this->per_page) + 1);
+   
+		// Calculate the start and end numbers. These determine
+		// which number to start and end the digit links with
+        $start = (($this->cur_page - $this->num_links) > 0) ? $this->cur_page - ($this->num_links - 1) : 1;
+        $end   = (($this->cur_page + $this->num_links) < $num_pages) ? $this->cur_page + $this->num_links : $num_pages;
+        
+		// Add a trailing slash to the base URL if needed
+		$this->base_url = preg_replace("/(.+?)\/*$/", "\\1/",  $this->base_url);
+		
+  		// And here we go...
+        $output = '';
+ 
+		// Render the "First" link
+        if  ($this->cur_page > $this->num_links)
+        {
+            $output .= $this->first_tag_open.''.$this->first_link.''.$this->first_tag_close;
+        }
+ 
+		// Render the "previous" link
+        if  (($this->cur_page - $this->num_links) >= 0)
+        {
+        	$i = $uri_page_number - $this->per_page;  
+        	if ($i == 0) $i = '';
+            $output .= $this->prev_tag_open.''.$this->prev_link.''.$this->prev_tag_close;
+        }
+        
+		// Write the digit links
+        for ($loop = $start -1; $loop <= $end; $loop++) 
+        {
+			$i = ($loop * $this->per_page) - $this->per_page;
+					
+			if ($i >= 0)
+			{
+				if ($this->cur_page == $loop)
+				{
+					$output .= $this->cur_tag_open.$loop.$this->cur_tag_close; // Current page
+				}
+				else
+				{
+					$n = ($i == 0) ? '' : $i;
+					$output .= $this->num_tag_open.''.$loop.''.$this->num_tag_close;
+				}
+			}
+        } 
+
+		// Render the "next" link
+        if ($this->cur_page < $num_pages)
+        {  
+            $output .= $this->next_tag_open.''.$this->next_link.''.$this->next_tag_close;        
+        }
+
+		// Render the "Last" link
+        if (($this->cur_page + $this->num_links) < $num_pages)
+        {
+            $i = (($num_pages * $this->per_page) - $this->per_page);
+            $output .= $this->last_tag_open.''.$this->last_link.''.$this->last_tag_close;
+        }
+    
+		// Kill double slashes.  Note: Sometimes we can end up with a double slash 
+		// in the penultimate link so we'll kill all double shashes.
+		$output = preg_replace("#([^:])//+#", "\\1/", $output);  
+
+		// Add the wrapper HTML if exists
+		$output = $this->full_tag_open.$output.$this->full_tag_close;
+		
+		return $output;		
+    }
+}
+// END Pagination Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php
new file mode 100644
index 00000000..9f6a814a
--- /dev/null
+++ b/system/libraries/Parser.php
@@ -0,0 +1,178 @@
+load->view($template, '', TRUE);
+		
+		if ($template == '')
+		{
+			return FALSE;
+		}
+		
+		foreach ($data as $key => $val)
+		{
+			if ( ! is_array($val))
+			{
+				$template = $this->_parse_single($key, $val, $template);
+			}
+			else
+			{
+				$template = $this->_parse_pair($key, $val, $template);		
+			}
+		}
+		
+		if ($return == FALSE)
+		{
+			$OUT->final_output = $template;
+		}
+		
+		return $template;
+	}
+	// END set_method()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Set the left/right variable delimiters
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	void
+	 */
+	function set_delimiters($l = '{', $r = '}')
+	{
+		$this->l_delim = $l;
+		$this->r_delim = $r;
+	}
+	// END set_method()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Parse a single key/value
+	 *
+	 * @access	private
+	 * @param	string
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */
+	function _parse_single($key, $val, $string)
+	{
+		return str_replace($this->l_delim.$key.$this->r_delim, $val, $string);
+	}
+	// END set_method()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Parse a tag pair
+	 *
+	 * Parses tag pairs:  {some_tag} string... {/some_tag}
+	 *
+	 * @access	private
+	 * @param	string
+	 * @param	array
+	 * @param	string
+	 * @return	string
+	 */
+	function _parse_pair($variable, $data, $string)
+	{	
+		if (FALSE === ($match = $this->_match_pair($string, $variable)))
+		{
+			return $string;
+		}
+
+		$str = '';
+		foreach ($data as $row)
+		{
+			$temp = $match['1'];
+			foreach ($row as $key => $val)
+			{
+				if ( ! is_array($val))
+				{
+					$temp = $this->_parse_single($key, $val, $temp);
+				}
+				else
+				{
+					$temp = $this->_parse_pair($key, $val, $temp);
+				}
+			}
+			
+			$str .= $temp;
+		}
+		
+		return str_replace($match['0'], $str, $string);
+	}
+	// END set_method()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Matches a variable pair
+	 *
+	 * @access	private
+	 * @param	string
+	 * @param	string
+	 * @return	mixed
+	 */
+	function _match_pair($string, $variable)
+	{
+		if ( ! preg_match("|".$this->l_delim . $variable . $this->r_delim."(.+)".$this->l_delim . '/' . $variable . $this->r_delim."|s", $string, $match))
+		{
+			return FALSE;
+		}
+		
+		return $match;
+	}
+	// END _match_pair()
+
+}
+// END Parser Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
new file mode 100644
index 00000000..abc253ef
--- /dev/null
+++ b/system/libraries/Router.php
@@ -0,0 +1,318 @@
+config =& _load_class('CI_Config');
+		$this->_set_route_mapping();
+		log_message('debug', "Router Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set the route mapping
+	 *
+	 * This function determies what should be served based on the URI request,
+	 * as well as any "routes" that have been set in the routing config file.
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _set_route_mapping()
+	{		
+		// Are query strings enabled? If so we're done...
+		if ($this->config->item('enable_query_strings') === TRUE AND isset($_GET[$this->config->item('controller_trigger')]))
+		{
+			$this->set_class($_GET[$this->config->item('controller_trigger')]);
+
+			if (isset($_GET[$this->config->item('function_trigger')]))
+			{
+				$this->set_method($_GET[$this->config->item('function_trigger')]);
+			}
+			
+			return;
+		}
+
+		// Load the routes.php file
+		include_once(APPPATH.'config/routes'.EXT);
+		$this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route;
+		unset($route);
+
+		// Set the default controller	
+		$this->default_controller = ( ! isset($this->routes['default_controller']) OR $this->routes['default_controller'] == '') ? FALSE : strtolower($this->routes['default_controller']);
+
+		// Fetch the URI string Depending on the server, 
+		// the URI will be available in one of two globals
+		switch ($this->config->item('uri_protocol'))
+		{
+			case 'path_info'	: $this->uri_string = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO');	
+				break;
+			case 'query_string' : $this->uri_string = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING'); 
+				break;
+			default : 
+						$path_info = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO');
+						
+						if ($path_info != '' AND $path_info != "/".SELF)
+						{
+							$this->uri_string = $path_info;
+						}
+						else
+						{
+							$this->uri_string = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
+						}
+				break;
+		}
+	
+		// Is there a URI string? If not, the default controller specified 
+		// by the admin in the "routes" file will be shown.
+		if ($this->uri_string == '')
+		{
+			if ($this->default_controller === FALSE)
+			{
+				show_error("Unable to determine what should be displayed. A default route has not been specified in the routing file.");
+			}
+		
+			$this->set_class($this->default_controller);
+			$this->set_method('index');
+
+			log_message('debug', "No URI present. Default controller set.");
+			return;
+		}
+		
+		// Do we need to remove the suffix specified in the config file?
+		if  ($this->config->item('url_suffix') != "")
+		{
+			$this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string);
+		}
+
+		// Explode the URI Segments. The individual segments will
+		// be stored in the $this->segments array.
+		$this->_compile_segments(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)));
+
+
+		// Remap the class/method if a route exists
+		unset($this->routes['default_controller']);
+		
+		if (count($this->routes) > 0)
+		{
+			$this->_parse_routes();
+		}
+	}
+	// END _set_route_mapping()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Compile Segments
+	 *
+	 * This function takes an array of URI segments as
+	 * input, and puts it into the $this->segments array.
+	 * It also sets the current class/method
+	 *
+	 * @access	private
+	 * @param	array
+	 * @param	bool
+	 * @return	void
+	 */
+	function _compile_segments($segs, $route = FALSE)
+	{		
+		$segments = array();
+	
+		$i = 1;
+		foreach($segs as $val)
+		{
+			$val = trim($this->_filter_uri($val));
+			
+			if ($val != '')
+				$segments[$i++] = $val;
+		}
+		
+		$this->set_class($segments['1']);
+		
+		if (isset($segments['2']))
+		{
+			// A scaffolding request. No funny business with the URL
+			if ($this->routes['scaffolding_trigger'] == $segments['2'] AND $segments['2'] != '_ci_scaffolding')
+			{
+				$this->scaffolding_request = TRUE;
+				unset($this->routes['scaffolding_trigger']);
+			}
+			else
+			{
+				// A standard method request
+				$this->set_method($segments['2']);
+			}
+		}
+		
+		if ($route == FALSE)
+		{
+			$this->segments = $segments;
+		}
+		
+		unset($segments);
+	}
+	// END _compile_segments()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Filter segments for malicious characters
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */	
+	function _filter_uri($str)
+	{
+		 if ( ! preg_match("/^[a-z0-9~\s\%\.:_-]+$/i", $str))
+		 { 
+			exit('The URI you submitted has disallowed characters: '.$str);
+		 }
+		 
+		 return $str;
+	}
+	// END _filter_uri()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set the class name
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_class($class)
+	{
+		$this->class = $class;
+	}
+	// END _filter_uri()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch the current class
+	 *
+	 * @access	public
+	 * @return	string
+	 */	
+	function fetch_class()
+	{
+		return $this->class;
+	}
+	// END _filter_uri()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Set the method name
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_method($method)
+	{
+		$this->method = $method;
+	}
+	// END set_method()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Fetch the current method
+	 *
+	 * @access	public
+	 * @return	string
+	 */	
+	function fetch_method()
+	{
+		return $this->method;
+	}
+	// END set_method()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Parse Routes
+	 *
+	 * This function matches any routes that may exist in
+	 * the config/routes.php file against the URI to 
+	 * determine if the class/method need to be remapped.
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _parse_routes()
+	{
+		// Turn the segment array into a URI string
+		$uri = implode('/', $this->segments);
+		$num = count($this->segments);
+
+		// Is there a literal match?  If so we're done
+		if (isset($this->routes[$uri]))
+		{
+			$this->_compile_segments(explode('/', $this->routes[$uri]), TRUE);		
+			return;
+		}
+		
+		// Loop through the route array looking for wildcards
+		foreach ($this->routes as $key => $val)
+		{
+			if (count(explode('/', $key)) != $num)
+				continue;
+		
+			if (preg_match("|".str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key))."$|", $uri))
+			{
+				$this->_compile_segments(explode('/', $val), TRUE);		
+				break;
+			}
+		}	
+	}
+	// END set_method()
+}
+// END Router Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
new file mode 100644
index 00000000..4f08cf69
--- /dev/null
+++ b/system/libraries/Session.php
@@ -0,0 +1,499 @@
+object =& get_instance();
+
+		log_message('debug', "Session Class Initialized");
+		$this->sess_run();
+	}
+	// END display_errors()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Run the session routines
+	 *
+	 * @access	public
+	 * @return	void
+	 */		
+	function sess_run()
+	{
+		/*
+		 *  Set the "now" time
+		 *
+		 * It can either set to GMT or time(). The pref
+		 * is set in the config file.  If the developer
+		 * is doing any sort of time localization they 
+		 * might want to set the session time to GMT so
+		 * they can offset the "last_activity" and
+		 * "last_visit" times based on each user's locale.
+		 *
+		 */
+		if (strtolower($this->object->config->item('time_reference')) == 'gmt')
+		{
+			$now = time();
+			$this->now = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now));   
+	
+			if (strlen($this->now) < 10)
+			{
+				$this->now = time();
+				log_message('error', 'The session class could not set a proper GMT timestamp so the local time() value was used.');
+			}
+		}
+		else
+		{
+			$this->now = time();
+		}
+		
+		/*
+		 *  Set the session length
+		 *
+		 * If the session expiration is set to zero in
+		 * the config file we'll set the expiration 
+		 * two years from now.
+		 *
+		 */
+		$expiration = $this->object->config->item('sess_expiration');
+		
+		if (ctype_digit($expiration))
+		{
+			if ($expiration > 0)
+			{
+				$this->sess_length = $this->object->config->item('sess_expiration');
+			}
+			else
+			{
+				$this->sess_length = (60*60*24*365*2);
+			}
+		}
+		
+		// Do we need encryption?
+		$this->encryption = $this->object->config->item('sess_encrypt_cookie');
+		
+		if ($this->encryption == TRUE)	
+		{
+			$this->object->load->library('encrypt');
+		}		
+
+		// Are we using a database?
+		if ($this->object->config->item('sess_use_database') === TRUE AND $this->object->config->item('sess_table_name') != '')
+		{
+			$this->use_database = TRUE;
+			$this->session_table = $this->object->config->item('sess_table_name');
+			$this->object->load->database();
+		}
+		
+		// Set the cookie name
+		if ($this->object->config->item('sess_cookie_name') != FALSE)
+		{
+			$this->sess_cookie = $this->object->config->item('cookie_prefix').$this->object->config->item('sess_cookie_name');
+		}
+	
+		/*
+		 *  Fetch the current session
+		 *
+		 * If a session doesn't exist we'll create
+		 * a new one.  If it does, we'll update it.
+		 *
+		 */
+		if ( ! $this->sess_read())
+		{
+			$this->sess_create();
+		}
+		else
+		{	
+			// We only update the session every five minutes
+			if (($this->userdata['last_activity'] + 300) < $this->now)
+			{
+				$this->sess_update();
+			}
+		}
+		
+		// Delete expired sessions if necessary
+		if ($this->use_database === TRUE)
+		{		
+			$this->sess_gc();
+		}	
+	}
+	// END sess_run()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch the current session data if it exists
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_read()
+	{	
+		// Fetch the cookie
+		$session = $this->object->input->cookie($this->sess_cookie);
+		
+		if ($session === FALSE)
+		{
+			log_message('debug', 'A session cookie was not found.');
+			return FALSE;
+		}
+		
+		// Decrypt and unserialize the data
+		if ($this->encryption == TRUE)
+		{
+			$session = $this->object->encrypt->decode($session);
+		}
+
+		$session = @unserialize($this->strip_slashes($session));
+		
+		if ( ! is_array($session) OR ! isset($session['last_activity']))
+		{
+			log_message('error', 'The session cookie data did not contain a valid array. This could be a possible hacking attempt.');
+			return FALSE;
+		}
+		
+		// Is the session current?
+		if (($session['last_activity'] + $this->sess_length) < $this->now) 
+		{
+			$this->sess_destroy();
+			return FALSE;
+		}
+
+		// Does the IP Match?
+		if ($this->object->config->item('sess_match_ip') == TRUE AND $session['ip_address'] != $this->object->input->ip_address())
+		{
+			$this->sess_destroy();
+			return FALSE;
+		}
+		
+		// Does the User Agent Match?
+		if ($this->object->config->item('sess_match_useragent') == TRUE AND $session['user_agent'] != substr($this->object->input->user_agent(), 0, 50))
+		{
+			$this->sess_destroy();
+			return FALSE;
+		}
+		
+		// Is there a corresponding session in the DB?
+		if ($this->use_database === TRUE)
+		{
+			$this->object->db->where('session_id', $session['session_id']);
+					
+			if ($this->object->config->item('sess_match_ip') == TRUE)
+			{
+				$this->object->db->where('ip_address', $session['ip_address']);
+			}
+
+			if ($this->object->config->item('sess_match_useragent') == TRUE)
+			{
+				$this->object->db->where('user_agent', $session['user_agent']);
+			}
+			
+			$query = $this->object->db->get($this->session_table);
+
+			if ($query->num_rows() == 0)
+			{
+				$this->sess_destroy();
+				return FALSE;
+			}
+			else
+			{
+				$row = $query->row();
+				if (($row->last_activity + $this->sess_length) < $this->now) 
+				{
+					$this->object->db->where('session_id', $session['session_id']);
+					$this->object->db->delete($this->session_table);
+					$this->sess_destroy();
+					return FALSE;
+				}
+			}
+		}
+	
+		// Session is valid!
+		$this->userdata = $session;
+		unset($session);
+		
+		return TRUE;
+	}
+	// END sess_read()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Write the session cookie
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_write()
+	{								
+		$cookie_data = serialize($this->userdata);
+		
+		if ($this->encryption == TRUE)
+		{
+			$cookie_data = $this->object->encrypt->encode($cookie_data);
+		}
+
+		setcookie(
+					$this->sess_cookie, 
+					$cookie_data, 
+					$this->sess_length + $this->now, 
+					$this->object->config->item('cookie_path'), 
+					$this->object->config->item('cookie_domain'), 
+					0
+				);
+	}
+	// END sess_read()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Create a new session
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_create()
+	{	
+		$sessid = '';
+		while (strlen($sessid) < 32) 
+		{    
+			$sessid .= mt_rand(0, mt_getrandmax());
+		}
+	
+		$this->userdata = array(
+							'session_id' 	=> md5(uniqid($sessid, TRUE)),
+							'ip_address' 	=> $this->object->input->ip_address(),
+							'user_agent' 	=> substr($this->object->input->user_agent(), 0, 50),
+							'last_activity'	=> $this->now
+							);
+		
+		
+		// Save the session in the DB if needed
+		if ($this->use_database === TRUE)
+		{
+			$this->object->db->query($this->object->db->insert_string($this->session_table, $this->userdata));
+		}
+			
+		// Write the cookie
+		$this->userdata['last_visit'] = 0;		
+		$this->sess_write();
+	}
+	// END sess_read()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Update an existing session
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_update()
+	{	
+        if (($this->userdata['last_activity'] + $this->sess_length) < $this->now) 
+        {
+			$this->userdata['last_visit'] = $this->userdata['last_activity'];
+        }
+	
+		$this->userdata['last_activity'] = $this->now;
+		
+		// Update the session in the DB if needed
+		if ($this->use_database === TRUE)
+		{		
+			$this->object->db->query($this->object->db->update_string($this->session_table, array('last_activity' => $this->now), array('session_id' => $this->userdata['session_id'])));
+		}
+		
+		// Write the cookie
+		$this->sess_write();
+	}
+	// END sess_update()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Destroy the current session
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_destroy()
+	{
+		setcookie(
+					$this->sess_cookie, 
+					addslashes(serialize(array())), 
+					($this->now - 31500000), 
+					$this->object->config->item('cookie_path'), 
+					$this->object->config->item('cookie_domain'), 
+					0
+				);
+	}
+	// END sess_destroy()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Garbage collection
+	 *
+	 * This deletes expired session rows from database
+	 * if the probability percentage is met
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+    function sess_gc()
+    {  
+		srand(time());
+		if ((rand() % 100) < $this->gc_probability) 
+		{  
+			$expire = $this->now - $this->sess_length;
+			
+			$this->object->db->where("last_activity < {$expire}");
+			$this->object->db->delete($this->session_table);
+
+			log_message('debug', 'Session garbage collection performed.');
+		}    
+    }
+	// END sess_destroy()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a specific item form  the session array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */		
+	function userdata($item)
+	{
+    	return ( ! isset($this->userdata[$item])) ? FALSE : $this->userdata[$item];
+	}
+	// END sess_destroy()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Add or change data in the "userdata" array
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @param	string
+	 * @return	void
+	 */		
+	function set_userdata($newdata = array(), $newval = '')
+	{
+		if (is_string($newdata))
+		{
+			$newdata = array($newdata => $newval);
+		}
+	
+		if (count($newdata) > 0)
+		{
+			foreach ($newdata as $key => $val)
+			{
+				$this->userdata[$key] = $val;
+			}
+		}
+	
+    	$this->sess_write();
+	}
+	// END set_userdata()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Delete a session variable from the "userdata" array
+	 *
+	 * @access	array
+	 * @return	void
+	 */		
+	function unset_userdata($newdata = array())
+	{
+		if (is_string($newdata))
+		{
+			$newdata = array($newdata => '');
+		}
+	
+		if (count($newdata) > 0)
+		{
+			foreach ($newdata as $key => $val)
+			{
+				unset($this->userdata[$key]);
+			}
+		}
+	
+    	$this->sess_write();
+	}
+	// END set_userdata()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Strip slashes
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @return	mixed
+	 */
+     function strip_slashes($vals)
+     {
+     	if (is_array($vals))
+     	{	
+     		foreach ($vals as $key=>$val)
+     		{
+     			$vals[$key] = $this->strip_slashes($val);
+     		}
+     	}
+     	else
+     	{
+     		$vals = stripslashes($vals);
+     	}
+     	
+     	return $vals;
+	}
+	// END strip_slashes()
+}
+// END Session Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php
new file mode 100644
index 00000000..13196eb6
--- /dev/null
+++ b/system/libraries/Sha1.php
@@ -0,0 +1,254 @@
+> 6) + 1;
+        
+        for ($i = 0; $i < $n * 16; $i++)
+        {
+            $x[$i] = 0;
+        }
+        
+        for ($i = 0; $i < strlen($str); $i++)
+        {
+            $x[$i >> 2] |= ord(substr($str, $i, 1)) << (24 - ($i % 4) * 8);
+        }
+        
+        $x[$i >> 2] |= 0x80 << (24 - ($i % 4) * 8);
+        
+        $x[$n * 16 - 1] = strlen($str) * 8;
+        
+        $a =  1732584193;
+        $b = -271733879;
+        $c = -1732584194;
+        $d =  271733878;
+        $e = -1009589776;
+        
+        for ($i = 0; $i < sizeof($x); $i += 16) 
+        {
+            $olda = $a;
+            $oldb = $b;
+            $oldc = $c;
+            $oldd = $d;
+            $olde = $e;
+            
+            for($j = 0; $j < 80; $j++) 
+            {
+                if ($j < 16)
+                {
+                    $w[$j] = $x[$i + $j];
+                }
+                else
+                {
+                    $w[$j] = $this->_rol($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
+                }
+                
+                $t = $this->_safe_add($this->_safe_add($this->_rol($a, 5), $this->_ft($j, $b, $c, $d)), $this->_safe_add($this->_safe_add($e, $w[$j]), $this->_kt($j)));
+                
+                $e = $d;
+                $d = $c;
+                $c = $this->_rol($b, 30);
+                $b = $a;
+                $a = $t;
+            }
+
+            $a = $this->_safe_add($a, $olda);
+            $b = $this->_safe_add($b, $oldb);
+            $c = $this->_safe_add($c, $oldc);
+            $d = $this->_safe_add($d, $oldd);
+            $e = $this->_safe_add($e, $olde);
+        }
+        
+        return $this->_hex($a).$this->_hex($b).$this->_hex($c).$this->_hex($d).$this->_hex($e);
+    }
+  	// END generate()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Convert a decimal to hex
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */	
+    function _hex($str)
+    {
+        $str = dechex($str);
+        
+        if (strlen($str) == 7)
+        {
+            $str = '0'.$str;
+        }
+            
+        return $str;
+    }    
+  	// END _hex()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 *  Return result based on iteration
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+    function _ft($t, $b, $c, $d) 
+    {
+        if ($t < 20) 
+            return ($b & $c) | ((~$b) & $d);
+        if ($t < 40) 
+            return $b ^ $c ^ $d;
+        if ($t < 60) 
+            return ($b & $c) | ($b & $d) | ($c & $d);
+        
+        return $b ^ $c ^ $d;
+    }
+    // END _ft()
+  
+	// --------------------------------------------------------------------
+
+	/**
+	 * Determine the additive constant
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+    function _kt($t) 
+    {
+        if ($t < 20) 
+        {
+            return 1518500249;
+        } 
+        else if ($t < 40) 
+        {
+            return 1859775393;
+        } 
+        else if ($t < 60) 
+        {
+            return -1894007588;
+        } 
+        else 
+        {
+            return -899497514;
+        }
+    }
+  	// END _kt()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Add integers, wrapping at 2^32
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+    function _safe_add($x, $y)
+    {
+        $lsw = ($x & 0xFFFF) + ($y & 0xFFFF);
+        $msw = ($x >> 16) + ($y >> 16) + ($lsw >> 16);
+    
+        return ($msw << 16) | ($lsw & 0xFFFF);
+    }
+  	// END _safe_add()
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Bitwise rotate a 32-bit number
+	 *
+	 * @access	private
+	 * @return	integer
+	 */	
+    function _rol($num, $cnt)
+    {
+        return ($num << $cnt) | $this->_zero_fill($num, 32 - $cnt);
+    }
+  
+	// --------------------------------------------------------------------
+
+	/**
+	 * Pad string with zero
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+    function _zero_fill($a, $b) 
+    {
+        $bin = decbin($a);
+        
+        if (strlen($bin) < $b)
+        {
+            $bin = 0;
+        }
+        else
+        {
+            $bin = substr($bin, 0, strlen($bin) - $b);
+        }
+        
+        for ($i=0; $i < $b; $i++) 
+        {
+            $bin = "0".$bin;
+        }
+        
+        return bindec($bin);
+    }
+}
+// END CI_SHA
+?>
\ No newline at end of file
diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php
new file mode 100644
index 00000000..583c6d28
--- /dev/null
+++ b/system/libraries/Trackback.php
@@ -0,0 +1,561 @@
+ '', 'title' => '', 'excerpt' => '', 'blog_name' => '', 'charset' => '');
+	var $convert_ascii	= TRUE;
+	var $response		= '';
+	var $error_msg		= array();
+
+	/**
+	 * Constructor
+	 *
+	 * @access	public
+	 */
+	function CI_Trackback()
+	{
+		log_message('debug', "Trackback Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Send Trackback
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	bool
+	 */	
+	function send($tb_data)
+	{		
+		if ( ! is_array($tb_data))
+		{ 
+			$this->set_error('The send() method must be passed an array');
+			return FALSE;
+		}
+		
+		// Pre-process the Trackback Data
+		foreach (array('url', 'title', 'excerpt', 'blog_name', 'ping_url') as $item)
+		{
+			if ( ! isset($tb_data[$item]))
+			{ 
+				$this->set_error('Required item missing: '.$item);
+				return FALSE;
+			}
+			
+			switch ($item)
+			{
+				case 'ping_url'	: $$item = $this->extract_urls($tb_data[$item]);
+					break;
+				case 'excerpt'	: $$item = $this->limit_characters($this->convert_xml(strip_tags(stripslashes($tb_data[$item]))));
+					break;
+				case 'url'	 	: $$item = str_replace('-', '-', $this->convert_xml(strip_tags(stripslashes($tb_data[$item]))));
+					break;
+				default			: $$item = $this->convert_xml(strip_tags(stripslashes($tb_data[$item])));
+					break;
+			}
+
+			// Convert High ASCII Characters
+			if ($this->convert_ascii == TRUE)
+			{
+				if ($item == 'excerpt')
+				{
+					$$item = $this->convert_ascii($$item);
+				}
+				elseif ($item == 'title')
+				{
+					$$item = $this->convert_ascii($$item);
+				}
+				elseif($item == 'blog_name')
+				{
+					$$item = $this->convert_ascii($$item);
+				}
+			}
+		}
+
+		// Build the Trackback data string
+		$charset = ( ! isset($tb_data['charset'])) ? $this->charset : $tb_data['charset'];
+		
+		$data = "url=".rawurlencode($url)."&title=".rawurlencode($title)."&blog_name=".rawurlencode($blog_name)."&excerpt=".rawurlencode($excerpt)."&charset=".rawurlencode($charset); 
+				
+		// Send Trackback(s)
+		$return = TRUE;
+		if (count($ping_url) > 0)
+		{
+			foreach ($ping_url as $url)
+			{
+				if ($this->process($url, $data) == FALSE)
+				{
+					$return = FALSE;
+				}
+			}	
+		}
+
+		return $return;
+	}	
+	// END send()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Receive Trackback  Data
+	 *
+	 * This function simply validates the incoming TB data.
+	 * It returns false on failure and true on success.
+	 * If the data is valid it is set to the $this->data array
+	 * so that it can be inserted into a database.
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function receive()
+	{  					
+		foreach (array('url', 'title', 'blog_name', 'excerpt') as $val)
+		{
+			if ( ! isset($_POST[$val]) OR $_POST[$val] == '')
+			{
+				$this->set_error('The following required POST variable is missing: '.$val);
+				return FALSE;
+			}
+			
+			$this->data['charset'] = ( ! isset($_POST['charset'])) ? 'auto' : strtoupper(trim($_POST['charset']));
+	
+			if ($val != 'url' && function_exists('mb_convert_encoding'))
+			{
+				$_POST[$val] = mb_convert_encoding($_POST[$val], $this->charset, $this->data['charset']);
+			}
+			
+			$_POST[$val] = ($val != 'url') ? $this->convert_xml(strip_tags($_POST[$val])) : strip_tags($_POST[$val]);
+			
+			if ($val == 'excerpt')
+			{
+				$_POST['excerpt'] = $this->limit_characters($_POST['excerpt']);
+			}
+			
+			$this->data[$val] = $_POST[$val];
+		}
+
+		return TRUE;
+	}	
+	// END receive()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Send Trackback Error Message
+	 *
+	 * Allows custom errros to be set.  By default it 
+	 * sends the "incomplete information" error, as that's
+	 * the most common one.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function send_error($message = 'Incomplete Information')
+	{
+		echo "\n\n1\n".$message."\n";
+		exit;
+	}
+	// END send_error()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Send Trackback Success Message
+	 *
+	 * This should be called when a trackback has been
+	 * successfully received and inserted.
+	 *
+	 * @access	public
+	 * @return	void
+	 */		
+	function send_success()
+	{
+		echo "\n\n0\n";
+		exit;
+	}
+	// END send_success()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a particular item
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function data($item)
+	{
+		return ( ! isset($this->data[$item])) ? '' : $this->data[$item];
+	}
+	// END data()
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Process Trackback
+	 *
+	 * Opens a socket connection and passes the data to 
+	 * the server.  Returns true on success, false on failure
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	bool
+	 */	
+	function process($url, $data)
+	{
+		$target = parse_url($url);
+	
+		// Open the socket
+		if ( ! $fp = @fsockopen($target['host'], 80))
+		{
+			$this->set_error('Invalid Connection: '.$url);
+			return FALSE;
+		}
+
+		// Build the path
+		$ppath = ( ! isset($target['path'])) ? $url : $target['path'];
+		
+		$path = (isset($target['query']) && $target['query'] != "") ? $ppath.'?'.$target['query'] : $ppath;
+
+		// Add the Trackback ID to the data string
+		if ($id = $this->get_id($url))
+		{
+			$data = "tb_id=".$id."&".$data;
+		}
+ 
+		// Transfer the data
+		fputs ($fp, "POST " . $path . " HTTP/1.0\r\n" ); 
+		fputs ($fp, "Host: " . $target['host'] . "\r\n" ); 
+		fputs ($fp, "Content-type: application/x-www-form-urlencoded\r\n" ); 
+		fputs ($fp, "Content-length: " . strlen($data) . "\r\n" ); 
+		fputs ($fp, "Connection: close\r\n\r\n" ); 
+		fputs ($fp, $data);
+   
+		// Was it successful?
+		$this->response = "";
+		
+		while(!feof($fp))
+		{
+			$this->response .= fgets($fp, 128);
+		}  
+		@fclose($fp);
+		
+		if ( ! eregi("0", $this->response))
+		{
+			$message = 'An unknown error was encountered';
+			
+			if (preg_match("/(.*?)<\/message>/is", $this->response, $match))
+			{
+				$message = trim($match['1']);
+			}
+			
+			$this->set_error($message);
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+	// END process()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Extract Trackback URLs
+	 *
+	 * This function lets multiple trackbacks be sent.
+	 * It takes a string of URLs (separated by comma or
+	 * space) and puts each URL into an array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function extract_urls($urls)
+	{		   
+		// Remove the pesky white space and replace with a comma.
+		$urls = preg_replace("/\s*(\S+)\s*/", "\\1,", $urls);
+		
+		// If they use commas get rid of the doubles.
+		$urls = str_replace(",,", ",", $urls);
+		
+		// Remove any comma that might be at the end
+		if (substr($urls, -1) == ",")
+		{
+			$urls = substr($urls, 0, -1);
+		}
+				
+		// Break into an array via commas
+		$urls = preg_split('/[,]/', $urls);
+		
+		// Removes duplicates
+		$urls = array_unique($urls);
+		
+		array_walk($urls, array($this, 'validate_url')); 
+		
+		return $urls;
+	}
+	// END extract_urls()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Validate URL
+	 *
+	 * Simply adds "http://" if missing
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function validate_url($url)
+	{
+		$url = trim($url);
+
+		if (substr($url, 0, 4) != "http")
+		{
+			$url = "http://".$url;
+		}
+	}
+	// END validate_url()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Find the Trackback URL's ID
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function get_id($url)
+	{	
+		$tb_id = "";
+		
+		if (strstr($url, '?'))
+		{
+			$tb_array = explode('/', $url);
+			$tb_end   = $tb_array[count($tb_array)-1];
+			
+			if ( ! ctype_digit($tb_end))
+			{
+				$tb_end  = $tb_array[count($tb_array)-2];
+			}
+			
+			$tb_array = explode('=', $tb_end);
+			$tb_id	= $tb_array[count($tb_array)-1];
+		}
+		else
+		{
+			if (ereg("/$", $url))
+			{
+				$url = substr($url, 0, -1);
+			}
+				
+			$tb_array = explode('/', $url);
+			$tb_id	= $tb_array[count($tb_array)-1];
+			
+			if ( ! ctype_digit($tb_id))
+			{
+				$tb_id  = $tb_array[count($tb_array)-2];
+			}
+		}	
+				
+		if ( ! preg_match ("/^([0-9]+)$/", $tb_id)) 
+		{
+			return false;
+		}
+		else
+		{
+			return $tb_id;
+		}		
+	}
+	// END get_id()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Convert Reserved XML characters to Entities
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function convert_xml($str)
+	{
+		$temp = '__TEMP_AMPERSANDS__';
+		
+		$str = preg_replace("/&#(\d+);/", "$temp\\1;", $str);
+		$str = preg_replace("/&(\w+);/",  "$temp\\1;", $str);
+		
+		$str = str_replace(array("&","<",">","\"", "'", "-"),
+						   array("&", "<", ">", """, "'", "-"),
+						   $str);
+			
+		$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
+		$str = preg_replace("/$temp(\w+);/","&\\1;", $str);
+			
+		return $str;
+	}	
+	// END get_id()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Character limiter
+	 *
+	 * Limits the string based on the character count. Will preserve complete words.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	integer
+	 * @param	string
+	 * @return	string
+	 */
+	function limit_characters($str, $n = 500, $end_char = '…')
+	{
+		if (strlen($str) < $n) 
+		{
+			return $str;
+		}
+			
+		$str = preg_replace("/\s+/", ' ', preg_replace("/(\r\n|\r|\n)/", " ", $str));
+	
+		if (strlen($str) <= $n)
+		{
+			return $str;
+		}
+										
+		$out = "";
+		foreach (explode(' ', trim($str)) as $val)
+		{
+			$out .= $val.' ';			
+			if (strlen($out) >= $n)
+			{
+				return trim($out).$end_char; 
+			}		
+		}
+	}
+	// END get_id()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * High ASCII to Entities
+	 *
+	 * Converts Hight ascii text and MS Word special chars
+	 * to character entities
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function convert_ascii($str)
+	{
+	   $count	= 1;
+	   $out	= '';
+	   $temp	= array();
+		   
+	   for ($i = 0, $s = strlen($str); $i < $s; $i++)
+	   {
+		   $ordinal = ord($str[$i]);
+		   
+		   if ($ordinal < 128)
+		   {
+			   $out .= $str[$i];			
+		   }
+		   else
+		   {
+			   if (count($temp) == 0)
+			   {
+				   $count = ($ordinal < 224) ? 2 : 3;
+			   }
+			   
+			   $temp[] = $ordinal;
+			   
+			   if (count($temp) == $count)
+			   {
+				   $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64);
+	
+				   $out .= '&#'.$number.';';
+				   $count = 1;
+				   $temp = array();
+			   }   
+		   }   
+	   }
+	   
+	   return $out;
+	}
+	// END convert_ascii()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set error message
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_error($msg)
+	{
+		log_message('error', $msg);
+		$this->error_msg[] = $msg;
+	}
+	// END convert_ascii()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Show error messages
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function display_errors($open = '
', $close = '
')
+	{	
+		$str = '';
+		foreach ($this->error_msg as $val)
+		{
+			$str .= $open.$val.$close;
+		}
+	
+		return $str;
+	}
+	// END display_errors()
+}
+// END Trackback Class
+?>
\ No newline at end of file
diff --git a/system/libraries/URI.php b/system/libraries/URI.php
new file mode 100644
index 00000000..4c2fa9c7
--- /dev/null
+++ b/system/libraries/URI.php
@@ -0,0 +1,243 @@
+uri =& _load_class('CI_Router');		
+		log_message('debug', "URI Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a URI Segment
+	 *
+	 * This function returns the URI segment based on the number provided.  
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @param	bool
+	 * @return	string
+	 */
+	function segment($n, $no_result = FALSE)
+	{
+		return ( ! isset($this->uri->segments[$n])) ? $no_result : $this->uri->segments[$n];
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate a key value pair from the URI string
+	 *
+	 * This function generates and associative array of URI data starting 
+	 * at the supplied segment. For example, if this is your URI:
+	 *
+	 *	www.your-site.com/user/search/name/joe/location/UK/gender/male
+	 *
+	 * You can use this function to generate an array with this prototype:
+	 *
+	 * array (
+	 *			name => joe
+	 *			location => UK
+	 *			gender => male
+	 *		 )
+	 * 
+	 * @access	public
+	 * @param	integer	the starting segment number
+	 * @param	array	an array of default values
+	 * @return	array
+	 */
+	function uri_to_assoc($n = 3, $default = array())
+	{
+		if ( ! ctype_digit($n))
+		{
+			return $default;
+		}
+	
+		if (isset($this->keyval[$n]))
+		{
+			return $this->keyval[$n];
+		}
+	
+		if ($this->total_segments() < $n)
+		{
+			if (count($default) == 0)
+			{
+				return array();
+			}
+			
+			$retval = array();
+			foreach ($default as $val)
+			{
+				$retval[$val] = FALSE;
+			}		
+			return $default;
+		}
+
+		$segments = array_slice($this->segment_array(), ($n - 1));
+
+		$i = 0;
+		$lastval = '';
+		$retval  = array();
+		foreach ($segments as $seg)
+		{
+			if ($i % 2)
+			{
+				$retval[$lastval] = $seg;
+			}
+			else
+			{
+				$retval[$seg] = FALSE;
+				$lastval = $seg;
+			}
+		
+			$i++;
+		}
+
+		if (count($default) > 0)
+		{
+			foreach ($default as $val)
+			{
+				if ( ! array_key_exists($val, $retval))
+				{
+					$retval[$val] = FALSE;
+				}
+			}
+		}
+
+		// Cache the array for reuse
+		$this->keyval[$n] = $retval;
+		return $retval;
+	}
+
+	/**
+	 * Generate a URI string from an associative array
+	 *
+	 * 
+	 * @access	public
+	 * @param	array	an associative array of key/values
+	 * @return	array
+	 */	function assoc_to_uri($array)
+	{	
+		$temp = array();
+		foreach ((array)$array as $key => $val)
+		{
+			$temp[] = $key;
+			$temp[] = $val;
+		}
+		
+		return implode('/', $temp);
+	}
+
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a URI Segment and add a trailing slash
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @param	string
+	 * @return	string
+	 */
+	function slash_segment($n, $where = 'trailing')
+	{	
+		if ($where == 'trailing')
+		{
+			$trailing	= '/';
+			$leading	= '';
+		}
+		elseif ($where == 'leading')
+		{
+			$leading	= '/';
+			$trailing	= '';
+		}
+		else
+		{
+			$leading	= '/';
+			$trailing	= '/';
+		}
+		return ( ! isset($this->uri->segments[$n])) ? '' : $leading.$this->uri->segments[$n].$trailing;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Segment Array
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	function segment_array()
+	{
+		return $this->uri->segments;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Total number of segments
+	 *
+	 * @access	public
+	 * @return	integer
+	 */
+	function total_segments()
+	{
+		return count($this->uri->segments);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch the entire URI string
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function uri_string()
+	{
+		return $this->uri->uri_string;
+	}
+
+}
+// END URI Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
new file mode 100644
index 00000000..bf50350a
--- /dev/null
+++ b/system/libraries/Unit_test.php
@@ -0,0 +1,331 @@
+active == FALSE)
+			return;
+			
+		if (in_array($expected, array('is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null')))
+		{		
+			$expected = str_replace('is_float', 'is_double', $expected);
+			$result = ($expected($test)) ? TRUE : FALSE;	
+			$extype = str_replace(array('true', 'false'), 'bool', str_replace('is_', '', $expected));
+		}
+		else
+		{
+			if ($this->strict == TRUE)
+				$result = ($test === $expected) ? TRUE : FALSE;	
+			else
+				$result = ($test == $expected) ? TRUE : FALSE;	
+			
+			$extype = gettype($expected);
+		}
+				
+		$back = $this->_backtrace();
+	
+		$report[] = array (
+							'test_name'			=> $test_name,
+							'test_datatype'		=> gettype($test),
+							'res_datatype'		=> $extype,
+							'result'			=> ($result === TRUE) ? 'passed' : 'failed',
+							'file'				=> $back['file'],
+							'line'				=> $back['line']
+						);
+
+		$this->results[] = $report;		
+				
+		return($this->report($this->result($report)));
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate a report
+	 *
+	 * Displays a table with the test data
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function report($result = array())
+	{	
+		if (count($result) == 0)
+		{
+			$result = $this->result();
+		}
+		
+		$this->_parse_template();
+	
+		$r = '';
+		foreach ($result as $res)
+		{
+			$table = '';
+		
+			foreach ($res as $key => $val)
+			{
+				$temp = $this->_template_rows;			
+				$temp = str_replace('{item}', $key, $temp);
+				$temp = str_replace('{result}', $val, $temp);
+				$table .= $temp;
+			}
+			
+			$r .= str_replace('{rows}', $table, $this->_template);
+		}
+	
+		return $r;	
+	}	
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Use strict comparison
+	 *
+	 * Causes the evaluation to use === rather then ==
+	 *
+	 * @access	public
+	 * @param	bool
+	 * @return	null
+	 */
+	function use_strict($state = TRUE)
+	{
+		$this->strict = ($state == FALSE) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Make Unit testing active
+	 *
+	 * Enables/disables unit testing  
+	 *
+	 * @access	public
+	 * @param	bool
+	 * @return	null
+	 */
+	function active($state = TRUE)
+	{
+		$this->active = ($state == FALSE) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Result Array
+	 *
+	 * Returns the raw result data
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	function result($results = array())
+	{	
+		$obj =& get_instance();
+		$obj->load->language('unit_test');
+		
+		if (count($results) == 0)
+		{
+			$results = $this->results;
+		}
+		
+		$retval = array();
+		foreach ($results as $result)
+		{
+			$temp = array();
+			foreach ($result as $key => $val)
+			{
+				if (is_array($val))
+				{
+					foreach ($val as $k => $v)
+					{
+						if (FALSE !== ($line = $obj->lang->line(strtolower('ut_'.$v))))
+						{
+							$v = $line;
+						}				
+						$temp[$obj->lang->line('ut_'.$k)] = $v;					
+					}
+				}
+				else
+				{
+					if (FALSE !== ($line = $obj->lang->line(strtolower('ut_'.$val))))
+					{
+						$val = $line;
+					}				
+					$temp[$obj->lang->line('ut_'.$key)] = $val;
+				}
+			}
+			
+			$retval[] = $temp;
+		}
+	
+		return $retval;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set the template
+	 *
+	 * This lets us set the template to be used to display results
+	 *
+	 * @access	public
+	 * @params	string
+	 * @return	void
+	 */	
+	function set_template($tempalte)
+	{
+		$this->_template = $tempalte;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate a backtrace
+	 *
+	 * This lets us show file names and line numbers 
+	 *
+	 * @access	private
+	 * @return	array
+	 */
+	function _backtrace() 
+	{
+		if (function_exists('debug_backtrace')) 
+		{
+			$back = debug_backtrace();
+			
+			$file = ( ! isset($back['1']['file'])) ? '' : $back['1']['file'];
+			$line = ( ! isset($back['1']['line'])) ? '' : $back['1']['line'];
+						
+			return array('file' => $file, 'line' => $line);
+		}
+		return array('file' => 'Unknown', 'line' => 'Unknown');
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Get Default Template
+	 *
+	 * @access	private
+	 * @return	string
+	 */
+	function _default_template()
+	{	
+		$this->_template = '	
+		

+				
+		{rows}
+		
';
+		
+		$this->_template_rows = '
+		
+		{item}
+		{result}
+		
+		';	
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Parse Template
+	 *
+	 * Harvests the data within the template {pseudo-variables}
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+ 	function _parse_template()
+ 	{
+ 		if ( ! is_null($this->_template_rows))
+ 		{
+ 			return;
+ 		}
+ 		
+ 		if (is_null($this->_template))
+ 		{
+ 			$this->_default_template();
+ 			return;
+ 		}
+ 		
+		if ( ! preg_match("/\{rows\}(.*?)\{\/rows\}/si", $this->_template, $match))
+		{
+ 			$this->_default_template();
+ 			return;
+		}
+
+		$this->_template_rows = $match['1'];
+		$this->_template = str_replace($match['0'], '{rows}', $this->_template); 	
+ 	}
+ 	
+}
+// END Unit_test Class
+
+/**
+ * Helper functions to test boolean true/false
+ * 
+ *
+ * @access	private
+ * @return	bool
+ */
+function is_true($test)
+{
+	return (is_bool($test) AND $test === TRUE) ? TRUE : FALSE;
+}
+function is_false($test)
+{
+	return (is_bool($test) AND $test === FALSE) ? TRUE : FALSE;
+}
+
+?>
\ No newline at end of file
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
new file mode 100644
index 00000000..6d12dbcd
--- /dev/null
+++ b/system/libraries/Upload.php
@@ -0,0 +1,775 @@
+ 0)
+		{
+			$this->initialize($props);
+		}
+		
+		log_message('debug', "Upload Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Initialize preferences
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	void
+	 */	
+	function initialize($config = array())
+	{  
+		foreach ($config as $key => $val)
+		{
+			$method = 'set_'.$key;
+			if (method_exists($this, $method))
+			{
+				$this->$method($val);
+			}
+			else
+			{
+				$this->$key = $val;
+			}			
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Perform the file upload
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+    function do_upload()
+    {
+		// Is $_FILES['userfile'] set? If not, no reason to continue.
+    	if ( ! isset($_FILES['userfile']))
+    	{
+			$this->set_error('upload_userfile_not_set');
+			return FALSE;
+    	}
+    	
+		// Is the upload path valid?
+		if ( ! $this->validate_upload_path())
+		{
+			return FALSE;
+		}
+		    	    	
+		// Was the file able to be uploaded? If not, determine the reason why.
+		if ( ! is_uploaded_file($_FILES['userfile']['tmp_name'])) 
+		{
+            $error = ( ! isset($_FILES['userfile']['error'])) ? 4 : $_FILES['userfile']['error'];
+
+            switch($error)
+            { 
+                case 1  :   $this->set_error('upload_file_exceeds_limit');
+                    break;
+                case 3  :   $this->set_error('upload_file_partial');
+                    break;
+                case 4  :   $this->set_error('upload_no_file_selected');
+                    break;
+                default :   $this->set_error('upload_no_file_selected');
+                    break;
+            }
+            
+            return FALSE;
+		}
+ 
+		// Set the uploaded data as class variables
+		$this->file_temp = $_FILES['userfile']['tmp_name'];		
+		$this->file_name = $_FILES['userfile']['name'];
+		$this->file_size = $_FILES['userfile']['size'];		
+		$this->file_type = preg_replace("/^(.+?);.*$/", "\\1", $_FILES['userfile']['type']);
+		$this->file_type = strtolower($this->file_type);
+		$this->file_ext	 = $this->get_extension($_FILES['userfile']['name']);
+		
+		// Convert the file size to kilobytes
+		if ($this->file_size > 0)
+		{
+			$this->file_size = round($this->file_size/1024, 2);
+		}
+
+		// Is the file type allowed to be uploaded?
+        if ( ! $this->is_allowed_filetype())
+        {
+			$this->set_error('upload_invalid_filetype');
+			return FALSE;
+        }
+
+		// Is the file size within the allowed maximum?
+        if ( ! $this->is_allowed_filesize())
+        {
+			$this->set_error('upload_invalid_filesize');
+			return FALSE;    
+        }
+        
+		// Are the image dimensions within the allowed size?
+		// Note: This can fail if the server has an open_basdir restriction.
+        if ( ! $this->is_allowed_dimensions())
+        {
+			$this->set_error('upload_invalid_dimensions');
+			return FALSE;    
+        }
+        
+		// Sanitize the file name for security
+        $this->file_name = $this->clean_file_name($this->file_name);
+        
+		// Remove white spaces in the name
+        if ($this->remove_spaces == TRUE)
+        {
+            $this->file_name = preg_replace("/\s+/", "_", $this->file_name);
+        }
+        
+		/*
+		 * Validate the file name
+		 * This function appends an number onto the end of
+		 * the file if one with the same name already exists.
+		 * If it returns false there was a problem.
+		 */
+		$this->orig_name = $this->file_name;
+
+		if ($this->overwrite == FALSE)
+		{
+			$this->file_name = $this->set_filename($this->file_path, $this->file_name);
+			
+			if ($this->file_name === FALSE)
+			{
+				return FALSE;
+			}
+		}
+ 
+		/*
+		 * Move the file to the final destination
+		 * To deal with different server configurations
+		 * we'll attempt to use copy() first.  If that fails
+		 * we'll use move_uploaded_file().  One of the two should
+		 * reliably work in most environments
+		 */
+		if ( ! @copy($this->file_temp, $this->file_path.$this->file_name))
+		{                            
+			if ( ! @move_uploaded_file($this->file_temp, $this->file_path.$this->file_name))
+			{
+				 $this->set_error('upload_destination_error');
+				 return FALSE;
+			}
+		} 
+		
+		/*
+		 * Run the file through the XSS hacking filter
+		 * This helps prevent malicious code from being
+		 * embedded within a file.  Scripts can easily 
+		 * be disguised as images or other file types.
+		 */
+		if ($this->xss_clean == TRUE)
+		{
+			$this->do_xss_clean();
+		}
+ 
+		/*
+		 * Set the finalized image dimensions
+		 * This sets the image width/height (assuming the
+		 * file was an image).  We use this information
+		 * in the "data" function.
+		 */
+        $this->set_image_properties($this->file_path.$this->file_name);        
+        
+		return TRUE;
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Finalized Data Array 
+	 *	
+	 * Returns an associative array containing all of the information 
+	 * related to the upload, allowing the developer easy access in one array.
+	 *
+	 * @access	public
+	 * @return	array
+	 */	
+	function data()
+	{
+		return array (
+					'file_name'			=> $this->file_name,
+					'file_type'			=> $this->file_type,
+					'file_path'			=> $this->file_path,
+					'full_path'			=> $this->file_path.$this->file_name,
+					'raw_name'			=> str_replace($this->file_ext, '', $this->file_name),
+					'orig_name'			=> $this->orig_name,
+					'file_ext'			=> $this->file_ext,
+					'file_size'			=> $this->file_size,
+					'is_image'			=> $this->is_image(),
+					'image_width'		=> $this->image_width,
+					'image_height'		=> $this->image_height,
+					'image_type'		=> $this->image_type,
+					'image_size_str'	=> $this->image_size_str,
+				);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Upload Path 
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+    function set_upload_path($path)
+    {     
+		$this->file_path = $path;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set the file name 
+	 *
+	 * This function takes a filename/path as input and looks for the 
+	 * existnace of a file with the same name. If found, it will append a 
+	 * number to the end of the filename to avoid overwritting a pre-existing file.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function set_filename($path, $filename)
+	{
+		if ($this->encrypt_name == TRUE)
+		{		
+			mt_srand();
+			$filename = md5(uniqid(mt_rand())).$this->file_ext; 			
+		}
+	
+		if ( ! file_exists($path.$filename))
+		{
+			return $filename;
+		}
+	
+		$filename = str_replace($this->file_ext, '', $filename);
+		
+		$new_filename = '';
+		for ($i = 1; $i < 100; $i++)
+		{			
+			if ( ! file_exists($path.$filename.$i.$this->file_ext))
+			{
+				$new_filename = $filename.$i.$this->file_ext;
+				break;
+			}
+		}
+
+		if ($new_filename == '')
+		{
+			$this->set_error('upload_bad_filename');
+			return FALSE;
+		}
+		else
+		{
+			return $new_filename;
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Maximum File Size 
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @return	void
+	 */	
+    function set_max_filesize($n)
+    {
+        $this->max_size = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; 
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Maximum Image Width 
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @return	void
+	 */	
+    function set_max_width($n)
+    {    
+        $this->max_width = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; 
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Maximum Image Height 
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @return	void
+	 */	
+    function set_max_height($n)
+    {
+        $this->max_height = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; 
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Allowed File Types 
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+    function set_allowed_types($types)
+    {
+    	$this->allowed_types = explode('|', $types);
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Image Properties
+	 *
+	 * Uses GD to determine the width/height/type of image
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+    function set_image_properties($path = '')
+    {
+        if ( ! $this->is_image())
+        {
+            return;    
+        }
+            
+        if (function_exists('getimagesize')) 
+        {
+            if (FALSE !== ($D = @getimagesize($path)))
+            {	
+				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
+            
+				$this->image_width		= $D['0'];
+				$this->image_height		= $D['1'];
+				$this->image_type		= ( ! isset($types[$D['2']])) ? 'unknown' : $types[$D['2']];
+				$this->image_size_str	= $D['3'];  // string containing height and width
+			}
+        }
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set XSS Clean
+	 *
+	 * Enables the XSS flag so that the file that was uploaded
+	 * will be run through the XSS filter.
+	 *
+	 * @access	public
+	 * @param	bool
+	 * @return	void
+	 */
+	function set_xss_clean($flag = FALSE)
+	{
+		$this->xss_clean = ($flag == TRUE) ? TRUE : FALSE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Validate the image
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+    function is_image()
+    {
+        $img_mimes = array(
+                            'image/gif',
+                            'image/jpg', 
+                            'image/jpe',
+                            'image/jpeg', 
+                            'image/pjpeg',
+                            'image/png',
+                            'image/x-png'
+                           );
+    
+
+		return (in_array($this->file_type, $img_mimes)) ? TRUE : FALSE;
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Verify that the filetype is allowed
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+    function is_allowed_filetype()
+    {
+    	if (count($this->allowed_types) == 0)
+    	{
+			$this->set_error('upload_no_file_types');
+			return FALSE;
+    	}
+    	     	 
+    	foreach ($this->allowed_types as $val)
+    	{
+    		$mime = $this->mimes_types(strtolower($val));
+    	
+    		if (is_array($mime))
+    		{
+    			if (in_array($this->file_type, $mime))
+    			{
+    				return TRUE;
+    			}
+    		}
+    		else
+    		{
+				if ($mime == $this->file_type)
+				{
+					return TRUE;
+				}	
+    		}    	
+    	}
+    	
+    	return FALSE;
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Verify that the file is within the allowed size
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+    function is_allowed_filesize()
+    {    
+        if ($this->max_size != 0  AND  $this->file_size > $this->max_size)
+        {
+            return FALSE;
+        }
+        else
+        {
+            return TRUE;
+        }
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Verify that the image is within the allowed width/height
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+    function is_allowed_dimensions()
+    {
+        if ( ! $this->is_image())
+        {
+            return TRUE;    
+        }
+    
+        if (function_exists('getimagesize')) 
+        {
+            $D = @getimagesize($this->file_temp);
+            
+            if ($this->max_width > 0 AND $D['0'] > $this->max_width)
+            {
+                return FALSE;
+            }
+
+            if ($this->max_height > 0 AND $D['1'] > $this->max_height)
+            {
+                return FALSE;
+            }
+                       
+            return TRUE;
+        }
+
+        return TRUE;
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * VAlidate Upload Path 
+	 *
+	 * Verifies that it is a valid upload path with proper permissions.
+	 *
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+    function validate_upload_path()
+    {    
+    	if ($this->file_path == '')
+    	{ 
+			$this->set_error('upload_no_filepath');
+			return FALSE;
+    	}
+    	
+		if (function_exists('realpath') AND @realpath($this->file_path) !== FALSE)
+		{
+			$this->file_path = str_replace("\\", "/", realpath($this->file_path)); 
+		}
+    
+        if ( ! @is_dir($this->file_path))
+        {
+			$this->set_error('upload_no_filepath');
+			return FALSE;
+        }
+        
+        if ( ! is_writable($this->file_path))
+        {
+			$this->set_error('upload_not_writable');
+			return FALSE;
+        }
+                
+		$this->file_path = preg_replace("/(.+?)\/*$/", "\\1/",  $this->file_path);
+		return TRUE;
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Extract the file extension
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function get_extension($filename)
+	{
+		$x = explode('.', $filename);
+		return '.'.end($x);
+	}	
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Clean the file name for security
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */		
+	function clean_file_name($filename)
+	{
+        $bad = array(
+						"",
+						"'",
+						"<",
+						">",
+						'"',
+						'&',
+						'$',
+						'=',
+						';',
+						'?',
+						'/',
+						"%20",
+						"%22",
+						"%3c",		// <
+						"%253c", 	// <
+						"%3e", 		// >
+						"%0e", 		// >
+						"%28", 		// (  
+						"%29", 		// ) 
+						"%2528", 	// (
+						"%26", 		// &
+						"%24", 		// $
+						"%3f", 		// ?
+						"%3b", 		// ;
+						"%3d"		// =
+        			);
+        			
+        foreach ($bad as $val)
+        {
+			$filename = str_replace($val, '', $filename);   
+        }
+        
+		return $filename;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Runs the file through the XSS clean function
+	 *
+	 * This prevents people from embedding malicious code in their files.  
+	 * I'm not sure that it won't negatively affect certain files in unexpected ways,
+	 * but so far I haven't found that it causes trouble.
+	 *
+	 * @access	public
+	 * @return	void
+	 */	
+	function do_xss_clean()
+	{		
+		$file = $this->file_path.$this->file_name;
+		
+		if (filesize($file) == 0) 
+		{
+			return FALSE;
+		}
+	
+		if ( ! $fp = @fopen($file, 'rb'))
+		{
+			return FALSE;
+		}
+			
+        flock($fp, LOCK_EX);
+
+		$data = fread($fp, filesize($file)); 
+		
+		$obj =& get_instance();	
+		$data = $obj->input->xss_clean($data);
+
+        fwrite($fp, $data);
+        flock($fp, LOCK_UN);
+        fclose($fp);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set an error message
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_error($msg)
+	{
+		$obj =& get_instance();	
+		$obj->lang->load('upload');
+		
+		if (is_array($msg))
+		{
+			foreach ($msg as $val)
+			{
+				$msg = ($obj->lang->line($val) == FALSE) ? $val : $obj->lang->line($val);				
+				$this->error_msg[] = $msg;
+				log_message('error', $msg);
+			}		
+		}
+		else
+		{
+			$msg = ($obj->lang->line($msg) == FALSE) ? $msg : $obj->lang->line($msg);
+			$this->error_msg[] = $msg;
+			log_message('error', $msg);
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Display the error message
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function display_errors($open = '
', $close = '
')
+	{
+		$str = '';
+		foreach ($this->error_msg as $val)
+		{
+			$str .= $open.$val.$close;
+		}
+	
+		return $str;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * List of Mime Types
+	 *
+	 * This is a list of mime types.  We use it to validate
+	 * the "allowed types" set by the developer
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function mimes_types($mime)
+	{
+		if (count($this->mimes) == 0)
+		{
+			if (@include(APPPATH.'config/mimes'.EXT))
+			{
+				$this->mimes = $mimes;
+				unset($mimes);
+			}
+		}
+	
+		return ( ! isset($this->mimes[$mime])) ? FALSE : $this->mimes[$mime];
+	}
+
+}
+// END Upload Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
new file mode 100644
index 00000000..df8c70ee
--- /dev/null
+++ b/system/libraries/Validation.php
@@ -0,0 +1,692 @@
+';
+	var $_error_suffix		= '
';
+	var $obj;
+	
+
+	/**
+	 * Constructor 
+	 *
+	 */	
+	function CI_Validation()
+	{	
+		$this->obj =& get_instance();
+		log_message('debug', "Validation Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Fields
+	 *
+	 * This function takes an array of field names as input
+	 * and generates class variables with the same name, which will
+	 * either be blank or contain the $_POST value corresponding to it
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	void
+	 */
+	function set_fields($data = '', $field = '')
+	{	
+		if ($data == '')
+			return;
+	
+		if ( ! is_array($data))
+		{
+			if ($field == '')
+				return;
+			
+			$data = array($data => $field);
+		}
+	
+		$this->_fields = $data;
+	
+		foreach($this->_fields as $key => $val)
+		{		
+			$this->$key = ( ! isset($_POST[$key]) OR is_array($_POST[$key])) ? '' : $this->prep_for_form($_POST[$key]);
+			
+			$error = $key.'_error';
+			if ( ! isset($this->$error))
+			{
+				$this->$error = '';
+			}
+		}		
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Rules
+	 *
+	 * This function takes an array of field names and validation 
+	 * rules as input ad simply stores is for use later.
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @param	string
+	 * @return	void
+	 */
+	function set_rules($data, $rules = '')
+	{
+		if ( ! is_array($data))
+		{
+			if ($rules == '')
+				return;
+				
+			$data[$data] = $rules;
+		}
+	
+		foreach ($data as $key => $val)
+		{
+			$this->_rules[$key] = $val;
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Error Message
+	 *
+	 * Lets users set their own error messages on the fly.  Note:  The key 
+	 * name has to match the  function name that it corresponds to.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */
+	function set_message($lang, $val = '')
+	{
+		if ( ! is_array($lang))
+		{
+			$lang = array($lang => $val);
+		}
+	
+		$this->_error_messages = array_merge($this->_error_messages, $lang);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set The Error Delimiter
+	 *
+	 * Permits a prefix/suffix to be added to each error message
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_error_delimiters($prefix = '
', $suffix = '
')
+	{
+		$this->_error_prefix = $prefix;
+		$this->_error_suffix = $suffix;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Run the Validator
+	 *
+	 * This function does all the work.
+	 *
+	 * @access	public
+	 * @return	bool
+	 */		
+	function run()
+	{
+		// Do we even have any data to process?  Mm?
+		if (count($_POST) == 0 OR count($this->_rules) == 0)
+		{
+			return FALSE;
+		}
+	
+		// Load the language file containing error messages
+		$this->obj->lang->load('validation');
+							
+		// Cycle through the rules and test for errors
+		foreach ($this->_rules as $field => $rules)
+		{
+			//Explode out the rules!
+			$ex = explode('|', $rules);
+
+			// Is the field required?  If not, if the field is blank  we'll move on to the next text
+			if ( ! in_array('required', $ex))
+			{
+				if ( ! isset($_POST[$field]) OR $_POST[$field] == '')
+				{
+					continue;
+				}
+			}
+			
+			/*
+			 * Are we dealing with an "isset" rule?
+			 *
+			 * Before going further, we'll see if one of the rules
+			 * is to check whether the item is set (typically this
+			 * applies only to checkboxes).  If so, we'll
+			 * test for it here since there's not reason to go
+			 * further
+			 */
+			if ( ! isset($_POST[$field]))
+			{			
+				if (in_array('isset', $ex) OR in_array('required', $ex))
+				{
+					if ( ! isset($this->messages['isset'])) 
+					{
+						if (FALSE === ($line = $this->obj->lang->line('isset')))
+						{
+							$line = 'The field was not set';
+						}							
+					}
+					else
+					{
+						$line = $this->_error_messages['isset'];
+					}
+					
+					$field = ( ! isset($this->_fields[$field])) ? $field : $this->_fields[$field];
+					$this->_error_array[] = sprintf($line, $field);	
+				}
+						
+				continue;
+			}
+	
+			/*
+			 * Set the current field
+			 *
+			 * The various prepping functions need to know the
+			 * current field name so they can do this:
+			 *
+			 * $_POST[$this->_current_field] == 'bla bla';
+			 */
+			$this->_current_field = $field;
+
+			// Cycle through the rules!
+			foreach ($ex As $rule)
+			{
+
+				// Is the rule a callback?			
+				$callback = FALSE;
+				if (substr($rule, 0, 9) == 'callback_')
+				{
+					$rule = substr($rule, 9);
+					$callback = TRUE;
+				}			
+			
+				// Strip the parameter (if exists) from the rule
+				// Rules can contain a parameter: max_length[5]
+				$param = FALSE;
+				if (preg_match("/.*?(\[.*?\]).*/", $rule, $match))
+				{
+					$param = substr(substr($match['1'], 1), 0, -1);
+					$rule  = str_replace($match['1'], '', $rule);
+				}
+
+				// Call the function that corresponds to the rule
+				if ($callback === TRUE)
+				{
+					if ( ! method_exists($this->obj, $rule))
+					{ 		
+						continue;
+					}
+					
+					$result = $this->obj->$rule($_POST[$field], $param);
+				}
+				else
+				{				
+					if ( ! method_exists($this, $rule))
+					{
+						/*
+						 * Run the native PHP function if called for
+						 *
+						 * If our own wrapper function doesn't exist we see
+						 * if a native PHP function does. Users can use
+						 * any native PHP function call that has one param.
+						 */
+						if (function_exists($rule))
+						{
+							$_POST[$field] = $rule($_POST[$field]);
+							$this->$field = $_POST[$field];
+						}
+											
+						continue;
+					}
+					
+					$result = $this->$rule($_POST[$field], $param);
+				}
+				
+				// Did the rule test negatively?  If so, grab the error.
+				if ($result === FALSE)
+				{
+					if ( ! isset($this->_error_messages[$rule])) 
+					{
+						if (FALSE === ($line = $this->obj->lang->line($rule)))
+						{
+							$line = 'Unable to access an error message corresponding to your field name.';
+						}						
+					}
+					else
+					{
+						$line = $this->_error_messages[$rule];;
+					}				
+
+					// Build the error message
+					$mfield = ( ! isset($this->_fields[$field])) ? $field : $this->_fields[$field];
+					$mparam = ( ! isset($this->_fields[$param])) ? $param : $this->_fields[$param];
+					$message = sprintf($line, $mfield, $mparam);
+					
+					// Set the error variable.  Example: $this->username_error
+					$error = $field.'_error';
+					$this->$error = $this->_error_prefix.$message.$this->_error_suffix;
+
+					// Add the error to the error array
+					$this->_error_array[] = $message;				
+					continue 2;
+				}
+			}
+		}
+		
+		$total_errors = count($this->_error_array);
+
+		/*
+		 * Recompile the class variables
+		 *
+		 * If any prepping functions were called the $_POST data
+		 * might now be different then the corresponding class
+		 * variables so we'll set them anew.
+		 */	
+		if ($total_errors > 0)
+		{
+			$this->_safe_form_data = TRUE;
+		}
+		
+		$this->set_fields();
+ 
+		// Did we end up with any errors?
+		if ($total_errors == 0)
+		{
+			return TRUE;
+		}
+		
+		// Generate the error string
+		foreach ($this->_error_array as $val)
+		{
+			$this->error_string .= $this->_error_prefix.$val.$this->_error_suffix."\n";
+		}
+
+		return FALSE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Required
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */
+	function required($str)
+	{
+		if ( ! is_array($str))
+		{
+			return (trim($str) == '') ? FALSE : TRUE;
+		}
+		else
+		{
+			return ( ! empty($str));
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Match one field to another
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */
+	function matches($str, $field)
+	{
+		if ( ! isset($_POST[$field]))
+		{
+			return FALSE;
+		}
+		
+		return ($str !== $_POST[$field]) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Minimum Length
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function min_length($str, $val)
+	{
+		if ( ! ctype_digit($val))
+		{
+			return FALSE;
+		}
+	
+		return (strlen($str) < $val) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Max Length
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function max_length($str, $val)
+	{
+		if ( ! ctype_digit($val))
+		{
+			return FALSE;
+		}
+	
+		return (strlen($str) > $val) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Exact Length
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function exact_length($str, $val)
+	{
+		if ( ! ctype_digit($val))
+		{
+			return FALSE;
+		}
+	
+		return (strlen($str) != $val) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Valid Email
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function valid_email($str)
+	{
+		return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $str)) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Alpha
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */		
+	function alpha($str)
+	{
+		return ( ! preg_match("/^([-a-z])+$/i", $str)) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Alpha-numeric
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function alpha_numeric($str)
+	{
+		return ( ! preg_match("/^([-a-z0-9])+$/i", $str)) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Alpha-numeric with underscores and dashes
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function alpha_dash($str)
+	{
+		return ( ! preg_match("/^([-a-z0-9_-])+$/i", $str)) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Numeric
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function numeric($str)
+	{
+		return ( ! ctype_digit($str)) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Select
+	 *
+	 * Enables pull-down lists to be set to the value the user
+	 * selected in the event of an error
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function set_select($field = '', $value = '')
+	{
+		if ($field == '' OR $value == '' OR  ! isset($_POST[$field]))
+		{
+			return '';
+		}
+			
+		if ($_POST[$field] == $value)
+		{
+			return ' selected="selected"';
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Radio
+	 *
+	 * Enables radio buttons to be set to the value the user
+	 * selected in the event of an error
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function set_radio($field = '', $value = '')
+	{
+		if ($field == '' OR $value == '' OR  ! isset($_POST[$field]))
+		{
+			return '';
+		}
+			
+		if ($_POST[$field] == $value)
+		{
+			return ' checked="checked"';
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Checkbox
+	 *
+	 * Enables checkboxes to be set to the value the user
+	 * selected in the event of an error
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function set_checkbox($field = '', $value = '')
+	{
+		if ($field == '' OR $value == '' OR  ! isset($_POST[$field]))
+		{
+			return '';
+		}
+			
+		if ($_POST[$field] == $value)
+		{
+			return ' checked="checked"';
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Prep data for form
+	 *
+	 * This function allows HTML to be safely shown in a form.
+	 * Special characters are converted.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+    function prep_for_form($str = '')
+    {
+    	if ($this->_safe_form_data == FALSE OR $str == '')
+    	{
+    		return $str;
+    	}
+            
+		return str_replace(array("'", '"', '<', '>'), array("'", """, '<', '>'), stripslashes($str));
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Prep URL
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+    function prep_url($str = '')
+    {
+		if ($str == 'http://' OR $str == '')
+		{
+			$_POST[$this->_current_field] = '';
+			return;
+		}
+		
+		if (substr($str, 0, 7) != 'http://' && substr($str, 0, 8) != 'https://')
+		{
+			$str = 'http://'.$str;
+		}
+		
+		$_POST[$this->_current_field] = $str;
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Strip Image Tags
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+    function strip_image_tags($str)
+    {                    
+        $_POST[$this->_current_field] = $this->input->strip_image_tags($str);
+    }
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * XSS Clean
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function xss_clean($str)
+	{
+		$_POST[$this->_current_field] = $this->obj->input->xss_clean($str);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Convert PHP tags to entities
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+    function encode_php_tags($str)
+    { 
+    	$_POST[$this->_current_field] = str_replace(array(''),  array('<?php', '<?PHP', '<?', '?>'), $str);
+	}
+
+}
+// END Validation Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
new file mode 100644
index 00000000..9eeb46a1
--- /dev/null
+++ b/system/libraries/Xmlrpc.php
@@ -0,0 +1,1409 @@
+xmlrpcName 		= $this->xmlrpcName;
+		$this->xmlrpc_backslash = chr(92).chr(92);
+		
+		// Types for info sent back and forth
+		$this->xmlrpcTypes = array(
+			$this->xmlrpcI4       => '1',
+			$this->xmlrpcInt      => '1',
+			$this->xmlrpcBoolean  => '1',
+			$this->xmlrpcString   => '1',
+			$this->xmlrpcDouble   => '1',
+			$this->xmlrpcDateTime => '1',
+			$this->xmlrpcBase64   => '1',
+			$this->xmlrpcArray    => '2',
+			$this->xmlrpcStruct   => '3'
+			);
+			
+		// Array of Valid Parents for Various XML-RPC elements
+		$this->valid_parents = array('BOOLEAN'			=> array('VALUE'),
+									 'I4'				=> array('VALUE'),
+									 'INT'				=> array('VALUE'),
+									 'STRING'			=> array('VALUE'),
+									 'DOUBLE'			=> array('VALUE'),
+									 'DATETIME.ISO8601'	=> array('VALUE'),
+									 'BASE64'			=> array('VALUE'),
+									 'ARRAY'			=> array('VALUE'),
+									 'STRUCT'			=> array('VALUE'),
+									 'PARAM'			=> array('PARAMS'),
+									 'METHODNAME'		=> array('METHODCALL'),
+									 'PARAMS'			=> array('METHODCALL', 'METHODRESPONSE'),
+									 'MEMBER'			=> array('STRUCT'),
+									 'NAME'				=> array('MEMBER'),
+									 'DATA'				=> array('ARRAY'),
+									 'FAULT'			=> array('METHODRESPONSE'),
+									 'VALUE'			=> array('MEMBER', 'DATA', 'PARAM', 'FAULT')
+									 );
+			
+			
+		// XML-RPC Responses
+		$this->xmlrpcerr['unknown_method'] = '1';
+		$this->xmlrpcstr['unknown_method'] = 'This is not a known method for this XML-RPC Server';
+		$this->xmlrpcerr['invalid_return'] = '2';
+		$this->xmlrpcstr['invalid_return'] = 'The XML data receieved was either invalid or not in the correct form for XML-RPC.  Turn on debugging to examine the XML data further.';
+		$this->xmlrpcerr['incorrect_params'] = '3';
+		$this->xmlrpcstr['incorrect_params'] = 'Incorrect parameters were passed to method';
+		$this->xmlrpcerr['introspect_unknown'] = '4';
+		$this->xmlrpcstr['introspect_unknown'] = "Cannot inspect signature for request: method unknown";
+		$this->xmlrpcerr['http_error'] = '5';
+		$this->xmlrpcstr['http_error'] = "Did not receive a '200 OK' response from remote server.";
+		$this->xmlrpcerr['no_data'] = '6';
+		$this->xmlrpcstr['no_data'] ='No data received from server.';
+		
+		$this->initialize($config);
+		
+		log_message('debug', "XML-RPC Class Initialized");
+	}
+	
+	
+	//-------------------------------------
+    //  Initialize Prefs
+    //-------------------------------------   
+
+	function initialize($config = array()) 
+	{
+		if (sizeof($config) > 0)
+		{
+			foreach ($config as $key => $val)
+			{
+				if (isset($this->$key))
+				{
+					$this->$key = $val;			
+				}
+			}
+		}
+	}
+	// END
+	
+	//-------------------------------------
+    //  Take URL and parse it
+    //-------------------------------------   
+
+	function server($url, $port=80) 
+	{
+		if (substr($url, 0, 4) != "http")
+		{
+			$url = "http://".$url;
+		}
+		
+		$parts = parse_url($url);
+		
+		$path = (!isset($parts['path'])) ? '/' : $parts['path'];
+		
+		if (isset($parts['query']) && $parts['query'] != '')
+		{
+			$path .= '?'.$parts['query'];
+		}	
+		
+		$this->client = new XML_RPC_Client($path, $parts['host'], $port);
+	}
+	// END
+	
+	//-------------------------------------
+	//  Set Timeout
+	//-------------------------------------   
+
+	function timeout($seconds=5) 
+	{
+		if ( ! is_null($this->client) && is_int($seconds))
+		{
+			$this->client->timeout = $seconds;
+		}
+	}
+	// END
+	
+	//-------------------------------------
+	//  Set Methods
+	//-------------------------------------   
+
+	function method($function) 
+	{
+		$this->method = $function;
+	}
+	// END
+	
+	//-------------------------------------
+	//  Take Array of Data and Create Objects
+	//-------------------------------------   
+
+	function request($incoming) 
+	{
+		if ( ! is_array($incoming))
+		{
+			// Send Error
+		}
+		
+		foreach($incoming as $key => $value)
+		{
+			$this->data[$key] = $this->values_parsing($value);
+		}
+	}
+	// END
+	
+	
+	//-------------------------------------
+	//  Set Debug
+	//-------------------------------------   
+
+	function set_debug($flag = TRUE)
+	{
+		$this->debug = ($flag == TRUE) ? TRUE : FALSE;
+	}
+	
+	//-------------------------------------
+	//  Values Parsing
+	//-------------------------------------   
+
+	function values_parsing($value, $return = FALSE)
+	{
+		if (is_array($value) && isset($value['0']))
+		{
+			if ( ! isset($value['1']) OR ! isset($this->xmlrpcTypes[strtolower($value['1'])]))
+			{
+				$temp = new XML_RPC_Values($value['0'], 'string');
+			}
+			elseif(is_array($value['0']) && ($value['1'] == 'struct' OR $value['1'] == 'array'))
+			{
+				while (list($k) = each($value['0']))
+				{
+					$value['0'][$k] = $this->values_parsing($value['0'][$k], TRUE);
+				}
+				
+				$temp = new XML_RPC_Values($value['0'], $value['1']);
+			}
+			else
+			{
+				$temp = new XML_RPC_Values($value['0'], $value['1']);
+			}
+		}
+		else
+		{
+			$temp = new XML_RPC_Values($value, 'string');
+		}
+
+		return $temp;
+	}
+	// END
+
+
+	//-------------------------------------
+	//  Sends XML-RPC Request
+	//-------------------------------------   
+
+	function send_request() 
+	{
+		$this->message = new XML_RPC_Message($this->method,$this->data);
+		$this->message->debug = $this->debug;
+	
+		if ( ! $this->result = $this->client->send($this->message))
+		{
+			$this->error = $this->result->errstr;
+			return FALSE;
+		}
+		elseif( ! is_object($this->result->val))
+		{
+			$this->error = $this->result->errstr;
+			return FALSE;
+		}
+		
+		$this->response = $this->result->decode();
+		
+		return TRUE;
+	}
+	// END
+	
+	//-------------------------------------
+	//  Returns Error
+	//-------------------------------------   
+
+	function display_error() 
+	{
+		return $this->error;
+	}
+	// END
+	
+	//-------------------------------------
+	//  Returns Remote Server Response
+	//-------------------------------------   
+
+	function display_response() 
+	{
+		return $this->response;
+	}
+	// END
+	
+	//-------------------------------------
+	//  Sends an Error Message for Server Request
+	//-------------------------------------   
+	
+	function send_error_message($number, $message)
+	{
+		return new XML_RPC_Response('0',$number, $message);
+	}
+	// END
+	
+	
+	//-------------------------------------
+	//  Send Response for Server Request
+	//-------------------------------------   
+	
+	function send_response($response)
+	{
+		// $response should be array of values, which will be parsed
+		// based on their data and type into a valid group of XML-RPC values
+		
+		$response = $this->values_parsing($response);
+	
+		return new XML_RPC_Response($response);
+	}
+	// END
+	
+} // END XML_RPC Class
+
+	
+	
+/**
+ * XML-RPC Client class
+ * 
+ * @category	XML-RPC
+ * @author		Paul Burdick
+ * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ */
+class XML_RPC_Client extends CI_XML_RPC
+{
+	var $path			= '';
+	var $server			= '';
+	var $port			= 80;
+	var $errno			= '';
+	var $errstring		= '';
+	var $timeout		= 5;
+	var $no_multicall	= false;
+
+	function XML_RPC_Client($path, $server, $port=80)
+	{
+		parent::CI_XML_RPC();
+		
+		$this->port = $port; 
+		$this->server = $server; 
+		$this->path = $path;
+	}
+	
+	function send($msg)
+	{
+		if (is_array($msg))
+		{
+			// Multi-call disabled
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['multicall_recursion'],$this->xmlrpcstr['multicall_recursion']);
+			return $r;
+		}
+
+		return $this->sendPayload($msg);
+	}
+
+	function sendPayload($msg)
+	{	
+		$fp = @fsockopen($this->server, $this->port,$this->errno, $this->errstr, $this->timeout);
+		
+		if (! is_resource($fp))
+		{
+			error_log($this->xmlrpcstr['http_error']);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'],$this->xmlrpcstr['http_error']);
+			return $r;
+		}
+		
+		if(empty($msg->payload))
+		{
+			// $msg = XML_RPC_Messages
+			$msg->createPayload();
+		}
+		
+		$r = "\r\n";
+		$op  = "POST {$this->path} HTTP/1.0$r";
+		$op .= "Host: {$this->server}$r";
+		$op .= "Content-Type: text/xml$r";
+		$op .= "User-Agent: {$this->xmlrpcName}$r";
+		$op .= "Content-Length: ".strlen($msg->payload). "$r$r";
+		$op .= $msg->payload;
+		
+
+		if (!fputs($fp, $op, strlen($op)))
+		{
+			error_log($this->xmlrpcstr['http_error']);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error']);
+			return $r;
+		}
+		$resp = $msg->parseResponse($fp);
+		fclose($fp);
+		return $resp;
+	}
+
+} // end class XML_RPC_Client
+
+
+/**
+ * XML-RPC Response class
+ * 
+ * @category	XML-RPC
+ * @author		Paul Burdick
+ * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ */
+class XML_RPC_Response
+{
+	var $val = 0;
+	var $errno = 0;
+	var $errstr = '';
+	var $headers = array();
+
+	function XML_RPC_Response($val, $code = 0, $fstr = '')
+	{	
+		if ($code != 0)
+		{
+			// error
+			$this->errno = $code;
+			$this->errstr = htmlentities($fstr); 
+		}
+		else if (!is_object($val))
+		{
+			// programmer error, not an object
+			error_log("Invalid type '" . gettype($val) . "' (value: $val) passed to XML_RPC_Response.  Defaulting to empty value.");
+			$this->val = new XML_RPC_Values();
+		}
+		else
+		{
+			$this->val = $val;
+		}
+	}
+
+	function faultCode()
+	{
+		return $this->errno;
+	}
+
+	function faultString()
+	{
+		return $this->errstr;
+	}
+
+	function value()
+	{
+		return $this->val;
+	}
+	
+	function prepare_response()
+	{
+		$result = "\n";
+		if ($this->errno)
+		{
+			$result .= '
+	
+		
+			
+				faultCode
+				' . $this->errno . '
+			
+			
+				faultString
+				' . $this->errstr . '
+			
+		
+	
+';
+		}
+		else
+		{
+			$result .= "\n\n" .
+					$this->val->serialize_class() . 
+					"\n";
+		}
+		$result .= "\n";
+		return $result;
+	}
+	
+	function decode($array=FALSE)
+	{
+		$obj =& get_instance();	
+
+		if ($array !== FALSE && is_array($array))
+		{
+			while (list($key) = each($array))
+			{
+				if (is_array($array[$key]))
+				{
+					$array[$key] = $this->decode($array[$key]);
+				}
+				else
+				{
+					$array[$key] = $obj->input->xss_clean($array[$key]);
+				}
+			}
+			
+			$result = $array;
+		}
+		else
+		{
+			$result = $this->xmlrpc_decoder($this->val);
+			
+			if (is_array($result))
+			{
+				$result = $this->decode($result);
+			}
+			else
+			{
+				$result = $obj->input->xss_clean($result);
+			}
+		}
+		
+		return $result;
+	}
+
+	
+	
+	//-------------------------------------
+	//  XML-RPC Object to PHP Types
+	//------------------------------------- 
+
+	function xmlrpc_decoder($xmlrpc_val)
+	{
+		$kind = $xmlrpc_val->kindOf();
+
+		if($kind == 'scalar')
+		{
+			return $xmlrpc_val->scalarval();
+		}
+		elseif($kind == 'array')
+		{
+			reset($xmlrpc_val->me);
+			list($a,$b) = each($xmlrpc_val->me);
+			$size = sizeof($b);
+			
+			$arr = array();
+
+			for($i = 0; $i < $size; $i++)
+			{
+				$arr[] = $this->xmlrpc_decoder($xmlrpc_val->me['array'][$i]);
+			}
+			return $arr; 
+		}
+		elseif($kind == 'struct')
+		{
+			reset($xmlrpc_val->me['struct']);
+			$arr = array();
+
+			while(list($key,$value) = each($xmlrpc_val->me['struct']))
+			{
+				$arr[$key] = $this->xmlrpc_decoder($value);
+			}
+			return $arr;
+		}
+	}
+	
+	
+	//-------------------------------------
+	//  ISO-8601 time to server or UTC time
+	//------------------------------------- 
+
+	function iso8601_decode($time, $utc=0)
+	{
+		// return a timet in the localtime, or UTC
+		$t = 0;
+		if (ereg("([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})", $time, $regs))
+		{
+			if ($utc == 1)
+				$t = gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+			else
+				$t = mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+		} 
+		return $t;
+	}
+	
+} // End Response Class
+
+
+
+/**
+ * XML-RPC Message class
+ * 
+ * @category	XML-RPC
+ * @author		Paul Burdick
+ * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ */
+class XML_RPC_Message extends CI_XML_RPC
+{
+	var $payload;
+	var $method_name;
+	var $params			= array();
+	var $xh 			= array();
+
+	function XML_RPC_Message($method, $pars=0)
+	{
+		parent::CI_XML_RPC();
+		
+		$this->method_name = $method;
+		if (is_array($pars) && sizeof($pars) > 0)
+		{
+			for($i=0; $iparams[] = $pars[$i];
+			}
+		}
+	}
+	
+	//-------------------------------------
+	//  Create Payload to Send
+	//-------------------------------------   
+	
+	function createPayload()
+	{
+		$this->payload = "\r\n\r\n";
+		$this->payload .= '' . $this->method_name . "\r\n";
+		$this->payload .= "\r\n";
+		
+		for($i=0; $iparams); $i++)
+		{
+			// $p = XML_RPC_Values
+			$p = $this->params[$i];
+			$this->payload .= "\r\n".$p->serialize_class()."\r\n";
+		}
+		
+		$this->payload .= "\r\n\r\n";
+	}
+	
+	//-------------------------------------
+	//  Parse External XML-RPC Server's Response
+	//-------------------------------------   
+	
+	function parseResponse($fp)
+	{
+		$data = '';
+		
+		while($datum = fread($fp, 4096))
+		{
+			$data .= $datum;
+		}
+		
+		//-------------------------------------
+		//  DISPLAY HTTP CONTENT for DEBUGGING
+		//-------------------------------------
+		
+		if ($this->debug === TRUE)
+		{
+			echo "
";
+			echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
+			echo "
";
+		}
+		
+		//-------------------------------------
+		//  Check for data
+		//-------------------------------------   
+
+		if($data == "")
+		{
+			error_log($this->xmlrpcstr['no_data']);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['no_data'], $this->xmlrpcstr['no_data']);
+			return $r;
+		}
+		
+		
+		//-------------------------------------
+		//  Check for HTTP 200 Response
+		//-------------------------------------  
+		
+		if(ereg("^HTTP",$data) && !ereg("^HTTP/[0-9\.]+ 200 ", $data))
+		{
+			$errstr= substr($data, 0, strpos($data, "\n")-1);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error']. ' (' . $errstr . ')');
+			return $r;
+		}
+		
+		//-------------------------------------
+		//  Create and Set Up XML Parser
+		//------------------------------------- 
+	
+		$parser = xml_parser_create($this->xmlrpc_defencoding);
+
+		$this->xh[$parser]				 = array();
+		$this->xh[$parser]['isf']		 = 0;
+		$this->xh[$parser]['ac']		 = '';
+		$this->xh[$parser]['headers'] 	 = array();
+		$this->xh[$parser]['stack']		 = array();
+		$this->xh[$parser]['valuestack'] = array();
+		$this->xh[$parser]['isf_reason'] = 0;
+
+		xml_set_object($parser, $this);
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
+		xml_set_element_handler($parser, 'open_tag', 'closing_tag');
+		xml_set_character_data_handler($parser, 'character_data');
+		//xml_set_default_handler($parser, 'default_handler');
+
+
+		//-------------------------------------
+		//  GET HEADERS
+		//-------------------------------------  
+		
+		$lines = explode("\r\n", $data);
+		while (($line = array_shift($lines)))
+		{
+			if (strlen($line) < 1)
+			{
+				break;
+			}
+			$this->xh[$parser]['headers'][] = $line;
+		}
+		$data = implode("\r\n", $lines);
+		
+		
+		//-------------------------------------
+		//  PARSE XML DATA
+		//-------------------------------------  	
+
+		if (!xml_parse($parser, $data, sizeof($data)))
+		{
+			$errstr = sprintf('XML error: %s at line %d',
+					xml_error_string(xml_get_error_code($parser)),
+					xml_get_current_line_number($parser));
+			//error_log($errstr);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'], $this->xmlrpcstr['invalid_return']);
+			xml_parser_free($parser);
+			return $r;
+		}
+		xml_parser_free($parser);
+		
+		// ---------------------------------------
+		//  Got Ourselves Some Badness, It Seems
+		// ---------------------------------------
+		
+		if ($this->xh[$parser]['isf'] > 1)
+		{
+			if ($this->debug === TRUE)
+			{
+				echo "---Invalid Return---\n";
+				echo $this->xh[$parser]['isf_reason'];
+				echo "---Invalid Return---\n\n";
+			}
+				
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
+			return $r;
+		}
+		elseif ( ! is_object($this->xh[$parser]['value']))
+		{
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
+			return $r;
+		}
+		
+		//-------------------------------------
+		//  DISPLAY XML CONTENT for DEBUGGING
+		//-------------------------------------  	
+		
+		if ($this->debug === TRUE)
+		{
+			echo "
";
+			
+			if (count($this->xh[$parser]['headers'] > 0))
+			{
+				echo "---HEADERS---\n";
+				foreach ($this->xh[$parser]['headers'] as $header)
+				{
+					echo "$header\n";
+				}
+				echo "---END HEADERS---\n\n";
+			}
+			
+			echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
+			
+			echo "---PARSED---\n" ;
+			var_dump($this->xh[$parser]['value']);
+			echo "\n---END PARSED---
";
+		}
+		
+		//-------------------------------------
+		//  SEND RESPONSE
+		//-------------------------------------  
+		
+		$v = $this->xh[$parser]['value'];
+			
+		if ($this->xh[$parser]['isf'])
+		{
+			$errno_v = $v->me['struct']['faultCode'];
+			$errstr_v = $v->me['struct']['faultString'];
+			$errno = $errno_v->scalarval();
+
+			if ($errno == 0)
+			{
+				// FAULT returned, errno needs to reflect that
+				$errno = -1;
+			}
+
+			$r = new XML_RPC_Response($v, $errno, $errstr_v->scalarval());
+		}
+		else
+		{
+			$r = new XML_RPC_Response($v);
+		}
+
+		$r->headers = $this->xh[$parser]['headers'];
+		return $r;
+	}
+	
+	// ------------------------------------
+	//  Begin Return Message Parsing section
+	// ------------------------------------
+	
+	// quick explanation of components:
+	//   ac - used to accumulate values
+	//   isf - used to indicate a fault
+	//   lv - used to indicate "looking for a value": implements
+	//        the logic to allow values with no types to be strings
+	//   params - used to store parameters in method calls
+	//   method - used to store method name
+	//	 stack - array with parent tree of the xml element,
+	//			 used to validate the nesting of elements
+
+	//-------------------------------------
+	//  Start Element Handler
+	//------------------------------------- 
+
+	function open_tag($the_parser, $name, $attrs)
+	{
+		// If invalid nesting, then return
+		if ($this->xh[$the_parser]['isf'] > 1) return;
+		
+		// Evaluate and check for correct nesting of XML elements
+		
+		if (count($this->xh[$the_parser]['stack']) == 0)
+		{
+			if ($name != 'METHODRESPONSE' && $name != 'METHODCALL')
+			{
+				$this->xh[$the_parser]['isf'] = 2;
+				$this->xh[$the_parser]['isf_reason'] = 'Top level XML-RPC element is missing';
+				return;
+			}
+		}
+		else
+		{
+			// not top level element: see if parent is OK
+			if (!in_array($this->xh[$the_parser]['stack'][0], $this->valid_parents[$name]))
+			{
+				$this->xh[$the_parser]['isf'] = 2;
+				$this->xh[$the_parser]['isf_reason'] = "XML-RPC element $name cannot be child of ".$this->xh[$the_parser]['stack'][0];
+				return;
+			}
+		}
+		
+		switch($name)
+		{
+			case 'STRUCT':
+			case 'ARRAY':
+				// Creates array for child elements
+				
+				$cur_val = array('value' => array(),
+								 'type'	 => $name);
+								 
+				array_unshift($this->xh[$the_parser]['valuestack'], $cur_val);
+			break;
+			case 'METHODNAME':
+			case 'NAME':
+				$this->xh[$the_parser]['ac'] = '';
+			break;
+			case 'FAULT':
+				$this->xh[$the_parser]['isf'] = 1;
+			break;
+			case 'PARAM':
+				$this->xh[$the_parser]['value'] = null;
+			break;
+			case 'VALUE':
+				$this->xh[$the_parser]['vt'] = 'value';
+				$this->xh[$the_parser]['ac'] = '';
+				$this->xh[$the_parser]['lv'] = 1;
+			break;
+			case 'I4':
+			case 'INT':
+			case 'STRING':
+			case 'BOOLEAN':
+			case 'DOUBLE':
+			case 'DATETIME.ISO8601':
+			case 'BASE64':
+				if ($this->xh[$the_parser]['vt'] != 'value')
+				{
+					//two data elements inside a value: an error occurred!
+					$this->xh[$the_parser]['isf'] = 2;
+					$this->xh[$the_parser]['isf_reason'] = "'Twas a $name element following a ".$this->xh[$the_parser]['vt']." element inside a single value";
+					return;
+				}
+				
+				$this->xh[$the_parser]['ac'] = '';
+			break;
+			case 'MEMBER':
+				// Set name of  to nothing to prevent errors later if no  is found
+				$this->xh[$the_parser]['valuestack'][0]['name'] = '';
+				
+				// Set NULL value to check to see if value passed for this param/member
+				$this->xh[$the_parser]['value'] = null;
+			break;
+			case 'DATA':
+			case 'METHODCALL':
+			case 'METHODRESPONSE':
+			case 'PARAMS':
+				// valid elements that add little to processing
+			break;
+			default:
+				/// An Invalid Element is Found, so we have trouble
+				$this->xh[$the_parser]['isf'] = 2;
+				$this->xh[$the_parser]['isf_reason'] = "Invalid XML-RPC element found: $name";
+			break;
+		}
+		
+		// Add current element name to stack, to allow validation of nesting
+		array_unshift($this->xh[$the_parser]['stack'], $name);
+
+		if ($name != 'VALUE') $this->xh[$the_parser]['lv'] = 0;
+	}
+	// END
+
+
+	//-------------------------------------
+	//  End Element Handler
+	//------------------------------------- 
+
+	function closing_tag($the_parser, $name)
+	{
+		if ($this->xh[$the_parser]['isf'] > 1) return;
+		
+		// Remove current element from stack and set variable
+		// NOTE: If the XML validates, then we do not have to worry about
+		// the opening and closing of elements.  Nesting is checked on the opening
+		// tag so we be safe there as well.
+		
+		$curr_elem = array_shift($this->xh[$the_parser]['stack']);
+	
+		switch($name)
+		{
+			case 'STRUCT':
+			case 'ARRAY':
+				$cur_val = array_shift($this->xh[$the_parser]['valuestack']);
+				$this->xh[$the_parser]['value'] = ( ! isset($cur_val['values'])) ? array() : $cur_val['values'];
+				$this->xh[$the_parser]['vt']	= strtolower($name);
+			break;
+			case 'NAME':
+				$this->xh[$the_parser]['valuestack'][0]['name'] = $this->xh[$the_parser]['ac'];
+			break;
+			case 'BOOLEAN':
+			case 'I4':
+			case 'INT':
+			case 'STRING':
+			case 'DOUBLE':
+			case 'DATETIME.ISO8601':
+			case 'BASE64':
+				$this->xh[$the_parser]['vt'] = strtolower($name);
+				
+				if ($name == 'STRING')
+				{
+					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
+				}
+				elseif ($name=='DATETIME.ISO8601')
+				{
+					$this->xh[$the_parser]['vt']    = $this->xmlrpcDateTime;
+					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
+				}
+				elseif ($name=='BASE64')
+				{
+					$this->xh[$the_parser]['value'] = base64_decode($this->xh[$the_parser]['ac']);
+				}
+				elseif ($name=='BOOLEAN')
+				{
+					// Translated BOOLEAN values to TRUE AND FALSE
+					if ($this->xh[$the_parser]['ac'] == '1')
+					{
+						$this->xh[$the_parser]['value'] = TRUE;
+					}
+					else
+					{
+						$this->xh[$the_parser]['value'] = FALSE;
+					}
+				}
+				elseif ($name=='DOUBLE')
+				{
+					// we have a DOUBLE
+					// we must check that only 0123456789-. are characters here
+					if (!ereg("^[+-]?[eE0123456789 \\t\\.]+$", $this->xh[$the_parser]['ac']))
+					{
+						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
+					}
+					else
+					{
+						$this->xh[$the_parser]['value'] = (double)$this->xh[$the_parser]['ac'];
+					}
+				}
+				else
+				{
+					// we have an I4/INT
+					// we must check that only 0123456789- are characters here
+					if (!ereg("^[+-]?[0123456789 \\t]+$", $this->xh[$the_parser]['ac']))
+					{
+						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
+					}
+					else
+					{
+						$this->xh[$the_parser]['value'] = (int)$this->xh[$the_parser]['ac'];
+					}
+				}
+				$this->xh[$the_parser]['ac'] = '';
+				$this->xh[$the_parser]['lv'] = 3; // indicate we've found a value
+			break;
+			case 'VALUE':
+				// This if() detects if no scalar was inside 
+				if ($this->xh[$the_parser]['vt']=='value')
+				{
+					$this->xh[$the_parser]['value']	= $this->xh[$the_parser]['ac'];
+					$this->xh[$the_parser]['vt']	= $this->xmlrpcString;
+				}
+				
+				// build the XML-RPC value out of the data received, and substitute it
+				$temp = new XML_RPC_Values($this->xh[$the_parser]['value'], $this->xh[$the_parser]['vt']);
+				
+				if (count($this->xh[$the_parser]['valuestack']) && $this->xh[$the_parser]['valuestack'][0]['type'] == 'ARRAY')
+				{
+					// Array
+					$this->xh[$the_parser]['valuestack'][0]['values'][] = $temp;
+				}
+				else
+				{
+					// Struct
+	    			$this->xh[$the_parser]['value'] = $temp;
+				}
+			break;
+			case 'MEMBER':
+				$this->xh[$the_parser]['ac']='';
+				
+				// If value add to array in the stack for the last element built
+				if ($this->xh[$the_parser]['value'])
+				{
+					$this->xh[$the_parser]['valuestack'][0]['values'][$this->xh[$the_parser]['valuestack'][0]['name']] = $this->xh[$the_parser]['value'];
+				}
+			break;
+			case 'DATA':
+				$this->xh[$the_parser]['ac']='';
+			break;
+			case 'PARAM':
+				if ($this->xh[$the_parser]['value'])
+				{
+					$this->xh[$the_parser]['params'][] = $this->xh[$the_parser]['value'];
+				}
+			break;
+			case 'METHODNAME':
+				$this->xh[$the_parser]['method'] = ereg_replace("^[\n\r\t ]+", '', $this->xh[$the_parser]['ac']);
+			break;
+			case 'PARAMS':
+			case 'FAULT':
+			case 'METHODCALL':
+			case 'METHORESPONSE':
+				// We're all good kids with nuthin' to do
+			break;
+			default:
+				// End of an Invalid Element.  Taken care of during the opening tag though
+			break;
+		}
+	}
+
+	//-------------------------------------
+	//  Parses Character Data
+	//------------------------------------- 
+
+	function character_data($the_parser, $data)
+	{
+		if ($this->xh[$the_parser]['isf'] > 1) return; // XML Fault found already
+		
+		// If a value has not been found
+		if ($this->xh[$the_parser]['lv'] != 3)
+		{
+			if ($this->xh[$the_parser]['lv'] == 1)
+			{
+				$this->xh[$the_parser]['lv'] = 2; // Found a value
+			}
+				
+			if( ! @isset($this->xh[$the_parser]['ac']))
+			{
+				$this->xh[$the_parser]['ac'] = '';
+			}
+				
+			$this->xh[$the_parser]['ac'] .= $data;
+		}
+	}
+	
+	
+	function addParam($par) { $this->params[]=$par; }
+	
+	function output_parameters($array=FALSE)
+	{
+		$obj =& get_instance();	
+
+		if ($array !== FALSE && is_array($array))
+		{
+			while (list($key) = each($array))
+			{
+				if (is_array($array[$key]))
+				{
+					$array[$key] = $this->output_parameters($array[$key]);
+				}
+				else
+				{
+					$array[$key] = $obj->input->xss_clean($array[$key]);
+				}
+			}
+			
+			$parameters = $array;
+		}
+		else
+		{
+			$parameters = array();
+		
+			for ($i = 0; $i < sizeof($this->params); $i++)
+    		{
+    			$a_param = $this->decode_message($this->params[$i]);
+    			
+    			if (is_array($a_param))
+    			{
+    				$parameters[] = $this->output_parameters($a_param);
+    			}
+    			else
+    			{
+    				$parameters[] = $obj->input->xss_clean($a_param);
+    			}
+    		}	
+    	}
+    	
+    	return $parameters;
+	}
+	
+	
+	function decode_message($param)
+	{
+		$kind = $param->kindOf();
+
+		if($kind == 'scalar')
+		{
+			return $param->scalarval();
+		}
+		elseif($kind == 'array')
+		{
+			reset($param->me);
+			list($a,$b) = each($param->me);
+			
+			$arr = array();
+
+			for($i = 0; $i < sizeof($b); $i++)
+			{
+				$arr[] = $this->decode_message($param->me['array'][$i]);
+			}
+			
+			return $arr; 
+		}
+		elseif($kind == 'struct')
+		{
+			reset($param->me['struct']);
+			
+			$arr = array();
+
+			while(list($key,$value) = each($param->me['struct']))
+			{
+				$arr[$key] = $this->decode_message($value);
+			}
+			
+			return $arr;
+		}
+	}
+	
+} // End XML_RPC_Messages class
+
+
+
+/**
+ * XML-RPC Values class
+ * 
+ * @category	XML-RPC
+ * @author		Paul Burdick
+ * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ */
+class XML_RPC_Values extends CI_XML_RPC
+{
+	var $me 	= array();
+	var $mytype	= 0;
+
+	function XML_RPC_Values($val=-1, $type='')
+	{	
+		parent::CI_XML_RPC();
+		
+		if ($val != -1 || $type != '')
+		{
+			$type = $type == '' ? 'string' : $type;
+			
+			if ($this->xmlrpcTypes[$type] == 1)
+			{
+				$this->addScalar($val,$type);
+			}
+			elseif ($this->xmlrpcTypes[$type] == 2)
+			{
+				$this->addArray($val);
+			}
+			elseif ($this->xmlrpcTypes[$type] == 3)
+			{
+				$this->addStruct($val);
+			}
+		}
+	}
+
+	function addScalar($val, $type='string')
+	{
+		$typeof = $this->xmlrpcTypes[$type];
+		
+		if ($this->mytype==1)
+		{
+			echo 'XML_RPC_Values: scalar can have only one value
';
+			return 0;
+		}
+		
+		if ($typeof != 1)
+		{
+			echo 'XML_RPC_Values: not a scalar type (${typeof})
';
+			return 0;
+		}
+
+		if ($type == $this->xmlrpcBoolean)
+		{
+			if (strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))
+			{
+				$val = 1;
+			}
+			else
+			{
+				$val=0;
+			}
+		}
+
+		if ($this->mytype == 2)
+		{
+			// adding to an array here
+			$ar = $this->me['array'];
+			$ar[] = new XML_RPC_Values($val, $type);
+			$this->me['array'] = $ar;
+		}
+		else
+		{
+			// a scalar, so set the value and remember we're scalar
+			$this->me[$type] = $val;
+			$this->mytype = $typeof;
+		}
+		return 1;
+	}
+
+	function addArray($vals)
+	{
+		if ($this->mytype != 0)
+		{
+			echo 'XML_RPC_Values: already initialized as a [' . $this->kindOf() . ']
';
+			return 0;
+		}
+
+		$this->mytype = $this->xmlrpcTypes['array'];
+		$this->me['array'] = $vals;
+		return 1;
+	}
+
+	function addStruct($vals)
+	{
+		if ($this->mytype != 0)
+		{
+			echo 'XML_RPC_Values: already initialized as a [' . $this->kindOf() . ']
';
+			return 0;
+		}
+		$this->mytype = $this->xmlrpcTypes['struct'];
+		$this->me['struct'] = $vals;
+		return 1;
+	}
+
+	function kindOf()
+	{
+		switch($this->mytype)
+		{
+			case 3:
+				return 'struct';
+				break;
+			case 2:
+				return 'array';
+				break;
+			case 1:
+				return 'scalar';
+				break;
+			default:
+				return 'undef';
+		}
+	}
+
+	function serializedata($typ, $val)
+	{
+		$rs = '';
+		
+		switch($this->xmlrpcTypes[$typ])
+		{
+			case 3:
+				// struct
+				$rs .= "\n";
+				reset($val);
+				while(list($key2, $val2) = each($val))
+				{
+					$rs .= "\n{$key2}\n";
+					$rs .= $this->serializeval($val2);
+					$rs .= "\n";
+				}
+				$rs .= '';
+			break;
+			case 2:
+				// array
+				$rs .= "\n\n";
+				for($i=0; $i < sizeof($val); $i++)
+				{
+					$rs .= $this->serializeval($val[$i]);
+				}
+				$rs.="\n\n";
+				break;
+			case 1:
+				// others
+				switch ($typ)
+				{
+					case $this->xmlrpcBase64:
+						$rs .= "<{$typ}>" . base64_encode($val) . "\n";
+					break;
+					case $this->xmlrpcBoolean:
+						$rs .= "<{$typ}>" . ($val ? '1' : '0') . "\n";
+					break;
+					case $this->xmlrpcString:
+						$rs .= "<{$typ}>" . htmlspecialchars($val). "\n";
+					break;
+					default:
+						$rs .= "<{$typ}>{$val}\n";
+					break;
+				}
+			default:
+			break;
+		}
+		return $rs;
+	}
+
+	function serialize_class()
+	{
+		return $this->serializeval($this);
+	}
+
+	function serializeval($o)
+	{
+		
+		$ar = $o->me;
+		reset($ar);
+		
+		list($typ, $val) = each($ar);
+		$rs = "\n".$this->serializedata($typ, $val)."\n";
+		return $rs;
+	}
+	
+	function scalarval()
+	{
+		reset($this->me);
+		list($a,$b) = each($this->me);
+		return $b;
+	}
+
+
+	//-------------------------------------
+	// Encode time in ISO-8601 form.
+	//------------------------------------- 
+	
+	// Useful for sending time in XML-RPC
+
+	function iso8601_encode($time, $utc=0)
+	{	
+		if ($utc == 1)
+		{
+			$t = strftime("%Y%m%dT%H:%M:%S", $time);
+		}
+		else
+		{
+			if (function_exists('gmstrftime'))
+				$t = gmstrftime("%Y%m%dT%H:%M:%S", $time);
+			else
+				$t = strftime("%Y%m%dT%H:%M:%S", $time - date('Z'));
+		}
+		return $t;
+	}
+	
+}
+// END XML_RPC_Values Class
+?>
\ No newline at end of file
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
new file mode 100644
index 00000000..eaec87a6
--- /dev/null
+++ b/system/libraries/Xmlrpcs.php
@@ -0,0 +1,492 @@
+set_system_methods();
+	
+		if (isset($config['functions']) && is_array($config['functions']))
+		{
+			$this->methods = $config['functions'];
+		}
+		
+		log_message('debug', "XML-RPC Server Class Initialized");
+	}
+	
+	//-------------------------------------
+	//  Initialize Prefs and Serve
+	//-------------------------------------  
+	
+	function initialize($config=array())
+	{	
+		if (isset($config['functions']) && is_array($config['functions']))
+		{
+			$this->methods = $config['functions'];
+		}
+		
+		if (isset($config['debug']))
+		{
+			$this->debug = $config['debug'];
+		}
+	}
+	
+	//-------------------------------------
+	//  Setting of System Methods
+	//------------------------------------- 
+	
+	function set_system_methods ()
+	{
+		$system_methods = array(
+		'system.listMethods' => array(
+			'function' => 'this.listMethods',
+			'signature' => array(array($this->xmlrpcArray, $this->xmlrpcString), array($this->xmlrpcArray)),
+			'docstring' => 'Returns an array of available methods on this server'),
+		'system.methodHelp' => array(
+			'function' => 'this.methodHelp',
+			'signature' => array(array($this->xmlrpcString, $this->xmlrpcString)),
+			'docstring' => 'Returns a documentation string for the specified method'),
+		'system.methodSignature' => array(
+			'function' => 'this.methodSignature',
+			'signature' => array(array($this->xmlrpcArray, $this->xmlrpcString)),
+			'docstring' => 'Returns an array describing the return type and required parameters of a method'),
+		'system.multicall' => array(
+			'function' => 'this.multicall',
+			'signature' => array(array($this->xmlrpcArray, $this->xmlrpcArray)),
+			'docstring' => 'Combine multiple RPC calls in one request. See http://www.xmlrpc.com/discuss/msgReader$1208 for details')
+		);
+	}
+
+
+	//-------------------------------------
+	//  Main Server Function
+	//------------------------------------- 
+	
+	function serve()
+	{
+		$r = $this->parseRequest();
+		$payload  = 'xmlrpc_defencoding.'"?'.'>'."\n";
+		$payload .= $this->debug_msg;
+		$payload .= $r->prepare_response();
+		
+		header("Content-Type: text/xml");
+		header("Content-Length: ".strlen($payload));
+		echo $payload;
+	}
+
+	//-------------------------------------
+	//  Add Method to Class
+	//-------------------------------------  
+	
+	function add_to_map($methodname,$function,$sig,$doc)
+	{
+		$this->methods[$methodname] = array(
+			'function'  => $function,
+			'signature' => $sig,
+			'docstring' => $doc
+		);
+	}
+
+
+	//-------------------------------------
+	//  Parse Server Request
+	//------------------------------------- 
+	
+	function parseRequest($data='')
+	{
+		global $HTTP_RAW_POST_DATA;
+		
+		//-------------------------------------
+		//  Get Data
+		//-------------------------------------  
+
+		if ($data == '')
+		{
+			$data = $HTTP_RAW_POST_DATA;
+		}
+
+
+		//-------------------------------------
+		//  Set up XML Parser
+		//------------------------------------- 
+		
+		$parser = xml_parser_create($this->xmlrpc_defencoding);
+		$parser_object = new XML_RPC_Message("filler");
+		
+		$parser_object->xh[$parser]					= array();
+		$parser_object->xh[$parser]['isf']			= 0;
+		$parser_object->xh[$parser]['isf_reason']	= '';
+		$parser_object->xh[$parser]['params']		= array();
+		$parser_object->xh[$parser]['stack']		= array();
+		$parser_object->xh[$parser]['valuestack']	= array();
+		$parser_object->xh[$parser]['method']		= '';
+
+		xml_set_object($parser, $parser_object);
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
+		xml_set_element_handler($parser, 'open_tag', 'closing_tag');
+		xml_set_character_data_handler($parser, 'character_data');
+		//xml_set_default_handler($parser, 'default_handler');
+		
+		
+		//-------------------------------------
+		//  PARSE + PROCESS XML DATA
+		//-------------------------------------  	
+		
+		if ( ! xml_parse($parser, $data, 1))
+		{
+			// return XML error as a faultCode
+			$r = new XML_RPC_Response(0,
+			$this->xmlrpcerrxml + xml_get_error_code($parser),
+			sprintf('XML error: %s at line %d',
+				xml_error_string(xml_get_error_code($parser)),
+				xml_get_current_line_number($parser)));
+			xml_parser_free($parser);
+		}
+		elseif($parser_object->xh[$parser]['isf'])
+		{
+			return new XML_RPC_Response(0,
+										$this->xmlrpcerr['invalid_return'],
+										$this->xmlrpcstr['invalid_retrun']);
+		}
+		else
+		{
+			xml_parser_free($parser);
+			
+			$m = new XML_RPC_Message($parser_object->xh[$parser]['method']);
+			$plist='';
+			
+			for($i=0; $i < sizeof($parser_object->xh[$parser]['params']); $i++)
+			{
+				$plist .= "$i - " .  print_r(get_object_vars($parser_object->xh[$parser]['params'][$i]), TRUE). ";\n";
+				
+				$m->addParam($parser_object->xh[$parser]['params'][$i]);
+			}
+			
+			if ($this->debug === TRUE)
+			{
+				echo "
";
+				echo "---PLIST---\n" . $plist . "\n---PLIST END---\n\n";
+				echo "
";
+			}
+			
+			$r = $this->execute($m);
+		}
+		
+		//-------------------------------------
+		//  SET DEBUGGING MESSAGE
+		//-------------------------------------  	
+		
+		if ($this->debug === TRUE) 
+		{
+			$this->debug_msg = "\n";
+		}
+		
+		return $r;
+	}
+
+	//-------------------------------------
+	//  Executes the Method
+	//------------------------------------- 
+	
+	function execute($m)
+	{
+		$methName = $m->method_name;
+		
+		// Check to see if it is a system call
+		// If so, load the system_methods
+		$sysCall = ereg("^system\.", $methName);
+		$methods = $sysCall ? $this->system_methods : $this->methods;
+		
+		//-------------------------------------
+		//  Check for Function
+		//------------------------------------- 
+		
+		if (!isset($methods[$methName]['function']))
+		{
+			return new XML_RPC_Response(0,
+				$this->xmlrpcerr['unknown_method'],
+				$this->xmlrpcstr['unknown_method']);
+		}
+		else
+		{
+			// See if we are calling function in an object
+			
+			$method_parts = explode(".",$methods[$methName]['function']);
+			$objectCall = (isset($method_parts['1']) && $method_parts['1'] != "") ? true : false;
+			
+			if ($objectCall && !is_callable(array($method_parts['0'],$method_parts['1'])))
+			{
+				return new XML_RPC_Response(0,
+				$this->xmlrpcerr['unknown_method'],
+				$this->xmlrpcstr['unknown_method']);
+			}
+			elseif (!$objectCall && !is_callable($methods[$methName]['function']))
+			{
+				return new XML_RPC_Response(0,
+					$this->xmlrpcerr['unknown_method'],
+					$this->xmlrpcstr['unknown_method']);
+			}		
+		}
+
+		//-------------------------------------
+		//  Checking Methods Signature
+		//------------------------------------- 
+		
+		if (isset($methods[$methName]['signature']))
+		{
+			$sig = $methods[$methName]['signature'];
+			for($i=0; $iparams)+1)
+				{
+					for($n=0; $n < sizeof($m->params); $n++)
+					{
+						$p = $m->params[$n];
+						$pt = ($p->kindOf() == 'scalar') ? $p->scalartyp() : $p->kindOf();
+						
+						if ($pt != $current_sig[$n+1])
+						{
+							$pno = $n+1;
+							$wanted = $current_sig[$n+1];
+							
+							return new XML_RPC_Response(0,
+								$this->xmlrpcerr['incorrect_params'],
+								$this->xmlrpcstr['incorrect_params'] . 
+								": Wanted {$wanted}, got {$pt} at param {$pno})");
+						}
+					}
+				}
+			}
+		}
+
+		//-------------------------------------
+		//  Calls the Function
+		//------------------------------------- 
+
+		if ($objectCall)
+		{
+			if ($method_parts['1'] == "this")
+			{
+				return call_user_func(array($this, $method_parts['0']), $m);
+			}
+			else
+			{
+				$obj =& get_instance();
+				return $obj->$method_parts['1']($m);
+				//$class = new $method_parts['0'];
+				//return $class->$method_parts['1']($m);
+				//return call_user_func(array(&$method_parts['0'],$method_parts['1']), $m);
+			}
+		}
+		else
+		{
+			return call_user_func($methods[$methName]['function'], $m);
+		}
+	}
+	
+	
+	//-------------------------------------
+	//  Server Function:  List Methods
+	//------------------------------------- 
+	
+	function listMethods($m)
+	{
+		$v = new XML_RPC_Values();
+		$output = array();
+		foreach($this->$methods as $key => $value)
+		{
+			$output[] = new XML_RPC_Values($key, 'string');
+		}
+		
+		foreach($this->system_methods as $key => $value)
+		{
+			$output[]= new XML_RPC_Values($key, 'string');
+		}
+
+		$v->addArray($output);
+		return new XML_RPC_Response($v);
+	}
+	
+	//-------------------------------------
+	//  Server Function:  Return Signature for Method
+	//------------------------------------- 
+		
+	function methodSignature($m)
+	{
+		$methName = $m->getParam(0);
+		$method_name = $methName->scalarval();
+		
+		$methods = ereg("^system\.", $method_name) ? $this->system_methods : $this->methods;
+		
+		if (isset($methods[$method_name]))
+		{
+			if ($methods[$method_name]['signature'])
+			{
+				$sigs = array();
+				$signature = $methods[$method_name]['signature'];
+				
+				for($i=0; $i < sizeof($signature); $i++)
+				{
+					$cursig = array();
+					$inSig = $signature[$i];
+					for($j=0; $jxmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
+		}
+		return $r;
+	}
+	
+	//-------------------------------------
+	//  Server Function:  Doc String for Method
+	//------------------------------------- 
+	
+	function methodHelp($m)
+	{
+		$methName = $m->getParam(0);
+		$method_name = $methName->scalarval();
+		
+		$methods = ereg("^system\.", $method_name) ? $this->system_methods : $this->methods;
+	
+		if (isset($methods[$methName]))
+		{
+			$docstring = isset($methods[$method_name]['docstring']) ? $methods[$method_name]['docstring'] : '';
+			$r = new XML_RPC_Response(new XML_RPC_Values($docstring, 'string'));
+		}
+		else
+		{
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
+		}
+		return $r;
+	}
+
+	//-------------------------------------
+	//  Server Function:  Multi-call
+	//------------------------------------- 
+
+	function multicall($m)
+	{
+		$calls = $m->getParam(0);
+		list($a,$b)=each($calls->me);
+		$result = array();
+
+		for ($i = 0; $i < sizeof($b); $i++)
+		{
+			$call = $calls->me['array'][$i];
+			$result[$i] = $this->do_multicall($call);
+		}
+
+		return new XML_RPC_Response(new XML_RPC_Values($result, 'array'));
+	}
+	
+	
+	//-------------------------------------
+	//  Multi-call Function:  Error Handling
+	//------------------------------------- 
+
+	function multicall_error($err)
+	{
+		$str  = is_string($err) ? $this->xmlrpcstr["multicall_${err}"] : $err->faultString();
+		$code = is_string($err) ? $this->xmlrpcerr["multicall_${err}"] : $err->faultCode();
+		
+		$struct['faultCode'] = new XML_RPC_Values($code, 'int');
+		$struct['faultString'] = new XML_RPC_Values($str, 'string');
+	
+		return new XML_RPC_Values($struct, 'struct');
+	}
+	
+	
+	//-------------------------------------
+	//  Multi-call Function:  Processes method
+	//------------------------------------- 
+	
+	function do_multicall($call)
+	{
+		if ($call->kindOf() != 'struct')
+			return $this->multicall_error('notstruct');
+		elseif (!$methName = $call->me['struct']['methodName'])
+			return $this->multicall_error('nomethod');
+		
+		list($scalar_type,$scalar_value)=each($methName->me);
+		$scalar_type = $scalar_type == $this->xmlrpcI4 ? $this->xmlrpcInt : $scalar_type;
+			
+		if ($methName->kindOf() != 'scalar' || $scalar_type != 'string') 
+			return $this->multicall_error('notstring');
+		elseif ($scalar_value == 'system.multicall')
+			return $this->multicall_error('recursion');
+		elseif (!$params = $call->me['struct']['params'])
+			return $this->multicall_error('noparams');
+		elseif ($params->kindOf() != 'array')
+			return $this->multicall_error('notarray');
+			
+		list($a,$b)=each($params->me);
+		$numParams = sizeof($b);
+
+		$msg = new XML_RPC_Message($scalar_value);
+		for ($i = 0; $i < $numParams; $i++)
+		{
+			$msg->params[] = $params->me['array'][$i];
+		}
+
+		$result = $this->execute($msg);
+
+		if ($result->faultCode() != 0)
+		{
+			return $this->multicall_error($result);
+		}
+
+		return new XML_RPC_Values(array($result->value()), 'array');
+	}	
+	
+}
+// END XML_RPC_Server class
+?>
\ No newline at end of file
diff --git a/system/libraries/index.html b/system/libraries/index.html
new file mode 100644
index 00000000..5a1f5d6a
--- /dev/null
+++ b/system/libraries/index.html
@@ -0,0 +1,15 @@
+
+
+
+
+403 Forbidden
+
+
+
+
+
+
Directory access is forbidden.

+
+
+
+
\ No newline at end of file
diff --git a/system/logs/index.html b/system/logs/index.html
new file mode 100644
index 00000000..5a1f5d6a
--- /dev/null
+++ b/system/logs/index.html
@@ -0,0 +1,15 @@
+
+
+
+
+403 Forbidden
+
+
+
+
+
+
Directory access is forbidden.

+
+
+
+
\ No newline at end of file
diff --git a/system/plugins/captcha_pi.php b/system/plugins/captcha_pi.php
new file mode 100644
index 00000000..54944b82
--- /dev/null
+++ b/system/plugins/captcha_pi.php
@@ -0,0 +1,346 @@
+load->plugin('captcha');
+
+Once loaded you can generate a captcha like this:
+	
+	$vals = array(
+					'word'		 => 'Random word',
+					'img_path'	 => './captcha/',
+					'img_url'	 => 'http://www.your-site.com/captcha/',
+					'font_path'	 => './system/texb.ttf',
+					'img_width'	 => '150',
+					'img_height' => 30,
+					'expiration' => 7200
+				);
+	
+	$cap = create_captcha($vals);
+	echo $cap['image'];
+	
+
+NOTES:
+	
+	The captcha function requires the GD image library.
+	
+	Only the img_path and img_url are required.  
+	
+	If a "word" is not supplied, the function will generate a random 
+	ASCII string.  You might put together your own word library that
+	you can draw randomly from.
+	
+	If you do not specify a path to a TRUE TYPE font, the native ugly GD
+	font will be used.
+	
+	The "captcha" folder must be writable (666, or 777)
+	
+	The "expiration" (in seconds) signifies how long an image will
+	remain in the captcha folder before it will be deleted.  The default
+	is two hours.
+   
+RETURNED DATA
+
+The create_captcha() function returns an associative array with this data:
+  
+  [array]
+  (
+	'image' => IMAGE TAG
+	'time'	=> TIMESTAMP (in microtime)
+	'word'	=> CAPTCHA WORD
+  )
+
+The "image" is the actual image tag: 
+
+
+The "time" is the micro timestamp used as the image name without the file 
+extension.  It will be a number like this:  1139612155.3422
+
+The "word" is the word that appears in the captcha image, which if not
+supplied to the function, will be a random string.
+
+
+ADDING A DATABASE
+
+In order for the captcha function to prevent someone from posting, you will need
+to add the information returned from create_captcha() function to your database.  
+Then, when the data from the form is submitted by the user you will need to verify 
+that the data exists in the database and has not expired.
+
+Here is a table prototype:
+   
+	CREATE TABLE captcha (
+	 captcha_id bigint(13) unsigned NOT NULL auto_increment,
+	 captcha_time int(10) unsigned NOT NULL,
+	 ip_address varchar(16) default '0' NOT NULL,
+	 word varchar(20) NOT NULL,
+	 PRIMARY KEY (captcha_id),
+	 KEY (word)
+	)
+
+
+Here is an example of usage with a DB.
+ 
+On the page where the captcha will be shown you'll have something like this:
+
+	$this->load->plugin('captcha');
+	$vals = array(
+					'img_path'	 => './captcha/',
+					'img_url'	 => 'http://www.your-site.com/captcha/'
+				);
+	
+	$cap = create_captcha($vals);
+
+	$data = array(
+					'captcha_id'	=> '', 
+					'captcha_time'	=> $cap['time'], 
+					'ip_address'	=> $this->input->ip_address(),
+					'word'			=> $cap['word'] 
+				);
+
+	$query = $this->db->insert_string('captcha', $data);
+	$this->db->query($query);
+		
+	echo 'Submit the word you see below:';
+	echo $cap['image'];
+	echo '';
+
+
+Then, on the page that accepts the submission you'll have something like this:
+
+	// First, delete old captchas
+	$expiration = time()-7200; // Two hour limit 
+	$DB->query("DELETE FROM captcha WHERE captcha_time < ".$expiration);		
+
+	// Then see if a captcha exists:
+	$sql = "SELECT COUNT(*) AS count FROM captcha WHERE word = ? AND ip_address = ? AND date > ?";
+	$binds = array($_POST['captcha'], $this->input->ip_address(), $expiration);
+	$query = $this->db->query($sql, $binds);
+	$row = $query->row();
+
+	if ($row->count == 0)
+	{
+		echo "You must submit the word that appears in the image";
+	}
+
+*/
+
+
+	
+/**
+|==========================================================
+| Create Captcha
+|==========================================================
+|
+*/
+function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '')
+{		
+	$defaults = array('word' => '', 'img_path' => '', 'img_url' => '', 'img_width' => '150', 'img_height' => '30', 'font_path' => '', 'expiration' => 7200);		
+	
+	foreach ($defaults as $key => $val)
+	{
+		if ( ! is_array($data))
+		{
+			if ( ! isset($$key) OR $$key == '')
+			{
+				$$key = $val;
+			}
+		}
+		else
+		{			
+			$$key = ( ! isset($data[$key])) ? $val : $data[$key];
+		}
+	}
+	
+	if ($img_path == '' OR $img_url == '')
+	{
+		return FALSE;
+	}
+
+	if ( ! @is_dir($img_path)) 
+	{
+		return FALSE;
+	}
+	
+	if ( ! is_writable($img_path))
+	{
+		return FALSE;
+	}
+			
+	if ( ! extension_loaded('gd'))
+	{
+		return FALSE;
+	}		
+	
+	// -----------------------------------
+	// Remove old images	
+	// -----------------------------------
+			
+	list($usec, $sec) = explode(" ", microtime());
+	$now = ((float)$usec + (float)$sec);
+			
+	$current_dir = @opendir($img_path);
+	
+	while($filename = @readdir($current_dir))
+	{        
+		if ($filename != "." and $filename != ".." and $filename != "index.html")
+		{
+			$name = str_replace(".jpg", "", $filename);
+		
+			if (($name + $expiration) < $now)
+			{
+				@unlink($img_path.$filename);
+			}
+		}
+	}
+	
+	@closedir($current_dir);
+
+	// -----------------------------------
+	// Do we have a "word" yet?
+	// -----------------------------------
+	
+   if ($word == '')
+   {
+		$pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+		$str = '';
+		for ($i = 0; $i < 8; $i++) 
+		{    
+			$str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); 
+		}
+		
+		$word = $str;
+   } 
+	
+	// -----------------------------------
+	// Determine angle and position	
+	// -----------------------------------
+	
+	$length	= strlen($word);
+	$angle	= ($length >= 6) ? rand(-($length-6), ($length-6)) : 0;
+	$x_axis	= rand(6, (360/$length)-16);			
+	$y_axis = ($angle >= 0 ) ? rand($img_height, $img_width) : rand(6, $img_height);
+	
+	// -----------------------------------
+	// Create image
+	// -----------------------------------
+			
+	$im = ImageCreate($img_width, $img_height);
+			
+	// -----------------------------------
+	//  Assign colors
+	// -----------------------------------
+	
+	$bg_color		= ImageColorAllocate($im, 255, 255, 255);
+	$border_color	= ImageColorAllocate($im, 153, 102, 102);
+	$text_color		= ImageColorAllocate($im, 204, 153, 153);
+	$grid_color		= imagecolorallocate($im, 255, 182, 182);
+	$shadow_color	= imagecolorallocate($im, 255, 240, 240);
+
+	// -----------------------------------
+	//  Create the rectangle
+	// -----------------------------------
+	
+	ImageFilledRectangle($im, 0, 0, $img_width, $img_height, $bg_color);
+	
+	// -----------------------------------
+	//  Create the spiral pattern
+	// -----------------------------------
+	
+	$theta		= 1;
+	$thetac		= 7;  
+	$radius		= 16;  
+	$circles	= 20;  
+	$points		= 32;
+
+	for ($i = 0; $i < ($circles * $points) - 1; $i++) 
+	{
+		$theta = $theta + $thetac;
+		$rad = $radius * ($i / $points );
+		$x = ($rad * cos($theta)) + $x_axis;
+		$y = ($rad * sin($theta)) + $y_axis;
+		$theta = $theta + $thetac;
+		$rad1 = $radius * (($i + 1) / $points);
+		$x1 = ($rad1 * cos($theta)) + $x_axis;
+		$y1 = ($rad1 * sin($theta )) + $y_axis;
+		imageline($im, $x, $y, $x1, $y1, $grid_color);
+		$theta = $theta - $thetac;
+	}
+
+	// -----------------------------------
+	//  Write the text
+	// -----------------------------------
+	
+	$use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE;
+		
+	if ($use_font == FALSE)
+	{
+		$font_size = 5;
+		$x = rand(0, $img_width/($length/3));
+		$y = 0;
+	}
+	else
+	{
+		$font_size	= 16;
+		$x = rand(0, $img_width/($length/1.5));
+		$y = $font_size+2;
+	}
+
+	for ($i = 0; $i < strlen($word); $i++)
+	{
+		if ($use_font == FALSE)
+		{
+			$y = rand(0 , $img_height/2);
+			imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color);
+			$x += ($font_size*2);
+		}
+		else
+		{		
+			$y = rand($img_height/2, $img_height-3);
+			imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1));
+			$x += $font_size;
+		}
+	}
+	
+
+	// -----------------------------------
+	//  Create the border
+	// -----------------------------------
+
+	imagerectangle($im, 0, 0, $img_width-1, $img_height-1, $border_color);		
+
+	// -----------------------------------
+	//  Generate the image
+	// -----------------------------------
+	
+	$img_name = $now.'.jpg';
+
+	ImageJPEG($im, $img_path.$img_name);
+	
+	$img = "\"";
+	
+	ImageDestroy($im);
+		
+	return array('word' => $word, 'time' => $now, 'image' => $img);
+}
+
+?>
\ No newline at end of file
diff --git a/system/plugins/index.html b/system/plugins/index.html
new file mode 100644
index 00000000..5a1f5d6a
--- /dev/null
+++ b/system/plugins/index.html
@@ -0,0 +1,15 @@
+
+
+
+
+403 Forbidden
+
+
+
+
+
+
Directory access is forbidden.

+
+
+
+
\ No newline at end of file
diff --git a/system/plugins/js_calendar_pi.php b/system/plugins/js_calendar_pi.php
new file mode 100644
index 00000000..16c3f413
--- /dev/null
+++ b/system/plugins/js_calendar_pi.php
@@ -0,0 +1,604 @@
+load->plugin('js_calendar');
+
+Once loaded you'll add the calendar script to the  of your page like this:
+
+
+
+The above function will be passed the name of your form.
+
+Then to show the actual calendar you'll do this:
+
+
+

+
+
Today

+

+
+
+Note:  The first parameter is the name of the field containing your date, the second parameter contains the "now" time,
+and the third tells the calendar whether to highlight the current day or not.
+
+Lastly, you'll need some CSS for your calendar:
+
+.calendar {
+	border: 1px #6975A3 solid;
+	background-color: transparent;
+}
+.calheading {
+	background-color: #7C8BC0;
+	color: #fff;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+	text-align: center;
+}
+.calnavleft {
+	background-color: #7C8BC0;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	color: #fff;
+	padding: 4px;
+	cursor: pointer;
+}
+.calnavright {
+	background-color: #7C8BC0;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	color: #fff;
+	text-align:  right;
+	padding: 4px;
+	cursor: pointer;
+}
+.caldayheading {
+	background-color: #000;
+	color: #fff;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 10px;
+	text-align: center;
+	padding: 6px 2px 6px 2px;
+}
+.caldaycells{
+	color: #000;
+	background-color: #D1D7E6;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 11px;
+	text-align: center;
+	padding: 4px;
+	border: 1px #E0E5F1 solid;
+	cursor: pointer;
+}
+.caldaycellhover{
+	color: #fff;
+	background-color: #B3BCD4;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 11px;
+	text-align: center;
+	padding: 4px;
+	border: 1px #B3BCD4 solid;
+	cursor: pointer;
+}
+.caldayselected{
+	background-color: #737FAC;
+	color:	#fff;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+	text-align: center;
+	border: 1px #566188 solid;
+	padding: 3px;
+	cursor: pointer;
+}
+.calblanktop {
+	background-color: #fff;
+	padding: 4px;
+}
+.calblankbot {
+	background-color: #fff;
+	padding: 4px;
+}
+
+
+*/
+ 
+function js_calendar_script($form_name = 'entryform')
+{    	
+
+ob_start();
+?>
+
+
+		var '.$field_id.' = new calendar("'.$field_id.'", '.$time.', '.(($highlight == TRUE) ? 'true' : 'false').');
+		document.write('.$field_id.'.write());
+	';	
+}	
+
+?>
\ No newline at end of file
diff --git a/system/scaffolding/Scaffolding.php b/system/scaffolding/Scaffolding.php
new file mode 100644
index 00000000..4b6ebeed
--- /dev/null
+++ b/system/scaffolding/Scaffolding.php
@@ -0,0 +1,285 @@
+ci_is_loaded as $val)
+		{
+			$this->$val =& $obj->$val;
+		}
+				
+		/**
+		 * Set the current table name
+		 * This is done when initializing scaffolding:
+		 * $this->_ci_init_scaffolding('table_name')
+		 *
+		 */
+		$this->current_table = $db_table;
+		
+		/**
+		 * Set the path to the "view" files
+		 * We'll manually override the "view" path so that
+		 * the load->view function knows where to look.
+		 */
+		$this->load->_ci_set_view_path(BASEPATH.'scaffolding/views/');
+
+		// Set the base URL
+		$this->base_url = $this->config->site_url().'/'.$this->uri->segment(1).$this->uri->slash_segment(2, 'both');
+		$this->base_uri = $this->uri->segment(1).$this->uri->slash_segment(2, 'leading');
+
+		// Set a few globals
+		$data = array(
+						'image_url'	=> $this->config->system_url().'scaffolding/images/',
+						'base_uri'  => $this->base_uri,
+						'base_url'	=> $this->base_url,
+						'title'		=> $this->current_table
+					);
+		
+		$this->load->vars($data);
+		
+		// Load the language file and create variables
+		$this->lang = $this->load->language('scaffolding', '', TRUE);		
+		$this->load->vars($this->lang);
+				
+		//  Load the helper files we plan to use
+		$this->load->helper(array('url', 'form'));
+		
+				
+		log_message('debug', 'Scaffolding Class Initialized');
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * "Add" Page
+	 *
+	 * Shows a form representing the currently selected DB
+	 * so that data can be inserted
+	 *
+	 * @access	public
+	 * @return	string	the HTML "add" page
+	 */
+	function add()
+	{	
+		$data = array(
+						'title'	=>  ( ! isset($this->lang['scaff_add'])) ? 'Add Data' : $this->lang['scaff_add'],
+						'fields' => $this->db->field_data($this->current_table),
+						'action' => $this->base_uri.'/insert'
+					);
+	
+		$this->load->view('add', $data);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Insert the data
+	 *
+	 * @access	public
+	 * @return	void	redirects to the view page
+	 */
+	function insert()
+	{		
+		if ($this->db->insert($this->current_table, $_POST) === FALSE)
+		{
+			$this->add();
+		}
+		else
+		{
+			redirect($this->base_uri.'/view/');
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * "View" Page
+	 *
+	 * Shows a table containing the data in the currently
+	 * selected DB
+	 *
+	 * @access	public
+	 * @return	string	the HTML "view" page
+	 */
+	function view()
+	{
+		// Fetch the total number of DB rows
+		$total_rows = $this->db->count_all($this->current_table);
+		
+		if ($total_rows < 1)
+		{
+			return $this->load->view('no_data');
+		}
+		
+		// Set the query limit/offset
+		$per_page = 20;
+		$offset = $this->uri->segment(4, 0);
+		
+		// Run the query
+		$query = $this->db->get($this->current_table, $per_page, $offset);
+
+		// Now let's get the field names				
+		$fields = $this->db->field_names($this->current_table);
+		
+		// We assume that the column in the first position is the primary field.
+		$primary = current($fields);
+
+		// Pagination!
+		$this->pagination->initialize(
+							array(
+									'base_url'		 => $this->base_url.'/view',
+									'total_rows'	 => $total_rows,
+									'per_page'		 => $per_page,
+									'uri_segment'	 => 4,
+									'full_tag_open'	 => '
',
+									'full_tag_close' => '
'
+									)
+								);	
+
+		$data = array(
+						'title'	=>  ( ! isset($this->lang['scaff_view'])) ? 'View Data' : $this->lang['scaff_view'],
+						'query'		=> $query,
+						'fields'	=> $fields,
+						'primary'	=> $primary,
+						'paginate'	=> $this->pagination->create_links()
+					);
+						
+		$this->load->view('view', $data);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * "Edit" Page
+	 *
+	 * Shows a form representing the currently selected DB
+	 * so that data can be edited
+	 *
+	 * @access	public
+	 * @return	string	the HTML "edit" page
+	 */
+	function edit()
+	{
+		if (FALSE === ($id = $this->uri->segment(4)))
+		{
+			return $this->view();
+		}
+
+		// Fetch the primary field name
+		$primary = $this->db->primary($this->current_table);				
+
+		// Run the query
+		$query = $this->db->getwhere($this->current_table, array($primary => $id));
+
+		$data = array(
+						'title'	=>  ( ! isset($this->lang['scaff_edit'])) ? 'Edit Data' : $this->lang['scaff_edit'],
+						'fields'	=> $query->field_data(),
+						'query'		=> $query->row(),
+						'action'	=> $this->base_uri.'/update/'.$this->uri->segment(4)
+					);
+	
+		$this->load->view('edit', $data);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Update
+	 *
+	 * @access	public
+	 * @return	void	redirects to the view page
+	 */
+	function update()
+	{	
+		// Fetch the primary key
+		$primary = $this->db->primary($this->current_table);				
+
+		// Now do the query
+		$this->db->update($this->current_table, $_POST, array($primary => $this->uri->segment(4)));
+		
+		redirect($this->base_uri.'/view/');
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Delete Confirmation
+	 *
+	 * @access	public
+	 * @return	string	the HTML "delete confirm" page
+	 */
+	function delete()
+	{
+		if ( ! isset($this->lang['scaff_del_confirm']))
+		{
+			$message = 'Are you sure you want to delete the following row: '.$this->uri->segment(4);
+		}
+		else
+		{
+			$message = $this->lang['scaff_del_confirm'].' '.$this->uri->segment(4);
+		}
+		
+		$data = array(
+						'title'		=> ( ! isset($this->lang['scaff_delete'])) ? 'Delete Data' : $this->lang['scaff_delete'],
+						'message'	=> $message,
+						'no'		=> anchor(array($this->base_uri, 'view'), ( ! isset($this->lang['scaff_no'])) ? 'No' : $this->lang['scaff_no']),
+						'yes'		=> anchor(array($this->base_uri, 'do_delete', $this->uri->segment(4)), ( ! isset($this->lang['scaff_yes'])) ? 'Yes' : $this->lang['scaff_yes'])
+					);
+	
+		$this->load->view('delete', $data);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Delete
+	 *
+	 * @access	public
+	 * @return	void	redirects to the view page
+	 */
+	function do_delete()
+	{		
+		// Fetch the primary key
+		$primary = $this->db->primary($this->current_table);				
+
+		// Now do the query
+		$this->db->where($primary, $this->uri->segment(4));
+		$this->db->delete($this->current_table);
+
+		header("Refresh:0;url=".site_url(array($this->base_uri, 'view')));
+		exit;
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/system/scaffolding/images/background.jpg b/system/scaffolding/images/background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9d5bdcea1d5b12024146ac223011123defe25635
GIT binary patch
literal 410
zcmex=C5UDGKfoZ!!BEV=#mp$kz$D1XEXer(2ty*!
z+02YUS0VrtD?1k>st{080OUV@genGxz>7?5j0-mkiCh&6o5sHUdIYDWAcnU8w-|VU
z<}(R03o_UTDGVclFtr^J1GVtmh-M!uS+`)H81DN0}
iwv|qaLOQIREgl>6ml<_DjNt59WD&;F0MaS{|0VzeUqk@_

literal 0
HcmV?d00001

diff --git a/system/scaffolding/images/index.html b/system/scaffolding/images/index.html
new file mode 100644
index 00000000..5a1f5d6a
--- /dev/null
+++ b/system/scaffolding/images/index.html
@@ -0,0 +1,15 @@
+
+
+
+
+403 Forbidden
+
+
+
+
+
+
Directory access is forbidden.

+
+
+
+
\ No newline at end of file
diff --git a/system/scaffolding/images/logo.jpg b/system/scaffolding/images/logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d6cc9a76db0b1174c74379f7f20df290e4ec7f86
GIT binary patch
literal 4518
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
fMjns;GH;Ptst=l@%I0apKb7
+
+
+
+403 Forbidden
+
+
+
+
+
+
Directory access is forbidden.

+
+
+
+
\ No newline at end of file
diff --git a/system/scaffolding/views/add.php b/system/scaffolding/views/add.php
new file mode 100644
index 00000000..a65e3d74
--- /dev/null
+++ b/system/scaffolding/views/add.php
@@ -0,0 +1,30 @@
+load->view('header');  ?>
+
+

+
+
+
+
+
+
+
+primary_key == 1) continue; ?>
+
+
+	
+	
+	type == 'blob'): ?>
+	
+	
+	
+	
+	
+
+
+
name; echo ' '.$field->default; ?>

+
+
+
+
+
+load->view('footer'); ?>
diff --git a/system/scaffolding/views/delete.php b/system/scaffolding/views/delete.php
new file mode 100644
index 00000000..75a5c21b
--- /dev/null
+++ b/system/scaffolding/views/delete.php
@@ -0,0 +1,7 @@
+load->view('header');  ?>
+
+

+
+
  |  
+
+load->view('footer'); ?>
diff --git a/system/scaffolding/views/edit.php b/system/scaffolding/views/edit.php
new file mode 100644
index 00000000..a7d65c61
--- /dev/null
+++ b/system/scaffolding/views/edit.php
@@ -0,0 +1,31 @@
+load->view('header');  ?>
+
+
+

+
+
+
+
+
+
+
+primary_key == 1) continue; ?>
+
+
+	
+	
+	type == 'blob'): ?>
+	
+	
+	
+	
+	
+
+
+
name; ?>

+
+
+
+
+
+load->view('footer'); ?>
\ No newline at end of file
diff --git a/system/scaffolding/views/footer.php b/system/scaffolding/views/footer.php
new file mode 100644
index 00000000..36b29d1c
--- /dev/null
+++ b/system/scaffolding/views/footer.php
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/system/scaffolding/views/header.php b/system/scaffolding/views/header.php
new file mode 100644
index 00000000..7ab60fd8
--- /dev/null
+++ b/system/scaffolding/views/header.php
@@ -0,0 +1,31 @@
+
+
+
+
+<?php echo $title; ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

\ No newline at end of file
diff --git a/system/scaffolding/views/index.html b/system/scaffolding/views/index.html
new file mode 100644
index 00000000..5a1f5d6a
--- /dev/null
+++ b/system/scaffolding/views/index.html
@@ -0,0 +1,15 @@
+
+
+
+
+403 Forbidden
+
+
+
+
+
+
Directory access is forbidden.

+
+
+
+
\ No newline at end of file
diff --git a/system/scaffolding/views/no_data.php b/system/scaffolding/views/no_data.php
new file mode 100644
index 00000000..dca477e2
--- /dev/null
+++ b/system/scaffolding/views/no_data.php
@@ -0,0 +1,6 @@
+load->view('header');  ?>
+
+

+

+
+load->view('footer'); ?>
\ No newline at end of file
diff --git a/system/scaffolding/views/stylesheet.css b/system/scaffolding/views/stylesheet.css
new file mode 100644
index 00000000..55c8d9e5
--- /dev/null
+++ b/system/scaffolding/views/stylesheet.css
@@ -0,0 +1,143 @@
+body {
+ margin: 0;
+ padding: 0;
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ font-size: 11px;
+ color: #4F5155;
+ background: #fff url(background.jpg) repeat-x left top;
+}
+
+a {
+ color: #8B0D00;
+ background-color: transparent;
+ text-decoration: none;
+ font-weight: bold;
+}
+
+a:visited {
+ color: #8B0D00;
+ background-color: transparent;
+ text-decoration: none;
+}
+
+a:hover {
+ color: #000;
+ text-decoration: none;
+ background-color: transparent;
+}
+
+
+#header {
+ margin: 0;
+ padding: 0;
+}
+
+#header_left {
+ background-color: transparent;
+ float: left;
+ padding: 21px 0 0 32px;
+ margin: 0
+}
+
+#header_right {
+ background-color: transparent;
+ float: right;
+ text-align: right;
+ padding: 35px 50px 20px 0;
+ margin: 0
+}
+
+#footer {
+ margin: 20px 0 15px 0;
+ padding: 0;
+}
+
+#footer p {
+ font-size: 10px;
+ color: #999;
+ text-align: center;
+}
+
+#outer {
+ margin: 30px 40px 0 40px;
+}
+
+img {
+ padding:0;
+ border: 0;
+ margin: 0;
+}
+
+.nopad {
+ padding:0;
+ border: 0;
+ margin: 0;
+}
+
+table {
+ background-color: #efefef;
+}
+
+th {
+ background-color: #eee;
+ font-weight: bold;
+ padding: 6px;
+ text-align: left;
+}
+
+td {
+ background-color: #fff;
+ padding: 6px;
+}
+
+
+form {
+ margin: 0;
+ padding: 0;
+}
+
+.input {
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ font-size: 11px;
+ width: 600px;
+ color: #333;
+ border: 1px solid #B3B4BD;
+ font-size: 11px;
+ height: 2em;
+ padding: 0;
+ margin: 0;
+} 
+
+.textarea {
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ font-size: 12px;
+ width: 600px;
+ color: #333;
+ border: 1px solid #B3B4BD;
+ padding: 0;
+ margin: 0;
+}
+
+.select {
+ background-color: #fff;
+ font-size:  11px;
+ font-weight: normal;
+ color: #333;
+ padding: 0;
+ margin: 0 0 3px 0;
+}
+
+.checkbox {
+ background-color: transparent;
+ padding: 0;
+ border: 0;
+}
+
+.submit {
+ background-color: #8B0D00;
+ color: transparent;
+ font-weight: normal;
+ border: 1px solid #000;
+ margin: 6px 0 0 0;
+ padding: 1px 5px 1px 5px;
+}
diff --git a/system/scaffolding/views/view.php b/system/scaffolding/views/view.php
new file mode 100644
index 00000000..fd20a174
--- /dev/null
+++ b/system/scaffolding/views/view.php
@@ -0,0 +1,25 @@
+load->view('header');  ?>
+
+
+ 
+	
+	
+	
+	
+	
+
+
+result() as $row): ?>
+ 
+	
+ 	
+ 		
+	
+	
+ 
+
+
EditDelete
 $primary), $scaff_edit); ?> $primary), $scaff_delete); ?>$field);?>

+
+
+
+load->view('footer'); ?>
\ No newline at end of file
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html
new file mode 100644
index 00000000..8838ac8a
--- /dev/null
+++ b/user_guide/general/alternative_php.html
@@ -0,0 +1,142 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Alternate PHP Syntax for View Files

+
+
If you do not utilize Code Igniter's template engine, you'll be using pure PHP 
+in your View files.  To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use PHPs alternative 
+syntax for control structures and echo statements.  If you are not familiar with this syntax, it allows you to eliminate the braces from your code,
+and eliminate "echo" statements.

+
+
Alternative Echos

+
+
Normally to echo, or print out a variable you would do this:

+
+<?php echo $variable; ?>
+
+
With the alternative syntax you can instead do it this way:

+
+<?=$variable?>
+
+
Note: If you find that the syntax described in this page does not work on your server it might
+be that "short tags" are disabled in your PHP ini file.

+
+
+
Alternative Control Structures

+
+
Controls structures, like if, for, foreach, and while can be 
+written in a simplified format as well.  Here is an example using foreach:

+
+
+<ul>

+

+<?php foreach($todo as $item): ?>

+

+<li><?=$item?></li>

+

+<?php endforeach ?>

+

+</ul>
+
+
Notice that there are no braces.  Instead, the end brace is replaced with endforeach.
+Each of the control structures listed above has a similar closing syntax:
+endif, endfor, endforeach, and endwhile

+
+
Also notice that instead of using a semicolon after each structure (except the last one), there is a colon.  This is 
+important!

+
+
Here is another example, using if/elseif/else.  Notice the colons:

+
+
+<?php if ($username == 'sally'): ?>

+

+   <h3>Hi Sally</h3>

+

+<?php elseif ($username == 'joe'): ?>

+

+   <h3>Hi Joe</h3>

+

+<?php else: ?>

+

+   <h3>Hi unknown user</h3>

+

+<?php endif; ?>
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html
new file mode 100644
index 00000000..fc67bec7
--- /dev/null
+++ b/user_guide/general/ancillary_classes.html
@@ -0,0 +1,122 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Creating Ancillary Classes

+
+
In some cases you may want to develop classes that exist apart from your controllers but have the ability to 
+utilize all of Code Igniter's resources. This is easily possible as you'll see.

+
+
get_instance()

+
+
+
Any class that you instantiate within your controller functions can access Code Igniter's native resources simply by using the get_instance() function.
+This function returns the main Code Igniter object.

+
+
Normally, to call any of the available Code Igniter functions requires you to use the $this construct:

+
+
+$this->load->helper('url');

+$this->load->library('session');

+$this->config->item('base_url');

+etc.
+
+
+
$this, however, only works within your controllers, your models, or your views.  
+If you would like to use Code Igniter's classes from within your own custom classes you can do so as follows:

+
+
+
First, assign the Code Igniter object to a variable:

+
+$obj =& get_instance();
+
+
Once you've assigned the object to a variable, you'll use that variable instead of $this:

+
+
+$obj =& get_instance();


+$obj->load->helper('url');

+$obj->load->library('session');

+$obj->config->item('base_url');

+etc.
+
+
+
Note: You'll notice that the above get_instance() function is being passed by reference:
+


+$obj =& get_instance();
+


+This is very important. Assigning by reference allows you to use the original Code Igniter object rather than creating a copy of it.

+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html
new file mode 100644
index 00000000..5f90fdda
--- /dev/null
+++ b/user_guide/general/autoloader.html
@@ -0,0 +1,106 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Auto-loading Resources

+
+
Code Igniter comes with an "Auto-load" feature that permits libraries, helpers, and plugins to be initialized
+automatically every time the system runs. If you need certain resources globally throughout your application you should
+consider auto-loading them for convenience.

+
+
The following items can be loaded automatically:

+
+
    
+
  • Core classes found in the "libraries" folder
    • 
+
  • Helper files found in the "helpers" folder
    • 
+
  • Plugins found in the "plugins" folder
    • 
+
  • Your own Scripts found in the "applications/scripts" folder
    • 
+
  • Custom config files found in the "config" folder
    • 
+

+
+
To autoload resources, open the application/config/autoload.php file and add the item you want
+loaded to the autoload array. You'll find instructions in that file corresponding to each
+type of item.

+
+
Note:  Do not include the file extension (.php) when adding items to the autoload array.

+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/base_classes.html b/user_guide/general/base_classes.html
new file mode 100644
index 00000000..215bd25b
--- /dev/null
+++ b/user_guide/general/base_classes.html
@@ -0,0 +1,127 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Replacing System Classes

+
+
Every time Code Igniter runs there are several base classes that are initialized automatically as part of the core framework.
+It is possible, however, to swap any of the core system files with your own versions.   Most users will never have any need to do this,
+but the option to replace them does exist for those that would like to significantly alter the Code Igniter core.
+

+
+
Note:  Replacing a core system class with your own version has a lot of implications, so make sure you 
+know what you are doing before attempting it.

+
+
+
System Class List

+
+
The following is a list of the core system files that are invoked every time Code Igniter runs:

+
+
    
+
  • Benchmark
    • 
+
  • Input
    • 
+
  • Config
    • 
+
  • Hooks
    • 
+
  • Router
    • 
+
  • URI
    • 
+
  • Language
    • 
+
  • Loader
    • 
+
  • Controller
    • 
+
  • Output
    • 
+

+
+
Replacing Core Classes

+
+
To use one of your own system classes instead of a default one simply place your version inside your local libraries directory:

+
+application/libraries/some-class.php
+
+
Any file named identically to one from the list above will be used instead of the one normally used.

+
+
Please note that your class must use CI as a prefix. For example, if your file is named Input.php the class will be named:

+
+
+class CI_Input {


+
+}
+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html
new file mode 100644
index 00000000..a5edbe73
--- /dev/null
+++ b/user_guide/general/caching.html
@@ -0,0 +1,119 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Web Page Caching

+
+
Code Igniter lets you cache your pages in order to achieve maximum performance.
+
+Although Code Igniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the
+server resources, memory, and processing cycles utilized, which affect your page load speeds. 
+By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.
+
+
+
How Does Caching Work?

+
+
Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed.
+When a page is loaded for the first time, the cache file will be written to your system/cache folder.  On subsequent page loads the cache file will be retrieved
+and sent to the requesting user's browser.  If it has expired, it will be deleted and refreshed before being sent to the browser.

+
+
Note: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled.

+
+
Enabling Caching

+
+
To enable caching, put the following tag in any of your controller functions:

+
+$this->output->cache(n);
+
+
Where n is the number of minutes you wish the page to remain cached between refreshes.

+
+
The above tag can go anywhere within a function. It is not affected by the order that it appears, so place it wherever it seems
+most logical to you. Once the tag is in place, your pages will begin being cached.

+
+
Note: Before the cache files can be written you must set the file permissions on your
+system/cache folder such that it is writable (666 is usually appropriate).

+
+
Deleting Caches

+
+
If you no longer wish to cache a file you can remove the caching tag and it will not longer be refreshed when it expires.  Note: 
+Removing the tag will not delete the cache immediately.  It will have to expire normally.  If you need to remove it earlier you
+will need to manually delete it from your cache folder.

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
new file mode 100644
index 00000000..0bcb165d
--- /dev/null
+++ b/user_guide/general/changelog.html
@@ -0,0 +1,248 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Change Log

+
+
+
+
Version 1.4.0

+
Release Date: August 25, 2006

+
+
    
+
  • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • 
+
  • Added the ability to replace core system classes with your own classes.
    • 
+
  • Added support for % character in URL.
    • 
+
  • Moved the MIME type array out of the Upload class and into its own file in the applications/comfig/ folder.
    • 
+
  • Removed a strtolower() call that was changing URL segments to lower case.
    • 
+
  • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name.  Please use dohash() instead.
    • 
+
  • Fixed a MS SQL issue.
    • 
+
  • Fixed an issue when removing GET variables.
    • 
+
  • Fixed this router bug.
    • 
+
  • Fixed a bug that was preventing multiple discreet database calls.
    • 
+
  • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • 
+
  • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • 
+
  • Removed backticks from Postgre class since these are not needed.
    • 
+

+
+
+
+
Version 1.3.3

+
Release Date: June 1, 2006

+
+
    
+
+
  • Models do not connect automatically to the database as of this version. More info here.
+
  • Updated the Sessions class to utilize the active record class when running session related queries.  Previously the queries assumed MySQL syntax.
    • 
+
  • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • 
+
  • Fixed a bug in the active record "having" function.
    • 
+
  • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • 
+
  • Fixed a bug in the word_limiter() helper function.  It was cutting off the fist word.
    • 
+
  • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • 
+
  • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • 
+
  • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • 
+
  • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • 
+
  • Fixed a bug in the hash() security helper.
    • 
+
  • Fixed some typos.
    • 
+

+
+
+
+
+
Version 1.3.2

+
Release Date: April 17, 2006

+
+
    
+
  • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • 
+
  • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • 
+
  • Fixed a bug in the init_pagination file.  The $config item was not being set correctly.
    • 
+
  • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • 
+
  • Fixed a couple bugs in the Model class.
    • 
+
  • Fixed some documentation typos and errata.
    • 
+

+
+
+
+
Version 1.3.1

+
Release Date: April 11, 2006

+
+
    
+
  • Added a Unit Testing Library.
    • 
+
  • Added the ability to pass objects to the insert() and update()  database functions.
+This feature enables you to (among other things) use your  Model class variables to run queries with. See the Models page for details.
    • 
+
  • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • 
+
  • Added getwhere function to Active Record class.
    • 
+
  • Added count_all function to Active Record class.
    • 
+
  • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • 
+
  • Added $this->db->last_query(), which allows you to view your last query that was run.
    • 
+
  • Added a new mime type to the upload class for better compatibility.
    • 
+
  • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • 
+
  • Fixed a bug in a couple of the active record functions (where and orderby).
    • 
+
  • Fixed a bug in the image library when realpath() returns false.
    • 
+
  • Fixed a bug in the Models that was preventing libraries from being used within them.
    • 
+
  • Fixed a bug in the "exact_length" function of the validation class.
    • 
+
  • Fixed some typos in the user guide
    • 
+

+
+
+
Version 1.3

+
Release Date: April 3, 2006

+
+
    
+
  • Added support for Models.
    • 
+
  • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • 
+
  • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • 
+
  • Added a feature to the database class that lets you run custom function calls.
    • 
+
  • Added support for private functions in your controllers.  Any controller function name that starts with an underscore will not be served by a URI request.
    • 
+
  • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • 
+
  • Added support for running standard query string URLs.  These can be optionally enabled in your config file.
    • 
+
  • Added the ability to  specify a "suffix", which will be appended to your URLs.  For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • 
+
  • Added a new error template for use with native PHP errors.
    • 
+
  • Added "alternator" function in the string helpers.
    
+
  • Removed slashing from the input class. After much debate we decided to kill this feature.
    • 
+
  • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • 
+
  • Added better class and function name-spacing to avoid collisions with user developed classes. All Code Igniter classes are now prefixed with CI_ and
+all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • 
+
  • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • 
+
  • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • 
+
  • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • 
+
  • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • 
+
  • Fixed a typo in the URI class.  $this->total_segment() should be plural: $this->total_segments()
    • 
+
  • Fixed some typos in the default calendar template
    • 
+
  • Fixed some typos in the user guide
    • 
+

+
+
+
+
+
+
+
+
+
Version 1.2

+
Release Date: March 21, 2006

+
+
    
+
  • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • 
+
  • Added a global function named get_instance() allowing the main Code Igniter object to be accessible throughout your own classes.
    • 
+
  • Added new File Helper:  delete_files()
    • 
+
  • Added new URL Helpers:  base_url(), index_page()
    • 
+
  • Added the ability to create your own core libraries and store them in your local application directory.
    • 
+
  • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • 
+
  • Added Javascript Calendar plugin.
    • 
+
  • Added search feature to user guide.  Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • 
+
  • Updated the parser class so that it allows tag pars within other tag pairs.
    • 
+
  • Fixed a bug in the DB "where" function.
    • 
+
  • Fixed a bug that was preventing custom config files to be auto-loaded.
    • 
+
  • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • 
+
  • Fixed some bugs in the xss_clean function
    • 
+

+
+
+
+
+
+
Version Beta 1.1

+
Release Date: March 10, 2006

+
+
    
+
  • Added a Calendaring class.
    • 
+
  • Added support for running multiple applications that share a common Code Igniter backend.
    • 
+
  • Moved the "uri protocol" variable from the index.php file into the config.php file
    • 
+
  • Fixed a problem that was preventing certain function calls from working within constructors.
    • 
+
  • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • 
+
  • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • 
+
  • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • 
+
  • Fixed a data type error in the form_radio function (form helper)
    • 
+
  • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • 
+
  • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • 
+
  • Fixed a pagination problem in the scaffolding.
    • 
+
  • Fixed a bug in the mysql class "where" function.
    • 
+
  • Fixed a regex problem in some code that trimmed duplicate slashes.
    • 
+
  • Fixed a bug in the br() function in the HTML helper
    • 
+
  • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • 
+
  • Removed the "style" attributes form the form helpers.
    • 
+
  • Updated the documentation. Added "next/previous" links to each page and fixed various typos.
    • 
+

+
+
Version Beta 1.0 

+
Release Date: February 28, 2006

+
First publicly released version.

+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
new file mode 100644
index 00000000..648298eb
--- /dev/null
+++ b/user_guide/general/controllers.html
@@ -0,0 +1,317 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Controllers

+
+
Controllers are the heart of your application, as they determine how HTTP requests should be handled.

+
+
+
+
+
+
+
What is a Controller?

+
+
A Controller is simply a class file that is named in a way that can be associated with a URI.

+
+
Consider this URI:

+
+www.your-site.com/index.php/blog/
+
+
In the above example, Code Igniter would attempt to find a controller named blog.php and load it.

+
+
When a controller's name matches the first segment of a URI, it will be loaded.

+
+
+
Let's try it:  Hello World!

+
+
Let's create a simple controller so you can see it in action.  Using your text editor, create a file called blog.php, and put the following code in it:

+
+
+
+
+
+
+
Then save the file to your application/controllers/ folder.

+
+
Now visit the your site using a URL similar to this:

+
+www.your-site.com/index.php/blog/
+
+
If you did it right, you should see Hello World!.

+
+
Note: Class names must start with an uppercase letter.  In other words, this is valid:
+
+<?php

+class Blog extends Controller {

+

+}

+?>
+
+
This is not valid:

+
+<?php

+class blog extends Controller {

+

+}

+?>
+
+
Also, always make sure your controller extends the parent controller class so that it can inherit all its functions.
 
+
+
+
+
+
Functions

+
+
In the above example the function name is index().  The "index" function is always loaded by default if the 
+second segment of the URI is empty.  Another way to show your "Hello World" message would be this:

+
+www.your-site.com/index.php/blog/index/
+
+
The second segment of the URI determines which function in the controller gets called.

+
+
Let's try it.  Add a new function to your controller:

+
+
+
+
+
Now load the following URL to see the comment function:

+
+www.your-site.com/index.php/blog/comments/
+
+
You should see your new message.

+
+
+
Private Functions

+
+
In some cases you may not want certain functions accessible publicly.  To make a function private, simply add an
+underscore as the name prefix and it will not be served via a URL request. For example, if you were to have a function like this:

+
+
+function _utility()

+{

+  // some code

+}
+
+
Trying to access it via the URL, like this, will not work:

+
+www.your-site.com/index.php/blog/_utility/
+
+
+
+
+
Defining a Default Controller

+
+
Code Igniter can be told to load a default controller when a URI is not present, 
+as will be the case when only your site root URL is requested.  To specify a default controller, open 
+your application/config/routes.php file and set this variable:

+
+$route['default_controller'] = 'Blog';
+
+
Where Blog is the name of the controller class you want used. If you now load your main index.php file without
+specifying any URI segments you'll see your Hello World message by default.

+
+
+
+
Class Constructors

+
+
+
If you intend to use a constructor in any of your Controllers, you MUST place the following line of code in it:

+
+parent::Controller();
+
+
The reason this line is necessary is because your local constructor will be overriding the one in the parent controller class so we need to manually call it.

+
+
+
If you are not familliar with constructors, in PHP 4, a constructor is simply a function that has the exact same name as the class:

+
+
+<?php

+class Blog extends Controller {

+

+       function Blog()

+       {

+            parent::Controller();

+       }

+}

+?>
+
+
In PHP 5, constructors use the following syntax:

+
+
+<?php

+class Blog extends Controller {

+

+       function __construct()

+       {

+            parent::Controller();

+       }

+}

+?>
+
+
Constructors are useful if you need to set some default values, or run a default process when your class is instantiated.
+Constructors can't return a value, but they can do some default work.

+
+
+
Reserved Function Names

+
+
Since your controller classes will extend the main application controller you 
+must be careful not to name your functions identically to the ones used by that class, otherwise your local functions
+will override them.  The following
+is a list of reserved names.  Do not name your controller functions any of these:

+
+
    
+
  • Controller
    • 
+
  • CI_Base
    • 
+
  • _ci_autoload
    • 
+
  • _ci_autoloader
    • 
+
  • _ci_assign_core
    • 
+
  • _ci_initialize
    • 
+
  • _ci_init_database
    • 
+
  • _ci_init_scaffolding
    • 
+
  • _ci_is_loaded
    • 
+
  • _ci_load
    • 
+
  • _ci_scaffolding
    • 
+
  • _ci_set_view_path
    • 
+

+
+

If you are running PHP 4 there are some additional reserved names. These ONLY apply if you are running PHP 4.

+
+
    
+
  • CI_Loader
    • 
+
  • config
    • 
+
  • database
    • 
+
  • file
    • 
+
  • helper
    • 
+
  • helpers
    • 
+
  • language
    • 
+
  • library
    • 
+
  • plugin
    • 
+
  • plugins
    • 
+
  • scaffolding
    • 
+
  • script
    • 
+
  • view
    • 
+
  • vars
    • 
+

+
+
+
+
+
+
+
That's it!

+
+
That, in a nutshell, is all there is to know about controllers.

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
new file mode 100644
index 00000000..fa341676
--- /dev/null
+++ b/user_guide/general/creating_libraries.html
@@ -0,0 +1,222 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Creating Libraries

+
+
When we use the term "Libraries" we are normally referring to the classes that are located in the libraries
+directory and described in the Class Reference of this user guide.  In this case, however, we will instead describe how you can create your own libraries within 
+your application directory in order to maintain separation between your local resources and the global framework resources.

+
+
Storage

+
+
In order for your libraries to be stored in your application folder you will need to create two directories in which to store them:

+
+
    
+
  • application/init
    • 
+
  • application/libraries
    • 
+

+
+
+
Anatomy of a Library

+
+
A class library consists of two components:

+
+
    
+
  1. An init file.
    2. 
+
  2. A class file.
    3. 
+

+
+
The Init File

+
+
An init file a small initialization file corresponding to each of your classes.  The purpose of this file is to 
+instantiate a particular class. Each init file must be named identically to your class file name, adding the "init_" prefix.  For example, if your
+class is named myclass.php your init file will be named:

+
+init_myclass.php
+
+
Within your init file you will place your initialization code.  Here's an example of such code, using an imaginary class named Myclass:

+
+
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+

+if ( ! class_exists('Myclass'))

+{

+     require_once(APPPATH.'libraries/Myclass'.EXT);

+}

+

+$obj =& get_instance();

+$obj->myclass = new Myclass();

+$obj->ci_is_loaded[] = 'myclass';

+

+?>
+
+
The Class File

+
+
Your class file itself will be placed inside your libraries directory:

+
+application/libraries/myclass.php
+
+
The class will have this basic prototype:

+
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+

+class Myclass {

+

+}

+?>
+
+
+
Naming Conventions

+
+
    
+
  • All file names must be in lowercase:  myclass.php and init_myclass.php
    • 
+
  • Class names must be capitalize:  class Myclass
    • 
+

+
+
+
Using Your Class

+
+
From within any of your Controller classes you can initialize your class using the standard:

+
+$this->load->library('myclass');
+
+
Once loaded you can access your class using:

+
+$this->myclass->function();
+
+
Note: In your init file you can define the object variable name.

+
+
+
Passing Parameters Your Class

+
+
In the library loading function you can pass data via the second parameter and it will be available to your initialization file:

+
+
+$params = array('type' => 'large', 'color' => 'red');

+

+$this->load->library('myclass', $params);
+
+
Parameters will be accessible using a variable called $params.  By default this variable is set to FALSE.

+
+
+
Utilizing Code Igniter Resources within Your Library

+
+
+
To access Code Igniter's native resources within your library use the get_instance() function.
+This function returns the Code Igniter super object.

+
+
Normally, to call any of the available Code Igniter functions requires you to use the $this construct:

+
+
+$this->load->helper('url');

+$this->load->library('session');

+$this->config->item('base_url');

+etc.
+
+
+
$this, however, only works directly within your controllers, your models, or your views.  
+If you would like to use Code Igniter's classes from within your own custom classes you can do so as follows:

+
+
+
First, assign the Code Igniter object to a variable:

+
+$obj =& get_instance();
+
+
Once you've assigned the object to a variable, you'll use that variable instead of $this:

+
+
+$obj =& get_instance();


+$obj->load->helper('url');

+$obj->load->library('session');

+$obj->config->item('base_url');

+etc.
+
+
+
Note: You'll notice that the above get_instance() function is being passed by reference:
+


+$obj =& get_instance();
+


+This is very important. Assigning by reference allows you to use the original Code Igniter object rather than creating a copy of it.

+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
new file mode 100644
index 00000000..dd318b7d
--- /dev/null
+++ b/user_guide/general/credits.html
@@ -0,0 +1,96 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Credits

+
+
Code Igniter was developed by Rick Ellis, who in his other life is CEO of
+pMachine, Inc.  The core framework was written
+specifically for this application, while many of the class libraries, helpers, and sub-systems borrow from the code-base of
+ExpressionEngine, a Content Management System written by Rick Ellis and 
+Paul Burdick.

+
+
A hat tip goes to Ruby on Rails for inspiring us to create a PHP framework, and for
+bringing frameworks into the general consciousness of the web community.

+
+
The Code Igniter logo and icons were created by Rick Ellis.

+
+
The pull-down table of contents was created with the use of the moo.fx library.

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html
new file mode 100644
index 00000000..60acbfe1
--- /dev/null
+++ b/user_guide/general/errors.html
@@ -0,0 +1,142 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Error Handling

+
+
Code Igniter lets you build error reporting into your applications using the functions described below.  
+In addition, it has an error logging class that permits error and debugging messages to be saved as text files.

+
+
Note: By default, Code Igniter displays all PHP errors.  You might 
+wish to change this behavior once your development is complete.  You'll find the error_reporting()
+function located at the top of your main index.php file. Disabling error reporting will NOT prevent log files
+from being written if there are errors.

+
+
Unlike most systems in Code Igniter, the error functions are simple procedural interfaces that are available 
+globally throughout the application.  This approach permits error messages to get triggered without having to worry
+about class/function scoping.

+
+
The following functions let you generate errors:

+
+
show_error('message')

+
This function will display the error message supplied to it using the following error template:

+
application/errors/error_general.php

+
+
show_404('page')

+
This function will display the 404 error message supplied to it using the following error template:

+
application/errors/error_404.php

+
+
The function expects the string passed to it to be the file path to the page that isn't found.
+Note that Code Igniter automatically shows 404 messages if controllers are not found.

+
+
+
log_message('level', 'message')

+
+
This function lets you write messages to your log files.  You must supply one of three "levels" 
+in the first parameter, indicating what type of message it is (debug, error, info), with the message
+itself in the second parameter.  Example:

+
+
+if ($some_var == "")

+{

+    log_message('error', 'Some variable did not contain a value.');

+}

+else

+{

+    log_message('debug', 'Some variable was correctly set');

+}

+

+log_message('info', 'The purpose of some variable is to provide some value.');

+
+
+
There are three message types:

+
+
    
+
  1. Error Messages.  These are actual errors, such as PHP errors or user errors.
    2. 
+
  2. Debug Messages.  These are messages that assist in debugging. For example, if a class has been initialized, you could log this as debugging info.
    3. 
+
  3. Informational Messages.  These are the lowest priority messages, simply giving information regarding some process.  Code Igniter doesn't natively generate any info messsages but you may want to in your application.
    4. 
+

+
+
+
Note: In order for the log file to actually be written, the "log_errors"
+option must be enabled in your application/config/config.php file, and the "logs" folder must be writable.  
+In addition, you'll can set the "threshold" for logging.  
+You might, for example, only want error messages to be logged, and not the other two types.

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html
new file mode 100644
index 00000000..1bed4a8b
--- /dev/null
+++ b/user_guide/general/helpers.html
@@ -0,0 +1,140 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Helper Functions

+
+
Helpers, as the name suggests, help you with tasks.  Each helper file is simply a collection of functions in a particular
+category.  There are URL Helpers, that assist in creating links, there are Form Helpers
+that help you create form elements, Text Helpers perform various text formatting routines,
+Cookie Helpers set and read cookies, File Helpers help you deal with files, etc.
+

+
+
Unlike most other systems in Code Igniter, Helpers are not written in an Object Oriented format.  They are simple, procedural functions.
+Each helper function performs one specific task, with no dependence on other functions.

+
+
Code Igniter does not load Helper Files by default, so the first step in using 
+a Helper is to load it.  Once loaded, it becomes globally available in your controller and views.

+
+
Loading a Helper

+
+
Loading a helper file is quite simple using the following function:

+
+$this->load->helper('name');
+
+
Where name is the file name of the helper, without the .php file extension or the "helper" part.

+
+
For example, to load the URL Helper file, which is named url_helper.php, you would do this:

+
+$this->load->helper('url');
+
+
A helper can be loaded anywhere within your controller functions (or even within your View files, although that's not a good practice),
+as long as you load it before you use it.  You can load your helpers in your controller constructor so that they become available
+automatically in any function, or you can load a helper in a specific function that needs it.

+
+
Note: The Helper loading function above does not return a value, so don't try to assign it to a variable.  Just use it as shown.

+
+
+
Loading Multiple Helpers

+
+
If you need to load more than one helper you can specify them in an array, like this:

+
+$this->load->helper( array('helper1', 'helper2', 'helper3') );
+
+
Auto-loading Helpers

+
+
If you find that you need a particular helper globally throughout your application, you can tell Code Igniter to auto-load it during system initialization.
+This is done by opening the application/config/autoload.php file and adding the helper to the autoload array.

+
+
+
Using a Helper

+
+
Once you've loaded the Helper File containing the function you intend to use, you'll call it the way you would a standard PHP function.

+
+
For example, to create a link using the anchor() function in one of your view files you would do this:

+
+<?=anchor('blog/comments', 'Click Here');?>
+
+
Where "Click Here" is the name of the link, and "blog/comments" is the URI to the controller/function you wish to link to.

+
+
+
Now What?

+
+
In the Table of Contents you'll find a list of all the available Helper Files.  Browse each one to see what they do.

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
new file mode 100644
index 00000000..30165465
--- /dev/null
+++ b/user_guide/general/hooks.html
@@ -0,0 +1,184 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Hooks - Extending the Framework Core

+
+
Code Igniter's Hooks feature provides a means to tap into and modify the inner workings of the framework without hacking the core files.  
+When Code Igniter runs it follows a specific execution process, diagramed in the Application Flow page. 
+There may be instances, however, where you'd like to cause some action to take place at a particular stage in the execution process.  
+For example, you might want to run a script right before your controllers get loaded, or right after, or you might want to trigger one of 
+your own scripts in some other location.
+

+
+
+
Defining a Hook

+
+
Hooks are defined in application/config/hooks.php file.  Each hook is specified as an array with this prototype:

+
+
+$hook['pre_controller'] = array(

+                                'class'    => 'MyClass',

+                                'function' => 'Myfunction',
 
+                                'filename' => 'Myclass.php',

+                                'filepath' => 'hooks',

+                                'params'   => array('beer', 'wine', 'snacks')

+                                );
+
+
Notes:
The array index correlates to the name of the particular hook point you want to 
+use.  In the above example the hook point is pre_controller. A list of hook points is found below. 
+The following items should be defined in your associative hook array:

+
+
    
+
  • class  The name of the class you wish to invoke. If you prefer to use a procedural function instead of a class, leave this item blank.
    • 
+
  • function  The function name you wish to call.
    • 
+
  • filename  The file name containing your class/function.
    • 
+
  • filepath  The name of the directory containing your script.  Note: Your script must be located in a directory INSIDE your application folder, so the file path is relative to that folder.  For example, if your script is located in application/hooks, you will simply use hooks as your filepath.  If your script is located in application/hooks/utilities you will use hooks/utilities as your filepath. No trailing slash.
    • 
+
  • params  Any parameters you wish to pass to your script. This item is optional.
    • 
+

+
+
+
Multiple Calls to the Same Hook

+
+
If want to use the same hook point with more then one script, simply make your array declaration multi-dimensional, like this:
+
+
+$hook['pre_controller'][] = array(

+                                'class'    => 'MyClass',

+                                'function' => 'Myfunction',
 
+                                'filename' => 'Myclass.php',

+                                'filepath' => 'hooks',

+                                'params'   => array('beer', 'wine', 'snacks')

+                                );

+

+$hook['pre_controller'][] = array(

+                                'class'    => 'MyOtherClass',

+                                'function' => 'MyOtherfunction',
 
+                                'filename' => 'Myotherclass.php',

+                                'filepath' => 'hooks',

+                                'params'   => array('red', 'yellow', 'blue')

+                                );
+
+
Notice the brackets after each array index:

+
+$hook['pre_controller'][]
+
+
This permits you to the same hook point with multiple scripts.  The order you define your array will be the execution order.

+
+
+
Hook Points

+
+The following is a list of available hook points.

+
+
    
+
+
  • pre_system
    
+Called very early during system execution.  Only the benchmark and hooks class have been loaded at this point. No routing or other processes have happened.
    • 
+
+
  • pre_controller
    
+Called immediately prior to any of your controllers being called. All base classes, routing, and security checks have been done.
    • 
+
+
  • post_controller
    
+Called immediately after the controller is called.
    • 
+
+
  • display_override
    
+Overrides the _display() function, used to send the finalized page to the web browser at the end of system execution.  This permits you to 
+use your own display methodology.  Note that the finalized data will be available by calling $this->output->get_output()
    • 
+
+
  • cache_override
    
+Enables you to call your own function instead of the _display_cache() function in the output class.  This permits you to use your own cache display mechanism.
    • 
+
+
  • scaffolding_override
    
+Permits a scaffolding request to trigger your own script instead.
    • 
+
+
  • post_system
    
+Called after the final rendered page is sent to the browser, at the end of system execution after the finalized data is sent to the browser.
    • 
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/index.html b/user_guide/general/index.html
new file mode 100644
index 00000000..31e99d53
--- /dev/null
+++ b/user_guide/general/index.html
@@ -0,0 +1,95 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Getting Started With Code Igniter

+
+
Any software application requires some effort to learn.  We've done our best to minimize the learning
+curve, while making the process as enjoyable as possible.
+

+
+
The first step is to install Code Igniter, then read 
+all the topics in the Introduction section of the User Guide.

+
+
Next, read each of the General Topics pages in order.
+Each topic builds on the previous one, and includes code examples that you are encouraged to try.

+
+
Once you understand the basics you'll be ready to explore the Class Reference and 
+Helper Reference pages to learn to utilize the native libraries and helper files.

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html
new file mode 100644
index 00000000..642399ba
--- /dev/null
+++ b/user_guide/general/libraries.html
@@ -0,0 +1,111 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Loading Libraries

+
+
The core libraries are the class files located in the "libraries" folder. 
+In most cases, to use one of these classes involves initializing it within your controllers using the following function:

+
+$this->load->library('class name'); 
+
+
Where class name is the name of the class you want to invoke.  For example, to load the validation class you would do this:

+
+$this->load->library('validation'); 
+
+
Once initialized you can use it as indicated in the user guide page corresponding to each class.

+
+
Semantic Relevance

+
+
The pattern you will  use when calling functions is this:

+
+
$this->class->function()

+
+
We've placed a high value on semantic relevance in the naming of our classes and functions.  
+Here are some examples of function calls you might use in Code Igniter:

+
+
$this->email->send()

+
$this->input->user_agent()

+
$this->benchmark->elapsed_time()

+
$this->db->query()

+
$this->load->helper()

+
$this->uri->segment()

+
$this->lang->line()

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/models.html b/user_guide/general/models.html
new file mode 100644
index 00000000..dfb45d62
--- /dev/null
+++ b/user_guide/general/models.html
@@ -0,0 +1,256 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Models

+
+
Models are optionally available for those who want to use a more
+traditional MVC approach.

+
+
+
+
+
+
+
+
What is a Model?

+
+
Models are PHP classes that are designed to work with information in your database.  For example, let's say 
+you use Code Igniter to manage a blog.  You might have a model class that contains functions to insert, update, and
+retrieve your blog data. Here is an example of what such a model class might look like:

+
+
+class Blogmodel extends Model {

+

+    var $title   = '';

+    var $content = '';

+    var $date    = '';

+

+    function Blogmodel()

+    {

+        // Call the Model constructor

+        parent::Model();

+    }

+    

+    function get_last_ten_entries()

+    {

+        $query = $this->db->get('entries', 10);

+        return $query->result();

+    }

+

+    function insert_entry()

+    {

+        $this->title   = $_POST['title'];

+        $this->content = $_POST['content'];

+        $this->date    = time();

+

+        $this->db->insert('entries', $this);

+    }

+

+    function update_entry()

+    {

+        $this->title   = $_POST['title'];

+        $this->content = $_POST['content'];

+        $this->date    = time();

+

+        $this->db->update('entries', $this, array('id', $_POST['id']));

+    }

+

+}
+
+
Note: The functions in the above example use the Active Record database functions.

+
+
+
+
Anatomy of a Model

+
+
Model classes are stored in your application/models/ folder.  The basic prototype for a model is this:

+
+
+
+class Model_name extends Model {

+

+    function Model_name()

+    {

+        parent::Model();

+    }

+}
+
+
Where Model_name is the name of your class.  Class names must be capitalized. 
+Make sure your class extends the base Model class.

+
+
The file name will be a lower case version of your class name.  For example, if your class is this:

+
+
+class User_model extends Model {

+

+    function User_model()

+    {

+        parent::Model();

+    }

+}
+
+
Your file will be this:

+
+application/models/user_model.php
+
+
+
+
Loading a Model

+
+
Your models will typically be loaded and called from within your controller functions.
+To load a model you will use the following function:

+
+$this->load->model('Model_name');
+
+
Once loaded, you will access your model functions using an object with the same name as your class:

+
+
+$this->load->model('Model_name');

+

+$this->Model_name->function();
+
+
+
If you would like your model assigned to a different object name you can specify it via the second parameter of the loading
+function:

+
+
+
+$this->load->model('Model_name', 'fubar');

+

+$this->fubar->function();
+
+
+
Here is an example of a controller, that loads a model, then serves a view:

+
+
+class Blog_controller extends Controller {

+

+    function blog()

+    {

+        $this->load->model('Blog');

+

+        $data['query'] = $this->Blog->get_last_ten_entries();


+        $this->load->view('blog', $data);

+    }

+}
+
+
+
+
+
Connecting to your Database

+
+
When a model is loaded it does NOT connect automatically to your database.  The following options for connecting are available to you:

+
+
    
+
  • You can connect using the standard database methods described here, either from within your Controller class or your Model class.
    • 
+
  • You can tell the model loading function to auto-connect by passing TRUE (boolean) via the third parameter,
+and connectivity settings, as defined in your database config file will be used: 
+
+	$this->load->model('Model_name', '', TRUE);	
+	
    • 
+
+
+
  • You can manually pass database connectivity settings via the third parameter: 
+
+
+		$config['hostname'] = "localhost";
    
+		$config['username'] = "myusername";
    
+		$config['password'] = "mypassword";
    
+		$config['database'] = "mydatabase";
    
+		$config['dbdriver'] = "mysql";
    
+		$config['dbprefix'] = "";
    
+		$config['pconnect'] = FALSE;
    
+		$config['db_debug'] = TRUE;
    
+		$config['active_r'] = TRUE;
    
+		
    
+		$this->load->model('Model_name', '', $config);
    • 
+

+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html
new file mode 100644
index 00000000..22934949
--- /dev/null
+++ b/user_guide/general/multiple_apps.html
@@ -0,0 +1,116 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Running Multiple Applications with one Code Igniter Installation

+
+
By default it is assumed that you only intend to use Code Igniter to manage one application, which you will build in your
+system/application/ directory.  It is possible, however, to have multiple sets of applications that share a single
+Code Igniter installation.  To do this you will put all of the directories located inside your application folder into their
+own sub-folder.

+
+
For example, let's say you want to create two applications, "foo" and "bar".  You will structure your
+application folder like this:
+
+system/application/foo/

+system/application/foo/config/

+system/application/foo/controllers/

+system/application/foo/errors/

+system/application/foo/models/

+system/application/foo/scripts/

+system/application/foo/views/

+system/application/bar/

+system/application/bar/config/

+system/application/bar/controllers/

+system/application/bar/errors/

+system/application/bar/models/

+system/application/bar/scripts/

+system/application/bar/views/
+
+
+
To select a particular application for use requires that you open your main index.php file and set the $application_folder
+variable.  For example, to select the "foo" application for use you would do this:

+
+$application_folder = "foo";
+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html
new file mode 100644
index 00000000..c28dd321
--- /dev/null
+++ b/user_guide/general/plugins.html
@@ -0,0 +1,125 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Plugins

+
+
Plugins work almost identically to Helpers.  The main difference is that a plugin usually 
+provides a single function, whereas a Helper is usually a collection of functions.  Helpers are also considerd a part of
+the core system; plugins are intended to be created and shared by our community.

+
+
+
Loading a Plugin

+
+
Loading a plugin file is quite simple using the following function:

+
+$this->load->plugin('name');
+
+
Where name is the file name of the plugin, without the .php file extension or the "plugin" part.

+
+
For example, to load the Captcha plugin, which is named captcha_pi.php, you will do this:

+
+$this->load->plugin('captcha');
+
+
A plugin can be loaded anywhere within your controller functions (or even within your View files, although that's not a good practice),
+as long as you load it before you use it.  You can load your plugins in your controller constructor so that they become available
+automatically in any function, or you can load a plugin in a specific function that needs it.

+
+
Note: The Plugin loading function above does not return a value, so don't try to assign it to a variable.  Just use it as shown.

+
+
+
Loading Multiple Plugins

+
+
If you need to load more than one plugin you can specify them in an array, like this:

+
+$this->load->plugin( array('plugin1', 'plugin2', 'plugin3') );
+
+
Auto-loading Plugins

+
+
If you find that you need a particular plugin globally throughout your application, you can tell Code Igniter to auto-load it 
+during system initialization. This is done by opening the application/config/autoload.php file and adding the plugin to the autoload array.

+
+
+
Using a Plugin

+
+
Once you've loaded the Plugin, you'll call it the way you would a standard PHP function.

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html
new file mode 100644
index 00000000..3e95fac6
--- /dev/null
+++ b/user_guide/general/quick_reference.html
@@ -0,0 +1,83 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Quick Reference Chart

+
+
For a PDF version of this chart, click here.
+
+

+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html
new file mode 100644
index 00000000..8e18ab09
--- /dev/null
+++ b/user_guide/general/requirements.html
@@ -0,0 +1,88 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Server Requirements

+
+
    
+	
  • PHP version 4.3.2 or newer
    • 
+	
  • A Database. Supported databases are MySQL, MySQLi, MS SQL, Postgre, SQLite, and ODBC
    • 
+

+
+
+
+

+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
new file mode 100644
index 00000000..c6e8bd9c
--- /dev/null
+++ b/user_guide/general/routing.html
@@ -0,0 +1,163 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
URI Routing

+
+
Typically there is a one-to-one relationship between a URL string and its corresponding controller class/method. 
+The segments in a URI normally follow this pattern:

+
+www.your-site.com/class/function/id/
+
+
In some instances, however, you may want to remap this relationship so that a different class/function can be called 
+instead of the one corresponding to the URL.

+
+
For example, lets say you want your URLs to have this prototype:

+
+

+www.your-site.com/product/1/

+www.your-site.com/product/2/

+www.your-site.com/product/3/

+www.your-site.com/product/4/
+

+
+
Normally the second segment of the URL is reserved for the function name, but in the example above, it instead has a product ID.  
+To overcome this, Code Igniter allows you to remap the URI handler.

+
+
+
Setting your own routing rules

+
+
Routing rules are defined in your application/config/routes.php file.  In it you'll see an array called $route, that
+you can use to specify your own routing criteria. A typical route might look something like this:

+
+$route['product/:num'] = "catalog/product_lookup";
+
+
In a route, the array key contains the URI to be matched, while the array value  contains the destination it should be re-routed to. 
+In the above example, if the literal word "product" is found in the first segment of the URL, and a number is found in the second segment, 
+the "catalog" class and the "product_lookup" method are instead used.

+
+
You can match literal values or you can use two wildcard types:

+
+

+:num

+:any
+

+
+
:num will match a segment containing only numbers.

+:any will match a segment containing any character.
+

+
+
Note: Routes will run in the order they are defined. 
+Higher routes will always take precedence over lower ones.

+
+
+
Examples

+
+
Here are a few routing examples:

+
+$route['journals'] = "blogs";
+
Any URL containing the word "journals" in the first segment will be remapped to the "blogs" class.

+
+$route['blog/joe'] = "blogs/users/34";
+
Any URL containing the segments blog/joe will be remapped to the "blogs" class and the "users" method.  The ID will be set to "34".

+
+
+$route['product/:any'] = "catalog/product_lookup";
+
Any URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the  "product_lookup" method.

+
+
Important: Do not use leading/trailing slashes.

+
+
+
Reserved Route

+
+
There are two reserved routes:

+
+$route['default_controller'] = 'welcome';
+
+
This route indicates which controller class should be loaded if the URI contains no data, which will be the case
+when people load your root URL. In the above example, the "welcome" class would be loaded.  You
+are encouraged to always have a default route otherwise a 404 page will appear by default.

+
+$route['scaffolding_trigger'] = 'scaffolding';
+
+
This route lets you set a secret word, which when present in the URL, triggers the scaffolding feature.
+Please read the Scaffolding page for details.

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html
new file mode 100644
index 00000000..3b32c369
--- /dev/null
+++ b/user_guide/general/scaffolding.html
@@ -0,0 +1,153 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Scaffolding

+
+
Code Igniter's Scaffolding feature provides a fast and very convenient way to add, edit, or delete information in your database 
+during development.

+
+
Very Important:  Scaffolding is intended for development use only.  It provides very little
+security other than a "secret" word, so anyone who has access to your Code Igniter site can potentially edit or delete your information.  
+If you use scaffolding make sure you disable it immediately after you are through using it.  DO NOT leave it enabled on a live site.
+And please, set a secret word before you use it.

+
+
+
Why would someone use scaffolding?

+
+
Here's a typical scenario:  You create a new database table during development and you'd like a quick way to insert some data
+into it to work with.  Without scaffolding your choices are either to write some inserts using the command line or to use a
+database management tool like phpMyAdmin.  With Code Igniter's scaffolding feature you can quickly add some data using its browser 
+interface.  And when you are through using the data you can easily delete it.

+
+
Setting a Secret Word

+
+
Before enabling scaffolding please take a moment to set a secret word.  This word, when encountered in your URL,
+will launch the scaffolding interface, so please pick something obscure that no one is likely to guess.

+
+
To set a secret word, open your application/config/routes.php file and look for this item:

+
+$route['scaffolding_trigger'] = '';
+
+
Once you've found it add your own unique word.

+
+
Note: The scaffolding word can not start with an underscore.

+
+
+
Enabling Scaffolding

+
+
Note: The information on this page assumes you already know how controllers work, and that you have
+a working one available.  It also assumes you have configured Code Igniter to auto-connect to your database. 
+If not, the information here won't be very relevant, so you are encouraged to go through those sections first.
+Lastly, it assumes you understand what a class constructor is.  If not, read the last section of the controllers
+page.

+
+
To enable scaffolding you will initialize it in your constructor like this:

+
+
+<?php

+class Blog extends Controller {

+

+       function Blog()

+       {

+            parent::Controller();


+            $this->load->scaffolding('table_name');

+       }

+}

+?>
+
+
Where table_name is the name of the table (table, not database) you wish to work with.

+
+
Once you've initialized scaffolding, you will access it with this URL prototype:
+
+www.your-site.com/index.php/class/secret_word/
+
+
For example, using a controller named Blog, and abracadabra as the secret word,
+you would access scaffolding like this:

+
+www.your-site.com/index.php/blog/abracadabra/
+
+
The scaffolding interface should be self-explanatory.  You can add, edit or delete records.

+
+
+
A Final Note:

+
+
The scaffolding feature will only work with tables that contain a primary key, as this is information is needed to perform the various
+database functions.

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/scripts.html b/user_guide/general/scripts.html
new file mode 100644
index 00000000..d0b5d26f
--- /dev/null
+++ b/user_guide/general/scripts.html
@@ -0,0 +1,115 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
The Scripts Folder

+
+
Inside the application directory you'll find a folder called scripts.  Its purpose is
+to give you a place to store your own script includes or classes.

+
+
Loading a Script

+
+
Your scripts can be loaded in your controllers or views using the following function:

+
+$this->load->script('name');
+
+
Where name is the file name of the script, without the .php file extension.

+
+
For example, to load a file called utilities.php you would do this:

+
+$this->load->script('utilities');
+
+
If you load a script in your controller constructor it will be available
+automatically in any function, or you can load it in a specific function that needs it.

+
+
Note: The Script loading function above does not return a value, so don't try to assign it to a variable.  Just use it as shown.

+
+
Loading Multiple Scripts

+
+
If you need to load more than one script you can specify them in an array, like this:

+
+$this->load->script( array('script1', 'script2', 'script3') );
+
+
Auto-loading Scripts

+
+
If you find that you need a particular script globally throughout your application, you can tell Code Igniter to auto-load it 
+during system initialization. This is done by opening the application/config/autoload.php file and adding 
+the script to the autoload array.

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/security.html b/user_guide/general/security.html
new file mode 100644
index 00000000..06287a23
--- /dev/null
+++ b/user_guide/general/security.html
@@ -0,0 +1,159 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Security

+
+
This page describes some "best practices" regarding web security, and details
+Code Igniter's internal security features.

+
+
+
URI Security

+
+
Code Igniter is fairly restrictive regarding which characters it allows in your URI strings in order to help
+minimize the possibility that malicious data can be passed to your application.  URIs may only contain the following:
+

+
+
    
+
  • Alpha-numeric text
    • 
+
  • Tilde: ~ 
    • 
+
  • Period: .
    • 
+
  • Colon: :
    • 
+
  • Underscore: _
    • 
+
  • Dash: -
    • 
+

+
+
GET, POST, and COOKIE Data

+
+
GET data is simply disallowed by Code Igniter since the system utilizes URI segments rather than traditional URL query strings (unless
+you have the query string option enabled in your config file).  The global GET 
+array is unset by the Input class during system initialization.

+
+
Register_globals

+
+
During system initialization all global variables are unset, except those found in the $_POST and $_COOKIE arrays. The unsetting
+routine is effectively the same as register_globals = off.

+
+
+
magic_quotes_runtime

+
+
The magic_quotes_runtime directive is turned off during system initialization so that you don't have to remove slashes when
+retrieving data from your database.

+
+

Best Practices

+
+
Before accepting any data into your application, whether it be POST data from a form submission, COOKIE data, URI data, 
+XML-RPC data, or even data from the SERVER array, you are encouraged to practice this three step approach:

+
+
    
+
+
  1. Filter the data as if it were tainted.
    2. 
+
  2. Validate the data to ensure it conforms to the correct  type, length, size, etc. (sometimes this step can replace step one)
    3. 
+
  3. Escape the data before submitting it into your database.
    4. 
+

+
+Code Igniter provides the following functions to assist in this process:

+
+
    
+
+
  • XSS Filtering
    
+
+
    Code Igniter comes with a Cross Site Scripting filter.  This filter looks for commonly 
+used techniques to embed malicious Javascript into your data, or other types of code that attempt to hijack cookies
+or do other malicious things. The XSS Filter is described here.  
+
    
+
    • 
+
+
  • Validate the data
    
+
+
    Code Igniter has a Validation Class that assists you in validating, filtering, and prepping 
+your data.
    
+
    • 
+
+
  • Escape all data before database insertion
    
+
+
    Never insert information into your database without escaping it. Please see the section that discusses
+queries for more information.
    
+
+
    • 
+
+

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html
new file mode 100644
index 00000000..8daef51a
--- /dev/null
+++ b/user_guide/general/urls.html
@@ -0,0 +1,159 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Code Igniter URLs

+
+
By default, URLs in Code Igniter are designed to be search-engine and human friendly.  Rather than using the standard "query string" 
+approach to URLs that is synonymous with dynamic systems, Code Igniter uses a segment-based approach:

+
+www.your-site.com/news/article/my_article
+
+
Note: Query string URLs can be optionally enabled, as described below.

+
+
URI Segments

+
+
The segments in the URL, in following with the Model-View-Controller approach, usually represent:

+
+www.your-site.com/class/function/ID
+
+
    
+
  1. The first segment represents the controller class that should be invoked.
    2. 
+
  2. The second segment represents the class function, or method, that should be called.
    3. 
+
  3. The third, and any additional segments, represent the ID and any variables that will be passed to the controller.
    
+

+
+
The URI Class and the URL Helper 
+contain functions that make it easy to work with your URI data.  In addition, your URLs can be remapped using the 
+URI Routing feature for more flexibility.

+
+
+
+
Removing the index.php file

+
+
By default, the index.php file will be included in your URLs:
+
+www.your-site.com/index.php/news/article/my_article
+
+
You can easily remove this file by using a .htaccess file with some simple rules. Here is an example
+ of such a file, using the "negative" method in which everything is redirected except the specified items:

+
+RewriteEngine on

+RewriteCond $1 !^(index\.php|images|robots\.txt)

+RewriteRule ^(.*)$ /index.php/$1 [L]
+
+
In the above example, any HTTP request other than those for index.php, images, and robots.txt is treated as
+a request for your index.php file.

+
+
+
Adding a URL Suffix

+
+
In your config/config.php file you can specify a suffix that will be added to all URLs generated
+by Code Igniter.  For example, if a URL is this:
+
+www.your-site.com/index.php/products/view/shoes
+
+
You can optionaally add a suffix, like .html, making the page appear to be of a certain type:

+
+www.your-site.com/index.php/products/view/shoes.html
+
+
+
Enabling Query Strings

+
+
In some cases you might prefer to use query strings URLs:

+
+index.php?c=products&m=view&id=345
+
+
Code Igniter optionally supports this capability, which can be enabled in your application/config.php file. If you
+open your config file you'll see these items:

+
+$config['enable_query_strings'] = FALSE;

+$config['controller_trigger'] = 'c';

+$config['function_trigger'] = 'm';
+
+
If you change "enable_query_strings" to TRUE this feature will become active.  Your controllers and functions will then
+be accessible using the "trigger" words you've set to invoke your controllers and methods:

+
+index.php?c=controller&m=method
+
+
Please note: If you are using query strings you will have to build your own URLs, rather than utilizing
+the URL helpers (and other helpers that generate URLs, like some of the form helpers) as these are designed to work with 
+segment based URLs.

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/general/views.html b/user_guide/general/views.html
new file mode 100644
index 00000000..14b03e58
--- /dev/null
+++ b/user_guide/general/views.html
@@ -0,0 +1,249 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Views

+
+
A view is simply a web page, or a page fragment, like a header, footer, sidebar, etc.
+In fact, views can flexibly be embedded within other views (within other views, etc., etc.) if you need this type 
+of hierarchy.

+
+
Views are never called directly, they must be loaded by a controller.  Remember that in an MVC framework, the Controller acts as the
+traffic cop, so it is responsible for fetching a particular view. If you have not read the Controllers page 
+you should do so before continuing.

+
+
Using the example controller you created in the controller page, let's add a view to it.

+
+
Creating a View

+
+
Using your text editor, create a file called blogview.php, and put this in it:

+
+
+
+
Then save the file in your application/views/ folder.

+
+
Loading a View

+
+
To load a particular view file you will use the following function:

+
+$this->load->view('name');
+
+
Where name is the name of your view file, without the .php file extension.

+
+
Now, open the controller file you made earlier called blog.php, and replace the echo statement with the view loading function:

+
+
+
+
+
+
If you visit the your site using the URL you did earlier you should see your new view.  The URL was similar to this:

+
+www.your-site.com/index.php/blog/
+
+
+
Adding Dynamic Data to the View

+
+
Data is passed from the controller to the view by way of an array or an object in the second 
+parameter of the view loading function. Here is an example using an array:

+
+$data = array(

+               'title' => 'My Title',

+               'heading' => 'My Heading'

+               'message' => 'My Message'

+          );

+

+$this->load->view('blogview', $data);
+
+
And here's an example using an object:

+
+$data = new Someclass();

+$this->load->view('blogview', $data);
+
+
Note: If you use an object, the class variables will be turned into array elements.

+
+
+
Let's try it with your controller file.  Open it add this code:

+
+
+
+
+
Now open your view file and change the text to variables that correspond to the array keys in your data:

+
+
+
+
+
Then load the page at the URL you've been using and you should see the variables replaced.

+
+
Note: Youl'll notice that in the example above we are using PHP's alternative syntax.  If you
+are not familiar with it you can read about it here.

+
+
Creating Loops

+
+
The data array you pass to your view files is not limited to simple variables.  You can
+pass multi dimensional arrays, which can be looped to generate multiple rows.  For example, if you
+pull data from your database it will typically be in the form of a multi-dimensional array.

+
+
Here's a simple example. Add this to your controller:

+
+
+
+
+
Now open your view file and create a loop:

+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html
new file mode 100644
index 00000000..d719be9c
--- /dev/null
+++ b/user_guide/helpers/array_helper.html
@@ -0,0 +1,111 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Array Helper

+
+
The Array Helper file contains functions that assist in working with arrays.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('array');
+
+
The following functions are available:

+
+
+
random_element()

+
+
Takes an array as input and returns a random element from it.  Usage example:

+
+$quotes = array(

+            "I find that the harder I work, the more luck I seem to have. - Thomas Jefferson",

+            "Don't stay in bed, unless you can make money in bed. - George Burns",

+            "We didn't lose the game; we just ran out of time. - Vince Lombardi",

+            "If everything seems under control, you're not going fast enough. - Mario Andretti",

+            "Reality is merely an illusion, albeit a very persistent one. - Albert Einstein",

+            "Chance favors the prepared mind - Louis Pasteur"

+            );

+

+echo random_element($quotes);
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html
new file mode 100644
index 00000000..3152fc30
--- /dev/null
+++ b/user_guide/helpers/cookie_helper.html
@@ -0,0 +1,133 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Cookie Helper

+
+
The Cookie Helper file contains functions that assist in working with cookies.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('cookie');
+
+
The following functions are available:

+
+
set_cookie()

+
+
Sets a cookie containing the values you specify.  There are two ways to pass information this function so that a cookie can be set:
+Arrray Method, and Discreet Parameters:

+
+
Array Method

+
+
Using this method, an associative array is passed to the first parameter:

+
+$cookie = array(

+                   'name'   => 'The Cookie Name',

+                   'value'  => 'The Value',

+                   'expire' => '86500',

+                   'domain' => '.some-domain.com',

+                   'path'   => '/',

+                   'prefix' => 'myprefix_',

+               );

+

+set_cookie($cookie);
+
+
+
Notes:

+
+
Only the name and value are required.

+
+
The expiration is set in seconds, which will be added to the current time.  Do not include the time, but rather only the
+number of seconds from now that you wish the cookie to be valid.  If the expiration is set to 
+zero the cookie will only last as long as the browser is open.

+
To delete a cookie set it with the expiration blank.

+
For site-wide cookies regardless of how your site is requested, add your URL to the domain starting with a period, like this:  .your-domain.com

+
The path is usually not needed since the function sets a root path.

+
The prefix is only needed if you need to avoid name collisions with other identically named cookies for your server.

+
+
Discreet Parameters

+
+
If you prefer, you can set the cookie by passing data using individual parameters:

+
+set_cookie($name, $value, $expire, $domain, $path, $prefix);
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html
new file mode 100644
index 00000000..b25f249d
--- /dev/null
+++ b/user_guide/helpers/date_helper.html
@@ -0,0 +1,340 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Date Helper

+
+
The Date Helper file contains functions that help you work with dates.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('date');
+
+
+
The following functions are available:

+
+
now()

+
+
Returns the current time as a Unix timestamp, referenced either to your server's local time or GMT, based on the "time reference"
+setting in your config file.  If you do not intend to set your master time reference to GMT (which you'll typically do if you
+run a site that lets each user set their own timezone settings) there is no benefit to using this function over PHP's time() function.
+

+
+
+
+
+
mdate()

+
+
This function is identical to PHPs date() function, except that it lets you 
+use MySQL style date codes, where each code letter is preceded with a percent sign:  %Y %m %d etc.

+
+
The benefit of doing dates this way is that you don't have to worry about escaping any characters that
+are not date codes, as you would normally have to do with the date() function.  Example:

+
+$datestring = "Year: %Y Month: %m Day: %d - %h:%i %a";

+$time = time();

+

+echo mdate($datestring, $time);
+
+
If a timestamp is not included in the second parameter the current time will be used.

+
+
+
local_to_gmt()

+
+
Takes a Unix timestamp as input and returns it as GMT.  Example:

+
+$now = time();

+

+$gmt = local_to_gmt($now);
+
+
+
gmt_to_local()

+
+
Takes a Unix timestamp (referenced to GMT) as input, and converts it to a localized timestamp based on the 
+timezone and Daylight Saving time submitted.  Example:

+
+
+$timestamp = '1140153693';

+$timezone  = 'UM8';

+$daylight_saving = TRUE;

+

+echo gmt_to_local($timestamp, $timezone, daylight_saving);
+
+
Note: For a list of timezones see the reference at the bottom of this page.

+
+
mysql_to_unix()

+
+
Takes a MySQL Timestamp as input and returns it as Unix. Example:

+
+$mysql = '20061124092345';

+

+$unix = mysql_to_unix($mysql);
+
+
+
unix_to_human()

+
+
Takes a Unix timestamp as input and returns it in a human readable format with this prototype:

+
+YYYY-MM-DD HH:MM:SS AM/PM
+
+
This can be useful if you need to display a date in a form field for submission.

+
+
The time can be formatted with or without seconds, and it can be set to European or US format.  If only 
+the timestamp is submitted it will return the time without seconds formatted for the U.S. Examples:
+
+$now = time();

+

+echo unix_to_human($now); // U.S. time, no seconds

+

+echo unix_to_human($now, TRUE, 'us'); // U.S. time with seconds

+

+echo unix_to_human($now, TRUE, 'eu'); // Euro time with seconds
+
+
+
human_to_unix()

+
+
The opposite of the above function.  Takes a "human" time as input and returns it as Unix.  This function is 
+useful if you accept "human" formatted dates submitted via a form.  Returns FALSE (boolean) if 
+the date string passed to it is not formatted as indicated above.  Example:

+
+$now = time();

+

+$human = unix_to_human($now);

+

+$unix = human_to_unix($human);
+
+
+
+
+
+
timespan()

+
+
Formats a unix timestamp so that is appears similar to this:

+
+1 Year, 10 Months, 2 Weeks, 5 Days, 10 Hours, 16 Minutes
+
+
The first parameter must contain a Unix timestamp.  The second parameter must contain a
+timestamp that is greater that the first timesamp.  If the second parameter empty, the current time will be used.  The most common purpose
+for this function is to show how much time has elapsed from some point in time in the past to now.  Example:

+
+$post_date = '1079621429';

+$now = time();

+

+echo timespan($post_date, $now);
+
+
Note: The text generated by this function is found in the following language file: language/<your_lang>/date_lang.php

+
+
+
days_in_month()

+
+
Returns the number of days in a given month/year. Takes leap years into account.  Example:

+echo days_in_month(06, 2005);
+
+
If the second parameter is empty, the current year will be used.

+
+
+
+
timezone_menu()

+
+
Generates a pull-down menu of timezones, like this one:

+
+

+
+

+
+
This menu is useful if you run a membership site in which your users are allowed to set their local timezone value.

+
+
The first paramater lets you set the "selected" state of the menu.  For example, to set Pacific time as the default you will do this:

+
+echo timezone_menu('UM8');
+
+
Please see the timezone reference below to see the values of this menu.

+
+
The second parameter lets you set a CSS class name for the menu.

+
+
Note: The text contained in the menu is found in the following language file: language/<your_lang>/date_lang.php

+
+
+
+
Timezone Reference

+
+
The following table indicates each timezone and its location.

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Time ZoneLocation
UM12(UTC - 12:00) Enitwetok, Kwajalien
UM11(UTC - 11:00) Nome, Midway Island, Samoa
UM10(UTC - 10:00) Hawaii
UM9(UTC - 9:00) Alaska
UM8(UTC - 8:00) Pacific Time
UM7(UTC - 7:00) Mountain Time
UM6(UTC - 6:00) Central Time, Mexico City
UM5(UTC - 5:00) Eastern Time, Bogota, Lima, Quito
UM4(UTC - 4:00) Atlantic Time, Caracas, La Paz
UM25(UTC - 3:30) Newfoundland
UM3(UTC - 3:00) Brazil, Buenos Aires, Georgetown, Falkland Is.
UM2(UTC - 2:00) Mid-Atlantic, Ascention Is., St Helena
UM1(UTC - 1:00) Azores, Cape Verde Islands
(UTC(UTC) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia
UP1(UTC + 1:00) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome
UP2(UTC + 2:00) Kaliningrad, South Africa, Warsaw
UP3(UTC + 3:00) Baghdad, Riyadh, Moscow, Nairobi
UP25(UTC + 3:30) Tehran
UP4(UTC + 4:00) Adu Dhabi, Baku, Muscat, Tbilisi
UP35(UTC + 4:30) Kabul
UP5(UTC + 5:00) Islamabad, Karachi, Tashkent
UP45(UTC + 5:30) Bombay, Calcutta, Madras, New Delhi
UP6(UTC + 6:00) Almaty, Colomba, Dhakra
UP7(UTC + 7:00) Bangkok, Hanoi, Jakarta
UP8(UTC + 8:00) Beijing, Hong Kong, Perth, Singapore, Taipei
UP9(UTC + 9:00) Osaka, Sapporo, Seoul, Tokyo, Yakutsk
UP85(UTC + 9:30) Adelaide, Darwin
UP10(UTC + 10:00) Melbourne, Papua New Guinea, Sydney, Vladivostok
UP11(UTC + 11:00) Magadan, New Caledonia, Solomon Islands
UP12(UTC + 12:00) Auckland, Wellington, Fiji, Marshall Island

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html
new file mode 100644
index 00000000..803bb4ce
--- /dev/null
+++ b/user_guide/helpers/directory_helper.html
@@ -0,0 +1,145 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Directory Helper

+
+
The Directory Helper file contains functions that assist in working with directories.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('directory');
+
+
The following functions are available:

+
+
directory_map('source directory')

+
+
This function reads the directory path specified in the first parameter
+and builds an array representation of it and all its contained files. Example:

+
+$map = directory_map('./mydirectory/');
+
+
Note: Paths are almost always relative to your main index.php file.

+
+
+
+
Sub-folders contained within the directory will be mapped as well.  If you wish to map
+only the top level directory set the second parameter to true (boolean):

+
+$map = directory_map('./mydirectory/', TRUE);
+
+
Each folder name will be an array index, while its contained files will be numerically indexed. 
+Here is an example of a typical array:

+
+Array

+(

+   [libraries] => Array

+   (

+       [0] => benchmark.html

+       [1] => config.html

+       [database] => Array

+       (

+             [0] => active_record.html

+             [1] => binds.html

+             [2] => configuration.html

+             [3] => connecting.html

+             [4] => examples.html

+             [5] => fields.html

+             [6] => index.html

+             [7] => queries.html

+        )

+       [2] => email.html

+       [3] => file_uploading.html

+       [4] => image_lib.html

+       [5] => input.html

+       [6] => language.html

+       [7] => loader.html

+       [8] => pagination.html

+       [9] => uri.html

+)
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html
new file mode 100644
index 00000000..c6b049b2
--- /dev/null
+++ b/user_guide/helpers/file_helper.html
@@ -0,0 +1,144 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
File Helper

+
+
The File Helper file contains functions that assist in working with files.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('file');
+
+
The following functions are available:

+
+
read_file('path')

+
+
Returns the data contained in the file specified in the path.  Example:

+
+$string = read_file('./path/to/file.php');
+
+
The path can be a relative or full server path.  Returns FALSE (boolean) on failure.

+
+
Note: The path is relative to your main site index.php file, NOT your controller or view files.
+Code Igniter uses a front controller so paths are always relative to the main site index.

+
+
If you server is running an open_basedir restriction this function
+might not work if you are trying to access a file above the calling script.

+
+
write_file('path', $data)

+
+
Writes data to the file specified in the path.  If the file does not exist the function will create it. Example:

+
+
+$data = 'Some file data';

+

+if ( ! write_file('./path/to/file.php', $data))

+{

+     echo 'Unable to write the file';

+}

+else

+{

+     echo 'File written!';

+}
+
+
Note: In order for this function to write data to a file its file permissions must be set such that it is writable (666, 777, etc.).
+If the file does not already exist, the directory containing it must be writable.

+
+
Note: The path is relative to your main site index.php file, NOT your controller or view files.
+Code Igniter uses a front controller so paths are always relative to the main site index.

+
+
+
+
delete_files('path')

+
+
Deletes ALL files contained in the supplied path.  Example:

+delete_files('/path/to/directory/');
+
+
If the second parameter is set to true, any directories contained within the supplied root path will be deleted as well. Example:

+
+delete_files('/path/to/directory/', TRUE);
+
+
Note: The files must be writable or owned by the system in order to be deleted.

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html
new file mode 100644
index 00000000..8593f81d
--- /dev/null
+++ b/user_guide/helpers/form_helper.html
@@ -0,0 +1,343 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Form Helper

+
+
The Form Helper file contains functions that assist in working with forms.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('form');
+
+
The following functions are available:

+
+
+
+
form_open()

+
+
Creates an opening form tag with a base URL built from your config preferences.  It will optionally let you
+add form attributes and hidden input fields.

+
+
The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable
+in the event your URLs ever change.

+
+
Here's a simple example:

+
+echo form_open('email/send');
+
+
The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

+
+<form method="post" action="http:/www.your-site.com/index.php/email/send" />
+
+
Adding Attributes

+
+
Attributes can be added by passing an associative array to the second parameter, like this:

+
+
+$attributes = array('class' => 'email', 'id' => 'myform');

+

+echo form_open('email/send', $attributes);
+
+
The above example would create a form similar to this:

+
+<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />
+
+
Adding Hidden Input Fields

+
+
Hidden fields can be added by passing an associative array to the third parameter, like this:

+
+
+$hidden = array('username' => 'Joe', 'member_id' => '234');

+

+echo form_open('email/send', '', $hidden);
+
+
The above example would create a form similar to this:

+
+<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />

+<input type="hidden" name="username" value="Joe" />

+<input type="hidden" name="member_id" value="234" />
+
+
+
form_open_multipart()

+
+
This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute,
+which is necessary if you would like to use the form to upload files with.

+
+
form_hidden()

+
+
Lets you generate hidden input fields.  You can either submit a name/value string to create one field:

+
+form_hidden('username', 'johndoe');

+

+// Would produce:


+<input type="hidden" name="username" value="johnodoe" />
+
+
Or you can submit an associative array to create multiple fields:

+
+$data = array(

+              'name'  => 'John Doe',

+              'email' => 'john@some-site.com',

+              'url'   => 'http://www.some-site.com'

+            );

+

+echo form_hidden($data);

+

+// Would produce:


+<input type="hidden" name="name" value="John Doe" />

+<input type="hidden" name="email" value="john@some-site.com" />

+<input type="hidden" name="url" value="http://www.some-site.com" />
+
+
+
+
+
form_input()

+
+
Lets you generate a standard text input field.  You can minimally pass the field name and value in the first
+and second parameter:
+
+echo form_input('username', 'johndoe');
+
+
Or you can pass an associative array containing any data you wish your form to contain:

+
+$data = array(

+              'name'        => 'username',

+              'id'          => 'username',

+              'value'       => 'johndoe',

+              'maxlength'   => '100',

+              'size'        => '50',

+              'style'       => 'width:50%',

+            );

+

+echo form_input($data);

+

+// Would produce:


+<input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />
+
+
If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the 
+third parameter:
+
+$js = 'onClick="some_function()"';

+

+echo form_input('username', 'johndoe', $js);
+
+
form_password()

+
+
This function is identical in all respects to the form_input() function above 
+except that is sets it as a "password" type.

+
+
form_upload()

+
+
This function is identical in all respects to the form_input() function above 
+except that is sets it as a "file" type, allowing it to be used to upload files.

+
+
form_textarea()

+
+
This function is identical in all respects to the form_input() function above 
+except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above
+example, you will instead specify "rows" and "cols".

+
+
+
form_dropdown()

+
+
Lets you create a standard drop-down field.  The first parameter will contain the name of the field,
+the second parameter will contain an associative array of options, and the third parameter will contain the
+value you wish to be selected.  Example:
+
+$options = array(

+                  'small'  => 'Small Shirt',

+                  'med'    => 'Medium Shirt',

+                  large'   => 'Large Shirt',

+                  'xlarge' => 'Extra Large Shirt',

+                );

+

+echo form_dropdown('shirts', $options, 'large');

+

+// Would produce:


+
+<select name="shirts">

+<option value="small">Small Shirt

+<option value="med">Medium  Shirt

+<option value="large" selected>Large Shirt

+<option value="xlarge">Extra Large Shirt

+</select>
+
+
+
If you would like the opening <select> to contain  additional data, like JavaScript, you can pass it as a string in the 
+fourth parameter:
+
+$js = 'onChange="some_function()"';

+

+echo form_dropdown('shirts', $options, 'large', $js);
+
+
+
form_checkbox()

+
+
Lets you generate a checkbox field. Simple example:
+
+
+echo form_checkbox('newsletter', 'accept', TRUE);

+

+// Would produce:

+

+<input type="checkbox" name="newsletter" value="accept" checked="checked" />
+
+
The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

+
+
Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

+
+$data = array(

+              'name'        => 'newsletter',

+              'id'          => 'newsletter',

+              'value'       => 'accept',

+              'checked'     => TRUE,

+              'style'       => 'margin:10px',

+            );

+

+echo form_checkbox($data);

+

+// Would produce:


+<input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />
+
+
As with other functions, if you would like the tag to contain  additional data, like JavaScript, you can pass it as a string in the 
+fourth parameter:
+
+$js = 'onClick="some_function()"';

+

+echo echo form_checkbox('newsletter', 'accept', TRUE, $js)
+
+
+
form_radio()

+
This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

+
+
+
form_submit()

+
+
Lets you generate a standard submit button. Simple example:

+
+echo form_submit('mysubmit', 'Submit Post!');

+

+// Would produce:

+

+<input type="submit" name="mysubmit" value="Submit Post!" />
+
+
Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes.
+The third parameter lets you add extra data to your form, like JavaScript.

+
+
+
form_close()

+
+
Produces a closing </form> tag.  The only advantage to using this function is it permits you to pass data to it
+which will be added below the tag.  For example:

+
+$string = "</div></div>";

+

+echo form_close($string);

+

+// Would produce:

+

+</form>

+</div></div>
+
+
+
+
+
+
form_prep()

+
+
Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form.  Consider this example:

+
+$string = 'Here is a string containing "quoted" text.';

+

+<input type="text" name="myform" value="$string" />
+
+
Since the above string contains a set of quotes it will cause the form to break.
+The form_prep function converts HTML so that it can be used safely:

+
+<input type="text" name="myform" value="<?php echo form_prep($string); ?>" />
+
+
Note: If you use any of the form helper functions listed in this page the form
+values will be prepped automatically, so there is no need to call this function. Use it only if you are
+creating your own form elements.

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html
new file mode 100644
index 00000000..603b83aa
--- /dev/null
+++ b/user_guide/helpers/html_helper.html
@@ -0,0 +1,117 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
HTML Helper

+
+
The HTML Helper file contains functions that assist in working with HTML.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('html');
+
+
The following functions are available:

+
+
+
heading()

+
+
Lets you create HTML <h1> tags.  The first parameter will contain the data, the
+second the size of the heading.  Example:

+
+echo heading('Welcome!', 3);
+
+
The above would produce:  <h3>Welcome!</h3>

+
+
+
nbs()

+
Generates non-breaking spaces (&nbsp;) based on the number you submit. Example:

+echo nbs(3);
+
The above would produce: &nbsp;&nbsp;&nbsp;

+
+
+
br()

+
Generates line break tags (<br />) based on the number you submit. Example:

+echo br(3);
+
The above would produce: <br /><br /><br />

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html
new file mode 100644
index 00000000..342549d3
--- /dev/null
+++ b/user_guide/helpers/index.html
@@ -0,0 +1,131 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Helper Functions

+
+
Helpers, as the name suggests, help you with tasks.  Each helper file is simply a collection of functions in a particular
+category.  There are URL Helpers, that assist in creating links, there are Form Helpers
+that help you create form elements, Text Helpers perform various text formatting routines,
+Cookie Helpers set and read cookies, File Helpers help you deal with files, etc.
+

+
+
Unlike most other systems in Code Igniter, Helpers are not written in an Object Oriented format.  They are simple, procedural functions.
+Each helper function performs one specific task, with no dependence on other functions.

+
+
Helpers are intentionally kept very simple so that they can be used within your View Files with a minimal amount of code.  
+This is important if you intend to have designers or non-programmer will be working with your view files, since it keeps the code to a minimum.
+

+
+
Code Igniter does not load Helper Files by default, so the first step in using 
+a Helper is to load it.  Once loaded, it becomes globally available in your controller and views.

+
+
Loading a Helper

+
+
Loading a helper file is quite simple using the following function:

+
+$this->load->helper('name');
+
+
Where name is the file name of the helper, without the .php file extension or the "helper" part.

+
+
For example, to load the URL Helper file, which is named url_helper.php, you would do this:

+
+$this->load->helper('url');
+
+
A helper can be loaded anywhere within your controller functions (or even within your View files, although that's not a good practice),
+as long as you load it before you use it.  You can load your helpers in your controller constructor so that they become available
+automatically in any function, or you can load a helper in a specific function that needs it.

+
+
Note: The Helper loading function above does not return a value, so don't try to assign it to a variable.  Just use it as shown.

+
+
Auto-loading Helpers

+
+
If you find that you need a particular helper globally throughout your application, you can tell Code Igniter to auto-load it during system initialization.
+This is done by opening the application/config/autoload.php file and adding the helper to the autoload array.

+
+
+
Using a Helper

+
+
Once you've loaded the Helper File containing the function you intend to use, you'll call it the way you would a standard PHP function.

+
+
For example, to create a link using the anchor() function in one of your view files you would do this:

+
+<?=anchor('blog/comments', 'Click Here');?>
+
+
Where "Click Here" is the name of the link, and "blog/comments" is the URI to the controller/function you wish to link to.

+
+
+
Now What?

+
+
In the Table of Contents you'll find a list of all the available Helper Files.  Browse each one to see what they do.

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html
new file mode 100644
index 00000000..7649fe77
--- /dev/null
+++ b/user_guide/helpers/security_helper.html
@@ -0,0 +1,131 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Security Helper

+
+
The Security Helper file contains security related functions.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('security');
+
+
The following functions are available:

+
+
+
xss_clean()

+
+
Provides Cross Site Script Hack filtering.  This function is an alias to the the one in the 
+Input class.  More info can be found there.

+
+
+
hash()

+
+
Permits you to create SHA1 or MD5 one way hashes suitable for encrypting passwords.  Will create SHA1 by default. Examples:

+
+
+$str = hash($str); // SHA1

+

+$str = hash($str, 'md5'); // MD5
+
+
+
+
+
+
strip_image_tags()

+
+
This is a security function that will strip image tags from a string.  It leaves the image URL as plain text.

+
+$string = strip_image_tags($string);
+
+
+
encode_php_tags()

+
+
This is a security function that converts PHP tags to entities. Note: If you use the XSS filtering function it does this automatically.

+
+$string = encode_php_tags($string);
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html
new file mode 100644
index 00000000..dfe8ae7d
--- /dev/null
+++ b/user_guide/helpers/string_helper.html
@@ -0,0 +1,144 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
String Helper

+
+
The String Helper file contains functions that assist in working with strings.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('string');
+
+
The following functions are available:

+
+
random_string()

+
+
Generates a random string based on the type and length you specify.  Useful for creating passwords or generating random hashes.

+
+
The first parameter specifies the type of string, the second parameter specifies the length.  The following choices are available:

+
+
+
    
+
  • alnum:  Alpha-numeric string with lower and uppercase characters.
    • 
+
  • numeric:  Numeric string.
    • 
+
  • nozero:  Numeric string with no zeros.
    • 
+
  • unique:  Encrypted with MD5 and uniquid(). Note: The length parameter is not available for this type. 
+Returns a fixed length 33 character string.
    • 
+

+
+
Usage example:

+
+echo random_string('alnum', 16);
+
+
+
alternator()

+
+
Allows two or more items to be alternated between, when cycling through a loop.  Example:
+
+for ($i = 0; $i < 10; $i++)

+{

+    echo alternator('string one', 'string two');

+}

+
+
+
You can add as many parameters as you want, and with each each iteration of your loop the next item will be returned.

+
+for ($i = 0; $i < 10; $i++)

+{

+    echo alternator('one', 'two', 'three', 'four', 'five');

+}

+
+
+
Note: To use multiple separate calls to this function simply call the function with no arguments to re-initialize.

+
+
+
+
repeater()

+
Generates repeating copies of the data you submit. Example:

+$string = "\n";

+echo repeater($string, 30);
+
+
The above would generate 30 newlines.

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html
new file mode 100644
index 00000000..61de8ea4
--- /dev/null
+++ b/user_guide/helpers/text_helper.html
@@ -0,0 +1,197 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Text Helper

+
+
The Text Helper file contains functions that assist in working with text.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('text');
+
+
The following functions are available:

+
+
+
word_limiter()

+
+
Truncates a string to the number of words specified.  Example:

+
+
+$str = "Here is a nice text string consisting of eleven words.";

+

+$string = word_limiter($string, 4);


+
+// Returns:  Here is a nice…
+
+
+
The third parameter is an optional suffix added to the string.  By default it add an ellipsis.

+
+
+
character_limiter()

+
+
Truncates a string to the number of characters specified.  It maintains the integrity
+of words so the character count may be slightly more or less then what you specify. Example:

+
+
+$str = "Here is a nice text string consisting of eleven words.";

+

+$string = char_limiter($string, 20);


+
+// Returns:  Here is a nice text string…
+
+
+
The third parameter is an optional suffix added to the string.  By default it add an ellipsis.

+
+
+
+
ascii_to_entities()

+
+
Converts ASCII values to character entities, including high ASCII and MS Word characters that can cause problems when used in a web page,
+so that they can be shown consistently regardless of browser settings or stored reliably in a database.
+There is some dependance on your server's supported character sets, so it may not be 100% reliable in all cases, but for the most
+part it should correctly identify characters outside the normal range (like accented characters). Example:

+
+$string = ascii_to_entities($string);
+
+
+
entities_to_ascii()

+
+
This function does the opposite of the previous one; it turns character entities back into ASCII.

+
+
+
word_censor()

+
+
Enables you to censor words within a text string.  The first parameter will contain the original string.  The
+second will contain an array of words which you disallow.  The third (optional) parameter can contain a replacement value
+for the words.  If not specified they are replaced with pound signs: ####.  Example:

+
+
+$disallowed = array('darn', 'shucks', 'golly', 'phooey');

+

+$string = word_censor($string, $disallowed, 'Beep!');
+
+
+
highlight_code()

+
+
Colorizes a string of code (PHP, HTML, etc.).  Example:

+
+$string = highlight_code($string);
+
+
The function uses PHP's highlight_string() function, so the colors used are the ones specified in your php.ini file.

+
+
+
highlight_phrase()

+
+
Will highlight a phrase within a text string.  The first parameter will contain the original string, the second will
+contain the phrase you wish to highlight.  The third and fourth parameters will contain the opening/closing HTML tags
+you would like the phrase wrapped in.  Example:

+
+
+$str = "Here is a nice text string about nothing in particular.";

+

+$string = highlight_phrase($string, "nice text", '<span style="color:#990000">', '</span>');
+
+
+
The above text returns:

+
+
Here is a nice text string about nothing in particular.

+
+
+
+
word_wrap()

+
+
Wraps text at the specified character count while maintaining complete words.  Example:

+
+$string = "Here is a simple string of text that will help us demonstrate this function.";

+

+echo word_wrap($string, 25);

+

+// Would produce:

+

+Here is a simple string

+of text that will help

+us demonstrate this

+function
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html
new file mode 100644
index 00000000..5e8da4ba
--- /dev/null
+++ b/user_guide/helpers/typography_helper.html
@@ -0,0 +1,129 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Typography Helper

+
+
The Typography Helper file contains functions that help your format text in semantically relevant ways.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('typography');
+
+
The following functions are available:

+
+
+
auto_typography()

+
+
Formats text so that it is semantically and typographically correct HTML.  Takes a string as input and returns it with 
+the following formatting:

+
+
    
+
  • Surrounds paragraphs within <p></p> (looks for double line breaks to identify paragraphs).
    • 
+
  • Single line breaks are converted to <br />, except those that appear within <pre> tags.
    • 
+
  • Block level elements, like <div> tags, are are not wrapped within paragraphs, but their contained text is if it contains paragraphs.
    • 
+
  • Quotes are converted to correctly facing curly quote entities, except those that appear within tags.
    • 
+
  • Apostrophes are converted to curly apostrophy entities.
    • 
+
  • Double dashes (either like -- this or like--this) are converted to em—dashes.
    • 
+
  • Three consecutive periods either preceding or following a word are converted to ellipsis…
    • 
+
  • Double spaces following sentences are converted to non-breaking spaces to mimic double spacing.
    • 
+

+
+
Usage example:

+
+$string = auto_typography($string);
+
+
Note: Typographic formatting can be processor intensive, particularly if you have a lot of content being formatted. 
+If you choose to use this function you may want to consider
+caching your pages.

+
+
+
nl2br_except_pre()

+
+
Converts newlines to <br /> tags unless they appear within <pre> tags. 
+This function is identical to the native PHP nl2br() function, except that it ignores <pre> tags.

+
+
Usage example:

+
+$string = nl2br_except_pre($string);
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html
new file mode 100644
index 00000000..a8f5c14d
--- /dev/null
+++ b/user_guide/helpers/url_helper.html
@@ -0,0 +1,269 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
URL Helper

+
+
The URL Helper file contains functions that assist in working with URLs.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('url');
+
+
The following functions are available:

+
+
site_url()

+
+
Returns your site URL, as specified in your config file.  The index.php file (or whatever you have set as your
+site index_page in your config file) will be added to the URL, as will any URI segments you pass to the function.

+
+
You are encouraged to use this function any time you need to generate a local URL so that your pages become more portable 
+in the event your URL changes.

+
+
Segments can be optionally passed to the function as a string or an array.  Here is a string example:

+
+echo site_url("news/local/123");
+
+
The above example would return something like: http://www.your-site.com/index.php/news/local/123

+
+
Here is an example of segments passed as an array:

+
+
+$segments = array('news', 'local', '123');

+

+echo site_url($segments);
+
+
+
base_url()

+
Returns your site base URL, as specified in your config file.  Example:

+echo base_url();
+
+
+
index_page()

+
Returns your site "index" page, as specified in your config file.  Example:

+echo index_page();
+
+
+
+
anchor()

+
+
Creates a standard HTML anchor link based on your local site URL:

+
+<a href="http://www.your-site.com">Click Here</a>
+
+
The tag has three optional parameters:

+
+anchor(uri segments, text, attributes)
+
+
The first parameter can contain any segments you wish appended to the URL.  As with the site_url() function above,
+segments can be a string or an array. Note: Do not include the base URL.  It will be built as specified in your config file. Include
+only the URI segments you wish appended to the URL.

+
+
The second segment is the text you would like the link to say.  If you leave it blank, the URL will be used.

+
+
The third parameter can contain a list of attributes you would like added to the link.  The attributes can be a simple string or an associative array.

+
+
Here are some examples:

+
+echo anchor(news/local/123, My News);
+
+
Would produce: <a href="http://www.your-site.com/index.php/news/local/123" title="My News">My News</a>

+
+echo anchor(news/local/123, My News, array('title' => 'The best news!'));
+
+
Would produce: <a href="http://www.your-site.com/index.php/news/local/123" title="The best news!">My News</a>

+
+
+
anchor_popup()

+
+
Nearly identical to the anchor() function except that it opens the URL in a new window.  
+
+You can specify JavaScript window attributes in the third parameter to control how the window is opened. If 
+the third parameter is not set it will simply open a new window with your own browser settings.  Here is an example
+with attributes:

+
+
+
+$atts = array(

+              'width'      => '800',

+              'height'     => '600',

+              'scrollbars' => 'yes',

+              'status'     => 'yes',

+              'resizable'  => 'yes',

+              'screenx'    => '0',

+              'screeny'    => '0'

+            );

+

+echo anchor_popup(news/local/123, 'Click Me!', $atts);
+
+
Note: The above attributes are the function defaults so you only need to set the ones that are different from what you need.
+If you want the function to use all of its defaults simply pass an empty array in the third parameter:

+
+echo anchor_popup(news/local/123, 'Click Me!', array());
+
+
+
mailto()

+
+
Creates a standard HTML email link.  Usage example:

+
+echo mailto('me@my-site.com', 'Click Here to Contact Me');
+
+
As with the anchor() tab above, you can set attributes using the third parameter.

+
+
+
safe_mailto()

+
+
Identical to the above function except it writes an obfuscated version of the mailto tag using ordinal numbers
+written with JavaScript to help prevent the email address from being harvested by spam bots.

+
+
+
auto_link()

+
+
Automatically turns URLs and email addresses contained in a string into links.  Example:

+
+$string = auto_link($string);
+
+
The second parameter determines whether URLs and emails are converted or just one or the other.  Default behavior is both
+if the parameter is not specified

+
+
Converts only URLs:

+$string = auto_link($string, 'url');
+
+
Converts only Email addresses:

+$string = auto_link($string, 'email');
+
+
The third parameter determines whether links are shown in a new window.  The value can be TRUE or FALSE (boolean):

+$string = auto_link($string, 'both', TRUE);
+
+
+
url_title()

+
Takes a string as input and creates a human-friendly URL string. This is useful if, for example, you have a blog
+in which you'd like to use the title of your entries in the URL.  Example:

+
+$title = "What's wrong with CSS?";

+

+$url_title = url_title($title);

+

+// Produces:  whats-wrong-with-css
+
+
+
+
The second parameter determines the word delimiter.  By default dashes are used.  Options are:  dash, or underscore:

+
+$title = "What's wrong with CSS?";

+

+$url_title = url_title($title, 'underscore');

+

+// Produces:  whats_wrong_with_css
+
+
+
+
prep_url()

+
This function will add http:// in the event it is missing from a URL.  Pass the URL string to the function like this:

+
+$url = "www.some-site.com";


+$url = prep_url($url);
+
+
+
+
+
redirect()

+
+
Does a "header redirect" to the local URI specified. Just like other functions in this helper, this one is designed
+to redirect to a local URL within your site.  You will not specify the full site URL, but rather simply the URI segments
+to the controller you want to direct to. The function will build the URL based on your config file values.

+
+
The second parameter allows you to choose between the "location" 
+method or the "refresh" method.  Location is faster, but on Windows servers it can sometimes be a problem.  Example:

+
+if ($logged_in == FALSE)

+{

+     redirect('/login/form/', 'refresh');

+}
+
+
Note: In order for this function to work it must be used before anything is outputted
+to the browser since it utilizes server headers.

+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html
new file mode 100644
index 00000000..63e2b73c
--- /dev/null
+++ b/user_guide/helpers/xml_helper.html
@@ -0,0 +1,110 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
XML Helper

+
+
The XML Helper file contains functions that assist in working with XML data.

+
+
+
Loading this Helper

+
+
This helper is loaded using the following code:

+$this->load->helper('xml');
+
+
The following functions are available:

+
+
xml_convert('string')

+
+
Takes a string as input and converts the following reserved XML characters to entities:

+
+

+Ampersands: &

+Less then and greater than characters: < >

+Single and double quotes: '  "

+Dashes: -

+
+
This function ignores ampersands if they are part of existing character entities.  Example:

+
+$string = xml_convert($string);
+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/images/appflowchart.gif b/user_guide/images/appflowchart.gif
new file mode 100644
index 0000000000000000000000000000000000000000..422332c9e21ceb09a535d098407f52effc392baa
GIT binary patch
literal 25276
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
T6G@R3X^|I+kr`=$0RaFz4Q(3T

literal 0
HcmV?d00001

diff --git a/user_guide/images/arrow.gif b/user_guide/images/arrow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9e9c79a79f1e962848ce10853005a144faea2aee
GIT binary patch
literal 123
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
I<-!CK>lfYCw0ubCBI0i05|k4G7ppw3Xo
zb5Z8{SP$`6#6MC>;CaEUBwAkJH2a>{$cGPqEUJ79iU?T>1c!X*CCAnPrHk*N6S<1m3%6w)bd>0l@$f?`}a%<#F_4=4Q;B=4C3r-Jf;4t``3*Y
z?I?l_73B?ZMTc%;7x^!THE=2?mL4{--3q$8>)!cOc`MBpFME}xN+R@ZeT%zdp&l<>
zQ`MA=qZG%}<&r}ZT}u`nG6LwN$6|&`50Qp<@4+q5eqAdnPv~ilVxRBDO52wwE55Xx
zY|LMXK4CyD9FeYwLMJP_s!QPSr>rTv8IdN3J@Im~9ym5&5mP&3Pj_V?(0v%G9`wND
zOWevrM`W@HUM85<;@(TB3`BTOD=Kprxgb?o<#CEU=_6@LZMKSxh_UI_ciUln7Hkz^xHsLJ&cYBELU;S`oSDoA-G{ZWizE2FJ4YH4qjM(TqWGA
zouW}{j<&(z7bHa8OjNCx`fp@5hbL#P#l*}X=!KrLXD|zbN9(^aroDyh7bpp@h%_VH
z!_G(bhq~lEZ!^SOEPP)x9rN=gF4*l$uusibSWxr1)BWj#C-FTUMw(U5BV`pVHQ`9m
z*j1kIfb;TpV0*cAHGL;hP<2r~q9?Kt0{I>p89T1kG~Ij@n&X$Sl~}N5?`GK-<}{qT
z`lv_4`JBZ-y=ie=@X_Oqn^l&3FJt?Hfz`g2878>IxE)gCU231&f9Y$g8cy%I`08iR
z&6I$_$F&~FFXP#fH+E~~U1e_J7{Z1fhO-4r*3`FsQ;KkEteXG9I-k#X)5d+$#$Inm
zJ7$|H5sJc#zBm|vXgX3A)7LiXpX`7s8uYiSo)6se+P0JS-3)T;=y`KSUPqK+9_NdC
z7mGIrnoj_vs%y$Dq)Gqx%9J|RtZ~KqROby1E5q9O=v!S$DhKLqf9n+KG^yjr#CNo6
z+{?xCjJ8h*@jI&H2t_klnVXl-Cj{a0BCG>`(S0qrTQ*ckX
zIY&a&gHyXZU4!Qx_KFJm7`HEh*wg&^%2)Sh@onCNZxqvtnkt74SO9
zfWAZ9Ex)-Osv5IPkdR;`#Q%s?E`n2z&HTR^GJ0

literal 0
HcmV?d00001

diff --git a/user_guide/images/ci_quick_ref.png b/user_guide/images/ci_quick_ref.png
new file mode 100644
index 0000000000000000000000000000000000000000..c07d6b46970bfde2affac0e50644db91414e41c0
GIT binary patch
literal 94476
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

literal 0
HcmV?d00001

diff --git a/user_guide/images/file.gif b/user_guide/images/file.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8141e035765ada7662821335f68ff7d29de5788b
GIT binary patch
literal 370
zcmZ?wbhEHb{^WFOoFJHa>_Wk?kFJGQKd;ak8lf8TQ
z)iyRCJa}m5u3a_tjn7}aOh`(xvvUZGh;sMz{`l!rbZq>ax9@!X0-Rmk0)s;>Ev=uu
zcsXg>j0KCA?%ub*v863DCvU^1E$!XCpFe-;>YGqeQ`b9TQeI(kN_yt@ox8U0+`WF|
z<}KT{=NFX}msJ2A!$2ZX{K>+|z@X2d1JVcb69ZfSf$0SvI#T^7mK1r$Sj_hmI&Q4P
zyY9wnMY*cvxjC`hf1ST9^5^DoD2u0Y1wvKwzT8WPXHXO0qJU~g_|We^Z$5aH?R
z?Ga%R6=GnSI&C_GkR*c`*Sz`j#26&S8CaLESjiwR%)rmPVI%)$24M*Xj-9)9Ge`(B
fa2`B#m_bmA;l#;PC#0CpoxgCw=kgV2M+R#E(SVbV

literal 0
HcmV?d00001

diff --git a/user_guide/images/folder.gif b/user_guide/images/folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fef31a60b2ff00dec181fc27cb2267878e36afaa
GIT binary patch
literal 570
zcmZ?wbhEHb?p5w`Tqng2jwY@F89^E4)=f8xaV)zya^8_!Rg_eFZbEnIkI(!>uNH$6Rm{MXEx
zXS=)iIXjj5`!^pr@VTx1)|@%#O-(a)Y=1p__W3ny?r+=na>dHqB_&(yYB#Q0eRtxd
z_sf>uJaOXpp+jGD^Hyxx@_g~)Ye$d%$j@K2VdIm{o1R%&=Pg-sea4K_d-lAaH}~S?
zNypmScJABvp{aRWL&N5djy+SSo>;T`ep}nEo}OnDCmxJ+|t_C-qG3B-P7B|FkwO`1LM@G4DC}S
zI62w087EF)^O?f3Y?;fn=?m9PbXH(xVA{N8D=PF+VzCqGfJn;p$*7`mUcr-AmEU
eyJE=#gU2VVgM@NA3XTWNU)(OBY{tdHU=0AxnagGX

literal 0
HcmV?d00001

diff --git a/user_guide/images/nav_bg.jpg b/user_guide/images/nav_bg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..440e04ddb406a6f6553ff755135a99777e31d148
GIT binary patch
literal 441
zcmex=C5UDGKfoZ!!JxyS&deytz$D1XEXer(2tzE;
z+02YUS0VrtJ0}+-st{080O$i&PJ}831}4UZLCnIzEMnK#!>4md3Swyae~W#!?^^YX6AMO8Puw(Hyc;7hZ!H>CxI!wx+U+LW&w|K*+%b%MCq+vG0Yry*91L~
jaC@6HoiRDsMTgN>U<0d((*co-+zdc26UaU=_^fFN%4A1V|p(1D);H+XF(6x5S@*!k5_aSq~!K^=ukl3oFr#
mj1WZ$DpAEMmj3oHefc-!Emdo4$gT{c_~odK8J#CbySxCR0v&n)

literal 0
HcmV?d00001

diff --git a/user_guide/images/nav_toggle.jpg b/user_guide/images/nav_toggle.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..531bc2635a35d9a91711a542a62063a7a98b9b29
GIT binary patch
literal 3076
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

literal 0
HcmV?d00001

diff --git a/user_guide/images/transparent.gif b/user_guide/images/transparent.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b7406476aa46e4d98eefacf95f6d3e8c5439e330
GIT binary patch
literal 43
qcmZ?wbh9u|WMp7uXkY+=|Ns9h{$ycf01D`U_#hbuCMF+725SJnmj?g<

literal 0
HcmV?d00001

diff --git a/user_guide/index.html b/user_guide/index.html
new file mode 100644
index 00000000..b0f4bfa3
--- /dev/null
+++ b/user_guide/index.html
@@ -0,0 +1,106 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+

+
+
+
+

+
+

+
+
+
+

+
+
+
+
Welcome to Code Igniter

+
+
Code Igniter is an Application Development Framework - a toolkit - for people who build web sites using PHP.  
+Its goal is to enable you to develop projects must faster than you could if you were writing code 
+from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and
+logical structure to access these libraries. Code Igniter lets you creatively focus on your project by 
+minimizing the amount of code needed for a given task.

+
+
Please read the Introduction section of the User Guide to learn the broad concepts behind Code Igniter, 
+then read the Getting Started page.

+
+
+
Who is Code Igniter For?

+
+
Code Igniter is right for you if:

+
+
    
+
  • You want a framework with a small footprint.
    • 
+
  • You are not interested in large-scale, monolithic libraries, like PEAR.
    • 
+
  • You need broad compatibility with standard  hosting accounts that run a variety of PHP versions and configurations.
    •  
+
  • You want a framework that requires nearly zero configuration.
    • 
+
  • You want a framework that does not require you to use the command line.
    • 
+
  • You do not want to be forced to learn a templating language.
    • 
+
  • You need exceptional performance.
    • 
+
  • You eschew complexity, favoring simple solutions.
    • 
+
  • You need clear, thorough documentation.
    • 
+

+
+
+

+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html
new file mode 100644
index 00000000..df887845
--- /dev/null
+++ b/user_guide/installation/downloads.html
@@ -0,0 +1,97 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Downloading Code Igniter

+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html
new file mode 100644
index 00000000..15e7925b
--- /dev/null
+++ b/user_guide/installation/index.html
@@ -0,0 +1,116 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Installation Instructions

+
+
Code Igniter is installed in four steps:

+
+
    
+
  1. Unzip the package.
    2. 
+
  2. Upload the Code Igniter folders and files to your server.  Normally the index.php file will be at your root.
    3. 
+
  3. Open the application/config/config.php file with a text editor and set your base URL.
    4. 
+
  4. If you intend to use a database, open the application/config/database.php file with a text editor and set your database settings.
    5. 
+

+
+
If you wish to increase security by hiding the location of your Code Igniter files you can rename the system folder
+to something more private.  If you do rename it, you must open your main index.php file and set the $system_folder 
+variable at the top of the page with the new name you've chosen.

+
+
That's it!

+
+
If you're new to Code Igniter, please read the Getting Started section of the User Guide to begin learning how
+to build dynamic PHP applications. Enjoy!

+
+
Troubleshooting

+
+
If you find that no matter what you put in your URL only your default page is loading, it might be that your server 
+does not support the PATH_INFO variable needed to serve search-engine friendly URLs.  
+
+As a first step, open your application/config/config.php file and look for the URI Protocol
+information. It will recommend that you try a couple alternate settings.  If it still doesn't work after you've tried this you'll need
+to force Code Igniter to add a question mark to your URLs.  To do this open your application/config/config.php file and change this:

+
+$config['index_page'] = "index.php";
+
+
To this:

+
+$config['index_page'] = "index.php?";
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html
new file mode 100644
index 00000000..28ee83cb
--- /dev/null
+++ b/user_guide/installation/upgrade_120.html
@@ -0,0 +1,98 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Upgrading From Beta 1.0 to Final 1.2

+
+
To upgrade to Version 1.2 please replace the following directories with the new versions:

+
+
Note: If you have any custom developed files in these folders please make copies of them first.

+
+
    
+
  • drivers
    • 
+
  • helpers
    • 
+
  • init
    • 
+
  • language
    • 
+
  • libraries
    • 
+
  • plugins
    • 
+
  • scaffolding
    • 
+

+
+
Please also replace your local copy of the user guide with the new version.

+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html
new file mode 100644
index 00000000..41de13e7
--- /dev/null
+++ b/user_guide/installation/upgrade_130.html
@@ -0,0 +1,209 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Upgrading from 1.2 to 1.3

+
+
Note: The instructions on this page assume you are running version 1.2.  If you 
+have not upgraded to that version please do so first.

+
+
+
Before performing an update you should take your site offline by replacing the index.php file
+with a static one.

+
+
+
Step 1: Update your Code Igniter files

+
+
Replace the following directories in your "system" folder with the new versions:

+
+
Note: If you have any custom developed files in these folders please make copies of them first.

+
+
    
+
  • application/models/    (new for 1.3)
    • 
+
  • codeigniter     (new for 1.3)
    • 
+
  • drivers
    • 
+
  • helpers
    • 
+
  • init
    • 
+
  • language
    • 
+
  • libraries
    • 
+
  • plugins
    • 
+
  • scaffolding
    • 
+

+
+
+
Step 2: Update your error files

+
+
Version 1.3 contains two new error templates located in application/errors, and for naming consistency the other error templates have
+been renamed.

+
+
If you have not customized any of the error templates simply 
+replace this folder:

+
+
    
+
  • application/errors/
    • 
+

+
+
If you have customized your error templates, rename them as follows:

+
+
+
    
+
  • 404.php   =  error_404.php
    • 
+
  • error.php   =  error_general.php
    • 
+
  • error_db.php   (new)
    • 
+
  • error_php.php   (new)
    • 
+

+
+
+
Step 3: Update your index.php file

+
+
Please open your main index.php file (located at your root).  At the very bottom of the file, change this:

+
+require_once BASEPATH.'libraries/Front_controller'.EXT;
+
+
To this:

+
+require_once BASEPATH.'codeigniter/CodeIgniter'.EXT;
+
+
+
Step 4: Update your config.php file

+
+
Open your application/config/config.php file and add these new items:

+
+
+/*
+|------------------------------------------------
+| URL suffix
+|------------------------------------------------
+|
+| This option allows you to add a suffix to all URLs.
+| For example, if a URL is this:
+|
+| www.your-site.com/index.php/products/view/shoes
+| 
+| You can optionally add a suffix, like ".html",
+| making the page appear to be of a certain type:
+|
+| www.your-site.com/index.php/products/view/shoes.html
+|
+*/
+$config['url_suffix'] = "";
+
+
+/*
+|------------------------------------------------
+| Enable Query Strings
+|------------------------------------------------
+|
+| By default Code Igniter uses search-engine and 
+| human-friendly segment based URLs:
+|
+| www.your-site.com/who/what/where/
+|
+| You can optionally enable standard query string
+| based URLs:
+|
+| www.your-site.com?who=me&what=something&where=here
+|
+| Options are: TRUE or FALSE (boolean)
+|
+| The two other items let you set the query string "words"
+| that will invoke your controllers and functions:
+| www.your-site.com/index.php?c=controller&m=function
+|
+*/
+$config['enable_query_strings'] = FALSE;
+$config['controller_trigger'] = 'c';
+$config['function_trigger'] = 'm';
+

+
+
+
Step 5: Update your database.php file

+
+
Open your application/config/database.php file and add these new items:

+
+
+$db['default']['dbprefix'] = "";
+$db['default']['active_r'] = TRUE;
+

+
+
+
Step 6: Update your user guide

+
+
Please also replace your local copy of the user guide with the new version.

+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html
new file mode 100644
index 00000000..8f7a7408
--- /dev/null
+++ b/user_guide/installation/upgrade_131.html
@@ -0,0 +1,108 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Upgrading from 1.3 to 1.3.1

+
+
Note: The instructions on this page assume you are running version 1.3.  If you 
+have not upgraded to that version please do so first.

+
+
Before performing an update you should take your site offline by replacing the index.php file with a static one.

+
+
+
+
Step 1: Update your Code Igniter files

+
+
Replace the following directories in your "system" folder with the new versions:

+
+
Note: If you have any custom developed files in these folders please make copies of them first.

+
+
    
+
  • drivers
    • 
+
  • init/init_unit_test.php (new for 1.3.1)
    • 
+
  • language/
    • 
+
  • libraries
    • 
+
  • scaffolding
    • 
+

+
+
+
Step 2: Update your user guide

+
+
Please also replace your local copy of the user guide with the new version.

+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html
new file mode 100644
index 00000000..69f22212
--- /dev/null
+++ b/user_guide/installation/upgrade_132.html
@@ -0,0 +1,106 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Upgrading from 1.3.1 to 1.3.2

+
+
Note: The instructions on this page assume you are running version 1.3.1.  If you 
+have not upgraded to that version please do so first.

+
+
Before performing an update you should take your site offline by replacing the index.php file with a static one.

+
+
+
+
Step 1: Update your Code Igniter files

+
+
Replace the following directories in your "system" folder with the new versions:

+
+
Note: If you have any custom developed files in these folders please make copies of them first.

+
+
    
+
  • drivers
    • 
+
  • init
    • 
+
  • libraries
    • 
+

+
+
+
Step 2: Update your user guide

+
+
Please also replace your local copy of the user guide with the new version.

+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html
new file mode 100644
index 00000000..563cbf7b
--- /dev/null
+++ b/user_guide/installation/upgrade_133.html
@@ -0,0 +1,118 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Upgrading from 1.3.2 to 1.3.3

+
+
Note: The instructions on this page assume you are running version 1.3.2.  If you 
+have not upgraded to that version please do so first.

+
+
Before performing an update you should take your site offline by replacing the index.php file with a static one.

+
+
+
+
Step 1: Update your Code Igniter files

+
+
Replace the following directories in your "system" folder with the new versions:

+
+
Note: If you have any custom developed files in these folders please make copies of them first.

+
+
    
+
  • codeigniter
    • 
+
  • drivers
    • 
+
  • helpers
    • 
+
  • init
    • 
+
  • libraries
    • 
+

+
+
+
Step 2: Update your Models

+
+
If you are NOT using Code Igniter's Models feature disregard this step.

+
+
As of version 1.3.3, Code Igniter does not connect automatically to your database when a model is loaded.  This
+allows you greater flexibility in determining which databases you would like used with your models.  If your application is not connecting
+to your database prior to a model being loaded you will have to update your code.  There are several options for connecting, 
+as described here.
+
+
+
Step 3: Update your user guide

+
+
Please also replace your local copy of the user guide with the new version.

+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html
new file mode 100644
index 00000000..7f25c44e
--- /dev/null
+++ b/user_guide/installation/upgrade_140.html
@@ -0,0 +1,111 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Upgrading from 1.3.3 to 1.4.0

+
+
Note: The instructions on this page assume you are running version 1.3.2.  If you 
+have not upgraded to that version please do so first.

+
+
Before performing an update you should take your site offline by replacing the index.php file with a static one.

+
+
+
+
Step 1: Update your Code Igniter files

+
+
Replace the following directories in your "system" folder with the new versions:

+
+
Note: If you have any custom developed files in these folders please make copies of them first.

+
+
    
+
  • application/config/mimes.php
    • 
+
  • codeigniter
    • 
+
  • drivers
    • 
+
  • helpers
    • 
+
  • init
    • 
+
  • language
    • 
+
  • libraries
    • 
+
  • scaffolding
    • 
+

+
+
+
Step 4: Update your user guide

+
+
Please also replace your local copy of the user guide with the new version.

+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html
new file mode 100644
index 00000000..562507a5
--- /dev/null
+++ b/user_guide/installation/upgrade_b11.html
@@ -0,0 +1,150 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Upgrading From Beta 1.0 to Beta 1.1

+
+
To upgrade to Beta 1.1 please perform the following steps:

+
+
Step 1: Replace your index file

+
+
Replace your main index.php file with the new index.php file. Note:  If you have renamed your "system" folder you will need to edit this info in the new file.

+
+
Step 2: Relocate your config folder

+
+
This version of Code Igniter now permits multiple sets of "applications" to all share a common set of backend files. In order to enable
+each application to have its own configuration values, the config directory must now reside 
+inside of your application folder, so please move it there.

+
+
+
Step 3: Replace directories

+
+
Replace the following directories with the new versions:

+
+
    
+
  • drivers
    • 
+
  • helpers
    • 
+
  • init
    • 
+
  • libraries
    • 
+
  • scaffolding
    • 
+

+
+
+
Step 4: Add the calendar language file

+
+
There is a new language file corresponding to the new calendaring class which must be added to your language folder. Add
+the following item to your version: language/english/calendar_lang.php

+
+
+
Step 5: Edit your config file

+
+
The original application/config/config.php file has a typo in it  Open the file and look for the items related to cookies:

+
+$conf['cookie_prefix']	= "";

+$conf['cookie_domain']	= "";

+$conf['cookie_path']	= "/";
+
+
Change the array name from $conf to $config, like this:

+
+$config['cookie_prefix']	= "";

+$config['cookie_domain']	= "";

+$config['cookie_path']	= "/";
+
+
Lastly, add the following new item to the config file (and edit the option if needed):

+
+

+/*

+|------------------------------------------------

+| URI PROTOCOL

+|------------------------------------------------

+|

+| 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 

+| 'query_string'	Uses the QUERY_STRING

+*/

+

+$config['uri_protocol']	= "auto";
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html
new file mode 100644
index 00000000..3ab9fd84
--- /dev/null
+++ b/user_guide/installation/upgrading.html
@@ -0,0 +1,95 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Upgrading From a Previous Version

+
+
Please read the upgrade notes corresponding to the version you are upgrading from.

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html
new file mode 100644
index 00000000..1f72f353
--- /dev/null
+++ b/user_guide/libraries/benchmark.html
@@ -0,0 +1,160 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Benchmarking Class

+
+
Code Igniter has a Benchmarking class that is always active, enabling the time difference between any
+two marked points to be calculated.

+
+
Note: This class is initialized automatically by the system so there is no need to do it manually.

+
+
+
In addition, the benchmark is always started the moment the framework is
+invoked, and ended by the output class right before sending the final view to the browser, enabling a very accurate
+timing of the entire system execution to be shown.

+
+
Using the Benchmark

+
+
The Benchmark class can be used within your controllers,  views, or your  Models.  The process for usage is this:
+
+
    
+
  1. Mark a start point
    2. 
+
  2. Mark an end point
    3. 
+
  3. Run the "elapsed time" function to view the results
    4. 
+

+
+
Here's an example using real code:

+
+$this->benchmark->mark('start');

+

+// Some code happens here

+

+$this->benchmark->mark('end');

+

+echo $this->benchmark->elapsed_time('start', 'end');
+
+
Note: The words "start" and "end" are arbitrary.  They are simply words used to set two markers.  You can
+use any words you want, and you can set multiple sets of markers. Consider this example:

+
+$this->benchmark->mark('dog');

+

+// Some code happens here

+

+$this->benchmark->mark('cat');

+

+// More code happens here

+

+$this->benchmark->mark('bird');

+

+echo $this->benchmark->elapsed_time('dog', 'cat');

+echo $this->benchmark->elapsed_time('cat', 'bird');

+echo $this->benchmark->elapsed_time('dog', 'bird');
+
+
+
Displaying Total Execution Time

+
+
If you would like to display the total elapsed time from the moment Code Igniter starts to the moment the final output
+is sent to the browser, simply place this in one of your view templates:

+
+<?=$this->benchmark->elapsed_time();?>
+
+
You'll notice that it's the same function used in the examples above to calculate the time between two point, except you are 
+not using any parameters.  When the parameters are absent, Code Igniter does not stop the benchmark until right before the final
+output is sent to the browser.  It doesn't matter where you use the function call, the timer will continue to run until the very end.

+
+
An alternate way to show your elapsed time in your view files is to use this pseudo-variable, if you prefer not to use the pure PHP:

+{elapsed_time}
+
+
Note: If you want to benchmark anything within your controller 
+functions you must set your own start/end points.

+
+
Displaying Memory Consumption

+
+
If your PHP installation is configured with --enable-memory-limit, you can display the amount of memory consumed by the entire
+system using the following code in one of your view file:

+
+<?=$this->benchmark->memory_usage();?>
+
Note: This function can only be used in your view files. The consumpiton will reflect the total memory used by the entire app.

+
+
An alternate way to show your memory usage in your view files is to use this pseudo-variable, if you prefer not to use the pure PHP:

+{memory_usage}
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html
new file mode 100644
index 00000000..a3bd87b5
--- /dev/null
+++ b/user_guide/libraries/calendar.html
@@ -0,0 +1,258 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
+
+
Calendaring Class

+
+
The Calendar class enables you to dynamically create calendars. Your calendars can be formatted through the use of a calendar 
+template, allowing 100% control over every aspect of its design. In addition, you can pass data to your calendar cells.

+
+
Initializing the Class

+
+
Like most other classes in Code Igniter, the Calendar class is initialized in your controller using the $this->load->library function:

+
+$this->load->library('calendar');
+
Once loaded, the Calendar object will be available using: $this->calendar

+
+
+
Displaying a Calendar

+
+
Here is a very simple example showing how you can display a calendar:

+
+$this->load->library('calendar');

+

+echo $this->calendar->generate();
+
+
The above code will generate a calendar for the current month/year based on your server time.
+To show a calendar for a specific month and year you will pass this information to the calendar generating function:

+
+$this->load->library('calendar');

+

+echo $this->calendar->generate(2006, 6);
+
+
The above code will generate a calendar showing the month of June in 2006.  The first parameter specifies the year, the second parameter specifies the month.

+
+
Passing Data to your Calendar Cells

+
+
To add data to your calendar cells involves creating an associative array in which the keys correspond to the days
+you wish to populate and the array value contains the data.  The array is passed to the third parameter of the calendar
+generating function.  Consider this example:

+
+$this->load->library('calendar');

+

+$data = array(

+               3  => 'http://your-site.com/news/article/2006/03/',

+               7  => 'http://your-site.com/news/article/2006/07/',

+               13 => 'http://your-site.com/news/article/2006/13/',

+               26 => 'http://your-site.com/news/article/2006/26/'

+             );

+

+echo $this->calendar->generate(2006, 6, $data);
+
+
Using the above example, day numbers 3, 7, 13, and 26 will become links pointing to the URLs you've provided.

+
+
Note: By default it is assumed that your array will contain links. 
+In the section that explains the calendar template below you'll see how you can customize
+how data passed to your cells is handled so you can pass different types of information.

+
+
+
Setting Display Preferences

+
+
There are seven preferences you can set to control various aspects of the calendar.  Preferences are set using an initialization 
+function similar to other classes.  Here is an example:
+
+
+$this->load->library('calendar');

+

+$prefs = array (

+               'start_day'    => 'saturday',

+               'month_type'   => 'long',

+               'day_type'     => 'short'

+             );

+

+$this->calendar->initialize($prefs);

+

+echo $this->calendar->generate();
+
+
The above code would start the calendar on saturday, use the "long" month heading, and the "short" day names.  More information
+regarding preferences below.

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PreferenceDefault ValueOptionsDescription
templateNoneNoneA string containing your calendar template. See the template section below.
local_timetime()NoneA Unix timestamp corresponding to the current time.
start_daysundayAny week day (sunday, monday, tuesday, etc.)Sets the day of the week the calendar should start on.
month_typelonglong, shortDetermines what version of the month name to use in the header. long = January, short = Jan.
day_typeabrlong, short, abrDetermines what version of the weekday names to use in the column headers. long = Sunday, short = Sun, abr = Su.
show_next_prevFALSETRUE/FALSE (boolean)Determines whether to display links allowing you to toggle to next/previous months. See information on this feature below.
next_prev_urlNoneA URLSets the basepath used in the next/previous calendar links.

+
+
+
+
+
Creating a Calendar Template

+
+
By creating a calendar template you have 100% control over the design of your calendar. Each component of your
+calendar will be placed within a pair of pseudo-variables as shown here:

+
+
+$this->load->library('calendar');


+$prefs['template'] = '


+   {table_open}<table border="0" cellpadding="0" cellspacing="0">{/table_open}

+

+   {heading_row_start}<tr>{/heading_row_start}

+

+   {heading_previous_cell}<th><a href="{previous_url}">&lt;&lt;</a></th>{/heading_previous_cell}

+   {heading_title_cell}<th colspan="{colspan}">{heading}</th>{/heading_title_cell}

+   {heading_next_cell}<th><a href="{next_url}">&gt;&gt;</a></th>{/heading_next_cell}

+

+   {heading_row_end}</tr>{/heading_row_end}

+

+   {week_row_start}<tr>{/week_row_start}

+   {week_day_cell}<td>{week_day}</td>{/week_day_cell}

+   {week_row_end}</tr>{/week_row_end}

+

+   {cal_row_start}<tr>{/cal_row_start}

+   {cal_cell_start}<td>{/cal_cell_start}

+

+   {cal_cell_content}<a href="{content}">{day}</a>{/cal_cell_content}

+   {cal_cell_content_today}<div class="highlight"><a href="{content}">{day}</a></div>{/cal_cell_content_today}

+

+   {cal_cell_no_content}{day}{/cal_cell_no_content}

+   {cal_cell_no_content_today}<div class="highlight">{day}</div>{/cal_cell_no_content_today}

+

+   {cal_cell_blank}&nbsp;{/cal_cell_blank}

+

+   {cal_cell_end}</td>{/cal_cell_end}

+   {cal_row_end}<tr>{/cal_row_end}

+

+   {table_close}</table>{/table_close}

+';

+

+$this->calendar->initialize($prefs);

+

+echo $this->calendar->generate();
+
+
+
+
Showing Next/Previous Month Links

+
+
To allow your calendar to dynamically increment/decrement via the next/previous links requires that you set up your calendar
+code similar to this example:

+
+
+$this->load->library('calendar');

+

+$prefs = array (

+               'show_next_prev'  => TRUE,

+               'next_prev_url'   => 'http://www.your-site.com/index.php/calendar/show/'

+             );

+

+$this->calendar->initialize($prefs);

+

+echo $this->calendar->generate($this->uri->segment(3), $this->uri->segment(4));
+
+
You'll notice a few things about the above example:

+
+
    
+
  • You must set the "show_next_prev" to TRUE.
    • 
+
  • You must supply the URL to the controller containing your calendar in the "next_prev_url" preference.
    • 
+
  • You must supply the "year" and "month" to the calendar generating function via the URI segments where they appear (Note:  The calendar class automatically adds the year/month to the base URL you provide.).
    • 
+

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html
new file mode 100644
index 00000000..c173f569
--- /dev/null
+++ b/user_guide/libraries/config.html
@@ -0,0 +1,158 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Config Class

+
+
The Config class provides a means to retrieve configuration preferences.  These preferences can
+come from the default config file (application/config/config.php) or from your own custom config files.

+
+
Note: This class is initialized automatically by the system so there is no need to do it manually.

+
+
+
Anatomy of a Config File

+
+
By default, Code Igniter has a one primary config file, located at application/config/config.php.  If you open the file using
+your text editor you'll see that config items are stored in an array called $config.

+
+
You can add your own config items to
+this file, or if you prefer to keep your configuration items separate (assuming you even need config items), 
+simply create your own file and save it in config folder.

+
+
Note: If you do create your own config files use the same format as the primary one, storing your items in
+an array called  $config. Code Igniter will intelligently manage these files so there will be no conflict even though
+the array has the same name (assuming an array index is not named the same as another).

+
+
Loading a Config File

+
+
Note: Code Igniter automatically loads the primary config file (application/config/config.php), 
+so you will only need to load a config file if you have created your own.

+
+
There are two ways to load a config file:

+
+
  1. Manual Loading
+
+
    To load one of your custom config files you will use the following function within the controller that needs it:
    
+
+$this->config->load('filename');
+
+
    Where filename is the name of your config file, without the .php file extension.
    
+
+
    2. 
+
  2. Auto-loading
    3. 
+
+
    If you find that you need a particular config file globally, you can have it loaded automatically by the system.  To do this,
+open the autoload.php file, located at application/config/autoload.php, and add your config file as
+indicated in the file.
    
+
+

+
+
+
Fetching Config Items

+
+
To retrive an item from your config file, use the following function:

+
+$this->config->item('item name');
+
+
Where item name is the $config array index you want to retrieve. For example, to fetch your language choice you'll do this:

+
+$lang = $this->config->item('language');
+
+
The function returns FALSE (boolean) if the item you are trying to fetch does not exist.

+
+
Setting a Config Item

+
+
If you would like to dynamically set a config item or change an existing one, you can so so using:

+
+$this->config->set_item('item_name', 'item_value');
+
+
Where item_name is the $config array index you want to change, and item_value is its value.

+
+
+
Helper Functions

+
+
The config class has the following helper functions:

+
+
$this->config->site_url();

+
This function retrieves the URL to your site, along with the "index" value you've specified in the config file.

+
+
$this->config->system_url();

+
This function retrieves the URL to your system folder.

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/database/active_record.html b/user_guide/libraries/database/active_record.html
new file mode 100644
index 00000000..8fc3b813
--- /dev/null
+++ b/user_guide/libraries/database/active_record.html
@@ -0,0 +1,610 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
Active Record Class

+
+
+
Code Igniter uses a modified version of the Active Record Database Pattern.  
+This pattern allows information to be retrieved, inserted, and updated in your database with minimal scripting. 
+In some cases only one or two lines of code are necessary to perform a database action.  
+Code Igniter does not require that each database table be its own class file.  It instead provides a more simplified interface.

+
+
Beyond simplicity, a major benefit to using the Active Record features is that it allows you to create database independent applications, since the query syntax
+is generated by each database adapter.  It also allows for safer queries, since the values are escaped automatically by the system.

+
+
Note:  If you intend to write your own queries you can disable this class in your database config file, allowing the core database library and adapter to utilize fewer resources.

+
+

+
+
+
+
+
+
+ 
+
Selecting Data

+
+
The following functions allow you to build SQL SELECT statements.

+
+
Note: If you are using PHP 5 you can use method chaining for more compact syntax. This is described at the end of the page.

+
+
+
$this->db->get();

+
+
Runs the selection query and returns the result.  Can be used by itself to retrieve all records from a table:

+
+$query = $this->db->get('mytable');

+

+// Produces: SELECT * FROM mytable
+
+
The second and third parameters enable you do set a limit and offset clause:

+
+$query = $this->db->get('mytable', 10, 20);

+

+// Produces: SELECT * FROM mytable LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)
+
+
+
+
You'll notice that the above function is assigned to a variable named $query, which can be used to show the results:

+
+$query = $this->db->get('mytable');

+

+foreach ($query->result() as $row)

+{

+    echo $row->title;

+}
+
+
Please visit the result functions page for a full discussion regarding result generation.

+
+
+
$this->db->getwhere();

+
+
Identical to the above function except that it permits you to add a "where" clause in the second parameter,
+instead of using the db->where() function:

+
+$query = $this->db->getwhere('mytable', array(id => $id), $limit, $offset);
+
+
Please read the about the where function below for more information.

+
+
+
$this->db->select();

+
+
Permits you to write the SELECT portion of your query:

+
+
+$this->db->select('title, content, date');

+

+$query = $this->db->get('mytable');

+

+// Produces: SELECT title, content, date FROM mytable
+
+
Note: If you are selecting all (*) from a table you do not need to use this function.  When omitted, Code Igniter assumes you wish to SELECT *

+
+
+
$this->db->from();

+
+
Permits you to write the FROM portion of your query:

+
+
+$this->db->select('title, content, date');

+$this->db->from('mytable');

+

+$query = $this->db->get();

+

+// Produces: SELECT title, content, date FROM mytable
+
+
Note: As shown earlier, the FROM portion of your query can be specified in the $this->db->get() function, so use whichever method
+you prefer.

+
+
$this->db->join();

+
+
Permits you to write the JOIN portion of your query:

+
+
+$this->db->select('*');

+$this->db->from('blogs');

+$this->db->join('comments', 'comments.id = blogs.id');

+

+$query = $this->db->get();

+

+// Produces: 

+// SELECT * FROM blogs

+// JOIN comments ON comments.id = blogs.id

+
+
+
Multiple function calls can be made if you need several joins in one query.

+
+
If you need something other than a natural JOIN you can specify it via the third parameter of the function.  
+Options are: left, right, outer, inner, left outer, and right outer.

+
+
+$this->db->join('comments', 'comments.id = blogs.id', 'left');

+

+// Produces: LEFT JOIN comments ON comments.id = blogs.id
+
+
+
+
+
+
$this->db->where();

+
This function enables you to set WHERE clauses using one of four methods:

+
+
Note: All values passed to this function are escaped automatically, producing safer queries.

+
+
    
+	
  1. Simple key/value method:
+
+	$this->db->where('name', $name);
+	

    // Produces: WHERE name = 'Joe'
+	    
+	
+	
    Notice that the equal sign is added for you.
    
+	
+	
    If you use multiple function calls they will be chained together with AND between them:
    
+	
+	$this->db->where('name', $name);
    
+	$this->db->where('title', $title);
    
+	$this->db->where('status', $status);
+	

    // WHERE = 'Joe' AND title = 'boss' AND status = 'active'
+	    
+	
+
+	
    2. 
+	
+	
  2. Custom key/value method:
+	
+	
    You can include an operator in the first parameter in order to to control the comparison:
    
+	
+	$this->db->where('name !=', $name);
    
+	$this->db->where('id <', $id);
+	

    // Produces: WHERE name != 'Joe' AND id < 45
+	    
+
+
+	
+	
    3. 
+	
  3. Associative array method:
+
+
+	
+	$array = array('name' => $name, 'title' => $title, 'status' => $status);

    
+	
+	$this->db->where($array);
+	

    // Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
+	    
+
+	
    You can include your own operators using this method as well:
    
+
+	
+	$array = array('name !=' => $name, 'id <' => $id, 'date >' => $date);

    
+	
+	$this->db->where($array);    
+
+	
    4. 
+		
  4. Custom string:
+		
+		
    You can write your own clauses manually:
    
+
+		
+		$where = "name='Joe' AND status='boss' OR status='active'";

    
+		$this->db->where($where);    
+
+	
    5. 
+

+
+
+
$this->db->orwhere();

+
This function is identical to the one above, except that multiple instances are joined by OR:

+
+
+$this->db->where('name !=', $name);

+$this->db->orwhere('id >', $id);
+

// Produces: WHERE name != 'Joe' OR id > 50
+
+	
+	
+	
+
+
$this->db->like();

+
This function enables you to generate LIKE clauses, useful for doing searches.

+
+
Note: All values passed to this function are escaped automatically.

+
+
+
    
+	
  1. Simple key/value method:
+
+	$this->db->like('title', $match);
+	

    // Produces: WHERE title LIKE '%match%'
+	    
+		
+	
    If you use multiple function calls they will be chained together with AND between them:
    
+	
+	$this->db->like('title', $match);
    
+	$this->db->like('body', $match);
+	

    // WHERE title LIKE '%match%' AND  body LIKE '%match%'
+	    
+	
+	
    2. 
+	
+	
  2. Associative array method:
+
+	
+	$array = array('title' => $match, 'page1' => $match, 'page2' => $match);

    
+	
+	$this->db->like($array);
+	

    // WHERE title LIKE '%match%' AND  page1 LIKE '%match%' AND  page2 LIKE '%match%'
+	    
+
+	
    3. 
+

+	
+	
+
$this->db->orlike();

+
This function is identical to the one above, except that multiple instances are joined by OR:

+
+
+$this->db->like('title', $match);

+$this->db->orlike('body', $match);
+

// WHERE title LIKE '%match%' OR  body LIKE '%match%'
+
+
+
+
+	
+
$this->db->groupby();

+
+
Permits you to write the GROUP BY portion of your query:

+	
+$this->db->groupby("title");
+

// Produces: GROUP BY title
+
+
+
You can also pass an array of multiple values as well:

+	
+$this->db->groupby(array("title", "date");
+

// Produces: GROUP BY title, date
+
+	
+		
+
$this->db->having();

+
+
Permits you to write the HAVING portion of your query:

+	
+$this->db->having('user_id = 45');
+

// Produces: HAVING 'user_id = 45'
+
+	
+
You can also pass an array of multiple values as well:

+
+
+$this->db->having(array('title =' => 'My Title', 'id <' => $id));
+

// Produces: HAVING title = 'My Title', 'id < 45'
+
+
+	
+	
+
$this->db->orderby();

+
Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. 
+The second parameter lets you set the direction of the result.  Options are asc or desc

+	
+$this->db->orderby("title", "desc");
+

// Produces: ORDER BY title DESC
+
+
+
You can also pass your own string in the first parameter:

+	
+$this->db->orderby('title desc, name asc');
+

// Produces: ORDER BY title DESC, name ASC
+
+	
+
+
+
$this->db->limit();

+
Lets you limit the number of rows you would like returned by the query:
+
+
+$this->db->limit(10);

+

+// Produces: LIMIT 10
+
+
+
The second parameter lets you set a result offset.

+
+
+$this->db->limit(10, 20);

+

+// Produces: LIMIT 20, 10 (in MySQL.  Other databases have slightly different syntax)
+
+
+
$this->db->count_all();

+
+
Permits you to determine the number of rows in a particular table.  Submit the table name in the first parameter. Example:

+
+echo $this->db->count_all('my_table');

+

+// Produces an integer, like 25
+
+
+
+	
+ 
+
Inserting Data

+	
+
$this->db->insert();

+
Generates an insert string based on the data you supply, and runs the query. You can either pass an
+array or an object to the function.  Here is an example using an array:

+
+
+$data = array(

+               'title' => $title,

+               'name' => $name,

+               'date' => $date

+            );

+

+$this->db->insert('mytable', $data);
+


+// Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')
+
+
The first parameter will contain the table name, the second is an associative array of values.

+
+
Here is an example using an object:

+
+
+/*

+    class Myclass {

+        var = $title = 'My Title';

+        var = $content = 'My Content';

+        var = $date = 'My Date';

+    }

+*/

+

+$object = new Myclass;

+

+$this->db->insert('mytable', $object);
+


+// Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')
+
+
The first parameter will contain the table name, the second is an associative array of values.

+
+
Note: All values are escaped automatically producing safer queries.

+	
+	
+	
+
+
$this->db->set();

+
This function enables you to set values for inserts or updates.

+
+
It can be used instead of passing a data array directly to the insert or update functions: 

+
+$this->db->set('name', $name);
+

+$this->db->insert('mytable');
+


+// Produces: INSERT INTO mytable (name) VALUES ('{$name}')
+
+
If you use multiple function called they will be assembled properly based on whether you are doing an insert or an update:

+
+$this->db->set('name', $name);

+$this->db->set('title', $title);

+$this->db->set('status', $status);

+$this->db->insert('mytable');
+
+
+
You can also pass an associative array to this function:

+
+
+$array = array('name' => $name, 'title' => $title, 'status' => $status);


+
+$this->db->set($array);

+$this->db->insert('mytable');
+
+
+
Or an object:

+
+
+
+/*

+    class Myclass {

+        var = $title = 'My Title';

+        var = $content = 'My Content';

+        var = $date = 'My Date';

+    }

+*/

+

+$object = new Myclass;

+

+$this->db->set($object);

+$this->db->insert('mytable');
+
+
+
+	
+ 
+
Updating Data

+	
+
$this->db->update();

+
Generates an update string and runs the query based on the data you supply.  You can pass an
+array or an object to the function. Here is an example using
+an array:

+
+
+$data = array(

+               'title' => $title,

+               'name' => $name,

+               'date' => $date

+            );

+

+$this->db->where('id', $id);

+$this->db->update('mytable', $data);
+


+// Produces:

+// UPDATE mytable 

+// SET title = '{$title}', name = '{$name}', date = '{$date}'

+// WHERE id = $id
+
+
Or you can supply an object:

+
+
+/*

+    class Myclass {

+        var = $title = 'My Title';

+        var = $content = 'My Content';

+        var = $date = 'My Date';

+    }

+*/

+

+$object = new Myclass;

+

+$this->db->where('id', $id);

+$this->db->update('mytable', $object, $where);
+


+// Produces:

+// UPDATE mytable 

+// SET title = '{$title}', name = '{$name}', date = '{$date}'

+// WHERE id = $id
+
+
+
+
Note: All values are escaped automatically producing safer queries.

+	
+
You'll notice the use of the $this->db->where() function, enabling you to set the WHERE clause.
+You can optionally pass this information directly into the update function as a string:

+
+$this->db->update('mytable', $data, "id = 4");
+
+
Or as an array:

+
+$this->db->update('mytable', $data, array('id' => $id));
+	
+
You may also use the $this->db->set() function described above when performing updates.

+
+	
+ 
+
Deleting Data

+
+
+	
+
$this->db->delete();

+
Generates a delete SQL string and runs the query.

+
+
+$this->db->delete('mytable', array('id', $id));
+


+// Produces:

+// DELETE FROM mytable 

+// WHERE id = $id
+
+
The first parameter is the table name, the second is the where clause. You can also use the where() or orwhere() functions instead of passing 
+the data to the second parameter of the function:
+
+
+$this->db->where('id', $id);

+$this->db->delete('mytable');
+


+// Produces:

+// DELETE FROM mytable 

+// WHERE id = $id
+
+
Note: All values are escaped automatically producing safer queries.

+
+
+ 
+
Method Chaining

+
+
Method chaining allows you to simplify your syntax by connecting multiple functions.  Consider this example:

+
+
+$this->db->select('title')->from('mytable')->where('id', $id)->limit(10, 20);

+

+$query = $this->db->get();
+
+
Note: Method chaining only works with PHP 5.

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/database/call_function.html b/user_guide/libraries/database/call_function.html
new file mode 100644
index 00000000..9c860a42
--- /dev/null
+++ b/user_guide/libraries/database/call_function.html
@@ -0,0 +1,123 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+
+

+
+
+
+

+
+
Custom Function Calls

+
+
$this->db->call_function();

+
+
This function enables you to call PHP database functions that are not natively included in Code Igniter, in a platform independent manner. 
+For example, lets say you want to call the mysql_get_client_info() function, which is not natively supported 
+by Code Igniter.  You could do so like this:
+

+
+$this->db->call_function('get_client_info');
+
+
You must supply the name of the function, without the mysql_ prefix, in the first parameter.  The prefix is added
+automatically based on which database driver is currently being used.  This permits you to run the same function on different database platforms.  
+Obviously not all function calls are identical between platforms, so there are limits to how useful this function can be in terms of portability.

+
+
Any parameters needed by the function you are calling will be added to the second parameter.

+
+$this->db->call_function('some_function', $param1, $param2, etc..);
+
+
+
Often, you will either need to supply a database connection ID or a database result ID.  The connection ID can be accessed using:

+
+$this->db->conn_id;
+
+
The result ID can be accessed from within your result object, like this:

+
+$query = $this->db->query("SOME QUERY");

+

+$query->result_id;
+
+
+
+
+
+
+
+
+
+
+
+	
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/database/configuration.html b/user_guide/libraries/database/configuration.html
new file mode 100644
index 00000000..4b7d2a8a
--- /dev/null
+++ b/user_guide/libraries/database/configuration.html
@@ -0,0 +1,144 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
Database Configuration

+
+
Code Igniter has a config file that lets you store your database connection values (username, password, database name, etc.).  
+The config file is located at:
+
+
application/config/database.php

+
+
The config settings are stored in a multi-dimensional array with this prototype:

+
+$db['default']['hostname'] = "localhost";

+$db['default']['username'] = "root";

+$db['default']['password'] = "";

+$db['default']['database'] = "database_name";

+$db['default']['dbdriver'] = "mysql";

+$db['default']['dbprefix'] = "";

+$db['default']['pconnect'] = TRUE;

+$db['default']['db_debug'] = FALSE;

+$db['default']['active_r'] = TRUE;
+
+
The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store 
+multiple sets of connection values.  If, for example,  you run multiple environments (development, production, test, etc.) 
+under a single installation, you can set up a connection group for each, then switch between groups as needed.
+For example, to set up a "test" environment you would do this:

+
+$db['test']['hostname'] = "localhost";

+$db['test']['username'] = "root";

+$db['test']['password'] = "";

+$db['test']['database'] = "database_name";

+$db['test']['dbdriver'] = "mysql";

+$db['test']['dbprefix'] = "";

+$db['test']['pconnect'] = TRUE;

+$db['test']['db_debug'] = FALSE;

+$db['test']['active_r'] = TRUE;
+
+ 
+
Then, to globally tell the system to use that group you would set this variable located in the config file:

+
+$active_group = "test";
+
+
Note: The name "test" is arbitrary.  It can be anything you want. By default we've used the word "default"
+for the primary connection, but it too can be renamed to something more relevant to your project.

+
+
Explanation of Values:

+
+
    
+
  • hostname - The hostname of your database server. Often this is "localhost".
    •  
+
  • 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, postgre, obdc, etc. Must be specified in lower case.
    •  
+
  • dbprefix - An optional table prefix which will added to the table name when running Active Record queries.  This permits multiple Code Igniter installations to share one database.
    •  
+
  • pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
    •  
+
  • db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
    •  
+
  • active_r - TRUE/FALSE (boolean) - Whether to load the Active Record Class. If you are not using the active record class you can have it omitted when the database classes are initialized in order to utilize less resources.
    •  
+

+
+
Note: Depending on what database platform you are using (MySQL, Postgre, etc.)
+not all values will be needed.  For example, when using SQLite you will not need to supply a username or password, and
+the database name will be the path to your database file. The information above assumes you are using MySQL.

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/database/connecting.html b/user_guide/libraries/database/connecting.html
new file mode 100644
index 00000000..7bf93c30
--- /dev/null
+++ b/user_guide/libraries/database/connecting.html
@@ -0,0 +1,172 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
Connecting to your Database

+
+
There are two ways to connect to a database:

+
+
Automatically Connecting

+
+
The "auto connect" feature will load and instantiate the database class with every page load. 
+To enable "auto connecting", add the word database to the core array, as indicated in the following file:

+
+
application/config/autoload.php

+
+
Manually Connecting

+
+
If only some of your pages require database connectivity you can manually connect to your database by adding this 
+line of code in any function where it is needed, or in your class constructor to make the database 
+available globally in that class.

+
+$this->load->database();
+
+
If the above function does not contain any information in the first parameter it will connect 
+to the group specified in your database config file. For most people, this is the preferred method of use.

+
+
+
The first parameter of this function can optionally be used to specify a particular database group
+from your config file, or you can even submit connection values for a database that is not specified in your config file.
+Examples:

+
+
To choose a specific group from your config file you can do this:

+
+$this->load->database('group_name');
+
+
Where group_name is the name of the connection group from your config file.

+
+
+
To connect manually to a desired database you can pass an array of values:

+
+$config['hostname'] = "localhost";

+$config['username'] = "myusername";

+$config['password'] = "mypassword";

+$config['database'] = "mydatabase";

+$config['dbdriver'] = "mysql";

+$config['dbprefix'] = "";

+$config['pconnect'] = FALSE;

+$config['db_debug'] = TRUE;

+$config['active_r'] = TRUE;

+

+$this->load->database($config);
+
+
For information on each of these values please see the configuration page.
+
+
Or you can submit your database values as a Data Source Name. DSNs must have this prototype:
+
+$dsn = 'dbdriver://username:password@hostname/database';

+

+$this->load->database('$dsn');
+
+
Note that if you use a DSN you will not be able to specify some of the default values like you can if you use a connection array.

+
+
+
+
+
Connecting to Multiple Databases

+
+
If you need to connect to more than one database simultaneously you can do so as follows:

+
+
+$DB1 = $this->load->database('group_one', TRUE);

+$DB2 = $this->load->database('group_two', TRUE);
+
+
+
Note: Change the words "group_one" and "group_two" to the specific group names you are connecting to (or 
+you can pass the connection values as indicated above).

+
+
By setting the second parameter to TRUE (boolean) the function will return the database object.

+
+

+
When you connect this way, you will use your object name to issue commands rather than the syntax used throughout this guide.  In other words, rather than issuing commands with:

+
+
$this->db->query();
$this->db->result();
 etc...

+
+
You will instead use:

+
+
$DB1->query();
$DB1->result();
 etc...

+
+

+
+
+
+	
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/database/examples.html b/user_guide/libraries/database/examples.html
new file mode 100644
index 00000000..e738ba82
--- /dev/null
+++ b/user_guide/libraries/database/examples.html
@@ -0,0 +1,183 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
Database Quick Start: Example Code

+
+
The following page contains example code showing how the database class is used.  For complete details please
+read the individual pages describing each function.

+
+
+
Initializing the Database Class

+
+
The following code loads and initializes the database class based on your configuration settings:

+
+$this->load->database();
+
+
Once loaded the class is ready to be used as described below.

+
+
Note: If all your pages require database access you can connect automatically.  See the connecting page for details.

+
+
+
Standard Query With Multiple Results (Object Version)

+
+$query = $this->db->query('SELECT name, title, email FROM my_table');

+

+foreach ($query->result() as $row)

+{

+    echo $row->title;

+    echo $row->name;

+    echo $row->email;

+}

+

+echo 'Total Results: ' . $query->num_rows();
+
+
+
The above result() function returns an array of objects.  Example:  $row->title

+
+
+
Standard Query With Multiple Results (Array Version)

+
+$query = $this->db->query('SELECT name, title, email FROM my_table');

+

+foreach ($query->result_array() as $row)

+{

+    echo $row['title'];

+    echo $row['name'];

+    echo $row['email'];

+}
+
+
The above result_array() function returns an array of standard array indexes.  Example:  $row['title']

+
+
+
Standard Query With Single Result

+
+$query = $this->db->query('SELECT name FROM my_table LIMIT 1');

+

+$row = $query->row();

+echo $row->name;

+
+
+
+
Standard Insert

+
+
+$sql = "INSERT INTO mytable (title, name) 

+        VALUES (".$this->db->escape($title).", ".$this->db->escape($name).")";

+

+$this->db->query($sql);

+

+echo $this->db->affected_rows();
+
+
+
+
+
+
Active Record Query

+
+
The Active Record Pattern gives you a simplified means of retrieving data:

+
+
+$query = $this->db->get('table_name');

+

+foreach ($query->result() as $row)

+{

+    echo $row->title;

+}
+	
+
+
Active Record Insert

+
+
+$data = array(

+               'title' => $title,

+               'name' => $name,

+               'date' => $date

+            );

+

+$this->db->insert('mytable', $data);
+


+// Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/database/fields.html b/user_guide/libraries/database/fields.html
new file mode 100644
index 00000000..dd2def9a
--- /dev/null
+++ b/user_guide/libraries/database/fields.html
@@ -0,0 +1,144 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
Field Data

+
+
+
Retrieving Field Names

+
Sometimes it's helpful to gather the field names.

+
+
$this->db->field_names();

+
Returns an array containing the field names.  You must supply the table name to the function:

+
+
+$fields = $this->db->field_names('table_name');


+
+foreach ($fields as $field)

+{

+   echo $field;

+}
+
+
+
+
+
Retrieving Field MetaData

+
Sometimes it's helpful to gather the field names or other metadata, like the column type, max length, etc.

+
+
$this->db->field_data();

+
Returns an array of objects containing field information.

+
+
Note: Not all databases provide meta-data.

+
+
Usage example:

+
+
+$fields = $this->db->field_data('table_name');


+
+foreach ($fields as $field)

+{

+   echo $field->name;

+   echo $field->type;

+   echo $field->max_length;

+   echo $field->primary_key;

+}
+
+
+
If you have run a query already you can use the result oject instead of supplying the table name:

+
+
+$query = $this->db->query("YOUR QUERY");

+$fields = $query->field_data();
+
+
+
+
The following data is available from this function if supported by your database:

+
+
    
+
  • name - column name
    • 
+
  • max_length - maximum length of the column
    • 
+
  • primary_key - 1 if the column is a primary key
    • 
+
  • type - the type of the column
    • 
+

+
+
+
+	
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/database/index.html b/user_guide/libraries/database/index.html
new file mode 100644
index 00000000..a8e7c8e7
--- /dev/null
+++ b/user_guide/libraries/database/index.html
@@ -0,0 +1,99 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
The Database Class

+
+
Code Igniter comes with a full-featured and very fast abstracted database class that supports both traditional
+structures and Active Record patterns. The database functions offer clear, simple syntax.

+
+	
+	
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/database/queries.html b/user_guide/libraries/database/queries.html
new file mode 100644
index 00000000..57fd916e
--- /dev/null
+++ b/user_guide/libraries/database/queries.html
@@ -0,0 +1,180 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+
+
+

+
+
+
+

+
+
+
Queries

+
+
To submit a query, use the following function:

+
+$this->db->query('YOUR QUERY HERE');
+
+
The query() function returns a database result object 
+which you can use to show your results. You will typically assign the query to your own variable, like this:

+
+$query = $this->db->query('YOUR QUERY HERE');
+
+
+
Escaping Queries

+
+
It's a very good security practice to escape your data before sumbiting it into your database. 
+Code Igniter has two functions that help you do this:

+
+
    
+
+
  1. $this->db->escape() This function determines the data type so that it 
+can escape only string data.  It also automatically adds single quotes around the data so you don't have to:
+
+$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";
+
+
+
  2. $this->db->escape_str()  This function escapes the data passed to it, regardless of type.  
+Most of the time you'll use the above function rather then this one. Use the function like this:
+
+$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')";
+
+
+
    3. 
+

+
+
+
+

Query Bindings

+
+
+
Bindings enable you to simplify your query syntax by letting the system put the queries together for you. Consider the following example:

+
+
+$sql = "SELECT * FROM some_table WHERE id = ? AND status = ? AND author = ?";
+


+$this->db->query($sql, array(3, 'live', 'Rick'));
+
+
+
The question marks in the query are automatically replaced with the values in the array in the second parameter of the query function.

+
The secondary benefit of using binds is that the values are automatically escaped, producing safer queries.  You don't have to remember to manually escape data; the engine does it automatically for you.

+
+
+
+

Query Helper Functions

+
+
+
$this->db->last_query();

+
+
Returns the last query that was run (the query string, not the result).  Example:

+
+$str = $this->db->last_query();

+

+// Produces:  SELECT * FROM sometable....
+
+
+
+
The following two functions help simplify the process of writing database INSERTs and UPDATEs.

+
+
+
$this->db->insert_string(); 

+
This function simplifies the process of writing database inserts. It returns a correctly formatted SQL insert string. Example:

+
+$data = array('name' => $name, 'email' => $email, 'url' => $url);

+

+$str = $this->db->insert_string('table_name', $data);
+
+
+
The first parameter is the table name, the second is an associative array with the data to be inserted.  The above example produces:

+INSERT INTO table_name (name, email, url) VALUES ('Rick', 'rick@your-site.com', 'www.your-site.com')
+
+
+
+
$this->db->update_string(); 

+
This function simplifies the process of writing database updates. It returns a correctly formatted SQL update string. Example:

+
+$data = array('name' => $name, 'email' => $email, 'url' => $url);

+

+$where = "author_id = 1 AND status = 'active'";
+


+$str = $this->db->update_string('table_name', $data, $where);
+
+
+
The first parameter is the table name, the second is an associative array with the data to be inserted, and the third parameter is the "where" clause. The above example produces:

+ UPDATE exp_weblog SET name = 'Rick', email = 'rick@your-site.com', url = 'www.your-site.com' WHERE author_id = 1 AND status = 'active'
+
+	
+	
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/database/results.html b/user_guide/libraries/database/results.html
new file mode 100644
index 00000000..7e6b95d2
--- /dev/null
+++ b/user_guide/libraries/database/results.html
@@ -0,0 +1,235 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+
Query Results

+
+
+
There are several ways to generate query results:

+
+	
result()

+	
+	
This function returns the query result as an array of objects, or FALSE on failure.
+	
+	Typically you'll use this in a foreach loop, like this:

+	
+	
+	$query = $this->db->query("YOUR QUERY");

+	

+	foreach ($query->result() as $row)

+	{

+	   echo $row->title;

+	   echo $row->name;

+	   echo $row->body;

+	}
+
+	
If you run queries that might not produce a result, you are encouraged to test the result first:

+	
+	
+	$query = $this->db->query("YOUR QUERY");

+	

+	if ($query->num_rows() > 0)

+	{

+	   foreach ($query->result() as $row)

+	   {

+	      echo $row->title;

+	      echo $row->name;

+	      echo $row->body;

+	   }

+	}
+	
+
+	
result_array()

+	
+	
This function returns the query result as a pure array, or FALSE on failure.  Typically you'll use this in a foreach loop, like this:

+	
+	$query = $this->db->query("YOUR QUERY");

+	

+	foreach ($query->result_array() as $row)

+	{

+	   echo $row['title'];

+	   echo $row['name'];

+	   echo $row['body'];

+	}
+	
+
+	
row()

+	
+	
This function returns a single result row.  If your query has more than one row, it returns only the first row.  
+	The result is returned as an object.  Here's a usage example:

+	
+	$query = $this->db->query("YOUR QUERY");

+	

+	if ($query->num_rows() > 0)

+	{

+	   $row = $query->row();
+	


+	   echo $row->title;

+	   echo $row->name;

+	   echo $row->body;

+	}
+	
+	
+	
If you want a specific row returned you can submit the row number as a digit in the first parameter:
+	
+	$row = $query->row(5);
+
+
+	
row_array()

+
+	
Identical to the above row() function, except it returns an array.  Example:

+
+	
+	$query = $this->db->query("YOUR QUERY");

+	

+	if ($query->num_rows() > 0)

+	{

+	   $row = $query->row_array();
+	


+	   echo $row['title'];

+	   echo $row['name'];

+	   echo $row['body'];

+	}
+	
+
+	
+	
If you want a specific row returned you can submit the row number as a digit in the first parameter:
+	
+	$row = $query->row_array(5);
+	
+ 
+ 	
In addition, you can walk forward/backwards/first/last through your results using these variations:

+
+

+	$row = $query->first_row()

+	$row = $query->last_row()

+	$row = $query->next_row()

+	$row = $query->previous_row()
+

+
+
By default they return an object unless you put the word "array" in the parameter:

+
+

+	$row = $query->first_row('array')

+	$row = $query->last_row('array')

+	$row = $query->next_row('array')

+	$row = $query->previous_row('array')
+

+
+
+

Query Result Helpers

+
+
The following functions provide useful information when dealing with query results.

+
+
$query->num_rows()

+
The number of rows returned by the query. Note:  $query is the variable that the query was assigned to:

+
+$query = $this->db->query('SELECT * FROM my_table');


+echo $query->num_rows();
+
+
+
$query->num_fields()

+
The number of FIELDS returned by the query.  Make sure to call the function using your query result object:

+
+$query = $this->db->query('SELECT * FROM my_table');


+echo $query->num_fields();
+
+
+
+
$this->db->insert_id()

+
The insert ID number when performing database inserts.

+
+
$this->db->affected_rows()

+
Displays the number of affected rows, when doing "write" type queries (insert, update, etc.).

+
Note:  In MySQL "DELETE FROM TABLE" returns 0 affected rows. The database class has a small hack that allows it to return the
+correct number of affected rows.  By default this hack is enabled but it can be turned off in the database driver file.

+
+
+
$this->db->version()

+
Outputs the database version you are running:

+
+echo $this->db->version();
+
+
+
+	
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/database/table_data.html b/user_guide/libraries/database/table_data.html
new file mode 100644
index 00000000..7d340d4e
--- /dev/null
+++ b/user_guide/libraries/database/table_data.html
@@ -0,0 +1,116 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+
+

+
+
+
+

+
+
Table Data

+
+
These functions let you fetch table information.

+
+
$this->db->tables();

+
+
Returns an array containing the names of all the tables in the database you are currently connected to.  Example:

+
+$tables = $this->db->tables()

+

+foreach ($tables as $table)

+{

+   echo $table;

+}
+
+
+
+
$this->db->table_exists();

+
+
Sometimes it's helpful to know whether a particular table exists before running an operation on it.
+Returns a boolean TRUE/FALSE.  Usage example:

+
+
+if ($this->db->table_exists('table_name'))

+{

+   // some code...

+}
+
+
+
Note:  Replace table_name with the name of the table you are looking for.

+
+
+
+	
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html
new file mode 100644
index 00000000..25f5f4ad
--- /dev/null
+++ b/user_guide/libraries/email.html
@@ -0,0 +1,294 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Email Class

+
+
Code Igniter's robust Email Class supports the following features:

+
+
+
    
+
  • Multiple Protocols: Mail, Sendmail, and SMTP
    • 
+
  • Multiple recipients
    • 
+
  • CC and BCCs
    • 
+
  • HTML or Plaintext email
    • 
+
  • Attachments
    • 
+
  • Word wrapping
    • 
+
  • Priorities
    • 
+
  • BCC Batch Mode, enabling large email lists to be broken into small BCC batches.
    • 
+
  • Email Debugging tools
    • 
+

+
+
+
Sending Email

+
+
Sending email is not only simple, but you can configure it on the fly or set your preferences in a config file.

+
+
Here is a basic example demonstrating how you might send email.  Note:  This example assumes you are sending the email from one of your
+controllers.

+
+$this->load->library('email');

+

+$this->email->from('your@your-site.com', 'Your Name');
	
+$this->email->to('someone@some-site.com'); 

+$this->email->cc('another@another-site.com'); 

+$this->email->bcc('them@their-site.com'); 

+

+$this->email->subject('Email Test');

+$this->email->message('Testing the email class.');	

+

+$this->email->send();

+

+echo $this->email->print_debugger();
+
+
+
+
+
Setting Email Preferences

+
+
There are 17 different preferences available to tailor how your email messages are sent. You can either set them manually
+as described here, or automatically via preferences stored in your config file, described below:

+
+
Preferences are set by passing an array of preference values to the email initialize function.  Here is an example of how you might set some preferences:

+
+$config['protocol'] = 'sendmail';

+$config['mailpath'] = '/usr/sbin/sendmail';

+$config['charset'] = 'iso-8859-1';

+$config['wordwrap'] = TRUE;

+

+$this->email->initialize($config);
+
+
Note: Most of the preferences have default values that will be used if you do not set them.
Setting Email Preferences in your Config File
+
+
If you prefer not to set preferences using the above method, you can instead put them into a config file.
+Simply create a new file called the email.php,  add the $config
+array in that file. Then save the file at config/email.php and it will be used automatically. You
+will NOT need to use the $this->email->initialize() function if you save your preferences in a config file.

+
+
+
+
+
Email Preferences

+
+
The following is a list of all the preferences that can be set when sending email.

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PreferenceDefault ValueOptionsDescription
useragentCode IgniterNoneThe "user agent".
protocolmailmail, sendmail, or smtpThe mail sending protocol.
mailpath/usr/sbin/sendmailNoneThe server path to Sendmail.
smtp_hostNo DefaultNoneSMTP Server Address.
smtp_userNo DefaultNoneSMTP Username.
smtp_passNo DefaultNoneSMTP Password.
smtp_port25NoneSMTP Port.
smtp_timeout5NoneSMTP Timeout (in seconds).
wordwrapTRUETRUE or FALSE (boolean)Enable word-wrap.
wrapchars76 Character count to wrap at.
mailtypetexttext or htmlType of mail. If you send HTML email you must send it as a complete web page.  Make sure you don't have any relative links or relative image paths otherwise they will not work.
charsetutf-8Character set (utf-8, iso-8859-1, etc.).
validateFALSETRUE or FALSE  (boolean)Whether to validate the email address.
priority31, 2, 3, 4, 5Email Priority. 1 = highest.  5 = lowest.  3 = normal.
newline\n"\r\n" or "\n"Newline character. (Use "\r\n" to comply with RFC 822).
bcc_batch_modeFALSETRUE or FALSE (boolean)Enable BCC Batch Mode.
bcc_batch_size200NoneNumber of emails in each BCC batch.

+
+
+
Email Function Reference

+
+
$this->email->from()

+
Sets the email address and name of the person sending the email:

+$this->email->from('you@your-site.com', 'Your Name');
+
+
$this->email->reply_to()

+
Sets the reply-to address.  If the information is not provided the information in the "from" function is used. Example:

+$this->email->reply_to('you@your-site.com', 'Your Name');
+
+
+
$this->email->to()

+
Sets the email address(s) of the recipient(s).  Can be a single email, a comma-delimited list or an array:

+
+$this->email->to('someone@some-site.com');
+$this->email->to('one@some-site.com, two@some-site.com, three@some-site.com');
+
+$list = array('one@some-site.com, two@some-site.com, three@some-site.com');


+$this->email->to('$list');
+
+
$this->email->cc()

+
Sets the CC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

+
+
$this->email->bcc()

+
Sets the BCC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

+
+
+
$this->email->subject()

+
Sets the email subject:

+$this->email->subject('This is my subject');
+
+
$this->email->message()

+
Sets the email message body:

+$this->email->message('This is my message');
+
+
$this->email->alt_message()

+
Sets the alternative email message body:

+$this->email->alt_message('This is the alternative message');
+
+
This is an optional message string which can be used if you send HTML formatted email.  It lets you specify an alternative
+message with no HTML formatting which is added to the header string for people who do not accept HTML email.  
+If you do not set your own message Code Igniter will extract the message from your HTML email and strip the tags.

+
+
+
+
$this->email->clear()

+
Initializes all the email variables to an empty state.  This function is intended for use if you run the email sending function
+in a loop, permitting the data to be reset between cycles.

+foreach ($list as $name => $address)

+{

+    $this->email->clear();


+	
+    $this->email->to($address);

+    $this->email->from('your@your-site.com');

+    $this->email->subject('Here is your info '.$name);

+    $this->email->message('Hi '.$name.' Here is the info you requested.');

+    $this->email->send();

+}
+
+
+
$this->email->send()

+
The Email sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used
+conditionally.

+
+
+
$this->email->attach()

+
Enables you to send an attachment. Put the file path/name in the first parameter. Note: Use a file path, not a URL.
+For multiple attachments use the function multiple times. For example:

+
+$this->email->attach('/path/to/photo1.jpg');

+$this->email->attach('/path/to/photo2.jpg');

+$this->email->attach('/path/to/photo3.jpg');

+

+$this->email->send();
+
+
+
$this->email->print_debugger()

+
Returns a string containing any server messages, the email headers, and the email messsage.  Useful for debugging.

+
+
+
Overriding Word Wrapping

+
+
If you have word wrapping enabled (recommended to comply with RFC 822) and you have a very long link in your email it can
+get wrapped too, causing it to become un-clickable by the person receiving it.  Code Igniter lets you manually override
+word wrapping within part of your message like this:
+
+The text of your email that

+gets wrapped normally.

+

+{unwrap}http://www.some-site.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}

+

+More text that will be

+wrapped normally.
+
+
Place the item you do not want word-wrappd between: {unwrap} {/unwrap}
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html
new file mode 100644
index 00000000..e24e11df
--- /dev/null
+++ b/user_guide/libraries/encryption.html
@@ -0,0 +1,187 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Encrypt Class

+
+
The Encrypt Class provides two-way data encryption.  It uses a scheme that pre-compiles
+the message using a randomly hashed bitwise XOR encoding scheme, which is then encrypted using
+the Mcrypt library.  If Mcrypt is not available on your server the encoded message will
+still provide a reasonable degree of security for encrypted sessions or other such "light" purposes. 
+If Mcrypt is available, you'll effectively end up with a double-encrypted message string, which should
+provide a very high degree of security.

+
+
+
Setting your Key

+
+
A key is a piece of information that controls the cryptographic process and permits an encrypted string to be decoded. 
+In fact, the key you chose will provide the only means to decode data that was encrypted with that key,
+so not only must you chose the key carefully, you must must never change it if you intend use it for persistent data.

+
+
It goes without saying that you should guard your key carefully.
+Should someone gain access to your key, the data will be easily decoded.  If your server is not totally under your control
+it's impossible to ensure key security so you may want to think carefully before using it for anything
+that requires high security, like storing credit card numbers.

+
+
To take maximum advantage of the encryption algorithm, your key should be 32 characters in length (128 bits).  
+The key should be as random a string as you can concoct, with numbers and uppercase and lowercase letters.  
+Your key should not be a simple text string. In order to be cryptographically secure it 
+needs to be as random as possible.

+
+
Your key can be either stored in your application/config/config.php, or you can design your own 
+storage mechanism and pass the key dynamically when encoding/decoding.

+
+
To save your key to your application/config/config.php, open the file and set:

+$config['encryption_key'] = "YOUR KEY";
+
+
+
Message Length

+
+
It's important for you to know that the encoded messages the encryption function generates will be approximately 2.6 times longer than the original 
+message.  For example, if you encrypt the string "my super secret data", which is 21 characters in length, you'll end up
+with an encoded string that is roughly 55 characters (we say "roughly" because the encoded string length increments in
+64 bit clusters, so it's not exactly linear).  Keep this information in mind when selecting your data storage mechanism.  Cookies,
+for example, can only hold 4K of information.

+
+
+
Initializing the Class

+
+
Like most other classes in Code Igniter, the Encrypt class is initialized in your controller using the $this->load->library function:

+
+$this->load->library('encrypt');
+
Once loaded, the Encrypt library object will be available using: $this->encrypt

+
+
+
$this->encrypt->encode()

+
+
Performs the data encryption and returns it as a string. Example:

+
+$msg = 'My secret message';

+

+$encrypted_string = $this->encrypt->encode($msg);
+
+
You can optionally pass your encryption key via the second parameter if you don't want to use the one in your config file:

+
+
+$msg = 'My secret message';

+$key = 'super-secret-key';

+

+$encrypted_string = $this->encrypt->encode($msg, $key);
+
+
+
$this->encrypt->decode()

+
+
Decrypts an encoded string.  Example:

+
+
+$encrypted_string = 'APANtByIGI1BpVXZTJgcsAG8GZl8pdwwa84';

+

+$plaintext_string = $this->encrypt->decode($encrypted_string);
+
+
+
$this->encrypt->set_cypher();

+
+
Permits you to set an Mcrypt cypher.  By default it uses MCRYPT_RIJNDAEL_256.  Example:
+$this->encrypt->set_cypher('MCRYPT_BLOWFISH');
+
Please visit php.net for a list of  available cyphers.

+
+
If you'd like to manually test whether your server supports Mcrypt you can use:

+echo ( ! function_exists('mcrypt_encrypt')) ? 'Nope' : 'Yup';
+
+
+
$this->encrypt->set_mode();

+
+
Permits you to set an Mcrypt mode.  By default it uses MCRYPT_MODE_ECB.  Example:
+$this->encrypt->set_mode('MCRYPT_MODE_CFB');
+
Please visit php.net for a list of  available modes.

+
+
+
$this->encrypt->sha1();

+
SHA1 encoding function.  Provide a string and it will return a 160 bit one way hash.  Note:  SHA1, just like MD5 is non-decodable. Example:

+$hash = $this->encrypt->sha1('Some string');
+
+
Many PHP installations have SHA1 support by default so if all you need is to encode a hash it's simpler to use the native
+function:

+
+$hash = sha1('Some string');
+
+
If your server does not support SHA1 you can use the provided function.

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html
new file mode 100644
index 00000000..7fabb095
--- /dev/null
+++ b/user_guide/libraries/file_uploading.html
@@ -0,0 +1,429 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
File Uploading Class

+
+
Code Igniter's File Uploading Class permits files to be uploaded.  You can set various 
+preferences, restricting the type and size of the files.

+
+
+
The Process

+
+
Uploading a file involves the following general process:

+
+
+
    
+
  • An upload form is displayed, allowing a user to select a file and upload it.
    • 
+
  • When the form is submitted, the file is uploaded to the destination you specify.
    • 
+
  • Along the way, the file is validated to make sure it is allowed to be uploaded based on the preferences you set.
    • 
+
  • Once uploaded, the user will be shown a success message.
    • 
+

+
+
To demonstrate this process here is brief tutorial. Afterward you'll find reference information.

+
+
Creating the Upload Form

+
+
+
+
Using a text editor, create a form called upload_form.php.  In it, place this code and save it to your applications/views/
+folder:

+
+
+
+
+
You'll notice we are using a form helper to create the opening form tag.  File uploads require a multipart form, so the helper 
+creates the proper syntax for you.  You'll also notice we have an $error variable.  This is so we can show error messages in the event
+the user does something wrong.

+
+
+
The Success Page

+
+
Using a text editor, create a form called upload_success.php.
+In it, place this code and save it to your applications/views/ folder:

+
+
+
+
+
The Controller

+
+
Using a text editor, create a controller called upload.php.  In it, place this code and save it to your applications/controllers/
+folder:

+
+
+
+
+
+
The Upload Folder

+
+
You'll need a destination folder for your uploaded images.  Create a folder at the root of your Code Igniter installation called
+uploads and set its file permissions to 777.

+
+
+
Try it!

+
+
To try your form, visit your site using a URL similar to this one:

+
+www.your-site.com/index.php/upload/
+
+
You should see an upload form. Try uploading an image file (either a jpg, gif, or png). If the path in your 
+controller is correct it should work.

+
+
+
 

+
+
Reference Guide

+
+
+
Initializing the Upload Class

+
+
Like most other classes in Code Igniter, the Upload class is initialized in your controller using the $this->load->library function:

+
+$this->load->library('upload');
+
Once the Upload class is loaded, the object will be available using: $this->upload

+
+
+
Setting Preferences

+
+
Similar to other libraries, you'll control what is allowed to be upload based on your preferences.  In the controller you 
+built above you set the following preferences:

+
+$config['upload_path'] = './uploads/';

+$config['allowed_types'] = 'gif|jpg|png';

+$config['max_size']	= '100';

+$config['max_width']  = '1024';

+$config['max_height']  = '768';

+

+$this->upload->initialize($config);
+
+
The above preferences should be fairly self-explanatory.  Below is a table describing all available preferences.

+
+
+
Preferences

+
+
The following preferences are available.  The default value indicates what will be used if you do not specify that preference.

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PreferenceDefault ValueOptionsDescription
upload_pathNoneNoneThe path to the folder where the upload should be placed.  The folder must be writable and the path can be absolute or relative.
allowed_typesNoneNoneThe mime types corresponding to the types of files you allow to be uploaded.  Usually the file extension can be used as the mime type.  Separate multiple types with a pipe.
overwriteFALSETRUE/FALSE (boolean)If set to true, if a file with the same name as the one you are uploading exists, it will be overwritten. If set to false, a number will be appended to the filename if another with the same name exists.
max_size0NoneThe maximum size (in kilobytes) that the file can be.  Set to zero for no limit. Note:  Most PHP installations have their own limit, as specified in the php.ini file.  Usually 2 MB (or 2048 KB) by default.
max_width0NoneThe maximum width (in pixels) that the file can be.  Set to zero for no limit.
max_height0NoneThe maximum height (in pixels) that the file can be.  Set to zero for no limit.
encrypt_nameFALSETRUE/FALSE (boolean)If set to TRUE the file name will be converted to a random encrypted string. This can be useful if you would like the file saved with a name that can not be discerned by the person uploading it.
remove_spacesTRUETRUE/FALSE (boolean)If set to TRUE, any spaces in the file name will be converted to underscores. This is recommended.

+
+
+
Setting preferences in a config file

+
+
If you prefer not to set preferences using the above method, you can instead put them into a config file.
+Simply create a new file called the upload.php,  add the $config
+array in that file. Then save the file in: config/upload.php and it will be used automatically. You
+will NOT need to use the $this->upload->initialize function if you save your preferences in a config file.

+
+
+
Function Reference

+
+
The following functions are available

+
+
+
$this->upload->do_upload()

+
+
Performs the upload based on the preferences you've set.  Note:  The upload routine expects the file to come from a form field 
+called userfile, and the form must be a "multipart type:

+
+<form method="post" action="some_action" enctype="multipart/form-data" />
+
+
+
$this->upload->display_errors()

+
+
Retrieves any error messages if the do_upload() function returned false.  The function does not echo automatically, it
+returns the data so you can assign it however you need.

+
+
Formatting Errors

+
By default the above function wraps any errors within <p> tags.  You can set your own delimiters like this:

+
+$this->upload->display_errors('<p>', '</p>');
+
+
$this->upload->data()

+
+
This is a helper function that returns an array containing all of the data related to the file you uploaded. 
+Here is the array prototype:

+
+Array

+(

+    [file_name]    => mypic.jpg

+    [file_type]    => image/jpeg

+    [file_path]    => /path/to/your/upload/

+    [full_path]    => /path/to/your/upload/jpg.jpg

+    [raw_name]     => mypic

+    [orig_name]    => mypic.jpg

+    [file_ext]     => .jpg

+    [file_size]    => 22.2

+    [is_image]     => 1

+    [image_width]  => 800

+    [image_height] => 600

+    [image_type]   => jpeg

+    [image_size_str] => width="800" height="200"

+)
+
+
Explanation

+
+
Here is an explanation of the above array items.

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ItemDescription
file_nameThe name of the file that was uploaded including the file extension.
file_typeThe file's Mime type
file_pathThe absolute server path to the file
full_pathThe absolute server path including the file name
raw_nameThe file name without the extension
orig_nameThe original file name.  This is only useful if you use the encrypted name option.
file_extThe file extension with period
file_sizeThe file size in kilobytes
is_imageWhether the file is an image or not.  1 = image. 0 = not.
image_widthImage width.
image_heigthImage height
image_typeImage type.  Typically the file extension without the period.
image_size_strA string containing the width and height.  Useful to put into an image tag.

+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html
new file mode 100644
index 00000000..ae043b53
--- /dev/null
+++ b/user_guide/libraries/image_lib.html
@@ -0,0 +1,669 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Image Manipulation Class

+
+
Code Igniter's Image Manipulation class lets you perform the following actions:

+
+
    
+
  • Image Resizing
    • 
+
  • Thumbnail Creation
    • 
+
  • Image Cropping
    • 
+
  • Image Rotating
    • 
+
  • Image Watermarking
    • 
+

+
+
All three major image libraries are supported:  GD/GD2, NetPBM, and ImageMagick

+
+
Note: Watermarking is only available using the GD/GD2 library. 
+In addition, even though other libraries are supported, GD is required in
+order for the script to calculate the image properties.  The image processing, however, will be performed with the 
+library you specify.

+
+
+
Initializing the Class

+
+
Like most other classes in Code Igniter, the image class is initialized in your controller
+using the $this->load_library function:

+$this->load->library('image_lib');
+
+
Once the library is loaded it will be ready for use.  The image library object you will use to call all functions is: $this->image_lib

+
+
+
Processing an Image

+
+
Regardless of the type of processing you would like to perform (resizing, cropping, rotation, or watermarking), the general process is
+identical. You will set some preferences corresponding to the action you intend to perform, then
+call one of four available processing functions.  For example, to create an image thumbnail you'll do this:

+
+$config['image_library'] = 'GD';

+$config['source_image']	= '/path/to/image/mypic.jpg';

+$config['create_thumb'] = TRUE;

+$config['maintain_ratio'] = TRUE;

+$config['width']		= 75;

+$config['height']	= 50;

+

+$this->image_lib->initialize($config);
+

+

+$this->image_lib->resize();
+
+
The above code tells the image_resize function to look for an image called mypic.jpg
+located in the source_image folder, then create a thumbnail that is 75 X 50 pixels using the GD2 image_library.
+Since the maintain_ratio option is enabled, the thumb will be as close to the target width and 
+height as possible while preserving the original aspect ratio.  The thumbnail will be called mypic_thumb.jpg
+

+
+
Note: In order for the image class to be allowed to do any processing, the
+folder containing the image files must have file permissions of 777.

+
+
+
Processing Functions

+
+
There are four available processing functions:

+
+
    
+
  • $this->image_lib->resize()
    • 
+
  • $this->image_lib->crop()
    • 
+
  • $this->image_lib->rotate()
    • 
+
  • $this->image_lib->watermark()
    • 
+

+
+
These functions return boolean TRUE upon success and FALSE for failure.  If they fail you can retrieve the
+error message using this function:

+
+echo $this->image_lib->display_errors();
+
+
A good practice is use the processing function conditionally, showing an error upon failure, like this:

+
+if ( ! $this->image_lib->resize())

+{

+    echo $this->image_lib->display_errors();

+}
+
+
Note:  You can optionally specify the HTML formatting to be applied to the errors, by submitting the opening/closing
+tags in the function, like this:

+
+$this->image_lib->display_errors('<p>', '</p>');
+
+
+
Preferences

+
+
The 14 available preferences described below allow you to tailor the image processing to suit your needs.

+
+
Note that not all preferences are available for every
+function.  For example, the x/y axis preferences are only available for image cropping. Likewise, the width and height
+preferences have no effect on cropping.  The "availability" column indicates which functions support a given preference.

+
+
Availability Legend:

+
+
    
+
  • R - Image Resizing
    • 
+
  • C - Image Cropping
    • 
+
  • X - Image Rotation
    • 
+
  • W - Image Watermarking
    • 
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PreferenceDefault ValueOptionsDescriptionAvailability
image_libraryGD2GD, GD2, ImageMagick, NetPBMSets the image library to be used.R, C, X, W
library_pathNoneNoneSets the server path to your ImageMagick or NetPBM library.  If you use either of those libraries you must supply the path.R, C, X
source_imageNoneNoneSets the source image name/path.  The path must be a relative or absolute server path, not a URL.R, C, S, W
dynamic_outputFALSETRUE/FALSE (boolean)Determines whether the new image file should be written to disk or generated dynamically.  Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers.R, C, X, W
quality90%1 - 100%Sets the quality of the image. The higher the quality the larger the file size.R, C, X, W
new_imageNoneNoneSets the destination image name/path.  You'll use this preference when creating an image copy. The path must be a relative or absolute server path, not a URL.R
widthNoneNoneSets the width you would like the image set to.R
heightNoneNoneSets the height you would like the image set to.R
create_thumbFALSETRUE/FALSE (boolean)Tells the image processing function to create a thumb.R
thumb_marker_thumbNoneSpecifies the thumbnail indicator.  It will be inserted just before the file extension, so mypic.jpg would become mypic_thumb.jpgR
maintain_ratioTRUETRUE/FALSE (boolean)Specifies whether to maintain the original aspect ratio when resizing or use hard values.R
master_dimautoauto, width, heightSpecifies what to use as the master axis when resizing or creating thumbs. For example, let's say you want to resize an image to 100 X 75 pixels. If the source image size does not allow perfect resizing to those dimensions, this setting determines which axis should be used as the hard value. "auto" sets the axis automatically based on whether the image is taller then wider, or vice versa.R
rotation_angleNone90, 180, 270, vrt, horSpecifies the angle of rotation when rotating images.  Note that PHP rotates counter-clockwise, so a 90 degree rotation to the right must be specified as 270.X
x_axisNoneNoneSets the X coordinate in pixels for image cropping. For example, a setting of 30 will crop an image 30 pixels from the left.C
y_axisNoneNoneSets the Y coordinate in pixels for image cropping. For example, a setting of 30 will crop an image 30 pixels from the top.C

+
+
+
Setting preferences in a config file

+
+
If you prefer not to set preferences using the above method, you can instead put them into a config file.
+Simply create a new file called the image_lib.php,  add the $config
+array in that file. Then save the file in: config/image_lib.php and it will be used automatically. You
+will NOT need to use the $this->image_lib->initialize function if you save your preferences in a config file.

+
+
+
$this->image_lib->resize()

+
+
The image resizing function lets you resize the original image, create a copy (with or without resizing), 
+or create a thumbnail image.

+
+
For practical purposes there is no difference between creating a copy and creating
+a thumbnail except a thumb will have the thumbnail marker as part of the name (ie, mypic_thumb.jpg).

+
+
All preferences listed in the table above are available for this function except these three:  rotation, x_axis, and y_axis.

+
+
Creating a Thumbnail

+
+
The resizing function will create a thumbnail file (and preserve the original) if you set this preference so TRUE:

+
+$config['create_thumb'] = TRUE;
+
+
This single preference determines whether a thumbnail is created or not.

+
+
Creating a Copy

+
+
The resizing function will create a copy of the image file (and preserve the original) if you set
+a path and/or a new filename using this preference:

+
+$config['new_image'] = '/path/to/new_image.jpg';
+
+
Notes regarding this preference:

+
    
+
  • If only the new image name is specified it will be placed in the same folder as the original
    • 
+
  • If only the path is specified, the new image will be placed in the destination with the same name as the original.
    • 
+
  • If both the path and image name are specified it will placed in its own destination and given the new name.
    • 
+

+
+
+
Resizing the Original Image

+
+
If neither of the two preferences listed above (create_thumb, and new_image) are used, the resizing function will instead
+target the original image for processing.

+
+
+
$this->image_lib->crop()

+
+
The cropping function works nearly identically to the resizing function except it requires that you set 
+preferences for the X and Y axis (in pixels) specifying where to crop, like this:

+
+$config['x_axis'] = '100';

+$config['x_axis'] = '40';
+
+
All preferences listed in the table above are available for this function except these:  rotation, width, height, create_thumb, new_image.

+
+
Here's an example showing how you might crop an image:

+
+$config['image_library'] = 'imagemagick';

+$config['library_path'] = '/usr/X11R6/bin/';

+$config['source_image']	= '/path/to/image/mypic.jpg';

+$config['x_axis'] = '100';

+$config['y_axis'] = '60';

+

+$this->image_lib->initialize($config);
+

+

+if ( ! $this->image_lib->crop())

+{

+    echo $this->image_lib->display_errors();

+}
+
+
+
Note: Without a visual interface it is difficult to crop images, so this function is not very useful 
+unless you intend to build such an interface.  That's exactly what we did using for the photo 
+gallery module in ExpressionEngine, the CMS we develop.  We added a JavaScript UI that lets the cropping
+area be selected.

+
+
$this->image_lib->rotate()

+
+
The image rotation function requires that the angle of rotation be set via its preference:

+
+$config['rotation_angle'] = '90';
+
+
There are 5 rotation options:

+
+
    
+
  1. 90 - rotates counter-clockwise by 90 degrees.
    2. 
+
  2. 180 - rotates counter-clockwise by 180 degrees.
    3. 
+
  3. 270 - rotates counter-clockwise by 270 degrees.
    4. 
+
  4. hor - flips the image horizontally.
    5. 
+
  5. vrt - flips the image vertically.
    6. 
+

+
+
Here's an example showing how you might rotate an image:

+
+$config['image_library'] = 'netpbm';

+$config['library_path'] = '/usr/bin/';

+$config['source_image']	= '/path/to/image/mypic.jpg';

+$config['rotation_angle'] = 'hor';

+

+$this->image_lib->initialize($config);
+

+

+if ( ! $this->image_lib->rotate())

+{

+    echo $this->image_lib->display_errors();

+}
+
+
+
+
 

+
Image Watermarking

+
+
The Watermarking feature requires the GD/GD2 library.

+
+
+
Two Types of Watermarking

+
+
There are two types of watermarking that you can use:

+
+
    
+
  • Text: The watermark message will be generating using text, either with a True Type font that you specify, or
+using the native text output that the GD library supports. If you use the True Type version your GD installation 
+must be compiled with True Type support (most are, but not all).
    • 
+
+
  • Overlay: The watermark message will be generated by overlaying an image (usually a transparent PNG or GIF)
+containing your watermark over the source image.
    • 
+
+

+
+
+
Watermarking an Image

+
+
Just as with the other function (resizing, cropping, and rotating) the general process for watermarking
+involves setting the preferences corresponding to the action you intend to perform, then
+calling the watermark function.  Here is an example:

+
+
+$config['source_image']	= '/path/to/image/mypic.jpg';

+$config['wm_text'] = 'Copyright 2006 - John Doe';
	
+$config['wm_type'] = 'text';

+$config['wm_font_path'] = './system/fonts/texb.ttf';

+$config['wm_font_size']	= '16';

+$config['wm_text_color'] = 'ffffff';

+$config['wm_vrt_alignment']  = 'bottom';

+$config['wm_hor_alignment']  = 'center';

+$config['wm_padding']  = '20';

+

+$this->image_lib->initialize($config);
+

+

+$this->image_lib->watermark();
+
+
+
The above example will use a 16 pixel True Type font to create the text "Copyright 2006 - John Doe".  The watermark
+will be positioned at the bottom/center of the image, 20 pixels from the bottom of the image.

+
+
Note: In order for the image class to be allowed to do any processing, the image file must have file permissions of 777.

+
+
+
Watermarking Preferences

+
+
This table shown the preferences that are available for both types of watermarking (text or overlay)

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PreferenceDefault ValueOptionsDescription
wm_typetexttype, overlaySets the type of watermarking that should be used.
source_imageNoneNoneSets the source image name/path.  The path must be a relative or absolute server path, not a URL.
dynamic_outputFALSETRUE/FALSE (boolean)Determines whether the new image file should be written to disk or generated dynamically.  Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers.
quality90%1 - 100%Sets the quality of the image. The higher the quality the larger the file size.
paddingNoneA numberThe amount of padding, set in pixels, that will be applied to the watermark to set it away from the edge of your images.
wm_vrt_alignmentbottomtop, middle, bottomSets the vertical alignment for the watermark image.
wm_hor_alignmentcenterleft, center, rightSets the horizontal alignment for the watermark image.
wm_vrt_offsetNoneNoneYou may specify a horizontal offset (in pixels) to apply to the watermark position. The offset normally moves the watermark to the right, except if you have your alignment set to "right" then your offset value will move the watermark toward the left of the image.
wm_hor_offsetNoneNoneYou may specify a horizontal offset (in pixels) to apply to the watermark position. The offset normally moves the watermark down, except if you have your alignment set to "bottom" then your offset value will move the watermark toward the top of the image.

+
+
+
+
Text Preferences

+
This table shown the preferences that are available for the text type of watermarking.

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PreferenceDefault ValueOptionsDescription
wm_textNoneNoneThe text you would like shown as the watermark.  Typically this will be a copyright notice.
wm_font_pathNoneNoneThe server path to the True Type Font you would like to use  Code Igniter includes a font in the system/fonts folder.  If you do not use this option, the native GD font will be used.
wm_font_size16NoneThe size of the text.  Note: If you are not using the True Type option above, the number is set using a range of 1 - 5.  Otherwise, you can use any valid pixel size for the font you're using.
wm_font_colorffffffNoneThe font color, specified in hex.  Note, you must use the full 6 character hex value (ie, 993300), rather than the three character abbreviated version (ie fff).
wm_shadow_colorNoneNoneThe color of the drop shadow, specified in hex. If you leave this blank a drop shadow will not be used. Note, you must use the full 6 character hex value (ie, 993300), rather than the three character abbreviated version (ie fff).
wm_shadow_distance3NoneThe distance (in pixels) from the font that the drop shadow should appear.

+
+
+
+
+
Overlay Preferences

+
This table shown the preferences that are available for the overlay type of watermarking.

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PreferenceDefault ValueOptionsDescription
wm_overlay_pathNoneNoneThe server path to the image you wish to use as your watermark. Required only if you are using the overlay method.
wm_opacity501 - 100Image opacity. You may specify the opacity (i.e. transparency) of your watermark image. This allows the watermark to be faint and not completely obscure the details from the original image behind it. A 50% opacity is typical.
wm_x_transp4A numberIf your watermark image is a PNG or GIF image, you may specify a color on the image to be "transparent". This setting (along with the next) will allow you to specify that color. This works by specifying the "X" and "Y" coordinate pixel (measured from the upper left) within the image that corresponds to a pixel representative of the color you want to be transparent.
wm_y_transp4A numberAlong with the previous setting, this allows you to specify the coordinate to a pixel representative of the color you want to be transparent.

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html
new file mode 100644
index 00000000..0878f9d1
--- /dev/null
+++ b/user_guide/libraries/input.html
@@ -0,0 +1,207 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Input Class

+
+
The Input Class serves two purposes:

+
+
    
+
  1. It pre-processes global input data for security.
    2. 
+
  2. It provides some helper functions for fetching input data and pre-processing it.
    3. 
+

+
+
Note: This class is initialized automatically by the system so there is no need to do it manually.

+
+
+
Security Filtering

+
+
The security filtering function is called automatically when a new controller is invoked.  It does the following:

+
+
    
+
  • Destroys the global GET array.  Since Code Igniter does not utilize GET strings, there is no reason to allow it.
    • 
+
  • Destroys all global variables in the event register_globals is turned on.
    • 
+
  • Filters the POST/COOKIE array keys, permitting only alpha-numeric (and a few other) characters.
    • 
+
  • Provides XSS (Cross-site Scripting Hacks) filtering.  This can be enabled globally, or upon request.
    • 
+
  • Standardizes newline characters to \n
    • 
+

+
+
+
XSS Filtering

+
+
Code Igniter comes with a Cross Site Scripting Hack prevention filter which can either run automatically to filter
+all POST and COOKIE data that is encountered, or you can run it on a per item basis.  By default it does not
+run globally since it requires a bit of processing overhead, and since you may not need it in all cases.

+
+
The XSS filter looks for commonly used techniques to trigger Javascript or other types of code that attempt to hijack cookies
+or do other malicious things.  If anything disallowed is encountered it is rendered safe by converting the data to character entities.

+
+

+Note: This function should only be used to deal with data upon submission. It's not something that should be used for general runtime processing since it requires a fair amount of processing overhead.

+
+
+
To filter data through the XSS filter use this function:

+
+
$this->input->xss_clean()

+
+
Here is an usage example:

+
+$data = $this->input->xss_clean($data);
+
+
If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your 
+application/config/config.php file and setting this:
+
+$config['global_xss_filtering'] = TRUE;
+
+
Note: If you use the form validation class, it gives you the option of XSS filtering as well.

+
+
+
+
+
Using POST or COOKIE Data

+
+
Code Igniter comes with two helper functions that let you fetch POST or COOKIE items.  The main advantage of using the provided
+functions rather then fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and
+return false (boolean) if not.  This lets you conveniently use data without having to test whether an item exists first. 
+In other words, normally you might do something like this:
+
+
+if ( ! isset($_POST['something']))

+{

+    $something = FALSE;

+}

+else

+{

+    $something = $_POST['something'];

+}
+
+
With Code Igniter's built in functions you can simply do this:

+
+$something = $this->input->post('something');
+
+
The two functions are:

+
+
$this->input->post()

+
+
The first parameter will contain the name of the POST item you are looking for:

+
+$this->input->post('some_data');
+
+
The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

+
+
The second optional parameter lets you run the data through the XSS filter.  It's enabled by setting the second parameter to boolean TRUE;

+
+$this->input->post('some_data', TRUE);
+
+
$this->input->cookie()

+
+
This function is identical to the post function, only it fetches cookie data:

+
+$this->input->cookie('some_data', TRUE);
+
+
+
+
+
$this->input->ip_address()

+
Returns the IP address for the current user.  If the IP address is not valid, the function will return an IP of: 0.0.0.0

+echo $this->input->ip_address();
+
+
+
$this->input->valid_ip($ip)

+
+
Takes an IP address as input and returns TRUE or FALSE (boolean) if it is valid or not.  Note:  The $this->input->ip_address() function above
+validates the IP automatically.

+
+if ( ! valid_id($ip))

+{

+     echo 'Not Valid';

+}

+else

+{

+     echo 'Valid';

+}
+
+
+
$this->input->user_agent()

+
Returns the user agent (web browser) being used by the current user. Returns FALSE if it's not available.

+echo $this->input->user_agent();
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html
new file mode 100644
index 00000000..98ef4b09
--- /dev/null
+++ b/user_guide/libraries/language.html
@@ -0,0 +1,130 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Language Class

+
+
The Language Class provides functions to retrieve language files and lines of text for purposes of internationalization.

+
+
In your Code Igniter system folder you'll find one called language containing sets of language files.  You can create
+your own language files as needed in order to display error and other messages in other languages.

+
+
Creating Language Files

+
+
Language files must be named with _lang.php as the file extension.  For example, let's say you want to create a file
+containing error messages.  You might name it:  error_lang.php

+
+
Within the file you will assign each line of text to an array called $lang with this prototype:

+
+$lang['language_key'] = "The actual message to be shown";
+
+
Note: It's a good practice to use a common prefix for all messages in a given file to avoid collisions with 
+similarly named items in other files:

+
+$lang['error_email_missing'] = "You must submit an email address";

+$lang['error_url_missing'] = "You must submit a URL";

+$lang['error_username_missing'] = "You must submit a username";
+
+
+
Loading A Language File

+
+
In order to fetch a line from a particular file you must load the file first.  Loading a language file is done with the following code:

+
+$this->lang->load('filename', 'language');
+
+
Where filename is the name of the file you wish to load (without the file extension), and language
+is the language set containing it (ie, english).  If the second parameter is missing, the default language set in your
+application/config/config.php file will be used.

+
+
+
Fetching a Line of Text

+
+
Once your desired language file is loaded you can access any line of text using this function:

+
+$this->lang->line('language_key');
+
+
Where language_key is the array key corresponding to the line you wish to show.

+
+
Note: This function simply returns the line.  It does not echo it for you.

+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
new file mode 100644
index 00000000..630a2ea6
--- /dev/null
+++ b/user_guide/libraries/loader.html
@@ -0,0 +1,171 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Loader Class

+
+
Loader, as the name suggests, is used to load elements.  These elements can be libraries (classes) View files, 
+Helpers, Plugins, or your own files.

+
+
Note: This class is initialized automatically by the system so there is no need to do it manually.

+
+
The following functions are available in this class:

+
+
+
+
$this->load->view('file_name', $data, true/false)

+
+
This function is used to load your View files.  If you haven't read the Views section of the
+user guide it is recommended that you do since it shows you how this function is typically used.

+
+
The first parameter is required.  It is the name of the view file you would like to load.

+
+
The second optional parameter can take
+an associative array or an object as input, which it runs through the PHP extract function to 
+convert to variables that can be used in your view files.  Again, read the Views page to learn
+how this might be useful.

+
+
The third optional parameter lets you change the behavior of the function so that it returns data as a string
+rather than sending it to your browser.  This can be useful if you want to process the data in some way.  If you
+set the parameter to true (boolean) it will return data.  The default behavior is false, which sends it
+to your browser.  Remember to assign it to a variable if you wan the data returned:

+
+$string = $this->load->view('myfile', '', true);
+
+
+
+
$this->load->library('class_name')

+
+
This function is used to load core classes.  Where class_name is the name of the class you want to load. 
+Note: We use the terms "class" and "library" interchangeably.

+
+
For example, if you would like to send email with Code Igniter, the first step is to load the email class within your controller:

+
+$this->load->library('email');
+
+
Once loaded, the library will be ready for use.  Each library is described in detail in its own page, so please read the
+information regarding each one you would like to use.

+
+
+
+
$this->load->database('options', true/false)

+
+
This function lets you load the database class.  The two parameters are optional.  Please see the 
+database section for more info.

+
+
+
$this->load->scaffolding('table_name')

+
+
This function lets you enable scaffolding.  Please see the 
+scaffolding section for more info.

+
+
+
+
$this->load->vars($array)

+
+
This function takes an associative array as input and generates variables using the PHP extract function.
+This function produces the same result as using the second parameter of the $this->load->view() function above.  The reason you might 
+want to use this function independently is if you would like to set some global variables in the constructor of your controller 
+and have them become available in any view file loaded from any function.  You can have multiple calls to this function.  The data get cached 
+and merged into one array for conversion to variables.
+

+
+
+
$this->load->helper('file_name')

+
This function loads helper files, where file_name is the name of the file, without the _helper.php extension.

+
+
+
$this->load->plugin('file_name')

+
This function loads plugins files, where file_name is the name of the file, without the _plugin.php extension.

+
+
$this->load->file('filepath/filename', true/false)

+
This is a generic file loading function.  Supply the filepath and name in the first parameter and it will open and read the file. 
+By default the data is sent to your browser, just like a View file, but if you set the second parameter to true (boolean)
+it will instead return the data as a string.

+
+
+
$this->load->lang('file_name')

+
This function is an alias of the language loading function: $this->lang->load()

+
+
$this->load->config('file_name')

+
This function is an alias of the config file loading function: $this->config->load()

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html
new file mode 100644
index 00000000..1a4537af
--- /dev/null
+++ b/user_guide/libraries/output.html
@@ -0,0 +1,112 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Output Class

+
+
The Output class is a small class with one main function:  To send the finalized web page to the requesting browser.  It is
+also responsible for caching your web pages, if you use that feature.

+
+
Note: This class is initialized automatically by the system so there is no need to do it manually.

+
+
Under normal circumstances you won't even notice the Output class since it works transparently without your intervention.  
+For example, when you use the Loader class to load a view file, it's automatically
+passed to the Output class, which will be called automatically by Code Igniter at the end of system execution. 
+It is possible, however, for you to manually intervene with the output if you need to, using either of the two following functions:

+
+
$this->output->set_output();

+
+
Permits you to manually set the final output string.  Usage example:

+
+$this->output->set_output($data);
+
+
Important: If you do set your output manually, it must be the last thing done in the function you call it from.
+For example, if you build a page in one of your controller functions, don't set the output until the end.

+
+
+
$this->output->get_output();

+
+
Permits you to manually retrieve any output that has been sent for storage in the output class.  Usage example:

+$string = $this->output->get_output();
+
+
Note that data will only be retrievable from this function if it has been previously sent to the output class by one of the
+Code Igniter functions like $this->load->view().

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html
new file mode 100644
index 00000000..3f4e5693
--- /dev/null
+++ b/user_guide/libraries/pagination.html
@@ -0,0 +1,218 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Pagination Class

+
+
Code Igniter's Pagination class is very easy to use, and it is 100% customizable, ether dynamically or via stored preferences.

+
+
If you are not familiar with the term "pagination", it refers to links that allows you to navigate from page to page, like this:

+
+« First  < 1 2 3 4 5 >  Last »
+
+
Example

+
+
Here is a simple example showing how to create pagination in one of your controller functions:

+
+
+$this->load->library('pagination');

	
+$config['base_url'] = 'http://www.your-site.com/index.php/test/page/';

+$config['total_rows'] = '200';

+$config['per_page']  = '20';
+


+$this->pagination->initialize($config);
+
+


+echo  $this->pagination->create_links();
+
+
Notes:

+
+
The $config array contains your configuration variables.  It is passed to the $this->pagination->initialize function as shown above.  Although there are some twenty items you can configure, at 
+minimum you need the three shown.  Here is a description of what those items represent:

+
+
    
+	
  • base_url This is the full URL to the controller class/function containing your pagination.  In the example
+	above, it is pointing to a controller called "Page" and a function called "test".  Keep in mind that you can
+	re-route your URI if you need a different structure.
    • 
+	
  • total_rows This number represents the total rows in the result set you are creating pagination for.
+	Typically this number will be the total rows that your database query returned.
+	
    • 
+	
  • per_page The number of items you intend to show per page.  In the above example, you would be showing 20 items per page.
    • 
+

+
+
The create_links() function returns an empty string when there is no pagination to show.
+
+
+
Setting preferences in a config file

+
+
If you prefer not to set preferences using the above method, you can instead put them into a config file.
+Simply create a new file called the pagination.php,  add the $config
+array in that file. Then save the file in: config/pagination.php and it will be used automatically. You
+will NOT need to use the $this->pagination->initialize function if you save your preferences in a config file.

+
+
+
Customizing the Pagination

+
+
The following is a list of all the preferences you can pass to the initialization function to tailor the display.

+
+
+
$config['uri_segment'] = 3;

+
+
The pagination function automatically determines which segment of your URI contains the page number. If you need
+something different you can specify it.

+
+
$config['num_links'] = 2;

+
+
The number of "digit" links you would like before and after the the selected page number. For example, the number 2 
+will place two digits on either side, as in the example links at the very top of this page.

+
+
Adding Enclosing Markup

+
+
If you would like to surround the entire pagination with some markup you can do it with these two prefs:

+
+
$config['full_tag_open'] = '<p>';

+
The opening tag placed on the left side of the entire result.

+
+
$config['full_tag_close'] = '</p>';

+
The closing tag placed on the right side of the entire result.

+
+
+
Customizing the First Link

+
+
$config['first_link'] = 'First';

+
The text you would like shown in the "first" link on the left.

+
+
$config['first_tag_open'] = '<div>';

+
The opening tag for the "first" link.

+
+
$config['first_tag_close'] = '</div>';

+
The closing tag for the "first" link.

+
+
Customizing the Last Link

+
+
$config['last_link'] = 'Last';

+
The text you would like shown in the "last" link on the right.

+
+
$config['last_tag_open'] = '<div>';

+
The opening tag for the "last" link.

+
+
$config['last_tag_close'] = '</div>';

+
The closing tag for the "last" link.

+
+
Customizing the "Next" Link

+
+
$config['next_link'] = '&gt';

+
The text you would like shown in the "next" page link.

+
+
$config['next_tag_open'] = '<div>';

+
The opening tag for the "next" link.

+
+
$config['next_tag_close'] = '</div>';

+
The closing tag for the "next" link.

+
+
Customizing the "Previous" Link

+
+
$config['prev_link'] = '&lt';

+
The text you would like shown in the "previous" page link.

+
+
$config['prev_tag_open'] = '<div>';

+
The opening tag for the "previous" link.

+
+
$config['prev_tag_close'] = '</div>';

+
The closing tag for the "previous" link.

+
+
Customizing the "Current Page" Link

+
+
$config['cur_tag_open'] = '<b>';

+
The opening tag for the "current" link.

+
+
$config['cur_tag_close'] = '</b>';

+
The closing tag for the "current" link.

+
+
+
Customizing the "Digit" Link

+
+
$config['num_tag_open'] = '<div>';

+
The opening tag for the "digit" link.

+
+
$config['num_tag_close'] = '</div>';

+
The closing tag for the "digit" link.

+		
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html
new file mode 100644
index 00000000..f8ddd41c
--- /dev/null
+++ b/user_guide/libraries/parser.html
@@ -0,0 +1,214 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
+
+
Template Parser Class

+
+
The Template Parser Class enables you to parse pseudo-variables contained within your view files. It can parse simple
+variables or variable tag pairs. If you've never used a template engine, pseudo-variables look like this:

+
+<html>

+<head>

+<title>{blog_title}</title>

+</head>

+<body>

+

+<h3>{blog_heading}</h3>

+

+{blog_entries}

+<h5>{title}</h5>

+<p>{body}</p>

+{/blog_entries}

+
+</body>

+</html>
+
+
These variables are not actual PHP variables, but rather plain text representations that allow you to eliminate
+PHP from your templates (view files).

+
+
Note: Code Igniter does not require you to use this class
+since using pure PHP in your view pages lets them run a little faster.  However, some developers prefer to use a template engine if 
+they work with designers who they feel would find some confusion working with PHP.

+
+
Also Note: The Template Parser Class is not not a
+full-blown template parsing solution. We've kept it very lean on purpose in order to maintain maximum performance.
+
+

+
+
+
Initializing the Class

+
+
Like most other classes in Code Igniter, the Parser class is initialized in your controller using the $this->load->library function:

+
+$this->load->library('parser');
+
Once loaded, the Parser library object will be available using: $this->parser

+
+
The following functions are available in this library:

+
+
$this->parser->parse()

+
+
This variable accepts a template name and data array as input, and it generates a parsed version.  Example:

+
+$this->load->library('parser');

+

+$data = array(

+            'blog_title' => 'My Blog Title',

+            'blog_heading' => 'My Blog Heading'

+            );

+

+$this->parser->parse('blog_template', $data);
+
+
The first parameter contains the name of the view file (in this example the file would be called blog_template.php),
+and the second parameter contains an associative array of data to be replaced in the template.  In the above example, the
+template would contain two variables: {blog_title} and {blog_heading}

+
+
There is no need to "echo" or do something with the data returned by $this->parser->parse().  It is automatically
+passed to the output class to be sent to the browser.  However, if you do want the data returned instead of sent to the output class you can 
+pass TRUE (boolean) to the third parameter:

+
+$string = $this->parser->parse('blog_template', $data, TRUE);
+
+
+
Variable Pairs

+
+
The above example code allows simple variables to be replaced.  What if you would like an entire block of variables to be
+repeated, with each iteration containing new values?  Consider the template example we showed at the top of the page:

+
+<html>

+<head>

+<title>{blog_title}</title>

+</head>

+<body>

+

+<h3>{blog_heading}</h3>

+

+{blog_entries}

+<h5>{title}</h5>

+<p>{body}</p>

+{/blog_entries}

+
+</body>

+</html>
+
+
In the above code you'll notice a pair of variables: {blog_entries} data... {/blog_entries}.
+In a case like this, the entire chunk of data between these pairs would be repeated multiple times, corresponding
+to the number of rows in a result.

+
+
Parsing variable pairs is done using the identical code shown above to parse single variables,  
+except, you will add a multi-dimensional array corresponding to your variable pair data.
+Consider this example:

+
+
+$this->load->library('parser');

+

+$data = array(

+              'blog_title'   => 'My Blog Title',

+              'blog_heading' => 'My Blog Heading',

+              'blog_entries' => array(

+                                      array('title' => 'Title 1', 'body' => 'Body 1'),

+                                      array('title' => 'Title 2', 'body' => 'Body 2'),

+                                      array('title' => 'Title 3', 'body' => 'Body 3'),

+                                      array('title' => 'Title 4', 'body' => 'Body 4'),

+                                      array('title' => 'Title 5', 'body' => 'Body 5')

+                                      )

+            );

+

+$this->parser->parse('blog_template', $data);
+
+
If your "pair" data is coming from a database result, which is already a multi-dimensional array, you can simply
+use the database result function:

+
+
+$query = $this->db->query("SELECT * FROM blog");

+

+$this->load->library('parser');

+

+$data = array(

+              'blog_title'   => 'My Blog Title',

+              'blog_heading' => 'My Blog Heading',

+              'blog_entries' => $query->result_array()

+            );

+

+$this->parser->parse('blog_template', $data);
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
new file mode 100644
index 00000000..1050e110
--- /dev/null
+++ b/user_guide/libraries/sessions.html
@@ -0,0 +1,283 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Session Class

+
+
The Session class permits you maintain a user's "state" and track their activity while they browse your site. 
+The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie. 
+It can also store the session data in a database table for added security, as this permits the session ID in the 
+user's cookie to be matched against the stored session ID. By default only the cookie is saved.  If you choose to
+use the database option you'll need to create the session table as indicated below.
+

+
+
Note: The Session class does not utilize native PHP sessions. It
+generates its own session data, offering more flexibility for developers.

+
+
Initializing a Session

+
+
Sessions will typically run globally with each page load, so the session class must either be 
+initialized in your
+controller constructors, or it can be
+auto-loaded by the system.
+For the most part the session class will run unattended in the background, so simply initializing the class
+will cause it to read, create, and update sessions.

+
+
+
To initialize the Session class manually in your controller constructor, use the $this->load->library function:

+
+$this->load->library('session');
+
Once loaded, the Sessions library object will be available using: $this->session

+
+
+
How do Sessions work?

+
+
When a page is loaded, the session class will check to see if valid session data exists in the user's session cookie. 
+If sessions data does not exist (or if it has expired) a new session will be created and saved in the cookie. 
+If a session does exist, its information will be updated and the cookie will be updated.

+
+
It's important for you to understand that once initialized, the Session class runs automatically.  There is nothing
+you need to do to cause the above behavior to happen.  You can, as you'll see below, work with session data or
+even add your own data to a user's session, but the process of reading, writing, and updating a session is automatic.

+
+
+
What is Session Data?

+
+
A session, as far as Code Igniter is concerned, is simply an array containing the following information:

+
+
    
+
  • The user's unique Session ID (this is a statistically random string with very strong entropy, hashed with MD5 for portability)
    • 
+
  • The user's IP Address
    • 
+
  • The user's User Agent data (the first 50 characters of the browser data string)
    • 
+
  • The "last activity" and "last visit" time stamps.
    • 
+

+
+
The above data is stored in a cookie as a serialized array with this prototype:

+
+[array]

+(

+     'session_id'    => random hash,

+     'ip_address'    => 'string - user IP address',

+     'user_agent'    => 'string - user agent data',

+     'last_activity' => timestamp,

+     'last_visit'    => timestamp

+)
+
+
If you have the encryption option enabled, the serialized array will be encrypted before being stored in the cookie,
+making the data highly secure and impervious to being read or altered by someone. More info regarding encryption
+can be found here, although the Session class will take care of initializing
+and encrypting the data automatically.

+
+
Note: Session cookies are only updated every five minutes to reduce processor load.  If you repeatedly reload a page
+you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time
+the cookie was written.

+
+
Retrieving Session Data

+
+
Any piece of information from the session array is available using the following function:

+
+$this->session->userdata('item');
+
+
Where item is the array index corresponding to the item you wish to fetch.  For example, to fetch the session ID you 
+will do this:

+
+$session_id = $this->session->userdata('session_id');
+
+
Note: The function returns FALSE (boolean) if the item you are trying to access does not exist.

+
+
+
Adding Custom Session Data

+
+
A useful aspect of the session array is that you can add your own data to it and it will be stored in the user's cookie.
+Why would you want to do this?  Here's one example:

+
+
Let's say a particular user logs into your site. Once authenticated,
+you could add their username and email address to the session cookie, making that data globally available to you without
+having to run a database query when you need it.

+
+
To add your data to the session array involves passing an array containing your new data to this function:

+
+$this->session->set_userdata($array);
+
+
Where $array is an associative array containing your new data.  Here's an example:

+
+
+$newdata = array(

+                   'username'  => 'johndoe',

+                   'email'     => 'johndoe@some-site.com',

+                   'logged_in' => TRUE

+               );

+

+$this->session->set_userdata($newdata);
+
+
Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity.  The
+encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

+
+
Saving Session Data to a Database

+
+
While the session data array stored in the user's cookie contains a Session ID,
+unless you store session data in a database there is no way to validate it.  For some applications that require little or no
+security, session ID validation may not be needed, but if your application requires security, validation is mandatory.
 
+
+
When session data is available in a database, every time a valid session is found in the user's cookie, a database
+query is performed to match it.  If the session ID does not match, the session is destroyed.  Session IDs can never
+be updated, they can only be generated when a new session is created.

+
+
In order to store sessions, you must first create a database table for this purpose.  Here is the basic 
+prototype required by the session class:

+
+
+
+
Note: By default the table is called ci_sessions, but you can name it anything you want
+as long as you update the application/config/config.php file so that it contains the name you have chosen.
+Once you have created your database table you can enable the database option in your config.php file as follows:

+
+$config['sess_use_database'] = TRUE;
+
+
Once enabled, the Session class will store session data in the DB.

+
+
Session Preferences

+
+
You'll find the following Session related preferences in your application/config/config.php file:

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PreferenceDefaultOptionsDescription
sess_cookie_nameci_sessionNoneThe name you world the session cookie saved as.
sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). 
+If you would like a non-expiring session set the value to zero: 0
sess_encrypt_cookieTRUETRUE/FALSE (boolean)Whether to encrypt the session data.
sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database.  You must create the table before enabling this option.
sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.
sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data.  Note that some ISPs dynamically
+changes the IP, so if you want a non-expiring session you will likely set this to FALSE.
sess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html
new file mode 100644
index 00000000..71b9be04
--- /dev/null
+++ b/user_guide/libraries/trackback.html
@@ -0,0 +1,251 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Trackback Class

+
+
The Trackback Class provides functions that enable you to send and receive Trackback data.

+
+
+
If you are not familiar with Trackbacks you'll find more information here.

+
+
Initializing the Class

+
+
Like most other classes in Code Igniter, the Trackback class is initialized in your controller using the $this->load->library function:

+
+$this->load->library('trackback');
+
Once loaded, the Trackback library object will be available using: $this->trackback

+
+
+
Sending Trackbacks

+
+
A Trackback can be sent from any of your controller functions using code similar to this example:
+
+$this->load->library('trackback');

+

+$tb_data = array(

+                'ping_url'  => 'http://some-site.com/trackback/456',

+                'url'       => 'http://www.my-site.com/blog/entry/123',

+                'title'     => 'The Title of My Entry',

+                'excerpt'   => 'The entry content.',

+                'blog_name' => 'My Blog Name',

+                'charset'   => 'utf-8'

+                );

+

+if ( ! $this->trackback->send($tb_data))

+{

+     echo $this->trackback->display_errors();

+}

+else

+{

+     echo 'Trackback was sent!';

+}
+
+
Description of array data:

+
+
    
+
  • ping_url - The URL of the site you are sending the Trackback to. You can send Trackbacks to multiple URLs by separating each URL with a comma.
    • 
+
  • url - The URL to YOUR site where the weblog entry can be seen.
    • 
+
  • title - The title of your weblog entry.
    • 
+
  • excerpt - The content of your weblog entry. Note: the Trackback class will automatically send only the first 500 characters of your entry.  It will also strip all HTML.
    • 
+
  • blog_name - The name of your weblog.
    • 
+
  • charset - The character encoding your weblog is written in.  If omitted, UTF-8 will be used.
    • 
+

+
+
The Trackback sending function returns TRUE/FALSE (boolean) on success or failure.  If it fails, you can retrieve the error message using:

+
+$this->trackback->display_errors();
+
+
+
Receiving Trackbacks

+
+
Before you can receive Trackbacks you must create a weblog.  If you don't have a blog yet there's no point in continuing.

+
+
Receiving Trackbacks is a little more complex than sending them, only because you will need a database table in which to store them,
+and you will need to validate the incoming trackback data.  You are encouraged to implement a thorough validation process to
+guard against spam and duplicate data.  You may also want to limit the number of Trackbacks you allow from a particular IP within
+a given span of time to further curtail spam.  The process of receiving a Trackback is quite simple; 
+the validation is what takes most of the effort.

+
+
Your Ping URL

+
+
In order to accept Trackbacks you must display a Trackback URL next to each one of your weblog entries.  This will be the URL
+that people will use to send you Trackbacks (we will refer to this as your "Ping URL").

+
+
Your Ping URL must point to a controller function where your Trackback receiving code is located, and the URL
+must contain the ID number for each particular entry, so that when the Trackback is received you'll be 
+able to associate it with a particular entry.

+
+
For example, if your controller class is called Trackback, and the receiving function is called receive, your
+Ping URLs will look something like this:

+
+http://www.your-site.com/index.php/trackback/receive/entry_id
+
+
Where entry_id represents the individual ID number for each of your entries.

+
+
+
Creating a Trackback Table

+
+
Before you can receive Trackbacks you must create a table in which to store them.  Here is a basic prototype for such a table:

+
+
+
+
+
The Trackback specification only requires four pieces of information to be sent in a Trackback (url, title, excerpt, blog_name),
+but to make the data more useful we've added a few more fields in the above table schema (date, IP address, etc.).

+
+
Processing a Trackback

+
+
Here is an example showing how you will receive and process a Trackback.  The following
+code is intended for use within the controller function where you expect to receive Trackbacks.

+
+$this->load->library('trackback');

+$this->load->database();

+

+if ($this->uri->segment(3) == FALSE)

+{

+    $this->trackback->send_error("Unable to determine the entry ID");

+}

+

+if ( ! $this->trackback->receive())

+{

+    $this->trackback->send_error("The Trackback did not contain valid data");

+}

+

+$data = array(

+                'tb_id'      => '',

+                'entry_id'   => $this->uri->segment(3),

+                'url'        => $this->trackback->data('url'),

+                'title'      => $this->trackback->data('title'),

+                'excerpt'    => $this->trackback->data('excerpt'),

+                'blog_name'  => $this->trackback->data('blog_name'),

+                'tb_date'    => time(),

+                'ip_address' => $this->input->ip_address()

+                );

+

+$sql = $this->db->insert_string('trackbacks', $data);

+$this->db->query($sql);

+

+$this->trackback->send_success();
+
+
Notes:

+
+
The entry ID number is expected in the third segment of your URL.  This is based on the URI example we gave earlier:

+
+http://www.your-site.com/index.php/trackback/receive/entry_id
+
+
Notice the entry_id is in the third URI, which you can retrieve using:

+
+$this->uri->segment(3);
+
+
In our Trackback receiving code above, if the third segment is missing, we will issue an error.  Without a valid entry ID, there's no
+reason to continue.

+
+
The $this->trackback->receive() function is simply a validation function that looks at the incoming data
+and makes sure it contains the four pieces of data that are required (url, title, excerpt, blog_name).
+It returns TRUE on success and FALSE on failure.  If it fails you will issue an error message.

+
+
The incoming Trackback data can be retrieved using this function:

+
+$this->trackback->data('item')
+
+
Where item represents one of these four pieces of info: url, title, excerpt, or blog_name

+
+
If the Trackback data is successfully received, you will issue a success message using:

+
+$this->trackback->send_success();
+
+
Note: The above code contains no data validation, which you are encouraged to add.

+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
new file mode 100644
index 00000000..182e29e3
--- /dev/null
+++ b/user_guide/libraries/unit_testing.html
@@ -0,0 +1,210 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Unit Testing Class

+
+
Unit testing is an approach to software development in which tests are written for each function in your application.
+If you are not familiar with the concept you might do a little googling on the subject.

+
+
Code Igniter's Unit Test class is quite simple, consisting of an evaluation function and two result functions. 
+It's not intended to be a full-blown test suite but rather a simple mechanism to evaluate your code 
+to determine if it is producing the correct data type and result.
+

+
+
+
Initializing the Class

+
+
Like most other classes in Code Igniter, the Unit Test class is initialized in your controller using the $this->load->library function:

+
+$this->load->library('unit_test');
+
Once loaded, the Unit Test object will be available using: $this->unit

+
+
+
Running Tests

+
+
Running a test involves supplying a test and an expected result to the following function:

+
+
$this->unit->run( test, expected result, 'test name' );

+
+
Where test is the result of the code you wish to test, 
+expected result is the data type you expect, and test name is an optional name you can give your test. Example:

+
+$test = 1 + 1;

+

+$expected_result = 2;

+

+$test_name = 'Adds one plus one';

+

+$this->unit->run($test, $expected_result, $test_name);
+
+
The expected result you supply can either be a literal match, or a data type match.  Here's an example of a literal:

+
+$this->unit->run('Foo', 'Foo');
+
+
Here is an example of a data type match:

+
+$this->unit->run('Foo', 'is_string');
+
+
Notice the use of "is_string" in the second parameter?  This tells the function to evaluate whether your test is producing a string 
+as the result.  Here is a list of allowed comparison types:

+
+
    
+
  • is_string
    • 
+
  • is_bool
    • 
+
  • is_true
    • 
+
  • is_false
    • 
+
  • is_int
    • 
+
  • is_numeric
    • 
+
  • is_float
    • 
+
  • is_double
    • 
+
  • is_array
    • 
+
  • is_null
    • 
+

+
+
+
Generating Reports

+
+
You can either display results after each test, or your can run several tests and generate a report at the end. 
+To show a report directly simply echo or return the run function:

+
+echo $this->unit->run($test, $expected_result);
+
+
To run a full report of all tests, use this:

+
+echo $this->unit->report();
+
+
The report will be formatted in an HTML table for viewing.  If you prefer the raw data you can retrieve an array using:

+
+echo $this->unit->result();
+
+
+
Strict Mode

+
+
By default the unit test class evaluates literal matches loosely.  Consider this example:

+
+$this->unit->run(1, TRUE);
+
+
The test is evaluating an integer, but the expected result is a boolean.  PHP, however, due to it's loose data-typing
+will evaluate the above code as TRUE using a normal equality test:

+
+if (1 == TRUE) echo 'This evaluates as true';
+
+
If you prefer, you can put the unit test class in to strict mode, which will compare the data type as well as the value:

+
+if (1 === TRUE) echo 'This evaluates as FALSE';
+
+
To enable strict mode use this:

+
+$this->unit->strict(TRUE);
+
+
Enabling/Disabling Unit Testing

+
+
If you would like to leave some testing in place in your scripts, but not have it run unless you need it, you can disable
+unit testing using:

+
+$this->unit->active(FALSE)
+
+
+
+
Creating a Template

+
+
If you would like your test results formatted differently then the default you can set your own template.  Here is an
+example of a simple template.  Note the required pseudo-variables:

+
+
+$str = '

+<table border="0" cellpadding="4" cellspacing="1">

+    {rows}

+        <tr>

+        <td>{item}</td>

+        <td>{result}</td>

+        </tr>

+    {/rows}

+</table>';

+

+$this->unit->set_template($str);
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html
new file mode 100644
index 00000000..5218cea8
--- /dev/null
+++ b/user_guide/libraries/uri.html
@@ -0,0 +1,220 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
URI Class

+
+
The URI Class provides functions that help you retrieve information from your URI strings.

+
+
Note: This class is initialized automatically by the system so there is no need to do it manually.

+
+
$this->uri->segment(n)

+
+
Permits you to retrieve a specific segment. Where n is the segment number you wish to retrieve.  
+Segments are numbered from left to right. For example, if your full URL is this:

+
+http://www.your-site.com/index.php/news/local/metro/crime_is_up
+
+
The segment numbers would be this:

+
+
    
+
  1. news
    2. 
+
  2. local
    3. 
+
  3. metro
    4. 
+
  4. crime_is_up
    5. 
+

+
+
By default the function returns FALSE (boolean) if the segment does not exist. There is an optional second parameter that 
+permits you to set your own default value if the segment is missing.
+For example, this would tell the function to return the number zero in the event of failure:

+
+$product_id = $this->uri->segment(3, 0);
+
+
It helps avoid having to write code like this:

+
+if ($this->uri->segment(3) === FALSE)

+{

+    $product_id = 0;

+}

+else

+{

+    $product_id = $this->uri->segment(3);

+}

+
+
+
+
$this->uri->slash_segment(n)

+
+
This function is almost identical to the one above, except it adds a trailing and/or leading slash based on the second
+parameter.  If the parameter is not used, a trailing slash added.  Examples:

+
+$this->uri->slash_segment(3);

+$this->uri->slash_segment(3, 'leading');

+$this->uri->slash_segment(3, 'both');
+
+
Returns:

+
+
    
+
  1. segment/
    2. 
+
  2. /segment
    3. 
+
  3. /segment/
    4. 
+

+
+
+
$this->uri->uri_to_assoc(n)

+
+
This function lets you turn URI segments into and associative array of key/value pairs.  Consider this URI:

+
+index.php/user/search/name/joe/location/UK/gender/male
+
+
Using this function you can turn the URI into an associative array with this prototype:

+
+[array]

+(

+    'name' => 'joe'

+    'location'	=> 'UK'

+    'gender'	=> 'male'

+)
+
+
The first parameter of the function lets you set an offset.  By default it is set to 3 since your
+URI will normally contain a controller/function in the first and second segments. Example:

+
+
+$array = $this->uri->uri_to_assoc(3);

+

+echo $array['name'];
+
+
+
+
The second parameter lets you set default key names, so that the array returned by the function will always contain expected indexes, even if missing from the URI. Example:

+
+
+$default = array('name', 'gender', 'location', 'type', 'sort');

+

+$array = $this->uri->uri_to_assoc(3, $default);
+
+
If the URI does not contain a value in your default, an array index will be set to that name, with a value of FALSE.

+
+
Lastly, if a corresponding value is not found for a given key (if there is an odd number of URI segments) the value will be set to FALSE (boolean).

+
+
+
$this->uri->assoc_to_uri()

+
+
Takes an associative array as input and generates a URI string from it.  The array keys will be included in the string.  Example:

+
+$array = array('product' => 'shoes', 'size' => 'large', 'color' => 'red');

+

+$str = $this->uri->assoc_to_str($array);

+

+// Produces:  product/shoes/size/large/color/red
+
+
+
+
$this->uri->uri_string()

+
+
Returns a string with the complete URI.  For example, if this is your full URL:

+
+http://www.your-site.com/index.php/news/local/345
+
+
The function would return this:

+
+news/local/345
+
+
+
$this->uri->total_segments()

+
+
Returns the total number of segments.

+
+
+
+
$this->uri->segment_array()

+
+
Returns an array containing the URI segments.  For example:

+
+
+$segs = $this->uri->segment_array();

+

+foreach ($segs as $segment)

+{

+    echo $segment;

+    echo '<br />';

+}
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html
new file mode 100644
index 00000000..2489aa6e
--- /dev/null
+++ b/user_guide/libraries/validation.html
@@ -0,0 +1,674 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Form Validation

+
+
Before explaining Code Igniter's approach to data validation, let's describe the ideal scenario:

+
+
    
+
  1. A form is displayed.
    2. 
+
  2. You fill it in and submit it.
    3. 
+
  3. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data along with an error message describing the problem.
    4. 
+
  4. This process continues until you have submitted a valid form.
    5. 
+

+
+
On the receiving end, the script must:

+
+
    
+
  1. Check for required data.
    2. 
+
  2. Verify that the data is of the correct type, and meets the correct criteria. (For example, if a username is submitted 
+it must be validated to contain only permitted characters.  It must be of a minimum length, 
+and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.)
+
  3. Sanitize the data for security.
    4. 
+
  4. Pre-format the data if needed (Does the data need to be trimmed?  HTML encoded?  Etc.)
    5. 
+
  5. Prep the data for insertion in the database.
    6. 
+

+
+
+
Although there is nothing complex about the above process, it usually requires a significant
+amount of code, and to display error messages, various control structures are usually placed within the form HTML.
+Form validation, while simple to create, is generally very messy and tedious to implement.

+
+Code Igniter provides a comprehensive validation framework that truly minimizes the amount of code you'll write.
+It also removes all control structures from your form HTML, permitting it to be clean and free of code.
+
+
Overview

+
+
In order to implement Code Igniter's form validation you'll need three things:

+
+
    
+
  1. A View file containing the form.
    2. 
+
  2. A View file containing a "success" message to be displayed upon successful submission.
    3. 
+
  3. A controller function to receive and process the submitted data.
    4. 
+

+
+
Let's create those three things, using a member sign-up form as the example.

+
+
The Form

+
+
Using a text editor, create a form called myform.php.  In it, place this code and save it to your applications/views/
+folder:

+
+
+
+
+
+
The Success Page

+
+
+
Using a text editor, create a form called formsuccess.php.  In it, place this code and save it to your applications/views/
+folder:

+
+
+
+
+
+
The Controller

+
+
Using a text editor, create a controller called form.php.  In it, place this code and save it to your applications/controllers/
+folder:

+
+
+
+
+
+
Try it!

+
+
To try your form, visit your site using a URL similar to this one:

+
+www.your-site.com/index.php/form/
+
+
If you submit the form you should simply see the form reload.  That's because you haven't set up any validation 
+rules yet, which we'll get to in a moment.

+
+
+
Explanation

+
+
You'll notice several things about the above pages:

+
+
The form (myform.php) is a standard web form with a couple exceptions:

+
+
    
+
  1. It uses a form helper to create the form opening.
+Technically, this isn't necessary.  You could create the form using standard HTML.  However, the benefit of using the helper
+is that it generates the action URL for you, based on the URL in your config file.  This makes your application more portable
+and flexible in the event your URLs change.
    2. 
+
+
  2. At the top of the form you'll notice the following variable:
+<?=$this->validation->error_string; ?>
+
+
    This variable will display any error messages sent back by the validator. If there are no messages it returns nothing.
    
+
    3. 
+

+
+
The controller (form.php) has one function: index(). This function initializes the validation class and
+loads the form helper and URL helper used by your view files. It also runs 
+the validation routine. Based on 
+whether the validation was successful it either presents the form or the success page.

+
+
Since you haven't told the validation class to validate anything yet, it returns "false" (boolean false) by default.  The run()
+function only returns "true" if it has successfully applied your rules without any of them failing.

+
+
+
Setting Validation Rules

+
+
Code Igniter lets you set as many validation rules as you need for a given field, cascading them in order, and it even lets you prep and pre-process the field data
+at the same time. Let's see it in action, we'll explain it afterwards.

+
+
In your controller (form.php), add this code just below the validation initialization function:

+
+$rules['username']	= "required";

+$rules['password']	= "required";

+$rules['passconf']	= "required";

+$rules['email']		= "required";

+

+$this->validation->set_rules($rules);
+
+
Your controller should now look like this:

+
+
+
+
Now submit the form with the fields blank and you should see the error message.
+If you submit the form with all the fields populated you'll see your success page.

+
+
Note: The form fields are not yet being re-populated with the data when
+there is an error.  We'll get to that shortly, once we're through explaining the validation rules.

+
+
+
Changing the Error Delimiters

+
+
By default, the system adds a paragraph tag (<p>) around each error message shown. You can easily change these delimiters with
+this code, placed in your controller:

+
+$this->validation->set_error_delimiters('<div class="error">', '</div>');
+
+
In this example, we've switched to using div tags.

+
+
Cascading Rules

+
+
Code Igniter lets you pipe multiple rules together.  Let's try it. Change your rules array like this:

+
+
+$rules['username']	= "required|min_length[5]|max_length[12]";

+$rules['password']	= "required|matches[passconf]";

+$rules['passconf']	= "required";

+$rules['email']		= "required|valid_email";
+
+
The above code requires that:

+
+
    
+
  1. The username field be no shorter than 5 characters and no longer than 12.
    2. 
+
  2. The password field must match the password confirmation field.
    3. 
+
  3. The email field must contain a valid email address.
    4. 
+

+
+
Give it a try!

+
+
Note: There are numerous rules available which you can read about in the validation reference.

+
+
+
Prepping Data

+
+
In addition to the validation functions like the ones we used above, you can also prep your data in various ways.  
+For example, you can set up rules like this:
+
+$rules['username']	= "trim|required|min_length[5]|max_length[12]|xss_clean";

+$rules['password']	= "trim|required|matches[passconf]|md5";

+$rules['passconf']	= "trim|required";

+$rules['email']		= "trim|required|valid_email";
+
+
In the above, we are "trimming" the fields, converting the password to MD5, and running the username through
+the "xss_clean" function, which removes malicious data.

+
+
Any native PHP function that accepts one parameter can be used as a rule, like htmlspecialchars,
+trim,  MD5, etc.

+
+
Note: You will generally want to use the prepping functions after
+the validation rules so if there is an error, the original data will be shown in the form.

+
+
Callbacks: Your own Validation Functions

+
+
The validation system supports callbacks to your own validation functions.  This permits you to extend the validation class
+to meet your needs.  For example, if you need to run a database query to see if the user is choosing a unique username, you can
+create a callback function that does that.  Let's create a simple example.

+
+
In your controller, change the "username" rule to this:

+
+$rules['username'] = "callback_username_check"; 
+
+
Then add a new function called username_check to your controller.  Here's how your controller should look:

+
+
+
+
+
Reload your form and submit it with the word "test" as the username.  You can see that the form field data was passed to your
+callback function for you to process.

+
+
To invoke a callback just put the function name in a rule, with "callback_" as the rule prefix.

+
+
The error message was set using the $this->validation->set_message function. 
+Just remember that the message key (the first parameter) must match your function name.

+
+
Note: You can apply your own custom error messages to any rule, just by setting the 
+message similarly. For example, to change the message for the "required" rule you will do this:

+
+$this->validation->set_message('required', 'Your custom message here');
+
+
Re-populating the form

+
+
Thus far we have only been dealing with errors.  It's time to repopulate the form field with the submitted data. 
+This is done similarly to your rules.  Add the following code to your controller, just below your rules:

+
+$fields['username'] = 'Username';

+$fields['password'] = 'Password';

+$fields['passconf'] = 'Password Confirmation';

+$fields['email'] = 'Email Address';

+

+$this->validation->set_fields($fields);
+
+
The array keys are the actual names of the form fields, the value represents the full name that you want shown in the 
+error message.

+
+
The index function of your controller should now look like this:

+
+
+
+
+
+
Now open your myform.php view file and update the value in each field so that it has an object corresponding to its name:

+
+
+
+
+
+
Now reload your page and submit the form so that it triggers an error.  Your form fields should be populated
+and the error messages will contain a more relevant field name.

+
+
+
+
Showing Errors Individually

+
+
If you prefer to show an error message next to each form field, rather than as a list, you can change your form so that it looks like this:

+
+
+
+
+
If there are no errors, nothing will be shown.  If there is an error, the message will appear, wrapped in the delimiters you
+have set (<p> tags by default).

+
+
Note: To display errors this way you must remember to set your fields using the $this->validation->set_fields
+function described earlier. The errors will be turned into variables that have "_error" after your field name. 
+For example, your "username" error will be available at:
$this->validation->username_error.

+
+
+
Rule Reference

+
+
The following is a list of all the native rules that are available to use:

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
RuleParameterDescriptionExample
requiredNoReturns FALSE if the form element is empty. 
matchesYesReturns FALSE if the form element does not match the one in the parameter.matches[form_item]
min_lengthYesReturns FALSE if the form element is shorter then the parameter value.min_length[6]
max_lengthYesReturns FALSE if the form element is longer then the parameter value.max_length[12]
exact_lengthYesReturns FALSE if the form element is not exactly the parameter value.exact_length[8]
alphaNoReturns FALSE if the form element contains anything other than alphabetical characters. 
alpha_numericNoReturns FALSE if the form element contains anything other than alpha-numeric characters. 
alpha_dashNoReturns FALSE if the form element contains anything other than alpha-numeric characters, underscores or dashes. 
numericNoReturns FALSE if the form element contains anything other than numeric characters. 
valid_emailNoReturns FALSE if the form element does not contain a valid email address. 

+
+
Note: These rules can also be called as discreet functions. For example:

+
+$this->validation->required($string);
+
+
Note: You can also use any native PHP functions that permit one parameter.

+
+
+
+
Prepping Reference

+
+
The following is a list of all the prepping functions that are available to use:

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
NameParameterDescription
xss_cleanNoRuns the data through the XSS filtering function, described in the Input Class page.
prep_for_formNoConverts special characters so that HTML data can be shown in a form field without breaking it.
prep_urlNoAdds "http://" to URLs if missing.
strip_image_tagsNoStrips the HTML from image tags leaving the raw URL.
encode_php_tagsNoConverts PHP tags to entities.

+
+
Note: You can also use any native PHP functions that permit one parameter,
+like trim, htmlspecialchars, urldecode, etc.

+
+
+
Setting Custom Error Messages

+
+
All of the native error messages are located in the following language file:  language/english/validation_lang.php

+
+
To set your own custom message you can either edit that file, or use the following function:

+
+$this->validation->set_message('rule', 'Error Message');
+
+
Where rule corresponds to the name of a particular rule, and Error Message is the text you would like displayed.

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html
new file mode 100644
index 00000000..f8ef5995
--- /dev/null
+++ b/user_guide/libraries/xmlrpc.html
@@ -0,0 +1,485 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
XML-RPC and XML-RPC Server Classes

+
+
+
Code Igniter's XML-RPC classes permit you to send requests to another server, or set up 
+your own XML-RPC server to receive requests.

+
+
+
What is XML-RPC?

+
+
Quite simply it is a way for two computers to communicate over the internet using XML.  
+One computer, which we will call the client, sends an XML-RPC request to 
+another computer, which we will call the server.  Once the server receives and processes the request it
+will send back a response to the client.

+
+
For example, using the MetaWeblog API, an XML-RPC Client (usually a desktop publishing tool) will 
+send a request to an XML-RPC Server running on your site.  This request might be a new weblog entry
+being sent for publication, or it could be a request for an existing entry for editing.
+
+When the XML-RPC Server receives this request it will examine it to determine which class/method should be called to process the request.
+Once processed, the server will then send back a response message.

+
+
For detailed spcifications, you can visit the XML-RPC site.

+
+
Initializing the Class

+
+
Like most other classes in Code Igniter, the XML-RPC and XML-RPCS classes are initialized in your controller using the $this->load->library function:

+
+
To load the XML-RPC class you will use:
+$this->load->library('xmlrpc');
+
Once loaded, the xml-rpc library object will be available using: $this->xmlrpc

+
+
To load the XML-RPC Server class you will use:
+$this->load->library('xmlrpcs');
+
Once loaded, the xml-rpcs library object will be available using: $this->xmlrpcs

+
+
+
+
Sending XML-RPC Requests

+
+
To send a request to an XML-RPC server you must specify the following information:

+
+
    
+
  • The URL of the server
    • 
+
  • The method on the server you wish to call
    • 
+
  • The request data (explained below).
    • 
+

+
+
Here is a basic example that sends a simple Weblogs.com ping to the Ping-o-Matic

+
+
+$this->load->library('xmlrpc');

+

+$this->xmlrpc->server('http://rpc.pingomatic.com/', 80);

+$this->xmlrpc->method('weblogUpdates.ping');

+
+

+$request = array('My Photoblog', 'http://www.my-site.com/photoblog/');

+$this->xmlrpc->request($request);

+

+if ( ! $this->xmlrpc->send_request())

+{

+    echo $xmlrpc->display_error();

+}
+
+
+
Explanation

+
+
The above code initializes the XML-RPC class, sets the server URL and method to be called (weblogUpdates.ping).  The
+request (in this case, the title and URL of your site) is placed into an array for transportation, and
+compiled using the request() function.
+Lastly, the full request is sent.  If the send_request() method returns false we will display the error message
+sent back from the XML-RPC Server.

+
+
Anatomy of a Request

+
+
An XML-RPC request is simply the data you are sending to the XML-RPC server.  Each piece of data in a request 
+is referred to as a request parameter.  The above example has two parameters: 
+The URL and title of your site. When the XML-RPC server receives your request, it will look for parameters it requires.

+
+
Request parameters must be placed into an array for transportation, and each parameter can can be one
+of seven data types (strings, numbers, dates, etc.). If your parameters are something other than strings 
+you will have to include the data type in the request array.

+
+
Here is an example of a simple array with three parameters:

+
+$request = array('John', 'Doe', 'www.some-site.com');

+$this->xmlrpc->request($request);
+
+
If you use data types other than strings, or if you have several different data types, you will place
+each parameter into its own array, with the data type in the second position:

+
+
+$request = array (

+                   array('John', 'string'),

+                   array('Doe', 'string'),

+                   array(FALSE, 'boolean'),

+                   array(12345, 'int')

+                 );
+

+$this->xmlrpc->request($request);
+
+The  Data Types  section below has a full list of data types.

+
+
+
+
Creating an XML-RPC Server

+
+
An XML-RPC Server acts as a traffic cop of sorts, waiting for incoming requests and redirecting them to the 
+appropriate functions for processing.

+
+
To create your own XML-RPC server involves initializing the XML-RPC Server class in your controller where you expect the incoming 
+request to appear, then setting up an array with mapping instructions so that incoming requests can be sent to the appropriate
+class and method for processing.

+
+
Here is an example to illustrate:

+
+$this->load->library('xmlrpcs');

+

+$config['functions']['new_post'];  = array('function' => 'My_blog.new_entry');

+$config['functions']['update_post'] = array('function' => 'My_blog.update_entry');

+

+$this->xmlrpcs->initialize($config);

+$this->xmlrpcs->serve();
+
+
The above example contains an array specifying two method requests that the Server allows.  
+The allowed methods are on the left side of the array. When either of those are received, they will be mapped to the class and method on the right.
+
+
In other words, if an XML-RPC Client sends a request for the new_post method, your 
+server will load the My_blog class and call the new_entry function.
+If the request is for the update_post method, your 
+server will load the My_blog class and call the update_entry function.

+
+
The function names in the above example are arbitrary.  You'll decide what they should be called on your server, 
+or if you are using standardized APIs, like the Blogger or MetaWeblog API, you'll use their function names.

+
+
+
Processing Server Requests

+
+
When the XML-RPC Server receives a request and loads the class/method for processing, it will pass
+an object to that method containing the data sent by the client.

+
+
Using the above example, if the new_post method is requested, the server will expect a class
+to exist with this prototype:

+
+class My_blog extends Controller {

+

+    function new_post($request)

+    {

+	

+    }

+}
+
+
+
The $request variable is an object compiled by the Server, which contains the data sent by the XML-RPC Client.
+Using this object you will have access to the request parameters enabling you to process the request.  When
+you are done you will send a Response back to the Client.

+
+
Below is a real-world example, using the Blogger API.  One of the methods in the Blogger API is getUserInfo().  
+Using this method, an XML-RPC Client can send the Server a username and password, in return the Server sends
+back information about that particular user (nickname, user ID, email address, etc.).  Here is how the processing
+function might look:

+
+
+class My_blog extends Controller {

+

+    function getUserInfo($request)

+    {

+
+        $username = 'smitty';

+        $password = 'secretsmittypass';


+
+        $this->load->library('xmlrpc');

+    

+        $parameters = $request->output_parameters();

+    

+        if ($parameters['1'] != $username AND $parameters['2'] != $password)

+        {

+            return $this->xmlrpc->send_error_message('100', 'Invalid Access');

+        }

+    

+        $response = array(array('nickname'  => array('Smitty','string'),

+                                'userid'    => array('99','string'),

+                                'url'       => array('http://yoursite.com','string'),

+                                'email'     => array('jsmith@yoursite.com','string'),

+                                'lastname'  => array('Smith','string'),

+                                'firstname' => array('John','string')

+                                ),

+                         'struct');

+

+        $this->xmlrpc->send_response($response);

+    }

+}
+
+
+
Notes:

+
The output_parameters() function retrieves an indexed array corresponding to the request parameters sent by the client.
+In the above example, the output parameters will be the username and password.

+
+
If the username and password sent by the client were not valid, and error message is returned using send_error_message().

+
+
If the operation was successful, the client will be sent back a response array containing the user's info.

+
+
+
Formatting a Response

+
+
Similar to Requests, Responses must be formatted as an array.  However, unlike requests, a response is an array
+that contains a single item.  This item can be an array with several additional arrays, but there
+can be only one primary array index.  In other words, the basic prototype is this:

+
+$request = array('Response data',  'array');
+
+
Responses, however, usually contain multiple pieces of information. In order to accomplish this we must put the response into its own 
+array so that the primary array continues to contain a single piece of data.  Here's an example showing how this might be accomplished:

+
+
+$request = array (

+                   array(

+                         'first_name' => array('John', 'string'),

+                         'last_name' => array('Doe', 'string'),

+                         'member_id' => array(123435, 'int'),

+                         'todo_list' => array(array('clean house', 'call mom', 'water plants'), 'array'),

+                        ),

+                 'struct'

+                 );
+
+
+
Notice that the above array is formatted as a struct.  This is the most common data type for responses.

+
+
As with Requests, a response can be on of the seven data types listed in the  Data Types  section.

+
+
+
Sending an Error Response

+
+
If you need to send the client an error response you will use the following:

+
+return $this->xmlrpc->send_error_message('123', 'Requested data not available');
+
+
The first parameter is the error number while the second parameter is the error message.

+
+
+
+
+
+
+
Creating Your Own Client and Server

+
+
To help you understand everything we've covered thus far, let's create a couple controllers that act as 
+XML-RPC Client and Server.  You'll use the Client to send a request to the Server and receive a response.

+
+
The Client

+
+
Using a text editor, create a controller called xmlrpc_client.php.  
+In it, place this code and save it to your applications/controllers/ folder:

+
+
+
+
Note: In the above code we are using a "url helper".  You can find more information in the Helpers Functions page.

+
+
The Server

+
+
Using a text editor, create a controller called xmlrpc_server.php.  
+In it, place this code and save it to your applications/controllers/ folder:

+
+
+
+
Try it!

+
+
Now visit the your site using a URL similar to this:

+www.your-site.com/index.php/xmlrpc_client/
+
+
You should now see the message you sent to the server, and its response back to you.

+
+
The client you created sends a message ("How's is going?") to the server, along with a reqest for the "Greetings" method.
+The Server receives the request and maps it to the "process" function, where a response is sent back.

+
+
+
+
 

+
XML-RPC Function Reference

+
+
$this->xmlrpc->server()

+
Sets the URL and port number of the server to which a request is to be sent:

+$this->xmlrpc->server('http://www.sometimes.com/pings.php', 80);
+
+
$this->xmlrpc->timeout()

+
Set a time out period (in seconds) after which the request will be canceled:

+$this->xmlrpc->timeout(6);
+
+
$this->xmlrpc->method()

+
Sets the method that will be requested from the XML-RPC server:

+$this->xmlrpc->method('method');
+
+
Where method is the name of the method.

+
+
$this->xmlrpc->request()

+
Takes an array of data and builds request to be sent to XML-RPC server:

+$request = array(array('My Photoblog', 'string'), 'http://www.yoursite.com/photoblog/');

+$this->xmlrpc->request($request);
+
+
$this->xmlrpc->send_request()

+
The request sending function.  Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

+
+
$this->xmlrpc->set_debug(TRUE);

+
Enables debugging, which will display a variety of information and error data helpful during development.

+
+
+
$this->xmlrpc->display_error()

+
Returns an error message as a string if your request failed for some reason.

+echo $this->xmlrpc->display_error();
+
+
$this->xmlrpc->display_response()

+
Returns the response from the remote server once request is received.  The response will typically be an associative array.

+$this->xmlrpc->display_response();
+
+
$this->xmlrpc->send_error_message()

+
This function lets you send an error message from your server to the client. First parameter is the error number while the second parameter 
+is the error message.

+return $this->xmlrpc->send_error_message('123', 'Requested data not available');
+
+
$this->xmlrpc->send_response()

+
Lets you send the response from your server to the client. An array of of valid data values must be sent with this method.

+$response = array(

+                 array(

+                        'flerror' => array(FALSE, 'boolean'),

+                        'message' => "Thanks for the ping!")

+                     )

+                 'struct');

+return $this->xmlrpc->send_response($response);
+
+
+
+
Data Types

+
+
According to the XML-RPC spec there are seven types
+of values that you can send via XML-RPC:

+
+
    
+
  • int or i4
    • 
+
  • boolean
    • 
+
  • string
    • 
+
  • double
    • 
+
  • dateTime.iso8601
    • 
+
  • base64
    • 
+
  • struct (contains array of values)
    • 
+
  • array (contains array of values)
    • 
+

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/license.html b/user_guide/license.html
new file mode 100644
index 00000000..4bc94154
--- /dev/null
+++ b/user_guide/license.html
@@ -0,0 +1,113 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+

+
+
+
+

+
+
Code Igniter License Agreement

+
+
Copyright (c) 2006, pMachine, Inc.
 
+All rights reserved.

+
+
This license is a legal agreement between you and pMachine Inc. for the use of Code Igniter Software (the "Software").  By obtaining the Software you agree to comply with the terms and conditions of this license.

+
+
Permitted Use

+
You are permitted to use, copy, modify, and distribute the Software and its documentation, with or without modification, for any purpose, provided that the following conditions are met:

+
+
    
+
  1. A copy of this license agreement must be included with the distribution.
    2. 
+
  2. Redistributions of source code must retain the above copyright notice in all source code files.
    3. 
+
  3. Redistributions in binary form must reproduce the above copyright notice in the documentation and/or other materials provided with the distribution.
    4. 
+
  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. 
+
  5. Products derived from the Software must include an acknowledgment that they are derived from Code Igniter in their documentation and/or other materials provided with the distribution.
    6. 
+
  6. Products derived from the Software may not be called "Code Igniter", nor may "Code Igniter" appear in their name, without prior written permission from pMachine, Inc.
    7. 
+

+
+
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 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.

+
+
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 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.

+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html
new file mode 100644
index 00000000..0322a043
--- /dev/null
+++ b/user_guide/overview/appflow.html
@@ -0,0 +1,101 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Application Flow Chart

+
+
The following graphic illustrates how data flows throughout the system:

+
+

+
+
+
    
+
  1. The index.php serves as the front controller, initializing the base resources needed to run Code Igniter.
    2. 
+
  2. The Router examines the HTTP request to determine what should be done with it.
    3. 
+
  3. If a cache file exists, it is sent directly to the browser, bypassing the normal system execution.
    4. 
+
  4. Security.  Before the application controller is loaded, the HTTP request and any user submitted data is filtered for security.
    5. 
+
  5. The Controller loads the model, core libraries, plugins, helpers, and any other resources needed to process the specific request.
    6. 
+
  6. The finalized View is rendered then sent to the web browser to be seen. If caching is enabled, the view is cached first so
+that on subsequent requests it can be served.
    7. 
+

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html
new file mode 100644
index 00000000..188ced25
--- /dev/null
+++ b/user_guide/overview/at_a_glance.html
@@ -0,0 +1,168 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Code Igniter at a Glance

+
+
+
Code Igniter is an Application Framework

+
+
Code Igniter is a toolkit for people who build web application using PHP.  Its goal is to enable you to develop projects must faster than you could if you were writing code 
+from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and
+logical structure to access these libraries. Code Igniter lets you creatively focus on your project by 
+minimizing the amount of code needed for a given task.

+
+
Code Igniter is Free

+
Code Igniter is licensed under an Apache/BSD-style open source license so you can use it however you please.
+For more information please read the license agreement.

+
+
+
Code Igniter Runs on PHP 4

+
Code Igniter is written to be compatible with PHP 4.  Although we would have loved to take advantage of the better object handling 
+in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance), 
+at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our 
+potential audience.  Major OS vendors like RedHat have yet to support PHP 5, and they are unlikely to do so until 2007, so
+we felt that it did not serve the best interests of the PHP community to write Code Igniter in PHP 5.

+
+
Note:  Code Igniter will run on PHP 5.  It simply does not take advantage of any native features that are only available in that version.

+
+
Code Igniter is Light Weight

+
Truly light weight.  The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources.
+Additional libraries are loaded dynamically upon request, based on your needs for a given process, so the base system
+is very lean and quite fast.
+

+
+
Code Igniter Uses M-V-C

+
Code Igniter uses the Model-View-Controller approach, which allows great separation between logic and presentation.
+This is particularly good for projects in which designers are working with your template files, as the code these file contain will be minimized. We describe MVC in more detail on its own page.

+
+
Code Igniter Generates Clean URLs

+
The URLs generated by Code Igniter are clean and search-engine friendly.  Rather than using the standard "query string" 
+approach to URLs that is synonymous with dynamic systems, Code Igniter uses a segment-based approach:

+
+www.your-site.com/news/article/345
+
+
Note: By default the index.php file is included in the URL but it can be removed using a simple .htaccess file.

+
+
Code Igniter Packs a Punch

+
Code Igniter comes with a very nice set of libraries that enable the most commonly needed web development tasks, 
+like connecting to a database, sending email, validating form data, maintaining sessions, manipulating images, and more.

+
+
Code Igniter is Extensible

+
The system can be easily extended through the use of plugins and helper files, or even through class extensions or standard includes.

+
+
Code Igniter Does Not Require a Template Engine

+
Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template 
+engine is usually only marginally easier than learning the basics of PHP.  Consider this block of PHP code:

+
+<ul>

+

+<?php foreach ($addressbook as $name):?>

+

+<li><?=$name?></li>

+

+<?php endforeach; ?>

+

+</ul>
+
+
Contrast this with the pseudo-code used by a template engine:

+
+<ul>

+

+{foreach from=$addressbook item="name"}
 
+

+<li>{$name}</li>

+

+{/foreach}

+

+</ul>
+
+
Yes, the template engine example is a bit cleaner, but it comes at the price of performance, as the pseudo-code must be converted 
+back into PHP to run. Since one of our goals is maximum performance, we opted to not require the use of a template engine.

+
+
That said, Code Igniter does come with a simple template engine class which you can optionally use.  Or, if you
+prefer using a full-blown template engine such as Smarty, there's no reason why you can't use it with Code Igniter.
+Just include your template engine script when you write your controllers, and continue working as you normally do.

+
+
Code Igniter is Thoroughly Documented

+
Programmers love to code and hate to write documentation.  We're no different, of course, but
+since documentation is as important as the code itself, 
+we are committed to doing it. Our source code is extremely clean and well commented as well.

+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html
new file mode 100644
index 00000000..3cb1ba1f
--- /dev/null
+++ b/user_guide/overview/features.html
@@ -0,0 +1,122 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Code Igniter Features

+
+
Features in and of themselves are a very poor way to judge an application since they tell you nothing
+about the user experience, or how intuitively or intelligently it is designed.  Features
+don't reveal anything about the quality of the code, or the performance, or the attention to detail, or security practices.
+The only way to really judge an app is to try it and get to know the code. Installing 
+Code Igniter is child's play so we encourage you to do just that.  In the mean time here's a list of Code Igniter's main features.

+
+
    
+
  • Model-View-Controller Based System
    • 
+
  • PHP 4 Compatible
    • 
+
  • Extremely Light Weight
    • 
+
  • Full Featured database classes with support for several platforms.
    • 
+
  • Active Record Database Support
    • 
+
  • Form and Data Validation
    • 
+
  • Security and XSS Filtering
    • 
+
  • Session Management
    • 
+
  • Email Sending Class. Supports Attachments, HTML/Text email, multiple protocols (sendmail, SMTP, and Mail) and more.
    • 
+
  • Image Manipulation Library (cropping, resizing, rotating, etc.).  Supports GD, ImageMagick, and NetPBM
    • 
+
  • File Uploading Class
    • 
+
  • Localization
    • 
+
  • Pagination
    • 
+
  • Data Encryption
    • 
+
  • Benchmarking
    • 
+
  • Full Page Caching
    • 
+
  • Error Logging
    • 
+
  • Scaffolding
    • 
+
  • Calendaring Class
    • 
+
  • Template Engine Class
    • 
+
  • Trackback Class
    • 
+
  • XML-RPC Library
    • 
+
  • Unit Testing Class
    • 
+
  • Search-engine Friendly URLs
    • 
+
  • Flexible URI Routing
    • 
+
  • Library of "helper" functions
    • 
+
  • Plugin Support
    • 
+

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html
new file mode 100644
index 00000000..0fdd4d1a
--- /dev/null
+++ b/user_guide/overview/goals.html
@@ -0,0 +1,103 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
+
Design and Architectural Goals

+
+
Our goal for Code Igniter is maximum performance, capability, and flexibility in the smallest, lightest possible package.

+
+
To meet this goal we are committed to benchmarking, re-factoring, and simplifying at every step of the development process, 
+rejecting anything that doesn't further the stated objective.

+
+
From an technical and architectural standpoint, Code Igniter was created with the following objectives:

+
+
    
+
  • Dynamic Instantiation.  In Code Igniter, components are loaded and routines executed only when requested, rather than globally.  No assumptions are made by the system regarding what may be needed beyond the minimal core resources, so the system is very light-weight by default.  The events, as triggered by the HTTP request, and the controllers and views you design will determine what is invoked.
    • 
+
  • Loose Coupling.  Coupling is the degree to which components of a system rely on each other.  The less components depend on each other the more reusable and flexible the system becomes. Our goal was a very loosely coupled system.
    • 
+
  • Component Singularity.  Singularity is the degree to which components have a narrowly focused purpose.  In Code Igniter, each class and its functions are highly autonomous in order to allow maximum usefulness.
    • 
+

+
+
Code Igniter is a dynamically instantiated, loosely coupled system with high component singularity. It strives for simplicity, flexibility, and high performance in a small footprint package.

+
+
+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html
new file mode 100644
index 00000000..8ddbdad3
--- /dev/null
+++ b/user_guide/overview/index.html
@@ -0,0 +1,89 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
Code Igniter Overview

+
+
The following pages describe the broad concepts behind Code Igniter:

+
+	
+	
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html
new file mode 100644
index 00000000..4f251e4d
--- /dev/null
+++ b/user_guide/overview/mvc.html
@@ -0,0 +1,105 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+
+

+
+
+
Model-View-Controller

+
+
Code Igniter is based on the Model-View-Controller development pattern.  
+
+MVC is a software approach that separates application logic from presentation.  In practice, it permits your web pages to contain minimal scripting since the presentation is separate from the PHP scripting.

+
+
    
+
  • The Model represents your data structures. Typically your model classes will contains functions that help you 
+retrieve, insert, and update information in your your database.
    • 
+
  • The View is the information that is being presented to a user.  A View will normally be a web page, but
+in Code Igniter, a view can also be a page fragment like a header or footer. 
    • 
+
  • The Controller serves as an intermediary between the Model, the View,
+and any other resources needed to process the HTTP request and generate a web page.
    • 
+
+

+
+
Code Igniter has a fairly loose approach to MVC since Models are not required.  
+If you don't need the added separation, or find that maintaining models requires more complexity than you
+want, you can ignore them and build your application minimally using Controllers and Views. Code Igniter also 
+enables you to incorporate your own existing scripts, or even develop core libraries for the system,
+ enabling you to work in a way that makes the most sense to you.

+
+
+
+
+

+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/scripts/hacks.txt b/user_guide/scripts/hacks.txt
new file mode 100644
index 00000000..f29e5a77
--- /dev/null
+++ b/user_guide/scripts/hacks.txt
@@ -0,0 +1,9 @@
+I did the following hack in moo.fx.js:
+
+At line 79 in the toggle: function()  function, I added:
+
+document.getElementById('nav').style.display = 'block';
+
+
+
+-- Rick Ellis
\ No newline at end of file
diff --git a/user_guide/scripts/moo.fx.js b/user_guide/scripts/moo.fx.js
new file mode 100755
index 00000000..953e87c6
--- /dev/null
+++ b/user_guide/scripts/moo.fx.js
@@ -0,0 +1,119 @@
+/*
+moo.fx, simple effects library built with prototype.js (http://prototype.conio.net).
+by Valerio Proietti (http://mad4milk.net) MIT-style LICENSE.
+for more info (http://moofx.mad4milk.net).
+10/24/2005
+v(1.0.2)
+*/
+
+//base
+var fx = new Object();
+fx.Base = function(){};
+fx.Base.prototype = {
+	setOptions: function(options) {
+	this.options = {
+		duration: 500,
+		onComplete: ''
+	}
+	Object.extend(this.options, options || {});
+	},
+
+	go: function() {
+		this.duration = this.options.duration;
+		this.startTime = (new Date).getTime();
+		this.timer = setInterval (this.step.bind(this), 13);
+	},
+
+	step: function() {
+		var time  = (new Date).getTime();
+		var Tpos   = (time - this.startTime) / (this.duration);
+		if (time >= this.duration+this.startTime) {
+			this.now = this.to;
+			clearInterval (this.timer);
+			this.timer = null;
+			if (this.options.onComplete) setTimeout(this.options.onComplete.bind(this), 10);
+		}
+		else {
+			this.now = ((-Math.cos(Tpos*Math.PI)/2) + 0.5) * (this.to-this.from) + this.from;
+			//this time-position, sinoidal transition thing is from script.aculo.us
+		}
+		this.increase();
+	},
+
+	custom: function(from, to) {
+		if (this.timer != null) return;
+		this.from = from;
+		this.to = to;
+		this.go();
+	},
+
+	hide: function() {
+		this.now = 0;
+		this.increase();
+	},
+
+	clearTimer: function() {
+		clearInterval(this.timer);
+		this.timer = null;
+	}
+}
+
+//stretchers
+fx.Layout = Class.create();
+fx.Layout.prototype = Object.extend(new fx.Base(), {
+	initialize: function(el, options) {
+		this.el = $(el);
+		this.el.style.overflow = "hidden";
+		this.el.iniWidth = this.el.offsetWidth;
+		this.el.iniHeight = this.el.offsetHeight;
+		this.setOptions(options);
+	}
+});
+
+fx.Height = Class.create();
+Object.extend(Object.extend(fx.Height.prototype, fx.Layout.prototype), {	
+	increase: function() {
+		this.el.style.height = this.now + "px";
+	},
+
+	toggle: function() {
+		if (this.el.offsetHeight > 0) this.custom(this.el.offsetHeight, 0);
+		else this.custom(0, this.el.scrollHeight);
+	}
+});
+
+fx.Width = Class.create();
+Object.extend(Object.extend(fx.Width.prototype, fx.Layout.prototype), {	
+	increase: function() {
+		this.el.style.width = this.now + "px";
+	},
+
+	toggle: function(){
+		if (this.el.offsetWidth > 0) this.custom(this.el.offsetWidth, 0);
+		else this.custom(0, this.el.iniWidth);
+	}
+});
+
+//fader
+fx.Opacity = Class.create();
+fx.Opacity.prototype = Object.extend(new fx.Base(), {
+	initialize: function(el, options) {
+		this.el = $(el);
+		this.now = 1;
+		this.increase();
+		this.setOptions(options);
+	},
+
+	increase: function() {
+		if (this.now == 1) this.now = 0.9999;
+		if (this.now > 0 && this.el.style.visibility == "hidden") this.el.style.visibility = "visible";
+		if (this.now == 0) this.el.style.visibility = "hidden";
+		if (window.ActiveXObject) this.el.style.filter = "alpha(opacity=" + this.now*100 + ")";
+		this.el.style.opacity = this.now;
+	},
+
+	toggle: function() {
+		if (this.now > 0) this.custom(1, 0);
+		else this.custom(0, 1);
+	}
+});
\ No newline at end of file
diff --git a/user_guide/scripts/moo.fx.pack.js b/user_guide/scripts/moo.fx.pack.js
new file mode 100755
index 00000000..8b422832
--- /dev/null
+++ b/user_guide/scripts/moo.fx.pack.js
@@ -0,0 +1,241 @@
+/*
+moo.fx pack, effects extensions for moo.fx.
+by Valerio Proietti (http://mad4milk.net) MIT-style LICENSE
+for more info visit (http://moofx.mad4milk.net).
+Wednesday, November 16, 2005
+v1.0.4
+*/
+
+//text size modify, now works with pixels too.
+fx.Text = Class.create();
+fx.Text.prototype = Object.extend(new fx.Base(), {
+	initialize: function(el, options) {
+		this.el = $(el);
+		this.setOptions(options);
+		if (!this.options.unit) this.options.unit = "em";
+	},
+
+	increase: function() {
+		this.el.style.fontSize = this.now + this.options.unit;
+	}
+});
+
+//composition effect, calls Width and Height alltogheter
+fx.Resize = Class.create();
+fx.Resize.prototype = {
+	initialize: function(el, options) {
+		this.h = new fx.Height(el, options); 
+		if (options) options.onComplete = null;
+		this.w = new fx.Width(el, options);
+		this.el = $(el);
+	},
+
+	toggle: function(){
+		this.h.toggle();
+		this.w.toggle();
+	},
+
+	modify: function(hto, wto) {
+		this.h.custom(this.el.offsetHeight, this.el.offsetHeight + hto);
+		this.w.custom(this.el.offsetWidth, this.el.offsetWidth + wto);
+	},
+
+	custom: function(hto, wto) {
+		this.h.custom(this.el.offsetHeight, hto);
+		this.w.custom(this.el.offsetWidth, wto);
+	},
+
+	hide: function(){
+		this.h.hide();
+		this.w.hide();
+	}
+}
+
+//composition effect, calls Opacity and (Width and/or Height) alltogheter
+fx.FadeSize = Class.create();
+fx.FadeSize.prototype = {
+	initialize: function(el, options) {
+		this.el = $(el);
+		this.el.o = new fx.Opacity(el, options);
+		if (options) options.onComplete = null;
+		this.el.h = new fx.Height(el, options);
+		this.el.w = new fx.Width(el, options);
+	},
+
+	toggle: function() {
+		this.el.o.toggle();
+		for (var i = 0; i < arguments.length; i++) {
+			if (arguments[i] == 'height') this.el.h.toggle();
+			if (arguments[i] == 'width') this.el.w.toggle();
+		}
+	},
+
+	hide: function(){
+		this.el.o.hide();
+		for (var i = 0; i < arguments.length; i++) {
+			if (arguments[i] == 'height') this.el.h.hide();
+			if (arguments[i] == 'width') this.el.w.hide();
+		}
+	}
+}
+
+//intended to work with arrays.
+var Multi = new Object();
+Multi = function(){};
+Multi.prototype = {
+	initialize: function(elements, options){
+		this.options = options;
+		this.el = this.getElementsFromArray(elements);
+		for (i=0;i 0 && this.el[i] != el && this.el[i].h.timer == null && el.h.timer == null){
+				this.el[i].fs.toggle(mode);
+				setTimeout(function(){el.fs.toggle(mode);}.bind(el), delay);
+			}
+			
+		}
+	},
+
+	hide: function(el, mode){
+		el.fs.hide(mode);
+	}
+});
+
+var Remember = new Object();
+Remember = function(){};
+Remember.prototype = {
+	initialize: function(el, options){
+		this.el = $(el);
+		this.days = 365;
+		this.options = options;
+		this.effect();
+		var cookie = this.readCookie();
+		if (cookie) {
+			this.fx.now = cookie;
+			this.fx.increase();
+		}
+	},
+
+	//cookie functions based on code by Peter-Paul Koch
+	setCookie: function(value) {
+		var date = new Date();
+		date.setTime(date.getTime()+(this.days*24*60*60*1000));
+		var expires = "; expires="+date.toGMTString();
+		document.cookie = this.el+this.el.id+this.prefix+"="+value+expires+"; path=/";
+	},
+
+	readCookie: function() {
+		var nameEQ = this.el+this.el.id+this.prefix + "=";
+		var ca = document.cookie.split(';');
+		for(var i=0;i < ca.length;i++) {
+			var c = ca[i];
+			while (c.charAt(0)==' ') c = c.substring(1,c.length);
+			if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+		}
+		return false;
+	},
+
+	custom: function(from, to){
+		if (this.fx.now != to) {
+			this.setCookie(to);
+			this.fx.custom(from, to);
+		}
+	}
+}
+
+fx.RememberHeight = Class.create();
+fx.RememberHeight.prototype = Object.extend(new Remember(), {
+	effect: function(){
+		this.fx = new fx.Height(this.el, this.options);
+		this.prefix = 'height';
+	},
+	
+	toggle: function(){
+		if (this.el.offsetHeight == 0) this.setCookie(this.el.scrollHeight);
+		else this.setCookie(0);
+		this.fx.toggle();
+	},
+	
+	resize: function(to){
+		this.setCookie(this.el.offsetHeight+to);
+		this.fx.custom(this.el.offsetHeight,this.el.offsetHeight+to);
+	},
+
+	hide: function(){
+		if (!this.readCookie()) {
+			this.fx.hide();
+		}
+	}
+});
+
+fx.RememberText = Class.create();
+fx.RememberText.prototype = Object.extend(new Remember(), {
+	effect: function(){
+		this.fx = new fx.Text(this.el, this.options);
+		this.prefix = 'text';
+	}
+});
+
+
+//use to attach effects without using js code, just classnames and rel attributes.
+ParseClassNames = Class.create();
+ParseClassNames.prototype = {
+	initialize: function(options){
+		var babies = document.getElementsByTagName('*') || document.all;
+		for (var i = 0; i < babies.length; i++) {
+			var el = babies[i];
+			//attach the effect, from the classNames;
+			var effects = this.getEffects(el);
+			for (var j = 0; j < effects.length; j++) {
+				if (j == 1 && options) options.onComplete = null;
+				el[effects[j]+"fx"] = new fx[effects[j]](el, options);
+			}
+			//execute methods, from rel
+			if (el.rel) {
+				el.crel = el.rel.split(' ');
+				if (el.crel[0].indexOf("fx_") > -1) {
+					var event = el.crel[0].replace('fx_', '');
+					var tocompute = this.getEffects($(el.crel[1]));
+					el["on"+event] = function(){
+						for (var f = 0; f < tocompute.length; f++) {
+							$(this.crel[1])[tocompute[f]+"fx"][this.crel[2] || "toggle"](this.crel[3] || null, this.crel[4] || null);
+						}
+					}
+				}
+			}
+		}
+	},
+
+	getEffects: function(el){
+		var effects = new Array();
+		var css = el.className.split(' ');
+		for (var i = 0; i < css.length; i++) {
+			if (css[i].indexOf('fx_') > -1) {
+				var effect = css[i].replace('fx_', '');
+				effects.push(effect);
+			}
+		}
+		return effects;
+	}
+}
\ No newline at end of file
diff --git a/user_guide/scripts/nav.js b/user_guide/scripts/nav.js
new file mode 100644
index 00000000..be0f7b1a
--- /dev/null
+++ b/user_guide/scripts/nav.js
@@ -0,0 +1,116 @@
+function create_menu(basepath)
+{
+	var base = (basepath == 'null') ? '' : basepath;
+
+	document.write(
+		'' +
+		'
' +
+
+		'
User Guide Home
' +	
+
+		'
Basic Info
' +
+		'' +	
+		
+		'
Installation
' +
+		'' +
+		
+		'
Introduction
' +
+		'' +	
+				
+		'		' +
+
+		'
General Topics
' +
+		'' +
+		
+		'		' +
+
+				
+		'
Class Reference
' +
+		'' +
+
+		'		' +
+
+		'
Helper Reference
' +
+		'' +	
+
+
+		'
Additional Resources
' +
+		'' +	
+		
+		'
');
+}
\ No newline at end of file
diff --git a/user_guide/scripts/prototype.lite.js b/user_guide/scripts/prototype.lite.js
new file mode 100755
index 00000000..f1520e2c
--- /dev/null
+++ b/user_guide/scripts/prototype.lite.js
@@ -0,0 +1,127 @@
+/*  Prototype JavaScript framework
+ *  (c) 2005 Sam Stephenson 
+ *
+ *  Prototype is freely distributable under the terms of an MIT-style license.
+ *
+ *  For details, see the Prototype web site: http://prototype.conio.net/
+ *
+/*--------------------------------------------------------------------------*/
+
+
+//note: this is a stripped down version of prototype, to be used with moo.fx by mad4milk (http://moofx.mad4milk.net).
+
+var Class = {
+  create: function() {
+    return function() { 
+      this.initialize.apply(this, arguments);
+    }
+  }
+}
+
+Object.extend = function(destination, source) {
+  for (property in source) {
+    destination[property] = source[property];
+  }
+  return destination;
+}
+
+Function.prototype.bind = function(object) {
+  var __method = this;
+  return function() {
+    return __method.apply(object, arguments);
+  }
+}
+
+function $() {
+  var elements = new Array();
+
+  for (var i = 0; i < arguments.length; i++) {
+    var element = arguments[i];
+    if (typeof element == 'string')
+      element = document.getElementById(element);
+
+    if (arguments.length == 1) 
+      return element;
+
+    elements.push(element);
+  }
+
+  return elements;
+}
+
+//-------------------------
+
+document.getElementsByClassName = function(className) {
+  var children = document.getElementsByTagName('*') || document.all;
+  var elements = new Array();
+  
+  for (var i = 0; i < children.length; i++) {
+    var child = children[i];
+    var classNames = child.className.split(' ');
+    for (var j = 0; j < classNames.length; j++) {
+      if (classNames[j] == className) {
+        elements.push(child);
+        break;
+      }
+    }
+  }
+  
+  return elements;
+}
+
+//-------------------------
+
+if (!window.Element) {
+  var Element = new Object();
+}
+
+Object.extend(Element, {
+  remove: function(element) {
+    element = $(element);
+    element.parentNode.removeChild(element);
+  },
+
+  hasClassName: function(element, className) {
+    element = $(element);
+    if (!element)
+      return;
+    var a = element.className.split(' ');
+    for (var i = 0; i < a.length; i++) {
+      if (a[i] == className)
+        return true;
+    }
+    return false;
+  },
+
+  addClassName: function(element, className) {
+    element = $(element);
+    Element.removeClassName(element, className);
+    element.className += ' ' + className;
+  },
+  
+  removeClassName: function(element, className) {
+    element = $(element);
+    if (!element)
+      return;
+    var newClassName = '';
+    var a = element.className.split(' ');
+    for (var i = 0; i < a.length; i++) {
+      if (a[i] != className) {
+        if (i > 0)
+          newClassName += ' ';
+        newClassName += a[i];
+      }
+    }
+    element.className = newClassName;
+  },
+  
+  // removes whitespace-only text node children
+  cleanWhitespace: function(element) {
+    element = $(element);
+    for (var i = 0; i < element.childNodes.length; i++) {
+      var node = element.childNodes[i];
+      if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) 
+        Element.remove(node);
+    }
+  }
+});
\ No newline at end of file
diff --git a/user_guide/toc.html b/user_guide/toc.html
new file mode 100644
index 00000000..9935c730
--- /dev/null
+++ b/user_guide/toc.html
@@ -0,0 +1,182 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
Code Igniter User Guide Version 1.4.0

+

+
+
+
+
+
+
+
+
+
+
+

+
+
+

+
+
+

+
+
+
Table of Contents

+
+
+
Basic Info
 
+ 	
+
+
Installation
 
+ 
+
+
Introduction
 
+ 	
+
+
+
General Topics
 
+ 
+
+
+		
+
Class Reference
 
+ 
+
+
+
+
Helper Reference
 
+ 	
+
+
Additional Resources
 
+
+
+
+
+
+

+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user_guide/userguide.css b/user_guide/userguide.css
new file mode 100644
index 00000000..4da90dc6
--- /dev/null
+++ b/user_guide/userguide.css
@@ -0,0 +1,406 @@
+body {
+ margin: 0;
+ padding: 0;
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ font-size: 14px;
+ color: #4F5155;
+ background: #fff url(images/background.jpg) repeat-x left top;
+}
+
+a {
+ color: #003399;
+ background-color: transparent;
+ text-decoration: none;
+ font-weight: normal;
+}
+a:visited {
+ color: #003399;
+ background-color: transparent;
+ text-decoration: none;
+}
+a:hover {
+ color: #000;
+ text-decoration: none;
+ background-color: transparent;
+}
+
+#breadcrumb {
+ float: left;
+ background-color: transparent;
+ margin: 10px 0 0 42px;
+ padding: 0;
+ font-size: 10px;
+ color: #666;
+}
+#breadcrumb_right {
+ float: right;
+ width: 175px;
+ background-color: transparent;
+ padding: 8px 8px 3px 0;
+ text-align: right;
+ font-size: 10px;
+ color: #666;
+}
+#nav {
+ background-color: #5d5d5d;
+ margin: 0;
+ padding: 0;
+}
+#nav2 {
+ background: #fff url(images/nav_bg.jpg) repeat-x left top;
+ padding: 0 180px 0 0;
+ margin: 0;
+ text-align: right;
+}
+#nav_inner {
+ background-color: transparent;
+ padding: 8px 12px 0 20px;
+ margin: 0;
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ font-size: 11px;
+}
+
+#nav_inner h3 {
+ font-size: 12px;
+ color: #fff;
+ margin: 0;
+ padding: 0;
+}
+
+#nav_inner .td_sep {
+ background: transparent url(images/nav_separator.jpg) repeat-y left top;
+ width: 25%;
+ padding: 0 0 0 20px;
+}
+#nav_inner .td {
+ width: 25%;
+}
+#nav_inner p {
+ color: #eee;
+ background-color: transparent;
+ padding:0;
+ margin: 0 0 10px 0;
+}
+#nav_inner ul {
+ list-style-image: url(images/arrow.gif);
+ padding: 0 0 0 18px;
+ margin: 8px 0 12px 0;
+}
+#nav_inner li {
+ padding: 0;
+ margin: 0 0 4px 0;
+}
+
+#nav_inner a {
+ color: #eee;
+ background-color: transparent;
+ text-decoration: none;
+ font-weight: normal;
+}
+
+#nav_inner a:visited {
+ color: #eee;
+ background-color: transparent;
+ text-decoration: none;
+}
+
+#nav_inner a:hover {
+ color: #ccc;
+ text-decoration: none;
+ background-color: transparent;
+}
+
+#masthead {
+ margin: 0 40px 0 35px;
+ padding: 0 0 0 6px;
+ border-bottom: 1px solid #999;
+}
+
+#masthead h1 {
+background-color: transparent;
+color: #003399;
+font-size: 18px;
+font-weight: normal;
+margin: 0;
+padding: 0 0 6px 0;
+}
+
+#searchbox {
+ background-color: transparent;
+ padding: 6px 40px 0 0;
+ text-align: right;
+ font-size: 10px;
+ color: #666;
+}
+
+#img_welcome {
+ border-bottom: 1px solid #D0D0D0;
+ margin: 0 40px 0 40px;
+ padding: 0;
+ text-align: center;
+}
+
+#content {
+ margin: 20px 40px 0 40px;
+ padding: 0;
+}
+
+#content p {
+ margin: 10px 20px 12px 0;
+}
+
+#content h1 {
+color: #333;
+font-weight: normal;
+font-size: 22px;
+margin: 0 0 15px 0;
+padding: 0;
+}
+
+#content h2 {
+ background-color: transparent;
+ border-bottom: 1px solid #D0D0D0;
+ color: #444;
+ font-size: 16px;
+ font-weight: bold;
+ margin: 24px 0 2px 0;
+ padding: 5px 0 6px 0;
+}
+
+#content h3 {
+ background-color: transparent;
+ color: #333;
+ font-size: 14px;
+ font-weight: bold;
+ margin: 22px 0 12px 0;
+ padding: 0 0 0 0;
+}
+
+#content h4 {
+ background-color: transparent;
+ color: #444;
+ font-size: 14px;
+ font-weight: bold;
+ margin: 22px 0 0 0;
+ padding: 0 0 0 0;
+}
+
+#content img {
+ margin: auto;
+ padding: 0;
+}
+
+#content code {
+ font-family: Monaco, Verdana, Sans-serif;
+ font-size: 12px;
+ background-color: #f9f9f9;
+ border: 1px solid #D0D0D0;
+ color: #002166;
+ display: block;
+ margin: 14px 0 14px 0;
+ padding: 12px 10px 12px 10px;
+}
+
+#content pre {
+ font-family: Monaco, Verdana, Sans-serif;
+ font-size: 12px;
+ background-color: #f9f9f9;
+ border: 1px solid #D0D0D0;
+ color: #002166;
+ display: block;
+ margin: 14px 0 14px 0;
+ padding: 12px 10px 12px 10px;
+}
+
+#content .path {
+ background-color: #EBF3EC;
+ border: 1px solid #99BC99;
+ color: #005702;
+ text-align: center;
+ margin: 0 0 14px 0;
+ padding: 5px 10px 5px 8px;
+}
+
+#content dfn {
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ color: #00620C;
+ font-weight: bold;
+ font-style: normal;
+}
+#content var {
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ color: #8F5B00;
+ font-weight: bold;
+ font-style: normal;
+}
+#content samp {
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ color: #480091;
+ font-weight: bold;
+ font-style: normal;
+}
+#content kbd { 
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ color: #A70000;
+ font-weight: bold;
+ font-style: normal;
+}
+
+#content ul {
+ list-style-image: url(images/arrow.gif);
+ padding: 0 0 0 18px;
+ margin: 8px 0 12px 0;
+}
+
+#content li {
+ padding: 0;
+ margin: 0 0 6px 0;
+}
+
+#content li p {
+ margin-left: 0;
+ margin-right: 0;
+}
+
+#content .tableborder {
+ border: 1px solid #999;
+}
+#content th {
+ font-weight: bold;
+ text-align: left;
+ font-size: 12px;
+ background-color: #666;
+ color: #fff;
+ padding: 4px;
+}
+
+#content .td {
+ font-weight: normal;
+ font-size: 12px;
+ padding: 6px;
+ background-color: #f3f3f3;
+}
+
+#content .tdpackage {
+ font-weight: normal;
+ font-size: 12px;
+}
+
+#content .important {
+ background: #FBE6F2;
+ border: 1px solid #D893A1;
+ color: #333;
+ margin: 10px 0 5px 0;
+ padding: 10px;
+}
+
+#content .important p {
+ margin: 6px 0 8px 0;
+ padding: 0;
+}
+ 
+#content .important .leftpad {
+ margin: 6px 0 8px 0;
+ padding-left: 20px;
+}
+ 
+#content .critical {
+ background: #FBE6F2;
+ border: 1px solid #E68F8F;
+ color: #333;
+ margin: 10px 0 5px 0;
+ padding: 10px;
+}
+ 
+#content .critical p {
+ margin: 5px 0 6px 0;
+ padding: 0;
+}
+
+
+#footer {
+background-color: transparent;
+font-size: 10px;
+padding: 16px 0 15px 0;
+margin: 20px 0 0 0;
+text-align: center;
+}
+
+#footer p {
+ font-size: 10px;
+ color: #999;
+ text-align: center;
+}
+#footer address {
+ font-style: normal;
+}
+
+.center {
+ text-align: center;
+}
+
+img {
+ padding:0;
+ border: 0;
+ margin: 0;
+}
+
+.nopad {
+ padding:0;
+ border: 0;
+ margin: 0;
+}
+
+
+form {
+ margin: 0;
+ padding: 0;
+}
+
+.input {
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ font-size: 11px;
+ color: #333;
+ border: 1px solid #B3B4BD;
+ width: 100%;
+ font-size: 11px;
+ height: 1.5em;
+ padding: 0;
+ margin: 0;
+} 
+
+.textarea {
+ font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+ font-size: 14px;
+ color: #143270;
+ background-color: #f9f9f9;
+ border: 1px solid #B3B4BD;
+ width: 100%;
+ padding: 0;
+ margin: 0;
+}
+
+.select {
+ background-color: #fff;
+ font-size:  11px;
+ font-weight: normal;
+ color: #333;
+ padding: 0;
+ margin: 0 0 3px 0;
+}
+
+.checkbox {
+ background-color: transparent;
+ padding: 0;
+ border: 0;
+}
+
+.submit {
+ background-color: #000;
+ color: #fff;
+ font-weight: normal;
+ font-size: 10px;
+ border: 1px solid #fff;
+ margin: 0;
+ padding: 1px 5px 2px 5px;
+}
\ No newline at end of file

From d34f4248ec3fe428838aadccaf8ca57047a4f60e Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 25 Aug 2006 22:03:55 +0000
Subject: [PATCH 0002/2544]

---
 user_guide/general/libraries.html | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html
index 642399ba..edef2d72 100644
--- a/user_guide/general/libraries.html
+++ b/user_guide/general/libraries.html
@@ -47,7 +47,7 @@
 
 Code Igniter Home  › 
 User Guide Home  › 
-Loading Libraries
+Using Code Igniter Libraries
 
 
Search User Guide   

 
@@ -60,10 +60,10 @@
 
 

 
-
Loading Libraries

+
Using Code Igniter Libraries

 
-
The core libraries are the class files located in the "libraries" folder. 
-In most cases, to use one of these classes involves initializing it within your controllers using the following function:

+
All of the available libraries are located in your system/libraries folder. 
+In most cases, to use one of these classes involves initializing it within a controller using the following initialization function:

 
 $this->load->library('class name'); 
 
@@ -71,24 +71,11 @@ 
Loading Libraries

 
 $this->load->library('validation'); 
 
-
Once initialized you can use it as indicated in the user guide page corresponding to each class.

+
Once initialized you can use it as indicated in the user guide page corresponding to that class.

 
-
Semantic Relevance

+
Creating Your Own Libraries

 
-
The pattern you will  use when calling functions is this:

-
-
$this->class->function()

-
-
We've placed a high value on semantic relevance in the naming of our classes and functions.  
-Here are some examples of function calls you might use in Code Igniter:

-
-
$this->email->send()

-
$this->input->user_agent()

-
$this->benchmark->elapsed_time()

-
$this->db->query()

-
$this->load->helper()

-
$this->uri->segment()

-
$this->lang->line()

+
Please read the section of the user guide that discusses how to create your own libraries

 
 
 

From 04d4dbede875d9562da88f6eb4dfa2af8cc91511 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 25 Aug 2006 22:09:35 +0000
Subject: [PATCH 0003/2544]

---
 .../{base_classes.html => core_classes.html}       | 14 +++++++-------
 user_guide/scripts/nav.js                          |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename user_guide/general/{base_classes.html => core_classes.html} (88%)

diff --git a/user_guide/general/base_classes.html b/user_guide/general/core_classes.html
similarity index 88%
rename from user_guide/general/base_classes.html
rename to user_guide/general/core_classes.html
index 215bd25b..c03e70d6 100644
--- a/user_guide/general/base_classes.html
+++ b/user_guide/general/core_classes.html
@@ -47,7 +47,7 @@
 
 Code Igniter Home  › 
 User Guide Home  › 
-Replacing System Classes
+Creating Core System Classes
 
 
Search User Guide   

 
@@ -60,11 +60,11 @@
 
 

 
-
Replacing System Classes

+
Creating Core System Classes

 
 
Every time Code Igniter runs there are several base classes that are initialized automatically as part of the core framework.
-It is possible, however, to swap any of the core system files with your own versions.   Most users will never have any need to do this,
-but the option to replace them does exist for those that would like to significantly alter the Code Igniter core.
+It is possible, however, to swap any of the core system classes with your own versions.   Most users will never have any need to do this,
+but the option to replace them does exist for those that would like to significantly alter the Code Igniter core.
 

 
 
Note:  Replacing a core system class with your own version has a lot of implications, so make sure you 
@@ -90,10 +90,12 @@ 
System Class List

 
 
Replacing Core Classes

 
-
To use one of your own system classes instead of a default one simply place your version inside your local libraries directory:

+
To use one of your own system classes instead of a default one simply place your version inside your local application/libraries directory:

 
 application/libraries/some-class.php
 
+
If this directory does not exist you can create it.

+
 
Any file named identically to one from the list above will be used instead of the one normally used.

 
 
Please note that your class must use CI as a prefix. For example, if your file is named Input.php the class will be named:

@@ -106,8 +108,6 @@ 
Replacing Core Classes

 
 
 
-
-
 

 
 
diff --git a/user_guide/scripts/nav.js b/user_guide/scripts/nav.js
index be0f7b1a..27e65530 100644
--- a/user_guide/scripts/nav.js
+++ b/user_guide/scripts/nav.js
@@ -46,7 +46,7 @@ function create_menu(basepath)
 			'
  • Scripts
    • ' +
 			'
  • Using Code Igniter Libraries
    • ' +
 			'
  • Creating Your Own Libraries
    • ' +
-			'
  • Creating Core Classes
    • ' +
+			'
  • Creating Core Classes
    • ' +
 			'
  • Hooks - Extending the Core
    • ' +
 			'
  • Auto-loading Resources
    • ' +
 			'
  • Scaffolding
    • ' +

From a634e56d86b965df334e4a431fb0586565ade7a6 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 25 Aug 2006 22:19:55 +0000
Subject: [PATCH 0004/2544]

---
 user_guide/general/autoloader.html         | 2 +-
 user_guide/general/core_classes.html       | 4 ++--
 user_guide/general/creating_libraries.html | 4 ++--
 user_guide/general/hooks.html              | 4 ++--
 user_guide/general/scripts.html            | 2 +-
 user_guide/toc.html                        | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html
index 5f90fdda..48cdf4d0 100644
--- a/user_guide/general/autoloader.html
+++ b/user_guide/general/autoloader.html
@@ -93,7 +93,7 @@ 
    Auto-loading Resources
    
 
 
diff --git a/user_guide/toc.html b/user_guide/toc.html
index 9935c730..adfa3d0b 100644
--- a/user_guide/toc.html
+++ b/user_guide/toc.html
@@ -99,11 +99,11 @@ 
    General Topics
    
 	
  • Helpers
    •  
 	
  • Plugins
    •  
 	
  • Scripts
    •  
-	
  • Loading Libraries
    •  
-	
  • Creating Libraries
    •  
-	
  • Creating Ancillary Classes
    • 
+	
  • Using Code Igniter Libraries
    •  
+	
  • Creating Your Own Libraries
    •  
+	
  • Creating Core Classes
    • 
+	
  • Hooks - Extending the Core
    •  
 	
  • Auto-loading Resources
    •  
-	
  • Hooks
    •  
 	
  • Scaffolding
    •  
 	
  • URI Routing
    •  
 	
  • Error Handling
    •  

From d4e95072203a5cf4f1d50d16fe3e490f275a4307 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 26 Aug 2006 01:15:06 +0000
Subject: [PATCH 0005/2544]

---
 system/application/config/routes.php |  2 ++
 system/libraries/Router.php          | 19 ++++++++++++++----
 user_guide/general/changelog.html    |  3 ++-
 user_guide/general/routing.html      | 29 +++++++++++++++++++++++++---
 4 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/system/application/config/routes.php b/system/application/config/routes.php
index 622bf88e..5167f756 100644
--- a/system/application/config/routes.php
+++ b/system/application/config/routes.php
@@ -46,4 +46,6 @@
 // Define your own routes below -------------------------------------------
 
 
+$route['products\/([a-z]+)\/(\d+)'] = "$1/a$2";
+
 ?>
\ No newline at end of file
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index abc253ef..b61dfb79 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -300,16 +300,27 @@ function _parse_routes()
 		}
 		
 		// Loop through the route array looking for wildcards
-		foreach ($this->routes as $key => $val)
+		foreach (array_slice($this->routes, 1) as $key => $val)
 		{
 			if (count(explode('/', $key)) != $num)
 				continue;
-		
-			if (preg_match("|".str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key))."$|", $uri))
-			{
+						
+			// Convert wildcards to RegEx
+			$key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key));
+			
+			// Does the regex match this URI ?
+			if (preg_match('|^'.$key.'$|', $uri))
+			{			
+				// Do we have a replacemnt?
+				if (strpos($val, '$') !== FALSE AND strpos($key, '(') !== FALSE)
+				{
+					$val = preg_replace('|^'.$key.'$|', $val, $uri);
+				}
+			
 				$this->_compile_segments(explode('/', $val), TRUE);		
 				break;
 			}
+		
 		}	
 	}
 	// END set_method()
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 0bcb165d..a03d6b19 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -69,8 +69,9 @@ 
    Version 1.4.0
    
 
 
      
 
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • 
-
    • Added the ability to replace core system classes with your own classes.
      • 
+
    • Added the ability to replace core system classes with your own classes.
      • 
 
    • Added support for % character in URL.
      • 
+
    • Updated the Routing feature to accept regular expressions within routing rules.
      • 
 
    • Moved the MIME type array out of the Upload class and into its own file in the applications/comfig/ folder.
      • 
 
    • Removed a strtolower() call that was changing URL segments to lower case.
      • 
 
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name.  Please use dohash() instead.
      • 
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index c6e8bd9c..977698b9 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -85,8 +85,13 @@ 
      URI Routing
      
 
 
      Setting your own routing rules
      
 
-
      Routing rules are defined in your application/config/routes.php file.  In it you'll see an array called $route, that
-you can use to specify your own routing criteria. A typical route might look something like this:
      
+
      Routing rules are defined in your application/config/routes.php file.  In it you'll see an array called $route that
+permits you to specify your own routing criteria. Routes can either be specified using wildcards or Regular Expressions
+
+
+
      Wildcards
      
+
+
      A typical wildcard route might look something like this:
      
 
 $route['product/:num'] = "catalog/product_lookup";
 
@@ -125,8 +130,21 @@ 
      Examples
      
 
 
      Important: Do not use leading/trailing slashes.
      
 
+
      Regular Expressions
      
+
+
      If you prefer you can use regular expressions to define your routing rules.  Any valid regular expression is allowed, as are back-references.
      
+
+
      Note:  If you use back-references you must use the dollar syntax rather then the double backslash syntax.
      
+
+
      A typical RegEx route might look something like this:
      
+
+$route['products\/([a-z]+)\/(\d+)'] = "$1/id_$2";
 
-
      Reserved Route
      
+
      In the above example, a URI similar to products/shirts/123 would instead call the shirts controller class and the id_123 function.
      
+
+
      You can also mix and match wildcards with regular expressions.
      
+
+
      Reserved Routes
      
 
 
      There are two reserved routes:
      
 
@@ -144,6 +162,11 @@ 
      Reserved Route
      
 
 
 
+
+
+
+
+
 
    
 
 

From 45c872b0ac215d590e785fe393241a06facd7e05 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 26 Aug 2006 04:51:38 +0000
Subject: [PATCH 0006/2544]

---
 system/codeigniter/CodeIgniter.php |  13 +-
 system/libraries/Router.php        | 211 +++++++++++++++++++----------
 user_guide/general/changelog.html  |   1 +
 3 files changed, 144 insertions(+), 81 deletions(-)

diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index aef7618e..de7f89af 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -99,16 +99,6 @@
 	}
 }
 
-/*
- * ------------------------------------------------------
- *  Does the requested controller exist?
- * ------------------------------------------------------
- */
-if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_class().EXT))
-{
-	show_404();
-}
-
 /*
  * ------------------------------------------------------
  *  Load the remaining base classes
@@ -132,7 +122,6 @@
  * 
  */
  
- 
 _load_class('CI_Loader'); 
   
 if (floor(phpversion()) < 5)
@@ -146,7 +135,7 @@
 
 _load_class('CI_Controller'); 
 
-require(APPPATH.'controllers/'.$RTR->fetch_class().EXT);
+require(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT);
 
 /*
  * ------------------------------------------------------
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index b61dfb79..7839de2d 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -34,6 +34,7 @@ class CI_Router {
 	var $routes 		= array();
 	var $class			= '';
 	var $method			= 'index';
+	var $directory		= '';
 	var $uri_protocol 	= 'auto';
 	var $default_controller;
 	var $scaffolding_request = FALSE; // Must be set to FALSE
@@ -121,6 +122,7 @@ function _set_route_mapping()
 			log_message('debug', "No URI present. Default controller set.");
 			return;
 		}
+		unset($this->routes['default_controller']);
 		
 		// Do we need to remove the suffix specified in the config file?
 		if  ($this->config->item('url_suffix') != "")
@@ -129,13 +131,20 @@ function _set_route_mapping()
 		}
 
 		// Explode the URI Segments. The individual segments will
-		// be stored in the $this->segments array.
-		$this->_compile_segments(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)));
-
-
-		// Remap the class/method if a route exists
-		unset($this->routes['default_controller']);
+		// be stored in the $this->segments array.	
+		$i = 1;
+		foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val)
+		{
+			// Filter segments for security
+			$val = trim($this->_filter_uri($val));
+			
+			if ($val != '')
+				$this->segments[$i++] = $val;
+		}
 		
+		$this->_compile_segments($this->segments);
+		
+		// Do we have any custom routing to deal with?
 		if (count($this->routes) > 0)
 		{
 			$this->_parse_routes();
@@ -157,19 +166,15 @@ function _set_route_mapping()
 	 * @param	bool
 	 * @return	void
 	 */
-	function _compile_segments($segs, $route = FALSE)
-	{		
-		$segments = array();
-	
-		$i = 1;
-		foreach($segs as $val)
+	function _compile_segments($segments = array())
+	{	
+		$segments = $this->_validate_segments($segments);
+		
+		if (count($segments) == 0)
 		{
-			$val = trim($this->_filter_uri($val));
-			
-			if ($val != '')
-				$segments[$i++] = $val;
+			return;
 		}
-		
+						
 		$this->set_class($segments['1']);
 		
 		if (isset($segments['2']))
@@ -186,15 +191,54 @@ function _compile_segments($segs, $route = FALSE)
 				$this->set_method($segments['2']);
 			}
 		}
-		
-		if ($route == FALSE)
+	}
+	// END _compile_segments()
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Validates the supplied segments.  Attempts to determine the path to
+	 * the controller.
+	 *
+	 * @access	private
+	 * @param	array
+	 * @return	array
+	 */	
+	function _validate_segments($segments)
+	{
+		// Does the requested controller exist?
+		if ( ! file_exists(APPPATH.'controllers/'.$segments['1'].EXT))
 		{
-			$this->segments = $segments;
+			// Is it a directory?  No?  Smite them!
+			if ( ! is_dir(APPPATH.'controllers/'.$segments['1']))
+			{
+				show_404();
+			}
+			else
+			{
+				$this->set_directory($segments['1']);	
+				$segs = array_slice($segments, 1);
+				
+				if (count($segs) == 0)
+				{
+					$this->set_class($this->default_controller);
+					$this->set_method('index');
+					$this->directory = '';
+					return array();
+				}
+	
+				$i = 1;
+				$segments = array();
+				foreach ($segs as $val)
+				{
+					$segments[$i++] = $val;
+				}
+			}
 		}
 		
-		unset($segments);
+		return $segments;
 	}
-	// END _compile_segments()
+	// END _validate_segments()
 	
 	// --------------------------------------------------------------------
 	
@@ -218,6 +262,56 @@ function _filter_uri($str)
 	
 	// --------------------------------------------------------------------
 	
+	/**
+	 *  Parse Routes
+	 *
+	 * This function matches any routes that may exist in
+	 * the config/routes.php file against the URI to 
+	 * determine if the class/method need to be remapped.
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _parse_routes()
+	{
+		// Turn the segment array into a URI string
+		$uri = implode('/', $this->segments);
+		$num = count($this->segments);
+
+		// Is there a literal match?  If so we're done
+		if (isset($this->routes[$uri]))
+		{
+			$this->_compile_segments(explode('/', $this->routes[$uri]));		
+			return;
+		}
+		
+		// Loop through the route array looking for wildcards
+		foreach (array_slice($this->routes, 1) as $key => $val)
+		{
+			if (count(explode('/', $key)) != $num)
+				continue;
+						
+			// Convert wildcards to RegEx
+			$key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key));
+			
+			// Does the RegEx match?
+			if (preg_match('|^'.$key.'$|', $uri))
+			{			
+				// Do we have a back-reference?
+				if (strpos($val, '$') !== FALSE AND strpos($key, '(') !== FALSE)
+				{
+					$val = preg_replace('|^'.$key.'$|', $val, $uri);
+				}
+			
+				$this->_compile_segments(explode('/', $val));		
+				return;
+			}
+		}	
+	}
+	// END set_method()
+
+	// --------------------------------------------------------------------
+	
 	/**
 	 * Set the class name
 	 *
@@ -229,7 +323,7 @@ function set_class($class)
 	{
 		$this->class = $class;
 	}
-	// END _filter_uri()
+	// END set_class()
 	
 	// --------------------------------------------------------------------
 	
@@ -243,7 +337,7 @@ function fetch_class()
 	{
 		return $this->class;
 	}
-	// END _filter_uri()
+	// END fetch_class()
 	
 	// --------------------------------------------------------------------
 	
@@ -259,7 +353,7 @@ function set_method($method)
 		$this->method = $method;
 	}
 	// END set_method()
-	
+
 	// --------------------------------------------------------------------
 	
 	/**
@@ -272,58 +366,37 @@ function fetch_method()
 	{
 		return $this->method;
 	}
-	// END set_method()
-	
+	// END fetch_method()
+
 	// --------------------------------------------------------------------
 	
 	/**
-	 *  Parse Routes
+	 *  Set the directory name
 	 *
-	 * This function matches any routes that may exist in
-	 * the config/routes.php file against the URI to 
-	 * determine if the class/method need to be remapped.
-	 *
-	 * @access	private
+	 * @access	public
+	 * @param	string
 	 * @return	void
-	 */
-	function _parse_routes()
+	 */	
+	function set_directory($dir)
 	{
-		// Turn the segment array into a URI string
-		$uri = implode('/', $this->segments);
-		$num = count($this->segments);
+		$this->directory = $dir.'/';
+	}
+	// END set_directory()
 
-		// Is there a literal match?  If so we're done
-		if (isset($this->routes[$uri]))
-		{
-			$this->_compile_segments(explode('/', $this->routes[$uri]), TRUE);		
-			return;
-		}
-		
-		// Loop through the route array looking for wildcards
-		foreach (array_slice($this->routes, 1) as $key => $val)
-		{
-			if (count(explode('/', $key)) != $num)
-				continue;
-						
-			// Convert wildcards to RegEx
-			$key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key));
-			
-			// Does the regex match this URI ?
-			if (preg_match('|^'.$key.'$|', $uri))
-			{			
-				// Do we have a replacemnt?
-				if (strpos($val, '$') !== FALSE AND strpos($key, '(') !== FALSE)
-				{
-					$val = preg_replace('|^'.$key.'$|', $val, $uri);
-				}
-			
-				$this->_compile_segments(explode('/', $val), TRUE);		
-				break;
-			}
-		
-		}	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Fetch the sub-directory (if any) that contains the requested controller class
+	 *
+	 * @access	public
+	 * @return	string
+	 */	
+	function fetch_directory()
+	{
+		return $this->directory;
 	}
-	// END set_method()
+	// END fetch_directory()
+
 }
 // END Router Class
 ?>
\ No newline at end of file
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index a03d6b19..5f3b8690 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -71,6 +71,7 @@ 
    Version 1.4.0
    
 
  • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • 
 
  • Added the ability to replace core system classes with your own classes.
    • 
 
  • Added support for % character in URL.
    • 
+
  • Added the ability to organize controller files into sub-folders.
 
  • Updated the Routing feature to accept regular expressions within routing rules.
    • 
 
  • Moved the MIME type array out of the Upload class and into its own file in the applications/comfig/ folder.
    • 
 
  • Removed a strtolower() call that was changing URL segments to lower case.
    • 

From e07fbb376a741e21e69a182eada322c4d3b7e62e Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 26 Aug 2006 17:11:01 +0000
Subject: [PATCH 0007/2544]

---
 system/libraries/Router.php | 84 ++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 7839de2d..67814545 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -132,23 +132,25 @@ function _set_route_mapping()
 
 		// Explode the URI Segments. The individual segments will
 		// be stored in the $this->segments array.	
-		$i = 1;
 		foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val)
 		{
 			// Filter segments for security
 			$val = trim($this->_filter_uri($val));
 			
 			if ($val != '')
-				$this->segments[$i++] = $val;
+				$this->segments[] = $val;
 		}
 		
-		$this->_compile_segments($this->segments);
+		// Parse any custom routing that may exist
+		$this->_parse_routes();		
 		
-		// Do we have any custom routing to deal with?
-		if (count($this->routes) > 0)
+		// Re-index the segment array so that it starts with 1 rather than 0
+		$i = 1;
+		foreach ($this->segments as $val)
 		{
-			$this->_parse_routes();
+			$this->segments[$i++] = $val;
 		}
+		unset($this->segments['0']);
 	}
 	// END _set_route_mapping()
 	
@@ -175,12 +177,12 @@ function _compile_segments($segments = array())
 			return;
 		}
 						
-		$this->set_class($segments['1']);
+		$this->set_class($segments['0']);
 		
-		if (isset($segments['2']))
+		if (isset($segments['1']))
 		{
 			// A scaffolding request. No funny business with the URL
-			if ($this->routes['scaffolding_trigger'] == $segments['2'] AND $segments['2'] != '_ci_scaffolding')
+			if ($this->routes['scaffolding_trigger'] == $segments['1'] AND $segments['1'] != '_ci_scaffolding')
 			{
 				$this->scaffolding_request = TRUE;
 				unset($this->routes['scaffolding_trigger']);
@@ -188,7 +190,7 @@ function _compile_segments($segments = array())
 			else
 			{
 				// A standard method request
-				$this->set_method($segments['2']);
+				$this->set_method($segments['1']);
 			}
 		}
 	}
@@ -206,37 +208,32 @@ function _compile_segments($segments = array())
 	 */	
 	function _validate_segments($segments)
 	{
-		// Does the requested controller exist?
-		if ( ! file_exists(APPPATH.'controllers/'.$segments['1'].EXT))
+		// Does the requested controller exist in the root folder?
+		if (file_exists(APPPATH.'controllers/'.$segments['0'].EXT))
 		{
-			// Is it a directory?  No?  Smite them!
-			if ( ! is_dir(APPPATH.'controllers/'.$segments['1']))
+			return $segments;
+		}
+		
+		// Is the controller in a sub-folder?
+		if (is_dir(APPPATH.'controllers/'.$segments['0']))
+		{
+			// Set the directory and remove it from the segment array
+			$this->set_directory($segments['0']);
+			$segments = array_slice($segments, 1);
+			
+			if (count($segments) == 0)
 			{
-				show_404();
+				$this->set_class($this->default_controller);
+				$this->set_method('index');
+				$this->directory = '';
+				return array();
 			}
-			else
-			{
-				$this->set_directory($segments['1']);	
-				$segs = array_slice($segments, 1);
 				
-				if (count($segs) == 0)
-				{
-					$this->set_class($this->default_controller);
-					$this->set_method('index');
-					$this->directory = '';
-					return array();
-				}
-	
-				$i = 1;
-				$segments = array();
-				foreach ($segs as $val)
-				{
-					$segments[$i++] = $val;
-				}
-			}
+			return $segments;
 		}
-		
-		return $segments;
+	
+		// Can't find the requested controller...
+		show_404();	
 	}
 	// END _validate_segments()
 	
@@ -274,6 +271,13 @@ function _filter_uri($str)
 	 */
 	function _parse_routes()
 	{
+		// Do we even have any custom routing to deal with?
+		if (count($this->routes) == 0)
+		{
+			$this->_compile_segments($this->segments);
+			return;
+		}
+	
 		// Turn the segment array into a URI string
 		$uri = implode('/', $this->segments);
 		$num = count($this->segments);
@@ -284,7 +288,7 @@ function _parse_routes()
 			$this->_compile_segments(explode('/', $this->routes[$uri]));		
 			return;
 		}
-		
+				
 		// Loop through the route array looking for wildcards
 		foreach (array_slice($this->routes, 1) as $key => $val)
 		{
@@ -306,7 +310,11 @@ function _parse_routes()
 				$this->_compile_segments(explode('/', $val));		
 				return;
 			}
-		}	
+		}
+		
+		// If we got this far it means we didn't encounter a 
+		// matching route so we'll set the site default route
+		$this->_compile_segments($this->segments);
 	}
 	// END set_method()
 

From b071bb5a92aade551345a495fb13f5678f3978d0 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 26 Aug 2006 19:28:37 +0000
Subject: [PATCH 0008/2544]

---
 system/application/config/config.php          |  2 +
 system/application/config/routes.php          |  3 +-
 system/codeigniter/CodeIgniter.php            |  6 +--
 system/codeigniter/Common.php                 |  3 +-
 system/drivers/DB_mssql.php                   |  2 +-
 system/drivers/DB_mysql.php                   |  2 +-
 system/drivers/DB_mysqli.php                  |  2 +-
 system/drivers/DB_odbc.php                    |  2 +-
 system/drivers/DB_postgre.php                 |  8 ++--
 system/drivers/DB_sqlite.php                  |  2 +-
 system/helpers/form_helper.php                |  2 +-
 system/helpers/url_helper.php                 |  4 +-
 system/libraries/Calendar.php                 |  2 +-
 system/libraries/Loader.php                   |  2 +-
 system/libraries/Router.php                   | 45 ++++++++++---------
 system/libraries/URI.php                      | 14 +++---
 user_guide/general/changelog.html             | 16 +++++--
 user_guide/general/controllers.html           | 20 +++++++++
 user_guide/general/routing.html               |  2 +-
 user_guide/helpers/form_helper.html           | 10 ++---
 user_guide/helpers/url_helper.html            |  6 ++-
 .../libraries/database/active_record.html     |  2 +-
 22 files changed, 96 insertions(+), 61 deletions(-)

diff --git a/system/application/config/config.php b/system/application/config/config.php
index 0b4f33f4..c33bda37 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -37,6 +37,8 @@
 | 'auto'			Default - auto detects
 | 'path_info'		Uses the PATH_INFO 
 | 'query_string'	Uses the QUERY_STRING
+| 'orig_path_info'	Uses the ORIG_PATH_INFO 
+| 'request_uri'		Uses the REQUEST_URI
 |
 */
 $config['uri_protocol']	= "auto";
diff --git a/system/application/config/routes.php b/system/application/config/routes.php
index 5167f756..dc8a32d0 100644
--- a/system/application/config/routes.php
+++ b/system/application/config/routes.php
@@ -45,7 +45,8 @@
 
 // Define your own routes below -------------------------------------------
 
+$route['products/([a-z]+)/(\d+)'] = "bamo/$1/a$2";
+
 
-$route['products\/([a-z]+)\/(\d+)'] = "$1/a$2";
 
 ?>
\ No newline at end of file
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index de7f89af..872f4c04 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -27,7 +27,7 @@
  * @link		http://www.codeigniter.com/user_guide/
  */
  
-define('APPVER', '1.4');
+define('APPVER', '1.4.0');
 
 /*
  * ------------------------------------------------------
@@ -122,7 +122,7 @@
  * 
  */
  
-_load_class('CI_Loader'); 
+_load_class('CI_Loader', FALSE); 
   
 if (floor(phpversion()) < 5)
 {
@@ -133,7 +133,7 @@
 	require(BASEPATH.'codeigniter/Base5'.EXT);
 }
 
-_load_class('CI_Controller'); 
+_load_class('CI_Controller', FALSE); 
 
 require(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT);
 
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index 2ec1c3d3..4879e709 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -63,11 +63,10 @@ function &_load_class($class, $instantiate = TRUE)
 		}
 		else
 		{
-			$objects[$class] = TRUE;
+			$objects[$class] = FALSE;
 		}
 	}
 	
-	
 	return $objects[$class];
 }
 
diff --git a/system/drivers/DB_mssql.php b/system/drivers/DB_mssql.php
index 6156ec3c..48d1929e 100644
--- a/system/drivers/DB_mssql.php
+++ b/system/drivers/DB_mssql.php
@@ -93,7 +93,7 @@ function execute($sql)
 	 * @param	string	an SQL query
 	 * @return	string
 	 */	
-    function &_prep_query($sql)
+    function _prep_query($sql)
     {
 		return $sql;
     }
diff --git a/system/drivers/DB_mysql.php b/system/drivers/DB_mysql.php
index 18c080b2..82e677a1 100644
--- a/system/drivers/DB_mysql.php
+++ b/system/drivers/DB_mysql.php
@@ -100,7 +100,7 @@ function execute($sql)
 	 * @param	string	an SQL query
 	 * @return	string
 	 */	
-    function &_prep_query($sql)
+    function _prep_query($sql)
     {
 		// "DELETE FROM TABLE" returns 0 affected rows This hack modifies 
 		// the query so that it returns the number of affected rows
diff --git a/system/drivers/DB_mysqli.php b/system/drivers/DB_mysqli.php
index f8cb19db..32c4c0f8 100644
--- a/system/drivers/DB_mysqli.php
+++ b/system/drivers/DB_mysqli.php
@@ -102,7 +102,7 @@ function execute($sql)
 	 * @param	string	an SQL query
 	 * @return	string
 	 */	
-    function &_prep_query($sql)
+    function _prep_query($sql)
     {
 		// "DELETE FROM TABLE" returns 0 affected rows This hack modifies 
 		// the query so that it returns the number of affected rows
diff --git a/system/drivers/DB_odbc.php b/system/drivers/DB_odbc.php
index fac44904..50f39acc 100644
--- a/system/drivers/DB_odbc.php
+++ b/system/drivers/DB_odbc.php
@@ -94,7 +94,7 @@ function execute($sql)
 	 * @param	string	an SQL query
 	 * @return	string
 	 */	
-    function &_prep_query($sql)
+    function _prep_query($sql)
     {
 		return $sql;
     }
diff --git a/system/drivers/DB_postgre.php b/system/drivers/DB_postgre.php
index 01d4b3df..3829b04a 100644
--- a/system/drivers/DB_postgre.php
+++ b/system/drivers/DB_postgre.php
@@ -94,7 +94,7 @@ function execute($sql)
 	 * @param	string	an SQL query
 	 * @return	string
 	 */	
-    function &_prep_query($sql)
+    function _prep_query($sql)
     {
 		return $sql;
     }
@@ -174,7 +174,7 @@ function count_all($table = '')
 		if ($table == '')
 			return '0';
 	
-		$query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`");
+		$query = $this->query("SELECT COUNT(*) AS numrows FROM ".$this->dbprefix.$table."");
 		
 		if ($query->num_rows() == 0)
 			return '0';
@@ -225,7 +225,7 @@ function escape_table($table)
 	{
 		if (stristr($table, '.'))
 		{
-			$table = preg_replace("/\./", "`.`", $table);
+			$table = preg_replace("/\./", ".", $table);
 		}
 		
 		return $table;
@@ -432,7 +432,7 @@ function field_data()
 			$F->name 		= pg_field_name($this->result_id, $i);
 			$F->type 		= pg_field_type($this->result_id, $i);
 			$F->max_length	= pg_field_size($this->result_id, $i);
-			$F->primary_key = 0;
+			$F->primary_key = $i == 0;
 			$F->default		= '';
 
 			$retval[] = $F;
diff --git a/system/drivers/DB_sqlite.php b/system/drivers/DB_sqlite.php
index 6428dd5b..1192e6dc 100644
--- a/system/drivers/DB_sqlite.php
+++ b/system/drivers/DB_sqlite.php
@@ -115,7 +115,7 @@ function execute($sql)
 	 * @param	string	an SQL query
 	 * @return	string
 	 */	
-    function &_prep_query($sql)
+    function _prep_query($sql)
     {
 		return $sql;
     }
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index f82ad01a..d4e45a0a 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -326,7 +326,7 @@ function form_close($extra = '')
  */	
 function form_prep($str = '')
 {
-	if ($str == '')
+	if ($str === '')
 	{
 		return '';
 	}
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index d2d2a598..03d6c3b2 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -90,7 +90,7 @@ function index_page()
  */	
 function anchor($uri = '', $title = '', $attributes = '')
 {
-	$site_url = site_url($uri);
+	$site_url = ( ! preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri;
 	
 	if ($title == '')
 	{
@@ -128,7 +128,7 @@ function anchor($uri = '', $title = '', $attributes = '')
  */
 function anchor_popup($uri = '', $title = '', $attributes = FALSE)
 {	
-	$site_url = site_url($uri);
+	$site_url = ( ! preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri;
 	
 	if ($title == '')
 	{
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index 013f0679..b77dd1b6 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -263,7 +263,7 @@ function get_month_name($month)
 		}
 		else
 		{
-			$month_names = array('01' => 'cal_january', '02' => 'cal_february', '03' => 'cal_march', '04' => 'cal_april', '05' => 'cal_mayl', '06' => 'cal_june', '07' => 'cal_july', '08' => 'cal_august', '09' => 'cal_september', '10' => 'cal_october', '11' => 'cal_novermber', '12' => 'cal_december');
+			$month_names = array('01' => 'cal_january', '02' => 'cal_february', '03' => 'cal_march', '04' => 'cal_april', '05' => 'cal_mayl', '06' => 'cal_june', '07' => 'cal_july', '08' => 'cal_august', '09' => 'cal_september', '10' => 'cal_october', '11' => 'cal_november', '12' => 'cal_december');
 		}
 		
 		$month = $month_names[$month];
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index e2467fa6..3d2501fc 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -478,7 +478,7 @@ function _ci_load($data)
 		if ($path == '')
 		{
 			$ext = pathinfo($view, PATHINFO_EXTENSION);
-			$file = ($ext == '') ? $view.EXT : $view;
+			$file = ($ext != EXT) ? $view.EXT : $view;
 			$path = $this->view_path.$file;
 		}
 		else
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 67814545..b28ead95 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -87,25 +87,31 @@ function _set_route_mapping()
 
 		// Fetch the URI string Depending on the server, 
 		// the URI will be available in one of two globals
-		switch ($this->config->item('uri_protocol'))
+		if ($this->config->item('uri_protocol') == 'auto')
 		{
-			case 'path_info'	: $this->uri_string = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO');	
-				break;
-			case 'query_string' : $this->uri_string = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING'); 
-				break;
-			default : 
-						$path_info = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO');
-						
-						if ($path_info != '' AND $path_info != "/".SELF)
-						{
-							$this->uri_string = $path_info;
-						}
-						else
-						{
-							$this->uri_string = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
-						}
-				break;
+			$path_info = getenv('PATH_INFO');
+			if ($path_info != '' AND $path_info != "/".SELF)
+			{
+				$this->uri_string = $path_info;
+			}
+			else
+			{
+				$path_info = getenv('ORIG_PATH_INFO');
+				if ($path_info != '' AND $path_info != "/".SELF)
+				{
+					$this->uri_string = $path_info;
+				}
+				else
+				{
+					$this->uri_string = getenv('QUERY_STRING');
+				}
+			}
+		}
+		else
+		{
+			$this->uri_string = getenv(strtoupper($this->config->item('uri_protocol')));		
 		}
+		
 	
 		// Is there a URI string? If not, the default controller specified 
 		// by the admin in the "routes" file will be shown.
@@ -291,10 +297,7 @@ function _parse_routes()
 				
 		// Loop through the route array looking for wildcards
 		foreach (array_slice($this->routes, 1) as $key => $val)
-		{
-			if (count(explode('/', $key)) != $num)
-				continue;
-						
+		{						
 			// Convert wildcards to RegEx
 			$key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key));
 			
diff --git a/system/libraries/URI.php b/system/libraries/URI.php
index 4c2fa9c7..c5fd4625 100644
--- a/system/libraries/URI.php
+++ b/system/libraries/URI.php
@@ -28,7 +28,7 @@
  */
 class CI_URI {
 
-	var $uri;
+	var $router;
 	var	$keyval	= array();
 
 	/**
@@ -42,7 +42,7 @@ class CI_URI {
 	 */		
 	function CI_URI()
 	{
-		$this->uri =& _load_class('CI_Router');		
+		$this->router =& _load_class('CI_Router');	
 		log_message('debug', "URI Class Initialized");
 	}
 	
@@ -60,7 +60,7 @@ function CI_URI()
 	 */
 	function segment($n, $no_result = FALSE)
 	{
-		return ( ! isset($this->uri->segments[$n])) ? $no_result : $this->uri->segments[$n];
+		return ( ! isset($this->router->segments[$n])) ? $no_result : $this->router->segments[$n];
 	}
 
 	// --------------------------------------------------------------------
@@ -196,7 +196,7 @@ function slash_segment($n, $where = 'trailing')
 			$leading	= '/';
 			$trailing	= '/';
 		}
-		return ( ! isset($this->uri->segments[$n])) ? '' : $leading.$this->uri->segments[$n].$trailing;
+		return ( ! isset($this->router->segments[$n])) ? '' : $leading.$this->router->segments[$n].$trailing;
 	}
 	
 	// --------------------------------------------------------------------
@@ -209,7 +209,7 @@ function slash_segment($n, $where = 'trailing')
 	 */
 	function segment_array()
 	{
-		return $this->uri->segments;
+		return $this->router->segments;
 	}
 	
 	// --------------------------------------------------------------------
@@ -222,7 +222,7 @@ function segment_array()
 	 */
 	function total_segments()
 	{
-		return count($this->uri->segments);
+		return count($this->router->segments);
 	}
 	
 	// --------------------------------------------------------------------
@@ -235,7 +235,7 @@ function total_segments()
 	 */
 	function uri_string()
 	{
-		return $this->uri->uri_string;
+		return $this->router->uri_string;
 	}
 
 }
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 5f3b8690..5721bc86 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -69,20 +69,28 @@ 
    Version 1.4.0
    
 
 
      
 
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • 
+
    • Added the ability to organize controller files into sub-folders.  Kudos to Marco for suggesting this (and the next two) feature.
      • 
+
    • Added regular expressions support for routing rules.
      • 
 
    • Added the ability to replace core system classes with your own classes.
      • 
 
    • Added support for % character in URL.
      • 
-
    • Added the ability to organize controller files into sub-folders.
-
    • Updated the Routing feature to accept regular expressions within routing rules.
      • 
+
    • Added the ability to supply full URLs using the anchor() helper function.
      • 
 
    • Moved the MIME type array out of the Upload class and into its own file in the applications/comfig/ folder.
      • 
+
    • Tweaked the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • 
 
    • Removed a strtolower() call that was changing URL segments to lower case.
      • 
+
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
      • 
+
    • Removed backticks from Postgre class since these are not needed.
      • 
 
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name.  Please use dohash() instead.
      • 
-
    • Fixed a MS SQL issue.
      • 
 
    • Fixed an issue when removing GET variables.
      • 
 
    • Fixed this router bug.
      • 
 
    • Fixed a bug that was preventing multiple discreet database calls.
      • 
 
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
      • 
 
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
      • 
-
    • Removed backticks from Postgre class since these are not needed.
      • 
+
    • Fixed some missing prefixes when using the database prefix feature.
      • 
+
    • Fixed a bug that was causing the Loader class to incorrectly identify the file extension.
      • 
+
    • Fixed a typo in the Calendar class (cal_november).
      •  
+
    • Fixed an evaluation bug in the database initialization function.
      • 
+
    • Fixed some MS SQL bugs.
      • 
+
    • Fixed some doc typos.
      • 
 
    
 
 
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 648298eb..b45b5aef 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -71,6 +71,7 @@ 
    Controllers
    
 
  • Functions
    • 
 
  • Private Functions
    • 
 
  • Defining a Default Controller
    • 
+
  • Organizing Controllers into Sub-folders
    • 
 
  • Class Constructors
    • 
 
  • Reserved Function Names
    • 
 
@@ -204,6 +205,25 @@ 
    Defining a Default Controller
    
 specifying any URI segments you'll see your Hello World message by default.
    
 
 
+
+
    Organizing Your Controllers into Sub-folders
    
+
+
    If you are building a large application you might find it convenient to organize your controllers into sub-folders.  Code Igniter permits you to do this.
    
+
+
    Simply create folders within your application/controllers directory and place your controller classes within them.
    
+
+
    Note:  When using this feature the first segment or your URI must specify the folder.  For example, lets say you have a controller
+located here:
    
+
+application/controllers/products/shoes.php
+
+
    To call the above controller your URI will look something like this:
    
+
+www.your-site.com/index.php/products/shoes/123
+
+
    Code Igniter also permits you to remap your URIs using its URI Routing feature.
+
+
 
 
    Class Constructors
    
 
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index 977698b9..e5dac680 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -138,7 +138,7 @@ 
    Regular Expressions
    
 
 
    A typical RegEx route might look something like this:
    
 
-$route['products\/([a-z]+)\/(\d+)'] = "$1/id_$2";
+$route['products/([a-z]+)/(\d+)'] = "$1/id_$2";
 
 
    In the above example, a URI similar to products/shirts/123 would instead call the shirts controller class and the id_123 function.
    
 
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html
index 8593f81d..f38d4ada 100644
--- a/user_guide/helpers/form_helper.html
+++ b/user_guide/helpers/form_helper.html
@@ -208,7 +208,7 @@ 
    form_dropdown()
    
 $options = array(
    
                   'small'  => 'Small Shirt',
    
                   'med'    => 'Medium Shirt',
    
-                  large'   => 'Large Shirt',
    
+                  'large'   => 'Large Shirt',
    
                   'xlarge' => 'Extra Large Shirt',
    
                 );
    
 
    
@@ -217,10 +217,10 @@ 
    form_dropdown()
    
 // Would produce:

    
 
 <select name="shirts">
    
-<option value="small">Small Shirt
    
-<option value="med">Medium  Shirt
    
-<option value="large" selected>Large Shirt
    
-<option value="xlarge">Extra Large Shirt
    
+<option value="small">Small Shirt</option>
    
+<option value="med">Medium  Shirt</option>
    
+<option value="large" selected>Large Shirt</option>
    
+<option value="xlarge">Extra Large Shirt</option>
    
 </select>    
 
 
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html
index a8f5c14d..2b5b354c 100644
--- a/user_guide/helpers/url_helper.html
+++ b/user_guide/helpers/url_helper.html
@@ -117,8 +117,10 @@ 
    anchor()
    
 anchor(uri segments, text, attributes)
 
 
    The first parameter can contain any segments you wish appended to the URL.  As with the site_url() function above,
-segments can be a string or an array. Note: Do not include the base URL.  It will be built as specified in your config file. Include
-only the URI segments you wish appended to the URL.
    
+segments can be a string or an array.
    
+
+
    Note:  If you are building links that are internal to your application do not include the base URL (http://...).  This
+will be added automatically from the information specified in your config file. Include only the URI segments you wish appended to the URL.
    
 
 
    The second segment is the text you would like the link to say.  If you leave it blank, the URL will be used.
    
 
diff --git a/user_guide/libraries/database/active_record.html b/user_guide/libraries/database/active_record.html
index 8fc3b813..6e5d6126 100644
--- a/user_guide/libraries/database/active_record.html
+++ b/user_guide/libraries/database/active_record.html
@@ -557,7 +557,7 @@ 
    $this->db->delete();
    
 
    Generates a delete SQL string and runs the query.
    
 
 
-$this->db->delete('mytable', array('id', $id));
+$this->db->delete('mytable', array('id' => $id));
 

    
 // Produces:
    
 // DELETE FROM mytable 
    

From 141808ad31d4eefad4c6c3dbaf8306fac2342668 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 27 Aug 2006 01:52:51 +0000
Subject: [PATCH 0009/2544]

---
 system/drivers/DB_mysql.php          | 4 ----
 system/drivers/DB_mysqli.php         | 4 ----
 system/drivers/DB_postgre.php        | 4 ----
 system/drivers/DB_sqlite.php         | 4 ----
 system/helpers/form_helper.php       | 9 +++++++--
 system/libraries/Encrypt.php         | 2 +-
 system/libraries/Language.php        | 2 +-
 system/libraries/Log.php             | 2 +-
 system/libraries/Validation.php      | 8 ++++----
 user_guide/general/changelog.html    | 6 +++++-
 user_guide/libraries/pagination.html | 2 +-
 11 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/system/drivers/DB_mysql.php b/system/drivers/DB_mysql.php
index 82e677a1..a90d8426 100644
--- a/system/drivers/DB_mysql.php
+++ b/system/drivers/DB_mysql.php
@@ -126,10 +126,6 @@ function _prep_query($sql)
 	 */
 	function escape_str($str)	
 	{	
-		if (get_magic_quotes_gpc())
-		{
-			$str = stripslashes($str); 
-		}
 		return mysql_real_escape_string($str);
 	}
 	
diff --git a/system/drivers/DB_mysqli.php b/system/drivers/DB_mysqli.php
index 32c4c0f8..75c01e7f 100644
--- a/system/drivers/DB_mysqli.php
+++ b/system/drivers/DB_mysqli.php
@@ -128,10 +128,6 @@ function _prep_query($sql)
 	 */
 	function escape_str($str)	
 	{	
-		if (get_magic_quotes_gpc())
-		{
-			$str = stripslashes($str); 
-		}
 		return mysqli_real_escape_string($this->conn_id, $str);
 	}
 	
diff --git a/system/drivers/DB_postgre.php b/system/drivers/DB_postgre.php
index 3829b04a..cf59f0fd 100644
--- a/system/drivers/DB_postgre.php
+++ b/system/drivers/DB_postgre.php
@@ -110,10 +110,6 @@ function _prep_query($sql)
 	 */
 	function escape_str($str)	
 	{	
-		if (get_magic_quotes_gpc())
-		{
-			$str = stripslashes($str); 
-		}
 		return pg_escape_string($str);
 	}
 	
diff --git a/system/drivers/DB_sqlite.php b/system/drivers/DB_sqlite.php
index 1192e6dc..b2c31a8b 100644
--- a/system/drivers/DB_sqlite.php
+++ b/system/drivers/DB_sqlite.php
@@ -131,10 +131,6 @@ function _prep_query($sql)
 	 */
 	function escape_str($str)	
 	{
-		if (get_magic_quotes_gpc())
-		{
-			$str = stripslashes($str); 
-		}
 		return sqlite_escape_string($str);
 	}
 	
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index d4e45a0a..06910106 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -38,11 +38,16 @@
  * @param	array	a key/value pair hidden data
  * @return	string
  */	
-function form_open($action, $attributes = array(), $hidden = array())
+function form_open($action = '', $attributes = array(), $hidden = array())
 {
 	$obj =& get_instance();
 
-	$form = '
    config->site_url($action).'"';
+	
+	if ( ! isset($attributes['method']))
+	{
+		$form .= ' method="post"';
+	}
 	
 	if (is_array($attributes) AND count($attributes) > 0)
 	{
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php
index 532bfe1f..bcffdf1a 100644
--- a/system/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
@@ -322,7 +322,7 @@ function _get_mcrypt()
 	 */		
 	function set_hash($type = 'sha1')
 	{
-		$this->_hash_type = ($type != 'sha1' OR $type != 'md5') ? 'sha1' : $type;
+		$this->_hash_type = ($type != 'sha1' AND $type != 'md5') ? 'sha1' : $type;
 	}
   	// END set_hash()
   	
diff --git a/system/libraries/Language.php b/system/libraries/Language.php
index b668aa06..328d53e4 100644
--- a/system/libraries/Language.php
+++ b/system/libraries/Language.php
@@ -68,7 +68,7 @@ function load($langfile = '', $idiom = '', $return = FALSE)
 	
 		if ( ! file_exists(BASEPATH.'language/'.$idiom.'/'.$langfile))
 		{
-			show_error('Unable to load the requested language file: language/'.$langfile.EXT);
+			show_error('Unable to load the requested language file: language/'.$langfile);
 		}
 
 		include_once(BASEPATH.'language/'.$idiom.'/'.$langfile);
diff --git a/system/libraries/Log.php b/system/libraries/Log.php
index 35e30b64..17b96b2c 100644
--- a/system/libraries/Log.php
+++ b/system/libraries/Log.php
@@ -88,7 +88,7 @@ function write_log($level = 'error', $msg, $php_error = FALSE)
 			return FALSE;
 		}
 	
-		$filepath = $this->log_path.'log-'.date('Y-m-d').'.php';
+		$filepath = $this->log_path.'log-'.date('Y-m-d').EXT;
 		$message  = '';
 		
 		if ( ! file_exists($filepath))
diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index df8c70ee..e037e69c 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -252,12 +252,12 @@ function run()
 				// Strip the parameter (if exists) from the rule
 				// Rules can contain a parameter: max_length[5]
 				$param = FALSE;
-				if (preg_match("/.*?(\[.*?\]).*/", $rule, $match))
+				if (preg_match("/(.*?)\[(.*?)\]/", $rule, $match))
 				{
-					$param = substr(substr($match['1'], 1), 0, -1);
-					$rule  = str_replace($match['1'], '', $rule);
+					$rule	= $match[1];
+					$param	= $match[2];
 				}
-
+				
 				// Call the function that corresponds to the rule
 				if ($callback === TRUE)
 				{
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 5721bc86..bf79a14d 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -75,7 +75,8 @@ 
    Version 1.4.0
    
 
  • Added support for % character in URL.
    • 
 
  • Added the ability to supply full URLs using the anchor() helper function.
    • 
 
  • Moved the MIME type array out of the Upload class and into its own file in the applications/comfig/ folder.
    • 
-
  • Tweaked the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • 
+
  • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • 
+
  • Updated the form_open() helper to allow the GET method to be used.
    • 
 
  • Removed a strtolower() call that was changing URL segments to lower case.
    • 
 
  • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • 
 
  • Removed backticks from Postgre class since these are not needed.
    • 
@@ -89,6 +90,9 @@ 
    Version 1.4.0
    
 
  • Fixed a bug that was causing the Loader class to incorrectly identify the file extension.
    • 
 
  • Fixed a typo in the Calendar class (cal_november).
    •  
 
  • Fixed an evaluation bug in the database initialization function.
    • 
+
  • Fixed a minor bug in one of the error messages in the language class.
    • 
+
  • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • 
+
  • Fixed a couple bugs in the Unit Testing class.
    • 
 
  • Fixed some MS SQL bugs.
    • 
 
  • Fixed some doc typos.
    • 
 
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html
index 3f4e5693..ac71d78b 100644
--- a/user_guide/libraries/pagination.html
+++ b/user_guide/libraries/pagination.html
@@ -91,7 +91,7 @@ 
    Notes:
    
 
 
      
 	
    • base_url This is the full URL to the controller class/function containing your pagination.  In the example
-	above, it is pointing to a controller called "Page" and a function called "test".  Keep in mind that you can
+	above, it is pointing to a controller called "Test" and a function called "page".  Keep in mind that you can
 	re-route your URI if you need a different structure.
      • 
 	
    • total_rows This number represents the total rows in the result set you are creating pagination for.
 	Typically this number will be the total rows that your database query returned.

From 57b3d39cb79bb3b8d193e0e345a62e3396e519f2 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 27 Aug 2006 15:28:31 +0000
Subject: [PATCH 0010/2544]

---
 system/codeigniter/Common.php       |  6 ++++--
 system/drivers/DB_active_record.php |  2 +-
 system/drivers/DB_driver.php        | 10 +++++-----
 system/helpers/form_helper.php      |  4 ++--
 system/libraries/Log.php            |  2 +-
 user_guide/general/changelog.html   |  3 +++
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index 4879e709..d5bec77f 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -153,8 +153,10 @@ function show_404($page = '')
 * @access	public
 * @return	void
 */
-function log_message($level = 2, $message, $php_error = FALSE)
+function log_message($level = 'error', $message, $php_error = FALSE)
 {
+	static $LOG;
+	
 	$config =& _get_config();
 	if ($config['log_errors'] === FALSE)
 	{
@@ -166,7 +168,7 @@ function log_message($level = 2, $message, $php_error = FALSE)
 		include_once(BASEPATH.'libraries/Log.php');		
 	}
 	
-	if ( ! isset($LOG))
+	if ( ! is_object($LOG))
 	{
 		$LOG = new CI_Log(
 							$config['log_path'], 
diff --git a/system/drivers/DB_active_record.php b/system/drivers/DB_active_record.php
index 373c0f62..f1995c80 100644
--- a/system/drivers/DB_active_record.php
+++ b/system/drivers/DB_active_record.php
@@ -663,7 +663,7 @@ function delete($table = '', $where = '')
 
 		if (count($this->ar_where) == 0)
 		{
-            if ($this->debug)
+            if ($this->db_debug)
             {
 				return $this->display_error('db_del_must_use_where');
             }
diff --git a/system/drivers/DB_driver.php b/system/drivers/DB_driver.php
index ed18d54e..3a2a5e9b 100644
--- a/system/drivers/DB_driver.php
+++ b/system/drivers/DB_driver.php
@@ -86,7 +86,7 @@ function initialize($params = '')
 			{
 				log_message('error', 'Invalid DB Connection String');
 			
-				if ($this->debug)
+				if ($this->db_debug)
 				{
 					return $this->display_error('db_invalid_connection_str');
 				}
@@ -265,7 +265,7 @@ function call_function($function)
 		
 		if ( ! function_exists($function))
 		{ 
-			if ($this->debug)
+			if ($this->db_debug)
 			{
 				return $this->display_error('db_unsupported_function');
 			}
@@ -425,7 +425,7 @@ function field_names($table = '')
     {
     	if ($table == '')
     	{
-			if ($this->debug)
+			if ($this->db_debug)
 			{
 				return $this->display_error('db_field_param_missing');
 			}
@@ -472,7 +472,7 @@ function field_data($table = '')
 	{
     	if ($table == '')
     	{
-			if ($this->debug)
+			if ($this->db_debug)
 			{
 				return $this->display_error('db_field_param_missing');
 			}
@@ -535,7 +535,7 @@ function compile_binds($sql, $binds)
 			// Just in case the replacement string contains the bind
 			// character we'll temporarily replace it with a marker
 			$val = str_replace($this->bind_marker, '{%bind_marker%}', $val);
-			$sql = preg_replace("#".preg_quote($this->bind_marker)."#", $val, $sql, 1);
+			$sql = preg_replace("#".preg_quote($this->bind_marker, '#')."#", str_replace('$', '\$', $val), $sql, 1);
 		}
 
 		return str_replace('{%bind_marker%}', $this->bind_marker, $sql);		
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 06910106..eb97913f 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -247,7 +247,7 @@ function form_checkbox($data = '', $value = '', $checked = TRUE, $extra = '')
 {
 	$defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value);
 	
-	if (isset($data['checked']))
+	if (is_array($data) AND array_key_exists('checked', $data))
 	{
 		$checked = $data['checked'];
 		
@@ -256,7 +256,7 @@ function form_checkbox($data = '', $value = '', $checked = TRUE, $extra = '')
 	}
 	
 	if ($checked == TRUE)
-		$defaults['checked'] = ' checked="checked"';
+		$defaults['checked'] = 'checked';
 	else
 		unset($defaults['checked']);
 
diff --git a/system/libraries/Log.php b/system/libraries/Log.php
index 17b96b2c..de5a9b83 100644
--- a/system/libraries/Log.php
+++ b/system/libraries/Log.php
@@ -40,7 +40,7 @@ class CI_Log {
 	 * @param	string	the error threshold
 	 * @param	string	the date formatting codes
 	 */
-	function CI_Log($path = '', $threshold = '', $date_fmt = '')
+	function CI_Log($path = '', $threshold = 4, $date_fmt = '')
 	{	
 		$this->log_path = ($path != '') ? $path : BASEPATH.'logs/';
 
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index bf79a14d..5d499679 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -89,8 +89,11 @@ 
      Version 1.4.0
      
 
    • Fixed some missing prefixes when using the database prefix feature.
      • 
 
    • Fixed a bug that was causing the Loader class to incorrectly identify the file extension.
      • 
 
    • Fixed a typo in the Calendar class (cal_november).
      •  
+
    • Fixed a bug in the form_checkbox() helper.
      • 
 
    • Fixed an evaluation bug in the database initialization function.
      • 
 
    • Fixed a minor bug in one of the error messages in the language class.
      • 
+
    • Fixed an undefined variable in the DB Driver class.
      • 
+
    • Fixed a bug in which dollar signs used as binding replacemnt values in the DB class would be treated as RegEx back-references.
      • 
 
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
      • 
 
    • Fixed a couple bugs in the Unit Testing class.
      • 
 
    • Fixed some MS SQL bugs.
      • 

From b4473d4407311cc5e4b2306cf5fa51221d5826f8 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 27 Aug 2006 15:46:31 +0000
Subject: [PATCH 0011/2544]

---
 system/libraries/Controller.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index ec21f8d6..06e54b2d 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -127,7 +127,12 @@ function _ci_load_model($model, $name = '', $db_conn = FALSE)
 		{
 			$name = $model;
 		}
-	
+		
+		if (in_array($name, $this->_ci_models))
+		{
+			return;
+		}		
+		
 		if (isset($this->$name))
 		{
 			show_error('The model name you are loading is the name of a resource that is already being used: '.$name);

From 0d29605b1e774efd57ffd8f5ccc8eaec1e9ca576 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 27 Aug 2006 15:48:38 +0000
Subject: [PATCH 0012/2544]

---
 system/libraries/Controller.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 06e54b2d..768b154e 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -128,7 +128,8 @@ function _ci_load_model($model, $name = '', $db_conn = FALSE)
 			$name = $model;
 		}
 		
-		if (in_array($name, $this->_ci_models))
+		$obj =& get_instance();
+		if (in_array($name, $obj->_ci_models))
 		{
 			return;
 		}		

From 1082bddc0c065895a3b39607cb930f5a101f54fb Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 27 Aug 2006 19:32:02 +0000
Subject: [PATCH 0013/2544]

---
 system/application/config/config.php     | 20 +++++++++++++++++
 system/drivers/DB_mssql.php              |  4 ++--
 system/drivers/DB_mysqli.php             |  4 +++-
 system/libraries/Config.php              |  5 +++--
 system/libraries/Router.php              | 14 +++++++-----
 user_guide/general/changelog.html        | 12 ++++++----
 user_guide/general/controllers.html      |  2 +-
 user_guide/general/core_classes.html     |  2 +-
 user_guide/installation/upgrade_140.html | 28 +++++++++++++++++++++++-
 9 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/system/application/config/config.php b/system/application/config/config.php
index c33bda37..c19fabf4 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -81,6 +81,26 @@
 $config['enable_hooks'] = TRUE;
 
 
+/*
+|--------------------------------------------------------------------------
+| Allowed URL Characters
+|--------------------------------------------------------------------------
+|
+| This lets you specify which characters are permitted 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~%.:_-
+|
+| Leave blank to allow all characters -- but only if you are insane.
+| 
+| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
+|
+*/
+$config['permitted_uri_chars'] = 'a-z 0-9~%.:_-';
+
+
 /*
 |--------------------------------------------------------------------------
 | Enable Query Strings
diff --git a/system/drivers/DB_mssql.php b/system/drivers/DB_mssql.php
index 48d1929e..f6e672b9 100644
--- a/system/drivers/DB_mssql.php
+++ b/system/drivers/DB_mssql.php
@@ -109,8 +109,8 @@ function _prep_query($sql)
 	 */
 	function escape_str($str)	
 	{	
-		// MS SQL doesn't require escaping
-		return $str;
+		// Escape single quotes
+		return str_replace("'", "''", $str);
 	}
 	
 	// --------------------------------------------------------------------
diff --git a/system/drivers/DB_mysqli.php b/system/drivers/DB_mysqli.php
index 75c01e7f..fadcdd3c 100644
--- a/system/drivers/DB_mysqli.php
+++ b/system/drivers/DB_mysqli.php
@@ -88,7 +88,9 @@ function db_select()
 	function execute($sql)
 	{
 		$sql = $this->_prep_query($sql);	
-		return @mysqli_query($this->conn_id, $sql);
+		$result = @mysqli_query($this->conn_id, $sql);
+		mysqli_next_result($this->conn_id);
+		return $result;
 	}
 	
 	// --------------------------------------------------------------------
diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index 85b29579..bd138331 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -53,7 +53,7 @@ function CI_Config()
 	 *
 	 * @access	public
 	 * @param	string	the config file name
-	 * @return	void
+	 * @return	boolean	if the file was loaded correctly
 	 */	
 	function load($file = '')
 	{
@@ -61,7 +61,7 @@ function load($file = '')
 	
 		if (in_array($file, $this->is_loaded))
 		{                
-			return;
+			return TRUE;
 		}
 	
 		include_once(APPPATH.'config/'.$file.EXT);
@@ -77,6 +77,7 @@ function load($file = '')
 		unset($config);
 
 		log_message('debug', 'Config file loaded: config/'.$file.EXT);
+		return TRUE;
 	}
   	// END load()
   	
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index b28ead95..2219f573 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -254,12 +254,14 @@ function _validate_segments($segments)
 	 */	
 	function _filter_uri($str)
 	{
-		 if ( ! preg_match("/^[a-z0-9~\s\%\.:_-]+$/i", $str))
-		 { 
-			exit('The URI you submitted has disallowed characters: '.$str);
-		 }
-		 
-		 return $str;
+		if ($this->config->item('permitted_uri_chars') != '')
+		{
+			if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str))
+			{ 
+				exit('The URI you submitted has disallowed characters: '.$str);
+			}
+		}	
+			return $str;
 	}
 	// END _filter_uri()
 	
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 5d499679..59a02f86 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -74,15 +74,19 @@ 
      Version 1.4.0
      
 
    • Added the ability to replace core system classes with your own classes.
      • 
 
    • Added support for % character in URL.
      • 
 
    • Added the ability to supply full URLs using the anchor() helper function.
      • 
-
    • Moved the MIME type array out of the Upload class and into its own file in the applications/comfig/ folder.
      • 
+
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
      • 
+
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
      • 
 
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • 
 
    • Updated the form_open() helper to allow the GET method to be used.
      • 
+
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • 
+
    • Updated the Models loader function to allow multiple loads of the same model.
      • 
+
    • Updated the MS SQL driver so that single quotes are escaped.
      • 
 
    • Removed a strtolower() call that was changing URL segments to lower case.
      • 
 
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
      • 
 
    • Removed backticks from Postgre class since these are not needed.
      • 
-
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name.  Please use dohash() instead.
      • 
-
    • Fixed an issue when removing GET variables.
      • 
-
    • Fixed this router bug.
      • 
+
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name.  Please use dohash() instead.
      • 
+
    • Fixed an bug that was preventing the input class from unsetting GET variables.
      • 
+
    • Fixed a router bug that was making it too greedy when matching end segments.
      • 
 
    • Fixed a bug that was preventing multiple discreet database calls.
      • 
 
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
      • 
 
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
      • 
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index b45b5aef..4dc94cba 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -212,7 +212,7 @@ 
      Organizing Your Controllers into Sub-folders
      
 
 
      Simply create folders within your application/controllers directory and place your controller classes within them.
      
 
-
      Note:  When using this feature the first segment or your URI must specify the folder.  For example, lets say you have a controller
+
      Note:  When using this feature the first segment of your URI must specify the folder.  For example, lets say you have a controller
 located here:
      
 
 application/controllers/products/shoes.php
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index 1e596847..4abe0677 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -64,7 +64,7 @@ 
      Creating Core System Classes
      
 
 
      Every time Code Igniter runs there are several base classes that are initialized automatically as part of the core framework.
 It is possible, however, to swap any of the core system classes with your own versions.   Most users will never have any need to do this,
-but the option to replace them does exist for those that would like to significantly alter the Code Igniter core.
+but the option to replace them does exist for those who would like to significantly alter the Code Igniter core.
 
      
 
 
      Note:  Replacing a core system class with your own version has a lot of implications, so make sure you 
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html
index 7f25c44e..bd84c242 100644
--- a/user_guide/installation/upgrade_140.html
+++ b/user_guide/installation/upgrade_140.html
@@ -87,7 +87,33 @@ 
      Step 1: Update your Code Igniter files
      
 
    
 
 
-
    Step 4: Update your user guide
    
+
    Step 2: Update your config.php file
    
+
+
    Open your application/config/config.php file and add these new items:
    
+
+
    +/*
+|--------------------------------------------------------------------------
+| Allowed URL Characters
+|--------------------------------------------------------------------------
+|
+| This lets you specify which characters are permitted 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~%.:_-
+|
+| Leave blank to allow all characters -- but only if you are insane.
+| 
+| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
+|
+*/
+$config['permitted_uri_chars'] = 'a-z 0-9~%.:_-';
+
    
+
+
+
    Step 3: Update your user guide
    
 
 
    Please also replace your local copy of the user guide with the new version.
    
 

From 97cdfb15951439bd4b04fabaf0dd590d9480c39e Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 27 Aug 2006 19:48:30 +0000
Subject: [PATCH 0014/2544]

---
 user_guide/general/changelog.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 59a02f86..d2a33dda 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -84,6 +84,7 @@ 
    Version 1.4.0
    
 
  • Removed a strtolower() call that was changing URL segments to lower case.
    • 
 
  • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • 
 
  • Removed backticks from Postgre class since these are not needed.
    • 
+
  • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • 
 
  • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name.  Please use dohash() instead.
    • 
 
  • Fixed an bug that was preventing the input class from unsetting GET variables.
    • 
 
  • Fixed a router bug that was making it too greedy when matching end segments.
    • 

From 6a285fb39f5fce271dc23e13bafdb414502c9ecb Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 27 Aug 2006 19:54:10 +0000
Subject: [PATCH 0015/2544]

---
 system/drivers/DB_sqlite.php      | 9 ++++++++-
 user_guide/general/changelog.html | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/system/drivers/DB_sqlite.php b/system/drivers/DB_sqlite.php
index b2c31a8b..71d2561d 100644
--- a/system/drivers/DB_sqlite.php
+++ b/system/drivers/DB_sqlite.php
@@ -489,7 +489,14 @@ function _fetch_assoc()
 	 */
 	function _fetch_object()
 	{
-		return sqlite_fetch_object($this->result_id);
+		if (function_exists('sqlite_fetch_object'))
+		{
+			return sqlite_fetch_object($this->result_id);
+		}
+		else
+		{
+			return $this->_fetch_assoc();
+		}
 	}
 
 }
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index d2a33dda..ef344ffc 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -79,6 +79,7 @@ 
    Version 1.4.0
    
 
  • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • 
 
  • Updated the form_open() helper to allow the GET method to be used.
    • 
 
  • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • 
+
  • Updated the SQLite Driver to check for object support before attmpting to return results as objects.  If unsupported it returns an array.
    • 
 
  • Updated the Models loader function to allow multiple loads of the same model.
    • 
 
  • Updated the MS SQL driver so that single quotes are escaped.
    • 
 
  • Removed a strtolower() call that was changing URL segments to lower case.
    • 

From 671dc754ef954eecf4c2e8301dde5b3aba6bfedc Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 02:36:03 +0000
Subject: [PATCH 0016/2544]

---
 system/libraries/Config.php | 99 ++++++++++++++++++++++++++++++++-----
 1 file changed, 86 insertions(+), 13 deletions(-)

diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index bd138331..f7f813f8 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -36,8 +36,12 @@ class CI_Config {
 	 *
 	 * Sets the $config data from the primary config.php file as a class variable
 	 *
-	 * @access	public
-	 */
+     * @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 CI_Config()
 	{
 		$this->config =& _get_config();
@@ -55,7 +59,7 @@ function CI_Config()
 	 * @param	string	the config file name
 	 * @return	boolean	if the file was loaded correctly
 	 */	
-	function load($file = '')
+	function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
 	{
 		$file = ($file == '') ? 'config' : str_replace(EXT, '', $file);
 	
@@ -63,15 +67,42 @@ function load($file = '')
 		{                
 			return TRUE;
 		}
+
+		if ( ! file_exists(APPPATH.'config/'.$file.EXT))
+		{
+			if ($fail_gracefully === TRUE)
+			{
+				return FALSE;
+			}
+			show_error('The configuration file '.$file.EXT.' does not exist.');
+		}
 	
 		include_once(APPPATH.'config/'.$file.EXT);
 
 		if ( ! isset($config) OR ! is_array($config))
 		{
+			if ($fail_gracefully === TRUE)
+			{
+				return FALSE;
+			}		
 			show_error('Your '.$file.EXT.' file does not appear to contain a valid configuration array.');
 		}
 		
-		$this->config = array_merge($this->config, $config);
+		if ($use_sections === TRUE)
+		{
+			if (isset($this->config[$file]))
+			{
+				$this->config[$file] = array_merge($this->config[$file], $config);
+			}
+			else
+			{
+				$this->config[$file] = $config;
+			}
+		}
+		else
+		{
+			$this->config = array_merge($this->config, $config);
+		}
 
 		$this->is_loaded[] = $file;
 		unset($config);
@@ -86,6 +117,48 @@ function load($file = '')
 	/**
 	 * Fetch a config file item
 	 *
+	 *
+	 * @access	public
+	 * @param	string	the config item name
+	 * @param	string	the index name
+	 * @param	bool
+	 * @return	string
+	 */		
+	function item($item, $index = '')
+	{			
+		if ($index == '')
+		{	
+			if ( ! isset($this->config[$item])) 
+			{
+				return FALSE;
+			}
+		
+			$pref = $this->config[$item];
+		}
+		else
+		{
+			if ( ! isset($this->config[$index])) 
+			{
+				return FALSE;
+			}
+		
+			if ( ! isset($this->config[$index][$item]))
+			{
+				return FALSE;
+			}
+		
+			$pref = $this->config[$index][$item];
+		}
+
+        return $pref;
+	}
+  	// END item()
+  	
+  	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch a config file item - adds slash after item
+	 *
 	 * The second parameter allows a slash to be added to the end of
 	 * the item, in the case of a path.
 	 *
@@ -94,7 +167,7 @@ function load($file = '')
 	 * @param	bool
 	 * @return	string
 	 */		
-	function item($item, $slash = FALSE)
+	function slash_item($item)
 	{
 		if ( ! isset($this->config[$item])) 
 		{
@@ -103,20 +176,20 @@ function item($item, $slash = FALSE)
 		
 		$pref = $this->config[$item];
 		
-		if ($pref == '')
-		{
-			return $pref;
+		if ($pref != '')
+		{			
+			if (ereg("/$", $pref) === FALSE)
+			{
+				$pref .= '/';
+			}
 		}
-			
-        if ($slash !== FALSE AND ereg("/$", $pref) === FALSE)
-        {
-			$pref .= '/';
-        }
         
         return $pref;
 	}
   	// END item()
   	
+  	
+  	
 	// --------------------------------------------------------------------
 
 	/**

From eb6db84333c40ed8d15dec5014564120ee0c60e6 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 02:39:45 +0000
Subject: [PATCH 0017/2544]

---
 system/codeigniter/CodeIgniter.php |  5 +++++
 system/drivers/DB_postgre.php      |  7 +++++--
 system/helpers/date_helper.php     |  2 +-
 system/libraries/Validation.php    |  2 +-
 user_guide/general/changelog.html  |  6 +++++-
 user_guide/libraries/config.html   | 32 +++++++++++++++++++++++++++++-
 6 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 872f4c04..1f7850ec 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -188,6 +188,11 @@
 }
 else
 {
+	if ($method == $class)
+	{
+		$method = 'index';
+	}
+
 	if ( ! method_exists($CI, $method))
 	{
 		show_404();
diff --git a/system/drivers/DB_postgre.php b/system/drivers/DB_postgre.php
index cf59f0fd..fd98ec78 100644
--- a/system/drivers/DB_postgre.php
+++ b/system/drivers/DB_postgre.php
@@ -211,7 +211,8 @@ function error_number()
 	 * Escape Table Name
 	 *
 	 * This function adds backticks if the table name has a period
-	 * in it. Some DBs will get cranky unless periods are escaped
+	 * in it. Some DBs will get cranky unless periods are escaped.
+	 * NOT NEEDED FOR POSTGRE
 	 *
 	 * @access	public
 	 * @param	string	the table name
@@ -219,10 +220,12 @@ function error_number()
 	 */
 	function escape_table($table)
 	{
+		/*
 		if (stristr($table, '.'))
 		{
-			$table = preg_replace("/\./", ".", $table);
+			$table = preg_replace("/\./", "`.`", $table);
 		}
+		*/
 		
 		return $table;
 	}
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index 2a3d5085..c8205bb7 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -189,7 +189,7 @@ function timespan($seconds = 1, $time = '')
 	{
 		if ($minutes > 0)
 		{	
-			$str .= $minutes.' '.$obj->lang->line((($minutes	> 1) ? 'date_minutes' : 'date_minutes')).', ';
+			$str .= $minutes.' '.$obj->lang->line((($minutes	> 1) ? 'date_minutes' : 'date_minute')).', ';
 		}
 		
 		$seconds -= $minutes * 60;
diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index e037e69c..30faa85e 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -208,7 +208,7 @@ function run()
 			{			
 				if (in_array('isset', $ex) OR in_array('required', $ex))
 				{
-					if ( ! isset($this->messages['isset'])) 
+					if ( ! isset($this->_error_messages['isset'])) 
 					{
 						if (FALSE === ($line = $this->obj->lang->line('isset')))
 						{
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index ef344ffc..a7707723 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -65,7 +65,7 @@ 
    Change Log
    
 
 
 
    Version 1.4.0
    
-
    Release Date: August 25, 2006
    
+
    Release Date: Septemer 01, 2006
    
 
 
      
 
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • 
@@ -76,6 +76,7 @@ 
      Version 1.4.0
      
 
    • Added the ability to supply full URLs using the anchor() helper function.
      • 
 
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
      • 
 
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
      • 
+
    • Updated the Config Library to be able to load config files silently.
      • 
 
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • 
 
    • Updated the form_open() helper to allow the GET method to be used.
      • 
 
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • 
@@ -96,12 +97,15 @@ 
      Version 1.4.0
      
 
    • Fixed a bug that was causing the Loader class to incorrectly identify the file extension.
      • 
 
    • Fixed a typo in the Calendar class (cal_november).
      •  
 
    • Fixed a bug in the form_checkbox() helper.
      • 
+
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
      • 
 
    • Fixed an evaluation bug in the database initialization function.
      • 
 
    • Fixed a minor bug in one of the error messages in the language class.
      • 
+
    • Fixed a bug in the date helper timespan function.
      • 
 
    • Fixed an undefined variable in the DB Driver class.
      • 
 
    • Fixed a bug in which dollar signs used as binding replacemnt values in the DB class would be treated as RegEx back-references.
      • 
 
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
      • 
 
    • Fixed a couple bugs in the Unit Testing class.
      • 
+
    • Fixed an incorrectlyl named variable in the Validation class.
      • 
 
    • Fixed some MS SQL bugs.
      • 
 
    • Fixed some doc typos.
      • 
 
    
diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html
index c173f569..ca4773d2 100644
--- a/user_guide/libraries/config.html
+++ b/user_guide/libraries/config.html
@@ -97,6 +97,22 @@ 
    Loading a Config File
    
 
 
    Where filename is the name of your config file, without the .php file extension.
    
 
+
    If you need to load multiple config files normally they will be merged into one master config array.  Name collisions can occur, however, if
+you have identically named array indexes in different config files.  To avoid collisions you can set the second parameter to TRUE
+and each config file will be stored in an array index corresponding to the name of the config file. Example:
+
+
+// Stored in an array with this prototype:  $this->config['blog_settings'] = $config
    
+$this->config->load('blog_settings', TRUE);    
+
+
    Please see the section entitled Fetching Config Items below to learn how to retrieve config items set this way.
    
+
+
    The third parameter allows you to suppress errors in the event that a config file does not exist:
    
+
+$this->config->load('blog_settings', FALSE, TRUE);
+
+
+
 
 
  • Auto-loading
    • 
 
@@ -109,7 +125,7 @@ 
    Loading a Config File
    
 
 
    Fetching Config Items
    
 
-
    To retrive an item from your config file, use the following function:
    
+
    To retrieve an item from your config file, use the following function:
    
 
 $this->config->item('item name');
 
@@ -119,6 +135,20 @@ 
    Fetching Config Items
    
 
 
    The function returns FALSE (boolean) if the item you are trying to fetch does not exist.
    
 
+
    If you are using the second parameter of the $this->config->load function in order to assign your config items to a specific index
+you can retrieve it by specifying the index name in the second parameter of the $this->config->item() function.  Example:
+
+
+// Loads a config file named blog_settings.php and assigns it to an index named "blog_settings"
    
+$this->config->load('blog_settings', 'TRUE');

    
+
+// Retrieve a config item named site_name contained within the blog_settings array
    
+$site_name = $this->config->item('site_name', 'blog_settings');

    
+
+// An alternate way to specify the same item:
    
+$blog_config = $this->config->item('blog_settings');
    
+$site_name = $blog_config['site_name'];    
+
 
    Setting a Config Item
    
 
 
    If you would like to dynamically set a config item or change an existing one, you can so so using:
    

From 6bda4e97821ee26efa29a2604b2e03eb2aa7273f Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 02:45:31 +0000
Subject: [PATCH 0018/2544]

---
 user_guide/general/changelog.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index a7707723..0a91b0c5 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -65,7 +65,7 @@ 
    Change Log
    
 
 
 
    Version 1.4.0
    
-
    Release Date: Septemer 01, 2006
    
+
    Release Date: September 01, 2006
    
 
 
      
 
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • 
@@ -80,7 +80,7 @@ 
      Version 1.4.0
      
 
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • 
 
    • Updated the form_open() helper to allow the GET method to be used.
      • 
 
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • 
-
    • Updated the SQLite Driver to check for object support before attmpting to return results as objects.  If unsupported it returns an array.
      • 
+
    • Updated the SQLite Driver to check for object support before attempting to return results as objects.  If unsupported it returns an array.
      • 
 
    • Updated the Models loader function to allow multiple loads of the same model.
      • 
 
    • Updated the MS SQL driver so that single quotes are escaped.
      • 
 
    • Removed a strtolower() call that was changing URL segments to lower case.
      • 
@@ -102,10 +102,10 @@ 
      Version 1.4.0
      
 
    • Fixed a minor bug in one of the error messages in the language class.
      • 
 
    • Fixed a bug in the date helper timespan function.
      • 
 
    • Fixed an undefined variable in the DB Driver class.
      • 
-
    • Fixed a bug in which dollar signs used as binding replacemnt values in the DB class would be treated as RegEx back-references.
      • 
+
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
      • 
 
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
      • 
 
    • Fixed a couple bugs in the Unit Testing class.
      • 
-
    • Fixed an incorrectlyl named variable in the Validation class.
      • 
+
    • Fixed an incorrectly named variable in the Validation class.
      • 
 
    • Fixed some MS SQL bugs.
      • 
 
    • Fixed some doc typos.
      • 
 
    

From 7530d50cd01c6cde8eabe6c62c180fe13a917f76 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 02:50:23 +0000
Subject: [PATCH 0019/2544]

---
 system/application/config/autoload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php
index a3ce4108..1ed6f175 100644
--- a/system/application/config/autoload.php
+++ b/system/application/config/autoload.php
@@ -39,7 +39,7 @@
 |	$autoload['core'] = array('database', 'session', 'xmlrpc');
 */
 
-$autoload['core'] = array('session');
+$autoload['core'] = array();
 
 
 /*

From c2efd6e9d84a3cb688d30239c4a0b2571b48b714 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 02:52:02 +0000
Subject: [PATCH 0020/2544]

---
 user_guide/installation/upgrade_140.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html
index bd84c242..810d1078 100644
--- a/user_guide/installation/upgrade_140.html
+++ b/user_guide/installation/upgrade_140.html
@@ -89,7 +89,7 @@ 
    Step 1: Update your Code Igniter files
    
 
 
    Step 2: Update your config.php file
    
 
-
    Open your application/config/config.php file and add these new items:
    
+
    Open your application/config/config.php file and add this new item:
    
 
 
     /*

From e0d85bf837a59e74054260346867aec8329565c0 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 03:59:48 +0000
Subject: [PATCH 0021/2544]

---
 system/application/config/hooks.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 system/application/config/hooks.php

diff --git a/system/application/config/hooks.php b/system/application/config/hooks.php
new file mode 100644
index 00000000..8ebb236d
--- /dev/null
+++ b/system/application/config/hooks.php
@@ -0,0 +1,12 @@
+
\ No newline at end of file

From b64b0be2dba3b342b70002b02305342e7f4e7ea4 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 17:19:54 +0000
Subject: [PATCH 0022/2544]

---
 user_guide/helpers/file_helper.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html
index c6b049b2..6970dd58 100644
--- a/user_guide/helpers/file_helper.html
+++ b/user_guide/helpers/file_helper.html
@@ -103,6 +103,12 @@ 
    write_file('path', $data)
    
      echo 'File written!';
    
 }    
 
+
    You can optionally set the write mode via the third parameter:
+
+write_file('./path/to/file.php', $data, 'r+');
+
+
    The default mode is wb.  Please see the PHP user guide for mode options.
    
+
 
    Note: In order for this function to write data to a file its file permissions must be set such that it is writable (666, 777, etc.).
 If the file does not already exist, the directory containing it must be writable.
    
 

From b4fd1d8b53451832fcdc54a01b76522f9bc8e125 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 17:22:01 +0000
Subject: [PATCH 0023/2544]

---
 user_guide/general/changelog.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 0a91b0c5..54f4746e 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -73,10 +73,11 @@ 
    Version 1.4.0
    
 
  • Added regular expressions support for routing rules.
    • 
 
  • Added the ability to replace core system classes with your own classes.
    • 
 
  • Added support for % character in URL.
    • 
-
  • Added the ability to supply full URLs using the anchor() helper function.
    • 
+
  • Added the ability to supply full URLs using the anchor() helper function.
    • 
+
  • Added mode parameter to file_write() helper.
    • 
 
  • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • 
 
  • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • 
-
  • Updated the Config Library to be able to load config files silently.
    • 
+
  • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • 
 
  • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • 
 
  • Updated the form_open() helper to allow the GET method to be used.
    • 
 
  • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • 

From 6d5a1c26d9cc3e754687580c6837f4fdbe8af49f Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 17:33:03 +0000
Subject: [PATCH 0024/2544]

---
 user_guide/libraries/database/configuration.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/libraries/database/configuration.html b/user_guide/libraries/database/configuration.html
index 4b7d2a8a..1e14438a 100644
--- a/user_guide/libraries/database/configuration.html
+++ b/user_guide/libraries/database/configuration.html
@@ -117,6 +117,7 @@ 
    Explanation of Values:
    
 
  • pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
    •  
 
  • db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
    •  
 
  • active_r - TRUE/FALSE (boolean) - Whether to load the Active Record Class. If you are not using the active record class you can have it omitted when the database classes are initialized in order to utilize less resources.
    •  
+
  • port - The database port number.  Currently only used with the Postgre driver.
    • 
 
 
 
    Note: Depending on what database platform you are using (MySQL, Postgre, etc.)

From 51cf423e1e41f573f87176d28affa50efda46c45 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 17:34:05 +0000
Subject: [PATCH 0025/2544]

---
 user_guide/general/changelog.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 54f4746e..188d8566 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -75,6 +75,7 @@ 
    Version 1.4.0
    
 
  • Added support for % character in URL.
    • 
 
  • Added the ability to supply full URLs using the anchor() helper function.
    • 
 
  • Added mode parameter to file_write() helper.
    • 
+
  • Added support for changing the port number in the Postgre driver.
    • 
 
  • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • 
 
  • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • 
 
  • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • 

From 2ed76d5ac89ec7869dcb64c050360fb2f99e9326 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 17:34:52 +0000
Subject: [PATCH 0026/2544]

---
 system/application/config/config.php     |  2 +-
 system/drivers/DB_driver.php             |  3 ++-
 system/drivers/DB_postgre.php            | 10 +++++++---
 system/helpers/file_helper.php           |  4 ++--
 system/helpers/url_helper.php            |  2 +-
 system/libraries/Output.php              |  2 +-
 user_guide/general/changelog.html        |  2 +-
 user_guide/general/hooks.html            |  6 ++++++
 user_guide/installation/upgrade_140.html | 15 ++++++++++++++-
 9 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/system/application/config/config.php b/system/application/config/config.php
index c19fabf4..7b19b83b 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -78,7 +78,7 @@
 | setting this variable to TRUE (boolean).  See the user guide for details.
 |
 */
-$config['enable_hooks'] = TRUE;
+$config['enable_hooks'] = FALSE;
 
 
 /*
diff --git a/system/drivers/DB_driver.php b/system/drivers/DB_driver.php
index 3a2a5e9b..0c2084ad 100644
--- a/system/drivers/DB_driver.php
+++ b/system/drivers/DB_driver.php
@@ -36,6 +36,7 @@ class CI_DB_driver {
 	var $database;
 	var $dbdriver		= 'mysql';
 	var $dbprefix		= '';
+	var $port			= '';
 	var $pconnect		= FALSE;
 	var $conn_id		= FALSE;
 	var $result_id		= FALSE;
@@ -75,7 +76,7 @@ function initialize($params = '')
 	{	
 		if (is_array($params))
 		{
-			foreach (array('hostname' => '', 'username' => '', 'password' => '', 'database' => '', 'dbdriver' => 'mysql', 'dbprefix' => '', 'pconnect' => FALSE, 'db_debug' => FALSE) as $key => $val)
+			foreach (array('hostname' => '', 'username' => '', 'password' => '', 'database' => '', 'dbdriver' => 'mysql', 'dbprefix' => '', 'port' => '', 'pconnect' => FALSE, 'db_debug' => FALSE) as $key => $val)
 			{
 				$this->$key = ( ! isset($params[$key])) ? $val : $params[$key];
 			}
diff --git a/system/drivers/DB_postgre.php b/system/drivers/DB_postgre.php
index fd98ec78..673dea33 100644
--- a/system/drivers/DB_postgre.php
+++ b/system/drivers/DB_postgre.php
@@ -38,9 +38,11 @@ class CI_DB_postgre extends CI_DB {
 	 */	
 	function db_connect()
 	{
-		return pg_connect("host=".$this->hostname." dbname=".$this->database." user=".$this->username." password=".$this->password);
+		$port = ($this->port == '') ? '' : " port=".$this->port;
+		
+		return pg_connect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password);
 	}
-	
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -51,7 +53,9 @@ function db_connect()
 	 */	
 	function db_pconnect()
 	{
-		return pg_pconnect("host=".$this->hostname." dbname=".$this->database." user=".$this->username." password=".$this->password);
+		$port = ($this->port == '') ? '' : " port=".$this->port;
+
+		return pg_pconnect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password);
 	}
 	
 	// --------------------------------------------------------------------
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index 93bddb02..32c0b2cd 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -75,9 +75,9 @@ function read_file($file)
  * @param	string	file data
  * @return	bool
  */	
-function write_file($path, $data)
+function write_file($path, $data, $mode = 'wb')
 {
-	if ( ! $fp = @fopen($path, 'wb'))
+	if ( ! $fp = @fopen($path, $mode))
 	{
 		return FALSE;
 	}
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 03d6c3b2..09169e32 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -56,7 +56,7 @@ function site_url($uri = '')
 function base_url()
 { 
 	$obj =& get_instance();
-	return $obj->config->item('base_url', 1);
+	return $obj->config->slash_item('base_url');
 }
 	
 // ------------------------------------------------------------------------
diff --git a/system/libraries/Output.php b/system/libraries/Output.php
index f5db3e0d..73f03863 100644
--- a/system/libraries/Output.php
+++ b/system/libraries/Output.php
@@ -147,7 +147,7 @@ function _write_cache($output)
 			return;
 		}
 		
-		$uri =	$obj->config->item('base_url', 1).
+		$uri =	$obj->config->slash_item('base_url').
 				$obj->config->item('index_page').
 				$obj->uri->uri_string();
 		
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 188d8566..e556684e 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -75,7 +75,7 @@ 
    Version 1.4.0
    
 
  • Added support for % character in URL.
    • 
 
  • Added the ability to supply full URLs using the anchor() helper function.
    • 
 
  • Added mode parameter to file_write() helper.
    • 
-
  • Added support for changing the port number in the Postgre driver.
    • 
+
  • Added support for changing the port number in the Postgre driver.
    • 
 
  • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • 
 
  • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • 
 
  • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • 
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
index 33d343d8..a780a5cd 100644
--- a/user_guide/general/hooks.html
+++ b/user_guide/general/hooks.html
@@ -69,6 +69,12 @@ 
    Hooks - Extending the Framework Core
    
 your own scripts in some other location.
 
    
 
+
    Enabling Hooks
    
+
+
    The hooks feature can be globally enabled/disabled by setting the following item in the application/config/config.php file:
    
+
+$config['enable_hooks'] = TRUE;
+
 
 
    Defining a Hook
    
 
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html
index 810d1078..1c72b5d7 100644
--- a/user_guide/installation/upgrade_140.html
+++ b/user_guide/installation/upgrade_140.html
@@ -89,9 +89,22 @@ 
    Step 1: Update your Code Igniter files
    
 
 
    Step 2: Update your config.php file
    
 
-
    Open your application/config/config.php file and add this new item:
    
+
    Open your application/config/config.php file and add these new items:
    
 
 
    +
+/*
+|--------------------------------------------------------------------------
+| Enable/Disable System Hooks
+|--------------------------------------------------------------------------
+|
+| 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.
+|
+*/
+$config['enable_hooks'] = FALSE;
+
+
 /*
 |--------------------------------------------------------------------------
 | Allowed URL Characters

From 337b270b6e566e81d3ee3b5575a3f274c000b459 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 17:43:16 +0000
Subject: [PATCH 0027/2544]

---
 system/libraries/Loader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 3d2501fc..f005adcf 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -478,7 +478,7 @@ function _ci_load($data)
 		if ($path == '')
 		{
 			$ext = pathinfo($view, PATHINFO_EXTENSION);
-			$file = ($ext != EXT) ? $view.EXT : $view;
+			$file = ($ext != '') ? $view.EXT : $view;
 			$path = $this->view_path.$file;
 		}
 		else

From 4064c1d7dab84fcafb42267a35a3b3aba8f9952d Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 17:43:31 +0000
Subject: [PATCH 0028/2544]

---
 user_guide/general/changelog.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index e556684e..168e72fe 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -96,7 +96,6 @@ 
    Version 1.4.0
    
 
  • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • 
 
  • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • 
 
  • Fixed some missing prefixes when using the database prefix feature.
    • 
-
  • Fixed a bug that was causing the Loader class to incorrectly identify the file extension.
    • 
 
  • Fixed a typo in the Calendar class (cal_november).
    •  
 
  • Fixed a bug in the form_checkbox() helper.
    • 
 
  • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • 

From 108d18acae3cf6e6e05afe2526eca97bfabcb4ad Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 17:45:38 +0000
Subject: [PATCH 0029/2544]

---
 user_guide/general/views.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide/general/views.html b/user_guide/general/views.html
index 14b03e58..b05e44c3 100644
--- a/user_guide/general/views.html
+++ b/user_guide/general/views.html
@@ -95,7 +95,7 @@ 
    Loading a View
    
 
 $this->load->view('name');
 
-
    Where name is the name of your view file, without the .php file extension.
    
+
    Where name is the name of your view file.  Note: The .php file extension does not need to be specified unless you use something other then .php.
    
 
 
    Now, open the controller file you made earlier called blog.php, and replace the echo statement with the view loading function:
    
 

From 6ac4bea2da9e64fb0b434f52177353f6bd65b8e6 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 2 Sep 2006 17:46:15 +0000
Subject: [PATCH 0030/2544]

---
 system/libraries/Loader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index f005adcf..e2467fa6 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -478,7 +478,7 @@ function _ci_load($data)
 		if ($path == '')
 		{
 			$ext = pathinfo($view, PATHINFO_EXTENSION);
-			$file = ($ext != '') ? $view.EXT : $view;
+			$file = ($ext == '') ? $view.EXT : $view;
 			$path = $this->view_path.$file;
 		}
 		else

From 1cf89aab5fff8c8068cbf0ed18038b6e4fd4f605 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 3 Sep 2006 18:24:39 +0000
Subject: [PATCH 0031/2544]

---
 system/codeigniter/CodeIgniter.php  | 15 ++++++++----
 system/codeigniter/Common.php       |  2 +-
 system/drivers/DB_active_record.php |  2 +-
 system/drivers/DB_driver.php        |  2 +-
 system/helpers/date_helper.php      |  2 +-
 system/helpers/text_helper.php      |  2 +-
 system/libraries/Email.php          |  4 ++--
 system/libraries/Image_lib.php      |  2 +-
 system/libraries/Log.php            |  6 ++---
 system/libraries/Output.php         |  2 +-
 system/libraries/Pagination.php     |  2 +-
 system/libraries/Router.php         | 14 ++++++++---
 system/libraries/Session.php        |  2 +-
 system/libraries/Trackback.php      |  4 ++--
 system/libraries/URI.php            |  4 ++--
 system/libraries/Validation.php     |  8 +++----
 user_guide/general/changelog.html   |  2 ++
 user_guide/general/controllers.html | 36 ++++++++++++++++++++++++++++-
 18 files changed, 81 insertions(+), 30 deletions(-)

diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 1f7850ec..5c3d19b7 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -192,13 +192,20 @@
 	{
 		$method = 'index';
 	}
-
-	if ( ! method_exists($CI, $method))
+	
+	if (method_exists($CI, '_remap'))
 	{
-		show_404();
+		$CI->_remap($method);
 	}
+	else
+	{
+		if ( ! method_exists($CI, $method))
+		{
+			show_404();
+		}
 	
-	$CI->$method();
+		$CI->$method();
+	}
 }
 
 /*
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index d5bec77f..1b190e20 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -175,7 +175,7 @@ function log_message($level = 'error', $message, $php_error = FALSE)
 							$config['log_threshold'], 
 							$config['log_date_format']
 						);
-	}
+	}	
 	
 	$LOG->write_log($level, $message, $php_error);
 }
diff --git a/system/drivers/DB_active_record.php b/system/drivers/DB_active_record.php
index f1995c80..1320af9e 100644
--- a/system/drivers/DB_active_record.php
+++ b/system/drivers/DB_active_record.php
@@ -790,7 +790,7 @@ function _compile_select()
 			}		
 		}
 		
-		if (ctype_digit($this->ar_limit))
+		if (is_numeric($this->ar_limit))
 		{
 			$sql .= "\n";
 			$sql = $this->_limit($sql, $this->ar_limit, $this->ar_offset);
diff --git a/system/drivers/DB_driver.php b/system/drivers/DB_driver.php
index 0c2084ad..5fcb04a0 100644
--- a/system/drivers/DB_driver.php
+++ b/system/drivers/DB_driver.php
@@ -352,7 +352,7 @@ function last_query()
 	 */	
 	function escape($str)
 	{	
-		if ( ! ctype_digit($str)) // bug fix to ensure that numbers are not treated as strings.
+		if ( ! is_numeric($str)) // bug fix to ensure that numbers are not treated as strings.
 		{
 			switch (gettype($str))
 			{
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index c8205bb7..ab3a3186 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -223,7 +223,7 @@ function days_in_month($month = 0, $year = '')
 		return 0;
 	}
 	
-	if ( ! ctype_digit($year) OR strlen($year) != 4)
+	if ( ! is_numeric($year) OR strlen($year) != 4)
 	{
 		$year = date('Y');
 	}
diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php
index 15b5573b..e4f816eb 100644
--- a/system/helpers/text_helper.php
+++ b/system/helpers/text_helper.php
@@ -333,7 +333,7 @@ function highlight_phrase($str, $phrase, $tag_open = '', $tag_close = '<
  */	
 function word_wrap($str, $chars = '76')
 {	
-	if ( ! ctype_digit($chars))
+	if ( ! is_numeric($chars))
 		$chars = 76;
 	
 	$str = preg_replace("/(\r\n|\r|\n)/", "\n", $str);
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 96dc0014..abc77a54 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -275,7 +275,7 @@ function cc($cc)
 	 */	
 	function bcc($bcc, $limit = '')
 	{
-		if ($limit != '' && ctype_digit($limit))
+		if ($limit != '' && is_numeric($limit))
 		{
 			$this->bcc_batch_mode = true;
 			$this->bcc_batch_size = $limit;
@@ -475,7 +475,7 @@ function set_protocol($protocol = 'mail')
 	 */	
 	function set_priority($n = 3)
 	{
-		if ( ! ctype_digit($n))
+		if ( ! is_numeric($n))
 		{
 			$this->priority = 3;
 			return;
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 854f0484..18e3253f 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -291,7 +291,7 @@ function initialize($props = array())
 		// Set the quality
 		$this->quality = trim(str_replace("%", "", $this->quality));
 		
-		if ($this->quality == '' OR $this->quality == 0 OR ! ctype_digit($this->quality))
+		if ($this->quality == '' OR $this->quality == 0 OR ! is_numeric($this->quality))
 			$this->quality = 90;
 	
 		// Set the x/y coordinates
diff --git a/system/libraries/Log.php b/system/libraries/Log.php
index de5a9b83..6c78316f 100644
--- a/system/libraries/Log.php
+++ b/system/libraries/Log.php
@@ -43,13 +43,13 @@ class CI_Log {
 	function CI_Log($path = '', $threshold = 4, $date_fmt = '')
 	{	
 		$this->log_path = ($path != '') ? $path : BASEPATH.'logs/';
-
+		
 		if ( ! is_dir($this->log_path) OR ! is_writable($this->log_path))
 		{
 			$this->_enabled = FALSE;
 		}
 		
-		if (ctype_digit($threshold))
+		if (is_numeric($threshold))
 		{
 			$this->_threshold = $threshold;
 		}
@@ -77,7 +77,7 @@ function CI_Log($path = '', $threshold = 4, $date_fmt = '')
 	function write_log($level = 'error', $msg, $php_error = FALSE)
 	{		
 		if ($this->_enabled === FALSE)
-		{
+		{ 
 			return FALSE;
 		}
 	
diff --git a/system/libraries/Output.php b/system/libraries/Output.php
index 73f03863..7a03cf9c 100644
--- a/system/libraries/Output.php
+++ b/system/libraries/Output.php
@@ -78,7 +78,7 @@ function set_output($output)
 	 */	
 	function cache($time)
 	{
-		$this->cache_expiration = ( ! ctype_digit($time)) ? 0 : $time;
+		$this->cache_expiration = ( ! is_numeric($time)) ? 0 : $time;
 	}
 	
 	// --------------------------------------------------------------------
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 0bbb577a..9d558f00 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -128,7 +128,7 @@ function create_links()
 			$this->cur_page = $obj->uri->segment($this->uri_segment);
 		}
 		
-		if ( ! ctype_digit($this->cur_page))
+		if ( ! is_numeric($this->cur_page))
 		{
 			$this->cur_page = 0;
 		}
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 2219f573..1c67113f 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -219,15 +219,23 @@ function _validate_segments($segments)
 		{
 			return $segments;
 		}
-		
+
 		// Is the controller in a sub-folder?
 		if (is_dir(APPPATH.'controllers/'.$segments['0']))
-		{
+		{		
 			// Set the directory and remove it from the segment array
 			$this->set_directory($segments['0']);
 			$segments = array_slice($segments, 1);
 			
-			if (count($segments) == 0)
+			if (count($segments) > 0)
+			{
+				// Does the requested controller exist in the sub-folder?
+				if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$segments['0'].EXT))
+				{
+					show_404();	
+				}
+			}
+			else
 			{
 				$this->set_class($this->default_controller);
 				$this->set_method('index');
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 4f08cf69..94efee55 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -99,7 +99,7 @@ function sess_run()
 		 */
 		$expiration = $this->object->config->item('sess_expiration');
 		
-		if (ctype_digit($expiration))
+		if (is_numeric($expiration))
 		{
 			if ($expiration > 0)
 			{
diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php
index 583c6d28..8f9680d4 100644
--- a/system/libraries/Trackback.php
+++ b/system/libraries/Trackback.php
@@ -368,7 +368,7 @@ function get_id($url)
 			$tb_array = explode('/', $url);
 			$tb_end   = $tb_array[count($tb_array)-1];
 			
-			if ( ! ctype_digit($tb_end))
+			if ( ! is_numeric($tb_end))
 			{
 				$tb_end  = $tb_array[count($tb_array)-2];
 			}
@@ -386,7 +386,7 @@ function get_id($url)
 			$tb_array = explode('/', $url);
 			$tb_id	= $tb_array[count($tb_array)-1];
 			
-			if ( ! ctype_digit($tb_id))
+			if ( ! is_numeric($tb_id))
 			{
 				$tb_id  = $tb_array[count($tb_array)-2];
 			}
diff --git a/system/libraries/URI.php b/system/libraries/URI.php
index c5fd4625..ba6279e8 100644
--- a/system/libraries/URI.php
+++ b/system/libraries/URI.php
@@ -88,7 +88,7 @@ function segment($n, $no_result = FALSE)
 	 */
 	function uri_to_assoc($n = 3, $default = array())
 	{
-		if ( ! ctype_digit($n))
+		if ( ! is_numeric($n))
 		{
 			return $default;
 		}
@@ -110,7 +110,7 @@ function uri_to_assoc($n = 3, $default = array())
 			{
 				$retval[$val] = FALSE;
 			}		
-			return $default;
+			return $retval;
 		}
 
 		$segments = array_slice($this->segment_array(), ($n - 1));
diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index 30faa85e..44f49ff6 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -404,7 +404,7 @@ function matches($str, $field)
 	 */	
 	function min_length($str, $val)
 	{
-		if ( ! ctype_digit($val))
+		if ( ! is_numeric($val))
 		{
 			return FALSE;
 		}
@@ -423,7 +423,7 @@ function min_length($str, $val)
 	 */	
 	function max_length($str, $val)
 	{
-		if ( ! ctype_digit($val))
+		if ( ! is_numeric($val))
 		{
 			return FALSE;
 		}
@@ -442,7 +442,7 @@ function max_length($str, $val)
 	 */	
 	function exact_length($str, $val)
 	{
-		if ( ! ctype_digit($val))
+		if ( ! is_numeric($val))
 		{
 			return FALSE;
 		}
@@ -517,7 +517,7 @@ function alpha_dash($str)
 	 */	
 	function numeric($str)
 	{
-		return ( ! ctype_digit($str)) ? FALSE : TRUE;
+		return ( ! is_numeric($str)) ? FALSE : TRUE;
 	}
 	
 	// --------------------------------------------------------------------
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 168e72fe..370cd044 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -71,6 +71,7 @@ 
    Version 1.4.0
    
 
  • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • 
 
  • Added the ability to organize controller files into sub-folders.  Kudos to Marco for suggesting this (and the next two) feature.
    • 
 
  • Added regular expressions support for routing rules.
    • 
+
  • Added the ability to remap function calls withing your controllers.
    • 
 
  • Added the ability to replace core system classes with your own classes.
    • 
 
  • Added support for % character in URL.
    • 
 
  • Added the ability to supply full URLs using the anchor() helper function.
    • 
@@ -107,6 +108,7 @@ 
    Version 1.4.0
    
 
  • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • 
 
  • Fixed a couple bugs in the Unit Testing class.
    • 
 
  • Fixed an incorrectly named variable in the Validation class.
    • 
+
  • Fixed an incorrectly named variable in the URI class.
    • 
 
  • Fixed some MS SQL bugs.
    • 
 
  • Fixed some doc typos.
    • 
 
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 4dc94cba..3ea0b61c 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -69,6 +69,7 @@ 
    Controllers
    
 
  • What is a Controller?
    • 
 
  • Hello World
    • 
 
  • Functions
    • 
+
  • Remapping Function Calls
    • 
 
  • Private Functions
    • 
 
  • Defining a Default Controller
    • 
 
  • Organizing Controllers into Sub-folders
    • 
@@ -174,10 +175,43 @@ 
    Functions
    
 
 
    You should see your new message.
    
 
+
+
+
    Remapping Function Calls
    
+
+
    As noted above, the second segment of the URI typically determines which function in the controller gets called.
+Code Igniter permits you to override this behavior through the use of the _remap() function:
    
+
+function _remap()
    
+{
    
+    // Some code here...
    
+}    
+
+
    Important:  If your controller contains a function named _remap(), it will always 
+get called regardless of what your URI contains.  It overrides the normal behavior in which the URI determines which function is called, 
+allowing you to define your own function routing rules.
    
+
+
    The overriden function call (typically the second segment of the URI) will be passed as a parameter the _remap() function:
    
+
+function _remap($method)
    
+{
    
+    if ($method == 'some_method')
    
+    {
    
+        $this->$method();
    
+    }
    
+    else
    
+    {
    
+        $this->default_method();
    
+    }
    
+}    
+
+
+
+
 
 
    Private Functions
    
 
-
    In some cases you may not want certain functions accessible publicly.  To make a function private, simply add an
+
    In some cases you may want certain functions hidden from public access.  To make a function private, simply add an
 underscore as the name prefix and it will not be served via a URL request. For example, if you were to have a function like this:
    
 
 

From 5e7ac0e9a4319d29fd23b5525aef05ad28ff0706 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 3 Sep 2006 18:29:51 +0000
Subject: [PATCH 0032/2544]

---
 system/drivers/DB_postgre.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/system/drivers/DB_postgre.php b/system/drivers/DB_postgre.php
index 673dea33..f0be3c0b 100644
--- a/system/drivers/DB_postgre.php
+++ b/system/drivers/DB_postgre.php
@@ -174,7 +174,7 @@ function count_all($table = '')
 		if ($table == '')
 			return '0';
 	
-		$query = $this->query("SELECT COUNT(*) AS numrows FROM ".$this->dbprefix.$table."");
+		$query = $this->query('SELECT COUNT(*) AS numrows FROM "'.$this->dbprefix.$table.'"');
 		
 		if ($query->num_rows() == 0)
 			return '0';
@@ -216,7 +216,6 @@ function error_number()
 	 *
 	 * This function adds backticks if the table name has a period
 	 * in it. Some DBs will get cranky unless periods are escaped.
-	 * NOT NEEDED FOR POSTGRE
 	 *
 	 * @access	public
 	 * @param	string	the table name
@@ -224,12 +223,10 @@ function error_number()
 	 */
 	function escape_table($table)
 	{
-		/*
 		if (stristr($table, '.'))
 		{
-			$table = preg_replace("/\./", "`.`", $table);
+			$table = '"'.preg_replace("/\./", '"."', $table).'"';
 		}
-		*/
 		
 		return $table;
 	}

From 2e825884e53da33db143d71ff64deb204e041962 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 3 Sep 2006 18:34:32 +0000
Subject: [PATCH 0033/2544]

---
 user_guide/general/changelog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 370cd044..5c721d1f 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -65,7 +65,7 @@ 
    Change Log
    
 
 
 
    Version 1.4.0
    
-
    Release Date: September 01, 2006
    
+
    Release Date: September 03, 2006
    
 
 
      
 
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • 

From e6ed3d965a3148327302e6f6a22ea38a141d4be9 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 3 Sep 2006 18:38:18 +0000
Subject: [PATCH 0034/2544]

---
 system/application/config/database.php | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/system/application/config/database.php b/system/application/config/database.php
index 610f6081..cf91844d 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -29,29 +29,16 @@
 |
 */
 
-$active_group = "test";
+$active_group = "default";
 
 $db['default']['hostname'] = "localhost";
-$db['default']['username'] = "root";
+$db['default']['username'] = "";
 $db['default']['password'] = "";
-$db['default']['database'] = "ellislab";
+$db['default']['database'] = "";
 $db['default']['dbdriver'] = "mysql";
 $db['default']['dbprefix'] = "";
 $db['default']['active_r'] = TRUE;
 $db['default']['pconnect'] = FALSE;
 $db['default']['db_debug'] = TRUE;
 
-
-
-$db['test']['hostname'] = "localhost";
-$db['test']['username'] = "root";
-$db['test']['password'] = "";
-$db['test']['database'] = "tester";
-$db['test']['dbdriver'] = "mysql";
-$db['test']['dbprefix'] = "";
-$db['test']['active_r'] = TRUE;
-$db['test']['pconnect'] = FALSE;
-$db['test']['db_debug'] = TRUE;
-
-
 ?>
\ No newline at end of file

From 6cd2ee9a7aa926b607922d933abc3f21b9e3868e Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 4 Sep 2006 07:11:16 +0000
Subject: [PATCH 0035/2544]

---
 system/libraries/Config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index f7f813f8..532f70d4 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -208,12 +208,12 @@ function site_url($uri = '')
 		
 		if ($uri == '')
 		{
-			return $this->item('base_url', 1).$this->item('index_page');
+			return $this->slash_item('base_url').$this->item('index_page');
 		}
 		else
 		{
 			$suffix = ($this->item('url_suffix') == FALSE) ? '' : $this->item('url_suffix');		
-			return $this->item('base_url', 1).$this->item('index_page', 1).preg_replace("|^/*(.+?)/*$|", "\\1", $uri).$suffix;
+			return $this->slash_item('base_url').$this->slash_item('index_page').preg_replace("|^/*(.+?)/*$|", "\\1", $uri).$suffix;
 		}
 	}
   	// END site_url()

From d7bb13b67294da6f0e0accccf6f992465665c149 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 4 Sep 2006 07:13:05 +0000
Subject: [PATCH 0036/2544]

---
 system/language/english/validation_lang.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/language/english/validation_lang.php b/system/language/english/validation_lang.php
index 326fe557..580ce297 100644
--- a/system/language/english/validation_lang.php
+++ b/system/language/english/validation_lang.php
@@ -7,7 +7,8 @@
 $lang['min_length']		= "The %s field must be at least %s characters in length.";
 $lang['max_length']		= "The %s field can not exceed %s characters in length.";
 $lang['exact_length']	= "The %s field must be exactly %s characters in length.";
-$lang['alpha']			= "The %s field may only contain alpha-numeric characters.";
+$lang['alpha']			= "The %s field may only contain alphabetical characters.";
+$lang['alpha_numeric']	= "The %s field may only contain alpha-numeric characters.";
 $lang['alpha_dash']		= "The %s field may only contain alpha-numeric characters, underscores, and dashes.";
 $lang['numeric']		= "The %s field must contain a number.";
 $lang['matches']		= "The %s field does not match the %s field.";

From 813711e6ddfa347fd0d74c109c14fe10a919f668 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 4 Sep 2006 07:13:57 +0000
Subject: [PATCH 0037/2544]

---
 system/libraries/Config.php | 2 +-
 system/libraries/Router.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index 532f70d4..108c94ab 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -229,7 +229,7 @@ function site_url($uri = '')
 	function system_url()
 	{
 		$x = explode("/", preg_replace("|/*(.+?)/*$|", "\\1", BASEPATH));
-		return $this->item('base_url', 1).end($x).'/';
+		return $this->slash_item('base_url').end($x).'/';
 	}
   	// END system_url()
   	
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 1c67113f..c7e855a7 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -312,12 +312,12 @@ function _parse_routes()
 			$key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key));
 			
 			// Does the RegEx match?
-			if (preg_match('|^'.$key.'$|', $uri))
+			if (preg_match('#^'.preg_quote($key).'$#', $uri))
 			{			
 				// Do we have a back-reference?
 				if (strpos($val, '$') !== FALSE AND strpos($key, '(') !== FALSE)
 				{
-					$val = preg_replace('|^'.$key.'$|', $val, $uri);
+					$val = preg_replace('#^'.preg_quote($key).'$#', $val, $uri);
 				}
 			
 				$this->_compile_segments(explode('/', $val));		

From eb2b8199fe2d2f7728e0c88fd68f6e712aba8951 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 4 Sep 2006 07:19:25 +0000
Subject: [PATCH 0038/2544]

---
 user_guide/general/changelog.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 5c721d1f..899896a1 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -109,6 +109,7 @@ 
      Version 1.4.0
      
 
    • Fixed a couple bugs in the Unit Testing class.
      • 
 
    • Fixed an incorrectly named variable in the Validation class.
      • 
 
    • Fixed an incorrectly named variable in the URI class.
      • 
+
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
      • 
 
    • Fixed some MS SQL bugs.
      • 
 
    • Fixed some doc typos.
      • 
 
    

From e3817a3d5edcca29e21b3c2f4292abae80070b2b Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 5 Sep 2006 03:30:46 +0000
Subject: [PATCH 0039/2544]

---
 user_guide/general/controllers.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 3ea0b61c..13a007aa 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -255,9 +255,15 @@ 
    Organizing Your Controllers into Sub-folders
    
 
 www.your-site.com/index.php/products/shoes/123
 
+
    Each of your sub-folders may contain a default controller which will be
+called if the URL contains only the sub-folder.  Simply name your default controller as specified in your
+application/config/routes.php file
    
+
+
 
    Code Igniter also permits you to remap your URIs using its URI Routing feature.
 
 
+
 
 
    Class Constructors
    
 

From 27818494dca469e96709fd9c54ba8f8461d88714 Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 5 Sep 2006 03:31:28 +0000
Subject: [PATCH 0040/2544]

---
 system/libraries/Router.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index c7e855a7..de1a6e9a 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -239,8 +239,14 @@ function _validate_segments($segments)
 			{
 				$this->set_class($this->default_controller);
 				$this->set_method('index');
-				$this->directory = '';
-				return array();
+			
+				// Does the default controller exist in the sub-folder?
+				if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$this->default_controller.EXT))
+				{
+					$this->directory = '';
+					return array();
+				}
+			
 			}
 				
 			return $segments;

From ddd0c7dff8e8d422f72c91c43e8a3a0a24c4c408 Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 5 Sep 2006 04:05:33 +0000
Subject: [PATCH 0041/2544]

---
 user_guide/libraries/file_uploading.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html
index 7fabb095..071ad1f1 100644
--- a/user_guide/libraries/file_uploading.html
+++ b/user_guide/libraries/file_uploading.html
@@ -323,11 +323,17 @@ 
    Function Reference
    
 
 
    $this->upload->do_upload()
    
 
-
    Performs the upload based on the preferences you've set.  Note:  The upload routine expects the file to come from a form field 
+
    Performs the upload based on the preferences you've set.  Note:  By default the upload routine expects the file to come from a form field 
 called userfile, and the form must be a "multipart type:
    
 
 <form method="post" action="some_action" enctype="multipart/form-data" />
 
+
    If you would like to set your own field name simply pass its value to the do_upload function:
    
+
+
+$field_name = "some_field_name";
    
+$this->upload->do_upload($field_name)    
+
 
 
    $this->upload->display_errors()
    
 

From 4cdd137a1d6d54e24058b35533f6d6df37856aa2 Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 5 Sep 2006 04:07:02 +0000
Subject: [PATCH 0042/2544]

---
 user_guide/general/changelog.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 899896a1..eebd9127 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -79,6 +79,7 @@ 
    Version 1.4.0
    
 
  • Added support for changing the port number in the Postgre driver.
    • 
 
  • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • 
 
  • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • 
+
  • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • 
 
  • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • 
 
  • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • 
 
  • Updated the form_open() helper to allow the GET method to be used.
    • 

From 73e582fbd7d7f6cdcf7f18b31b4b96ecb7c4141f Mon Sep 17 00:00:00 2001
From: admin 
Date: Wed, 6 Sep 2006 01:36:34 +0000
Subject: [PATCH 0043/2544]

---
 system/helpers/security_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php
index 918e4ae9..f14ba72a 100644
--- a/system/helpers/security_helper.php
+++ b/system/helpers/security_helper.php
@@ -50,7 +50,7 @@ function xss_clean($str, $charset = 'ISO-8859-1')
  * @param	string
  * @return	string
  */		
-function hash($str, $type = 'sha1')
+function dohash($str, $type = 'sha1')
 {
 	if ($type == 'sha1')
 	{

From 5ffcde80fe0c37015c5383da6e53389ad6f4d6f0 Mon Sep 17 00:00:00 2001
From: admin 
Date: Wed, 6 Sep 2006 01:41:48 +0000
Subject: [PATCH 0044/2544]

---
 user_guide/helpers/security_helper.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html
index 7649fe77..2fc8f6dc 100644
--- a/user_guide/helpers/security_helper.html
+++ b/user_guide/helpers/security_helper.html
@@ -80,14 +80,14 @@ 
    xss_clean()
    
 Input class.  More info can be found there.
    
 
 
-
    hash()
    
+
    dohash()
    
 
 
    Permits you to create SHA1 or MD5 one way hashes suitable for encrypting passwords.  Will create SHA1 by default. Examples:
    
 
 
-$str = hash($str); // SHA1
    
+$str = dohash($str); // SHA1
    
 
    
-$str = hash($str, 'md5'); // MD5
+$str = dohash($str, 'md5'); // MD5
     
 
 

From 1066dcb279e26de29fd663d61957dfcd1f939f9a Mon Sep 17 00:00:00 2001
From: admin 
Date: Wed, 6 Sep 2006 01:55:56 +0000
Subject: [PATCH 0045/2544]

---
 system/drivers/DB_postgre.php | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/system/drivers/DB_postgre.php b/system/drivers/DB_postgre.php
index f0be3c0b..aa7ec702 100644
--- a/system/drivers/DB_postgre.php
+++ b/system/drivers/DB_postgre.php
@@ -154,7 +154,35 @@ function affected_rows()
 	 */
 	function insert_id()
 	{
-		return pg_last_oid($this->result_id);
+		$v = pg_version($this->conn_id);
+		$v = $v['server'];
+		
+		$table	= func_num_args() > 0 ? func_get_arg(0) : null;
+		$column	= func_num_args() > 1 ? func_get_arg(1) : null;
+		
+		if ($table == null && $v >= '8.1')
+		{
+			$sql='SELECT LASTVAL() as ins_id';
+		}
+		elseif ($table != null && $column != null && $v >= '8.0')
+		{
+			$sql = sprintf("SELECT pg_get_serial_sequence('%s','%s') as seq", $table, $column);
+			$query = $this->query($sql);
+			$row = $query->row();
+			$sql = sprintf("SELECT CURRVAL('%s') as ins_id", $row->seq);
+		}
+		elseif ($table != null)
+		{
+			// seq_name passed in table parameter
+			$sql = sprintf("SELECT CURRVAL('%s') as ins_id", $table);
+		}
+		else
+		{
+			return pg_last_oid($this->result_id);
+		}
+		$query = $this->query($sql);
+		$row = $query->row();
+		return $row->ins_id;
 	}
 
 	// --------------------------------------------------------------------

From fdd928182d6691ed2073f6f3a90427157007f54b Mon Sep 17 00:00:00 2001
From: admin 
Date: Wed, 6 Sep 2006 01:57:41 +0000
Subject: [PATCH 0046/2544]

---
 system/drivers/DB_odbc.php | 69 +++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/system/drivers/DB_odbc.php b/system/drivers/DB_odbc.php
index 50f39acc..a5a8db64 100644
--- a/system/drivers/DB_odbc.php
+++ b/system/drivers/DB_odbc.php
@@ -445,9 +445,16 @@ function field_data()
 	 */
 	function _fetch_assoc()
 	{
-		return odbc_fetch_array($this->result_id);
+		if (function_exists('odbc_fetch_object'))
+		{
+			return odbc_fetch_array($this->result_id);
+		}
+		else
+		{
+			return $this->_odbc_fetch_array($this->result_id);
+		}
 	}
-	
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -460,9 +467,63 @@ function _fetch_assoc()
 	 */
 	function _fetch_object()
 	{
-		return odbc_fetch_object($this->result_id);
+		if (function_exists('odbc_fetch_object'))
+		{
+			return odbc_fetch_object($this->result_id);
+		}
+		else
+		{
+			return $this->_odbc_fetch_object($this->result_id);
+		}
 	}
-	
+
+
+	/**
+	 * Result - object
+	 *
+	 * subsititutes the odbc_fetch_object function when
+	 * not available (odbc_fetch_object requires unixODBC)
+	 *
+	 * @access	private
+	 * @return	object
+	 */
+
+	function _odbc_fetch_object(& $odbc_result) {
+		$rs = array();
+		$rs_obj = false;
+		if (odbc_fetch_into($odbc_result, $rs)) {
+			foreach ($rs as $k=>$v) {
+				$field_name= odbc_field_name($odbc_result, $k+1);
+				$rs_obj->$field_name = $v;
+			}
+		}
+		return $rs_obj;
+	}
+
+
+	/**
+	 * Result - array
+	 *
+	 * subsititutes the odbc_fetch_array function when
+	 * not available (odbc_fetch_array requires unixODBC)
+	 *
+	 * @access	private
+	 * @return	array
+	 */
+
+	function _odbc_fetch_array(& $odbc_result) {
+		$rs = array();
+		$rs_assoc = false;
+		if (odbc_fetch_into($odbc_result, $rs)) {
+			$rs_assoc=array();
+			foreach ($rs as $k=>$v) {
+				$field_name= odbc_field_name($odbc_result, $k+1);
+				$rs_assoc[$field_name] = $v;
+			}
+		}
+		return $rs_assoc;
+	}
+
 }
 
 ?>
\ No newline at end of file

From 4d07c1528873d70efcb6fbf305a8ab930a9bc758 Mon Sep 17 00:00:00 2001
From: admin 
Date: Wed, 6 Sep 2006 02:14:53 +0000
Subject: [PATCH 0047/2544]

---
 system/helpers/url_helper.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 09169e32..6e2f7f45 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -90,7 +90,14 @@ function index_page()
  */	
 function anchor($uri = '', $title = '', $attributes = '')
 {
-	$site_url = ( ! preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri;
+	if ( ! is_array($uri))
+	{
+		$site_url = ( ! preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri;
+	}
+	else
+	{
+		$site_url = site_url($uri);
+	}
 	
 	if ($title == '')
 	{

From 2e5872ac0527c342e066bdc2e8facf452858dd39 Mon Sep 17 00:00:00 2001
From: admin 
Date: Wed, 6 Sep 2006 02:32:55 +0000
Subject: [PATCH 0048/2544]

---
 system/libraries/Loader.php | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index e2467fa6..a140fb5a 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -565,15 +565,7 @@ function _ci_autoloader($autoload)
 		{
 			if (isset($autoload[$type]))
 			{
-				if ( ! is_array($autoload[$type]))
-				{
-					$autoload[$type] = array($autoload[$type]);
-				}
-			
-				foreach ($autoload[$type] as $item)
-				{
-					$this->$type($item);
-				}
+				$this->$type($autoload[$type]);
 			}
 		}
 	}
@@ -592,20 +584,9 @@ function _ci_autoloader($autoload)
 	 */
 	function _ci_object_to_array($object)
 	{
-		if ( ! is_object($object))
-		{
-			return $object;
-		}
-		
-		$array = array();
-		foreach (get_object_vars($object) as $key => $val)
-		{
-			$array[$key] = $val;
-		}
-	
-		return $array;
+		return (is_object($object)) ? get_object_vars($object) : $object;
 	}
+	// END _ci_object_to_array()
 	
 }
-// END Loader Class
 ?>
\ No newline at end of file

From a16e88387eb0b0d56d7fab44874e63fdead19da4 Mon Sep 17 00:00:00 2001
From: admin 
Date: Wed, 6 Sep 2006 02:48:30 +0000
Subject: [PATCH 0049/2544]

---
 user_guide/general/hooks.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
index a780a5cd..d71ec598 100644
--- a/user_guide/general/hooks.html
+++ b/user_guide/general/hooks.html
@@ -142,6 +142,9 @@ 
    Hook Points
    
 
  • pre_controller
    
 Called immediately prior to any of your controllers being called. All base classes, routing, and security checks have been done.
    • 
 
+
  • post_controller_constructor
    
+Called immediately after the controller is instantiated, but prior to any method calls happen.
    • 
+
 
  • post_controller
    
 Called immediately after the controller is called.
    • 
 

From eb567c702cda744b53be22206c55a960a36cb678 Mon Sep 17 00:00:00 2001
From: admin 
Date: Wed, 6 Sep 2006 02:48:47 +0000
Subject: [PATCH 0050/2544]

---
 system/codeigniter/CodeIgniter.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 5c3d19b7..e09bf3de 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -188,6 +188,16 @@
 }
 else
 {
+	/*
+	 * ------------------------------------------------------
+	 *  Is there a "post_controller_constructor" hook?
+	 * ------------------------------------------------------
+	 */
+	if ($EXT->_hook_exists('post_controller_constructor'))
+	{
+		$EXT->_call_hook('post_controller_constructor');
+	}
+
 	if ($method == $class)
 	{
 		$method = 'index';

From 764672b45108814fc643be65b53b18f0b6507112 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 15 Sep 2006 20:02:05 +0000
Subject: [PATCH 0051/2544]

---
 system/libraries/Hooks.php | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/system/libraries/Hooks.php b/system/libraries/Hooks.php
index 389e7ac1..7ff0592f 100644
--- a/system/libraries/Hooks.php
+++ b/system/libraries/Hooks.php
@@ -66,34 +66,6 @@ function CI_Hooks()
 	}
   	// END CI_Hooks()
   	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Does a given hook exist?
-	 *
-	 * Returns TRUE/FALSE based on whether a given hook exists
-	 *
-	 * @access	private
-	 * @param	string
-	 * @return	bool
-	 */
-	function _hook_exists($which = '')
-	{
-		if ( ! $this->enabled)
-		{
-			return FALSE;
-		}
-
-		if ( ! isset($this->hooks[$which]))
-		{
-			return FALSE;
-		}
-
-		return TRUE;
-	}
-  	// END hook_exists()
-  	
-  	
 	// --------------------------------------------------------------------
 
 	/**
@@ -107,6 +79,11 @@ function _hook_exists($which = '')
 	 */
 	function _call_hook($which = '')
 	{
+		if ( ! $this->enabled OR ! isset($this->hooks[$which]))
+		{
+			return FALSE;
+		}
+	
 		if (isset($this->hooks[$which][0]) AND is_array($this->hooks[$which][0]))
 		{
 			foreach ($this->hooks[$which] as $val)
@@ -118,6 +95,8 @@ function _call_hook($which = '')
 		{
 			$this->_run_hook($this->hooks[$which]);
 		}
+		
+		return TRUE;
 	}
   	// END hook_exists()
 
@@ -144,7 +123,7 @@ function _run_hook($data)
 		// -----------------------------------
 	
 		// If the script being called happens to have the same 
-		// extension call within it a loop can happen
+		// hook call within it a loop can happen
 		
 		if ($this->in_progress == TRUE)
 		{

From af436d7ceb4ea5afb96e3cbe1545ba9ace3d062a Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 15 Sep 2006 20:02:14 +0000
Subject: [PATCH 0052/2544]

---
 system/codeigniter/CodeIgniter.php | 43 ++++++------------------------
 1 file changed, 8 insertions(+), 35 deletions(-)

diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index e09bf3de..09cdcbfb 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -66,10 +66,7 @@
  *  Is there a "pre_system" hook?
  * ------------------------------------------------------
  */
-if ($EXT->_hook_exists('pre_system'))
-{
-	$EXT->_call_hook('pre_system');
-}
+$EXT->_call_hook('pre_system');
 
 /*
  * ------------------------------------------------------
@@ -87,11 +84,7 @@
  * ------------------------------------------------------
  */
  
-if ($EXT->_hook_exists('cache_override'))
-{
-	$EXT->_call_hook('cache_override');
-}
-else
+if ($EXT->_call_hook('cache_override') === FALSE)
 {
 	if ($OUT->_display_cache() == TRUE)
 	{
@@ -163,10 +156,7 @@
  *  Is there a "pre_controller" hook?
  * ------------------------------------------------------
  */
-if ($EXT->_hook_exists('pre_controller'))
-{
-	$EXT->_call_hook('pre_controller');
-}
+$EXT->_call_hook('pre_controller');
 
 /*
  * ------------------------------------------------------
@@ -177,11 +167,7 @@
 
 if ($RTR->scaffolding_request === TRUE)
 {
-	if ($EXT->_hook_exists('scaffolding_override'))
-	{
-		$EXT->_call_hook('scaffolding_override');
-	}
-	else
+	if ($EXT->_call_hook('scaffolding_override') === FALSE)
 	{
 		$CI->_ci_scaffolding();
 	}
@@ -193,10 +179,7 @@
 	 *  Is there a "post_controller_constructor" hook?
 	 * ------------------------------------------------------
 	 */
-	if ($EXT->_hook_exists('post_controller_constructor'))
-	{
-		$EXT->_call_hook('post_controller_constructor');
-	}
+	$EXT->_call_hook('post_controller_constructor');
 
 	if ($method == $class)
 	{
@@ -223,10 +206,7 @@
  *  Is there a "post_controller" hook?
  * ------------------------------------------------------
  */
-if ($EXT->_hook_exists('post_controller'))
-{
-	$EXT->_call_hook('post_controller');
-}
+$EXT->_call_hook('post_controller');
 
 /*
  * ------------------------------------------------------
@@ -234,11 +214,7 @@
  * ------------------------------------------------------
  */
  
-if ($EXT->_hook_exists('display_override'))
-{
-	$EXT->_call_hook('display_override');
-}
-else
+if ($EXT->_call_hook('display_override') === FALSE)
 {
 	$OUT->_display();
 }
@@ -248,10 +224,7 @@
  *  Is there a "post_system" hook?
  * ------------------------------------------------------
  */
-if ($EXT->_hook_exists('post_system'))
-{
-	$EXT->_call_hook('post_system');
-}
+$EXT->_call_hook('post_system');
 
 /*
  * ------------------------------------------------------

From 349b09c2af14c79c332a6b7d5e3b653a8ad527b7 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 15 Sep 2006 20:07:00 +0000
Subject: [PATCH 0053/2544]

---
 system/codeigniter/Common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index 1b190e20..6d76fb09 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -38,7 +38,7 @@
 */
 function &_load_class($class, $instantiate = TRUE)
 {
-	static $objects;
+	static $objects = array();
 	
 	if ( ! isset($objects[$class]))
 	{
@@ -63,7 +63,7 @@ function &_load_class($class, $instantiate = TRUE)
 		}
 		else
 		{
-			$objects[$class] = FALSE;
+			$objects[$class] = TRUE;
 		}
 	}
 	

From 71430b4c30f01c861abe379becc670748e3b4a19 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 15 Sep 2006 20:29:25 +0000
Subject: [PATCH 0054/2544]

---
 system/libraries/Router.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index de1a6e9a..1dd1e542 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -318,12 +318,12 @@ function _parse_routes()
 			$key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key));
 			
 			// Does the RegEx match?
-			if (preg_match('#^'.preg_quote($key).'$#', $uri))
+			if (preg_match('#^'.$key.'$#', $uri))
 			{			
 				// Do we have a back-reference?
 				if (strpos($val, '$') !== FALSE AND strpos($key, '(') !== FALSE)
 				{
-					$val = preg_replace('#^'.preg_quote($key).'$#', $val, $uri);
+					$val = preg_replace('#^'.$key.'$#', $val, $uri);
 				}
 			
 				$this->_compile_segments(explode('/', $val));		

From 633ec3758910482863299c7122dda3c15d9758a8 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 15 Sep 2006 20:43:32 +0000
Subject: [PATCH 0055/2544]

---
 system/libraries/Log.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/system/libraries/Log.php b/system/libraries/Log.php
index 6c78316f..39274258 100644
--- a/system/libraries/Log.php
+++ b/system/libraries/Log.php
@@ -40,23 +40,25 @@ class CI_Log {
 	 * @param	string	the error threshold
 	 * @param	string	the date formatting codes
 	 */
-	function CI_Log($path = '', $threshold = 4, $date_fmt = '')
-	{	
-		$this->log_path = ($path != '') ? $path : BASEPATH.'logs/';
+	function CI_Log()
+	{
+		$config =& _get_config();
+		
+		$this->log_path = ($config['log_path'] != '') ? $config['log_path'] : BASEPATH.'logs/';
 		
 		if ( ! is_dir($this->log_path) OR ! is_writable($this->log_path))
 		{
 			$this->_enabled = FALSE;
 		}
 		
-		if (is_numeric($threshold))
+		if (is_numeric($config['log_threshold']))
 		{
-			$this->_threshold = $threshold;
+			$this->_threshold = $config['log_threshold'];
 		}
 			
-		if ($date_fmt != '')
+		if ($config['log_date_format'] != '')
 		{
-			$this->_date_fmt = $date_fmt;
+			$this->_date_fmt = $config['log_date_format'];
 		}
 	}
 	// END CI_Log()

From 43a46cc3d3d485a50c287d33ad94f044f8a6c46c Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 15 Sep 2006 20:44:52 +0000
Subject: [PATCH 0056/2544]

---
 system/codeigniter/Common.php | 36 ++++-------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index 6d76fb09..a4531a7d 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -110,12 +110,7 @@ function &_get_config()
 */
 function show_error($message)
 {
-	if ( ! class_exists('CI_Exceptions'))
-	{
-		include_once(BASEPATH.'libraries/Exceptions.php');
-	}
-	
-	$error = new CI_Exceptions();
+	$error =& _load_class('CI_Exceptions');
 	echo $error->show_error('An Error Was Encountered', $message);
 	exit;
 }
@@ -133,12 +128,7 @@ function show_error($message)
 */
 function show_404($page = '')
 {
-	if ( ! class_exists('CI_Exceptions'))
-	{
-		include_once(BASEPATH.'libraries/Exceptions.php');
-	}
-	
-	$error = new CI_Exceptions();
+	$error =& _load_class('CI_Exceptions');
 	$error->show_404($page);
 	exit;
 }
@@ -163,20 +153,7 @@ function log_message($level = 'error', $message, $php_error = FALSE)
 		return;
 	}
 
-	if ( ! class_exists('CI_Log'))
-	{
-		include_once(BASEPATH.'libraries/Log.php');		
-	}
-	
-	if ( ! is_object($LOG))
-	{
-		$LOG = new CI_Log(
-							$config['log_path'], 
-							$config['log_threshold'], 
-							$config['log_date_format']
-						);
-	}	
-	
+	$LOG =& _load_class('CI_Log');	
 	$LOG->write_log($level, $message, $php_error);
 }
 
@@ -209,12 +186,7 @@ function _exception_handler($severity, $message, $filepath, $line)
 		return;
 	}
 
-	// Send the PHP error to the log file...
-	if ( ! class_exists('CI_Exceptions'))
-	{
-		include_once(BASEPATH.'libraries/Exceptions.php');
-	}
-	$error = new CI_Exceptions();
+	$error =& _load_class('CI_Exceptions');
 
 	// Should we display the error?  
 	// We'll get the current error_reporting level and add its bits

From 1856f58a16da54f12414350f2e2a833d0cdd7d45 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 15 Sep 2006 20:48:15 +0000
Subject: [PATCH 0057/2544]

---
 system/libraries/Output.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/libraries/Output.php b/system/libraries/Output.php
index 7a03cf9c..9523599e 100644
--- a/system/libraries/Output.php
+++ b/system/libraries/Output.php
@@ -147,7 +147,7 @@ function _write_cache($output)
 			return;
 		}
 		
-		$uri =	$obj->config->slash_item('base_url').
+		$uri =	$obj->config->item('base_url').
 				$obj->config->item('index_page').
 				$obj->uri->uri_string();
 		
@@ -191,8 +191,10 @@ function _display_cache()
 		}
 		
 		// Build the file path.  The file name is an MD5 hash of the full URI
-		$uri = $CFG->item('base_url', 1).$CFG->item('index_page').$RTR->uri_string;
-		
+		$uri =	$obj->config->item('base_url').
+				$obj->config->item('index_page').
+				$obj->uri->uri_string();
+				
 		$filepath = $cache_path.md5($uri);
 		
 		if ( ! @file_exists($filepath))

From 55c11e03927b371f895d98a0b533f69cac246b07 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 15 Sep 2006 20:50:51 +0000
Subject: [PATCH 0058/2544]

---
 system/application/config/mimes.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/application/config/mimes.php b/system/application/config/mimes.php
index 06bfcc67..b09cc196 100644
--- a/system/application/config/mimes.php
+++ b/system/application/config/mimes.php
@@ -52,7 +52,6 @@
 				'xhtml'	=>	'application/xhtml+xml',
 				'xht'	=>	'application/xhtml+xml',
 				'zip'	=> array('application/zip', 'application/x-zip-compressed'),
-				'zip'	=>	'application/zip',
 				'mid'	=>	'audio/midi',
 				'midi'	=>	'audio/midi',
 				'mpga'	=>	'audio/mpeg',

From dac65764e5ead0bcc9e7fcb2477926d7a2c1dc95 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 17 Sep 2006 18:05:43 +0000
Subject: [PATCH 0059/2544]

---
 system/libraries/Validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index 44f49ff6..e4fd3669 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -187,7 +187,7 @@ function run()
 			$ex = explode('|', $rules);
 
 			// Is the field required?  If not, if the field is blank  we'll move on to the next text
-			if ( ! in_array('required', $ex))
+			if ( ! in_array('required', $ex) AND strpos($rules, 'callback_') === FALSE)
 			{
 				if ( ! isset($_POST[$field]) OR $_POST[$field] == '')
 				{

From c47289a3196587361ac5fbbd8acd216b1ba0b8dc Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 17 Sep 2006 18:09:42 +0000
Subject: [PATCH 0060/2544]

---
 user_guide/libraries/unit_testing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
index 182e29e3..c1109613 100644
--- a/user_guide/libraries/unit_testing.html
+++ b/user_guide/libraries/unit_testing.html
@@ -185,7 +185,7 @@ 
    Creating a Template
    
 $this->unit->set_template($str);
     
 
-
+
    Note: Your template must be declared before running the unit test process.
    
 
 
 

From f6d823ee041caab303a7aba6ecd8c358c6970113 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 17 Sep 2006 18:10:57 +0000
Subject: [PATCH 0061/2544]

---
 system/libraries/Unit_test.php    | 4 ++--
 user_guide/general/changelog.html | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
index bf50350a..b2f4bf8c 100644
--- a/system/libraries/Unit_test.php
+++ b/system/libraries/Unit_test.php
@@ -223,9 +223,9 @@ function result($results = array())
 	 * @params	string
 	 * @return	void
 	 */	
-	function set_template($tempalte)
+	function set_template($template)
 	{
-		$this->_template = $tempalte;
+		$this->_template = $template;
 	}
 	
 	// --------------------------------------------------------------------
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index eebd9127..b8a399c3 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -71,7 +71,7 @@ 
    Version 1.4.0
    
 
  • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • 
 
  • Added the ability to organize controller files into sub-folders.  Kudos to Marco for suggesting this (and the next two) feature.
    • 
 
  • Added regular expressions support for routing rules.
    • 
-
  • Added the ability to remap function calls withing your controllers.
    • 
+
  • Added the ability to remap function calls within your controllers.
    • 
 
  • Added the ability to replace core system classes with your own classes.
    • 
 
  • Added support for % character in URL.
    • 
 
  • Added the ability to supply full URLs using the anchor() helper function.
    • 
@@ -111,6 +111,7 @@ 
    Version 1.4.0
    
 
  • Fixed an incorrectly named variable in the Validation class.
    • 
 
  • Fixed an incorrectly named variable in the URI class.
    • 
 
  • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • 
+
  • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • 
 
  • Fixed some MS SQL bugs.
    • 
 
  • Fixed some doc typos.
    • 
 

From b68745e494773bce023c9a7eaca672e32beb1a47 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 17 Sep 2006 18:13:34 +0000
Subject: [PATCH 0062/2544]

---
 system/drivers/DB_mysqli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/drivers/DB_mysqli.php b/system/drivers/DB_mysqli.php
index fadcdd3c..8bea6044 100644
--- a/system/drivers/DB_mysqli.php
+++ b/system/drivers/DB_mysqli.php
@@ -451,7 +451,7 @@ function field_data()
 			$F->type 		= $field->type;
 			$F->default		= $field->def;
 			$F->max_length	= $field->max_length;
-			$F->primary_key = 0;
+			$F->primary_key = ($field->flags & MYSQLI_PRI_KEY_FLAG) ? 1 : 0;
 			
 			$retval[] = $F;
 		}

From 990e3c6c79f68a396cd39fc99e798bc4333a3afc Mon Sep 17 00:00:00 2001
From: admin 
Date: Sun, 17 Sep 2006 18:47:00 +0000
Subject: [PATCH 0063/2544]

---
 user_guide/general/changelog.html  |  1 +
 user_guide/libraries/sessions.html | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index b8a399c3..92caa699 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -112,6 +112,7 @@ 
    Version 1.4.0
    
 
  • Fixed an incorrectly named variable in the URI class.
    • 
 
  • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • 
 
  • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • 
+
  • Fixed a problem that was prevenging scaffolding from working properly with MySQLi.
    • 
 
  • Fixed some MS SQL bugs.
    • 
 
  • Fixed some doc typos.
    • 
 
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
index 1050e110..f8549a5c 100644
--- a/user_guide/libraries/sessions.html
+++ b/user_guide/libraries/sessions.html
@@ -183,7 +183,7 @@ 
    Saving Session Data to a Database
    
 be updated, they can only be generated when a new session is created.
    
 
 
    In order to store sessions, you must first create a database table for this purpose.  Here is the basic 
-prototype required by the session class:
    
+prototype (for MySQL) required by the session class:
    
 
 
+
+
+
    The Trackback specification only requires four pieces of information to be sent in a Trackback (url, title, excerpt, blog_name),
+but to make the data more useful we've added a few more fields in the above table schema (date, IP address, etc.).
    
+
+
    Processing a Trackback
    
+
+
    Here is an example showing how you will receive and process a Trackback.  The following
+code is intended for use within the controller function where you expect to receive Trackbacks.
    
+
+$this->load->library('trackback');
    
+$this->load->database();
    
+
    
+if ($this->uri->segment(3) == FALSE)
    
+{
    
+    $this->trackback->send_error("Unable to determine the entry ID");
    
+}
    
+
    
+if ( ! $this->trackback->receive())
    
+{
    
+    $this->trackback->send_error("The Trackback did not contain valid data");
    
+}
    
+
    
+$data = array(
    
+                'tb_id'      => '',
    
+                'entry_id'   => $this->uri->segment(3),
    
+                'url'        => $this->trackback->data('url'),
    
+                'title'      => $this->trackback->data('title'),
    
+                'excerpt'    => $this->trackback->data('excerpt'),
    
+                'blog_name'  => $this->trackback->data('blog_name'),
    
+                'tb_date'    => time(),
    
+                'ip_address' => $this->input->ip_address()
    
+                );
    
+
    
+$sql = $this->db->insert_string('trackbacks', $data);
    
+$this->db->query($sql);
    
+
    
+$this->trackback->send_success();    
+
+
    Notes:
    
+
+
    The entry ID number is expected in the third segment of your URL.  This is based on the URI example we gave earlier:
    
+
+http://www.your-site.com/index.php/trackback/receive/entry_id
+
+
    Notice the entry_id is in the third URI, which you can retrieve using:
    
+
+$this->uri->segment(3);
+
+
    In our Trackback receiving code above, if the third segment is missing, we will issue an error.  Without a valid entry ID, there's no
+reason to continue.
    
+
+
    The $this->trackback->receive() function is simply a validation function that looks at the incoming data
+and makes sure it contains the four pieces of data that are required (url, title, excerpt, blog_name).
+It returns TRUE on success and FALSE on failure.  If it fails you will issue an error message.
    
+
+
    The incoming Trackback data can be retrieved using this function:
    
+
+$this->trackback->data('item')
+
+
    Where item represents one of these four pieces of info: url, title, excerpt, or blog_name
    
+
+
    If the Trackback data is successfully received, you will issue a success message using:
    
+
+$this->trackback->send_success();
+
+
    Note: The above code contains no data validation, which you are encouraged to add.
    
+
+
+
+
+
+
    
+
+
+
+
+
+
+
\ No newline at end of file

From a39627655aefb65df1e2cc845bd6ebf3d0a40a72 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 03:31:32 +0000
Subject: [PATCH 0300/2544]

---
 user_guide/libraries/table.html | 169 ++------------------------------
 1 file changed, 6 insertions(+), 163 deletions(-)

diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html
index 68b31165..f861a2c9 100644
--- a/user_guide/libraries/table.html
+++ b/user_guide/libraries/table.html
@@ -47,7 +47,7 @@
 
 Code Igniter Home  › 
 User Guide Home  › 
-Trackback Class
+HTML Table Class
 
 Search User Guide   
 
@@ -61,173 +61,16 @@
 
    
 
 
-
    Trackback Class
    
+
    HTML Table Class
    
 
-
    The Trackback Class provides functions that enable you to send and receive Trackback data.
    
-
-
-
    If you are not familiar with Trackbacks you'll find more information here.
    
+
    The Table Class provides functions that enable you to auto-generate HTML tables from arrays or database result sets.
    
 
 
    Initializing the Class
    
 
-
    Like most other classes in Code Igniter, the Trackback class is initialized in your controller using the $this->load->library function:
    
-
-$this->load->library('trackback');
-
    Once loaded, the Trackback library object will be available using: $this->trackback
    
-
-
-
    Sending Trackbacks
    
-
-
    A Trackback can be sent from any of your controller functions using code similar to this example:
-
-$this->load->library('trackback');
    
-
    
-$tb_data = array(
    
-                'ping_url'  => 'http://some-site.com/trackback/456',
    
-                'url'       => 'http://www.my-site.com/blog/entry/123',
    
-                'title'     => 'The Title of My Entry',
    
-                'excerpt'   => 'The entry content.',
    
-                'blog_name' => 'My Blog Name',
    
-                'charset'   => 'utf-8'
    
-                );
    
-
    
-if ( ! $this->trackback->send($tb_data))
    
-{
    
-     echo $this->trackback->display_errors();
    
-}
    
-else
    
-{
    
-     echo 'Trackback was sent!';
    
-}    
-
-
    Description of array data:
    
-
-
      
-
    • ping_url - The URL of the site you are sending the Trackback to. You can send Trackbacks to multiple URLs by separating each URL with a comma.
      • 
-
    • url - The URL to YOUR site where the weblog entry can be seen.
      • 
-
    • title - The title of your weblog entry.
      • 
-
    • excerpt - The content of your weblog entry. Note: the Trackback class will automatically send only the first 500 characters of your entry.  It will also strip all HTML.
      • 
-
    • blog_name - The name of your weblog.
      • 
-
    • charset - The character encoding your weblog is written in.  If omitted, UTF-8 will be used.
      • 
-
    
-
-
    The Trackback sending function returns TRUE/FALSE (boolean) on success or failure.  If it fails, you can retrieve the error message using:
    
-
-$this->trackback->display_errors();
-
-
-
    Receiving Trackbacks
    
-
-
    Before you can receive Trackbacks you must create a weblog.  If you don't have a blog yet there's no point in continuing.
    
-
-
    Receiving Trackbacks is a little more complex than sending them, only because you will need a database table in which to store them,
-and you will need to validate the incoming trackback data.  You are encouraged to implement a thorough validation process to
-guard against spam and duplicate data.  You may also want to limit the number of Trackbacks you allow from a particular IP within
-a given span of time to further curtail spam.  The process of receiving a Trackback is quite simple; 
-the validation is what takes most of the effort.
    
-
-
    Your Ping URL
    
-
-
    In order to accept Trackbacks you must display a Trackback URL next to each one of your weblog entries.  This will be the URL
-that people will use to send you Trackbacks (we will refer to this as your "Ping URL").
    
-
-
    Your Ping URL must point to a controller function where your Trackback receiving code is located, and the URL
-must contain the ID number for each particular entry, so that when the Trackback is received you'll be 
-able to associate it with a particular entry.
    
-
-
    For example, if your controller class is called Trackback, and the receiving function is called receive, your
-Ping URLs will look something like this:
    
-
-http://www.your-site.com/index.php/trackback/receive/entry_id
-
-
    Where entry_id represents the individual ID number for each of your entries.
    
-
-
-
    Creating a Trackback Table
    
-
-
    Before you can receive Trackbacks you must create a table in which to store them.  Here is a basic prototype for such a table:
    
-
-
-
-
-
    The Trackback specification only requires four pieces of information to be sent in a Trackback (url, title, excerpt, blog_name),
-but to make the data more useful we've added a few more fields in the above table schema (date, IP address, etc.).
    
-
-
    Processing a Trackback
    
-
-
    Here is an example showing how you will receive and process a Trackback.  The following
-code is intended for use within the controller function where you expect to receive Trackbacks.
    
-
-$this->load->library('trackback');
    
-$this->load->database();
    
-
    
-if ($this->uri->segment(3) == FALSE)
    
-{
    
-    $this->trackback->send_error("Unable to determine the entry ID");
    
-}
    
-
    
-if ( ! $this->trackback->receive())
    
-{
    
-    $this->trackback->send_error("The Trackback did not contain valid data");
    
-}
    
-
    
-$data = array(
    
-                'tb_id'      => '',
    
-                'entry_id'   => $this->uri->segment(3),
    
-                'url'        => $this->trackback->data('url'),
    
-                'title'      => $this->trackback->data('title'),
    
-                'excerpt'    => $this->trackback->data('excerpt'),
    
-                'blog_name'  => $this->trackback->data('blog_name'),
    
-                'tb_date'    => time(),
    
-                'ip_address' => $this->input->ip_address()
    
-                );
    
-
    
-$sql = $this->db->insert_string('trackbacks', $data);
    
-$this->db->query($sql);
    
-
    
-$this->trackback->send_success();    
-
-
    Notes:
    
-
-
    The entry ID number is expected in the third segment of your URL.  This is based on the URI example we gave earlier:
    
-
-http://www.your-site.com/index.php/trackback/receive/entry_id
-
-
    Notice the entry_id is in the third URI, which you can retrieve using:
    
-
-$this->uri->segment(3);
-
-
    In our Trackback receiving code above, if the third segment is missing, we will issue an error.  Without a valid entry ID, there's no
-reason to continue.
    
-
-
    The $this->trackback->receive() function is simply a validation function that looks at the incoming data
-and makes sure it contains the four pieces of data that are required (url, title, excerpt, blog_name).
-It returns TRUE on success and FALSE on failure.  If it fails you will issue an error message.
    
-
-
    The incoming Trackback data can be retrieved using this function:
    
-
-$this->trackback->data('item')
-
-
    Where item represents one of these four pieces of info: url, title, excerpt, or blog_name
    
-
-
    If the Trackback data is successfully received, you will issue a success message using:
    
-
-$this->trackback->send_success();
-
-
    Note: The above code contains no data validation, which you are encouraged to add.
    
+
    Like most other classes in Code Igniter, the Table class is initialized in your controller using the $this->load->library function:
    
 
+$this->load->library('table');
+
    Once loaded, the Trackback library object will be available using: $this->table
    
 
 
 

From 345b890d459880d0cd75315c95a47b27c35b9a2b Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 03:32:49 +0000
Subject: [PATCH 0301/2544]

---
 user_guide/toc.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/toc.html b/user_guide/toc.html
index 88b3bd25..65bf2e16 100644
--- a/user_guide/toc.html
+++ b/user_guide/toc.html
@@ -132,6 +132,7 @@ 
    Class Reference
    
 
  • Output Class
    •  
 
  • Pagination Class
    •  
 
  • Session Class
    •  
+
  • Table Class
    •  
 
  • Trackback Class
    •  
 
  • Template Parser Class
    •  
 
  • Unit Testing Class
    •  

From 6c9f736650bd9eafb2c44bb844f13de259d5efb6 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 03:33:48 +0000
Subject: [PATCH 0302/2544]

---
 system/libraries/Calendar.php       |  42 +++----
 system/libraries/User_agent.php     | 178 ++++++++++++++++++++++++++--
 user_guide/libraries/trackback.html |   4 +-
 user_guide/libraries/uri.html       |   2 +-
 user_guide/nav/nav.js               |   1 +
 5 files changed, 193 insertions(+), 34 deletions(-)

diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index 23a6bf79..048934b8 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -398,27 +398,27 @@ function get_total_days($month, $year)
 	function default_template()
 	{
 		return  array (
-						'table_open' => '',
-						'heading_row_start' => '',
-						'heading_previous_cell' => '',
-						'heading_title_cell' => '',
-						'heading_next_cell' => '',
-						'heading_row_end' => '',
-						'week_row_start' => '',
-						'week_day_cell' => '',
-						'week_row_end' => '',
-						'cal_row_start' => '',
-						'cal_cell_start' => '',
-						'cal_cell_end_today' => '',
-						'cal_row_end' => '',
-						'table_close' => '
    <<{heading}>>
    {week_day}
    ',
-						'cal_cell_start_today' => '',
-						'cal_cell_content' => '{day}',
-						'cal_cell_content_today' => '{day}',
-						'cal_cell_no_content' => '{day}',
-						'cal_cell_no_content_today' => '{day}',
-						'cal_cell_blank' => ' ',
-						'cal_cell_end' => '
    '
+						'table_open' 				=> '',
+						'heading_row_start' 		=> '',
+						'heading_previous_cell'		=> '',
+						'heading_title_cell' 		=> '',
+						'heading_next_cell' 		=> '',
+						'heading_row_end' 			=> '',
+						'week_row_start' 			=> '',
+						'week_day_cell' 			=> '',
+						'week_row_end' 				=> '',
+						'cal_row_start' 			=> '',
+						'cal_cell_start' 			=> '',
+						'cal_cell_end_today'		=> '',
+						'cal_row_end'				=> '',
+						'table_close'				=> '
    <<{heading}>>
    {week_day}
    ',
+						'cal_cell_start_today'		=> '',
+						'cal_cell_content'			=> '{day}',
+						'cal_cell_content_today'	=> '{day}',
+						'cal_cell_no_content'		=> '{day}',
+						'cal_cell_no_content_today'	=> '{day}',
+						'cal_cell_blank'			=> ' ',
+						'cal_cell_end'				=> '
    '
 					);	
 	}
 	
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 33e8451c..8c63924b 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -33,6 +33,9 @@ class CI_User_agent {
 	var $is_browser	= FALSE;
 	var $is_robot	= FALSE;
 	var $is_mobile	= FALSE;
+
+	var $languages	= array();
+	var $charsets	= array();
 	
 	var $platform	= '';
 	var $browser	= '';
@@ -40,7 +43,6 @@ class CI_User_agent {
 	var $moble		= '';
 	var $robot		= '';
 
-
 	var $platforms = array (
 							'windows nt 6.0'	=> 'Windows Longhorn',
 							'windows nt 5.2'	=> 'Windows 2003',
@@ -55,12 +57,13 @@ class CI_User_agent {
 							'windows 95'		=> 'Windows 95',
 							'win95'				=> 'Windows 95',
 							'windows'			=> 'Unknown Windows OS',
-							'mac os x'			=> 'Mac OS X',
+							'os x'				=> 'Mac OS X',
+							'ppc mac'			=> 'Power PC Mac',
 							'freebsd'			=> 'FreeBSD',
 							'ppc'				=> 'Macintosh',
-							'sunos'				=> 'Sun Solaris',
 							'linux'				=> 'Linux',
 							'debian'			=> 'Debian',
+							'sunos'				=> 'Sun Solaris',
 							'beos'				=> 'BeOS',
 							'apachebench'		=> 'ApacheBench',
 							'aix'				=> 'AIX',
@@ -80,12 +83,21 @@ class CI_User_agent {
 							'Internet Explorer'	=> 'Internet Explorer',
 							'Shiira'			=> 'Shiira',
 							'Firefox'			=> 'Firefox',
+							'Chimera'			=> 'Chimera',
+							'Phoenix'			=> 'Phoenix',
+							'Firebird'			=> 'Firebird',
 							'Camino'			=> 'Camino',
+							'Netscape'			=> 'Netscape',
+							'OmniWeb'			=> 'OmniWeb',
 							'Mozilla'			=> 'Mozilla',
 							'Safari'			=> 'Safari',
 							'Konqueror'			=> 'Konqueror',
+							'icab'				=> 'iCab',
 							'Lynx'				=> 'Lynx',
-							'ANTFresco'			=> 'Fresco'
+							'Links'				=> 'Links',
+							'hotjava'			=> 'HotJava',
+							'amaya'				=> 'Amaya',
+							'IBrowse'			=> 'IBrowse'
 						);
 
 	var $mobiles = array(
@@ -488,7 +500,7 @@ function _set_browser()
 		
 		return FALSE;
 	}
-		
+			
 	// --------------------------------------------------------------------
 	
 	/**
@@ -535,6 +547,51 @@ function _set_mobile()
 		return FALSE;
 	}
 	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set the accepted languages
+	 *
+	 * @access	private
+	 * @return	void
+	 */			
+	function _set_languages()
+	{
+		if ((count($this->languages) == 0) AND isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) AND $_SERVER['HTTP_ACCEPT_LANGUAGE'] != '')
+		{
+			$languages = preg_replace('/(;q=.+)/i', '', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+			
+			$this->languages = explode(',', $languages);
+		}
+		
+		if (count($this->languages) == 0)
+		{
+			$this->languages = array('Undefined');
+		}	
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set the accepted character sets
+	 *
+	 * @access	private
+	 * @return	void
+	 */			
+	function _set_charsets()
+	{	
+		if ((count($this->charsets) == 0) AND isset($_SERVER['HTTP_ACCEPT_CHARSET']) AND $_SERVER['HTTP_ACCEPT_CHARSET'] != '')
+		{
+			$charsets = preg_replace('/(;q=.+)/i', '', $_SERVER['HTTP_ACCEPT_CHARSET']);
+			
+			$this->charsets = explode(',', $charsets);
+		}
+		
+		if (count($this->charsets) == 0)
+		{
+			$this->charsets = array('Undefined');
+		}	
+	}
 
 	// --------------------------------------------------------------------
 	
@@ -577,13 +634,39 @@ function is_mobile()
 
 	// --------------------------------------------------------------------
 	
+	/**
+	 * Is this a referral from another site?
+	 *
+	 * @access	public
+	 * @return	bool
+	 */			
+	function is_referral()
+	{
+		return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') ? FALSE : TRUE;
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Agent String
+	 *
+	 * @access	public
+	 * @return	string
+	 */			
+	function agent()
+	{
+		return $this->agent;
+	}
+
+	// --------------------------------------------------------------------
+	
 	/**
 	 * Get Platform
 	 *
 	 * @access	public
 	 * @return	string
 	 */			
-	function get_platform()
+	function platform()
 	{
 		return $this->platform;
 	}
@@ -596,7 +679,7 @@ function get_platform()
 	 * @access	public
 	 * @return	string
 	 */			
-	function get_browser()
+	function browser()
 	{
 		return $this->browser;
 	}
@@ -609,7 +692,7 @@ function get_browser()
 	 * @access	public
 	 * @return	string
 	 */			
-	function get_version()
+	function version()
 	{
 		return $this->version;
 	}
@@ -622,7 +705,7 @@ function get_version()
 	 * @access	public
 	 * @return	string
 	 */				
-	function get_robot()
+	function robot()
 	{
 		return $this->robot;
 	}
@@ -634,11 +717,86 @@ function get_robot()
 	 * @access	public
 	 * @return	string
 	 */			
-	function get_mobile()
+	function mobile()
 	{
 		return $this->mobile;
 	}
 	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Get the referrer
+	 *
+	 * @access	public
+	 * @return	bool
+	 */			
+	function referrer()
+	{
+		return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') ? '' : $_SERVER['HTTP_REFERER'];
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Get the accepted languages
+	 *
+	 * @access	public
+	 * @return	array
+	 */			
+	function languages()
+	{
+		if (count($this->languages) == 0)
+		{
+			$this->_set_languages();
+		}
+	
+		return $this->languages;
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Get the accepted Character Sets
+	 *
+	 * @access	public
+	 * @return	array
+	 */			
+	function charsets()
+	{
+		if (count($this->charsets) == 0)
+		{
+			$this->_set_charsets();
+		}
+	
+		return $this->charsets;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Test for a particular language
+	 *
+	 * @access	public
+	 * @return	bool
+	 */			
+	function accept_lang($lang = 'en')
+	{
+		return (in_array(strtolower($lang), $this->languages(), TRUE)) ? TRUE : FALSE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Test for a particular character set
+	 *
+	 * @access	public
+	 * @return	bool
+	 */			
+	function accept_charset($charset = 'utf-8')
+	{
+		return (in_array(strtolower($charset), $this->charsets(), TRUE)) ? TRUE : FALSE;
+	}
+	
 	
 }
 
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html
index c2c9e815..0621d4e7 100644
--- a/user_guide/libraries/trackback.html
+++ b/user_guide/libraries/trackback.html
@@ -238,11 +238,11 @@ 
    Notes:
    
 
 
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html
index 8d2f2ee3..e221f4c6 100644
--- a/user_guide/libraries/uri.html
+++ b/user_guide/libraries/uri.html
@@ -249,7 +249,7 @@ 
    $this->uri->rsegment_array(n)
    
    ·  
 Top of Page   ·  
 User Guide Home   ·  
-Next Topic:  Validation Class
+Next Topic:  User Agent Class
 
    
 
    Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.
    
 
    
diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js
index 8d195572..b280e8fc 100644
--- a/user_guide/nav/nav.js
+++ b/user_guide/nav/nav.js
@@ -78,6 +78,7 @@ function create_menu(basepath)
 		'
  • Output Class
    • ' +
 		'
  • Pagination Class
    • ' +
 		'
  • Session Class
    • ' +
+		'
  • Table Class
    • ' +
 		'
  • Trackback Class
    • ' +
 		'
  • Template Parser Class
    • ' +
 		'
  • Unit Testing Class
    • ' +

From a1931ad87e8145f08dbf381ceab5bf88457b1a83 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 04:17:38 +0000
Subject: [PATCH 0303/2544]

---
 system/libraries/Table.php      |  11 +--
 user_guide/libraries/table.html | 138 +++++++++++++++++++++++++++++++-
 2 files changed, 139 insertions(+), 10 deletions(-)

diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 935a7d8a..4771295a 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -61,7 +61,7 @@ function set_template($template)
 	// --------------------------------------------------------------------
 
 	/**
-	 * Add a table heading
+	 * Set the table heading
 	 *
 	 * Can be passed as an array or discreet params
 	 *
@@ -69,7 +69,7 @@ function set_template($template)
 	 * @param	mixed
 	 * @return	void
 	 */
-	function add_heading()
+	function set_heading()
 	{
 		$args = func_get_args();
 		$this->heading = (is_array($args[0])) ? $args[0] : $args;
@@ -313,12 +313,7 @@ function _default_template()
 						'table_close' 			=> ''
 					);	
 	}
-
-
-
- 	
- 	
- 	
+	
 
 }
 
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html
index f861a2c9..e80e53fd 100644
--- a/user_guide/libraries/table.html
+++ b/user_guide/libraries/table.html
@@ -70,9 +70,143 @@ 
    Initializing the Class
    
 
    Like most other classes in Code Igniter, the Table class is initialized in your controller using the $this->load->library function:
    
 
 $this->load->library('table');
-
    Once loaded, the Trackback library object will be available using: $this->table
    
-
+
    Once loaded, the Table library object will be available using: $this->table
    
+
+
+
    Examples
    
+
+
    Here is an example showing how you can create a table from a multi-dimensional array. 
+Note that the first array index will become the table heading.
    
+
+
+$this->load->library('table');
    
+
    
+$data = array(
    
+             array('Name', 'Color', 'Size'),
    
+             array('Fred', 'Blue', 'Small'),
    
+             array('Mary', 'Red', 'Large'),
    
+             array('John', 'Green', 'Medium')	
    
+             );
    
+
    
+echo $this->table->generate($data);		
+    
+
+
    Here is an example of a table created from a database query result. The table class will automatically generate the 
+headings based on the table names. Or you can set your own headings using the set_heading() function described
+in the function reference below.
    
+
+
+$this->load->library('table');
    
+
    
+$query = $this->db->query("SELECT * FROM my_table");
    
+
    
+echo $this->table->generate($query);		
+    
+
+
+
    Here is an example showing how you might create a table using discreet parameters:
    
+
+
+$this->load->library('table');
    
+
    
+$this->table->set_heading('Name', 'Color', 'Size');
    
+
    
+$this->table->add_row('Fred', 'Blue', 'Small');
    
+$this->table->add_row('Mary', 'Red', 'Large');
    
+$this->table->add_row('John', 'Green', 'Medium');
    
+
    
+echo $this->table->generate();		
+    
+
+
    Here is the same example, except instead of individual parameters, arrays are used:
+
+
+$this->load->library('table');
    
+
    
+$this->table->set_heading(array('Name', 'Color', 'Size'));
    
+
    
+$this->table->add_row(array('Fred', 'Blue', 'Small'));
    
+$this->table->add_row(array('Mary', 'Red', 'Large'));
    
+$this->table->add_row(array('John', 'Green', 'Medium'));
    
+
    
+echo $this->table->generate();		
+    
+
+
+
    Changing the Look of Your Table
    
+
+
    The Table Class permits you to set a table template with which you can specify the design of your layout.  Here is the template
+prototype:
    
+
+
+$tmpl =  array (
    
+                    'table_open'          => '<table border="0" cellpadding="4" cellspacing="0">',
    
+
    
+                    'heading_row_start'   => '<tr>',
    
+                    'heading_row_end'     => '</tr>',
    
+                    'heading_cell_start'  => '<th>',
    
+                    'heading_cell_end'    => '</th>',
    
+
    
+                    'row_start'           => '<tr>',
    
+                    'row_end'             => '</tr>',
    
+                    'cell_start'          => '<td>',
    
+                    'cell_end'            => '</td>',
    
+
    
+                    'row_alt_start'       => '<tr>',
    
+                    'row_alt_end'         => '</tr>',
    
+                    'cell_alt_start'      => '<td>',
    
+                    'cell_alt_end'        => '</td>',
    
+
    
+                    'table_close'         => '</table>'
    
+              );
    
+
+
    
+$this->table->set_template($tmpl);
+    
+
+
    You'll notice there are two sets of "row" blocks in the template.  These permit you to create alternating row colors or design elements that alternate with each 
+iteration of the row data.
    
+
+
    You are NOT required to submit a complete template.  If you only need to change parts of the layout you can simply submit those elements.
+In this example, only the table opening tag is being changed:
    
+
+
+$tmpl =  array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );
    
+
+
    
+$this->table->set_template($tmpl);
+    
+
+
    
+
    Function Reference
    
+
+
    $this->table->generate()
    
+
    Returns a string containing the generated table.  Accepts an optional parameter which can be an array or a database result object.
    
+
+
    $this->table->set_heading()
    
+
+
    Permits you to set the table heading.  You can submit an array or discreet params:
    
+
+$this->table->set_heading('Name', 'Color', 'Size');
+$this->table->set_heading(array('Name', 'Color', 'Size'));
+
+
    $this->table->add_row()
    
+
+
    Permits you to add a row to your table.  You can submit an array or discreet params:
    
+
+$this->table->add_row('Blue', 'Red', 'Green');
+$this->table->add_row(array('Blue', 'Red', 'Green'));
+
+
    $this->table->set_template()
    
+
+
    Permits you to set your template. You can submit a full or partial template.
    
 
+
+$tmpl =  array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );
    
+
+
    
+$this->table->set_template($tmpl);
+    
 
 
 

From b3ad05ccbc2c0ad24c9af16f7f4d48bf59c71a11 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 17:25:46 +0000
Subject: [PATCH 0304/2544]

---
 system/application/config/user_agents.php | 103 ++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 system/application/config/user_agents.php

diff --git a/system/application/config/user_agents.php b/system/application/config/user_agents.php
new file mode 100644
index 00000000..a799f06b
--- /dev/null
+++ b/system/application/config/user_agents.php
@@ -0,0 +1,103 @@
+ 'Windows Longhorn',
+					'windows nt 5.2'	=> 'Windows 2003',
+					'windows nt 5.0'	=> 'Windows 2000',
+					'windows nt 5.1'	=> 'Windows XP',
+					'windows nt 4.0'	=> 'Windows NT 4.0',
+					'winnt4.0'			=> 'Windows NT 4.0',
+					'winnt 4.0'			=> 'Windows NT',
+					'winnt'				=> 'Windows NT',
+					'windows 98'		=> 'Windows 98',
+					'win98'				=> 'Windows 98',
+					'windows 95'		=> 'Windows 95',
+					'win95'				=> 'Windows 95',
+					'windows'			=> 'Unknown Windows OS',
+					'os x'				=> 'Mac OS X',
+					'ppc mac'			=> 'Power PC Mac',
+					'freebsd'			=> 'FreeBSD',
+					'ppc'				=> 'Macintosh',
+					'linux'				=> 'Linux',
+					'debian'			=> 'Debian',
+					'sunos'				=> 'Sun Solaris',
+					'beos'				=> 'BeOS',
+					'apachebench'		=> 'ApacheBench',
+					'aix'				=> 'AIX',
+					'irix'				=> 'Irix',
+					'osf'				=> 'DEC OSF',
+					'hp-ux'				=> 'HP-UX',
+					'netbsd'			=> 'NetBSD',
+					'bsdi'				=> 'BSDi',
+					'openbsd'			=> 'OpenBSD',
+					'gnu'				=> 'GNU/Linux',
+					'unix'				=> 'Unknown Unix OS'
+				);
+
+
+// The order of this array should NOT be changed. Many browsers return
+// multiple browser types so we want to identify the sub-type first.
+$browsers = array(
+					'Opera'				=> 'Opera',
+					'MSIE'				=> 'Internet Explorer',
+					'Internet Explorer'	=> 'Internet Explorer',
+					'Shiira'			=> 'Shiira',
+					'Firefox'			=> 'Firefox',
+					'Chimera'			=> 'Chimera',
+					'Phoenix'			=> 'Phoenix',
+					'Firebird'			=> 'Firebird',
+					'Camino'			=> 'Camino',
+					'Netscape'			=> 'Netscape',
+					'OmniWeb'			=> 'OmniWeb',
+					'Mozilla'			=> 'Mozilla',
+					'Safari'			=> 'Safari',
+					'Konqueror'			=> 'Konqueror',
+					'icab'				=> 'iCab',
+					'Lynx'				=> 'Lynx',
+					'Links'				=> 'Links',
+					'hotjava'			=> 'HotJava',
+					'amaya'				=> 'Amaya',
+					'IBrowse'			=> 'IBrowse'
+				);
+
+$mobiles = array(
+					'mobileexplorer'	=> 'Mobile Explorer',
+					'openwave'			=> 'Open Wave',
+					'opera mini'		=> 'Opera Mini',
+					'operamini'			=> 'Opera Mini',
+					'elaine'			=> 'Palm',
+					'palmsource'		=> 'Palm',
+					'digital paths'		=> 'Palm',
+					'avantgo'			=> 'Avantgo',
+					'xiino'				=> 'Xiino',
+					'palmscape'			=> 'Palmscape',
+					'nokia'				=> 'Nokia',
+					'ericsson'			=> 'Ericsson',
+					'blackBerry'		=> 'BlackBerry',
+					'motorola'			=> 'Motorola'
+				);	
+
+// There are hundreds of bots but these are the most common.
+$robots = array(
+					'googlebot'			=> 'Googlebot',
+					'msnbot'			=> 'MSNBot',
+					'slurp'				=> 'Inktomi Slurp',
+					'yahoo'				=> 'Yahoo',
+					'askjeeves'			=> 'AskJeeves',
+					'fastcrawler'		=> 'FastCrawler',
+					'infoseek'			=> 'InfoSeek Robot 1.0',
+					'lycos'				=> 'Lycos'
+				);	
+
+
+?>
\ No newline at end of file

From 3822194cde4614137a54eecb1e1fcc86672e84a1 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 17:34:19 +0000
Subject: [PATCH 0305/2544]

---
 system/libraries/User_agent.php | 500 ++++++--------------------------
 1 file changed, 96 insertions(+), 404 deletions(-)

diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 8c63924b..21162388 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -43,375 +43,6 @@ class CI_User_agent {
 	var $moble		= '';
 	var $robot		= '';
 
-	var $platforms = array (
-							'windows nt 6.0'	=> 'Windows Longhorn',
-							'windows nt 5.2'	=> 'Windows 2003',
-							'windows nt 5.0'	=> 'Windows 2000',
-							'windows nt 5.1'	=> 'Windows XP',
-							'windows nt 4.0'	=> 'Windows NT 4.0',
-							'winnt4.0'			=> 'Windows NT 4.0',
-							'winnt 4.0'			=> 'Windows NT',
-							'winnt'				=> 'Windows NT',
-							'windows 98'		=> 'Windows 98',
-							'win98'				=> 'Windows 98',
-							'windows 95'		=> 'Windows 95',
-							'win95'				=> 'Windows 95',
-							'windows'			=> 'Unknown Windows OS',
-							'os x'				=> 'Mac OS X',
-							'ppc mac'			=> 'Power PC Mac',
-							'freebsd'			=> 'FreeBSD',
-							'ppc'				=> 'Macintosh',
-							'linux'				=> 'Linux',
-							'debian'			=> 'Debian',
-							'sunos'				=> 'Sun Solaris',
-							'beos'				=> 'BeOS',
-							'apachebench'		=> 'ApacheBench',
-							'aix'				=> 'AIX',
-							'irix'				=> 'Irix',
-							'osf'				=> 'DEC OSF',
-							'hp-ux'				=> 'HP-UX',
-							'netbsd'			=> 'NetBSD',
-							'bsdi'				=> 'BSDi',
-							'openbsd'			=> 'OpenBSD',
-							'gnu'				=> 'GNU/Linux',
-							'unix'				=> 'Unknown Unix OS'
-						);
-
-	var $browsers = array(
-							'Opera'				=> 'Opera',
-							'MSIE'				=> 'Internet Explorer',
-							'Internet Explorer'	=> 'Internet Explorer',
-							'Shiira'			=> 'Shiira',
-							'Firefox'			=> 'Firefox',
-							'Chimera'			=> 'Chimera',
-							'Phoenix'			=> 'Phoenix',
-							'Firebird'			=> 'Firebird',
-							'Camino'			=> 'Camino',
-							'Netscape'			=> 'Netscape',
-							'OmniWeb'			=> 'OmniWeb',
-							'Mozilla'			=> 'Mozilla',
-							'Safari'			=> 'Safari',
-							'Konqueror'			=> 'Konqueror',
-							'icab'				=> 'iCab',
-							'Lynx'				=> 'Lynx',
-							'Links'				=> 'Links',
-							'hotjava'			=> 'HotJava',
-							'amaya'				=> 'Amaya',
-							'IBrowse'			=> 'IBrowse'
-						);
-
-	var $mobiles = array(
-							'mobileexplorer'	=> 'Mobile Explorer',
-							'openwave'			=> 'Open Wave',
-							'opera mini'		=> 'Opera Mini',
-							'operamini'			=> 'Opera Mini',
-							'elaine'			=> 'Palm',
-							'palmsource'		=> 'Palm',
-							'digital paths'		=> 'Palm',
-							'avantgo'			=> 'Avantgo',
-							'xiino'				=> 'Xiino',
-							'palmscape'			=> 'Palmscape',
-							'nokia'				=> 'Nokia',
-							'ericsson'			=> 'Ericsson',
-							'blackBerry'		=> 'BlackBerry',
-							'motorola'			=> 'Motorola'
-						);	
-
-	var $robots = array(
-			
-							'googlebot'					=> 'Googlebot',
-							'msnbot'					=> 'MSNBot',
-							'slurp'						=> 'Inktomi Slurp',
-							'yahoo'						=> 'Yahoo',
-							'askjeeves'					=> 'AskJeeves',
-							'fastcrawler'				=> 'FastCrawler',
-							'infoseek'					=> 'InfoSeek Robot 1.0',
-							'lycos'						=> 'Lycos',
-							'abcdatos'					=> 'ABCdatos BotLink',
-							'Acme.Spider'				=> 'Acme.Spider',
-							'ahoythehomepagefinder'		=> 'Ahoy! The Homepage Finder',
-							'Alkaline'					=> 'Alkaline',
-							'anthill'					=> 'Anthill',
-							'appie'						=> 'Walhello appie',
-							'arachnophilia'				=> 'Arachnophilia',
-							'arale'						=> 'Arale',
-							'araneo'					=> 'Araneo',
-							'araybot'					=> 'AraybOt',
-							'architext'					=> 'ArchitextSpider',
-							'aretha'					=> 'Aretha',
-							'ariadne'					=> 'ARIADNE',
-							'arks'						=> 'arks',
-							'aspider'					=> 'ASpider (Associative Spider)',
-							'atn.txt'					=> 'ATN Worldwide',
-							'atomz'						=> 'Atomz.com Search Robot',
-							'auresys'					=> 'AURESYS',
-							'backrub'					=> 'BackRub',
-							'bbot'						=> 'BBot',
-							'bigbrother'				=> 'Big Brother',
-							'bjaaland'					=> 'Bjaaland',
-							'blackwidow'				=> 'BlackWidow',
-							'blindekuh'					=> 'Die Blinde Kuh',
-							'Bloodhound'				=> 'Bloodhound',
-							'borg-bot'					=> 'Borg-Bot',
-							'boxseabot'					=> 'BoxSeaBot',
-							'brightnet'					=> 'bright.net caching robot',
-							'bspider'					=> 'BSpider',
-							'cactvschemistryspider'		=> 'CACTVS Chemistry Spider',
-							'calif'						=> 'Calif',
-							'cassandra'					=> 'Cassandra',
-							'cgireader'					=> 'Digimarc Marcspider/CGI',
-							'checkbot'					=> 'Checkbot',
-							'christcrawler'				=> 'ChristCrawler.com',
-							'churl'						=> 'churl',
-							'cienciaficcion'			=> 'cIeNcIaFiCcIoN.nEt',
-							'cmc'						=> 'CMC/0.01',
-							'Collective'				=> 'Collective',
-							'combine'					=> 'Combine System',
-							'confuzzledbot'				=> 'ConfuzzledBot',
-							'coolbot'					=> 'CoolBot',
-							'core'						=> 'Web Core / Roots',
-							'cosmos'					=> 'XYLEME Robot',
-							'cruiser'					=> 'Internet Cruiser Robot',
-							'cusco'						=> 'Cusco',
-							'cyberspyder'				=> 'CyberSpyder Link Test',
-							'cydralspider'				=> 'CydralSpider',
-							'desertrealm'				=> 'Desert Realm Spider',
-							'deweb'						=> 'DeWeb(c) Katalog/Index',
-							'dienstspider'				=> 'DienstSpider',
-							'digger'					=> 'Digger',
-							'diibot'					=> 'Digital Integrity Robot',
-							'directhit'					=> 'Direct Hit Grabber',
-							'dnabot'					=> 'DNAbot',
-							'download_express'			=> 'DownLoad Express',
-							'dragonbot'					=> 'DragonBot',
-							'e-collector'				=> 'e-collector',
-							'ebiness'					=> 'EbiNess',
-							'eit'						=> 'EIT Link Verifier Robot',
-							'elfinbot'					=> 'ELFINBOT',
-							'emacs'						=> 'Emacs-w3 Search Engine',
-							'emcspider'					=> 'ananzi',
-							'esculapio'					=> 'esculapio',
-							'esther'					=> 'Esther',
-							'evliyacelebi'				=> 'Evliya Celebi',
-							'nzexplorer'				=> 'nzexplorer',
-							'fdse'						=> 'Fluid Dynamics Search Engine robot',
-							'felix'						=> 'Felix IDE',
-							'ferret'					=> 'Wild Ferret Web Hopper #1, #2, #3',
-							'fetchrover'				=> 'FetchRover',
-							'fido'						=> 'fido',
-							'finnish'					=> 'Hämähäkki',
-							'fireball'					=> 'KIT-Fireball',
-							'fish'						=> 'Fish search',
-							'fouineur'					=> 'Fouineur',
-							'francoroute'				=> 'Robot Francoroute',
-							'freecrawl'					=> 'Freecrawl',
-							'funnelweb'					=> 'FunnelWeb',
-							'gama'						=> 'gammaSpider, FocusedCrawler',
-							'gazz'						=> 'gazz',
-							'gcreep'					=> 'GCreep',
-							'getbot'					=> 'GetBot',
-							'geturl'					=> 'GetURL',
-							'golem'						=> 'Golem',
-							'grapnel'					=> 'Grapnel/0.01 Experiment',
-							'griffon'					=> 'Griffon                                                               ',
-							'gromit'					=> 'Gromit',
-							'gulliver'					=> 'Northern Light Gulliver',
-							'gulperbot'					=> 'Gulper Bot',
-							'hambot'					=> 'HamBot',
-							'harvest'					=> 'Harvest',
-							'havindex'					=> 'havIndex',
-							'hi'						=> 'HI (HTML Index) Search',
-							'hometown'					=> 'Hometown Spider Pro',
-							'wired-digital'				=> 'Wired Digital',
-							'htdig'						=> 'ht://Dig',
-							'htmlgobble'				=> 'HTMLgobble',
-							'hyperdecontextualizer'		=> 'Hyper-Decontextualizer',
-							'iajabot'					=> 'iajaBot',
-							'ibm'						=> 'IBM_Planetwide',
-							'iconoclast'				=> 'Popular Iconoclast',
-							'Ilse'						=> 'Ingrid',
-							'imagelock'					=> 'Imagelock ',
-							'incywincy'					=> 'IncyWincy',
-							'informant'					=> 'Informant',
-							'infoseeksidewinder'		=> 'Infoseek Sidewinder',
-							'infospider'				=> 'InfoSpiders',
-							'inspectorwww'				=> 'Inspector Web',
-							'intelliagent'				=> 'IntelliAgent',
-							'irobot'					=> 'I, Robot',
-							'iron33'					=> 'Iron33',
-							'israelisearch'				=> 'Israeli-search',
-							'javabee'					=> 'JavaBee',
-							'JBot'						=> 'JBot Java Web Robot',
-							'jcrawler'					=> 'JCrawler',
-							'jobo'						=> 'JoBo Java Web Robot',
-							'jobot'						=> 'Jobot',
-							'joebot'					=> 'JoeBot',
-							'jubii'						=> 'The Jubii Indexing Robot',
-							'jumpstation'				=> 'JumpStation',
-							'kapsi'						=> 'image.kapsi.net',
-							'katipo'					=> 'Katipo',
-							'kdd'						=> 'KDD-Explorer',
-							'kilroy'					=> 'Kilroy',
-							'ko_yappo_robot'			=> 'KO_Yappo_Robot',
-							'labelgrabber.txt'			=> 'LabelGrabber',
-							'larbin'					=> 'larbin',
-							'legs'						=> 'legs',
-							'linkidator'				=> 'Link Validator',
-							'linkscan'					=> 'LinkScan',
-							'linkwalker'				=> 'LinkWalker',
-							'lockon'					=> 'Lockon',
-							'logo_gif'					=> 'logo.gif Crawler',
-							'magpie'					=> 'Magpie',
-							'marvin'					=> 'marvin/infoseek',
-							'mattie'					=> 'Mattie',
-							'mediafox'					=> 'MediaFox',
-							'merzscope'					=> 'MerzScope',
-							'meshexplorer'				=> 'NEC-MeshExplorer',
-							'MindCrawler'				=> 'MindCrawler',
-							'mnogosearch'				=> 'mnoGoSearch search engine software',
-							'moget'						=> 'moget',
-							'momspider'					=> 'MOMspider',
-							'monster'					=> 'Monster',
-							'motor'						=> 'Motor',
-							'muncher'					=> 'Muncher',
-							'muninn'					=> 'Muninn',
-							'muscatferret'				=> 'Muscat Ferret',
-							'mwdsearch'					=> 'Mwd.Search',
-							'myweb'						=> 'Internet Shinchakubin',
-							'NDSpider'					=> 'NDSpider',
-							'netcarta'					=> 'NetCarta WebMap Engine',
-							'netmechanic'				=> 'NetMechanic',
-							'netscoop'					=> 'NetScoop',
-							'newscan-online'			=> 'newscan-online',
-							'nhse'						=> 'NHSE Web Forager',
-							'nomad'						=> 'Nomad',
-							'northstar'					=> 'The NorthStar Robot',
-							'objectssearch'				=> 'ObjectsSearch',
-							'occam'						=> 'Occam',
-							'octopus'					=> 'HKU WWW Octopus',
-							'OntoSpider'				=> 'OntoSpider',
-							'openfind'					=> 'Openfind data gatherer',
-							'orb_search'				=> 'Orb Search',
-							'packrat'					=> 'Pack Rat',
-							'pageboy'					=> 'PageBoy',
-							'parasite'					=> 'ParaSite',
-							'patric'					=> 'Patric',
-							'pegasus'					=> 'pegasus',
-							'perignator'				=> 'The Peregrinator',
-							'perlcrawler'				=> 'PerlCrawler 1.0',
-							'phantom'					=> 'Phantom',
-							'phpdig'					=> 'PhpDig',
-							'pitkow'					=> 'html_analyzer',
-							'pjspider'					=> 'Portal Juice Spider',
-							'pka'						=> 'PGP Key Agent',
-							'poppi'						=> 'Poppi',
-							'portalb'					=> 'PortalB Spider',
-							'psbot'						=> 'psbot',
-							'Puu'						=> 'GetterroboPlus Puu',
-							'python'					=> 'The Python Robot',
-							'raven '					=> 'Raven Search',
-							'rbse'						=> 'RBSE Spider',
-							'resumerobot'				=> 'Resume Robot',
-							'rhcs'						=> 'RoadHouse Crawling System',
-							'rixbot'					=> 'RixBot',
-							'roadrunner'				=> 'Road Runner: The ImageScape Robot',
-							'robbie'					=> 'Robbie the Robot',
-							'robi'						=> 'ComputingSite Robi/1.0',
-							'robocrawl'					=> 'RoboCrawl Spider',
-							'robofox'					=> 'RoboFox',
-							'robozilla'					=> 'Robozilla',
-							'roverbot'					=> 'Roverbot',
-							'rules'						=> 'RuLeS',
-							'safetynetrobot'			=> 'SafetyNet Robot',
-							'scooter'					=> 'Scooter',
-							'search_au'					=> 'Search.Aus-AU.COM',
-							'search-info'				=> 'Sleek',
-							'searchprocess'				=> 'SearchProcess',
-							'senrigan'					=> 'Senrigan',
-							'sgscout'					=> 'SG-Scout',
-							'shaggy'					=> 'ShagSeeker',
-							'sift'						=> 'Sift',
-							'simbot'					=> 'Simmany Robot Ver1.0',
-							'site-valet'				=> 'Site Valet',
-							'sitetech'					=> 'SiteTech-Rover',
-							'skymob'					=> 'Skymob.com',
-							'slcrawler'					=> 'SLCrawler',
-							'smartspider'				=> 'Smart Spider',
-							'snooper'					=> 'Snooper',
-							'solbot'					=> 'Solbot',
-							'speedy'					=> 'Speedy Spider',
-							'spider_monkey'				=> 'spider_monkey',
-							'spiderbot'					=> 'SpiderBot',
-							'spiderline'				=> 'Spiderline Crawler',
-							'spiderman'					=> 'SpiderMan',
-							'spiderview'				=> 'SpiderView(tm)',
-							'spry'						=> 'Spry Wizard Robot',
-							'ssearcher'					=> 'Site Searcher',
-							'suke'						=> 'Suke',
-							'suntek'					=> 'suntek search engine',
-							'sven'						=> 'Sven',
-							'sygol'						=> 'Sygol ',
-							'tach_bw'					=> 'TACH Black Widow',
-							'tarantula'					=> 'Tarantula',
-							'tarspider'					=> 'tarspider',
-							'tcl'						=> 'Tcl W3 Robot',
-							'techbot'					=> 'TechBOT',
-							'templeton'					=> 'Templeton',
-							'titin'						=> 'TitIn',
-							'titan'						=> 'TITAN',
-							'tkwww'						=> 'The TkWWW Robot',
-							'tlspider'					=> 'TLSpider',
-							'ucsd'						=> 'UCSD Crawl',
-							'udmsearch'					=> 'UdmSearch',
-							'ultraseek'					=> 'Ultraseek',
-							'uptimebot'					=> 'UptimeBot',
-							'urlck'						=> 'URL Check',
-							'valkyrie'					=> 'Valkyrie',
-							'verticrawl'				=> 'Verticrawl',
-							'victoria'					=> 'Victoria',
-							'visionsearch'				=> 'vision-search',
-							'voidbot'					=> 'void-bot',
-							'voyager'					=> 'Voyager',
-							'vwbot'						=> 'VWbot',
-							'w3index'					=> 'The NWI Robot',
-							'w3m2'						=> 'W3M2',
-							'wallpaper'					=> 'WallPaper (alias crawlpaper)',
-							'wanderer'					=> 'the World Wide Web Wanderer',
-							'wapspider'					=> 'w@pSpider by wap4.com',
-							'webbandit'					=> 'WebBandit Web Spider',
-							'webcatcher'				=> 'WebCatcher',
-							'webcopy'					=> 'WebCopy',
-							'webfetcher'				=> 'webfetcher',
-							'webfoot'					=> 'The Webfoot Robot',
-							'webinator'					=> 'Webinator',
-							'weblayers'					=> 'weblayers',
-							'weblinker'					=> 'WebLinker',
-							'webmirror'					=> 'WebMirror',
-							'webmoose'					=> 'The Web Moose',
-							'webquest'					=> 'WebQuest',
-							'webreader'					=> 'Digimarc MarcSpider',
-							'webreaper'					=> 'WebReaper',
-							'webs'						=> 'webs',
-							'websnarf'					=> 'Websnarf',
-							'webspider'					=> 'WebSpider',
-							'webvac'					=> 'WebVac',
-							'webwalk'					=> 'webwalk',
-							'webwalker'					=> 'WebWalker',
-							'webwatch'					=> 'WebWatch',
-							'wget'						=> 'Wget',
-							'whatuseek'					=> 'whatUseek Winona',
-							'whowhere'					=> 'WhoWhere Robot',
-							'wlm'						=> 'Weblog Monitor',
-							'wmir'						=> 'w3mir',
-							'wolp'						=> 'WebStolperer',
-							'wombat'					=> 'The Web Wombat ',
-							'worm'						=> 'The World Wide Web Worm',
-							'wwwc'						=> 'WWWC Ver 0.2.5',
-							'wz101'						=> 'WebZinger',
-							'xget'						=> 'XGET',				
-						);	
-
-
 	
 	/**
 	 * Constructor
@@ -430,8 +61,61 @@ function CI_User_agent()
 		
 		if ( ! is_null($this->agent))
 		{
-			$this->_compile_data();
+			if ($this->_load_agent_file())
+			{
+				$this->_compile_data();
+			}
+		}
+	}
+
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Compile the User Agent Data
+	 *
+	 * @access	private
+	 * @return	bool
+	 */		
+	function _load_agent_file()
+	{
+		if ( ! @include(APPPATH.'config/user_agent'.EXT))
+		{
+			return FALSE;
+		}
+		
+		$return = FALSE;
+		
+		if (isset($platforms))
+		{
+			$this->platforms = $platforms;
+			unset($platforms);
+			$return = TRUE;
+		}
+
+		if (isset($browsers))
+		{
+			$this->browsers = $browsers;
+			unset($browsers);
+			$return = TRUE;
+		}
+
+		if (isset($mobiles))
+		{
+			$this->browsers = $mobiles;
+			unset($mobiles);
+			$return = TRUE;
 		}
+		
+		if (isset($robots))
+		{
+			$this->robots = $robots;
+			unset($robots);
+			$return = TRUE;
+		}
+		
+		
+		return $return;
 	}
 	
 	// --------------------------------------------------------------------
@@ -465,15 +149,17 @@ function _compile_data()
 	 */		
 	function _set_platform()
 	{
-		foreach ($this->platforms as $key => $val) 
+		if (is_array($this->platforms) AND count($this->platforms) > 0)
 		{
-			if (preg_match("|$key|i", $this->agent)) 
+			foreach ($this->platforms as $key => $val) 
 			{
-				$this->platform = $val;
-				return TRUE;
+				if (preg_match("|".preg_quote($key)."|i", $this->agent)) 
+				{
+					$this->platform = $val;
+					return TRUE;
+				}
 			}
 		}
-	
 		$this->platform = 'Unknown Platform';
 	}
 
@@ -487,17 +173,19 @@ function _set_platform()
 	 */		
 	function _set_browser()
 	{
-		foreach ($this->browsers as $key => $val) 
-		{		
-			if (preg_match("|".$key.".*?([0-9\.]+)|i", $this->agent, $match)) 
-			{
-				$this->is_browser = TRUE;
-				$this->version = $match[1];
-				$this->browser = $val;
-				return TRUE;
+		if (is_array($this->browsers) AND count($this->browsers) > 0)
+		{
+			foreach ($this->browsers as $key => $val) 
+			{		
+				if (preg_match("|".preg_quote($key).".*?([0-9\.]+)|i", $this->agent, $match)) 
+				{
+					$this->is_browser = TRUE;
+					$this->version = $match[1];
+					$this->browser = $val;
+					return TRUE;
+				}
 			}
 		}
-		
 		return FALSE;
 	}
 			
@@ -511,39 +199,43 @@ function _set_browser()
 	 */		
 	function _set_robot()
 	{
-		foreach ($this->robots as $key => $val) 
-		{
-			if (preg_match("|$key|i", $this->agent)) 
+		if (is_array($this->robots) AND count($this->robots) > 0)
+		{		
+			foreach ($this->robots as $key => $val) 
 			{
-				$this->is_robot = TRUE;
-				$this->robot = $val;
-				return TRUE;
+				if (preg_match("|".preg_quote($key)."|i", $this->agent)) 
+				{
+					$this->is_robot = TRUE;
+					$this->robot = $val;
+					return TRUE;
+				}
 			}
 		}
-	
 		return FALSE;
 	}
 
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Set the Mobile Devise
+	 * Set the Mobile Device
 	 *
 	 * @access	private
 	 * @return	bool
 	 */		
 	function _set_mobile()
 	{
-		foreach ($this->mobiles as $key => $val) 
-		{
-			if (FALSE !== (strpos(strtolower($this->agent), $key)))
+		if (is_array($this->mobiles) AND count($this->mobiles) > 0)
+		{		
+			foreach ($this->mobiles as $key => $val) 
 			{
-				$this->is_mobile = TRUE;
-				$this->mobile = $val;
-				return TRUE;
+				if (FALSE !== (strpos(strtolower($this->agent), $key)))
+				{
+					$this->is_mobile = TRUE;
+					$this->mobile = $val;
+					return TRUE;
+				}
 			}
-		}
-	
+		}	
 		return FALSE;
 	}
 	
@@ -559,7 +251,7 @@ function _set_languages()
 	{
 		if ((count($this->languages) == 0) AND isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) AND $_SERVER['HTTP_ACCEPT_LANGUAGE'] != '')
 		{
-			$languages = preg_replace('/(;q=.+)/i', '', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+			$languages = preg_replace('/(;q=.+)/i', '', trim($_SERVER['HTTP_ACCEPT_LANGUAGE']));
 			
 			$this->languages = explode(',', $languages);
 		}
@@ -582,7 +274,7 @@ function _set_charsets()
 	{	
 		if ((count($this->charsets) == 0) AND isset($_SERVER['HTTP_ACCEPT_CHARSET']) AND $_SERVER['HTTP_ACCEPT_CHARSET'] != '')
 		{
-			$charsets = preg_replace('/(;q=.+)/i', '', $_SERVER['HTTP_ACCEPT_CHARSET']);
+			$charsets = preg_replace('/(;q=.+)/i', '', trim($_SERVER['HTTP_ACCEPT_CHARSET']));
 			
 			$this->charsets = explode(',', $charsets);
 		}
@@ -712,7 +404,7 @@ function robot()
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Get the Mobile Devise
+	 * Get the Mobile Device
 	 *
 	 * @access	public
 	 * @return	string
@@ -732,7 +424,7 @@ function mobile()
 	 */			
 	function referrer()
 	{
-		return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') ? '' : $_SERVER['HTTP_REFERER'];
+		return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') ? '' : trim($_SERVER['HTTP_REFERER']);
 	}
 
 	// --------------------------------------------------------------------

From 2f0bac87c73febde8019e7cbab541905bcb0e5dd Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 17:36:45 +0000
Subject: [PATCH 0306/2544]

---
 system/libraries/Loader.php      | 29 +++++++++++-------------
 system/libraries/User_agent.php  |  3 +--
 user_guide/libraries/loader.html | 38 +++++++++++++++++++-------------
 user_guide/libraries/table.html  |  9 ++++----
 4 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 05ee9395..452e39df 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -65,15 +65,15 @@ function CI_Loader()
 	 *
 	 * @access	public
 	 * @param	string	the name of the class
-	 * @param	mixed	any initialization parameters
+	 * @param	sring	the optional class variable name to assign the library to
 	 * @return	void
 	 */	
-	function library($class, $param = NULL)
+	function library($class, $varname = NULL)
 	{		
 		if ($class == '')
 			return;
 	
-		$this->_ci_load_class($class, $param);
+		$this->_ci_load_class($class, $varname);
 		$this->_ci_assign_to_models();
 	}
 
@@ -595,7 +595,7 @@ function _ci_load($data)
 	 * @param	mixed	any additional parameters
 	 * @return 	void
 	 */
-	function _ci_load_class($class, $params = NULL)
+	function _ci_load_class($class, $varname = NULL)
 	{	
 		// Prep the class name
 		$class = strtolower(str_replace(EXT, '', $class));
@@ -627,7 +627,7 @@ function _ci_load_class($class, $params = NULL)
 				}
 			}
 			
-			return $this->_ci_init_class($filename, 'MY_', $params);
+			return $this->_ci_init_class($filename, 'MY_', $varname);
 		}
 
 		// Lets search for the requested library file and load it.
@@ -642,7 +642,7 @@ function _ci_load_class($class, $params = NULL)
 				if (file_exists($path.'libraries/'.$filename.EXT))
 				{
 					include_once($path.'libraries/'.$filename.EXT);
-					return $this->_ci_init_class($filename, '', $params);
+					return $this->_ci_init_class($filename, '', $varname);
 				}
 			}
 		}
@@ -662,15 +662,12 @@ function _ci_load_class($class, $params = NULL)
 	 * @param	string
 	 * @return	null
 	 */
-	function _ci_init_class($class, $prefix = '', $config = NULL)
+	function _ci_init_class($class, $prefix = '', $varname = NULL)
 	{	
 		// Is there an associated config file for this class?
-		if ($config == NULL)
+		if (file_exists(APPPATH.'config/'.$class.EXT))
 		{
-			if (file_exists(APPPATH.'config/'.$class.EXT))
-			{
-				include_once(APPPATH.'config/'.$class.EXT);
-			}
+			include_once(APPPATH.'config/'.$class.EXT);
 		}
 		
 		if ($prefix == '')
@@ -682,17 +679,17 @@ function _ci_init_class($class, $prefix = '', $config = NULL)
 			$name = $prefix.$class;
 		}
 						
-		$varname = ( ! isset($remap[$class])) ? $class : $remap[$class];
-		$varname = strtolower($varname);
+		$classvar = ( ! is_null($varname)) ? $varname : strtolower($class);
+		
 		
 		// Instantiate the class
 		if ($config !== NULL)
 		{
-			$this->CI->$varname = new $name($config);
+			$this->CI->$classvar = new $name($config);
 		}
 		else
 		{		
-			$this->CI->$varname = new $name;
+			$this->CI->$classvar = new $name;
 		}	
 	} 	
 	
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 21162388..39e12327 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -113,8 +113,7 @@ function _load_agent_file()
 			unset($robots);
 			$return = TRUE;
 		}
-		
-		
+
 		return $return;
 	}
 	
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index b8da7aaf..b93d5fa7 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -72,6 +72,29 @@ 
    Loader Class
    
 
 
 
+
    $this->load->library('class_name')
    
+
+
    This function is used to load core classes.  Where class_name is the name of the class you want to load. 
+Note: We use the terms "class" and "library" interchangeably.
    
+
+
    For example, if you would like to send email with Code Igniter, the first step is to load the email class within your controller:
    
+
+$this->load->library('email');
+
+
    Once loaded, the library will be ready for use, using $this->email->some_function().
+
+Each library is described in detail in its own page, so please read theinformation regarding each one you would like to use.
    
+
+
    If you would like your libraries assigned to a different variable name then the default you can specify the name in the second paramter:
    
+
+
+$this->load->library('email', 'E'); // Assigns the email object to "E"
    
+
    
+$this->E->some_function()
+    
+
+
+
 
    $this->load->view('file_name', $data, true/false)
    
 
 
    This function is used to load your View files.  If you haven't read the Views section of the
@@ -92,21 +115,6 @@ 
    $this->load->view('file_name', $data, true/fals
 $string = $this->load->view('myfile', '', true);
 
 
-
-
    $this->load->library('class_name')
    
-
-
    This function is used to load core classes.  Where class_name is the name of the class you want to load. 
-Note: We use the terms "class" and "library" interchangeably.
    
-
-
    For example, if you would like to send email with Code Igniter, the first step is to load the email class within your controller:
    
-
-$this->load->library('email');
-
-
    Once loaded, the library will be ready for use.  Each library is described in detail in its own page, so please read the
-information regarding each one you would like to use.
    
-
-
-
 
    $this->load->database('options', true/false)
    
 
 
    This function lets you load the database class.  The two parameters are optional.  Please see the 
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html
index e80e53fd..61b5ce82 100644
--- a/user_guide/libraries/table.html
+++ b/user_guide/libraries/table.html
@@ -76,7 +76,8 @@ 
    Initializing the Class
    
 
    Examples
    
 
 
    Here is an example showing how you can create a table from a multi-dimensional array. 
-Note that the first array index will become the table heading.
    
+Note that the first array index will become the table heading (or you can set your own headings using the 
+set_heading() function described in the function reference below).
    
 
 
 $this->load->library('table');
    
@@ -92,8 +93,8 @@ 
    Examples
    
     
 
 
    Here is an example of a table created from a database query result. The table class will automatically generate the 
-headings based on the table names. Or you can set your own headings using the set_heading() function described
-in the function reference below.
    
+headings based on the table names (or you can set your own headings using the set_heading() function described
+in the function reference below).
    
 
 
 $this->load->library('table');
    
@@ -164,7 +165,7 @@ 
    Changing the Look of Your Table
    
 $this->table->set_template($tmpl);
     
 
-
    You'll notice there are two sets of "row" blocks in the template.  These permit you to create alternating row colors or design elements that alternate with each 
+
    Note:  You'll notice there are two sets of "row" blocks in the template.  These permit you to create alternating row colors or design elements that alternate with each 
 iteration of the row data.
    
 
 
    You are NOT required to submit a complete template.  If you only need to change parts of the layout you can simply submit those elements.

From b1fddc051af66a0a41a709862dd84d06139e2325 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 21:29:07 +0000
Subject: [PATCH 0307/2544]

---
 system/application/config/database.php   |  2 +-
 system/application/config/mimes.php      |  2 +-
 system/libraries/Loader.php              | 16 +++++++++++++---
 system/libraries/User_agent.php          | 15 ++++++++++-----
 user_guide/installation/upgrade_150.html | 15 ++++++++-------
 user_guide/libraries/calendar.html       |  2 ++
 user_guide/libraries/encryption.html     |  2 ++
 user_guide/libraries/parser.html         |  2 ++
 user_guide/libraries/sessions.html       |  1 +
 user_guide/libraries/table.html          |  2 ++
 user_guide/libraries/trackback.html      |  1 +
 user_guide/libraries/unit_testing.html   |  1 +
 user_guide/libraries/zip.html            |  2 ++
 13 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/system/application/config/database.php b/system/application/config/database.php
index de781646..c594ba89 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -40,7 +40,7 @@
 $db['default']['active_r'] = TRUE;
 $db['default']['pconnect'] = TRUE;
 $db['default']['db_debug'] = TRUE;
-$db['default']['cache_on'] = TRUE;
+$db['default']['cache_on'] = FALSE;
 $db['default']['cachedir'] = APPPATH.'db_cache/';
 
 
diff --git a/system/application/config/mimes.php b/system/application/config/mimes.php
index de0a9175..8b5036f2 100644
--- a/system/application/config/mimes.php
+++ b/system/application/config/mimes.php
@@ -4,7 +4,7 @@
 | MIME TYPES
 | -------------------------------------------------------------------
 | This file contains an array of mime types.  It is used by the
-| Upload class to help identyfiy allowed file types.
+| Upload class to help identify allowed file types.
 |
 */
 
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 452e39df..dc588bb0 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -30,12 +30,13 @@ class CI_Loader {
 
 	var $CI;
 	var $ob_level;
+	var $view_path		= '';
 	var $cached_vars	= array();
 	var $models			= array();
 	var $helpers		= array();
 	var $plugins		= array();
 	var $scripts		= array();
-	var $view_path		= '';
+	var $varmap			= array('unit_test' => 'unit', 'user_agent' => 'agent');
 
 	/**
 	 * Constructor
@@ -665,6 +666,7 @@ function _ci_load_class($class, $varname = NULL)
 	function _ci_init_class($class, $prefix = '', $varname = NULL)
 	{	
 		// Is there an associated config file for this class?
+		$config = NULL;
 		if (file_exists(APPPATH.'config/'.$class.EXT))
 		{
 			include_once(APPPATH.'config/'.$class.EXT);
@@ -678,9 +680,17 @@ function _ci_init_class($class, $prefix = '', $varname = NULL)
 		{
 			$name = $prefix.$class;
 		}
-						
-		$classvar = ( ! is_null($varname)) ? $varname : strtolower($class);
 		
+		// Set the variable name we will assign the class to
+		if ( ! is_null($varname)) 
+		{
+			$classvar = $varname;
+		}
+		else
+		{
+			$class = strtolower($class);			
+			$classvar = ( ! isset($this->varmap[$class])) ? $class : $this->varmap[$class];
+		}
 		
 		// Instantiate the class
 		if ($config !== NULL)
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 39e12327..11c2baa6 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -37,12 +37,16 @@ class CI_User_agent {
 	var $languages	= array();
 	var $charsets	= array();
 	
+	var $platforms	= array();
+	var $browsers	= array();
+	var $mobiles	= array();
+	var $robots		= array();
+	
 	var $platform	= '';
 	var $browser	= '';
 	var $version	= '';
 	var $moble		= '';
 	var $robot		= '';
-
 	
 	/**
 	 * Constructor
@@ -66,8 +70,9 @@ function CI_User_agent()
 				$this->_compile_data();
 			}
 		}
+		
+		log_message('debug', "Table Class Initialized");
 	}
-
 	
 	// --------------------------------------------------------------------
 	
@@ -79,7 +84,7 @@ function CI_User_agent()
 	 */		
 	function _load_agent_file()
 	{
-		if ( ! @include(APPPATH.'config/user_agent'.EXT))
+		if ( ! @include(APPPATH.'config/user_agents'.EXT))
 		{
 			return FALSE;
 		}
@@ -102,7 +107,7 @@ function _load_agent_file()
 
 		if (isset($mobiles))
 		{
-			$this->browsers = $mobiles;
+			$this->mobiles = $mobiles;
 			unset($mobiles);
 			$return = TRUE;
 		}
@@ -344,7 +349,7 @@ function is_referral()
 	 * @access	public
 	 * @return	string
 	 */			
-	function agent()
+	function agent_string()
 	{
 		return $this->agent;
 	}
diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html
index 55ebaa74..b532073f 100644
--- a/user_guide/installation/upgrade_150.html
+++ b/user_guide/installation/upgrade_150.html
@@ -71,16 +71,17 @@ 
    Upgrading from 1.4.1 to 1.5.0
    
 
 
    Step 1: Update your Code Igniter files
    
 
-
    Replace these directories in your "system" folder with the new versions:
+
    Replace these files and directories in your "system" folder with the new versions:
 
 
      
 
-
    • system/codeigniter/
      • 
-
    • system/database/ (new for 1.5)
      • 
-
    • system/helpers/
      • 
-
    • system/language/
      • 
-
    • system/libraries/
      • 
-
    • system/scaffolding/
      • 
+
    • application/config/user_agents.php (new file for 1.5)
      • 
+
    • codeigniter/
      • 
+
    • database/ (new folder for 1.5. Replaces the "drivers" folder)
      • 
+
    • helpers/
      • 
+
    • language/
      • 
+
    • libraries/
      • 
+
    • scaffolding/
      • 
 
    
 
 
    Note: If you have any custom developed files in these folders please make copies of them first.
    
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html
index cd3e6644..9d2a01e1 100644
--- a/user_guide/libraries/calendar.html
+++ b/user_guide/libraries/calendar.html
@@ -75,6 +75,8 @@ 
    Initializing the Class
    
 $this->load->library('calendar');
 
    Once loaded, the Calendar object will be available using: $this->calendar
    
 
+
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
+
 
 
    Displaying a Calendar
    
 
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html
index 9be32cf4..92d128cd 100644
--- a/user_guide/libraries/encryption.html
+++ b/user_guide/libraries/encryption.html
@@ -110,6 +110,8 @@ 
    Initializing the Class
    
 $this->load->library('encrypt');
 
    Once loaded, the Encrypt library object will be available using: $this->encrypt
    
 
+
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
+
 
 
    $this->encrypt->encode()
    
 
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html
index bf7b1351..2f93baf0 100644
--- a/user_guide/libraries/parser.html
+++ b/user_guide/libraries/parser.html
@@ -103,6 +103,8 @@ 
    Initializing the Class
    
 
 $this->load->library('parser');
 
    Once loaded, the Parser library object will be available using: $this->parser
    
+
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
+
 
 
    The following functions are available in this library:
    
 
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
index 5a1216f6..7a894fae 100644
--- a/user_guide/libraries/sessions.html
+++ b/user_guide/libraries/sessions.html
@@ -87,6 +87,7 @@ 
    Initializing a Session
    
 
 $this->load->library('session');
 
    Once loaded, the Sessions library object will be available using: $this->session
    
+
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
 
 
 
    How do Sessions work?
    
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html
index 61b5ce82..c2e32399 100644
--- a/user_guide/libraries/table.html
+++ b/user_guide/libraries/table.html
@@ -72,6 +72,8 @@ 
    Initializing the Class
    
 $this->load->library('table');
 
    Once loaded, the Table library object will be available using: $this->table
    
 
+
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
+
 
 
    Examples
    
 
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html
index 0621d4e7..87f6f3a0 100644
--- a/user_guide/libraries/trackback.html
+++ b/user_guide/libraries/trackback.html
@@ -74,6 +74,7 @@ 
    Initializing the Class
    
 
 $this->load->library('trackback');
 
    Once loaded, the Trackback library object will be available using: $this->trackback
    
+
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
 
 
 
    Sending Trackbacks
    
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
index 11a8fc26..aa747587 100644
--- a/user_guide/libraries/unit_testing.html
+++ b/user_guide/libraries/unit_testing.html
@@ -78,6 +78,7 @@ 
    Initializing the Class
    
 
 $this->load->library('unit');
 
    Once loaded, the Unit Test object will be available using: $this->unit
    
+
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
 
 
 
    Running Tests
    
diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html
index 6171ed1c..32ef3bed 100644
--- a/user_guide/libraries/zip.html
+++ b/user_guide/libraries/zip.html
@@ -71,6 +71,8 @@ 
    Initializing the Class
    
 
 $this->load->library('zip');
 
    Once loaded, the Zip library object will be available using: $this->zip
    
+
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
+
 
 
    Usage Example
    
 

From daaa0c8403a80d325d3ce2b85c5be62067a3854b Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 21:39:12 +0000
Subject: [PATCH 0308/2544]

---
 system/libraries/Unit_test.php | 331 +++++++++++++++++++++++++++++++++
 1 file changed, 331 insertions(+)
 create mode 100644 system/libraries/Unit_test.php

diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
new file mode 100644
index 00000000..41516238
--- /dev/null
+++ b/system/libraries/Unit_test.php
@@ -0,0 +1,331 @@
+active == FALSE)
+			return FALSE;
+			
+		if (in_array($expected, array('is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null'), TRUE))
+		{
+			$expected = str_replace('is_float', 'is_double', $expected);
+			$result = ($expected($test)) ? TRUE : FALSE;	
+			$extype = str_replace(array('true', 'false'), 'bool', str_replace('is_', '', $expected));
+		}
+		else
+		{
+			if ($this->strict == TRUE)
+				$result = ($test === $expected) ? TRUE : FALSE;	
+			else
+				$result = ($test == $expected) ? TRUE : FALSE;	
+			
+			$extype = gettype($expected);
+		}
+				
+		$back = $this->_backtrace();
+	
+		$report[] = array (
+							'test_name'			=> $test_name,
+							'test_datatype'		=> gettype($test),
+							'res_datatype'		=> $extype,
+							'result'			=> ($result === TRUE) ? 'passed' : 'failed',
+							'file'				=> $back['file'],
+							'line'				=> $back['line']
+						);
+
+		$this->results[] = $report;		
+				
+		return($this->report($this->result($report)));
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate a report
+	 *
+	 * Displays a table with the test data
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function report($result = array())
+	{	
+		if (count($result) == 0)
+		{
+			$result = $this->result();
+		}
+		
+		$this->_parse_template();
+	
+		$r = '';
+		foreach ($result as $res)
+		{
+			$table = '';
+		
+			foreach ($res as $key => $val)
+			{
+				$temp = $this->_template_rows;			
+				$temp = str_replace('{item}', $key, $temp);
+				$temp = str_replace('{result}', $val, $temp);
+				$table .= $temp;
+			}
+			
+			$r .= str_replace('{rows}', $table, $this->_template);
+		}
+	
+		return $r;	
+	}	
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Use strict comparison
+	 *
+	 * Causes the evaluation to use === rather then ==
+	 *
+	 * @access	public
+	 * @param	bool
+	 * @return	null
+	 */
+	function use_strict($state = TRUE)
+	{
+		$this->strict = ($state == FALSE) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Make Unit testing active
+	 *
+	 * Enables/disables unit testing  
+	 *
+	 * @access	public
+	 * @param	bool
+	 * @return	null
+	 */
+	function active($state = TRUE)
+	{
+		$this->active = ($state == FALSE) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Result Array
+	 *
+	 * Returns the raw result data
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	function result($results = array())
+	{	
+		$CI =& get_instance();
+		$CI->load->language('unit_test');
+		
+		if (count($results) == 0)
+		{
+			$results = $this->results;
+		}
+		
+		$retval = array();
+		foreach ($results as $result)
+		{
+			$temp = array();
+			foreach ($result as $key => $val)
+			{
+				if (is_array($val))
+				{
+					foreach ($val as $k => $v)
+					{
+						if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$v))))
+						{
+							$v = $line;
+						}				
+						$temp[$CI->lang->line('ut_'.$k)] = $v;					
+					}
+				}
+				else
+				{
+					if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$val))))
+					{
+						$val = $line;
+					}				
+					$temp[$CI->lang->line('ut_'.$key)] = $val;
+				}
+			}
+			
+			$retval[] = $temp;
+		}
+	
+		return $retval;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set the template
+	 *
+	 * This lets us set the template to be used to display results
+	 *
+	 * @access	public
+	 * @params	string
+	 * @return	void
+	 */	
+	function set_template($template)
+	{
+		$this->_template = $template;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate a backtrace
+	 *
+	 * This lets us show file names and line numbers 
+	 *
+	 * @access	private
+	 * @return	array
+	 */
+	function _backtrace() 
+	{
+		if (function_exists('debug_backtrace')) 
+		{
+			$back = debug_backtrace();
+			
+			$file = ( ! isset($back['1']['file'])) ? '' : $back['1']['file'];
+			$line = ( ! isset($back['1']['line'])) ? '' : $back['1']['line'];
+						
+			return array('file' => $file, 'line' => $line);
+		}
+		return array('file' => 'Unknown', 'line' => 'Unknown');
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Get Default Template
+	 *
+	 * @access	private
+	 * @return	string
+	 */
+	function _default_template()
+	{	
+		$this->_template = '	
+		
    
+				
+		{rows}
+		
    ';
+		
+		$this->_template_rows = '
+		
+		{item}
+		{result}
+		
+		';	
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Parse Template
+	 *
+	 * Harvests the data within the template {pseudo-variables}
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+ 	function _parse_template()
+ 	{
+ 		if ( ! is_null($this->_template_rows))
+ 		{
+ 			return;
+ 		}
+ 		
+ 		if (is_null($this->_template))
+ 		{
+ 			$this->_default_template();
+ 			return;
+ 		}
+ 		
+		if ( ! preg_match("/\{rows\}(.*?)\{\/rows\}/si", $this->_template, $match))
+		{
+ 			$this->_default_template();
+ 			return;
+		}
+
+		$this->_template_rows = $match['1'];
+		$this->_template = str_replace($match['0'], '{rows}', $this->_template); 	
+ 	}
+ 	
+}
+// END Unit_test Class
+
+/**
+ * Helper functions to test boolean true/false
+ * 
+ *
+ * @access	private
+ * @return	bool
+ */
+function is_true($test)
+{
+	return (is_bool($test) AND $test === TRUE) ? TRUE : FALSE;
+}
+function is_false($test)
+{
+	return (is_bool($test) AND $test === FALSE) ? TRUE : FALSE;
+}
+
+?>
\ No newline at end of file

From 8d3f977d2c1d4dc01a72c0add3b14ffc73a54762 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 21:39:48 +0000
Subject: [PATCH 0309/2544]

---
 system/libraries/Loader.php            |   7 -
 system/libraries/Unit.php              | 331 -------------------------
 user_guide/general/changelog.html      |   3 +-
 user_guide/libraries/unit_testing.html |   2 +-
 4 files changed, 2 insertions(+), 341 deletions(-)
 delete mode 100644 system/libraries/Unit.php

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index dc588bb0..ca4c4feb 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -601,13 +601,6 @@ function _ci_load_class($class, $varname = NULL)
 		// Prep the class name
 		$class = strtolower(str_replace(EXT, '', $class));
 		
-		// Bug fix for backward compat.  
-		// Kill this at some point in the future
-		if ($class == 'unit_test')
-		{
-			$class = 'unit';
-		}
-
 		// Is this a class extension request?	
 		if (substr($class, 0, 3) == 'my_')
 		{
diff --git a/system/libraries/Unit.php b/system/libraries/Unit.php
deleted file mode 100644
index 439424fb..00000000
--- a/system/libraries/Unit.php
+++ /dev/null
@@ -1,331 +0,0 @@
-active == FALSE)
-			return FALSE;
-			
-		if (in_array($expected, array('is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null'), TRUE))
-		{
-			$expected = str_replace('is_float', 'is_double', $expected);
-			$result = ($expected($test)) ? TRUE : FALSE;	
-			$extype = str_replace(array('true', 'false'), 'bool', str_replace('is_', '', $expected));
-		}
-		else
-		{
-			if ($this->strict == TRUE)
-				$result = ($test === $expected) ? TRUE : FALSE;	
-			else
-				$result = ($test == $expected) ? TRUE : FALSE;	
-			
-			$extype = gettype($expected);
-		}
-				
-		$back = $this->_backtrace();
-	
-		$report[] = array (
-							'test_name'			=> $test_name,
-							'test_datatype'		=> gettype($test),
-							'res_datatype'		=> $extype,
-							'result'			=> ($result === TRUE) ? 'passed' : 'failed',
-							'file'				=> $back['file'],
-							'line'				=> $back['line']
-						);
-
-		$this->results[] = $report;		
-				
-		return($this->report($this->result($report)));
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Generate a report
-	 *
-	 * Displays a table with the test data
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	function report($result = array())
-	{	
-		if (count($result) == 0)
-		{
-			$result = $this->result();
-		}
-		
-		$this->_parse_template();
-	
-		$r = '';
-		foreach ($result as $res)
-		{
-			$table = '';
-		
-			foreach ($res as $key => $val)
-			{
-				$temp = $this->_template_rows;			
-				$temp = str_replace('{item}', $key, $temp);
-				$temp = str_replace('{result}', $val, $temp);
-				$table .= $temp;
-			}
-			
-			$r .= str_replace('{rows}', $table, $this->_template);
-		}
-	
-		return $r;	
-	}	
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Use strict comparison
-	 *
-	 * Causes the evaluation to use === rather then ==
-	 *
-	 * @access	public
-	 * @param	bool
-	 * @return	null
-	 */
-	function use_strict($state = TRUE)
-	{
-		$this->strict = ($state == FALSE) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Make Unit testing active
-	 *
-	 * Enables/disables unit testing  
-	 *
-	 * @access	public
-	 * @param	bool
-	 * @return	null
-	 */
-	function active($state = TRUE)
-	{
-		$this->active = ($state == FALSE) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Result Array
-	 *
-	 * Returns the raw result data
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	function result($results = array())
-	{	
-		$CI =& get_instance();
-		$CI->load->language('unit_test');
-		
-		if (count($results) == 0)
-		{
-			$results = $this->results;
-		}
-		
-		$retval = array();
-		foreach ($results as $result)
-		{
-			$temp = array();
-			foreach ($result as $key => $val)
-			{
-				if (is_array($val))
-				{
-					foreach ($val as $k => $v)
-					{
-						if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$v))))
-						{
-							$v = $line;
-						}				
-						$temp[$CI->lang->line('ut_'.$k)] = $v;					
-					}
-				}
-				else
-				{
-					if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$val))))
-					{
-						$val = $line;
-					}				
-					$temp[$CI->lang->line('ut_'.$key)] = $val;
-				}
-			}
-			
-			$retval[] = $temp;
-		}
-	
-		return $retval;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set the template
-	 *
-	 * This lets us set the template to be used to display results
-	 *
-	 * @access	public
-	 * @params	string
-	 * @return	void
-	 */	
-	function set_template($template)
-	{
-		$this->_template = $template;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Generate a backtrace
-	 *
-	 * This lets us show file names and line numbers 
-	 *
-	 * @access	private
-	 * @return	array
-	 */
-	function _backtrace() 
-	{
-		if (function_exists('debug_backtrace')) 
-		{
-			$back = debug_backtrace();
-			
-			$file = ( ! isset($back['1']['file'])) ? '' : $back['1']['file'];
-			$line = ( ! isset($back['1']['line'])) ? '' : $back['1']['line'];
-						
-			return array('file' => $file, 'line' => $line);
-		}
-		return array('file' => 'Unknown', 'line' => 'Unknown');
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Get Default Template
-	 *
-	 * @access	private
-	 * @return	string
-	 */
-	function _default_template()
-	{	
-		$this->_template = '	
-		
    
-				
-		{rows}
-		
    ';
-		
-		$this->_template_rows = '
-		
-		{item}
-		{result}
-		
-		';	
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Parse Template
-	 *
-	 * Harvests the data within the template {pseudo-variables}
-	 *
-	 * @access	private
-	 * @return	void
-	 */
- 	function _parse_template()
- 	{
- 		if ( ! is_null($this->_template_rows))
- 		{
- 			return;
- 		}
- 		
- 		if (is_null($this->_template))
- 		{
- 			$this->_default_template();
- 			return;
- 		}
- 		
-		if ( ! preg_match("/\{rows\}(.*?)\{\/rows\}/si", $this->_template, $match))
-		{
- 			$this->_default_template();
- 			return;
-		}
-
-		$this->_template_rows = $match['1'];
-		$this->_template = str_replace($match['0'], '{rows}', $this->_template); 	
- 	}
- 	
-}
-// END Unit_test Class
-
-/**
- * Helper functions to test boolean true/false
- * 
- *
- * @access	private
- * @return	bool
- */
-function is_true($test)
-{
-	return (is_bool($test) AND $test === TRUE) ? TRUE : FALSE;
-}
-function is_false($test)
-{
-	return (is_bool($test) AND $test === FALSE) ? TRUE : FALSE;
-}
-
-?>
\ No newline at end of file
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index f4e271d4..2a871acf 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -64,7 +64,7 @@ 
    Change Log
    
 
 
 
    Version 1.5.0
    
-
    Release Date: Ocotber 15, 2006
    
+
    Release Date: October 15, 2006
    
 
 
      
 
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • 
@@ -91,7 +91,6 @@ 
      Version 1.5.0
      
 
    • Fixed a bug in the validation class.
      • 
 
    • Deprecated "init" folder.  Initialization happens automatically now.  Please see documentation.
      • 
 
    • Deprecated $this->db->field_names()  USE  $this->db->list_fields()
      • 
-
    • Deprecated $this->load->library('unit_test').  USE $this->load->library('unit')
      • 
 
 
    
 
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
index aa747587..9951c824 100644
--- a/user_guide/libraries/unit_testing.html
+++ b/user_guide/libraries/unit_testing.html
@@ -76,7 +76,7 @@ 
    Initializing the Class
    
 
 
    Like most other classes in Code Igniter, the Unit Test class is initialized in your controller using the $this->load->library function:
    
 
-$this->load->library('unit');
+$this->load->library('unit_test');
 
    Once loaded, the Unit Test object will be available using: $this->unit
    
 
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
 

From ada5fa37c19c2f7f3de210869dca6243ca9b4174 Mon Sep 17 00:00:00 2001
From: admin 
Date: Mon, 9 Oct 2006 21:40:36 +0000
Subject: [PATCH 0310/2544]

---
 user_guide/libraries/user_agent.html | 210 +++++++++++++++++++++++++++
 1 file changed, 210 insertions(+)
 create mode 100644 user_guide/libraries/user_agent.html

diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html
new file mode 100644
index 00000000..50f4b77f
--- /dev/null
+++ b/user_guide/libraries/user_agent.html
@@ -0,0 +1,210 @@
+
+
+
+
+Code Igniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
+
+
+
+
+
    Code Igniter User Guide Version 1.5.0b1
    
+
    
+
+
+
+
+
+
+
+
+
+
    
+
+
+
    
+
+
+
+
    
+
+
+
    User Agent Class
    
+
+
    The User Agent Class provides functions that help identify information about the browser, mobile device, or robot visiting your site.
+In addition you can get referrer information as well as language and supported character-set information.
    
+
+
    Initializing the Class
    
+
+
    Like most other classes in Code Igniter, the User Agent class is initialized in your controller using the $this->load->library function:
    
+
+$this->load->library('user_agent');
+
    Once loaded, the object will be available using: $this->agent
    
+
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
+
+
    User Agent Definitions
    
+
+
    The user agent name definitions are located in a config file located at: application/config/user_agents.php.  You may add items to the
+various user agent arrays if needed.
    
+
+
    Example
    
+
+
    When the User Agent class is initialized it will attempt to determine whether the user agent browsing your site is
+a web browser, a mobile device, or a robot.  It will also gather the platform information if it is available.
+
+
+
+$this->load->library('user_agent');
    
+
    
+if ($this->agent->is_browser())
    
+{
    
+    $agent  = $this->agent->browser().' '.$this->agent->version();
    
+}
    
+elseif ($this->agent->is_robot())
    
+{
    
+    $agent = $this->agent->robot();
    
+}
    
+elseif ($this->agent->is_mobile())
    
+{
    
+    $agent = $this->agent->mobile();
    
+}
    
+else
    
+{
    
+    $agent = 'Unidentified User Agent';
    
+}
    
+
    
+echo $agent;
    
+
    
+echo $this->agent->platform(); // Platform info (Windows, Linux, Mac, etc.)
+    
+
+
+
+
+
    
+
    Function Reference
    
+
+
+
    $this->agent->is_browser()
    
+
    Returns TRUE/FALSE (boolean) if the user agent is a known web browser.
    
+
+
    $this->agent->is_mobile()
    
+
    Returns TRUE/FALSE (boolean) if the user agent is a known mobile device.
    
+
+
    $this->agent->is_robot()
    
+
    Returns TRUE/FALSE (boolean) if the user agent is a known robot.
    
+
+
    Note:  The user agent library only contains the most common robot
+definitions.  It is not a complete list of bots. There are hundreds of them so searching for each one would not be 
+very efficient. If you find that some bots that commonly visit your site are missing from the list you can add them to your
+application/config/user_agents.php file.
    
+
+
    $this->agent->is_referral()
    
+
    Returns TRUE/FALSE (boolean) if the user agent was referred from another site.
    
+
+
+
    $this->agent->browser()
    
+
    Returns a string containing the name of the web browser viewing your site.
    
+
+
    $this->agent->version()
    
+
    Returns a string containing the version number of the web browser viewing your site.
    
+
+
    $this->agent->mobile()
    
+
    Returns a string containing the name of the mobile device viewing your site.
    
+
+
    $this->agent->robot()
    
+
    Returns a string containing the name of the robot viewing your site.
    
+
+
    $this->agent->platform()
    
+
    Returns a string containing the platform viewing your site (Linux, Windows, OS X, etc.).
    
+
+
    $this->agent->referrer()
    
+
    The referrer, if the user agent was referred from another site. Typically you'll test for this as follows:
    
+
+ if ($this->agent->is_referral())
    
+{
    
+    echo $this->agent->referrer();
    
+}    
+
+
+
    $this->agent->agent_string()
    
+
    Returns a string containing the full user agent string.  Typically it will be something like this:
    
+
+Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.0.4) Gecko/20060613 Camino/1.0.2
+
+
+
    $this->agent->accept_lang()
    
+
    Lets you determine if the user agent accepts a particular language. Example:
    
+
+if ($this->agent->accept_lang('en'))
    
+{
    
+    echo 'You accept English!';
    
+}
+
+
    Note: This function is not typically very reliable
+since some browsers do not provide language info, and even among those that do, it is not always accurate. 
    
+
+
+
+
    $this->agent->accept_charset()
    
+
    Lets you determine if the user agent accepts a particular language. Example:
    
+
+if ($this->agent->accept_charset('utf-8'))
    
+{
    
+    echo 'You browser supports UTF-8!';
    
+}
+
+
    Note: This function is not typically very reliable
+since some browsers do not provide character-set info, and even among those that do, it is not always accurate. 
    
+
+
+
+
    
+
+
+
+
+
+
+
\ No newline at end of file

From cf49390d3d699d878eb6e151745e80285465ddb9 Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 10 Oct 2006 07:12:31 +0000
Subject: [PATCH 0311/2544]

---
 system/codeigniter/Base4.php               |  29 ++-
 system/libraries/Controller.php            |  17 +-
 system/libraries/Loader.php                | 219 +++++++++++++++------
 system/libraries/Model.php                 |   4 +-
 system/scaffolding/Scaffolding.php         |   2 +-
 user_guide/general/changelog.html          |   4 +-
 user_guide/general/creating_libraries.html |   3 +
 user_guide/libraries/calendar.html         |   2 -
 user_guide/libraries/encryption.html       |   2 -
 user_guide/libraries/loader.html           |   4 +
 user_guide/libraries/parser.html           |   1 -
 user_guide/libraries/sessions.html         |   1 -
 user_guide/libraries/table.html            |   2 -
 user_guide/libraries/trackback.html        |   1 -
 user_guide/libraries/unit_testing.html     |   1 -
 user_guide/libraries/user_agent.html       |   1 -
 user_guide/libraries/zip.html              |   1 -
 17 files changed, 197 insertions(+), 97 deletions(-)

diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php
index eccf58ed..115c1072 100644
--- a/system/codeigniter/Base4.php
+++ b/system/codeigniter/Base4.php
@@ -18,10 +18,18 @@
 /**
  * CI_BASE - For PHP 4
  * 
- * This file is used only when Code Igniter is being run under PHP 4.  
- * Since PHP 4 has such poor object handling we had to come up with 
- * a hack (and a really ugly one at that...) to resolve some scoping 
- * problems.  PHP 5 doesn't suffer from this problem so we load one of 
+ * This file is used only when Code Igniter is being run under PHP 4.
+ * 
+ * In order to allow CI to work under PHP 4 we had to make the Loader class 
+ * the parent class of the Controller Base class.  It's the only way we 
+ * could enable functions like $this->load->library('email') to instantiate 
+ * classes that can then be used within controllers as $this->email->send()
+ *
+ * PHP 4 also has trouble referencing the CI super object within application 
+ * constructors since objects do not exist until the class is fully
+ * instantiated.  Basically PHP 4 sucks...
+ *
+ * Since PHP 5 doesn't suffer from this problem so we load one of 
  * two files based on the version of PHP being run.
  * 
  * @package		CodeIgniter
@@ -34,18 +42,25 @@ class CI_Base extends CI_Loader {
 
 	function CI_Base()
 	{
-		global $OBJ; 
 		parent::CI_Loader();
 		$this->load =& $this;
+		
+		global $OBJ;
 		$OBJ = $this->load;
 	}
 }
 
 function &get_instance()
 {
-	global $OBJ, $CI;
+	global $CI, $OBJ;
+	
+	if (is_object($CI)) 
+	{
+		$CI->_ci_use_instance = TRUE;
+		return $CI;
+	}
 	
-	return (is_object($CI)) ? $CI : $OBJ->load;
+	return $OBJ->load;
 }
 
 ?>
\ No newline at end of file
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 4b9e3e96..c80097a1 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -80,20 +80,13 @@ function _ci_initialize()
 		if (floor(phpversion()) >= 5)
 		{
 			$this->load = new CI_Loader();
+			$this->load->_ci_use_instance = TRUE;
+			$this->load->_ci_autoloader();
 		}
-
-		// Load everything specified in the autoload.php file
-		$this->load->_ci_autoloader();
-
-		// This allows anything loaded using $this->load (viwes, files, etc.)
-		// to become accessible from within the Controller class functions.
-		foreach (get_object_vars($this) as $key => $var)
+		else
 		{
-			if (is_object($var))
-			{
-				$this->load->$key =& $this->$key;
-			}
-		}	
+			$this->_ci_autoloader();
+		}
 	}
     
 	// --------------------------------------------------------------------
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index ca4c4feb..1738438e 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -28,15 +28,18 @@
  */
 class CI_Loader {
 
-	var $CI;
-	var $ob_level;
-	var $view_path		= '';
-	var $cached_vars	= array();
-	var $models			= array();
-	var $helpers		= array();
-	var $plugins		= array();
-	var $scripts		= array();
-	var $varmap			= array('unit_test' => 'unit', 'user_agent' => 'agent');
+	var $_ci_ob_level;
+	var $_ci_view_path		= '';
+	var $_ci_cached_vars	= array();
+	var $_ci_models			= array();
+	var $_ci_helpers		= array();
+	var $_ci_plugins		= array();
+	var $_ci_scripts		= array();
+	var $_ci_varmap			= array('unit_test' => 'unit', 'user_agent' => 'agent');
+	
+	var $_ci_use_instance 	= FALSE; 	// This variable determines whether we should 
+										// use $this or $CI =& get_instance()  
+										// throughout this class. Don't mess with it. 
 
 	/**
 	 * Constructor
@@ -47,11 +50,9 @@ class CI_Loader {
 	 * @access	public
 	 */
 	function CI_Loader()
-	{
-		$this->CI =& get_instance();
-	
-		$this->view_path = APPPATH.'views/';
-		$this->ob_level = ob_get_level();
+	{	
+		$this->_ci_view_path = APPPATH.'views/';
+		$this->_ci_ob_level  = ob_get_level();
 				
 		log_message('debug', "Loader Class Initialized");
 	}
@@ -95,8 +96,7 @@ function model($model, $name = '', $db_conn = FALSE)
 		if ($model == '')
 			return;
 	
-		// Is the model in a sub-folder?
-		// If so, parse out the filename and path.
+		// Is the model in a sub-folder? If so, parse out the filename and path.
 		if (strpos($model, '/') === FALSE)
 		{
 			$path = '';
@@ -114,14 +114,25 @@ function model($model, $name = '', $db_conn = FALSE)
 			$name = $model;
 		}
 		
-		if (in_array($name, $this->models, TRUE))
+		if (in_array($name, $this->_ci_models, TRUE))
 		{
 			return;
-		}		
+		}
 		
-		if (isset($this->CI->$name))
+		if ($this->_ci_use_instance)
+		{
+			$CI =& get_instance();
+			if (isset($CI->$name))
+			{
+				show_error('The model name you are loading is the name of a resource that is already being used: '.$name);
+			}
+		}
+		else
 		{
-			show_error('The model name you are loading is the name of a resource that is already being used: '.$name);
+			if (isset($this->$name))
+			{
+				show_error('The model name you are loading is the name of a resource that is already being used: '.$name);
+			}
 		}
 	
 		$model = strtolower($model);
@@ -136,7 +147,14 @@ function model($model, $name = '', $db_conn = FALSE)
 			if ($db_conn === TRUE)
 				$db_conn = '';
 		
-			$this->CI->load->database($db_conn, FALSE, TRUE);
+			if ($this->_ci_use_instance)
+			{
+				$CI->load->database($db_conn, FALSE, TRUE);
+			}
+			else
+			{
+				$this->database($db_conn, FALSE, TRUE);
+			}
 		}
 	
 		if ( ! class_exists('Model'))
@@ -147,8 +165,17 @@ function model($model, $name = '', $db_conn = FALSE)
 		require_once(APPPATH.'models/'.$path.$model.EXT);
 
 		$model = ucfirst($model);
-		$this->CI->$name = new $model();
-		$this->models[] = $name;
+		
+		if ($this->_ci_use_instance)
+		{
+			$CI->$name = new $model();
+		}
+		else
+		{
+			$this->$name = new $model();
+		}
+		
+		$this->_ci_models[] = $name;
 		$this->_ci_assign_to_models();
 	}
 	
@@ -239,7 +266,7 @@ function vars($vars = array())
 		{
 			foreach ($vars as $key => $val)
 			{
-				$this->cached_vars[$key] = $val;
+				$this->_ci_cached_vars[$key] = $val;
 			}
 		}
 	}
@@ -264,7 +291,7 @@ function helper($helpers = array())
 	
 		foreach ($helpers as $helper)
 		{
-			if (isset($this->helpers[$helper]))
+			if (isset($this->_ci_helpers[$helper]))
 			{
 				continue;
 			}
@@ -287,7 +314,7 @@ function helper($helpers = array())
 				}
 			}
 
-			$this->helpers[$helper] = TRUE;
+			$this->_ci_helpers[$helper] = TRUE;
 		}
 		
 		log_message('debug', 'Helpers loaded: '.implode(', ', $helpers));
@@ -330,7 +357,7 @@ function plugin($plugins = array())
 	
 		foreach ($plugins as $plugin)
 		{
-			if (isset($this->plugins[$plugin]))
+			if (isset($this->_ci_plugins[$plugin]))
 			{
 				continue;
 			}
@@ -353,7 +380,7 @@ function plugin($plugins = array())
 				}
 			}
 			
-			$this->plugins[$plugin] = TRUE;
+			$this->_ci_plugins[$plugin] = TRUE;
 		}
 		
 		log_message('debug', 'Plugins loaded: '.implode(', ', $plugins));
@@ -400,7 +427,7 @@ function script($scripts = array())
 	
 		foreach ($scripts as $script)
 		{
-			if (isset($this->scripts[$script]))
+			if (isset($this->_ci_scripts[$script]))
 			{
 				continue;
 			}
@@ -414,7 +441,7 @@ function script($scripts = array())
 			
 			include_once(APPPATH.'scripts/'.$script.EXT);
 			
-			$this->scripts[$script] = TRUE;
+			$this->_ci_scripts[$script] = TRUE;
 		}
 		
 		log_message('debug', 'Scripts loaded: '.implode(', ', $scripts));
@@ -431,7 +458,15 @@ function script($scripts = array())
 	 */
 	function language($file = '', $lang = '', $return = FALSE)
 	{
-		return $this->CI->lang->load($file, $lang, $return);
+		if ($this->_ci_use_instance)
+		{
+			$CI =& get_instance();
+			return $CI->lang->load($file, $lang, $return);
+		}
+		else
+		{
+			return $this->lang->load($file, $lang, $return);
+		}
 	}
 	
 	// --------------------------------------------------------------------
@@ -444,8 +479,16 @@ function language($file = '', $lang = '', $return = FALSE)
 	 * @return	void
 	 */
 	function config($file = '')
-	{
-		$this->CI->config->load($file);
+	{		
+		if ($this->_ci_use_instance)
+		{
+			$CI =& get_instance();
+			$CI->config->load($file);
+		}
+		else
+		{
+			$this->config->load($file);
+		}
 	}
 
 	// --------------------------------------------------------------------
@@ -471,9 +514,18 @@ function scaffolding($table = '')
 		{
 			show_error('You must include the name of the table you would like access when you initialize scaffolding');
 		}
-			
-		$this->CI->_ci_scaffolding = TRUE;
-		$this->CI->_ci_scaff_table = $table;
+		
+		if ($this->_ci_use_instance)
+		{
+			$CI =& get_instance();
+			$CI->_ci_scaffolding = TRUE;
+			$CI->_ci_scaff_table = $table;
+		}
+		else
+		{
+			$this->_ci_scaffolding = TRUE;
+			$this->_ci_scaff_table = $table;
+		}
 	}
 
 	// --------------------------------------------------------------------
@@ -491,14 +543,20 @@ function _ci_load($data)
 	{
 		// This allows anything loaded using $this->load (viwes, files, etc.)
 		// to become accessible from within the Controller and Model functions.
-		foreach (get_object_vars($this->CI) as $key => $var)
+		// Only needed when running PHP 5
+		
+		if ($this->_ci_use_instance)
 		{
-			if (is_object($var))
+			$CI =& get_instance();
+			foreach (get_object_vars($CI) as $key => $var)
 			{
-				$this->$key =& $this->CI->$key;
+				if ( ! isset($this->$key))
+				{
+					$this->$key =& $CI->$key;
+				}
 			}
 		}
-				
+		
 		// Set the default data variables
 		foreach (array('view', 'vars', 'path', 'return') as $val)
 		{
@@ -515,16 +573,16 @@ function _ci_load($data)
 		 */	
 		if (is_array($vars))
 		{
-			$this->cached_vars = array_merge($this->cached_vars, $vars);
+			$this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $vars);
 		}
-		extract($this->cached_vars);
+		extract($this->_ci_cached_vars);
 				
 		// Set the path to the requested file
 		if ($path == '')
 		{
 			$ext = pathinfo($view, PATHINFO_EXTENSION);
 			$file = ($ext == '') ? $view.EXT : $view;
-			$path = $this->view_path.$file;
+			$path = $this->_ci_view_path.$file;
 		}
 		else
 		{
@@ -572,14 +630,15 @@ function _ci_load($data)
 		 * it can be seen and included  properly by the first included 
 		 * template and any subsequent ones. Oy!
 		 *
-		 */		
-		if (ob_get_level() > $this->ob_level + 1)
+		 */	
+		if (ob_get_level() > $this->_ci_ob_level + 1)
 		{
 			ob_end_flush();
 		}
 		else
 		{
-			$this->CI->output->set_output(ob_get_contents());
+			global $OUT;
+			$OUT->set_output(ob_get_contents());
 			ob_end_clean();
 		}
 	}
@@ -682,18 +741,33 @@ function _ci_init_class($class, $prefix = '', $varname = NULL)
 		else
 		{
 			$class = strtolower($class);			
-			$classvar = ( ! isset($this->varmap[$class])) ? $class : $this->varmap[$class];
+			$classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class];
 		}
 		
-		// Instantiate the class
-		if ($config !== NULL)
+		// Instantiate the class		
+		if ($this->_ci_use_instance)
 		{
-			$this->CI->$classvar = new $name($config);
+			$CI =& get_instance();
+			if ($config !== NULL)
+			{
+				$CI->$classvar = new $name($config);
+			}
+			else
+			{		
+				$CI->$classvar = new $name;
+			}	
 		}
 		else
-		{		
-			$this->CI->$classvar = new $name;
-		}	
+		{
+			if ($config !== NULL)
+			{
+				$this->$classvar = new $name($config);
+			}
+			else
+			{		
+				$this->$classvar = new $name;
+			}	
+		}
 	} 	
 	
 	// --------------------------------------------------------------------
@@ -719,10 +793,21 @@ function _ci_autoloader()
 		
 		// Load any custome config file
 		if (count($autoload['config']) > 0)
-		{
-			foreach ($autoload['config'] as $key => $val)
+		{			
+			if ($this->_ci_use_instance)
+			{
+				$CI =& get_instance();
+				foreach ($autoload['config'] as $key => $val)
+				{
+					$CI->config->load($val);
+				}
+			}
+			else
 			{
-				$this->CI->config->load($val);
+				foreach ($autoload['config'] as $key => $val)
+				{
+					$this->config->load($val);
+				}			
 			}
 		}		
 
@@ -788,14 +873,26 @@ function _ci_autoloader()
 	 */
 	function _ci_assign_to_models()
 	{
-		if (count($this->models) == 0)
+		if (count($this->_ci_models) == 0)
 		{
 			return;
 		}
-		foreach ($this->models as $model)
-		{			
-			$this->CI->$model->_assign_libraries();			
-		}		
+
+		if ($this->_ci_use_instance)
+		{
+			$CI =& get_instance();
+			foreach ($this->_ci_models as $model)
+			{			
+				$CI->$model->_assign_libraries();			
+			}
+		}
+		else
+		{
+			foreach ($this->_ci_models as $model)
+			{			
+				$this->$model->_assign_libraries();			
+			}
+		}
 	}  	
 
 	// --------------------------------------------------------------------
diff --git a/system/libraries/Model.php b/system/libraries/Model.php
index 46f0367c..48615e07 100644
--- a/system/libraries/Model.php
+++ b/system/libraries/Model.php
@@ -51,8 +51,8 @@ function _assign_libraries($use_reference = TRUE)
 	{
 		$CI =& get_instance();
 		foreach (get_object_vars($CI) as $key => $var)
-		{
-			if (is_object($var) AND ! isset($this->$key))
+		{		
+			if ( ! isset($this->$key))
 			{
 				if ($use_reference === TRUE)
 				{
diff --git a/system/scaffolding/Scaffolding.php b/system/scaffolding/Scaffolding.php
index c046d228..6c4b3a53 100644
--- a/system/scaffolding/Scaffolding.php
+++ b/system/scaffolding/Scaffolding.php
@@ -56,7 +56,7 @@ function Scaffolding($db_table)
 		 * the load->view function knows where to look.
 		 */
 		 
-		$this->CI->load->view_path = BASEPATH.'scaffolding/views/';
+		$this->CI->load->_ci_view_path = BASEPATH.'scaffolding/views/';
 
 		// Set the base URL
 		$this->base_url = $this->CI->config->site_url().'/'.$this->CI->uri->segment(1).$this->CI->uri->slash_segment(2, 'both');
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 2a871acf..732e1c77 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -82,9 +82,9 @@ 
    Version 1.5.0
    
 
  • Added $query->free_result() to database class.
    • 
 
  • Added $query->field_names() function to database class
    • 
 
  • Added $this->db->platform() function
    • 
-
  • Added two more protocols to the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • 
 
  • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • 
-
  • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers.
    • 
+
  • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • 
+
  • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • 
 
  • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • 
 
  • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • 
 
  • Fixed a bug in the Email class related to SMTP Helo data.
    • 
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index 73bc4d60..fb3f4178 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -250,8 +250,11 @@ 
    Extending Native Libraries
    
 
 $this->load->library('my_email');
 
+
    Once loaded you will use the class variable as you normally would for the class you are extending.  In the case of 
+the email class all calls will use:
 
 
+$this->email->some_function();
 
 
 
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html
index 9d2a01e1..cd3e6644 100644
--- a/user_guide/libraries/calendar.html
+++ b/user_guide/libraries/calendar.html
@@ -75,8 +75,6 @@ 
    Initializing the Class
    
 $this->load->library('calendar');
 
    Once loaded, the Calendar object will be available using: $this->calendar
    
 
-
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
-
 
 
    Displaying a Calendar
    
 
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html
index 92d128cd..9be32cf4 100644
--- a/user_guide/libraries/encryption.html
+++ b/user_guide/libraries/encryption.html
@@ -110,8 +110,6 @@ 
    Initializing the Class
    
 $this->load->library('encrypt');
 
    Once loaded, the Encrypt library object will be available using: $this->encrypt
    
 
-
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
-
 
 
    $this->encrypt->encode()
    
 
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index b93d5fa7..347421d6 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -85,6 +85,10 @@ 
    $this->load->library('class_name')
    
 
 Each library is described in detail in its own page, so please read theinformation regarding each one you would like to use.
    
 
+
    Parameters can be passed to the library via an array in the second parameter. 
+
+
+
 
    If you would like your libraries assigned to a different variable name then the default you can specify the name in the second paramter:
    
 
 
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html
index 2f93baf0..ace408e0 100644
--- a/user_guide/libraries/parser.html
+++ b/user_guide/libraries/parser.html
@@ -103,7 +103,6 @@ 
    Initializing the Class
    
 
 $this->load->library('parser');
 
    Once loaded, the Parser library object will be available using: $this->parser
    
-
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
 
 
 
    The following functions are available in this library:
    
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
index 7a894fae..5a1216f6 100644
--- a/user_guide/libraries/sessions.html
+++ b/user_guide/libraries/sessions.html
@@ -87,7 +87,6 @@ 
    Initializing a Session
    
 
 $this->load->library('session');
 
    Once loaded, the Sessions library object will be available using: $this->session
    
-
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
 
 
 
    How do Sessions work?
    
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html
index c2e32399..61b5ce82 100644
--- a/user_guide/libraries/table.html
+++ b/user_guide/libraries/table.html
@@ -72,8 +72,6 @@ 
    Initializing the Class
    
 $this->load->library('table');
 
    Once loaded, the Table library object will be available using: $this->table
    
 
-
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
-
 
 
    Examples
    
 
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html
index 87f6f3a0..0621d4e7 100644
--- a/user_guide/libraries/trackback.html
+++ b/user_guide/libraries/trackback.html
@@ -74,7 +74,6 @@ 
    Initializing the Class
    
 
 $this->load->library('trackback');
 
    Once loaded, the Trackback library object will be available using: $this->trackback
    
-
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
 
 
 
    Sending Trackbacks
    
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
index 9951c824..45b92abb 100644
--- a/user_guide/libraries/unit_testing.html
+++ b/user_guide/libraries/unit_testing.html
@@ -78,7 +78,6 @@ 
    Initializing the Class
    
 
 $this->load->library('unit_test');
 
    Once loaded, the Unit Test object will be available using: $this->unit
    
-
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
 
 
 
    Running Tests
    
diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html
index 50f4b77f..8f3eb07d 100644
--- a/user_guide/libraries/user_agent.html
+++ b/user_guide/libraries/user_agent.html
@@ -72,7 +72,6 @@ 
    Initializing the Class
    
 
 $this->load->library('user_agent');
 
    Once loaded, the object will be available using: $this->agent
    
-
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
 
 
    User Agent Definitions
    
 
diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html
index 32ef3bed..d072a570 100644
--- a/user_guide/libraries/zip.html
+++ b/user_guide/libraries/zip.html
@@ -71,7 +71,6 @@ 
    Initializing the Class
    
 
 $this->load->library('zip');
 
    Once loaded, the Zip library object will be available using: $this->zip
    
-
    You can also set your own class variable name.  Please see the Loader Class for more info.
    
 
 
 
    Usage Example
    

From 34f7f2d0a84c59233689908c11d8d2c6c5ba0875 Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 10 Oct 2006 08:06:42 +0000
Subject: [PATCH 0312/2544]

---
 system/codeigniter/Base4.php    |  1 -
 system/libraries/Controller.php |  3 +-
 system/libraries/Loader.php     | 77 +++++++++++++++++++++++----------
 3 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php
index 115c1072..8b3dc92f 100644
--- a/system/codeigniter/Base4.php
+++ b/system/codeigniter/Base4.php
@@ -56,7 +56,6 @@ function &get_instance()
 	
 	if (is_object($CI)) 
 	{
-		$CI->_ci_use_instance = TRUE;
 		return $CI;
 	}
 	
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index c80097a1..7a3f5e5d 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -32,6 +32,8 @@ class Controller extends CI_Base {
 	var $_ci_scaffolding	= FALSE;
 	var $_ci_scaff_table	= FALSE;
 	
+
+	
 	/**
 	 * Constructor
 	 *
@@ -80,7 +82,6 @@ function _ci_initialize()
 		if (floor(phpversion()) >= 5)
 		{
 			$this->load = new CI_Loader();
-			$this->load->_ci_use_instance = TRUE;
 			$this->load->_ci_autoloader();
 		}
 		else
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 1738438e..43d1cbec 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -28,8 +28,11 @@
  */
 class CI_Loader {
 
+	// All these are set automatically. Don't mess with them.
 	var $_ci_ob_level;
 	var $_ci_view_path		= '';
+	var $_ci_is_php5		= FALSE;
+	var $_ci_use_instance 	= FALSE; // Whether we should use $this or $CI =& get_instance()
 	var $_ci_cached_vars	= array();
 	var $_ci_models			= array();
 	var $_ci_helpers		= array();
@@ -37,20 +40,17 @@ class CI_Loader {
 	var $_ci_scripts		= array();
 	var $_ci_varmap			= array('unit_test' => 'unit', 'user_agent' => 'agent');
 	
-	var $_ci_use_instance 	= FALSE; 	// This variable determines whether we should 
-										// use $this or $CI =& get_instance()  
-										// throughout this class. Don't mess with it. 
 
 	/**
 	 * Constructor
 	 *
-	 * Sets the path to the view files and gets the initial output
-	 * buffering level
+	 * Sets the path to the view files and gets the initial output buffering level
 	 *
 	 * @access	public
 	 */
 	function CI_Loader()
 	{	
+		$this->_ci_is_php5 = (floor(phpversion()) >= 5) ? TRUE : FALSE;
 		$this->_ci_view_path = APPPATH.'views/';
 		$this->_ci_ob_level  = ob_get_level();
 				
@@ -119,7 +119,7 @@ function model($model, $name = '', $db_conn = FALSE)
 			return;
 		}
 		
-		if ($this->_ci_use_instance)
+		if ($this->_ci_use_instance())
 		{
 			$CI =& get_instance();
 			if (isset($CI->$name))
@@ -147,7 +147,7 @@ function model($model, $name = '', $db_conn = FALSE)
 			if ($db_conn === TRUE)
 				$db_conn = '';
 		
-			if ($this->_ci_use_instance)
+			if ($this->_ci_use_instance())
 			{
 				$CI->load->database($db_conn, FALSE, TRUE);
 			}
@@ -165,20 +165,34 @@ function model($model, $name = '', $db_conn = FALSE)
 		require_once(APPPATH.'models/'.$path.$model.EXT);
 
 		$model = ucfirst($model);
-		
-		if ($this->_ci_use_instance)
+				
+		if ($this->_ci_use_instance())
 		{
-			$CI->$name = new $model();
+			$CI->$name = new $model();	
+			foreach (get_object_vars($CI) as $key => $var)
+			{		
+				if ( ! isset($CI->$name->$key))
+				{
+					$CI->$name->$key =& $CI->$key;						
+				}				
+			}			
 		}
 		else
 		{
 			$this->$name = new $model();
-		}
+			foreach (get_object_vars($this) as $key => $var)
+			{			
+				if ( ! isset($this->$name->$key))
+				{
+					$this->$name->$key =& $CI->$key;						
+				}				
+			}			
+		}		
 		
 		$this->_ci_models[] = $name;
-		$this->_ci_assign_to_models();
 	}
 	
+	
 	// --------------------------------------------------------------------
 	
 	/**
@@ -458,7 +472,7 @@ function script($scripts = array())
 	 */
 	function language($file = '', $lang = '', $return = FALSE)
 	{
-		if ($this->_ci_use_instance)
+		if ($this->_ci_use_instance())
 		{
 			$CI =& get_instance();
 			return $CI->lang->load($file, $lang, $return);
@@ -480,7 +494,7 @@ function language($file = '', $lang = '', $return = FALSE)
 	 */
 	function config($file = '')
 	{		
-		if ($this->_ci_use_instance)
+		if ($this->_ci_use_instance())
 		{
 			$CI =& get_instance();
 			$CI->config->load($file);
@@ -515,7 +529,7 @@ function scaffolding($table = '')
 			show_error('You must include the name of the table you would like access when you initialize scaffolding');
 		}
 		
-		if ($this->_ci_use_instance)
+		if ($this->_ci_use_instance())
 		{
 			$CI =& get_instance();
 			$CI->_ci_scaffolding = TRUE;
@@ -545,7 +559,7 @@ function _ci_load($data)
 		// to become accessible from within the Controller and Model functions.
 		// Only needed when running PHP 5
 		
-		if ($this->_ci_use_instance)
+		if ($this->_ci_use_instance())
 		{
 			$CI =& get_instance();
 			foreach (get_object_vars($CI) as $key => $var)
@@ -627,7 +641,7 @@ function _ci_load($data)
 		 * In order to permit views to be nested within
 		 * other views, we need to flush the content back out whenever 
 		 * we are beyond the first level of output buffering so that 
-		 * it can be seen and included  properly by the first included 
+		 * it can be seen and included properly by the first included 
 		 * template and any subsequent ones. Oy!
 		 *
 		 */	
@@ -637,6 +651,7 @@ function _ci_load($data)
 		}
 		else
 		{
+			// PHP 4 requires that we use a global
 			global $OUT;
 			$OUT->set_output(ob_get_contents());
 			ob_end_clean();
@@ -745,7 +760,7 @@ function _ci_init_class($class, $prefix = '', $varname = NULL)
 		}
 		
 		// Instantiate the class		
-		if ($this->_ci_use_instance)
+		if ($this->_ci_use_instance())
 		{
 			$CI =& get_instance();
 			if ($config !== NULL)
@@ -794,7 +809,7 @@ function _ci_autoloader()
 		// Load any custome config file
 		if (count($autoload['config']) > 0)
 		{			
-			if ($this->_ci_use_instance)
+			if ($this->_ci_use_instance())
 			{
 				$CI =& get_instance();
 				foreach ($autoload['config'] as $key => $val)
@@ -867,7 +882,7 @@ function _ci_autoloader()
 	 * Makes sure that anything loaded by the loader class (libraries, plugins, etc.)
 	 * will be available to modles, if any exist.
 	 *
-	 * @access	public
+	 * @access	private
 	 * @param	object
 	 * @return	array
 	 */
@@ -878,7 +893,7 @@ function _ci_assign_to_models()
 			return;
 		}
 
-		if ($this->_ci_use_instance)
+		if ($this->_ci_use_instance())
 		{
 			$CI =& get_instance();
 			foreach ($this->_ci_models as $model)
@@ -902,7 +917,7 @@ function _ci_assign_to_models()
 	 *
 	 * Takes an object as input and convers the class variables to array key/vals
 	 *
-	 * @access	public
+	 * @access	private
 	 * @param	object
 	 * @return	array
 	 */
@@ -911,6 +926,24 @@ function _ci_object_to_array($object)
 		return (is_object($object)) ? get_object_vars($object) : $object;
 	}
 
+	// --------------------------------------------------------------------
+
+	/**
+	 * Determines whether we should use the CI instance or $this
+	 *
+	 * @access	private
+	 * @return	bool
+	 */
+	function _ci_use_instance()
+	{
+		if ($this->_ci_is_php5 == TRUE)
+		{
+			return TRUE;
+		}
+	
+		global $CI;
+		return (is_object($CI)) ? TRUE : FALSE;
+	}
 	
 }
 ?>
\ No newline at end of file

From 1e3039878265b09e85f14e6b5ad3fbb6d4aa24c3 Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 10 Oct 2006 16:35:43 +0000
Subject: [PATCH 0313/2544]

---
 system/libraries/Loader.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 43d1cbec..96ec0c91 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -32,7 +32,7 @@ class CI_Loader {
 	var $_ci_ob_level;
 	var $_ci_view_path		= '';
 	var $_ci_is_php5		= FALSE;
-	var $_ci_use_instance 	= FALSE; // Whether we should use $this or $CI =& get_instance()
+	var $_ci_is_instance 	= FALSE; // Whether we should use $this or $CI =& get_instance()
 	var $_ci_cached_vars	= array();
 	var $_ci_models			= array();
 	var $_ci_helpers		= array();
@@ -119,7 +119,7 @@ function model($model, $name = '', $db_conn = FALSE)
 			return;
 		}
 		
-		if ($this->_ci_use_instance())
+		if ($this->_ci_is_instance())
 		{
 			$CI =& get_instance();
 			if (isset($CI->$name))
@@ -147,7 +147,7 @@ function model($model, $name = '', $db_conn = FALSE)
 			if ($db_conn === TRUE)
 				$db_conn = '';
 		
-			if ($this->_ci_use_instance())
+			if ($this->_ci_is_instance())
 			{
 				$CI->load->database($db_conn, FALSE, TRUE);
 			}
@@ -166,7 +166,7 @@ function model($model, $name = '', $db_conn = FALSE)
 
 		$model = ucfirst($model);
 				
-		if ($this->_ci_use_instance())
+		if ($this->_ci_is_instance())
 		{
 			$CI->$name = new $model();	
 			foreach (get_object_vars($CI) as $key => $var)
@@ -472,7 +472,7 @@ function script($scripts = array())
 	 */
 	function language($file = '', $lang = '', $return = FALSE)
 	{
-		if ($this->_ci_use_instance())
+		if ($this->_ci_is_instance())
 		{
 			$CI =& get_instance();
 			return $CI->lang->load($file, $lang, $return);
@@ -494,7 +494,7 @@ function language($file = '', $lang = '', $return = FALSE)
 	 */
 	function config($file = '')
 	{		
-		if ($this->_ci_use_instance())
+		if ($this->_ci_is_instance())
 		{
 			$CI =& get_instance();
 			$CI->config->load($file);
@@ -529,7 +529,7 @@ function scaffolding($table = '')
 			show_error('You must include the name of the table you would like access when you initialize scaffolding');
 		}
 		
-		if ($this->_ci_use_instance())
+		if ($this->_ci_is_instance())
 		{
 			$CI =& get_instance();
 			$CI->_ci_scaffolding = TRUE;
@@ -559,7 +559,7 @@ function _ci_load($data)
 		// to become accessible from within the Controller and Model functions.
 		// Only needed when running PHP 5
 		
-		if ($this->_ci_use_instance())
+		if ($this->_ci_is_instance())
 		{
 			$CI =& get_instance();
 			foreach (get_object_vars($CI) as $key => $var)
@@ -760,7 +760,7 @@ function _ci_init_class($class, $prefix = '', $varname = NULL)
 		}
 		
 		// Instantiate the class		
-		if ($this->_ci_use_instance())
+		if ($this->_ci_is_instance())
 		{
 			$CI =& get_instance();
 			if ($config !== NULL)
@@ -809,7 +809,7 @@ function _ci_autoloader()
 		// Load any custome config file
 		if (count($autoload['config']) > 0)
 		{			
-			if ($this->_ci_use_instance())
+			if ($this->_ci_is_instance())
 			{
 				$CI =& get_instance();
 				foreach ($autoload['config'] as $key => $val)
@@ -893,7 +893,7 @@ function _ci_assign_to_models()
 			return;
 		}
 
-		if ($this->_ci_use_instance())
+		if ($this->_ci_is_instance())
 		{
 			$CI =& get_instance();
 			foreach ($this->_ci_models as $model)
@@ -934,7 +934,7 @@ function _ci_object_to_array($object)
 	 * @access	private
 	 * @return	bool
 	 */
-	function _ci_use_instance()
+	function _ci_is_instance()
 	{
 		if ($this->_ci_is_php5 == TRUE)
 		{

From 7099a589d1719311427d7552523ec962ebc3b650 Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 10 Oct 2006 17:47:59 +0000
Subject: [PATCH 0314/2544]

---
 system/codeigniter/Base4.php                  |  4 +--
 system/codeigniter/CodeIgniter.php            | 20 ++++++-------
 system/codeigniter/Common.php                 | 28 +++++++++++--------
 system/database/DB_driver.php                 | 12 +++++---
 system/database/DB_utility.php                |  3 +-
 system/database/drivers/oci8/oci8_driver.php  |  3 +-
 .../drivers/postgre/postgre_utility.php       |  2 +-
 system/libraries/Config.php                   |  2 +-
 system/libraries/Controller.php               |  2 +-
 system/libraries/Hooks.php                    |  2 +-
 system/libraries/Input.php                    |  5 ++--
 system/libraries/Log.php                      |  2 +-
 system/libraries/Output.php                   |  4 +--
 system/libraries/Router.php                   |  2 +-
 system/libraries/URI.php                      |  2 +-
 user_guide/general/changelog.html             |  2 +-
 16 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php
index 8b3dc92f..9366b458 100644
--- a/system/codeigniter/Base4.php
+++ b/system/codeigniter/Base4.php
@@ -21,8 +21,8 @@
  * This file is used only when Code Igniter is being run under PHP 4.
  * 
  * In order to allow CI to work under PHP 4 we had to make the Loader class 
- * the parent class of the Controller Base class.  It's the only way we 
- * could enable functions like $this->load->library('email') to instantiate 
+ * the parent of the Controller Base class.  It's the only way we enabled
+ * enable functions like $this->load->library('email') to instantiate 
  * classes that can then be used within controllers as $this->email->send()
  *
  * PHP 4 also has trouble referencing the CI super object within application 
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 63ae4586..611b1a62 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -50,7 +50,7 @@
  * ------------------------------------------------------
  */
 
-$BM =& _load_class('Benchmark');
+$BM =& load_class('Benchmark');
 $BM->mark('total_execution_time_start');
 $BM->mark('loading_time_base_clases_start');
 
@@ -60,7 +60,7 @@
  * ------------------------------------------------------
  */
 
-$EXT =& _load_class('Hooks');
+$EXT =& load_class('Hooks');
 
 /*
  * ------------------------------------------------------
@@ -75,9 +75,9 @@
  * ------------------------------------------------------
  */
 
-$CFG =& _load_class('Config');
-$RTR =& _load_class('Router');
-$OUT =& _load_class('Output');
+$CFG =& load_class('Config');
+$RTR =& load_class('Router');
+$OUT =& load_class('Output');
 
 /*
  * ------------------------------------------------------
@@ -99,9 +99,9 @@
  * ------------------------------------------------------
  */
 
-$IN		=& _load_class('Input');
-$URI	=& _load_class('URI');
-$LANG	=& _load_class('Language');
+$IN		=& load_class('Input');
+$URI	=& load_class('URI');
+$LANG	=& load_class('Language');
 
 /*
  * ------------------------------------------------------
@@ -116,7 +116,7 @@
  * 
  */
  
-_load_class('Loader', FALSE); 
+load_class('Loader', FALSE); 
   
 if (floor(phpversion()) < 5)
 {
@@ -127,7 +127,7 @@
 	require(BASEPATH.'codeigniter/Base5'.EXT);
 }
 
-_load_class('Controller', FALSE); 
+load_class('Controller', FALSE); 
 
 require(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT);
 
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index a801c082..8ac80d63 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -41,7 +41,7 @@
 * @param	bool	optional flag that lets classes get loaded but not instantiated
 * @return	object
 */
-function _load_class($class, $instantiate = TRUE)
+function &load_class($class, $instantiate = TRUE)
 {
 	static $objects = array();
 
@@ -55,7 +55,8 @@ function _load_class($class, $instantiate = TRUE)
 	// which we don't need to load.  We only instantiate it.
 	if ($class == 'Instance')
 	{
-		return $objects[$class] =& new $class();	
+		$objects[$class] =& new $class();
+		return $objects[$class];
 	}
 		
 	// If the requested class does not exist in the application/libraries
@@ -104,18 +105,21 @@ function _load_class($class, $instantiate = TRUE)
 
 	if ($instantiate == FALSE)
 	{
-		return $objects[$class] = TRUE;
+		$objects[$class] = TRUE;
+		return $objects[$class];
 	}
 		
 	if ($is_subclass == TRUE)
 	{
 		$name = 'MY_'.$class;
-		return $objects[$class] =& new $name();
+		$objects[$class] =& new $name();
+		return $objects[$class];
 	}
 
 	$name = ($class != 'Controller') ? 'CI_'.$class : $class;
 	
-	return $objects[$class] =& new $name();	
+	$objects[$class] =& new $name();
+	return $objects[$class];
 }
 
 /**
@@ -124,7 +128,7 @@ function _load_class($class, $instantiate = TRUE)
 * @access	private
 * @return	array
 */
-function &_get_config()
+function &get_config()
 {
 	static $main_conf;
 		
@@ -162,7 +166,7 @@ function &_get_config()
 */
 function show_error($message)
 {
-	$error =& _load_class('Exceptions');
+	$error =& load_class('Exceptions');
 	echo $error->show_error('An Error Was Encountered', $message);
 	exit;
 }
@@ -180,7 +184,7 @@ function show_error($message)
 */
 function show_404($page = '')
 {
-	$error =& _load_class('Exceptions');
+	$error =& load_class('Exceptions');
 	$error->show_404($page);
 	exit;
 }
@@ -199,13 +203,13 @@ function log_message($level = 'error', $message, $php_error = FALSE)
 {
 	static $LOG;
 	
-	$config =& _get_config();
+	$config = get_config();
 	if ($config['log_errors'] === FALSE)
 	{
 		return;
 	}
 
-	$LOG =& _load_class('Log');	
+	$LOG =& load_class('Log');	
 	$LOG->write_log($level, $message, $php_error);
 }
 
@@ -238,7 +242,7 @@ function _exception_handler($severity, $message, $filepath, $line)
 		return;
 	}
 
-	$error =& _load_class('Exceptions');
+	$error =& load_class('Exceptions');
 
 	// Should we display the error?  
 	// We'll get the current error_reporting level and add its bits
@@ -250,7 +254,7 @@ function _exception_handler($severity, $message, $filepath, $line)
 	}
 	
 	// Should we log the error?  No?  We're done...
-	$config =& _get_config();
+	$config = get_config();
 	if ($config['log_errors'] === FALSE)
 	{
 		return;
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index c8a00b7b..99c95a6f 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -682,7 +682,8 @@ function list_tables()
 			}
 		}
 
-		return $this->data_cache['table_names'] =& $retval;
+		$this->data_cache['table_names'] = $retval;
+		return $this->data_cache['table_names'];
 	}
 	
 	// --------------------------------------------------------------------
@@ -747,7 +748,8 @@ function list_fields($table = '')
 			}		
 		}
 		
-		return $this->data_cache['field_names'][$table] =& $retval;
+		$this->data_cache['field_names'][$table] = $retval;
+		return $this->data_cache['field_names'][$table];
 	}
 
 	// --------------------------------------------------------------------
@@ -931,7 +933,8 @@ function cache_set_path($path = '')
 	 */		
 	function cache_on()
 	{
-		return $this->cache_on = TRUE;
+		$this->cache_on = TRUE;
+		return TRUE;
 	}
 
 	// --------------------------------------------------------------------
@@ -944,7 +947,8 @@ function cache_on()
 	 */	
 	function cache_off()
 	{
-		return $this->cache_on = FALSE;
+		$this->cache_on = FALSE;
+		return FALSE;
 	}
 	
 
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index c2c5f1fe..51e43a7c 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -110,7 +110,8 @@ function list_databases()
 			}
 		}
 			
-		return $this->data_cache['db_names'] =& $dbs;
+		$this->data_cache['db_names'] = $dbs;
+		return $this->data_cache['db_names'];
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index e83c640b..794405a0 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -163,7 +163,8 @@ function _prep_query($sql)
      */
     function get_cursor()
     {
-		return $this->curs_id = ocinewcursor($this->conn_id);
+		$this->curs_id = ocinewcursor($this->conn_id);
+		return $this->curs_id;
     }
 
     // --------------------------------------------------------------------
diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php
index 0c265de1..b08b879d 100644
--- a/system/database/drivers/postgre/postgre_utility.php
+++ b/system/database/drivers/postgre/postgre_utility.php
@@ -106,7 +106,7 @@ function _optimize_table($table)
 	 */
 	function _repair_table($table)
 	{
-		return return FALSE;
+		return FALSE;
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index 26770cc4..82836b1f 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -44,7 +44,7 @@ class CI_Config {
      */
 	function CI_Config()
 	{
-		$this->config =& _get_config();
+		$this->config = get_config();
 		log_message('debug', "Config Class Initialized");
 	}
   	// END CI_Config()
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 7a3f5e5d..938c46e4 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -73,7 +73,7 @@ function _ci_initialize()
 		
 		foreach ($classes as $var => $class)
 		{
-			$this->$var =& _load_class($class);
+			$this->$var =& load_class($class);
 		}
 		
 		
diff --git a/system/libraries/Hooks.php b/system/libraries/Hooks.php
index 8767e10d..e2d0500c 100644
--- a/system/libraries/Hooks.php
+++ b/system/libraries/Hooks.php
@@ -53,7 +53,7 @@ function CI_Hooks()
 	 */  	
   	function _initialize()
   	{
-		$CFG =& _load_class('Config');
+		$CFG =& load_class('Config');
 		
 		// If hooks are not enabled in the config file
 		// there is nothing else to do
diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index 0d3c87b4..72344e34 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -44,7 +44,7 @@ function CI_Input()
 	{	
 		log_message('debug', "Input Class Initialized");
 	
-		$CFG =& _load_class('Config');
+		$CFG =& load_class('Config');
 		$this->use_xss_clean	= ($CFG->item('global_xss_filtering') === TRUE) ? TRUE : FALSE;
 		$this->allow_get_array	= ($CFG->item('enable_query_strings') === TRUE) ? TRUE : FALSE;		
 		$this->_sanitize_globals();
@@ -306,7 +306,8 @@ function ip_address()
 		
 		if ($this->ip_address === FALSE)
 		{
-			return $this->ip_address = '0.0.0.0';
+			$this->ip_address = '0.0.0.0';
+			return $this->ip_address;
 		}
 		
 		if (strstr($this->ip_address, ','))
diff --git a/system/libraries/Log.php b/system/libraries/Log.php
index eff7cb7f..09538fa0 100644
--- a/system/libraries/Log.php
+++ b/system/libraries/Log.php
@@ -42,7 +42,7 @@ class CI_Log {
 	 */
 	function CI_Log()
 	{
-		$config =& _get_config();
+		$config = get_config();
 		
 		$this->log_path = ($config['log_path'] != '') ? $config['log_path'] : BASEPATH.'logs/';
 		
diff --git a/system/libraries/Output.php b/system/libraries/Output.php
index 507beab5..7e859453 100644
--- a/system/libraries/Output.php
+++ b/system/libraries/Output.php
@@ -299,8 +299,8 @@ function _write_cache($output)
 	 */	
 	function _display_cache(&$CFG, &$RTR)
 	{
-		$CFG =& _load_class('Config');
-		$RTR =& _load_class('Router');
+		$CFG =& load_class('Config');
+		$RTR =& load_class(('Router');
 	
 		$cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path');
 			
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 27e3c27c..dab84883 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -48,7 +48,7 @@ class CI_Router {
 	 */
 	function CI_Router()
 	{
-		$this->config =& _load_class('Config');
+		$this->config =& load_class('Config');
 		$this->_set_route_mapping();
 		log_message('debug', "Router Class Initialized");
 	}
diff --git a/system/libraries/URI.php b/system/libraries/URI.php
index 80b11266..fcf6afe4 100644
--- a/system/libraries/URI.php
+++ b/system/libraries/URI.php
@@ -42,7 +42,7 @@ class CI_URI {
 	 */		
 	function CI_URI()
 	{
-		$this->router =& _load_class('Router');	
+		$this->router =& load_class('Router');	
 		log_message('debug', "URI Class Initialized");
 	}
 	
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 732e1c77..9836671e 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -116,7 +116,7 @@ 
    Version 1.4.1
    
 
  • Removed the is_numeric test from the db->escape() function.
    • 
 
  • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • 
 
  • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • 
-
  • Fixed a bug that was causing a PHP error when the Exceptions class was called within the _get_config() function since it was causing problems.
    • 
+
  • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • 
 
  • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • 
 
  • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • 
 
  • Added some code to allow email attachments to be reset when sending batches of email.
    • 

From adb899a14b65e553d24eabd9de0d38c6dd5d340c Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 10 Oct 2006 23:11:33 +0000
Subject: [PATCH 0315/2544]

---
 user_guide/database/caching.html | 46 ++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html
index 05c6b330..0e31eac2 100644
--- a/user_guide/database/caching.html
+++ b/user_guide/database/caching.html
@@ -81,7 +81,7 @@ 
    Enabling Caching
    
 
  • Enable the caching feature, either globally by setting the preference in your application/config/database.php file, or manually as described below.
    • 
 
 
-
    Once enabled, caching will happen automatically whenever a web pages that contains database queries is loaded.
    
+
    Once enabled, caching will happen automatically whenever a page is loaded that contains database queries.
    
 
 
 
    How Does Caching Work?
    
@@ -103,11 +103,11 @@ 
    Will Caching Improve Your Site's Performance?
    
 
 
    Getting a performance gain as a result of caching depends on many factors. 
 If you have a highly optimized database under very little load, you probably won't see a performance boost.
-If your database is under heavy use you probably will see an improved response, assuming your filesystem is not 
+If your database is under heavy use you probably will see an improved response, assuming your file-system is not 
 overly taxed.  Remember that caching simply changes how your information is retrieved, shifting it from being a database
-operation to a filesystem one.
    
+operation to a file-system one.
    
 
-
    In some clustered server environments, for example, caching may be detrimental since filesystem operations are so intense.
+
    In some clustered server environments, for example, caching may be detrimental since file-system operations are so intense.
 On single servers in shared environments, caching will probably be beneficial. Unfortunately there is no
 single answer to the question of whether you should cache your database.  It really depends on your situation.
    
 
@@ -119,7 +119,7 @@ 
    How are Cache Files Stored?
    
 
 
    For example, let's say you have a controller called blog with a function called comments that
 contains three queries.  The caching system will create a cache folder 
-called blog_comments, into which it will write three cache files.
    
+called blog+comments, into which it will write three cache files.
    
 
 
    If you use dynamic queries that change based on information in your URI (when using pagination, for example), each instance of
 the query will produce its own cache file.  It's possible, therefore, to end up with many times more cache files than you have 
@@ -158,8 +158,44 @@ 
    Function Reference
    
 
 
 
+
    $this->db->cache_on()  /   $this->db->cache_off()
    
 
+
    Manually enables/disables caching.  This can be useful if you want to
+keep certain queries from being cached.  Example:
    
 
+
+// Turn caching on
    
+$this->db->cache_on();
    
+$query = $this->db->query("SELECT * FROM mytable");
    
+
    
+// Turn caching off for this one query
    
+$this->db->cache_off();
    
+$query = $this->db->query("SELECT * FROM members WHERE member_id = '$current_user'");
    
+
    
+// Turn caching back on
    
+$this->db->cache_on();
    
+$query = $this->db->query("SELECT * FROM another_table");
+    
+
+
+
    $this->db->cache_delete()
    
+
+
    Deletes the cache files associated with a particular page. This is useful if you need to clear caching after you update your database.
    
+
+
    The caching system saves your cache files to folders that correspond to the URI of the page you are viewing.  For example, if you are viewing
+a page at www.your-site.com/index.php/blog/comments, the caching system will put all cache files associated with it in a folder
+called blog+comments.  To delete those particular cache files you will use:
    
+
+$this->db->cache_delete('blog', 'comments');
+
+
    If you do not use any parameters the current URI will be used when determining what should be cleared.
    
+
+
+
    $this->db->cache_delete_all()
    
+
+
    Clears all existing cache files.  Example:
    
+
+$this->db->cache_delete_all();
 
 
 

From f66de86a85676771d61759fb63e851fc496b0a3b Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 10 Oct 2006 23:30:04 +0000
Subject: [PATCH 0316/2544]

---
 user_guide/database/utilities.html | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html
index 68cf7ffb..1fdc4b00 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -138,12 +138,15 @@ 
    $this->dbutil->list_databases()
    
 
 
    $this->dbutil->optimize_table('table_name');
    
 
+
    Note:  This features is only available for MySQL/MySQLi databases.
    
+
+
 
    Permits you to optimize a table using the table name specified in the first parameter. Returns TRUE/FALSE based on success or failure:
    
 
 
 if ($this->dbutil->optimize_table('table_name'))
    
 {
    
-    echo 'Success!'
    
+    echo 'Success!';
    
 }
     
 
@@ -153,12 +156,15 @@ 
    $this->dbutil->optimize_table('table_name');
    
 
 
    $this->dbutil->repair_table('table_name');
    
 
+
    Note:  This features is only available for MySQL/MySQLi databases.
    
+
+
 
    Permits you to repair a table using the table name specified in the first parameter. Returns TRUE/FALSE based on success or failure:
    
 
 
 if ($this->dbutil->optimize_table('table_name'))
    
 {
    
-    echo 'Success!'
    
+    echo 'Success!';
    
 }
     
 
@@ -168,10 +174,12 @@ 
    $this->dbutil->repair_table('table_name');
    
 
 
    $this->dbutil->optimize_database();
    
 
+
    Note:  This features is only available for MySQL/MySQLi databases.
    
+
 
    Permits you to optimize the database your DB class is currently connected to. Returns an array containing the returned status messages or FALSE on failure.
    
 
 
-$result = $this->dbutil->optimize_databass();
    
+$result = $this->dbutil->optimize_database();
    
 
    
 if ($result !== FALSE)
    
 {
    
@@ -206,7 +214,7 @@ 
    $this->dbutil->csv_from_result($db_result)
    
 echo $this->dbutil->csv_from_result($query, $delimiter, $newline);
     
 
-
    Important:  This function will NOT write the CSV file for you.  It simply creates the CSV layout.
+
    Important:  This function will NOT write the CSV file for you.  It simply creates the CSV layout.
 If you need to write the file use the File Helper.
    
 
 
@@ -231,7 +239,7 @@ 
    $this->dbutil->xml_from_result($db_result)
    
 echo $this->dbutil->xml_from_result($query, $config);
     
 
-
    Important:  This function will NOT write the XML file for you.  It simply creates the XML layout.
+
    Important:  This function will NOT write the XML file for you.  It simply creates the XML layout.
 If you need to write the file use the File Helper.
    
 
 
@@ -240,6 +248,8 @@ 
    $this->dbutil->backup()
    
 
 
    Permits you to backup your full database or individual tables.  The backup data can be compressed in either Zip or Gzip format.
    
 
+
    Note:  This features is only available for MySQL/MySQLi databases.
    
+
 
    Note: Due to the limited execution time and memory available to PHP, backing up very large
 databases may not be possible.  If your database is very large you might need to backup directly from your SQL server 
 via the command line, or have your server admin do it for you if you do not have root privileges.
    

From 1b0ab4665720446eee6b03f864bb5576e6065a4a Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 10 Oct 2006 23:30:21 +0000
Subject: [PATCH 0317/2544]

---
 system/database/DB_driver.php  | 4 ++--
 system/database/DB_utility.php | 8 ++++----
 system/libraries/Output.php    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 99c95a6f..6da645a3 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -960,13 +960,13 @@ function cache_off()
 	 * @access	public
 	 * @return	void
 	 */		
-	function cache_delete()
+	function cache_delete($segment_one = '', $segment_two = '')
 	{
 		if ( ! $this->_cache_init())
 		{
 			return FALSE;
 		}
-		return $this->CACHE->delete();
+		return $this->CACHE->delete($segment_one, $segment_two);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 51e43a7c..13fcaa5c 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -37,7 +37,7 @@ function CI_DB_utility()
 	{
 		// Assign the main database object to $this->db
 		$CI =& get_instance();
-		$this->CI =& $obj->db;
+		$this->db =& $CI->db;
 		
 		log_message('debug', "Database Utility Class Initialized");
 	}
@@ -100,7 +100,7 @@ function list_databases()
 			return $this->data_cache['db_names'];
 		}
 	
-		$query = $this->db->query($this->_list_database());
+		$query = $this->db->query($this->_list_databases());
 		$dbs = array();
 		if ($query->num_rows() > 0)
 		{
@@ -147,7 +147,7 @@ function optimize_table($table_name)
 	function optimize_database()
 	{
 		$result = array();
-		foreach ($this->list_tables() as $table_name)
+		foreach ($this->db->list_tables() as $table_name)
 		{
 			$sql = $this->_optimize_table($table_name);
 			
@@ -356,7 +356,7 @@ function backup($params = array())
 		// If no table names were submitted we'll fetch the entire table list
 		if (count($prefs['tables']) == 0)
 		{
-			$prefs['tables'] = $this->list_tables();
+			$prefs['tables'] = $this->db->list_tables();
 		}
 		
 		// ------------------------------------------------------
diff --git a/system/libraries/Output.php b/system/libraries/Output.php
index 7e859453..9c48bbb8 100644
--- a/system/libraries/Output.php
+++ b/system/libraries/Output.php
@@ -300,7 +300,7 @@ function _write_cache($output)
 	function _display_cache(&$CFG, &$RTR)
 	{
 		$CFG =& load_class('Config');
-		$RTR =& load_class(('Router');
+		$RTR =& load_class('Router');
 	
 		$cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path');
 			

From a33ec0a3efc6e1c623966a210a83a67e1e253b9f Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 10 Oct 2006 23:38:05 +0000
Subject: [PATCH 0318/2544]

---
 user_guide/database/transactions.html | 4 ++--
 user_guide/general/changelog.html     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html
index cf095ea8..8077155e 100644
--- a/user_guide/database/transactions.html
+++ b/user_guide/database/transactions.html
@@ -67,11 +67,11 @@
 
    Transactions
    
 
 
    Code Igniter's database abstraction allows you to use transactions with databases that support transaction-safe table types.  In MySQL, you'll need
-to be running InnoDB or BDB table types rather then the more common MyISAM.  Most other databases support transactions natively.
    
+to be running InnoDB or BDB table types rather then the more common MyISAM.  Most other database platforms support transactions natively.
    
 
 
    If you are not familiar with 
 transactions we recommend you find a good online resource to learn about them for your particular database.  The information below assumes you 
-have a basic understanding of transactions.  For most sites, however, transactions won't be necessary.
+have a basic understanding of transactions.
 
    
 
 
    Code Igniter's Approach to Transactions
    
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 9836671e..81dbcff9 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -63,8 +63,8 @@
 
    Change Log
    
 
 
-
    Version 1.5.0
    
-
    Release Date: October 15, 2006
    
+
    Version 1.5.0 Beta
    
+
    Release Date: October 11, 2006
    
 
 
      
 
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • 

From 19ec9b171508e590f8503cf8c1408d6729bad18d Mon Sep 17 00:00:00 2001
From: admin 
Date: Tue, 10 Oct 2006 23:57:08 +0000
Subject: [PATCH 0319/2544]

---
 system/application/config/autoload.php |  2 +-
 system/application/config/database.php | 18 +-----------------
 system/application/config/routes.php   |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php
index f3b30a41..06d8780c 100644
--- a/system/application/config/autoload.php
+++ b/system/application/config/autoload.php
@@ -37,7 +37,7 @@
 |	$autoload['libraries'] = array('database', 'session', 'xmlrpc');
 */
 
-$autoload['libraries'] = array('database');
+$autoload['libraries'] = array();
 
 
 /*
diff --git a/system/application/config/database.php b/system/application/config/database.php
index c594ba89..32b23058 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -41,23 +41,7 @@
 $db['default']['pconnect'] = TRUE;
 $db['default']['db_debug'] = TRUE;
 $db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = APPPATH.'db_cache/';
-
-
-
-$db['test']['hostname'] = "localhost";
-$db['test']['username'] = "root";
-$db['test']['password'] = "";
-$db['test']['database'] = "exp4";
-$db['test']['dbdriver'] = "mysql";
-$db['test']['dbprefix'] = "";
-$db['test']['active_r'] = TRUE;
-$db['test']['pconnect'] = FALSE;
-$db['test']['db_debug'] = TRUE;
-
-
-
-
+$db['default']['cachedir'] = '';
 
 
 ?>
\ No newline at end of file
diff --git a/system/application/config/routes.php b/system/application/config/routes.php
index 097037e3..8fa16780 100644
--- a/system/application/config/routes.php
+++ b/system/application/config/routes.php
@@ -40,7 +40,7 @@
 */
 
 $route['default_controller'] = "welcome";
-$route['scaffolding_trigger'] = "scaffolding";
+$route['scaffolding_trigger'] = "";
 
 
 

From 2799120c10b8d2544dd71e37b3a48c1eaa834c48 Mon Sep 17 00:00:00 2001
From: admin 
Date: Wed, 11 Oct 2006 01:38:08 +0000
Subject: [PATCH 0320/2544]

---
 system/libraries/Table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 4771295a..0f2c49d9 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -50,7 +50,7 @@ function CI_Table()
 	 */
 	function set_template($template)
 	{
-		if ( ! is_array())
+		if ( ! is_array($template))
 		{
 			return FALSE;
 		}

From 4003718f35247ef9b4a8d678389bda639677bac7 Mon Sep 17 00:00:00 2001
From: admin 
Date: Wed, 11 Oct 2006 19:16:58 +0000
Subject: [PATCH 0321/2544]

---
 system/codeigniter/Base4.php             | 6 ++++--
 system/database/DB_driver.php            | 2 +-
 system/libraries/Controller.php          | 3 +--
 system/libraries/Table.php               | 8 ++++++--
 user_guide/database/utilities.html       | 4 ++--
 user_guide/general/changelog.html        | 2 +-
 user_guide/general/controllers.html      | 1 +
 user_guide/installation/upgrade_150.html | 8 +++++++-
 user_guide/libraries/file_uploading.html | 2 +-
 user_guide/libraries/image_lib.html      | 2 +-
 user_guide/libraries/table.html          | 4 ++--
 user_guide/libraries/trackback.html      | 2 +-
 user_guide/nav/nav.js                    | 2 +-
 user_guide/toc.html                      | 2 +-
 14 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php
index 9366b458..2793317e 100644
--- a/system/codeigniter/Base4.php
+++ b/system/codeigniter/Base4.php
@@ -21,7 +21,7 @@
  * This file is used only when Code Igniter is being run under PHP 4.
  * 
  * In order to allow CI to work under PHP 4 we had to make the Loader class 
- * the parent of the Controller Base class.  It's the only way we enabled
+ * the parent of the Controller Base class.  It's the only way we can
  * enable functions like $this->load->library('email') to instantiate 
  * classes that can then be used within controllers as $this->email->send()
  *
@@ -42,11 +42,13 @@ class CI_Base extends CI_Loader {
 
 	function CI_Base()
 	{
+		// This allows syntax like $this->load->foo() to work
 		parent::CI_Loader();
 		$this->load =& $this;
 		
+		// This allows resources used within controller constructors to work
 		global $OBJ;
-		$OBJ = $this->load;
+		$OBJ = $this->load; // Do NOT use a reference.
 	}
 }
 
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 6da645a3..22f91ed4 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -400,7 +400,7 @@ function simple_query($sql)
 			$this->initialize();
 		}
 
-		return $this->_execute($sql, $this->conn_id);
+		return $this->_execute($sql);
 	}
 	
 	// --------------------------------------------------------------------
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 938c46e4..88ab4616 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -75,8 +75,7 @@ function _ci_initialize()
 		{
 			$this->$var =& load_class($class);
 		}
-		
-		
+
 		// In PHP 5 the Controller class is run as a discreet 
 		// class.  In PHP 4 it extends the Controller
 		if (floor(phpversion()) >= 5)
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 0f2c49d9..61d04eef 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -211,9 +211,13 @@ function _set_from_object($query)
 		}
 				
 		// Next blast through the result array and build out the rows
-		foreach ($query->result_array() as $row)
+		
+		if ($query->num_rows() > 0)
 		{
-			$this->rows[] = $row;
+			foreach ($query->result_array() as $row)
+			{
+				$this->rows[] = $row;
+			}
 		}
 	}
 
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html
index 1fdc4b00..de025ea3 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -311,9 +311,9 @@ 
      Description of Backup Preferences
      
 
 add_dropTRUETRUE/FALSEWhether to include DROP TABLE statements in your SQL export file.
 
-add_insert/strong>TRUETRUE/FALSEWhether to include INSERT statements in your SQL export file.
+add_insertTRUETRUE/FALSEWhether to include INSERT statements in your SQL export file.
 
-newline/strong>"\n""\n", "\r", "\r\n"Type of newline to use in your SQL export file.
+newline"\n""\n", "\r", "\r\n"Type of newline to use in your SQL export file.
 
 
 
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 81dbcff9..6fac208f 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -80,7 +80,7 @@ 
      Version 1.5.0 Beta
      
 
    • Added simple_query() function to the database classes
      • 
 
    • Added standard_date() function to the Date Helper.
      • 
 
    • Added $query->free_result() to database class.
      • 
-
    • Added $query->field_names() function to database class
      • 
+
    • Added $query->list_fields() function to database class
      • 
 
    • Added $this->db->platform() function
      • 
 
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
      • 
 
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
      • 
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 49f8e58a..db488c54 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -398,6 +398,7 @@ 
      Reserved Function Names
      
 
    • _ci_autoloader
      • 
 
    • _ci_init_class
      • 
 
    • _ci_init_scaffolding
      • 
+
    • _ci_is_instance
      • 
 
    • _ci_load
      • 
 
    • _ci_load_class
      • 
 
    • _ci_object_to_array
      • 
diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html
index b532073f..e757d35a 100644
--- a/user_guide/installation/upgrade_150.html
+++ b/user_guide/installation/upgrade_150.html
@@ -97,8 +97,14 @@ 
      Step 2: Update your database.php file
    +

    Step 3: Update your main index.php file

    -

    Step 3: Update your user guide

    +

    If you are running a stock index.php file simply replace your version with the new one. If you are running one with +internal modifications, open it and add this line of code near the bottom:

    + +define('FCPATH', __FILE__); + +

    Step 4: Update your user guide

    Please also replace your local copy of the user guide with the new version.

    diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 9e779579..600a7fb3 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -426,7 +426,7 @@

    Explanation

       ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  Image Manipulation Class +Next Topic:  HTML Table Class

    Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

    diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index c33ec20e..4538e863 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -656,7 +656,7 @@

    Overlay Preferences

    diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index a5480b91..2f2e9b3c 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 8ae88957..a8f924e1 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html index 6fac208f..255a4b63 100644 --- a/user_guide/general/changelog.html +++ b/user_guide/general/changelog.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index db488c54..8cb54c8e 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 53a674b4..7466b544 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index fb3f4178..b57d739c 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 02777b04..49ba02e6 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 42981275..cf829027 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/index.html b/user_guide/general/index.html index 82daa74c..23584d62 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 176adf6d..4fcbfbb0 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index a00b46f7..fe9a1a1e 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 44b1eb0b..55585b30 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 0e1d2a69..957a734f 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 09683c69..3fdc4d6c 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    From 939906b0ba774948a49e1b9b0bc22d265ecb451a Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 11 Oct 2006 19:39:48 +0000 Subject: [PATCH 0325/2544] --- user_guide/general/alternative_php.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/multiple_apps.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index e1bc5cc8..ef90f2a4 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 8eb6fae3..8d2cbe55 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 5511c229..868d0cb0 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 557a49ef..4aa2e857 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 5999af7f..168aee8b 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html index 8537658d..481a24ef 100644 --- a/user_guide/general/multiple_apps.html +++ b/user_guide/general/multiple_apps.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 536c8481..cb402cb2 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 2c8d41ba..a4057817 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index 7242cd39..2cb99574 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 8f0be887..9d77e5da 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index cd3e6644..9f35d3f9 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 79921e8c..88f26a2c 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 4538e863..2cd9540d 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 4e5ac3b7..3bfea14f 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 347421d6..eb87231e 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 015e7ea8..487b5844 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 5a1216f6..daf5dfe6 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index e221f4c6..b9d4ebb3 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index f25e6979..b08b7b81 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index d072a570..8d2f06de 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -34,7 +34,7 @@ - +

    Code Igniter User Guide Version 1.5.0b1
    From 4979a12de4e18edb54af07cd187e2a193bc518eb Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 11 Oct 2006 19:40:07 +0000 Subject: [PATCH 0326/2544] --- user_guide/changelog.html | 105 +++++++++++------------ user_guide/index.html | 4 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 18 files changed, 70 insertions(+), 71 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 6fac208f..4407b7f1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -4,12 +4,12 @@ Code Igniter User Guide - - + + - - - + + + - + +
    - +

    Code Igniter User Guide Version 1.5.0b1
    @@ -46,7 +46,7 @@ Code Igniter Home  ›  -User Guide Home  ›  +User Guide Home  ›  Change Log
    Search User Guide   
    @@ -67,26 +67,26 @@

    Version 1.5.0 Beta

    Release Date: October 11, 2006

      -
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • -
    • Added Database Caching Class.
      • -
    • Added transaction support to the database classes.
      • -
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
      • -
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
      • -
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
      • -
    • Added Zip Encoding Library.
      • +
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • +
    • Added Database Caching Class.
      • +
    • Added transaction support to the database classes.
      • +
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
      • +
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
      • +
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
      • +
    • Added Zip Encoding Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
      • -
    • Added Download Helper.
      • -
    • Added simple_query() function to the database classes
      • -
    • Added standard_date() function to the Date Helper.
      • -
    • Added $query->free_result() to database class.
      • -
    • Added $query->list_fields() function to database class
      • -
    • Added $this->db->platform() function
      • +
    • Added Download Helper.
      • +
    • Added simple_query() function to the database classes
      • +
    • Added standard_date() function to the Date Helper.
      • +
    • Added $query->free_result() to database class.
      • +
    • Added $query->list_fields() function to database class
      • +
    • Added $this->db->platform() function
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
      • -
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
      • +
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the validation class.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
      • @@ -103,13 +103,13 @@

      Version 1.4.1

      • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
      • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
        • -
      • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
        • -
      • Added $this->output->set_header() function, which allows you to set server headers.
        • +
      • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
        • +
      • Added $this->output->set_header() function, which allows you to set server headers.
      • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
        • -
      • Added Inflector helper.
        • -
      • Added element() function in the array helper.
        • +
      • Added Inflector helper.
        • +
      • Added element() function in the array helper.
      • Added RAND() to active record orderby() function.
        • -
      • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
        • +
      • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
      • Added Oracle database driver (still undergoing testing so it might have some bugs).
      • Added the ability to combine pseudo-variables and php variables in the template parser class.
      • Added output compression option to the config file.
        • @@ -121,7 +121,7 @@

        Version 1.4.1

      • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
      • Added some code to allow email attachments to be reset when sending batches of email.
      • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own -libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
        • +libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
      • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
      • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().
      @@ -138,13 +138,13 @@

      Version 1.4.0

    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
      • -
    • Added the ability to supply full URLs using the anchor() helper function.
      • -
    • Added mode parameter to file_write() helper.
      • -
    • Added support for changing the port number in the Postgre driver.
      • +
    • Added the ability to supply full URLs using the anchor() helper function.
      • +
    • Added mode parameter to file_write() helper.
      • +
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
      • -
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
      • -
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
      • +
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
      • +
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • @@ -189,7 +189,7 @@

      Version 1.3.3

        -
      • Models do not connect automatically to the database as of this version. More info here. +
      • Models do not connect automatically to the database as of this version. More info here.
      • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
      • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
      • Fixed a bug in the active record "having" function.
        • @@ -224,14 +224,14 @@

        Version 1.3.1

        Release Date: April 11, 2006

          -
        • Added a Unit Testing Library.
          • +
        • Added a Unit Testing Library.
        • Added the ability to pass objects to the insert() and update() database functions. -This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
          • -
        • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
          • -
        • Added getwhere function to Active Record class.
          • -
        • Added count_all function to Active Record class.
          • +This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details. +
        • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
          • +
        • Added getwhere function to Active Record class.
          • +
        • Added count_all function to Active Record class.
        • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
          • -
        • Added $this->db->last_query(), which allows you to view your last query that was run.
          • +
        • Added $this->db->last_query(), which allows you to view your last query that was run.
        • Added a new mime type to the upload class for better compatibility.
        • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
        • Fixed a bug in a couple of the active record functions (where and orderby).
          • @@ -248,20 +248,20 @@

          Version 1.3

          • Added support for Models.
          • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
            • -
          • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
            • -
          • Added a feature to the database class that lets you run custom function calls.
            • +
          • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
            • +
          • Added a feature to the database class that lets you run custom function calls.
          • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
          • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
          • Added support for running standard query string URLs. These can be optionally enabled in your config file.
          • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
          • Added a new error template for use with native PHP errors.
            • -
          • Added "alternator" function in the string helpers.

            +
          • Added "alternator" function in the string helpers.

          • Removed slashing from the input class. After much debate we decided to kill this feature.
          • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
          • Added better class and function name-spacing to avoid collisions with user developed classes. All Code Igniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
          • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
            • -
          • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
            • +
          • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
          • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
          • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
          • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
            • @@ -282,10 +282,10 @@

            Version 1.2

            • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
            • Added a global function named get_instance() allowing the main Code Igniter object to be accessible throughout your own classes.
              • -
            • Added new File Helper: delete_files()
              • -
            • Added new URL Helpers: base_url(), index_page()
              • +
            • Added new File Helper: delete_files()
              • +
            • Added new URL Helpers: base_url(), index_page()
            • Added the ability to create your own core libraries and store them in your local application directory.
              • -
            • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
              • +
            • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
            • Added Javascript Calendar plugin.
            • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
            • Updated the parser class so that it allows tag pars within other tag pairs.
              • @@ -303,7 +303,7 @@

              Version Beta 1.1

              Release Date: March 10, 2006

                -
              • Added a Calendaring class.
                • +
              • Added a Calendaring class.
              • Added support for running multiple applications that share a common Code Igniter backend.
              • Moved the "uri protocol" variable from the index.php file into the config.php file
              • Fixed a problem that was preventing certain function calls from working within constructors.
                • @@ -332,14 +332,13 @@

                Version Beta 1.0

                diff --git a/user_guide/index.html b/user_guide/index.html index bb399f24..f55e7af6 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                @@ -84,7 +84,7 @@

                Who is Code Igniter For?

              • You need broad compatibility with standard hosting accounts that run a variety of PHP versions and configurations.
              • You want a framework that requires nearly zero configuration.
              • You want a framework that does not require you to use the command line.
                • -
              • You want a framework that doesn't require you to adhere to restrictive coding rules.
                • +
              • You want a framework that does not require you to adhere to restrictive coding rules.
              • You are not interested in large-scale monolithic libraries like PEAR.
              • You do not want to be forced to learn a templating language (although a template parser is optionally available if you desire one).
              • You eschew complexity, favoring simple solutions.
                • diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 825b9ded..3dc4551b 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 20597c9e..f97ab6f6 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 9be32cf4..df5c6eb6 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 600a7fb3..e8f58fad 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index d26a998b..eb17cdbf 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index d8ac8cd9..14796a78 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index ace408e0..d6279f9c 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 77f57087..a9d11c34 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index c4caf5e4..d060b392 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 45b92abb..f48681c1 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 8f3eb07d..82f8757d 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 38356708..f72ba9cd 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 96ce4d14..e76f57b8 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index ad14006c..dd77e6a6 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index e78e6a48..c9155efc 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/toc.html b/user_guide/toc.html index 7eaa5ae4..5d959e75 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -68,7 +68,7 @@

                Basic Info

                From 4d02a4feaf2ad7b5e5e29cedf446b777a5547321 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 11 Oct 2006 19:40:24 +0000 Subject: [PATCH 0327/2544] --- user_guide/database/active_record.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/license.html | 2 +- user_guide/nav/nav.js | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/goals.html | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index bbc0a446..afb93404 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 6010d8b9..0da65977 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 63fc6734..fa8ed63b 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 40a3b8c9..31e687ae 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index d9a2dcab..47395ff3 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index f6e93a95..f8609c77 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index ed1855ce..7ad559ca 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/index.html b/user_guide/database/index.html index ccc8060c..1805cdea 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/results.html b/user_guide/database/results.html index d4108819..e377c311 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index b7e80a37..b642e6c9 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 8077155e..fb1f1fc2 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index de025ea3..8defbc1b 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/license.html b/user_guide/license.html index 8a046f4a..0a758b1a 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index 150c7caf..3906038d 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -12,7 +12,7 @@ function create_menu(basepath) '' + diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 4ff54f39..720122a7 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 241b522b..50b5637c 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index d20ed486..6ee87022 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                From 43c36af048872d540a93abd0c8cc5546f4d84162 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 11 Oct 2006 19:40:39 +0000 Subject: [PATCH 0328/2544] --- user_guide/database/caching.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/index.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/userguide.css | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 0e31eac2..6abc4938 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 9ae382b4..d22113d5 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index f489d381..c45d3df1 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index c87eff78..f667e80b 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index ff0a44d2..ca88ba08 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index c1378f29..af1f87bc 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 7e7a9dcd..806c3a26 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index b48d3bf5..740cbc14 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index affdae3e..e8ee3f33 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index bd9527bc..1c565c17 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index f61d599d..9de65ae4 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index cb12d966..de566767 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index d6b286a3..e37902c3 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/userguide.css b/user_guide/userguide.css index 5cd6734f..d58ec96f 100644 --- a/user_guide/userguide.css +++ b/user_guide/userguide.css @@ -48,7 +48,7 @@ a:hover { } #nav2 { background: #fff url(images/nav_bg.jpg) repeat-x left top; - padding: 0 180px 0 0; + padding: 0 240px 0 0; margin: 0; text-align: right; } From 0a6973460d4a2942a7f8134b51171052a53145a3 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 11 Oct 2006 19:40:55 +0000 Subject: [PATCH 0329/2544] --- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 3a201732..f006cd3f 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index d06f7da5..15783890 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 69712c6d..05f14fe4 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index d4ed8339..273a177f 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index b470c71b..ab6e83c2 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 56036915..af3c3031 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 438a9b19..28189962 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 66ae7b63..03c50960 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 25a4bbac..90094bd4 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index 4ae790d9..f1f4e9e1 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 78ce2543..d4aa8ec9 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index c8db0479..ece00c81 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 245ab635..6ab237e0 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                From 75247ee81ed3e4b1248f9e5cf7efb41790bb4d3d Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 11 Oct 2006 19:41:10 +0000 Subject: [PATCH 0330/2544] --- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrading.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 8add34b3..78adaa40 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 7f0c1832..58e5d07b 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index a3d16fa7..10e53056 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index e757d35a..990c2bed 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index a05b25fe..134063a6 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -34,7 +34,7 @@ - +

                Code Igniter User Guide Version 1.5.0b1
                From 4c1ab6c826c3f5c3158a38443c2d3c30203f0f5a Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 11 Oct 2006 21:48:33 +0000 Subject: [PATCH 0331/2544] --- system/libraries/Router.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/system/libraries/Router.php b/system/libraries/Router.php index dab84883..ead1439f 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -366,24 +366,30 @@ function _get_uri_string() */ function _parse_request_uri() { - if (($request_uri = getenv('REQUEST_URI')) == '') + if ( ! isset($_SERVER['REQUEST_URI']) OR $_SERVER['REQUEST_URI'] == '') { return ''; } - $fc_path = FCPATH; + $request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI'])); + + if ($request_uri == '') + { + return ''; + } + $fc_path = FCPATH; if (strpos($request_uri, '?') !== FALSE) { $fc_path .= '?'; } - $parsed_uri = explode("/", preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $request_uri))); - + $parsed_uri = explode("/", $request_uri); + $i = 0; foreach(explode("/", $fc_path) as $segment) { - if ($segment == $parsed_uri[$i]) + if (isset($parsed_uri[$i]) AND $segment == $parsed_uri[$i]) { $i++; } From 606f99c043272f96f21911d89c21cd36c2ef59e4 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 11 Oct 2006 23:48:41 +0000 Subject: [PATCH 0332/2544] --- system/codeigniter/CodeIgniter.php | 2 +- system/database/DB_driver.php | 3 ++- system/database/DB_result.php | 6 +++--- system/database/drivers/mssql/mssql_result.php | 8 +++++++- system/database/drivers/mysql/mysql_result.php | 8 +++++++- system/database/drivers/mysqli/mysqli_result.php | 8 +++++++- system/database/drivers/oci8/oci8_result.php | 8 +++++++- system/database/drivers/odbc/odbc_result.php | 8 +++++++- system/database/drivers/postgre/postgre_result.php | 8 +++++++- system/database/drivers/sqlite/sqlite_result.php | 8 +++++++- system/libraries/Loader.php | 11 +++-------- system/libraries/Table.php | 4 ++-- 12 files changed, 60 insertions(+), 22 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 611b1a62..49347715 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -241,7 +241,7 @@ /* * ------------------------------------------------------ - * Close the DB connection of one exists + * Close the DB connection if one exists * ------------------------------------------------------ */ if (class_exists('CI_DB')) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 22f91ed4..a4131fd7 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -172,6 +172,7 @@ function load_utilities() $CI =& get_instance(); $CI->dbutil = new $class(); + $CI->_ci_assign_to_models(); } // -------------------------------------------------------------------- @@ -629,7 +630,7 @@ function escape($str) */ function primary($table = '') { - $fields = $this->field_names($table); + $fields = $this->list_fields($table); if ( ! is_array($fields)) { diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 1c8ad6be..b163bb5e 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -261,14 +261,14 @@ function previous_row($type = 'object') */ function num_rows() { return $this->num_rows; } function num_fields() { return 0; } - function field_names() { return array(); } + function list_fields() { return array(); } + function field_names() { return array(); } // Deprecated function field_data() { return array(); } function free_result() { return TRUE; } function _data_seek() { return TRUE; } function _fetch_assoc() { return array(); } function _fetch_object() { return array(); } - - + } // END DB_result class ?> \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php index 498deae0..0ba0b8c5 100644 --- a/system/database/drivers/mssql/mssql_result.php +++ b/system/database/drivers/mssql/mssql_result.php @@ -60,7 +60,7 @@ function num_fields() * @access public * @return array */ - function field_names() + function list_fields() { $field_names = array(); while ($field = mssql_fetch_field($this->result_id)) @@ -70,6 +70,12 @@ function field_names() return $field_names; } + + // Deprecated + function field_names() + { + return $this->list_fields(); + } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php index 3fdfc818..1cf6ff18 100644 --- a/system/database/drivers/mysql/mysql_result.php +++ b/system/database/drivers/mysql/mysql_result.php @@ -60,7 +60,7 @@ function num_fields() * @access public * @return array */ - function field_names() + function list_fields() { $field_names = array(); while ($field = mysql_fetch_field($this->result_id)) @@ -70,6 +70,12 @@ function field_names() return $field_names; } + + // Deprecated + function field_names() + { + return $this->list_fields(); + } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index 08db13f1..215403e9 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php @@ -60,7 +60,7 @@ function num_fields() * @access public * @return array */ - function field_names() + function list_fields() { $field_names = array(); while ($field = mysql_fetch_field($this->result_id)) @@ -71,6 +71,12 @@ function field_names() return $field_names; } + // Deprecated + function field_names() + { + return $this->list_fields(); + } + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index a3da8002..ab13a393 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -84,7 +84,7 @@ function num_fields() * @access public * @return array */ - function field_names() + function list_fields() { $field_names = array(); $fieldCount = $this->num_fields(); @@ -95,6 +95,12 @@ function field_names() return $field_names; } + // Deprecated + function field_names() + { + return $this->list_fields(); + } + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php index 9204d868..ea834f9b 100644 --- a/system/database/drivers/odbc/odbc_result.php +++ b/system/database/drivers/odbc/odbc_result.php @@ -60,7 +60,7 @@ function num_fields() * @access public * @return array */ - function field_names() + function list_fields() { $field_names = array(); for ($i = 0; $i < $this->num_fields(); $i++) @@ -71,6 +71,12 @@ function field_names() return $field_names; } + // Deprecated + function field_names() + { + return $this->list_fields(); + } + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php index 8c25c5d4..e792544a 100644 --- a/system/database/drivers/postgre/postgre_result.php +++ b/system/database/drivers/postgre/postgre_result.php @@ -60,7 +60,7 @@ function num_fields() * @access public * @return array */ - function field_names() + function list_fields() { $field_names = array(); for ($i = 0; $i < $this->num_fields(); $i++) @@ -71,6 +71,12 @@ function field_names() return $field_names; } + // Deprecated + function field_names() + { + return $this->list_fields(); + } + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php index a3e94b47..55364bb2 100644 --- a/system/database/drivers/sqlite/sqlite_result.php +++ b/system/database/drivers/sqlite/sqlite_result.php @@ -60,7 +60,7 @@ function num_fields() * @access public * @return array */ - function field_names() + function list_fields() { $field_names = array(); for ($i = 0; $i < $this->num_fields(); $i++) @@ -71,6 +71,12 @@ function field_names() return $field_names; } + // Deprecated + function field_names() + { + return $this->list_fields(); + } + // -------------------------------------------------------------------- /** diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 96ec0c91..7a6637ac 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -171,10 +171,7 @@ function model($model, $name = '', $db_conn = FALSE) $CI->$name = new $model(); foreach (get_object_vars($CI) as $key => $var) { - if ( ! isset($CI->$name->$key)) - { - $CI->$name->$key =& $CI->$key; - } + $CI->$name->$key =& $CI->$key; } } else @@ -182,14 +179,12 @@ function model($model, $name = '', $db_conn = FALSE) $this->$name = new $model(); foreach (get_object_vars($this) as $key => $var) { - if ( ! isset($this->$name->$key)) - { - $this->$name->$key =& $CI->$key; - } + $this->$name->$key =& $this->$key; } } $this->_ci_models[] = $name; + $this->_ci_assign_to_models(); } diff --git a/system/libraries/Table.php b/system/libraries/Table.php index 61d04eef..758676e2 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -202,12 +202,12 @@ function _set_from_object($query) // First generate the headings from the table column names if (count($this->heading) == 0) { - if ( ! method_exists($query, 'field_names')) + if ( ! method_exists($query, 'list_fields')) { return FALSE; } - $this->heading = $query->field_names(); + $this->heading = $query->list_fields(); } // Next blast through the result array and build out the rows From 0aef222d246da84c90e9a89f31f6677cbe6b4ddc Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 12 Oct 2006 18:00:22 +0000 Subject: [PATCH 0333/2544] --- system/database/DB.php | 19 +--- system/database/DB_driver.php | 19 ---- system/libraries/Controller.php | 2 +- system/libraries/Loader.php | 173 ++++++++++++-------------------- system/libraries/Model.php | 28 ++---- 5 files changed, 74 insertions(+), 167 deletions(-) diff --git a/system/database/DB.php b/system/database/DB.php index 62237440..a148c9ff 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -22,14 +22,8 @@ * @author Rick Ellis * @link http://www.codeigniter.com/user_guide/database/ */ -function DB($params = '', $return = FALSE, $active_record = FALSE) +function DB($params = '', $active_record = FALSE) { - // Do we even need to load the database class? - if (class_exists('CI_DB') AND $return == FALSE AND $active_record == FALSE) - { - return FALSE; - } - // Load the DB config file if a DSN string wasn't passed if (is_string($params) AND strpos($params, '://') === FALSE) { @@ -84,15 +78,8 @@ function DB($params = '', $return = FALSE, $active_record = FALSE) // Instantiate the DB adapter $driver = 'CI_DB_'.$params['dbdriver'].'_driver'; - $DB = new $driver($params); - - if ($return === TRUE) - { - return $DB; - } - - $CI =& get_instance(); - $CI->db =& $DB; + $DB = new $driver($params); + return $DB; } diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index a4131fd7..848d4f1c 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -155,26 +155,7 @@ function initialize($params = '') } } } - - // -------------------------------------------------------------------- - - /** - * Load the Utilities Class - * - * @access public - * @return string - */ - function load_utilities() - { - require_once(BASEPATH.'database/DB_utility'.EXT); - require_once(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_utility'.EXT); - $class = 'CI_DB_'.$this->dbdriver.'_utility'; - $CI =& get_instance(); - $CI->dbutil = new $class(); - $CI->_ci_assign_to_models(); - } - // -------------------------------------------------------------------- /** diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 88ab4616..0bbc7773 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -88,7 +88,7 @@ function _ci_initialize() $this->_ci_autoloader(); } } - + // -------------------------------------------------------------------- /** diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 7a6637ac..1f6a8bce 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -119,20 +119,10 @@ function model($model, $name = '', $db_conn = FALSE) return; } - if ($this->_ci_is_instance()) - { - $CI =& get_instance(); - if (isset($CI->$name)) - { - show_error('The model name you are loading is the name of a resource that is already being used: '.$name); - } - } - else + $CI =& get_instance(); + if (isset($CI->$name)) { - if (isset($this->$name)) - { - show_error('The model name you are loading is the name of a resource that is already being used: '.$name); - } + show_error('The model name you are loading is the name of a resource that is already being used: '.$name); } $model = strtolower($model); @@ -147,14 +137,7 @@ function model($model, $name = '', $db_conn = FALSE) if ($db_conn === TRUE) $db_conn = ''; - if ($this->_ci_is_instance()) - { - $CI->load->database($db_conn, FALSE, TRUE); - } - else - { - $this->database($db_conn, FALSE, TRUE); - } + $CI->load->database($db_conn, FALSE, TRUE); } if ( ! class_exists('Model')) @@ -166,28 +149,12 @@ function model($model, $name = '', $db_conn = FALSE) $model = ucfirst($model); - if ($this->_ci_is_instance()) - { - $CI->$name = new $model(); - foreach (get_object_vars($CI) as $key => $var) - { - $CI->$name->$key =& $CI->$key; - } - } - else - { - $this->$name = new $model(); - foreach (get_object_vars($this) as $key => $var) - { - $this->$name->$key =& $this->$key; - } - } + $CI->$name = new $model(); + $CI->$name->_assign_libraries(); - $this->_ci_models[] = $name; - $this->_ci_assign_to_models(); + $this->_ci_models[] = $name; } - - + // -------------------------------------------------------------------- /** @@ -201,19 +168,49 @@ function model($model, $name = '', $db_conn = FALSE) */ function database($params = '', $return = FALSE, $active_record = FALSE) { + // Do we even need to load the database class? + if (class_exists('CI_DB') AND $return == FALSE AND $active_record == FALSE) + { + return FALSE; + } + require_once(BASEPATH.'database/DB'.EXT); if ($return === TRUE) { - return DB($params, $return, $active_record); + return DB($params, $active_record); } - else + + $CI =& get_instance(); + $CI->db =& DB($params, $active_record); + $this->_ci_assign_to_models(); + } + + // -------------------------------------------------------------------- + + /** + * Load the Utilities Class + * + * @access public + * @return string + */ + function dbutil() + { + if ( ! class_exists('CI_DB')) { - DB($params, $return, $active_record); - $this->_ci_assign_to_models(); + $this->database(); } - } + $CI =& get_instance(); + + require_once(BASEPATH.'database/DB_utility'.EXT); + require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility'.EXT); + $class = 'CI_DB_'.$CI->db->dbdriver.'_utility'; + + $CI->dbutil = new $class(); + $CI->load->_ci_assign_to_models(); + } + // -------------------------------------------------------------------- /** @@ -467,15 +464,8 @@ function script($scripts = array()) */ function language($file = '', $lang = '', $return = FALSE) { - if ($this->_ci_is_instance()) - { - $CI =& get_instance(); - return $CI->lang->load($file, $lang, $return); - } - else - { - return $this->lang->load($file, $lang, $return); - } + $CI =& get_instance(); + return $CI->lang->load($file, $lang, $return); } // -------------------------------------------------------------------- @@ -489,15 +479,8 @@ function language($file = '', $lang = '', $return = FALSE) */ function config($file = '') { - if ($this->_ci_is_instance()) - { - $CI =& get_instance(); - $CI->config->load($file); - } - else - { - $this->config->load($file); - } + $CI =& get_instance(); + $CI->config->load($file); } // -------------------------------------------------------------------- @@ -524,17 +507,9 @@ function scaffolding($table = '') show_error('You must include the name of the table you would like access when you initialize scaffolding'); } - if ($this->_ci_is_instance()) - { - $CI =& get_instance(); - $CI->_ci_scaffolding = TRUE; - $CI->_ci_scaff_table = $table; - } - else - { - $this->_ci_scaffolding = TRUE; - $this->_ci_scaff_table = $table; - } + $CI =& get_instance(); + $CI->_ci_scaffolding = TRUE; + $CI->_ci_scaff_table = $table; } // -------------------------------------------------------------------- @@ -755,29 +730,15 @@ function _ci_init_class($class, $prefix = '', $varname = NULL) } // Instantiate the class - if ($this->_ci_is_instance()) + $CI =& get_instance(); + if ($config !== NULL) { - $CI =& get_instance(); - if ($config !== NULL) - { - $CI->$classvar = new $name($config); - } - else - { - $CI->$classvar = new $name; - } + $CI->$classvar = new $name($config); } else - { - if ($config !== NULL) - { - $this->$classvar = new $name($config); - } - else - { - $this->$classvar = new $name; - } - } + { + $CI->$classvar = new $name; + } } // -------------------------------------------------------------------- @@ -804,20 +765,10 @@ function _ci_autoloader() // Load any custome config file if (count($autoload['config']) > 0) { - if ($this->_ci_is_instance()) - { - $CI =& get_instance(); - foreach ($autoload['config'] as $key => $val) - { - $CI->config->load($val); - } - } - else + $CI =& get_instance(); + foreach ($autoload['config'] as $key => $val) { - foreach ($autoload['config'] as $key => $val) - { - $this->config->load($val); - } + $CI->config->load($val); } } @@ -893,14 +844,14 @@ function _ci_assign_to_models() $CI =& get_instance(); foreach ($this->_ci_models as $model) { - $CI->$model->_assign_libraries(); + $CI->$model->_assign_libraries(); } } else - { + { foreach ($this->_ci_models as $model) { - $this->$model->_assign_libraries(); + $this->$model->_assign_libraries(); } } } diff --git a/system/libraries/Model.php b/system/libraries/Model.php index 48615e07..017a9c6d 100644 --- a/system/libraries/Model.php +++ b/system/libraries/Model.php @@ -33,10 +33,9 @@ class Model { */ function Model() { - $this->_assign_libraries(FALSE); + $this->_assign_libraries(); log_message('debug', "Model Class Initialized"); } - // END Model() /** * Assign Libraries @@ -47,26 +46,15 @@ function Model() * * @access private */ - function _assign_libraries($use_reference = TRUE) + function _assign_libraries() { - $CI =& get_instance(); - foreach (get_object_vars($CI) as $key => $var) - { - if ( ! isset($this->$key)) - { - if ($use_reference === TRUE) - { - $this->$key =& $CI->$key; - } - else - { - $this->$key = $CI->$key; - } - } - } - + $CI =& get_instance(); + + foreach (array_keys(get_object_vars($CI)) as $key) + { + $this->$key =& $CI->$key; + } } - // END _assign_libraries() } // END Model Class From 572ed815e69fdd79bfc9cad63afcd370a4eba0aa Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 12 Oct 2006 18:01:52 +0000 Subject: [PATCH 0334/2544] --- user_guide/database/utilities.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 8defbc1b..615c0c52 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -86,11 +86,11 @@

                Table of Contents

                Initializing the Utility Class

                Important:  In order to initialize the Utility class, your database driver must -already be running, since the utilities class is loaded from within the main DB class.

                +already be running, since the utilities class relies on it.

                Load the Utility Class as follows:

                -$this->db->load_utilities() +$this->load->dbutil()

                Once initialized you will access the functions using the $this->dbutil object:

                From 9fa003797d794a63aa58356926fac9649269c668 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 12 Oct 2006 18:20:13 +0000 Subject: [PATCH 0335/2544] --- system/libraries/Encrypt.php | 10 +++++----- user_guide/libraries/encryption.html | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 50b3fab3..b7dba252 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -272,15 +272,15 @@ function mcrypt_decode($data, $key) // -------------------------------------------------------------------- /** - * Set the Mcrypt Cypher + * Set the Mcrypt Cipher * * @access public * @param constant * @return string */ - function set_cypher($cypher) + function set_cipher($cipher) { - $this->_mcrypt_cipher = $cypher; + $this->_mcrypt_cipher = $cipher; } // -------------------------------------------------------------------- @@ -300,12 +300,12 @@ function set_mode($mode) // -------------------------------------------------------------------- /** - * Get Mcrypt Cypher Value + * Get Mcrypt cipher Value * * @access private * @return string */ - function _get_cypher() + function _get_cipher() { if ($this->_mcrypt_cipher == '') { diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index df5c6eb6..3a774e2c 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -138,11 +138,11 @@

                $this->encrypt->decode()

                $plaintext_string = $this->encrypt->decode($encrypted_string);                 -

                $this->encrypt->set_cypher();

                +

                $this->encrypt->set_cipher();

                -

                Permits you to set an Mcrypt cypher. By default it uses MCRYPT_RIJNDAEL_256. Example: -$this->encrypt->set_cypher('MCRYPT_BLOWFISH'); -

                Please visit php.net for a list of available cyphers.

                +

                Permits you to set an Mcrypt cipher. By default it uses MCRYPT_RIJNDAEL_256. Example: +$this->encrypt->set_cipher('MCRYPT_BLOWFISH'); +

                Please visit php.net for a list of available ciphers.

                If you'd like to manually test whether your server supports Mcrypt you can use:

                echo ( ! function_exists('mcrypt_encrypt')) ? 'Nope' : 'Yup'; From 80b2bd9b7f1ecafed0d0170be60bd0a2d8a4201c Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 12 Oct 2006 18:30:36 +0000 Subject: [PATCH 0336/2544] --- system/libraries/Loader.php | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 1f6a8bce..2d312e9e 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -67,15 +67,15 @@ function CI_Loader() * * @access public * @param string the name of the class - * @param sring the optional class variable name to assign the library to + * @param mixed the optional parameters * @return void */ - function library($class, $varname = NULL) + function library($class, $params = FALSE) { if ($class == '') return; - $this->_ci_load_class($class, $varname); + $this->_ci_load_class($class, $params); $this->_ci_assign_to_models(); } @@ -640,7 +640,7 @@ function _ci_load($data) * @param mixed any additional parameters * @return void */ - function _ci_load_class($class, $varname = NULL) + function _ci_load_class($class, $params = FALSE) { // Prep the class name $class = strtolower(str_replace(EXT, '', $class)); @@ -665,7 +665,7 @@ function _ci_load_class($class, $varname = NULL) } } - return $this->_ci_init_class($filename, 'MY_', $varname); + return $this->_ci_init_class($filename, 'MY_', $params); } // Lets search for the requested library file and load it. @@ -680,7 +680,7 @@ function _ci_load_class($class, $varname = NULL) if (file_exists($path.'libraries/'.$filename.EXT)) { include_once($path.'libraries/'.$filename.EXT); - return $this->_ci_init_class($filename, '', $varname); + return $this->_ci_init_class($filename, '', $params); } } } @@ -700,13 +700,16 @@ function _ci_load_class($class, $varname = NULL) * @param string * @return null */ - function _ci_init_class($class, $prefix = '', $varname = NULL) + function _ci_init_class($class, $prefix = '', $config = FALSE) { // Is there an associated config file for this class? - $config = NULL; - if (file_exists(APPPATH.'config/'.$class.EXT)) + if ($config !== FALSE) { - include_once(APPPATH.'config/'.$class.EXT); + $config = FALSE; + if (file_exists(APPPATH.'config/'.$class.EXT)) + { + include_once(APPPATH.'config/'.$class.EXT); + } } if ($prefix == '') @@ -719,16 +722,9 @@ function _ci_init_class($class, $prefix = '', $varname = NULL) } // Set the variable name we will assign the class to - if ( ! is_null($varname)) - { - $classvar = $varname; - } - else - { - $class = strtolower($class); - $classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class]; - } - + $class = strtolower($class); + $classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class]; + // Instantiate the class $CI =& get_instance(); if ($config !== NULL) From f6615e650f7f871fbb4a2e0e1a75fd9afa2e3647 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 12 Oct 2006 19:16:57 +0000 Subject: [PATCH 0337/2544] --- system/libraries/Router.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Router.php b/system/libraries/Router.php index ead1439f..bbfa0d19 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -373,7 +373,7 @@ function _parse_request_uri() $request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI'])); - if ($request_uri == '') + if ($request_uri == '' OR $request_uri == SELF) { return ''; } From 5a14ea1599841bdaac15b45e3efd4cba01601f49 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 12 Oct 2006 20:42:55 +0000 Subject: [PATCH 0338/2544] --- system/codeigniter/CodeIgniter.php | 2 +- system/libraries/Loader.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 49347715..93c1dba5 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -244,7 +244,7 @@ * Close the DB connection if one exists * ------------------------------------------------------ */ -if (class_exists('CI_DB')) +if (class_exists('CI_DB') AND isset($CI->db)) { $CI->db->close(); } diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 2d312e9e..7bf11609 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -70,7 +70,7 @@ function CI_Loader() * @param mixed the optional parameters * @return void */ - function library($class, $params = FALSE) + function library($class, $params = NULL) { if ($class == '') return; @@ -640,7 +640,7 @@ function _ci_load($data) * @param mixed any additional parameters * @return void */ - function _ci_load_class($class, $params = FALSE) + function _ci_load_class($class, $params = NULL) { // Prep the class name $class = strtolower(str_replace(EXT, '', $class)); @@ -700,12 +700,12 @@ function _ci_load_class($class, $params = FALSE) * @param string * @return null */ - function _ci_init_class($class, $prefix = '', $config = FALSE) + function _ci_init_class($class, $prefix = '', $config = NULL) { // Is there an associated config file for this class? - if ($config !== FALSE) + if ($config !== NULL) { - $config = FALSE; + $config = NULL; if (file_exists(APPPATH.'config/'.$class.EXT)) { include_once(APPPATH.'config/'.$class.EXT); From b06d69f03f5149877390d7e99882006a141268ff Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 13 Oct 2006 21:44:17 +0000 Subject: [PATCH 0339/2544] --- system/codeigniter/Common.php | 4 ++-- system/libraries/Profiler.php | 15 +++++++++++++-- system/libraries/Session.php | 18 +++--------------- user_guide/changelog.html | 2 +- user_guide/general/errors.html | 8 ++++---- user_guide/general/models.html | 5 ----- 6 files changed, 23 insertions(+), 29 deletions(-) diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index 8ac80d63..07b468fe 100644 --- a/system/codeigniter/Common.php +++ b/system/codeigniter/Common.php @@ -204,7 +204,7 @@ function log_message($level = 'error', $message, $php_error = FALSE) static $LOG; $config = get_config(); - if ($config['log_errors'] === FALSE) + if ($config['log_threshold'] == 0) { return; } @@ -255,7 +255,7 @@ function _exception_handler($severity, $message, $filepath, $line) // Should we log the error? No? We're done... $config = get_config(); - if ($config['log_errors'] === FALSE) + if ($config['log_threshold'] == 0) { return; } diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 3370c911..7fecabd2 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -94,7 +94,12 @@ function _compile_benchmarks() // -------------------------------------------------------------------- - + /** + * Compile Queries + * + * @access private + * @return string + */ function _compile_queries() { $output = "\n\n"; @@ -130,7 +135,13 @@ function _compile_queries() } // -------------------------------------------------------------------- - + + /** + * Compile $_POST Data + * + * @access private + * @return string + */ function _compile_post() { $output = "\n\n"; diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 16f373fd..8390fd6d 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -112,10 +112,8 @@ function sess_run() } } - // Do we need encryption? - $this->encryption = $this->CI->config->item('sess_encrypt_cookie'); - - if ($this->encryption == TRUE) + // Do we need encryption? + if ($this->CI->config->item('sess_encrypt_cookie') == TRUE) { $this->CI->load->library('encrypt'); } @@ -160,7 +158,6 @@ function sess_run() $this->sess_gc(); } } - // END sess_run() // -------------------------------------------------------------------- @@ -257,7 +254,6 @@ function sess_read() return TRUE; } - // END sess_read() // -------------------------------------------------------------------- @@ -285,7 +281,6 @@ function sess_write() 0 ); } - // END sess_read() // -------------------------------------------------------------------- @@ -321,7 +316,6 @@ function sess_create() $this->userdata['last_visit'] = 0; $this->sess_write(); } - // END sess_read() // -------------------------------------------------------------------- @@ -349,7 +343,6 @@ function sess_update() // Write the cookie $this->sess_write(); } - // END sess_update() // -------------------------------------------------------------------- @@ -370,7 +363,6 @@ function sess_destroy() 0 ); } - // END sess_destroy() // -------------------------------------------------------------------- @@ -396,7 +388,6 @@ function sess_gc() log_message('debug', 'Session garbage collection performed.'); } } - // END sess_destroy() // -------------------------------------------------------------------- @@ -411,7 +402,6 @@ function userdata($item) { return ( ! isset($this->userdata[$item])) ? FALSE : $this->userdata[$item]; } - // END sess_destroy() // -------------------------------------------------------------------- @@ -440,7 +430,6 @@ function set_userdata($newdata = array(), $newval = '') $this->sess_write(); } - // END set_userdata() // -------------------------------------------------------------------- @@ -467,7 +456,6 @@ function unset_userdata($newdata = array()) $this->sess_write(); } - // END set_userdata() // -------------------------------------------------------------------- @@ -494,7 +482,7 @@ function strip_slashes($vals) return $vals; } - // END strip_slashes() + } // END Session Class ?> \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4407b7f1..75d3838f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -91,7 +91,7 @@

                Version 1.5.0 Beta

              • Fixed a bug in the validation class.
              • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
              • Deprecated $this->db->field_names() USE $this->db->list_fields()
                • - +
              • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
              diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 8d2cbe55..a2626ab3 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -116,10 +116,10 @@

              log_message('level', 'message')

              -

              Note: In order for the log file to actually be written, the "log_errors" -option must be enabled in your application/config/config.php file, and the "logs" folder must be writable. -In addition, you'll can set the "threshold" for logging. -You might, for example, only want error messages to be logged, and not the other two types.

              +

              Note: In order for the log file to actually be written, the + "logs" folder must be writable. In addition, you must set the "threshold" for logging. +You might, for example, only want error messages to be logged, and not the other two types. +If you set it to zero logging will be disabled.

              diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 168aee8b..3009e505 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -240,11 +240,6 @@

              Connecting to your Database

            - - - - - From 9a661810d2b9b96c458c1f369f0059b31012b6a8 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 16 Oct 2006 19:02:48 +0000 Subject: [PATCH 0340/2544] --- system/database/DB.php | 4 ++-- system/database/drivers/mssql/mssql_utility.php | 2 +- system/database/drivers/oci8/oci8_utility.php | 2 +- system/database/drivers/sqlite/sqlite_utility.php | 2 +- system/libraries/Loader.php | 5 ++--- system/libraries/Router.php | 2 +- user_guide/index.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/system/database/DB.php b/system/database/DB.php index a148c9ff..d2afce98 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -22,7 +22,7 @@ * @author Rick Ellis * @link http://www.codeigniter.com/user_guide/database/ */ -function DB($params = '', $active_record = FALSE) +function &DB($params = '', $active_record = FALSE) { // Load the DB config file if a DSN string wasn't passed if (is_string($params) AND strpos($params, '://') === FALSE) @@ -78,7 +78,7 @@ function DB($params = '', $active_record = FALSE) // Instantiate the DB adapter $driver = 'CI_DB_'.$params['dbdriver'].'_driver'; - $DB = new $driver($params); + $DB =& new $driver($params); return $DB; } diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php index 129ba686..24ff1e13 100644 --- a/system/database/drivers/mssql/mssql_utility.php +++ b/system/database/drivers/mssql/mssql_utility.php @@ -106,7 +106,7 @@ function _optimize_table($table) */ function _repair_table($table) { - return return FALSE; // Is this supported in MS SQL? + return FALSE; // Is this supported in MS SQL? } // -------------------------------------------------------------------- diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php index 96be0950..f4e91218 100644 --- a/system/database/drivers/oci8/oci8_utility.php +++ b/system/database/drivers/oci8/oci8_utility.php @@ -106,7 +106,7 @@ function _optimize_table($table) */ function _repair_table($table) { - return return FALSE; // Is this supported in Oracle? + return FALSE; // Is this supported in Oracle? } // -------------------------------------------------------------------- diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php index 9cb2cf02..ecce5be4 100644 --- a/system/database/drivers/sqlite/sqlite_utility.php +++ b/system/database/drivers/sqlite/sqlite_utility.php @@ -131,7 +131,7 @@ function _optimize_table($table) */ function _repair_table($table) { - return return FALSE; + return FALSE; } // -------------------------------------------------------------------- diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 7bf11609..b402464e 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -703,9 +703,8 @@ function _ci_load_class($class, $params = NULL) function _ci_init_class($class, $prefix = '', $config = NULL) { // Is there an associated config file for this class? - if ($config !== NULL) - { - $config = NULL; + if ($config === NULL) + { if (file_exists(APPPATH.'config/'.$class.EXT)) { include_once(APPPATH.'config/'.$class.EXT); diff --git a/system/libraries/Router.php b/system/libraries/Router.php index bbfa0d19..06037209 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -373,7 +373,7 @@ function _parse_request_uri() $request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI'])); - if ($request_uri == '' OR $request_uri == SELF) + if ($request_uri == '' OR $request_uri == $this->config->item('index_page')) { return ''; } diff --git a/user_guide/index.html b/user_guide/index.html index f55e7af6..395d7390 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -65,7 +65,7 @@

            Welcome to Code Igniter

            Code Igniter is an Application Development Framework - a toolkit - for people who build web sites using PHP. -Its goal is to enable you to develop projects must faster than you could if you were writing code +Its goal is to enable you to develop projects much faster than you could if you were writing code from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and logical structure to access these libraries. Code Igniter lets you creatively focus on your project by minimizing the amount of code needed for a given task.

            diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 720122a7..bf8a4e0d 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -65,7 +65,7 @@

            Code Igniter at a Glance

            Code Igniter is an Application Framework

            -

            Code Igniter is a toolkit for people who build web application using PHP. Its goal is to enable you to develop projects must faster than you could if you were writing code +

            Code Igniter is a toolkit for people who build web application using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and logical structure to access these libraries. Code Igniter lets you creatively focus on your project by minimizing the amount of code needed for a given task.

            From 30578eadecee1b7fd96e82b17100bba5347d362e Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 17 Oct 2006 02:31:06 +0000 Subject: [PATCH 0341/2544] --- system/libraries/Loader.php | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index b402464e..336caf7d 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -592,8 +592,24 @@ function _ci_load($data) } ob_start(); + + // If the PHP installation does not support short tags we'll + // do a little string replacement, changing the short tags + // to standard PHP echo statements. + if (ini_get("short_open_tag") == 0) + { + $file = file_get_contents($path); + + $file = str_replace('/", " ;?>", $file); + + echo eval('?>'.$file.' Date: Tue, 17 Oct 2006 02:32:59 +0000 Subject: [PATCH 0342/2544] --- system/libraries/Loader.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 336caf7d..ba98a642 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -599,7 +599,6 @@ function _ci_load($data) if (ini_get("short_open_tag") == 0) { $file = file_get_contents($path); - $file = str_replace('/", " ;?>", $file); From 94fe038a62c5d535920464266ae404b5e028f662 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 17 Oct 2006 02:36:31 +0000 Subject: [PATCH 0343/2544] --- system/libraries/Loader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index ba98a642..bc2e9dec 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -599,8 +599,8 @@ function _ci_load($data) if (ini_get("short_open_tag") == 0) { $file = file_get_contents($path); - $file = str_replace('/", " ;?>", $file); + $file = str_replace('/", ' ;?>', $file); echo eval('?>'.$file.' Date: Tue, 17 Oct 2006 03:40:51 +0000 Subject: [PATCH 0344/2544] --- system/libraries/Loader.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index bc2e9dec..4252f163 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -596,13 +596,10 @@ function _ci_load($data) // If the PHP installation does not support short tags we'll // do a little string replacement, changing the short tags // to standard PHP echo statements. - if (ini_get("short_open_tag") == 0) - { - $file = file_get_contents($path); - $file = str_replace('/", ' ;?>', $file); - echo eval('?>'.$file.''.preg_replace("/;*\s*\?>/", "; ?>", str_replace(' Date: Thu, 19 Oct 2006 16:38:23 +0000 Subject: [PATCH 0345/2544] --- system/application/config/config.php | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/system/application/config/config.php b/system/application/config/config.php index 31094f3b..3f26d48f 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -140,26 +140,15 @@ */ $config['time_reference'] = 'local'; -/* -|-------------------------------------------------------------------------- -| Enable/Disable Error Logging -|-------------------------------------------------------------------------- -| -| If you would like errors or debug messages logged set this variable to -| TRUE (boolean). Note: You must set the file permissions on the "logs" folder -| such that it is writable. -| -*/ -$config['log_errors'] = FALSE; - /* |-------------------------------------------------------------------------- | Error Logging Threshold |-------------------------------------------------------------------------- | -| If you have enabled error logging, you can set an error threshold to -| determine what gets logged. Threshold options are: +| 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 | 1 = Error Messages (including PHP errors) | 2 = Debug Messages | 3 = Informational Messages From 3ba33e79963beaf0c177371d175003a9c9151e00 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 19 Oct 2006 16:40:03 +0000 Subject: [PATCH 0346/2544] --- system/libraries/Hooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Hooks.php b/system/libraries/Hooks.php index e2d0500c..3c35c908 100644 --- a/system/libraries/Hooks.php +++ b/system/libraries/Hooks.php @@ -39,8 +39,8 @@ class CI_Hooks { */ function CI_Hooks() { - log_message('debug', "Hooks Class Initialized"); $this->_initialize(); + log_message('debug', "Hooks Class Initialized"); } // -------------------------------------------------------------------- From d54078fff55f74ee4fd320b27f8129b48bdcd3fa Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 20 Oct 2006 00:38:16 +0000 Subject: [PATCH 0347/2544] --- system/helpers/typography_helper.php | 72 ++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php index 65924f91..84ca0ed6 100644 --- a/system/helpers/typography_helper.php +++ b/system/helpers/typography_helper.php @@ -129,7 +129,7 @@ function convert($str) * * We don't want quotes converted within * tags so we'll temporarily convert them to - * {{{DQ}}} and {{{SQ}}} + * {@DQ} and {@SQ} * */ if (preg_match_all("#\<.+?>#si", $str, $matches)) @@ -137,11 +137,24 @@ function convert($str) for ($i = 0; $i < count($matches['0']); $i++) { $str = str_replace($matches['0'][$i], - str_replace(array("'",'"'), array('{{{SQ}}}', '{{{DQ}}}'), $matches['0'][$i]), + str_replace(array("'",'"'), array('{@SQ}', '{@DQ}'), $matches['0'][$i]), $str); } } - + + + /* + * Add closing/opening paragraph tags before/after "block" elements + * + * Since block elements (like , 
            , etc.) do not get
+		 * wrapped in paragraph tags we will add a closing 
             tag just before
+		 * each block element starts and an opening 
             tag right after the block element
+		 * ends.  Later on we'll do some further clean up.
+		 *
+		 */
+		$str = preg_replace("#(<.*?)(".$this->block_elements.")(.*?>)#", "
            \\1\\2\\3", $str);
+		$str = preg_replace("#(block_elements.")(.*?>)#", "\\1\\2\\3
            ", $str);
+	
 		/*
 		 * Convert "ignore" tags to tempoarary marker
 		 *
@@ -149,10 +162,10 @@ function convert($str)
 		 * it encounters.  Certain inline tags, like image 
 		 * tags, links, span tags, etc. will be adversely
 		 * affected if they are split out so we'll convert
-		 * the opening < temporarily to: {{{tag}}}
+		 * the opening < temporarily to: {@TAG}
 		 *
-		 */			
-		$str = preg_replace("#<(/*)(".$this->ignore_elements.")#i", "{{{tag}}}\\1\\2", $str);	
+		 */		
+		$str = preg_replace("#<(/*)(".$this->ignore_elements.")#i", "{@TAG}\\1\\2", $str);	
 		
 		/*
 		 * Split the string at every tag
@@ -188,7 +201,7 @@ function convert($str)
 			 * Well also set the "process" flag which allows us
 			 * to skip 
             tags and a few other things.
 			 *
-			 */			
+			 */
 			if (preg_match("#<(/*)(".$this->block_elements.").*?\>#", $chunk, $match)) 
 			{
 				if (preg_match("#".$this->skip_elements."#", $match['2']))
@@ -210,20 +223,51 @@ function convert($str)
 			$str .= $this->format_newlines($chunk);
 		}
 
+
+		/*
+		 * Clean up paragraph tags before/after "block" elements
+		 *
+		 * Earlier we added 
             tags before/after block level elements.
+		 * Then, we added paragraph tags around double line breaks.  This
+		 * potentially created incorrectly formatted paragraphs so we'll
+		 * clean it up here.
+		 *
+		 */
+		$str = preg_replace("#
            ({@TAG}.*?)(".$this->block_elements.")(.*?>)#", "\\1\\2\\3", $str);
+		$str = preg_replace("#({@TAG}/.*?)(".$this->block_elements.")(.*?>)
            #", "\\1\\2\\3", $str);
+
 		// Convert Quotes and other characters
 		$str = $this->format_characters($str);
-
-		//  We'll swap our temporary markers back and do some clean up.
+		
+		// Final clean up
 		$str = preg_replace('#(
            \n*
            )#', '', $str);
 		$str = preg_replace('#()
            #', "\\1", $str);
-		
+
 		$str = str_replace(
-							array('
            ', '
            ', '{{{tag}}}', '{{{DQ}}}', '{{{SQ}}}'), 
-							array('
            ', '
            ', '<', '"', "'"), 
+							array(
+									'
            ',
+									'
            ',
+									'
             ',
+									' 
            ',
+									'{@TAG}',
+									'{@DQ}',
+									'{@SQ}',
+									'
            '
+								),
+							array(
+									'
            ',
+									'
            ',
+									'
            ',
+									'
            ',
+									'<',
+									'"',
+									"'",
+									''
+								),
 							$str
-							);
+						);
 		
-		return trim($str);
+		return $str;
 	}
 	
 	// --------------------------------------------------------------------

From f4c010098af532d9eb843743ef6bb8ed05689765 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 00:53:22 +0000
Subject: [PATCH 0348/2544]

---
 system/helpers/typography_helper.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index 84ca0ed6..ba680487 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -223,7 +223,9 @@ function convert($str)
 			$str .= $this->format_newlines($chunk);
 		}
 
-
+		// FINAL CLEAN UP
+		// IMPORTANT:  DO NOT ALTER THE ORDER OF THE ITEMS BELOW!
+		
 		/*
 		 * Clean up paragraph tags before/after "block" elements
 		 *
@@ -239,10 +241,14 @@ function convert($str)
 		// Convert Quotes and other characters
 		$str = $this->format_characters($str);
 		
-		// Final clean up
+		// Fix an artifact that happens during the paragraph replacement
 		$str = preg_replace('#(
            \n*
            )#', '', $str);
+
+		// If the user submitted their own paragraph tags with class data 
+		// in them we will retain them instead of using our tags.
 		$str = preg_replace('#()
            #', "\\1", $str);
 
+		// Final clean up
 		$str = str_replace(
 							array(
 									'
            ',

From 3dd2528900020866db7260c8dfd5ad91120a7299 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 00:55:00 +0000
Subject: [PATCH 0349/2544]

---
 user_guide/changelog.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 75d3838f..f7e597cd 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -89,6 +89,7 @@ 
            Version 1.5.0 Beta
            
 
          • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
            • 
 
          • Fixed a bug in the Email class related to SMTP Helo data.
            • 
 
          • Fixed a bug in the validation class.
            • 
+
          • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
            • 
 
          • Deprecated "init" folder.  Initialization happens automatically now.  Please see documentation.
            • 
 
          • Deprecated $this->db->field_names()  USE  $this->db->list_fields()
            • 
 
          • Deprecated the $config['log_errors'] item from the config.php file.  Instead, $config['log_threshold'] can be set to "0" to turn it off.
            • 

From 90931313c2d8a90f84e3a62b59d9603f4ebe4127 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 00:59:17 +0000
Subject: [PATCH 0350/2544]

---
 system/libraries/Router.php | 64 +++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 35 deletions(-)

diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 06037209..94a9a524 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -292,7 +292,7 @@ function _get_uri_string()
 			// If the URL has a question mark then it's simplest to just
 			// build the URI string from the zero index of the $_GET array.
 			// This avoids having to deal with $_SERVER variables, which
-			// can be unreliable on some servers
+			// can be unreliable in some environments
 			if (is_array($_GET) AND count($_GET) == 1)
 			{
 				return current(array_keys($_GET));
@@ -300,44 +300,38 @@ function _get_uri_string()
 		
 			// Is there a PATH_INFO variable?
 			// Note: some servers seem to have trouble with getenv() so we'll test it two ways		
-			$path_info = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO');	
+			$path = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO');	
+			if ($path != '' AND $path != "/".SELF)
+			{
+				return $path;
+			}
+					
+			// No PATH_INFO?... What about QUERY_STRING?
+			$path =  (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');	
+			if ($path != '')
+			{
+				return $path;
+			}
 			
-			if ($path_info != '' AND $path_info != "/".SELF)
+			// No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists?
+			$path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO');	
+			if ($path != '' AND $path != "/".SELF)
 			{
-				return $path_info;
+				return $path;
 			}
-			else
+			
+			// OK, how about REQUEST_URI?  
+			// Note: REQUEST_URI is not supplied in a consistent manner with all platforms so it's
+			// a diffucult variable to use.  We'll try to parse it out correctly.  Hopfully one 
+			// of the other variables above was available.
+			$path = $this->_parse_request_uri();
+			if ($path != "")
 			{
-				// OK, how about REQUEST_URI?
-				$req_uri = $this->_parse_request_uri();
-				
-				if ($req_uri != "")
-				{
-					return $req_uri;
-				}
-				else
-				{
-					// Hm... maybe the ORIG_PATH_INFO variable exists?
-					$path_info = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO');	
-					if ($path_info != '' AND $path_info != "/".SELF)
-					{
-						return $path_info;
-					}
-					else
-					{
-						// At this point we've exhauseted all our options.
-						// Hopefully QUERY_STRING exists.  If not, there's nothing else we can try.
-						$query_string =  (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');	
-						
-						if ($query_string != '')
-						{
-							return $query_string;
-						}
-						
-						return '';
-					}
-				}			
+				return $path;
 			}
+
+			// We've exhausted all our options...
+			return '';
 		}
 		else
 		{
@@ -373,7 +367,7 @@ function _parse_request_uri()
 		
 		$request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI']));
 
-		if ($request_uri == '' OR $request_uri == $this->config->item('index_page'))
+		if ($request_uri == '' OR $request_uri == SELF)
 		{
 			return '';
 		}

From e0cd609abeaeb1be5ed0ef7ac88bb6de86627881 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 01:00:31 +0000
Subject: [PATCH 0351/2544]

---
 system/application/config/config.php         |  2 +-
 system/libraries/Exceptions.php              | 12 ++++++++++--
 user_guide/changelog.html                    |  2 +-
 user_guide/database/active_record.html       |  2 +-
 user_guide/database/caching.html             |  2 +-
 user_guide/database/call_function.html       |  2 +-
 user_guide/database/configuration.html       |  2 +-
 user_guide/database/connecting.html          |  2 +-
 user_guide/database/examples.html            |  2 +-
 user_guide/database/fields.html              |  2 +-
 user_guide/database/helpers.html             |  2 +-
 user_guide/database/index.html               |  2 +-
 user_guide/database/queries.html             |  2 +-
 user_guide/database/results.html             |  2 +-
 user_guide/database/table_data.html          |  2 +-
 user_guide/database/transactions.html        |  2 +-
 user_guide/database/utilities.html           |  2 +-
 user_guide/general/alternative_php.html      |  2 +-
 user_guide/general/ancillary_classes.html    |  2 +-
 user_guide/general/autoloader.html           |  2 +-
 user_guide/general/caching.html              |  2 +-
 user_guide/general/changelog.html            |  2 +-
 user_guide/general/controllers.html          |  2 +-
 user_guide/general/core_classes.html         |  2 +-
 user_guide/general/creating_libraries.html   |  2 +-
 user_guide/general/credits.html              |  2 +-
 user_guide/general/errors.html               |  2 +-
 user_guide/general/helpers.html              |  2 +-
 user_guide/general/hooks.html                |  2 +-
 user_guide/general/index.html                |  2 +-
 user_guide/general/libraries.html            |  2 +-
 user_guide/general/models.html               |  2 +-
 user_guide/general/multiple_apps.html        |  2 +-
 user_guide/general/plugins.html              |  2 +-
 user_guide/general/profiling.html            |  2 +-
 user_guide/general/quick_reference.html      |  2 +-
 user_guide/general/requirements.html         |  2 +-
 user_guide/general/routing.html              |  2 +-
 user_guide/general/scaffolding.html          |  2 +-
 user_guide/general/security.html             |  2 +-
 user_guide/general/urls.html                 |  2 +-
 user_guide/general/views.html                |  2 +-
 user_guide/helpers/array_helper.html         |  2 +-
 user_guide/helpers/cookie_helper.html        |  2 +-
 user_guide/helpers/date_helper.html          |  2 +-
 user_guide/helpers/directory_helper.html     |  2 +-
 user_guide/helpers/download_helper.html      |  2 +-
 user_guide/helpers/file_helper.html          |  2 +-
 user_guide/helpers/form_helper.html          |  2 +-
 user_guide/helpers/html_helper.html          |  2 +-
 user_guide/helpers/index.html                |  2 +-
 user_guide/helpers/inflector_helper.html     |  2 +-
 user_guide/helpers/security_helper.html      |  2 +-
 user_guide/helpers/string_helper.html        |  2 +-
 user_guide/helpers/text_helper.html          |  2 +-
 user_guide/helpers/typography_helper.html    |  2 +-
 user_guide/helpers/url_helper.html           |  2 +-
 user_guide/helpers/xml_helper.html           |  2 +-
 user_guide/index.html                        |  2 +-
 user_guide/installation/downloads.html       |  2 +-
 user_guide/installation/index.html           |  2 +-
 user_guide/installation/troubleshooting.html |  2 +-
 user_guide/installation/upgrade_120.html     |  2 +-
 user_guide/installation/upgrade_130.html     |  2 +-
 user_guide/installation/upgrade_131.html     |  2 +-
 user_guide/installation/upgrade_132.html     |  2 +-
 user_guide/installation/upgrade_133.html     |  2 +-
 user_guide/installation/upgrade_140.html     |  2 +-
 user_guide/installation/upgrade_141.html     |  2 +-
 user_guide/installation/upgrade_150.html     |  2 +-
 user_guide/installation/upgrade_b11.html     |  2 +-
 user_guide/installation/upgrading.html       |  2 +-
 user_guide/libraries/benchmark.html          |  2 +-
 user_guide/libraries/calendar.html           |  2 +-
 user_guide/libraries/config.html             |  2 +-
 user_guide/libraries/email.html              |  2 +-
 user_guide/libraries/encryption.html         |  2 +-
 user_guide/libraries/file_uploading.html     |  2 +-
 user_guide/libraries/image_lib.html          |  2 +-
 user_guide/libraries/input.html              |  2 +-
 user_guide/libraries/language.html           |  2 +-
 user_guide/libraries/loader.html             |  2 +-
 user_guide/libraries/output.html             |  2 +-
 user_guide/libraries/pagination.html         |  2 +-
 user_guide/libraries/parser.html             |  2 +-
 user_guide/libraries/sessions.html           |  2 +-
 user_guide/libraries/table.html              |  2 +-
 user_guide/libraries/trackback.html          |  2 +-
 user_guide/libraries/unit_testing.html       |  2 +-
 user_guide/libraries/uri.html                |  2 +-
 user_guide/libraries/user_agent.html         |  2 +-
 user_guide/libraries/validation.html         |  2 +-
 user_guide/libraries/xmlrpc.html             |  2 +-
 user_guide/libraries/zip.html                |  2 +-
 user_guide/license.html                      |  2 +-
 user_guide/overview/appflow.html             |  2 +-
 user_guide/overview/at_a_glance.html         |  2 +-
 user_guide/overview/features.html            |  2 +-
 user_guide/overview/goals.html               |  2 +-
 user_guide/overview/index.html               |  2 +-
 user_guide/overview/mvc.html                 |  2 +-
 user_guide/toc.html                          |  2 +-
 102 files changed, 111 insertions(+), 103 deletions(-)

diff --git a/system/application/config/config.php b/system/application/config/config.php
index 3f26d48f..bf15525c 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -78,7 +78,7 @@
 | setting this variable to TRUE (boolean).  See the user guide for details.
 |
 */
-$config['enable_hooks'] = FALSE;
+$config['enable_hooks'] = TRUE;
 
 
 /*
diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php
index c3af801a..4bdbe4f8 100644
--- a/system/libraries/Exceptions.php
+++ b/system/libraries/Exceptions.php
@@ -117,7 +117,11 @@ function show_404($page = '')
 	function show_error($heading, $message, $template = 'error_general')
 	{
 		$message = '
            '.implode('
            ', ( ! is_array($message)) ? array($message) : $message).'
            ';
-				
+
+		if (ob_get_level() > 1)
+		{
+			ob_end_flush();	
+		}
 		ob_start();
 		include_once(APPPATH.'errors/'.$template.EXT);
 		$buffer = ob_get_contents();
@@ -151,7 +155,11 @@ function show_php_error($severity, $message, $filepath, $line)
 			$x = explode('/', $filepath);
 			$filepath = $x[count($x)-2].'/'.end($x);
 		}
-	
+		
+		if (ob_get_level() > 1)
+		{
+			ob_end_flush();	
+		}
 		ob_start();
 		include_once(APPPATH.'errors/error_php'.EXT);
 		$buffer = ob_get_contents();
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index f7e597cd..bce31d56 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index afb93404..10b018b4 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html
index 6abc4938..8a43268e 100644
--- a/user_guide/database/caching.html
+++ b/user_guide/database/caching.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html
index 0da65977..43bc9729 100644
--- a/user_guide/database/call_function.html
+++ b/user_guide/database/call_function.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html
index fa8ed63b..ea287d77 100644
--- a/user_guide/database/configuration.html
+++ b/user_guide/database/configuration.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html
index 31e687ae..c057f69f 100644
--- a/user_guide/database/connecting.html
+++ b/user_guide/database/connecting.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html
index 47395ff3..8916b5ee 100644
--- a/user_guide/database/examples.html
+++ b/user_guide/database/examples.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html
index f8609c77..d70314b5 100644
--- a/user_guide/database/fields.html
+++ b/user_guide/database/fields.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html
index 7ad559ca..102794b2 100644
--- a/user_guide/database/helpers.html
+++ b/user_guide/database/helpers.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/index.html b/user_guide/database/index.html
index 1805cdea..4f3876ec 100644
--- a/user_guide/database/index.html
+++ b/user_guide/database/index.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html
index d22113d5..39ad00f1 100644
--- a/user_guide/database/queries.html
+++ b/user_guide/database/queries.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/results.html b/user_guide/database/results.html
index e377c311..a301bc3f 100644
--- a/user_guide/database/results.html
+++ b/user_guide/database/results.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html
index b642e6c9..511cc781 100644
--- a/user_guide/database/table_data.html
+++ b/user_guide/database/table_data.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html
index fb1f1fc2..ef1f1a6e 100644
--- a/user_guide/database/transactions.html
+++ b/user_guide/database/transactions.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html
index 615c0c52..f1692808 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html
index ef90f2a4..a06a208e 100644
--- a/user_guide/general/alternative_php.html
+++ b/user_guide/general/alternative_php.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html
index 2026990e..f04556de 100644
--- a/user_guide/general/ancillary_classes.html
+++ b/user_guide/general/ancillary_classes.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html
index 2f2e9b3c..a7e907e7 100644
--- a/user_guide/general/autoloader.html
+++ b/user_guide/general/autoloader.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html
index a8f924e1..6b4c3d1a 100644
--- a/user_guide/general/caching.html
+++ b/user_guide/general/caching.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 255a4b63..7b261791 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 8cb54c8e..f83cab89 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index 7466b544..556a4efc 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index b57d739c..3f168909 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
index 49ba02e6..770b0118 100644
--- a/user_guide/general/credits.html
+++ b/user_guide/general/credits.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html
index a2626ab3..72c9120d 100644
--- a/user_guide/general/errors.html
+++ b/user_guide/general/errors.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html
index cf829027..a0042b5c 100644
--- a/user_guide/general/helpers.html
+++ b/user_guide/general/helpers.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
index 868d0cb0..6bfa94ee 100644
--- a/user_guide/general/hooks.html
+++ b/user_guide/general/hooks.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/index.html b/user_guide/general/index.html
index 23584d62..9ca01f09 100644
--- a/user_guide/general/index.html
+++ b/user_guide/general/index.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html
index 4aa2e857..5a191bb0 100644
--- a/user_guide/general/libraries.html
+++ b/user_guide/general/libraries.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/models.html b/user_guide/general/models.html
index 3009e505..3f1c1e22 100644
--- a/user_guide/general/models.html
+++ b/user_guide/general/models.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html
index 481a24ef..db4a0cff 100644
--- a/user_guide/general/multiple_apps.html
+++ b/user_guide/general/multiple_apps.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html
index cb402cb2..2e603dd6 100644
--- a/user_guide/general/plugins.html
+++ b/user_guide/general/plugins.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html
index 4fcbfbb0..42cba043 100644
--- a/user_guide/general/profiling.html
+++ b/user_guide/general/profiling.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html
index fe9a1a1e..b9a293f3 100644
--- a/user_guide/general/quick_reference.html
+++ b/user_guide/general/quick_reference.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html
index a4057817..bf5470c5 100644
--- a/user_guide/general/requirements.html
+++ b/user_guide/general/requirements.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index 55585b30..102f34db 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html
index 2cb99574..b22b351e 100644
--- a/user_guide/general/scaffolding.html
+++ b/user_guide/general/scaffolding.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/security.html b/user_guide/general/security.html
index 957a734f..c3218cdb 100644
--- a/user_guide/general/security.html
+++ b/user_guide/general/security.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html
index 9d77e5da..e62ac2f2 100644
--- a/user_guide/general/urls.html
+++ b/user_guide/general/urls.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/general/views.html b/user_guide/general/views.html
index 3fdc4d6c..daba7594 100644
--- a/user_guide/general/views.html
+++ b/user_guide/general/views.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html
index f006cd3f..2bd4dc21 100644
--- a/user_guide/helpers/array_helper.html
+++ b/user_guide/helpers/array_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html
index c45d3df1..1e352fc1 100644
--- a/user_guide/helpers/cookie_helper.html
+++ b/user_guide/helpers/cookie_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html
index 15783890..6c21ee00 100644
--- a/user_guide/helpers/date_helper.html
+++ b/user_guide/helpers/date_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html
index f667e80b..35b2d6db 100644
--- a/user_guide/helpers/directory_helper.html
+++ b/user_guide/helpers/directory_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html
index ca88ba08..5b2f1ecf 100644
--- a/user_guide/helpers/download_helper.html
+++ b/user_guide/helpers/download_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html
index 05f14fe4..319ebfa9 100644
--- a/user_guide/helpers/file_helper.html
+++ b/user_guide/helpers/file_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html
index af1f87bc..a71aa513 100644
--- a/user_guide/helpers/form_helper.html
+++ b/user_guide/helpers/form_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html
index 806c3a26..17157bbf 100644
--- a/user_guide/helpers/html_helper.html
+++ b/user_guide/helpers/html_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html
index 740cbc14..2a5c6936 100644
--- a/user_guide/helpers/index.html
+++ b/user_guide/helpers/index.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html
index 273a177f..ace1b2e0 100644
--- a/user_guide/helpers/inflector_helper.html
+++ b/user_guide/helpers/inflector_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html
index e8ee3f33..516e3c0c 100644
--- a/user_guide/helpers/security_helper.html
+++ b/user_guide/helpers/security_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html
index 1c565c17..55cb1ae4 100644
--- a/user_guide/helpers/string_helper.html
+++ b/user_guide/helpers/string_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html
index ab6e83c2..27f6c63d 100644
--- a/user_guide/helpers/text_helper.html
+++ b/user_guide/helpers/text_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html
index 9de65ae4..a95eecc6 100644
--- a/user_guide/helpers/typography_helper.html
+++ b/user_guide/helpers/typography_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html
index de566767..d54acc12 100644
--- a/user_guide/helpers/url_helper.html
+++ b/user_guide/helpers/url_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html
index e37902c3..22e7009b 100644
--- a/user_guide/helpers/xml_helper.html
+++ b/user_guide/helpers/xml_helper.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/index.html b/user_guide/index.html
index 395d7390..00bf4464 100644
--- a/user_guide/index.html
+++ b/user_guide/index.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html
index af3c3031..c95f6b3c 100644
--- a/user_guide/installation/downloads.html
+++ b/user_guide/installation/downloads.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html
index 28189962..4c572de6 100644
--- a/user_guide/installation/index.html
+++ b/user_guide/installation/index.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html
index 03c50960..521d6388 100644
--- a/user_guide/installation/troubleshooting.html
+++ b/user_guide/installation/troubleshooting.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html
index 90094bd4..03aeba13 100644
--- a/user_guide/installation/upgrade_120.html
+++ b/user_guide/installation/upgrade_120.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html
index f1f4e9e1..923f789e 100644
--- a/user_guide/installation/upgrade_130.html
+++ b/user_guide/installation/upgrade_130.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html
index d4aa8ec9..b685b407 100644
--- a/user_guide/installation/upgrade_131.html
+++ b/user_guide/installation/upgrade_131.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html
index 78adaa40..9af6d96f 100644
--- a/user_guide/installation/upgrade_132.html
+++ b/user_guide/installation/upgrade_132.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html
index 58e5d07b..eed40cde 100644
--- a/user_guide/installation/upgrade_133.html
+++ b/user_guide/installation/upgrade_133.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html
index ece00c81..b6e4abbb 100644
--- a/user_guide/installation/upgrade_140.html
+++ b/user_guide/installation/upgrade_140.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html
index 10e53056..e1590e75 100644
--- a/user_guide/installation/upgrade_141.html
+++ b/user_guide/installation/upgrade_141.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html
index 990c2bed..cf41dc40 100644
--- a/user_guide/installation/upgrade_150.html
+++ b/user_guide/installation/upgrade_150.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html
index 6ab237e0..c7563a6f 100644
--- a/user_guide/installation/upgrade_b11.html
+++ b/user_guide/installation/upgrade_b11.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html
index 134063a6..fa6f2acf 100644
--- a/user_guide/installation/upgrading.html
+++ b/user_guide/installation/upgrading.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html
index 3dc4551b..37252b61 100644
--- a/user_guide/libraries/benchmark.html
+++ b/user_guide/libraries/benchmark.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html
index 9f35d3f9..a13cadf0 100644
--- a/user_guide/libraries/calendar.html
+++ b/user_guide/libraries/calendar.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html
index 88f26a2c..2797cd22 100644
--- a/user_guide/libraries/config.html
+++ b/user_guide/libraries/config.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html
index f97ab6f6..2064a3cf 100644
--- a/user_guide/libraries/email.html
+++ b/user_guide/libraries/email.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html
index 3a774e2c..b27a3764 100644
--- a/user_guide/libraries/encryption.html
+++ b/user_guide/libraries/encryption.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html
index e8f58fad..390b4537 100644
--- a/user_guide/libraries/file_uploading.html
+++ b/user_guide/libraries/file_uploading.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html
index 2cd9540d..f2a7a555 100644
--- a/user_guide/libraries/image_lib.html
+++ b/user_guide/libraries/image_lib.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html
index 3bfea14f..0ae95662 100644
--- a/user_guide/libraries/input.html
+++ b/user_guide/libraries/input.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html
index eb17cdbf..042a1dbf 100644
--- a/user_guide/libraries/language.html
+++ b/user_guide/libraries/language.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index eb87231e..44bae34a 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html
index 487b5844..d577fbba 100644
--- a/user_guide/libraries/output.html
+++ b/user_guide/libraries/output.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html
index 14796a78..19cfc744 100644
--- a/user_guide/libraries/pagination.html
+++ b/user_guide/libraries/pagination.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html
index d6279f9c..091817e1 100644
--- a/user_guide/libraries/parser.html
+++ b/user_guide/libraries/parser.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
index daf5dfe6..e9302d2c 100644
--- a/user_guide/libraries/sessions.html
+++ b/user_guide/libraries/sessions.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html
index a9d11c34..10bb4b3d 100644
--- a/user_guide/libraries/table.html
+++ b/user_guide/libraries/table.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html
index d060b392..ff71ea93 100644
--- a/user_guide/libraries/trackback.html
+++ b/user_guide/libraries/trackback.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
index f48681c1..f0b3782a 100644
--- a/user_guide/libraries/unit_testing.html
+++ b/user_guide/libraries/unit_testing.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html
index b9d4ebb3..9218c0d7 100644
--- a/user_guide/libraries/uri.html
+++ b/user_guide/libraries/uri.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html
index 82f8757d..6028f798 100644
--- a/user_guide/libraries/user_agent.html
+++ b/user_guide/libraries/user_agent.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html
index f72ba9cd..3a724831 100644
--- a/user_guide/libraries/validation.html
+++ b/user_guide/libraries/validation.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html
index b08b7b81..34d47d22 100644
--- a/user_guide/libraries/xmlrpc.html
+++ b/user_guide/libraries/xmlrpc.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html
index 8d2f06de..c03b54fb 100644
--- a/user_guide/libraries/zip.html
+++ b/user_guide/libraries/zip.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/license.html b/user_guide/license.html
index 0a758b1a..681ebba7 100644
--- a/user_guide/license.html
+++ b/user_guide/license.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html
index e76f57b8..a0ae1dee 100644
--- a/user_guide/overview/appflow.html
+++ b/user_guide/overview/appflow.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html
index bf8a4e0d..ad2a0e79 100644
--- a/user_guide/overview/at_a_glance.html
+++ b/user_guide/overview/at_a_glance.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html
index 50b5637c..4e013f50 100644
--- a/user_guide/overview/features.html
+++ b/user_guide/overview/features.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html
index 6ee87022..97d0774e 100644
--- a/user_guide/overview/goals.html
+++ b/user_guide/overview/goals.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html
index dd77e6a6..83a59f76 100644
--- a/user_guide/overview/index.html
+++ b/user_guide/overview/index.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html
index c9155efc..0f5fbe89 100644
--- a/user_guide/overview/mvc.html
+++ b/user_guide/overview/mvc.html
@@ -33,7 +33,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
 
            
 
            
diff --git a/user_guide/toc.html b/user_guide/toc.html
index 5d959e75..7f16ee8c 100644
--- a/user_guide/toc.html
+++ b/user_guide/toc.html
@@ -34,7 +34,7 @@
 
            
 
-
+
            
 
            Code Igniter User Guide Version 1.5.0b1
            Code Igniter User Guide Version 1.5.0b3
            		
 
            
 
            
 
            

From 1168557f576c88b065b72ff8fd8a924156a5a5bd Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 01:01:35 +0000
Subject: [PATCH 0352/2544]

---
 user_guide/changelog.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index bce31d56..0be18089 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -63,8 +63,8 @@
 
            Change Log
            
 
 
-
            Version 1.5.0 Beta
            
-
            Release Date: October 11, 2006
            
+
            Version 1.5.0 Beta 3
            
+
            Release Date: October 19, 2006
            
 
 
              
 
            • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
              • 

From b807f32ab209a537bbb0a85d6129d495675b189f Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 04:55:37 +0000
Subject: [PATCH 0353/2544]

---
 system/libraries/Loader.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 4252f163..3b1a7f2c 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -221,7 +221,7 @@ function dbutil()
 	 * 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
-	 * some cases it's advantageous to be able to retun data so that
+	 * some cases it's advantageous to be able to return data so that
 	 * a developer can process it in some way.
 	 *
 	 * @access	public
@@ -257,7 +257,7 @@ function file($path, $return = FALSE)
 	/**
 	 * Set Variables
 	 *
-	 * Once variables are set they become availabe within
+	 * Once variables are set they become available within
 	 * the controller class and its "view" files.
 	 *
 	 * @access	public
@@ -525,7 +525,7 @@ function scaffolding($table = '')
 	 */
 	function _ci_load($data)
 	{
-		// This allows anything loaded using $this->load (viwes, files, etc.)
+		// This allows anything loaded using $this->load (views, files, etc.)
 		// to become accessible from within the Controller and Model functions.
 		// Only needed when running PHP 5
 		
@@ -584,7 +584,7 @@ function _ci_load($data)
 		 * 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 acurate.
+		 * the browser and then stop the timer it won't be accurate.
 		 */
 		if ( ! file_exists($path))
 		{

From fe9754ca6af8c6242c7d2761047eb409af354930 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 05:00:34 +0000
Subject: [PATCH 0354/2544]

---
 system/application/config/database.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/application/config/database.php b/system/application/config/database.php
index 32b23058..8a1822e9 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -32,16 +32,16 @@
 $active_group = "default";
 
 $db['default']['hostname'] = "localhost";
-$db['default']['username'] = "root";
+$db['default']['username'] = "";
 $db['default']['password'] = "";
-$db['default']['database'] = "test";
+$db['default']['database'] = "";
 $db['default']['dbdriver'] = "mysql";
 $db['default']['dbprefix'] = "";
 $db['default']['active_r'] = TRUE;
 $db['default']['pconnect'] = TRUE;
 $db['default']['db_debug'] = TRUE;
 $db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = '';
+$db['default']['cachedir'] = "";
 
 
 ?>
\ No newline at end of file

From 6dfa713d204056d42027b54e851785646d00355a Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 05:01:30 +0000
Subject: [PATCH 0355/2544]

---
 system/application/config/database.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/application/config/database.php b/system/application/config/database.php
index 8a1822e9..082e34a0 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -23,6 +23,8 @@
 |	['pconnect'] TRUE/FALSE - Whether to use a persistent connection
 |	['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
 |	['active_r'] TRUE/FALSE - Whether to load the active record class
+|	['cache_on'] TRUE/FALSE - Enables/disables query caching
+|	['cachedir'] The path to the folder where cache files should be stored
 |
 | The $active_group variable lets you choose which connection group to
 | make active.  By default there is only one group (the "default" group).

From 31eeb0587cd5fcef8209ca5083f28a39435c135d Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 05:11:33 +0000
Subject: [PATCH 0356/2544]

---
 system/database/DB_result.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index b163bb5e..4e8c4fc7 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -63,6 +63,11 @@ function result_object()
 			return $this->result_object;
 		}
 		
+		if ($this->num_rows == 0)
+		{
+			return array();
+		}
+		
 		$this->_data_seek(0);
 		while ($row = $this->_fetch_object())
 		{ 
@@ -87,6 +92,11 @@ function result_array()
 			return $this->result_array;
 		}
 
+		if ($this->num_rows == 0)
+		{
+			return array();
+		}
+
 		$this->_data_seek(0);			
 		while ($row = $this->_fetch_assoc())
 		{

From 0625e19f3318874d6f95b546312601538edb0f14 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 22:16:54 +0000
Subject: [PATCH 0357/2544]

---
 system/application/config/config.php       | 43 ++++++++----
 system/codeigniter/Common.php              | 78 ++++++++++------------
 system/libraries/Benchmark.php             |  1 -
 system/libraries/Loader.php                | 50 +++++---------
 user_guide/general/core_classes.html       | 15 +++--
 user_guide/general/creating_libraries.html | 34 ++++++++--
 6 files changed, 121 insertions(+), 100 deletions(-)

diff --git a/system/application/config/config.php b/system/application/config/config.php
index bf15525c..b0d2bf50 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -81,6 +81,21 @@
 $config['enable_hooks'] = TRUE;
 
 
+/*
+|--------------------------------------------------------------------------
+| Class Extension Prefix
+|--------------------------------------------------------------------------
+|
+| 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
+|
+*/
+$config['subclass_prefix'] = 'MY_';
+
+
 /*
 |--------------------------------------------------------------------------
 | Allowed URL Characters
@@ -129,20 +144,7 @@
 
 /*
 |--------------------------------------------------------------------------
-| 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 
-| regarding date handling.
-|
-*/
-$config['time_reference'] = 'local';
-
-/*
-|--------------------------------------------------------------------------
-| Error Logging Threshold
+| Error Logging
 |--------------------------------------------------------------------------
 |
 | You can enable error logging by setting a threshold over zero. The 
@@ -267,5 +269,18 @@
 */
 $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 
+| regarding date handling.
+|
+*/
+$config['time_reference'] = 'local';
+
 
 ?>
\ No newline at end of file
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index 07b468fe..a82d486e 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -50,57 +50,27 @@ function &load_class($class, $instantiate = TRUE)
 	{
 		return $objects[$class];
 	}
-	
-	// This is a special case.  It's a class in the Base5.php file
-	// which we don't need to load.  We only instantiate it.
-	if ($class == 'Instance')
-	{
-		$objects[$class] =& new $class();
-		return $objects[$class];
-	}
-		
+			
 	// If the requested class does not exist in the application/libraries
-	// folder we'll load the native class from the system/libraries folder.
-	
-	$is_subclass = FALSE;	
-	if ( ! file_exists(APPPATH.'libraries/'.$class.EXT))
+	// folder we'll load the native class from the system/libraries folder.	
+	if (file_exists(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT))
 	{
-		require(BASEPATH.'libraries/'.$class.EXT);		
+		require(BASEPATH.'libraries/'.$class.EXT);	
+		require(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT);
+		$is_subclass = TRUE;	
 	}
 	else
 	{
-		// A core class can either be extended or replaced by putting an
-		// identically named file in the application/libraries folder. 
-		// We need to determine, however, if the class being requested is
-		// a sub-class of an existing library or an independent instance
-		// since each needs to be handled slightly different. 
-		// To do this we'll open the requested class and read the top portion
-		// of it. If the class extends a base class we will load the base first.
-		// If it doesn't extend the base we'll only load the requested class.
-		
-		// Note: I'm not thrilled with this approach since it requires us to
-		// read the top part of the file (I set a character limit of 5000 bytes,
-		// which correlates to roughly the first 100 lines of code), but
-		// I can't think of a better way to allow classes to be extended or
-		// replaced on-the-fly with nothing required for the user to do
-		// except write the declaration.  Fortunately PHP is ridiculously fast
-		// at file reading operations so I'm not able to discern a performance
-		// hit based on my benchmarks, assuming only a small number of core
-		// files are being extended, which will usually be the case.
-		
-		$fp	= fopen(APPPATH.'libraries/'.$class.EXT, "rb");
-		
-		if (preg_match("/MY_".$class."\s+extends\s+CI_".$class."/i", fread($fp, '6000')))
+		if (file_exists(APPPATH.'libraries/'.$class.EXT))
 		{
-			require(BASEPATH.'libraries/'.$class.EXT);	
-			require(APPPATH.'libraries/'.$class.EXT);
-			$is_subclass = TRUE;
+			require(APPPATH.'libraries/'.$class.EXT);	
+			$is_subclass = FALSE;	
 		}
 		else
 		{
-			require(APPPATH.'libraries/'.$class.EXT);
+			require(BASEPATH.'libraries/'.$class.EXT);
+			$is_subclass = FALSE;
 		}
-		fclose($fp);	
 	}
 
 	if ($instantiate == FALSE)
@@ -111,7 +81,7 @@ function &load_class($class, $instantiate = TRUE)
 		
 	if ($is_subclass == TRUE)
 	{
-		$name = 'MY_'.$class;
+		$name = config_item('subclass_prefix').$class;
 		$objects[$class] =& new $name();
 		return $objects[$class];
 	}
@@ -151,6 +121,30 @@ function &get_config()
 	return $main_conf[0];
 }
 
+/**
+* Gets a config item
+*
+* @access	public
+* @return	mixed
+*/
+function &config_item($item)
+{
+	static $config_item = array();
+
+	if ( ! isset($config_item[$item]))
+	{
+		$config =& get_config();
+		
+		if ( ! isset($config[$item]))
+		{
+			return FALSE;
+		}
+		$config_item[$item] = $config[$item];
+	}
+
+	return $config_item[$item];
+}
+
 
 /**
 * Error Handler
diff --git a/system/libraries/Benchmark.php b/system/libraries/Benchmark.php
index c20a5426..d4262792 100644
--- a/system/libraries/Benchmark.php
+++ b/system/libraries/Benchmark.php
@@ -31,7 +31,6 @@ class CI_Benchmark {
 
 	var $marker = array();
 
-    
 	// --------------------------------------------------------------------
 
 	/**
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 3b1a7f2c..b313c6d5 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -655,51 +655,37 @@ function _ci_load($data)
 	function _ci_load_class($class, $params = NULL)
 	{	
 		// Prep the class name
-		$class = strtolower(str_replace(EXT, '', $class));
-		
-		// Is this a class extension request?	
-		if (substr($class, 0, 3) == 'my_')
-		{
-			$class = preg_replace("/my_(.+)/", "\\1", $class);
+		$class = ucfirst(strtolower(str_replace(EXT, '', $class)));
 
-			// Load the requested library from the main system/libraries folder
-			if (file_exists(BASEPATH.'libraries/'.ucfirst($class).EXT))
-			{
-				include_once(BASEPATH.'libraries/'.ucfirst($class).EXT);
-			}
-			
-			// Now look for a matching library
-			foreach (array(ucfirst($class), $class) as $filename)
+		// Is this a class extension request?
+		if (file_exists(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT))
+		{
+			if ( ! file_exists(BASEPATH.'libraries/'.$class.EXT))
 			{
-				if (file_exists(APPPATH.'libraries/'.$filename.EXT))
-				{
-					include_once(APPPATH.'libraries/'.$filename.EXT);	
-				}
+				log_message('error', "Unable to load the requested class: ".$class);
+				show_error("Unable to load the requested class: ".$class);
 			}
-			
-			return $this->_ci_init_class($filename, 'MY_', $params);
+
+			include_once(BASEPATH.'libraries/'.ucfirst($class).EXT);
+			include_once(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT);
+
+			return $this->_ci_init_class($filename, config_item('subclass_prefix'), $params);			
 		}
 
 		// Lets search for the requested library file and load it.
-		// For backward compatibility we'll test for filenames that are
-		// both uppercase and lower.
-		foreach (array(ucfirst($class), $class) as $filename)
+		for ($i = 1; $i < 3; $i++)
 		{
-			for ($i = 1; $i < 3; $i++)
+			$path = ($i % 2) ? APPPATH : BASEPATH;		
+			if (file_exists($path.'libraries/'.$filename.EXT))
 			{
-				$path = ($i % 2) ? APPPATH : BASEPATH;
-			
-				if (file_exists($path.'libraries/'.$filename.EXT))
-				{
-					include_once($path.'libraries/'.$filename.EXT);
-					return $this->_ci_init_class($filename, '', $params);
-				}
+				include_once($path.'libraries/'.$filename.EXT);
+				return $this->_ci_init_class($filename, '', $params);
 			}
 		}
 		
 		// If we got this far we were unable to find the requested class
 		log_message('error', "Unable to load the requested class: ".$class);
-		show_error("Unable to load the class: ".$class);
+		show_error("Unable to load the requested class: ".$class);
 	}
 	
 	// --------------------------------------------------------------------
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index 556a4efc..6d2f3804 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -113,11 +113,15 @@ 
              Replacing Core Classes
              
 
              Extending Core Class
              
 
 
              If all you need to do is add some functionality to an existing library - perhaps add a function or two - then
-it's overkill to replace the entire library with your version.  In this case it's better to simply extend the class.
              
+it's overkill to replace the entire library with your version.  In this case it's better to simply extend the class.
+Extending a class is nearly identical to replacing a class with a couple exceptions:
              
 
-
              Extending a class is identical to replacing a class with one exception:  The class declaration must extend the parent class
-and your new class must be prefixed with MY_.  For example, to extend the native Input class
-you'll create a file named application/libraries/Input.php, and declare your class with:
              
+
                
+
              • The class declaration must extend the parent class.
                • 
+
              • Your new class name and filename must be prefixed with MY_ (this item is configurable.  See below.).
                •  
+
              
+
+
              For example, to extend the native Input class you'll create a file named application/libraries/MY_Input.php, and declare your class with:
              
 
 
 class MY_Input extends CI_Input {

              
@@ -135,7 +139,8 @@ 
              Extending Core Class
              
     }
              
 }              
 
-
              Any functions in your class that are named identically to the functions in the parent class will be used instead of the native ones.
+
              Tip:  Any functions in your class that are named identically to the functions in the parent class will be used instead of the native ones
+(this is known as "method overloading").
 This allows you to substantially alter the Code Igniter core.
              
 
 
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index 3f168909..d7646412 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -226,17 +226,24 @@ 
              Replacing Native Libraries with Your Versions
              
 
              Extending Native Libraries
              
 
 
              If all you need to do is add some functionality to an existing library - perhaps add a function or two - then
-it's overkill to replace the entire library with your version.  In this case it's better to simply extend the class.
              
+it's overkill to replace the entire library with your version.  In this case it's better to simply extend the class.
+Extending a class is nearly identical to replacing a class with a couple exceptions:
              
 
-
              Extending a class is identical to replacing a class with one exception:  The class declaration must extend the parent class
-and your new class must be prefixed with MY_.  For example, to extend the native Email class
-you'll create a file named application/libraries/Email.php, and declare your class with:
              
+
                
+
              • The class declaration must extend the parent class.
                • 
+
              • Your new class name and filename must be prefixed with MY_ (this item is configurable.  See below.).
                •  
+
              
+
+
              For example, to extend the native Email class you'll create a file named application/libraries/MY_Email.php, and declare your class with:
              
 
 
 class MY_Email extends CI_Email {

              
 
 }              
 
+
              Note: If you need to use a constructor in your class make sure you extend the parent constructor:
              
+
+
 
 class MY_Email extends CI_Email {
              
 
              
@@ -246,9 +253,13 @@ 
              Extending Native Libraries
              
     }
              
 }              
 
-
              Important: To tell Code Igniter to load your sub-class you MUST include my_ in the loading function:
              
 
-$this->load->library('my_email');
+
              Loading Your Sub-class
              
+
+
              To load your sub-class you'll use the standard syntax normally used.  DO NOT include your prefix.  For example,
+to load the example above, which extends the Email class, you will use:
              
+
+$this->load->library('email');
 
 
              Once loaded you will use the class variable as you normally would for the class you are extending.  In the case of 
 the email class all calls will use:
@@ -256,6 +267,17 @@ 
              Extending Native Libraries
              
 
 $this->email->some_function();
 
+
+
              Setting Your Own Prefix
              
+
+
              To set your own sub-class prefix, open your application/config/config.php file and look for this item:
              
+
+$config['subclass_prefix'] = 'MY_';
+
+
              Please note that all native Code Igniter libraries are prefixed with CI_ so DO NOT use that as your prefix.
              
+
+
+
 
            
 
 

From 420ba03fcc3ab0ca1ed60c92a7502a78b994bfc9 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 22:19:09 +0000
Subject: [PATCH 0358/2544]

---
 user_guide/changelog.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 0be18089..2771a14e 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -66,6 +66,9 @@ 
            Change Log
            
 
            Version 1.5.0 Beta 3
            
 
            Release Date: October 19, 2006
            
 
+
            Important:  In Beta 3, the way native libraries are extended has changed slightly thanks to
+a suggestion offered by coolfactor in our forums.  Please check the documentation below if you are extending classes.
             
+
 
              
 
            • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
              • 
 
            • Added Database Caching Class.
              • 

From afe3aaa5292132e3f2c4604a413957fa18a603e5 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 22:22:55 +0000
Subject: [PATCH 0359/2544]

---
 system/codeigniter/CodeIgniter.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 93c1dba5..409cf776 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -52,11 +52,11 @@
 
 $BM =& load_class('Benchmark');
 $BM->mark('total_execution_time_start');
-$BM->mark('loading_time_base_clases_start');
+$BM->mark('loading_time_base_classes_start');
 
 /*
  * ------------------------------------------------------
- *  Instantiate the hooks classe
+ *  Instantiate the hooks class
  * ------------------------------------------------------
  */
 
@@ -109,7 +109,7 @@
  * ------------------------------------------------------
  * 
  *  Note: Due to the poor object handling in PHP 4 we'll
- *  contditionally load different versions of the base
+ *  conditionally load different versions of the base
  *  class.  Retaining PHP 4 compatibility requires a bit of a hack.
  *
  *  Note: The Loader class needs to be included first
@@ -132,7 +132,7 @@
 require(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT);
 
 // Set a mark point for benchmarking
-$BM->mark('loading_time_base_clases_end');
+$BM->mark('loading_time_base_classes_end');
 
 
 /*

From 570c161b4c22c1fcdc0345b0d57a9ea127db4b4a Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 22:28:39 +0000
Subject: [PATCH 0360/2544]

---
 system/libraries/Loader.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index b313c6d5..253d916c 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -669,17 +669,17 @@ function _ci_load_class($class, $params = NULL)
 			include_once(BASEPATH.'libraries/'.ucfirst($class).EXT);
 			include_once(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT);
 
-			return $this->_ci_init_class($filename, config_item('subclass_prefix'), $params);			
+			return $this->_ci_init_class($class, config_item('subclass_prefix'), $params);			
 		}
 
 		// Lets search for the requested library file and load it.
 		for ($i = 1; $i < 3; $i++)
 		{
 			$path = ($i % 2) ? APPPATH : BASEPATH;		
-			if (file_exists($path.'libraries/'.$filename.EXT))
+			if (file_exists($path.'libraries/'.$class.EXT))
 			{
-				include_once($path.'libraries/'.$filename.EXT);
-				return $this->_ci_init_class($filename, '', $params);
+				include_once($path.'libraries/'.$class.EXT);
+				return $this->_ci_init_class($class, '', $params);
 			}
 		}
 		

From 82654c38441540e14096ec0fd95623af14d165ee Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 23:07:40 +0000
Subject: [PATCH 0361/2544]

---
 user_guide/changelog.html            |  1 +
 user_guide/libraries/validation.html | 39 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 2771a14e..01acd0f4 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -90,6 +90,7 @@ 
              Version 1.5.0 Beta 3
              
 
            • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
              • 
 
            • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
              • 
 
            • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
              • 
+
            • Documented three functions from the Validation class that were missing from the user guide:  set_select(), set_radio(), and set_checkbox().
              • 
 
            • Fixed a bug in the Email class related to SMTP Helo data.
              • 
 
            • Fixed a bug in the validation class.
              • 
 
            • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
              • 
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html
index 3a724831..1af3c32f 100644
--- a/user_guide/libraries/validation.html
+++ b/user_guide/libraries/validation.html
@@ -664,6 +664,45 @@ 
              Setting Custom Error Messages
              
 
              Where rule corresponds to the name of a particular rule, and Error Message is the text you would like displayed.
              
 
 
+
              Dealing with Select Menus, Radio Buttons, and Checkboxes
              
+
+
              If you use select menues, radio buttons or checkboxes, you will want the state of 
+these items to be retained in the event of an error.  The Validation class has three functions taht help you do this:
              
+
+
              set_select()
              
+
+
              Permits you to display the menu item that was selected.  The first parameter
+must contain the name of the select menu, the second parameter must contain the value of
+each item. Example:
              
+
+
+<select name="myselect">
              
+<option value="one" <?= $this->validation->set_select('myselect', 'one'); ?> >One</option>
              
+<option value="two" <?= $this->validation->set_select('myselect', 'two'); ?> >Three</option>
              
+<option value="three" <?= $this->validation->set_select('myselect', 'three'); ?> >Three</option>
              
+</select>
+              
+
+
+
              set_checkbox()
              
+
+
              Permits you to display a checkbox in the state it was submitted.  The first parameter
+must contain the name of the checkbox, the second parameter must contain its value. Example:
              
+
+<input type="checkbox" name="mycheck" value="1" <?= $this->validation->set_checkbox('mycheck', 1); ?> />
+
+
+
              set_radio()
              
+
+
              Permits you to display radio buttons in the state they were submitted.  The first parameter
+must contain the name of the radio button, the second parameter must contain its value. Example:
              
+
+<input type="radio" name="myradio" value="1" <?= $this->validation->set_radio('myradio', 1); ?> />
+
+
+
+
+
 
            
 
 

From ae3fbabe663d4f5f853e511b2e4619553787d3ad Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 20 Oct 2006 23:20:12 +0000
Subject: [PATCH 0362/2544]

---
 user_guide/installation/upgrade_150.html | 49 +++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html
index cf41dc40..4e25c54b 100644
--- a/user_guide/installation/upgrade_150.html
+++ b/user_guide/installation/upgrade_150.html
@@ -97,14 +97,59 @@ 
            Step 2: Update your database.php file
            
 
            
 
 
-
            Step 3: Update your main index.php file
            
+
+
            Step 2: Update your config.php file
            
+
+
            Open your application/config/config.php file and ADD  this new item:
            
+
+
            +/*
+|--------------------------------------------------------------------------
+| Class Extension Prefix
+|--------------------------------------------------------------------------
+|
+| 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
+|
+*/
+$config['subclass_prefix'] = 'MY_';
+
            
+
+
            In that same file REMOVE this item:
            
+
+
+
            +/*
+|--------------------------------------------------------------------------
+| Enable/Disable Error Logging
+|--------------------------------------------------------------------------
+|
+| If you would like errors or debug messages logged set this variable to 
+| TRUE (boolean).  Note: You must set the file permissions on the "logs" folder
+| such that it is writable.
+|
+*/
+$config['log_errors'] = FALSE;
+
            
+
+
            Error logging is now disabled simply by setting the threshold to zero.
            
+
+
+
+
            Step 4: Update your main index.php file
            
 
 
            If you are running a stock index.php file simply replace your version with the new one.  If you are running one with 
 internal modifications, open it and add this line of code near the bottom:
            
 
 define('FCPATH', __FILE__);
 
-
            Step 4: Update your user guide
            
+
+
+
+
            Step 5: Update your user guide
            
 
 
            Please also replace your local copy of the user guide with the new version.
            
 

From 9fcc28a29299fbbc242f87bf1b1e61fda6543886 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 21 Oct 2006 17:49:47 +0000
Subject: [PATCH 0363/2544]

---
 system/database/DB_cache.php   | 2 +-
 system/database/DB_driver.php  | 1 +
 system/helpers/file_helper.php | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index 86493e77..aee5ce6f 100644
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
@@ -171,7 +171,7 @@ function delete($segment_one = '', $segment_two = '')
 			$segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2);
 		}
 		
-		$dir_path = $this->CI->db->cachedir.md5($segment_one.'+'.$segment_two).'/';
+		$dir_path = $this->CI->db->cachedir.$segment_one.'+'.$segment_two.'/';
 		
 		delete_files($dir_path, TRUE);
 	}
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 848d4f1c..a24bd20d 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -236,6 +236,7 @@ function query($sql, $binds = FALSE, $return_object = TRUE)
 			{
 				if (FALSE !== ($cache = $this->CACHE->read($sql)))
 				{
+					$this->load_rdriver();
 					return $cache;
 				}
 			}
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index c0f52568..635ef1ba 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -110,7 +110,7 @@ function write_file($path, $data, $mode = 'wb')
  * @param	bool	whether to delete any directories found in the path
  * @return	bool
  */	
-function delete_files($path, $del_dir = FALSE)
+function delete_files($path, $del_dir = FALSE, $level = 0)
 {	
 	// Trim the trailing slash
 	$path = preg_replace("|^(.+?)/*$|", "\\1", $path);
@@ -124,7 +124,8 @@ function delete_files($path, $del_dir = FALSE)
 		{
 			if (is_dir($path.'/'.$filename))
 			{
-				delete_files($path.'/'.$filename, $del_dir);
+				$level++;
+				delete_files($path.'/'.$filename, $del_dir, $level);
 			}
 			else
 			{
@@ -134,7 +135,7 @@ function delete_files($path, $del_dir = FALSE)
 	}
 	@closedir($current_dir);
 	
-	if ($del_dir == TRUE)
+	if ($del_dir == TRUE AND $level > 0)
 	{
 		@rmdir($path);
 	}

From e7e1dcd452a15abaaa01c03cd1ade564e3a59453 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 21 Oct 2006 18:04:01 +0000
Subject: [PATCH 0364/2544]

---
 system/application/config/config.php      | 2 +-
 system/application/config/database.php    | 8 ++++----
 system/helpers/array_helper.php           | 2 +-
 system/helpers/directory_helper.php       | 2 +-
 system/libraries/Benchmark.php            | 2 +-
 system/libraries/Controller.php           | 2 +-
 system/libraries/Zip.php                  | 2 +-
 user_guide/database/active_record.html    | 2 +-
 user_guide/database/fields.html           | 6 +++---
 user_guide/database/queries.html          | 2 +-
 user_guide/general/autoloader.html        | 2 +-
 user_guide/general/errors.html            | 2 +-
 user_guide/general/helpers.html           | 2 +-
 user_guide/general/plugins.html           | 4 ++--
 user_guide/general/profiling.html         | 2 +-
 user_guide/general/urls.html              | 2 +-
 user_guide/general/views.html             | 2 +-
 user_guide/helpers/array_helper.html      | 2 +-
 user_guide/helpers/date_helper.html       | 4 ++--
 user_guide/helpers/security_helper.html   | 2 +-
 user_guide/helpers/string_helper.html     | 2 +-
 user_guide/helpers/text_helper.html       | 2 +-
 user_guide/helpers/typography_helper.html | 2 +-
 user_guide/libraries/config.html          | 2 +-
 user_guide/libraries/email.html           | 2 +-
 user_guide/libraries/encryption.html      | 2 +-
 user_guide/libraries/language.html        | 2 +-
 user_guide/libraries/loader.html          | 4 ++--
 user_guide/libraries/output.html          | 2 +-
 user_guide/libraries/pagination.html      | 2 +-
 user_guide/libraries/validation.html      | 4 ++--
 user_guide/libraries/xmlrpc.html          | 6 +++---
 32 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/system/application/config/config.php b/system/application/config/config.php
index b0d2bf50..ab4f445f 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -160,7 +160,7 @@
 | your log files will fill up very fast.
 |
 */
-$config['log_threshold'] = 4;
+$config['log_threshold'] = 0;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/system/application/config/database.php b/system/application/config/database.php
index 082e34a0..9d8c7783 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -34,16 +34,16 @@
 $active_group = "default";
 
 $db['default']['hostname'] = "localhost";
-$db['default']['username'] = "";
+$db['default']['username'] = "root";
 $db['default']['password'] = "";
-$db['default']['database'] = "";
+$db['default']['database'] = "tester";
 $db['default']['dbdriver'] = "mysql";
 $db['default']['dbprefix'] = "";
 $db['default']['active_r'] = TRUE;
 $db['default']['pconnect'] = TRUE;
 $db['default']['db_debug'] = TRUE;
-$db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = "";
+$db['default']['cache_on'] = TRUE;
+$db['default']['cachedir'] = APPPATH.'dbcache/';
 
 
 ?>
\ No newline at end of file
diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php
index de0faeef..8adbd854 100644
--- a/system/helpers/array_helper.php
+++ b/system/helpers/array_helper.php
@@ -31,7 +31,7 @@
  * Element
  *
  * Lets you determine whether an array index is set and whether it has a value.
- * If the element is empty it returns FALSE (or whater you specify as the default value.)
+ * If the element is empty it returns FALSE (or whatever you specify as the default value.)
  *
  * @access	public
  * @param	string
diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php
index 69eb13d1..4b7a383b 100644
--- a/system/helpers/directory_helper.php
+++ b/system/helpers/directory_helper.php
@@ -28,7 +28,7 @@
 // ------------------------------------------------------------------------
 
 /**
- * Create a Direcotry Map
+ * Create a Directory Map
  *
  * Reads the specified directory and builds an array
  * representation of it.  Sub-folders contained with the
diff --git a/system/libraries/Benchmark.php b/system/libraries/Benchmark.php
index d4262792..5fd24b05 100644
--- a/system/libraries/Benchmark.php
+++ b/system/libraries/Benchmark.php
@@ -54,7 +54,7 @@ function mark($name)
 	 * Calculates the time difference between two marked points.
 	 *
 	 * If the first parameter is empty this function instead returns the 
-	 * {elapsed_time} pseudo-variable. This permits the the full system 
+	 * {elapsed_time} pseudo-variable. This permits the full system 
 	 * execution time to be shown in a template. The output class will
 	 * swap the real value for this variable.
 	 *
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 0bbc7773..3db408be 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -18,7 +18,7 @@
 /**
  * Code Igniter Application Controller Class
  *
- * This class object is the the super class the every library in 
+ * This class object is the super class the every library in 
  * Code Igniter will be assigned to.
  *
  * @package		CodeIgniter
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index e13c713f..6af1ca97 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -228,7 +228,7 @@ function get_zip()
 	// --------------------------------------------------------------------
 
 	/**
-	 * Write File to the specified direcotry
+	 * Write File to the specified directory
 	 *
 	 * Lets you write a file
 	 *
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index 10b018b4..f30b3d8b 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -221,7 +221,7 @@ 
            $this->db->where();
            
 	
 	
          • Custom key/value method:
 	
-	
            You can include an operator in the first parameter in order to to control the comparison:
            
+	
            You can include an operator in the first parameter in order to control the comparison:
            
 	
 	$this->db->where('name !=', $name);
            
 	$this->db->where('id <', $id);
diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html
index d70314b5..1ae1a392 100644
--- a/user_guide/database/fields.html
+++ b/user_guide/database/fields.html
@@ -80,7 +80,7 @@ 
            $this->db->list_fields()
            
 }
             
 
-
            2. You can gather the feild names associated with any query you run by calling the function 
+
            2. You can gather the field names associated with any query you run by calling the function 
 from your query result object:
            
 
 
@@ -96,7 +96,7 @@ 
            $this->db->list_fields()
            
 
 
            $this->db->field_exists()
            
 
-
            Sometimes it's helpful to know whether a particular field exists befor performing an action.
+
            Sometimes it's helpful to know whether a particular field exists before performing an action.
 Returns a boolean TRUE/FALSE.  Usage example:
            
 
 
@@ -133,7 +133,7 @@ 
            $this->db->field_data()
            
 }
             
 
-
            If you have run a query already you can use the result oject instead of supplying the table name:
            
+
            If you have run a query already you can use the result object instead of supplying the table name:
            
 
 
 $query = $this->db->query("YOUR QUERY")
            
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html
index 39ad00f1..a13e2d6a 100644
--- a/user_guide/database/queries.html
+++ b/user_guide/database/queries.html
@@ -87,7 +87,7 @@ 
            $this->db->simple_query();
            
 
 
            Escaping Queries
            
 
-
            It's a very good security practice to escape your data before sumbiting it into your database. 
+
            It's a very good security practice to escape your data before submitting it into your database. 
 Code Igniter has two functions that help you do this:
            
 
 
              
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html
index a7e907e7..36893e91 100644
--- a/user_guide/general/autoloader.html
+++ b/user_guide/general/autoloader.html
@@ -92,7 +92,7 @@ 
              Auto-loading Resources
              
 
 
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html
index b27a3764..d541174f 100644
--- a/user_guide/libraries/encryption.html
+++ b/user_guide/libraries/encryption.html
@@ -75,7 +75,7 @@ 
              Setting your Key
              
 
 
              A key is a piece of information that controls the cryptographic process and permits an encrypted string to be decoded. 
 In fact, the key you chose will provide the only means to decode data that was encrypted with that key,
-so not only must you chose the key carefully, you must must never change it if you intend use it for persistent data.
              
+so not only must you chose the key carefully, you must never change it if you intend use it for persistent data.
              
 
 
              It goes without saying that you should guard your key carefully.
 Should someone gain access to your key, the data will be easily decoded.  If your server is not totally under your control
diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html
index 042a1dbf..10786531 100644
--- a/user_guide/libraries/language.html
+++ b/user_guide/libraries/language.html
@@ -70,7 +70,7 @@ 
              Language Class
              
 
 
              Language files are typically stored in your system/language directory.  Alternately you can create a folder called language inside
 your application folder and store them there.  Code Igniter will look first in your system/application/language
-directory.  If the direcotry does not exist or the specified language is not located there CI will instead look in your global 
+directory.  If the directory does not exist or the specified language is not located there CI will instead look in your global 
 system/language folder.
              
 
 
              Note:  Each language should be stored in its own folder.  For example, the English files are located at:
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index 44bae34a..32bbddfe 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -83,13 +83,13 @@ 
              $this->load->library('class_name')
              
 
 
              Once loaded, the library will be ready for use, using $this->email->some_function().
 
-Each library is described in detail in its own page, so please read theinformation regarding each one you would like to use.
              
+Each library is described in detail in its own page, so please read the information regarding each one you would like to use.
              
 
 
              Parameters can be passed to the library via an array in the second parameter. 
 
 
 
-
              If you would like your libraries assigned to a different variable name then the default you can specify the name in the second paramter:
              
+
              If you would like your libraries assigned to a different variable name then the default you can specify the name in the second parameter:
              
 
 
 $this->load->library('email', 'E'); // Assigns the email object to "E"
              
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html
index d577fbba..dd3ce423 100644
--- a/user_guide/libraries/output.html
+++ b/user_guide/libraries/output.html
@@ -110,7 +110,7 @@ 
              $this->output->enable_profiler();
              
 
              Permits you to enable/disable the Profiler, which will display benchmark and other data
 at the bottom of your pages for debugging and optimization purposes.
              
 
-
              To enable the profiler place the the following function anywhere within your Controller functions:
              
+
              To enable the profiler place the following function anywhere within your Controller functions:
              
 $this->output->enable_profiler(TRUE);
 
 
              When enabled a report will be generated and inserted at the bottom of your pages.
              
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html
index 19cfc744..317878a0 100644
--- a/user_guide/libraries/pagination.html
+++ b/user_guide/libraries/pagination.html
@@ -122,7 +122,7 @@ 
              $config['uri_segment'] = 3;
              
 
 
              $config['num_links'] = 2;
              
 
-
              The number of "digit" links you would like before and after the the selected page number. For example, the number 2 
+
              The number of "digit" links you would like before and after the selected page number. For example, the number 2 
 will place two digits on either side, as in the example links at the very top of this page.
              
 
 
              Adding Enclosing Markup
              
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html
index 1af3c32f..0a4905a7 100644
--- a/user_guide/libraries/validation.html
+++ b/user_guide/libraries/validation.html
@@ -666,8 +666,8 @@ 
              Setting Custom Error Messages
              
 
 
              Dealing with Select Menus, Radio Buttons, and Checkboxes
              
 
-
              If you use select menues, radio buttons or checkboxes, you will want the state of 
-these items to be retained in the event of an error.  The Validation class has three functions taht help you do this:
              
+
              If you use select menus, radio buttons or checkboxes, you will want the state of 
+these items to be retained in the event of an error.  The Validation class has three functions that help you do this:
              
 
 
              set_select()
              
 
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html
index 34d47d22..7cd00a26 100644
--- a/user_guide/libraries/xmlrpc.html
+++ b/user_guide/libraries/xmlrpc.html
@@ -82,7 +82,7 @@ 
              What is XML-RPC?
              
 When the XML-RPC Server receives this request it will examine it to determine which class/method should be called to process the request.
 Once processed, the server will then send back a response message.
              
 
-
              For detailed spcifications, you can visit the XML-RPC site.
              
+
              For detailed specifications, you can visit the XML-RPC site.
              
 
 
              Initializing the Class
              
 
@@ -145,7 +145,7 @@ 
              Anatomy of a Request
              
 is referred to as a request parameter.  The above example has two parameters: 
 The URL and title of your site. When the XML-RPC server receives your request, it will look for parameters it requires.
              
 
-
              Request parameters must be placed into an array for transportation, and each parameter can can be one
+
              Request parameters must be placed into an array for transportation, and each parameter can be one
 of seven data types (strings, numbers, dates, etc.). If your parameters are something other than strings 
 you will have to include the data type in the request array.
              
 
@@ -447,7 +447,7 @@ 
              $this->xmlrpc->send_error_message()
              
 return $this->xmlrpc->send_error_message('123', 'Requested data not available');
 
 
              $this->xmlrpc->send_response()
              
-
              Lets you send the response from your server to the client. An array of of valid data values must be sent with this method.
              
+
              Lets you send the response from your server to the client. An array of valid data values must be sent with this method.
              
 $response = array(
              
                  array(
              
                         'flerror' => array(FALSE, 'boolean'),
              

From fafe28bec4f414e48f63e01ed9105ae5c2c99802 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 21 Oct 2006 19:08:17 +0000
Subject: [PATCH 0365/2544]

---
 system/database/DB_active_rec.php             |  2 +-
 system/database/DB_cache.php                  |  2 +-
 system/database/DB_driver.php                 |  6 +-
 system/database/DB_result.php                 |  2 +-
 .../database/drivers/mssql/mssql_driver.php   |  2 +-
 .../database/drivers/mysql/mysql_driver.php   |  2 +-
 .../database/drivers/mysqli/mysqli_driver.php |  2 +-
 system/database/drivers/oci8/oci8_driver.php  |  2 +-
 system/database/drivers/odbc/odbc_driver.php  |  2 +-
 .../drivers/postgre/postgre_driver.php        |  2 +-
 .../database/drivers/sqlite/sqlite_driver.php |  2 +-
 system/helpers/date_helper.php                |  2 +-
 system/helpers/file_helper.php                |  4 +-
 system/helpers/form_helper.php                |  4 +-
 system/helpers/security_helper.php            |  8 +-
 system/helpers/typography_helper.php          |  6 +-
 system/helpers/user_agent_helper.php          | 89 -------------------
 system/libraries/Calendar.php                 |  2 +-
 18 files changed, 26 insertions(+), 115 deletions(-)
 delete mode 100644 system/helpers/user_agent_helper.php

diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 1fa4f955..8db6161a 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -804,7 +804,7 @@ function _compile_select()
 	/**
 	 * Object to Array
 	 *
-	 * Takes an object as input and convers the class variables to array key/vals
+	 * Takes an object as input and converts the class variables to array key/vals
 	 *
 	 * @access	public
 	 * @param	object
diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index aee5ce6f..b469b0e1 100644
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
@@ -82,7 +82,7 @@ function check_path($path = '')
 	// --------------------------------------------------------------------
 
 	/**
-	 * Retreive a cached query
+	 * Retrieve a cached query
 	 *
 	 * The URI being requested will become the name of the cache sub-folder.
 	 * An MD5 hash of the SQL statement will become the cache file name
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index a24bd20d..8a7b88f1 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -368,7 +368,7 @@ function load_rdriver()
 
 	/**
 	 * Simple Query  
-	 * This is a simiplified version of the query() function.  Internally
+	 * This is a simplified version of the query() function.  Internally
 	 * we only use it when running transaction commands since they do
 	 * not require all the features of the main query() function.
 	 * 
@@ -535,7 +535,7 @@ function is_write_type($sql)
 	 * Calculate the aggregate query elapsed time 
 	 * 
 	 * @access	public
-	 * @param	intiger	The number of decimal places
+	 * @param	integer	The number of decimal places
 	 * @return	integer		 
 	 */	
 	function elapsed_time($decimals = 6)
@@ -1021,7 +1021,7 @@ function close()
 	 * @param	string	the error message
 	 * @param	string	any "swap" values
 	 * @param	boolean	whether to localize the message
-	 * @return	string	sends the application/errror_db.php template		 
+	 * @return	string	sends the application/error_db.php template		 
 	 */	
 	function display_error($error = '', $swap = '', $native = FALSE) 
 	{
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index 4e8c4fc7..d02bfb96 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -63,7 +63,7 @@ function result_object()
 			return $this->result_object;
 		}
 		
-		if ($this->num_rows == 0)
+		if ($this->numerous == 0)
 		{
 			return array();
 		}
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index cb2f48dc..4dc8792c 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -277,7 +277,7 @@ function _list_tables()
 	// --------------------------------------------------------------------
 
 	/**
-	 * List columnn query
+	 * List column query
 	 *
 	 * Generates a platform-specific query string so that the column names can be fetched
 	 *
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 253627cd..20311ffa 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -311,7 +311,7 @@ function _list_tables()
 	// --------------------------------------------------------------------
 
 	/**
-	 * Show columnn query
+	 * Show column query
 	 *
 	 * Generates a platform-specific query string so that the column names can be fetched
 	 *
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index 4fd9f3aa..ea2adbea 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -303,7 +303,7 @@ function _list_tables()
 	// --------------------------------------------------------------------
 
 	/**
-	 * Show columnn query
+	 * Show column query
 	 *
 	 * Generates a platform-specific query string so that the column names can be fetched
 	 *
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 794405a0..4f5470c1 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -418,7 +418,7 @@ function _list_tables()
     // --------------------------------------------------------------------
 
     /**
-     * Show columnn query
+     * Show column query
      *
      * Generates a platform-specific query string so that the column names can be fetched
      *
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index 4bd6e110..17a6dfbd 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -278,7 +278,7 @@ function _list_tables()
 	// --------------------------------------------------------------------
 
 	/**
-	 * Show columnn query
+	 * Show column query
 	 *
 	 * Generates a platform-specific query string so that the column names can be fetched
 	 *
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 340d6504..f74e652d 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -305,7 +305,7 @@ function _list_tables()
 	// --------------------------------------------------------------------
 
 	/**
-	 * Show columnn query
+	 * Show column query
 	 *
 	 * Generates a platform-specific query string so that the column names can be fetched
 	 *
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index 9da50b67..fd9fd2c5 100644
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
@@ -297,7 +297,7 @@ function _list_tables()
 	// --------------------------------------------------------------------
 
 	/**
-	 * Show columnn query
+	 * Show column query
 	 *
 	 * Generates a platform-specific query string so that the column names can be fetched
 	 *
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index 03519e68..91186242 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -507,7 +507,7 @@ function timezone_menu($default = 'UTC', $class = "", $name = 'timezones')
  * Timezones
  *
  * Returns an array of timezones.  This is a helper function
- * for varios other ones in this library
+ * for various other ones in this library
  *
  * @access	public
  * @param	string	timezone
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index 635ef1ba..7a04324e 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -73,7 +73,7 @@ function read_file($file)
  * Write File
  *
  * Writes data to the file specified in the path. 
- * Creats a new file if non-existant.
+ * Creates a new file if non-existent.
  *
  * @access	public
  * @param	string	path to file
@@ -102,7 +102,7 @@ function write_file($path, $data, $mode = 'wb')
  *
  * Deletes all files contained in the supplied directory path.
  * Files must be writable or owned by the system in order to be deleted.
- * If the second parameter is set to TRUE, any direcotries contained
+ * If the second parameter is set to TRUE, any directories contained
  * within the supplied base directory will be nuked as well.
  *
  * @access	public
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 3fd36104..e12d8931 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -204,7 +204,7 @@ function form_textarea($data = '', $value = '', $extra = '')
 // ------------------------------------------------------------------------
 
 /**
- * Dropdown Menu
+ * Drop-down Menu
  *
  * @access	public
  * @param	string
@@ -348,7 +348,7 @@ function form_prep($str = '')
  *
  * @access	private
  * @param	array
- * @parm	array
+ * @param	array
  * @return	string
  */	
 function parse_form_attributes($attributes, $default)
diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php
index 347cab42..34386ffe 100644
--- a/system/helpers/security_helper.php
+++ b/system/helpers/security_helper.php
@@ -31,8 +31,8 @@
  * XSS Filtering
  *
  * @access	public
- * @parm	string
- * @parm	string	the character set of your data
+ * @param	string
+ * @param	string	the character set of your data
  * @return	string
  */	
 function xss_clean($str, $charset = 'ISO-8859-1')
@@ -84,7 +84,7 @@ function dohash($str, $type = 'sha1')
  * Strip Image Tags
  *
  * @access	public
- * @parm	string
+ * @param	string
  * @return	string
  */	
 function strip_image_tags($str)
@@ -101,7 +101,7 @@ function strip_image_tags($str)
  * Convert PHP tags to entities
  *
  * @access	public
- * @parm	string
+ * @param	string
  * @return	string
  */	
 function encode_php_tags($str)
diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index ba680487..fe9e3bb9 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -65,7 +65,7 @@ function nl2br_except_pre($str)
  * 
  *
  * @access	public
- * @parm	string
+ * @param	string
  * @return	string
  */
 function auto_typography($str)
@@ -125,7 +125,7 @@ function convert($str)
 		$str = preg_replace("/\n\n+/", "\n\n", $str);
 
 		/*
-		 * Convert quotes within tags to tempoarary marker
+		 * Convert quotes within tags to temporary marker
 		 *
 		 * We don't want quotes converted within 
 		 * tags so we'll temporarily convert them to 
@@ -156,7 +156,7 @@ function convert($str)
 		$str = preg_replace("#(block_elements.")(.*?>)#", "\\1\\2\\3
              ", $str);
 	
 		/*
-		 * Convert "ignore" tags to tempoarary marker
+		 * Convert "ignore" tags to temporary marker
 		 *
 		 * The parser splits out the string at every tag
 		 * it encounters.  Certain inline tags, like image 
diff --git a/system/helpers/user_agent_helper.php b/system/helpers/user_agent_helper.php
deleted file mode 100644
index 3c6085e7..00000000
--- a/system/helpers/user_agent_helper.php
+++ /dev/null
@@ -1,89 +0,0 @@
- 'Windows Longhorn',
-					'windows nt 5.2'	=> 'Windows 2003',
-					'windows nt 5.0'	=> 'Windows 2000',
-					'windows nt 5.1'	=> 'Windows XP',
-					'windows nt 4.0'	=> 'Windows NT 4.0',
-					'winnt4.0'			=> 'Windows NT 4.0',
-					'winnt 4.0'			=> 'Windows NT',
-					'winnt'				=> 'Windows NT',
-					'windows 98'		=> 'Windows 98',
-					'win98'				=> 'Windows 98',
-					'windows 95'		=> 'Windows 95',
-					'win95'				=> 'Windows 95',
-					'windows'			=> 'Unknown Windows OS',
-					'mac os x'			=> 'Mac OS X',
-					'freebsd'			=> 'FreeBSD',
-					'ppc'				=> 'Macintosh',
-					'sunos'				=> 'Sun Solaris',
-					'linux'				=> 'Linux',
-					'debian'			=> 'Debian',
-					'beos'				=> 'BeOS',
-					'apachebench'		=> 'ApacheBench',
-					'aix'				=> 'AIX',
-					'irix'				=> 'Irix',
-					'osf'				=> 'DEC OSF',
-					'hp-ux'				=> 'HP-UX',
-					'netbsd'			=> 'NetBSD',
-					'bsdi'				=> 'BSDi',
-					'openbsd'			=> 'OpenBSD',
-					'gnu'				=> 'GNU/Linux',
-					'unix'				=> 'Unknown Unix OS'
-				);
-	
-	
-	foreach ($os as $key => $val) 
-	{
-		if (preg_match("|$key|i", $_SERVER['HTTP_USER_AGENT'])) 
-		{
-			return $val;
-		}
-	}
-
-	return 'Unknown OS';
-}
-
-
-?>
\ No newline at end of file
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index 048934b8..52e99b5a 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -250,7 +250,7 @@ function generate($year = '', $month = '', $data = array())
 	 * month provided.
 	 *
 	 * @access	public
-	 * @parm	integer	the month
+	 * @param	integer	the month
 	 * @return	string
 	 */
 	function get_month_name($month)

From 1604062c207cc70eaa8f528e59756a807ba045db Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 21 Oct 2006 19:09:49 +0000
Subject: [PATCH 0366/2544]

---
 system/libraries/Benchmark.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/libraries/Benchmark.php b/system/libraries/Benchmark.php
index 5fd24b05..44c32a87 100644
--- a/system/libraries/Benchmark.php
+++ b/system/libraries/Benchmark.php
@@ -59,8 +59,8 @@ function mark($name)
 	 * swap the real value for this variable.
 	 *
 	 * @access	public
-	 * @param	string	a paricular marked point
-	 * @param	string	a paricular marked point
+	 * @param	string	a particular marked point
+	 * @param	string	a particular marked point
 	 * @param	integer	the number of decimal places
 	 * @return	mixed
 	 */

From 5f95aab62d3923e05dacf65d94eeefb2283edc4d Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 21 Oct 2006 19:10:51 +0000
Subject: [PATCH 0367/2544]

---
 system/libraries/Calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index 52e99b5a..ec355d24 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -246,7 +246,7 @@ function generate($year = '', $month = '', $data = array())
 	/**
 	 * Get Month Name
 	 *
-	 * Generates a texual month name based on the numeric 
+	 * Generates a textual month name based on the numeric 
 	 * month provided.
 	 *
 	 * @access	public

From 23db0ddcd518b8a6ab8b7688a3eab756a73463f0 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 21 Oct 2006 19:16:50 +0000
Subject: [PATCH 0368/2544]

---
 system/libraries/Email.php | 63 ++++----------------------------------
 1 file changed, 6 insertions(+), 57 deletions(-)

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 23f7fe45..eb04ae9d 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -87,7 +87,6 @@ function CI_Email($config = array())
 
 		log_message('debug', "Email Class Initialized");
 	}
-	// END CI_Email()
   
 	// --------------------------------------------------------------------
 
@@ -120,7 +119,6 @@ function initialize($config = array())
         $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE;			
 		$this->_safe_mode = (@ini_get("safe_mode") == 0) ? FALSE : TRUE;
 	}
-  	// END initialize()
   	
 	// --------------------------------------------------------------------
 
@@ -151,7 +149,6 @@ function clear($clear_attachments = FALSE)
             $this->_attach_disp = array();
         }   		
 	}
-  	// END clear()
   	
 	// --------------------------------------------------------------------
 
@@ -179,7 +176,6 @@ function from($from, $name = '')
 		$this->_set_header('From', $name.' <'.$from.'>');
 		$this->_set_header('Return-Path', '<'.$from.'>');
 	}
-  	// END from()
   	
 	// --------------------------------------------------------------------
 
@@ -212,7 +208,6 @@ function reply_to($replyto, $name = '')
 		$this->_set_header('Reply-To', $name.' <'.$replyto.'>');
 		$this->_replyto_flag = TRUE;
 	}
-  	// END reply_to()
   	
 	// --------------------------------------------------------------------
 
@@ -244,7 +239,6 @@ function to($to)
 			break;
 		}	
 	}
-  	// END to()
   	
 	// --------------------------------------------------------------------
 
@@ -268,7 +262,6 @@ function cc($cc)
 		if ($this->_get_protocol() == "smtp")
 			$this->_cc_array = $cc;
 	}
-  	// END cc()
   	
 	// --------------------------------------------------------------------
 
@@ -299,7 +292,6 @@ function bcc($bcc, $limit = '')
 		else
 			$this->_set_header('Bcc', implode(", ", $bcc));
 	}
-  	// END bcc()
   	
 	// --------------------------------------------------------------------
 
@@ -317,7 +309,6 @@ function subject($subject)
 		
 		$this->_set_header('Subject', trim($subject));		
 	}
-  	// END subject()
   	
 	// --------------------------------------------------------------------
 
@@ -339,7 +330,6 @@ function message($body)
 			
 		$this->_body = stripslashes($this->_body);
 	}	
- 	// END message()
  	
 	// --------------------------------------------------------------------
 
@@ -356,7 +346,6 @@ function attach($filename, $disposition = 'attachment')
 		$this->_attach_type[] = $this->_mime_types(next(explode('.', basename($filename))));
 		$this->_attach_disp[] = $disposition; // Can also be 'inline'  Not sure if it matters 
 	}
-  	// END attach()
   
 	// --------------------------------------------------------------------
 
@@ -372,7 +361,6 @@ function _set_header($header, $value)
 	{
 		$this->_headers[$header] = $value;
 	}
-  	// END _set_header()
   	
 	// --------------------------------------------------------------------
 
@@ -409,7 +397,6 @@ function _str_to_array($email)
 		}
 		return $email;
 	}
-  	// END _str_to_array()
   	
 	// --------------------------------------------------------------------
 
@@ -424,7 +411,6 @@ function set_alt_message($str = '')
 	{
 		$this->alt_message = ($str == '') ? '' : $str;
 	}
-  	// END set_alt_message()
   	
 	// --------------------------------------------------------------------
 
@@ -439,7 +425,6 @@ function set_mailtype($type = 'text')
 	{
 		$this->mailtype = ($type == 'html') ? 'html' : 'text';
 	}
-  	// END set_mailtype()
   	
 	// --------------------------------------------------------------------
 
@@ -454,12 +439,11 @@ function set_wordwrap($wordwrap = TRUE)
 	{
 		$this->wordwrap = ($wordwrap === FALSE) ? FALSE : TRUE;
 	}
-  	// END set_wordwrap()
   	
 	// --------------------------------------------------------------------
 
 	/**
-	 * Set Protocal
+	 * Set Protocol
 	 *
 	 * @access	public
 	 * @param	string
@@ -469,7 +453,6 @@ function set_protocol($protocol = 'mail')
 	{ 
 		$this->protocol = ( ! in_array($protocol, $this->_protocols, TRUE)) ? 'mail' : strtolower($protocol);
 	}
-  	// END set_protocol()
   	
 	// --------------------------------------------------------------------
 
@@ -496,7 +479,6 @@ function set_priority($n = 3)
 	
 		$this->priority = $n;
 	}
-  	// END set_priority()
   	
 	// --------------------------------------------------------------------
 
@@ -517,22 +499,20 @@ function set_newline($newline = "\n")
 	
 		$this->newline	= $newline;	
 	}
-  	// END set_newline()
   	
 	// --------------------------------------------------------------------
 
 	/**
-	 * Set Message Boundry
+	 * Set Message Boundary
 	 *
 	 * @access	private
 	 * @return	void
 	 */	
 	function _set_boundaries()
 	{
-		$this->_alt_boundary = "B_ALT_".uniqid(''); // mulipart/alternative
+		$this->_alt_boundary = "B_ALT_".uniqid(''); // multipart/alternative
 		$this->_atc_boundary = "B_ATC_".uniqid(''); // attachment boundary
 	}
-  	// END _set_boundaries()
   	
 	// --------------------------------------------------------------------
 
@@ -550,7 +530,6 @@ function _get_message_id()
 	
         return  "<".uniqid('').strstr($from, '@').">";	        
 	}
-  	// END _get_message_id()
   	
 	// --------------------------------------------------------------------
 
@@ -569,7 +548,6 @@ function _get_protocol($return = true)
 		if ($return == true) 
 			return $this->protocol;
 	}
-  	// END _get_protocol()
   	
 	// --------------------------------------------------------------------
 
@@ -590,7 +568,6 @@ function _get_encoding($return = true)
 		if ($return == true) 
 			return $this->_encoding;
 	}
-	// END _get_encoding()
   
 	// --------------------------------------------------------------------
 
@@ -613,7 +590,6 @@ function _get_content_type()
 				
 		  else	return 'plain';
 	}
-  	// END _get_content_type()
   	
 	// --------------------------------------------------------------------
 
@@ -632,7 +608,6 @@ function _set_date()
 		
 		return sprintf("%s %s%04d", date("D, j M Y H:i:s"), $operator, $timezone);
 	}
-  	// END _set_date()
   	
 	// --------------------------------------------------------------------
 
@@ -646,7 +621,6 @@ function _get_mime_message()
 	{
 		return "This is a multi-part message in MIME format.".$this->newline."Your email application may not support this format.";
 	}
-  	// END _get_mime_message()
   	
 	// --------------------------------------------------------------------
 
@@ -674,7 +648,6 @@ function validate_email($email)
 			}
 		}
 	}	
-  	// END validate_email()
   	
 	// --------------------------------------------------------------------
 
@@ -692,7 +665,6 @@ function valid_email($address)
 		else 
 			return TRUE;
 	}
-  	// END valid_email()
   	
 	// --------------------------------------------------------------------
 
@@ -725,7 +697,6 @@ function clean_email($email)
 		
 		return $clean_email;
 	}
-  	// END clean_email()
   	
 	// --------------------------------------------------------------------
 
@@ -773,7 +744,6 @@ function _get_alt_message()
 
 		return $this->word_wrap($body, '76');
 	}
-  	// END _get_alt_message()
   	
 	// --------------------------------------------------------------------
 
@@ -846,7 +816,6 @@ function word_wrap($str, $chars = '')
 
 		return $output;	
 	}
-  	// END word_wrap()
   	
 	// --------------------------------------------------------------------
 
@@ -865,7 +834,6 @@ function _build_headers()
 		$this->_set_header('Message-ID', $this->_get_message_id());		
 		$this->_set_header('Mime-Version', '1.0');
 	}
-  	// END _build_headers()
   	
 	// --------------------------------------------------------------------
 
@@ -899,7 +867,6 @@ function _write_headers()
 		if ($this->_get_protocol() == 'mail')
 			$this->_header_str = substr($this->_header_str, 0, -1);				
 	}
-  	// END _write_headers()
   	
 	// --------------------------------------------------------------------
 
@@ -1062,7 +1029,6 @@ function _build_message()
 		
 		return;	
 	}
-  	// END _build_message()
   	
 	// --------------------------------------------------------------------
 
@@ -1102,12 +1068,11 @@ function send()
 		else
 			return TRUE;
 	}
-  	// END send()
   	
 	// --------------------------------------------------------------------
 
 	/**
-	 * Batch Bcc Send.  Sends groups of Bccs in batches
+	 * Batch Bcc Send.  Sends groups of BCCs in batches
 	 *
 	 * @access	public
 	 * @return	bool
@@ -1154,7 +1119,6 @@ function batch_bcc_send()
 			$this->_spool_email();		
 		}
 	}
-  	// END batch_bcc_send()
   	
 	// --------------------------------------------------------------------
 
@@ -1168,7 +1132,6 @@ function _unwrap_specials()
     {
         $this->_finalbody = preg_replace_callback("/\{unwrap\}(.*?)\{\/unwrap\}/si", array($this, '_remove_nl_callback'), $this->_finalbody);
     }
-  	// END _unwrap_specials()
   	
 	// --------------------------------------------------------------------
 
@@ -1182,7 +1145,6 @@ function _remove_nl_callback($matches)
     {
         return preg_replace("/(\r\n)|(\r)|(\n)/", "", $matches['1']);    
     }
-  	// END _remove_nl_callback()
   	
 	// --------------------------------------------------------------------
 
@@ -1190,7 +1152,7 @@ function _remove_nl_callback($matches)
 	 * Spool mail to the mail server
 	 *
 	 * @access	private
-	 * @return	bol
+	 * @return	bool
 	 */	
 	function _spool_email()
 	{
@@ -1228,7 +1190,6 @@ function _spool_email()
 		$this->_set_error_message('email_sent', $this->_get_protocol());
 		return true;
 	}	
-  	// END _spool_email()
   	
 	// --------------------------------------------------------------------
 
@@ -1255,7 +1216,6 @@ function _send_with_mail()
 				return TRUE;
 		}
 	}
-  	// END _send_with_mail()
   	
 	// --------------------------------------------------------------------
 
@@ -1281,7 +1241,6 @@ function _send_with_sendmail()
 		
 		return TRUE;
 	}
-  	// END _send_with_sendmail()
   	
 	// --------------------------------------------------------------------
 
@@ -1344,7 +1303,6 @@ function _send_with_smtp()
 		$this->_send_command('quit');
 		return true;
 	}	
-  	// END _send_with_smtp()
   	
 	// --------------------------------------------------------------------
 
@@ -1373,7 +1331,6 @@ function _smtp_connect()
 		$this->_set_error_message($this->_get_smtp_data());
 		return $this->_send_command('hello');
 	}
-  	// END _smtp_connect()
   	
 	// --------------------------------------------------------------------
 
@@ -1439,7 +1396,6 @@ function _send_command($cmd, $data = '')
 	
 		return true;
 	}
-  	// END _send_command()
   	
 	// --------------------------------------------------------------------
 
@@ -1492,7 +1448,6 @@ function _smtp_authenticate()
 	
 		return true;
 	}
-  	// END _smtp_authenticate()
   	
 	// --------------------------------------------------------------------
 
@@ -1512,7 +1467,6 @@ function _send_data($data)
 		else
 			return true;
 	}
-  	// END _send_data()
   	
 	// --------------------------------------------------------------------
 
@@ -1536,7 +1490,6 @@ function _get_smtp_data()
     	
     	return $data;
 	}
-  	// END _get_smtp_data()
   	
 	// --------------------------------------------------------------------
 
@@ -1550,7 +1503,6 @@ function _get_hostname()
 	{	
 		return (isset($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : 'localhost.localdomain';	
 	}
-  	// END _get_hostname()
   	
 	// --------------------------------------------------------------------
 
@@ -1591,12 +1543,11 @@ function _get_ip()
 		
 		return $this->_IP;
 	}
-  	// END _get_ip()
   	
 	// --------------------------------------------------------------------
 
 	/**
-	 * Get Debugg Message
+	 * Get Debug Message
 	 *
 	 * @access	public
 	 * @return	string
@@ -1641,7 +1592,6 @@ function _set_error_message($msg, $val = '')
 			$this->_debug_msg[] = str_replace('%s', $val, $line)."
              ";
 		}	
 	}
-  	// END _set_error_message()
   	
 	// --------------------------------------------------------------------
 
@@ -1745,7 +1695,6 @@ function _mime_types($ext = "")
 
 		return ( ! isset($mimes[strtolower($ext)])) ? "application/x-unknown-content-type" : $mimes[strtolower($ext)];
 	}
-	// END _mime_types()
 
 }
 // END CI_Email class

From bd6bee75dd26ade1c8d9cfd104bb913065797c59 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 21 Oct 2006 19:39:00 +0000
Subject: [PATCH 0369/2544]

---
 system/libraries/Config.php     | 14 ++-----------
 system/libraries/Exceptions.php | 11 +++-------
 system/libraries/Hooks.php      |  3 ---
 system/libraries/Image_lib.php  | 36 ++++++---------------------------
 system/libraries/Input.php      | 12 +++++------
 system/libraries/Language.php   |  3 ---
 system/libraries/Loader.php     |  4 ++--
 system/libraries/Pagination.php |  2 +-
 system/libraries/Parser.php     |  5 -----
 system/libraries/Profiler.php   |  2 +-
 system/libraries/Router.php     |  8 ++++----
 system/libraries/Session.php    |  4 +---
 system/libraries/Sha1.php       |  5 -----
 system/libraries/Table.php      |  2 +-
 system/libraries/Trackback.php  | 19 +++--------------
 system/libraries/Unit_test.php  |  2 +-
 system/libraries/Upload.php     |  4 ++--
 17 files changed, 33 insertions(+), 103 deletions(-)

diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index 82836b1f..ef6d46a2 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -46,9 +46,7 @@ function CI_Config()
 	{
 		$this->config = get_config();
 		log_message('debug', "Config Class Initialized");
-	}
-  	// END CI_Config()
-  	
+	}  	
   	
 	// --------------------------------------------------------------------
 
@@ -110,7 +108,6 @@ function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
 		log_message('debug', 'Config file loaded: config/'.$file.EXT);
 		return TRUE;
 	}
-  	// END load()
   	
 	// --------------------------------------------------------------------
 
@@ -152,7 +149,6 @@ function item($item, $index = '')
 
         return $pref;
 	}
-  	// END item()
   	
   	// --------------------------------------------------------------------
 
@@ -186,9 +182,6 @@ function slash_item($item)
         
         return $pref;
 	}
-  	// END item()
-  	
-  	
   	
 	// --------------------------------------------------------------------
 
@@ -216,8 +209,7 @@ function site_url($uri = '')
 			return $this->slash_item('base_url').$this->slash_item('index_page').preg_replace("|^/*(.+?)/*$|", "\\1", $uri).$suffix;
 		}
 	}
-  	// END site_url()
-  	
+	
 	// --------------------------------------------------------------------
 
 	/**
@@ -231,7 +223,6 @@ function system_url()
 		$x = explode("/", preg_replace("|/*(.+?)/*$|", "\\1", BASEPATH));
 		return $this->slash_item('base_url').end($x).'/';
 	}
-  	// END system_url()
   	
 	// --------------------------------------------------------------------
 
@@ -247,7 +238,6 @@ function set_item($item, $value)
 	{
 		$this->config[$item] = $value;
 	}
-	// END set_item()
 
 }
 
diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php
index 4bdbe4f8..a0591e4e 100644
--- a/system/libraries/Exceptions.php
+++ b/system/libraries/Exceptions.php
@@ -55,7 +55,6 @@ function CI_Exceptions()
 	{
 		// Note:  Do not log messages from this constructor.
 	}
-  	// END CI_Exceptions()
   	
 	// --------------------------------------------------------------------
 
@@ -77,7 +76,6 @@ function log_exception($severity, $message, $filepath, $line)
 		
 		log_message('error', 'Severity: '.$severity.' '.$severity.' --> '.$message. ' '.$filepath.' '.$line, TRUE);
 	}
-	// END log_exception()
   
 	// --------------------------------------------------------------------
 
@@ -97,7 +95,6 @@ function show_404($page = '')
 		echo $this->show_error($heading, $message, 'error_404');
 		exit;
 	}
-  	// END show_404()
   	
 	// --------------------------------------------------------------------
 
@@ -105,7 +102,7 @@ function show_404($page = '')
 	 * General Error Page
 	 *
 	 * This function takes an error message as input
-	 * (either as a string or an array) and displayes
+	 * (either as a string or an array) and displays
 	 * it using the specified template.
 	 *
 	 * @access	private
@@ -128,8 +125,6 @@ function show_error($heading, $message, $template = 'error_general')
 		ob_end_clean();
 		return $buffer;
 	}
-	// END show_error()
-
   
 	// --------------------------------------------------------------------
 
@@ -166,8 +161,8 @@ function show_php_error($severity, $message, $filepath, $line)
 		ob_end_clean();
 		echo $buffer;
 	}
-  	// END show_php_error()
 
-// END Exceptions Class
+
 }
+// END Exceptions Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Hooks.php b/system/libraries/Hooks.php
index 3c35c908..6f48723f 100644
--- a/system/libraries/Hooks.php
+++ b/system/libraries/Hooks.php
@@ -109,7 +109,6 @@ function _call_hook($which = '')
 		
 		return TRUE;
 	}
-  	// END hook_exists()
 
 	// --------------------------------------------------------------------
 
@@ -218,8 +217,6 @@ function _run_hook($data)
 		$this->in_progress = FALSE;
 		return TRUE;
 	}
-  	// END _run_hook()
-
 
 }
 
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 16583c06..f8c05f83 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -92,7 +92,6 @@ function CI_Image_lib($props = array())
 		
 		log_message('debug', "Image Lib Class Initialized");
 	}
-	// END CI_Image_lib()
 	
 	// --------------------------------------------------------------------
 	
@@ -113,7 +112,6 @@ function clear()
 			$this->$val = '';
 		}  		
 	}
-	// END clear()
 	
 	// --------------------------------------------------------------------
 	
@@ -186,7 +184,7 @@ function initialize($props = array())
 		$this->source_image = end($x);
 		$this->source_folder = str_replace($this->source_image, '', $full_source_path);
 								
-		// Set the Image Propterties
+		// Set the Image Properties
 		if ( ! $this->get_image_properties($this->source_folder.$this->source_image))
 		{
 			return FALSE;       	
@@ -333,7 +331,6 @@ function initialize($props = array())
 
 		return TRUE;
 	} 
-	// END initialize()
 	
 	// --------------------------------------------------------------------
 	
@@ -357,7 +354,6 @@ function resize()
 		
 		return $this->$protocol('resize');
 	}
-	// END resize()
 	
 	// --------------------------------------------------------------------
 	
@@ -381,7 +377,6 @@ function crop()
 		
 		return $this->$protocol('crop');
 	}
-	// END crop()
 	
 	// --------------------------------------------------------------------
 	
@@ -435,7 +430,6 @@ function rotate()
 			return $this->image_rotate_gd();
 		}
 	}
-	// END rotate()
 	
 	// --------------------------------------------------------------------
 	
@@ -540,7 +534,6 @@ function image_process_gd($action = 'resize')
 		
 		return TRUE;
 	}
-	// END image_process_gd()
 	
 	// --------------------------------------------------------------------
 	
@@ -611,7 +604,6 @@ function image_process_imagemagick($action = 'resize')
 		
 		return TRUE;
 	}
-	// END image_process_imagemagick()
 	
 	// --------------------------------------------------------------------
 	
@@ -698,7 +690,6 @@ function image_process_netpbm($action = 'resize')
 		
 		return TRUE;
 	}
-	// END image_process_netpbm()
 	
 	// --------------------------------------------------------------------
 	
@@ -758,7 +749,6 @@ function image_rotate_gd()
 		
 		return true;
 	}
-	// END image_rotate_gd()
 	
 	// --------------------------------------------------------------------
 	
@@ -843,7 +833,6 @@ function image_mirror_gd()
 		
 		return TRUE;
 	}
-	// END image_mirror_gd()
 	
 	// --------------------------------------------------------------------
 	
@@ -868,7 +857,6 @@ function watermark()
 			return $this->text_watermark();
 		}
 	}
-	// END image_mirror_gd()
 	
 	// --------------------------------------------------------------------
 	
@@ -969,7 +957,6 @@ function overlay_watermark()
 				
 		return TRUE;
 	}
-	// END overlay_watermark()
 	
 	// --------------------------------------------------------------------
 	
@@ -1110,7 +1097,6 @@ function text_watermark()
 	
 		return TRUE;
 	}
-	// END text_watermark()
 	
 	// --------------------------------------------------------------------
 	
@@ -1168,12 +1154,11 @@ function image_create_gd($path = '', $image_type = '')
 		$this->set_error(array('imglib_unsupported_imagecreate'));
 		return FALSE;
 	}
-	// END image_create_gd()
 	
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Write imge file to disk - GD
+	 * Write image file to disk - GD
 	 *
 	 * Takes an image resource as input and writes the file 
 	 * to the specified destination
@@ -1226,12 +1211,11 @@ function image_save_gd($resource)
 	
 		return TRUE;
 	}	
-	// END image_save_gd()
 	
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Dynamically ouputs an image
+	 * Dynamically outputs an image
 	 *
 	 * @access	public
 	 * @param	resource
@@ -1256,18 +1240,17 @@ function image_display_gd($resource)
 				break;		
 		}			
 	}
-	// END image_display_gd()
 	
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Reproportion Image Width/Height
+	 * Re-proportion Image Width/Height
 	 *
 	 * When creating thumbs, the desired width/height
 	 * can end up warping the image due to an incorrect 
 	 * ratio between the full-sized image and the thumb. 
 	 * 
-	 * This function lets us reproportion the width/height
+	 * This function lets us re-proportion the width/height
 	 * if users choose to maintain the aspect ratio when resizing.
 	 *
 	 * @access	public
@@ -1303,7 +1286,6 @@ function image_reproportion()
 			}
 		}
 	}	
-	// END image_reproportion()
 	
 	// --------------------------------------------------------------------
 	
@@ -1355,7 +1337,6 @@ function get_image_properties($path = '', $return = FALSE)
 		
 		return TRUE;
 	}
-	// END get_image_properties()
 	
 	// --------------------------------------------------------------------
 	
@@ -1406,7 +1387,6 @@ function size_calculator($vals)
 	
 		return $vals;
 	}
-	// END size_calculator()
 	
 	// --------------------------------------------------------------------
 	
@@ -1447,7 +1427,6 @@ function explode_name($source_image)
 		
 		return $ret;
 	}	
-	// END explode_name()
 	
 	// --------------------------------------------------------------------
 	
@@ -1469,7 +1448,6 @@ function gd_loaded()
 		
 		return TRUE;
 	}
-	// END gd_loaded()
 	
 	// --------------------------------------------------------------------
 	
@@ -1491,7 +1469,6 @@ function gd_version()
 		
 		return FALSE;
 	}
-	// END gd_version()
 	
 	// --------------------------------------------------------------------
 	
@@ -1524,7 +1501,6 @@ function set_error($msg)
 			log_message('error', $msg);
 		}
 	}
-	// END set_error()
 	
 	// --------------------------------------------------------------------
 	
@@ -1545,7 +1521,7 @@ function display_errors($open = '
              ', $close = '
              ')
 	
 		return $str;
 	}
-	// END display_errors()
+
 }
 // END Image_lib Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index 72344e34..57696c8a 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -55,7 +55,7 @@ function CI_Input()
 	/**
 	 * Sanitize Globals
 	 *
-	 * This function does the folowing:
+	 * This function does the following:
 	 *
 	 * Unsets $_GET data (if query strings are not enabled)
 	 *
@@ -114,7 +114,7 @@ function _sanitize_globals()
 	// --------------------------------------------------------------------
 	
 	/**
-	 * Clean Intput Data
+	 * Clean Input Data
 	 *
 	 * This is a helper function. It escapes data and 
 	 * standardizes newline characters to \n
@@ -399,7 +399,7 @@ function xss_clean($str, $charset = 'ISO-8859-1')
 		$str = preg_replace('/(\\\\0)+/', '', $str);
 
 		/*
-		 * Validate standard character entites
+		 * Validate standard character entities
 		 *
 		 * Add a semicolon if missing.  We do this to enable
 		 * the conversion of entities to ASCII later.
@@ -408,7 +408,7 @@ function xss_clean($str, $charset = 'ISO-8859-1')
 		$str = preg_replace('#(&\#*\w+)[\x00-\x20]+;#u',"\\1;",$str);
 		
 		/*
-		 * Validate UTF16 two byte encodeing (x00) 
+		 * Validate UTF16 two byte encoding (x00) 
 		 *
 		 * Just as above, adds a semicolon if missing.
 		 *
@@ -501,7 +501,7 @@ function xss_clean($str, $charset = 'ISO-8859-1')
 		 *
 		 * Note: This code is a little blunt.  It removes
 		 * the event handler and anything up to the closing >, 
-		 * but it's unlkely to be a problem.
+		 * but it's unlikely to be a problem.
 		 *
 		 */		
 		 $str = preg_replace('#(<[^>]+.*?)(onblur|onchange|onclick|onfocus|onload|onmouseover|onmouseup|onmousedown|onselect|onsubmit|onunload|onkeypress|onkeydown|onkeyup|onresize)[^>]*>#iU',"\\1>",$str);
@@ -525,7 +525,7 @@ function xss_clean($str, $charset = 'ISO-8859-1')
 		 * tags it looks for PHP and JavaScript commands
 		 * that are disallowed.  Rather than removing the
 		 * code, it simply converts the parenthesis to entities
-		 * rendering the code unexecutable.
+		 * rendering the code un-executable.
 		 *
 		 * For example:	eval('some code')
 		 * Becomes:		eval('some code')
diff --git a/system/libraries/Language.php b/system/libraries/Language.php
index 00e2fb7e..82508074 100644
--- a/system/libraries/Language.php
+++ b/system/libraries/Language.php
@@ -38,7 +38,6 @@ function CI_Language()
 	{
 		log_message('debug', "Language Class Initialized");
 	}
-	// END CI_Language()
 	
 	// --------------------------------------------------------------------
 	
@@ -103,7 +102,6 @@ function load($langfile = '', $idiom = '', $return = FALSE)
 		log_message('debug', 'Language file loaded: language/'.$idiom.'/'.$langfile);
 		return TRUE;
 	}
-	// END load()
 	
 	// --------------------------------------------------------------------
 	
@@ -118,7 +116,6 @@ function line($line = '')
 	{
 		return ($line == '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line];
 	}
-	// END line()
 
 }
 // END Language Class
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 253d916c..849ee731 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -820,7 +820,7 @@ function _ci_autoloader()
 	 * Assign to Models
 	 *
 	 * Makes sure that anything loaded by the loader class (libraries, plugins, etc.)
-	 * will be available to modles, if any exist.
+	 * will be available to models, if any exist.
 	 *
 	 * @access	private
 	 * @param	object
@@ -855,7 +855,7 @@ function _ci_assign_to_models()
 	/**
 	 * Object to Array
 	 *
-	 * Takes an object as input and convers the class variables to array key/vals
+	 * Takes an object as input and converts the class variables to array key/vals
 	 *
 	 * @access	private
 	 * @param	object
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index b29571ee..26fb93ee 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -199,7 +199,7 @@ function create_links()
         }
     
 		// Kill double slashes.  Note: Sometimes we can end up with a double slash 
-		// in the penultimate link so we'll kill all double shashes.
+		// in the penultimate link so we'll kill all double slashes.
 		$output = preg_replace("#([^:])//+#", "\\1/", $output);  
 
 		// Add the wrapper HTML if exists
diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php
index a0c9dab9..ebf7644a 100644
--- a/system/libraries/Parser.php
+++ b/system/libraries/Parser.php
@@ -71,7 +71,6 @@ function parse($template, $data, $return = FALSE)
 		
 		return $template;
 	}
-	// END set_method()
 	
 	// --------------------------------------------------------------------
 	
@@ -88,7 +87,6 @@ function set_delimiters($l = '{', $r = '}')
 		$this->l_delim = $l;
 		$this->r_delim = $r;
 	}
-	// END set_method()
 	
 	// --------------------------------------------------------------------
 	
@@ -105,7 +103,6 @@ function _parse_single($key, $val, $string)
 	{
 		return str_replace($this->l_delim.$key.$this->r_delim, $val, $string);
 	}
-	// END set_method()
 	
 	// --------------------------------------------------------------------
 	
@@ -148,7 +145,6 @@ function _parse_pair($variable, $data, $string)
 		
 		return str_replace($match['0'], $str, $string);
 	}
-	// END set_method()
 	
 	// --------------------------------------------------------------------
 	
@@ -169,7 +165,6 @@ function _match_pair($string, $variable)
 		
 		return $match;
 	}
-	// END _match_pair()
 
 }
 // END Parser Class
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 7fecabd2..6e6fb675 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -46,7 +46,7 @@ function CI_Profiler()
 	 * Auto Profiler
 	 *
 	 * This function cycles through the entire array of mark points and
-	 * matches any two points that are named identially (ending in "_start"
+	 * matches any two points that are named identically (ending in "_start"
 	 * and "_end" respectively).  It then compiles the execution times for
 	 * all points and returns it as an array
 	 *
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 94a9a524..6002027d 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -58,7 +58,7 @@ function CI_Router()
 	/**
 	 * Set the route mapping
 	 *
-	 * This function determies what should be served based on the URI request,
+	 * This function determines what should be served based on the URI request,
 	 * as well as any "routes" that have been set in the routing config file.
 	 *
 	 * @access	private
@@ -322,7 +322,7 @@ function _get_uri_string()
 			
 			// OK, how about REQUEST_URI?  
 			// Note: REQUEST_URI is not supplied in a consistent manner with all platforms so it's
-			// a diffucult variable to use.  We'll try to parse it out correctly.  Hopfully one 
+			// a difficult variable to use.  We'll try to parse it out correctly.  Hopefully one 
 			// of the other variables above was available.
 			$path = $this->_parse_request_uri();
 			if ($path != "")
@@ -452,10 +452,10 @@ function _parse_routes()
 			return;
 		}
 				
-		// Loop through the route array looking for wildcards
+		// Loop through the route array looking for wild-cards
 		foreach (array_slice($this->routes, 1) as $key => $val)
 		{						
-			// Convert wildcards to RegEx
+			// Convert wild-cards to RegEx
 			$key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key));
 			
 			// Does the RegEx match?
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 8390fd6d..a47599d1 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -35,8 +35,7 @@ class CI_Session {
     var $sess_cookie	= 'ci_session';
 	var $userdata		= array();
     var $gc_probability	= 5;
-
-    
+ 
 
 	/**
 	 * Session Constructor
@@ -51,7 +50,6 @@ function CI_Session()
 		log_message('debug', "Session Class Initialized");
 		$this->sess_run();
 	}
-	// END display_errors()
 	
 	// --------------------------------------------------------------------
 	
diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php
index 13196eb6..971c091a 100644
--- a/system/libraries/Sha1.php
+++ b/system/libraries/Sha1.php
@@ -117,7 +117,6 @@ function generate($str)
         
         return $this->_hex($a).$this->_hex($b).$this->_hex($c).$this->_hex($d).$this->_hex($e);
     }
-  	// END generate()
   	
 	// --------------------------------------------------------------------
 
@@ -139,7 +138,6 @@ function _hex($str)
             
         return $str;
     }    
-  	// END _hex()
   	
 	// --------------------------------------------------------------------
 
@@ -160,7 +158,6 @@ function _ft($t, $b, $c, $d)
         
         return $b ^ $c ^ $d;
     }
-    // END _ft()
   
 	// --------------------------------------------------------------------
 
@@ -189,7 +186,6 @@ function _kt($t)
             return -899497514;
         }
     }
-  	// END _kt()
   	
 	// --------------------------------------------------------------------
 
@@ -206,7 +202,6 @@ function _safe_add($x, $y)
     
         return ($msw << 16) | ($lsw & 0xFFFF);
     }
-  	// END _safe_add()
   	
 	// --------------------------------------------------------------------
 
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 758676e2..c40c85e1 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -123,7 +123,7 @@ function generate($table_data = NULL)
 			return 'Undefined table data';
 		}
 	
-		// Compile and validate the templata date
+		// Compile and validate the template date
 		$this->_compile_template();
 	
 	
diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php
index 8b6cce16..74649151 100644
--- a/system/libraries/Trackback.php
+++ b/system/libraries/Trackback.php
@@ -120,8 +120,7 @@ function send($tb_data)
 		}
 
 		return $return;
-	}	
-	// END send()
+	}
 	
 	// --------------------------------------------------------------------
 	
@@ -165,14 +164,13 @@ function receive()
 
 		return TRUE;
 	}	
-	// END receive()
 	
 	// --------------------------------------------------------------------
 	
 	/**
 	 * Send Trackback Error Message
 	 *
-	 * Allows custom errros to be set.  By default it 
+	 * Allows custom errors to be set.  By default it 
 	 * sends the "incomplete information" error, as that's
 	 * the most common one.
 	 *
@@ -185,7 +183,6 @@ function send_error($message = 'Incomplete Information')
 		echo "\n\n1\n".$message."\n";
 		exit;
 	}
-	// END send_error()
 	
 	// --------------------------------------------------------------------
 	
@@ -203,7 +200,6 @@ function send_success()
 		echo "\n\n0\n";
 		exit;
 	}
-	// END send_success()
 	
 	// --------------------------------------------------------------------
 	
@@ -218,7 +214,6 @@ function data($item)
 	{
 		return ( ! isset($this->data[$item])) ? '' : $this->data[$item];
 	}
-	// END data()
 
 	// --------------------------------------------------------------------
 	
@@ -287,7 +282,6 @@ function process($url, $data)
 
 		return TRUE;
 	}
-	// END process()
 	
 	// --------------------------------------------------------------------
 	
@@ -326,7 +320,6 @@ function extract_urls($urls)
 		
 		return $urls;
 	}
-	// END extract_urls()
 	
 	// --------------------------------------------------------------------
 	
@@ -348,7 +341,6 @@ function validate_url($url)
 			$url = "http://".$url;
 		}
 	}
-	// END validate_url()
 	
 	// --------------------------------------------------------------------
 	
@@ -401,7 +393,6 @@ function get_id($url)
 			return $tb_id;
 		}		
 	}
-	// END get_id()
 	
 	// --------------------------------------------------------------------
 	
@@ -428,7 +419,6 @@ function convert_xml($str)
 			
 		return $str;
 	}	
-	// END get_id()
 	
 	// --------------------------------------------------------------------
 	
@@ -467,7 +457,6 @@ function limit_characters($str, $n = 500, $end_char = '…')
 			}		
 		}
 	}
-	// END get_id()
 	
 	// --------------------------------------------------------------------
 	
@@ -517,7 +506,6 @@ function convert_ascii($str)
 	   
 	   return $out;
 	}
-	// END convert_ascii()
 	
 	// --------------------------------------------------------------------
 	
@@ -533,7 +521,6 @@ function set_error($msg)
 		log_message('error', $msg);
 		$this->error_msg[] = $msg;
 	}
-	// END convert_ascii()
 	
 	// --------------------------------------------------------------------
 	
@@ -555,7 +542,7 @@ function display_errors($open = '
              ', $close = '
              ')
 	
 		return $str;
 	}
-	// END display_errors()
+
 }
 // END Trackback Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
index 41516238..6bfc59dc 100644
--- a/system/libraries/Unit_test.php
+++ b/system/libraries/Unit_test.php
@@ -220,7 +220,7 @@ function result($results = array())
 	 * This lets us set the template to be used to display results
 	 *
 	 * @access	public
-	 * @params	string
+	 * @param	string
 	 * @return	void
 	 */	
 	function set_template($template)
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 5bb506cd..09a47943 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -284,8 +284,8 @@ function set_upload_path($path)
 	 * Set the file name 
 	 *
 	 * This function takes a filename/path as input and looks for the 
-	 * existnace of a file with the same name. If found, it will append a 
-	 * number to the end of the filename to avoid overwritting a pre-existing file.
+	 * existence of a file with the same name. If found, it will append a 
+	 * number to the end of the filename to avoid overwriting a pre-existing file.
 	 *
 	 * @access	public
 	 * @param	string

From e334c472fb4be44feec3a73402fc4a2b062cbfc0 Mon Sep 17 00:00:00 2001
From: admin 
Date: Sat, 21 Oct 2006 19:44:22 +0000
Subject: [PATCH 0370/2544]

---
 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 +-
 .../database/drivers/mssql/mssql_driver.php   |  26 +-
 .../database/drivers/mssql/mssql_result.php   |  10 +-
 .../database/drivers/mssql/mssql_utility.php  |   6 +-
 .../database/drivers/mysql/mysql_driver.php   |  44 +-
 .../database/drivers/mysql/mysql_result.php   |   8 +-
 .../database/drivers/mysql/mysql_utility.php  |  52 +-
 .../database/drivers/mysqli/mysqli_driver.php |  34 +-
 .../database/drivers/mysqli/mysqli_result.php |  10 +-
 .../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 +-
 .../drivers/postgre/postgre_driver.php        |  28 +-
 .../drivers/postgre/postgre_result.php        |   8 +-
 .../drivers/postgre/postgre_utility.php       |   6 +-
 .../database/drivers/sqlite/sqlite_driver.php |  38 +-
 .../database/drivers/sqlite/sqlite_result.php |   6 +-
 .../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 8d7a3025..0386ed6e 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,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.
 |
 | NO TRAILING SLASH!
@@ -31,7 +31,7 @@
 | 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 @@
 	$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 @@
 // 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 cd779972..4476208a 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 ab4f445f..0ed58d94 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 @@
 | 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 @@
 | 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 @@
 |
 | 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 @@
 | 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 @@
 |
 | 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 @@
 | 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 @@
 | 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 @@
 |	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 @@
 | 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 @@
 |--------------------------------------------------------------------------
 | 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 @@
 | 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 @@
 |--------------------------------------------------------------------------
 |
 | 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 @@
 | 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 9d8c7783..b3246b6e 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 8fa16780..1702e4f4 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 a799f06b..6fa7b4a7 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 e5fa8f9d..bfe9444b 100644
--- a/system/application/errors/error_404.php
+++ b/system/application/errors/error_404.php
@@ -4,9 +4,9 @@
 404 Page Not Found
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
              
+
+
+
+
+
+
              Code Igniter User Guide Version 1.5.0b3
              
+
              
+
+
+
+
+
+
+
+
+
+
              
+
+
+
              
+
+
+
+
              
+
+
+
              FTP Class
              
+
+
              Code Igniter's FTP Class permits files to be uploaded via FTP to your server.
              
+
+
+
+
+
+
+
              
+
+
+
+
+
+
+
\ No newline at end of file

From d7f88ca118cf1afe0c730e68b35e3693eaf9022e Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 27 Oct 2006 06:34:06 +0000
Subject: [PATCH 0396/2544]

---
 system/libraries/Ftp.php | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index d61e0aba..6c1bad8e 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -129,11 +129,17 @@ function _login()
 	// --------------------------------------------------------------------
 
 	/**
-	 * Change direcotries
+	 * Change direcotry
+	 *
+	 * The second parameter lets us momentarily turn off debugging so that
+	 * this function can be used to test for the existance of a folder
+	 * without throwing an error.  There's no FTP equivalent to is_dir()
+	 * so we do it by trying to change to a particular directory.  
+	 * Internally, this paramter is only used by the "mirror" function below.
 	 *
 	 * @access	public
 	 * @param	string
-	 * @param	bool	lets us momentarily turn off debugging.
+	 * @param	bool
 	 * @return	array
 	 */	
 	function changedir($path = '', $supress_debug = FALSE)
@@ -203,7 +209,6 @@ function upload($locpath, $rempath, $mode = 'auto', $permissions = NULL)
 		if ( ! file_exists($locpath))
 		{
 			$this->_error('ftp_no_source_file');
-			
 			return FALSE;
 		}
 	
@@ -248,7 +253,17 @@ function upload($locpath, $rempath, $mode = 'auto', $permissions = NULL)
 	 * @return	array
 	 */		
 	function chmod($path, $perm)
-	{		
+	{
+		// Permissions can only be set when running PHP 5
+		if ( ! function_exists('ftp_chmod'))
+		{
+			if ($this->debug == TRUE)
+			{
+				$this->_error('ftp_unable_to_chmod');
+			}		
+			return FALSE;		
+		}
+	
 		$result = @ftp_chmod($this->conn_id, $perm, $path);
 		
 		if ($result === FALSE)
@@ -271,7 +286,7 @@ function chmod($path, $perm)
 	 * @access	public
 	 * @return	array
 	 */	
-	function filelist($path = '.')
+	function list_files($path = '.')
 	{		
 		return ftp_nlist($this->conn_id, $path);
 	}
@@ -286,8 +301,8 @@ function filelist($path = '.')
 	 * is in the original file path will be recreated in the zip file.
 	 *
 	 * @access	public
-	 * @param	string	path to source
-	 * @param	string	path to destination
+	 * @param	string	path to source with trailing slash
+	 * @param	string	path to destination - include the base folder with trailing slash
 	 * @return	bool
 	 */	
 	function mirror($locpath, $rempath)

From 865b4b32ff813156c577e336114ae67b4be1a259 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 27 Oct 2006 07:33:49 +0000
Subject: [PATCH 0397/2544]

---
 user_guide/libraries/ftp.html | 180 +++++++++++++++++++++++++++++++++-
 1 file changed, 179 insertions(+), 1 deletion(-)

diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html
index e588e062..ae025f5f 100644
--- a/user_guide/libraries/ftp.html
+++ b/user_guide/libraries/ftp.html
@@ -63,7 +63,185 @@
 
 
              FTP Class
              
 
-
              Code Igniter's FTP Class permits files to be uploaded via FTP to your server.
              
+
              Code Igniter's FTP Class permits files to be uploaded via FTP to your server.  It also includes a "mirroring" function
+that permits an local directory to be recreated remotely via FTP.
              
+
+
              Initializing the Class
              
+
+
              Like most other classes in Code Igniter, the FTP class is initialized in your controller using the $this->load->library function:
              
+
+$this->load->library('ftp');
+
              Once loaded, the FTP object will be available using: $this->ftp
              
+
+
+
              Usage Examples
              
+
+
              In this example a connection is opened to the FTP server, and a local file is read and uploaded in ASCII mode. The
+file permissions are set to 755.  Note: Setting permissions requires PHP 5.
              
+
+
+$this->load->library('ftp');
              
+
              
+$config['hostname'] = 'ftp.your-site.com';
              
+$config['username'] = 'your-username';
              
+$config['password'] = 'your-password';
              
+$config['debug'] 	= TRUE;
              
+
              
+$this->ftp->connect($config);
              
+
              
+$this->ftp->upload('/local/path/to/myfile.html', '/public_html/myfile.html', 'ascii', 0775);
              
+
              
+$this->ftp->close();
+
+              
+
+
+
              In this example a list of files is retrieved from the server.
              
+
+
+$this->load->library('ftp');
              
+
              
+$config['hostname'] = 'ftp.your-site.com';
              
+$config['username'] = 'your-username';
              
+$config['password'] = 'your-password';
              
+$config['debug'] 	= TRUE;
              
+
              
+$this->ftp->connect($config);
              
+
              
+$list = $this->ftp->list_files('/public_html/');
              
+
              
+print_r($list);
              
+
              
+$this->ftp->close();
+              
+
+
              In this example a local directory is mirrored on the server.
              
+
+
+
+$this->load->library('ftp');
              
+
              
+$config['hostname'] = 'ftp.your-site.com';
              
+$config['username'] = 'your-username';
              
+$config['password'] = 'your-password';
              
+$config['debug'] 	= TRUE;
              
+
              
+$this->ftp->connect($config);
              
+
              
+$this->ftp->mirror('/path/to/myfolder/', '/public_html/myfolder/');
              
+
              
+$this->ftp->close();
+              
+
+
+
              Function Reference
              
+
+
              $this->ftp->connect()
              
+
+
              Connects and logs into to the FTP server. Connection preferences are set by passing an array
+to the function, or you can store them in a config file.
              
+
+
+
              Here is an example showing how you set preferences manually:
              
+
+
+$this->load->library('ftp');
              
+
              
+$config['hostname'] = 'ftp.your-site.com';
              
+$config['username'] = 'your-username';
              
+$config['password'] = 'your-password';
              
+$config['port']     = 21;
              
+$config['passive']  = FALSE;
              
+$config['debug']    = TRUE;
              
+
              
+$this->ftp->connect($config);
              
+              
+
+
              Setting FTP Preferences in a Config File
              
+
+
              If you prefer you can store your FTP preferences in a config file.
+Simply create a new file called the ftp.php,  add the $config
+array in that file. Then save the file at config/ftp.php and it will be used automatically.
              
+
+
              Available connection options:
              
+
+
+
                
+
              • hostname - the FTP hostname.  Usually something like:  ftp.some-site.com
                • 
+
              • username - the FTP username.
                • 
+
              • password - the FTP password.
                • 
+
              • port - The port number. Set to 21 by default.
                • 
+
              • debug - TRUE/FALSE (boolean). Whether to enable debugging to display error messages.
                • 
+
              • passive - TRUE/FALSE (boolean). Whether to use passive mode.  Passive is set automatically by default.
                • 
+
              
+
+
+
              $this->ftp->sconnect()
              
+
+
              Secure FTP connect.  This function is identical to the function above, except that it initiates a secure connection.
              
+
+
+
              $this->ftp->upload()
              
+
+
              Uploads a file to your server.  You must supply the local path and the remote path (with trailing slash), and you can optionally set the mode and permissions.
+Example:
              
+
+
+$this->ftp->upload('/local/path/to/myfile.html', '/public_html/myfile.html', 'ascii', 0775);
+
+
              Mode options are:  ascii, binary, and auto (the default). If
+auto is used it will base the mode on the file extension of the source file.
              
+
+
              Permissions are available if you are running PHP 5 and can be passed as an octal value in the fourth parameter.
              
+
+
+
              $this->ftp->mkdir()
              
+
+
              Lets you create a directory on your server.  Supply the path ending in the folder name you wish to create, with a trailing slash:
              
+
+
+// Creates a folder named "bar"
              
+$this->ftp->mkdir('/public_html/foo/bar/');
+              
+
+
+
              $this->ftp->chmod()
              
+
+
              Permits you to set file permissions.  Supply the path to the file or folder you wish to alter permissions on:
              
+
+
+// Chmod "bar" to 777
              
+$this->ftp->chmod('/public_html/foo/bar/', 0777);
+              
+
+
+
              $this->ftp->list_files()
              
+
              Permits you to retrieve a list of files on your server returned as an array.  You must supply 
+the path to the desired directory.
              
+
+
+$list = $this->ftp->list_files('/public_html/');
              
+
              
+print_r($list);
+              
+
+
+
              $this->ftp->mirror()
              
+
+
              Recursively reads a folder and everything it contains (including sub-folders) and creates a 
+mirror via FTP based on it.  Whatever the directory structure of the original file path will be recreated on the server.
+You must supply a source path and a destination path:
              
+
+
+$this->ftp->mirror('/path/to/myfolder/', '/public_html/myfolder/');
+
+
+
+
+
              $this->ftp->close();
              
+
              Closes the connection to your server.  It's recommended that you use this when you are finished uploading.
              
+
+
 
 
 

From 631f17b88124619dd27a04509970da155a3fc1b7 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 27 Oct 2006 07:41:28 +0000
Subject: [PATCH 0398/2544]

---
 system/libraries/Ftp.php        | 32 ++++++++++++++++++++++++++------
 user_guide/libraries/email.html |  2 +-
 user_guide/libraries/ftp.html   |  2 +-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index 6c1bad8e..a0c6895b 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -31,7 +31,6 @@ class CI_FTP {
 	var $password	= '';
 	var $port		= 21;
 	var $passive	= TRUE;
-	var $secure		= FALSE;
 	var $debug		= FALSE;
 	var $conn_id;
 
@@ -80,11 +79,18 @@ function initialize($config = array())
 	 * FTP Connect
 	 *
 	 * @access	public
+	 * @param	array	 the connection values
+	 * @param	bool	whether to use a secure or standard connection
 	 * @return	bool
 	 */	
-	function connect()
-	{	
-		$method = ($this->secure == FALSE) ? 'ftp_connect' : 'ftp_ssl_connect';
+	function connect($config = array(), $secure = FALSE)
+	{		
+		if (count($config) > 0)
+		{
+			$this->initialize($config);
+		}	
+	
+		$method = ($secure == FALSE) ? 'ftp_connect' : 'ftp_ssl_connect';
 	
 		if (FALSE === ($this->conn_id = @$method($this->hostname, $this->port)))
 		{
@@ -112,6 +118,20 @@ function connect()
 		
 		return TRUE;
 	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Secure FTP Connect
+	 *
+	 * @access	public
+	 * @param	array	 the connection values
+	 * @return	bool
+	 */		
+	function sconnect($config = array())
+	{
+		return $this->connect($config, TRUE);
+	}
 		
 	// --------------------------------------------------------------------
 
@@ -297,8 +317,8 @@ function list_files($path = '.')
 	 * Read a directory and recreate it remotely
 	 *
 	 * This function recursively reads a folder and everything it contains (including
-	 * sub-folders) and creates a mirror via FTP based on it.  Whatever directory structure
-	 * is in the original file path will be recreated in the zip file.
+	 * sub-folders) and creates a mirror via FTP based on it.  Whatever the directory structure
+	 * of the original file path will be recreated on the server.
 	 *
 	 * @access	public
 	 * @param	string	path to source with trailing slash
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html
index b8a68e9d..96150eca 100644
--- a/user_guide/libraries/email.html
+++ b/user_guide/libraries/email.html
@@ -119,7 +119,7 @@ 
              Setting Email Preferences
              
 
 
              Note: Most of the preferences have default values that will be used if you do not set them.
              Setting Email Preferences in your Config File
+
              Setting Email Preferences in a Config File
              
 
 
              If you prefer not to set preferences using the above method, you can instead put them into a config file.
 Simply create a new file called the email.php,  add the $config
diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html
index ae025f5f..4df9c545 100644
--- a/user_guide/libraries/ftp.html
+++ b/user_guide/libraries/ftp.html
@@ -183,7 +183,7 @@ 
              $this->ftp->sconnect()
              
 
 
              $this->ftp->upload()
              
 
-
              Uploads a file to your server.  You must supply the local path and the remote path (with trailing slash), and you can optionally set the mode and permissions.
+
              Uploads a file to your server.  You must supply the local path and the remote path, and you can optionally set the mode and permissions.
 Example:
              
 
 

From 667da5e418c97f015a700cf61a70dede321436a9 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 27 Oct 2006 15:54:16 +0000
Subject: [PATCH 0399/2544]

---
 system/libraries/Upload.php | 76 +++++++++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 21 deletions(-)

diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 1a0b0fc8..ff0fb1cb 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -36,7 +36,7 @@ class CI_Upload {
 	var $file_type		= "";
 	var $file_size		= "";
 	var $file_ext		= "";
-	var $file_path		= "";
+	var $upload_path	= "";
 	var $overwrite		= FALSE;
 	var $encrypt_name	= FALSE;
 	var $is_image		= FALSE;
@@ -76,17 +76,51 @@ function CI_Upload($props = array())
 	 */	
 	function initialize($config = array())
 	{
-		foreach ($config as $key => $val)
-		{
-			$method = 'set_'.$key;
-			if (method_exists($this, $method))
+		$defaults = array(
+							'max_size'			=> 0,
+							'max_width'			=> 0,
+							'max_height'		=> 0,
+							'allowed_types'		=> "",
+							'file_temp'			=> "",
+							'file_name'			=> "",
+							'orig_name'			=> "",
+							'file_type'			=> "",
+							'file_size'			=> "",
+							'file_ext'			=> "",
+							'upload_path'		=> "",
+							'overwrite'			=> FALSE,
+							'encrypt_name'		=> FALSE,
+							'is_image'			=> FALSE,
+							'image_width'		=> '',
+							'image_height'		=> '',
+							'image_type'		=> '',
+							'image_size_str'	=> '',
+							'error_msg'			=> array(),
+							'mimes'				=> array(),
+							'remove_spaces'		=> TRUE,
+							'xss_clean'			=> FALSE,
+							'temp_prefix'		=> "temp_file_"
+						);	
+	
+	
+		foreach ($defaults as $key => $val)
+		{
+			if (isset($config[$key]))
 			{
-				$this->$method($val);
+				$method = 'set_'.$key;
+				if (method_exists($this, $method))
+				{
+					$this->$method($config[$key]);
+				}
+				else
+				{
+					$this->$key = $config[$key];
+				}			
 			}
 			else
 			{
 				$this->$key = $val;
-			}			
+			}
 		}
 	}
 	
@@ -188,7 +222,7 @@ function do_upload($field = 'userfile')
 
 		if ($this->overwrite == FALSE)
 		{
-			$this->file_name = $this->set_filename($this->file_path, $this->file_name);
+			$this->file_name = $this->set_filename($this->upload_path, $this->file_name);
 			
 			if ($this->file_name === FALSE)
 			{
@@ -203,9 +237,9 @@ function do_upload($field = 'userfile')
 		 * we'll use move_uploaded_file().  One of the two should
 		 * reliably work in most environments
 		 */
-		if ( ! @copy($this->file_temp, $this->file_path.$this->file_name))
+		if ( ! @copy($this->file_temp, $this->upload_path.$this->file_name))
 		{
-			if ( ! @move_uploaded_file($this->file_temp, $this->file_path.$this->file_name))
+			if ( ! @move_uploaded_file($this->file_temp, $this->upload_path.$this->file_name))
 			{
 				 $this->set_error('upload_destination_error');
 				 return FALSE;
@@ -229,7 +263,7 @@ function do_upload($field = 'userfile')
 		 * file was an image).  We use this information
 		 * in the "data" function.
 		 */
-		$this->set_image_properties($this->file_path.$this->file_name);
+		$this->set_image_properties($this->upload_path.$this->file_name);
 
 		return TRUE;
 	}
@@ -250,8 +284,8 @@ function data()
 		return array (
 						'file_name'			=> $this->file_name,
 						'file_type'			=> $this->file_type,
-						'file_path'			=> $this->file_path,
-						'full_path'			=> $this->file_path.$this->file_name,
+						'file_path'			=> $this->upload_path,
+						'full_path'			=> $this->upload_path.$this->file_name,
 						'raw_name'			=> str_replace($this->file_ext, '', $this->file_name),
 						'orig_name'			=> $this->orig_name,
 						'file_ext'			=> $this->file_ext,
@@ -275,7 +309,7 @@ function data()
 	 */	
 	function set_upload_path($path)
 	{
-		$this->file_path = $path;
+		$this->upload_path = $path;
 	}
 	
 	// --------------------------------------------------------------------
@@ -564,30 +598,30 @@ function is_allowed_dimensions()
 	 */	
 	function validate_upload_path()
 	{
-		if ($this->file_path == '')
+		if ($this->upload_path == '')
 		{
 			$this->set_error('upload_no_filepath');
 			return FALSE;
 		}
 		
-		if (function_exists('realpath') AND @realpath($this->file_path) !== FALSE)
+		if (function_exists('realpath') AND @realpath($this->upload_path) !== FALSE)
 		{
-			$this->file_path = str_replace("\\", "/", realpath($this->file_path));
+			$this->upload_path = str_replace("\\", "/", realpath($this->upload_path));
 		}
 
-		if ( ! @is_dir($this->file_path))
+		if ( ! @is_dir($this->upload_path))
 		{
 			$this->set_error('upload_no_filepath');
 			return FALSE;
 		}
 
-		if ( ! is_writable($this->file_path))
+		if ( ! is_writable($this->upload_path))
 		{
 			$this->set_error('upload_not_writable');
 			return FALSE;
 		}
 
-		$this->file_path = preg_replace("/(.+?)\/*$/", "\\1/",  $this->file_path);
+		$this->upload_path = preg_replace("/(.+?)\/*$/", "\\1/",  $this->upload_path);
 		return TRUE;
 	}
 	
@@ -668,7 +702,7 @@ function clean_file_name($filename)
 	 */	
 	function do_xss_clean()
 	{		
-		$file = $this->file_path.$this->file_name;
+		$file = $this->upload_path.$this->file_name;
 		
 		if (filesize($file) == 0)
 		{

From 259ea846018b3c465d3b9c3283a6142a5c342191 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 27 Oct 2006 17:56:58 +0000
Subject: [PATCH 0400/2544]

---
 system/database/drivers/oci8/oci8_result.php | 104 ++++++++++---------
 1 file changed, 54 insertions(+), 50 deletions(-)

diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php
index efb2f7be..af30457b 100644
--- a/system/database/drivers/oci8/oci8_result.php
+++ b/system/database/drivers/oci8/oci8_result.php
@@ -44,7 +44,7 @@ function num_rows()
 		}
 		else
 		{
-			return @ocirowcount($this->stmt_id)
+			return @ocirowcount($this->stmt_id);
 		}
 	}
 
@@ -60,8 +60,7 @@ function num_fields()
 	{
 		$count = @ocinumcols($this->stmt_id);
 
-		// if we used a limit, we added a field,
-		// subtract it out
+		// if we used a limit we subtract it
 		if ($this->limit_used)
 		{
 			$count = $count - 1;
@@ -135,7 +134,7 @@ function free_result()
 	{
 		if (is_resource($this->result_id))
 		{
-			OCIFreeStatement($this->result_id);
+			ocifreestatement($this->result_id);			
 			$this->result_id = FALSE;
 		}
 	}
@@ -152,32 +151,9 @@ function free_result()
 	 */
 	function _fetch_assoc(&$row)
 	{
-		// if pulling from a cursor, use curs_id
-		if ($this->curs_id)
-		{
-			return ocifetchinto($this->curs_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
-		}
-		else
-		{
-			return ocifetchinto($this->stmt_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Data Seek
-	 *
-	 * Moves the internal pointer to the desired offset.  We call
-	 * this internally before fetching results to make sure the
-	 * result set starts at zero
-	 *
-	 * @access	private
-	 * @return	array
-	 */
-	function _data_seek($n = 0)
-	{
-		return FALSE;
+		$id = ($this->curs_id) ? $this->curs_id : $this->stmt_id;
+	
+		return ocifetchinto($id, $row, OCI_ASSOC + OCI_RETURN_NULLS);	
 	}
 
 	// --------------------------------------------------------------------
@@ -191,24 +167,42 @@ function _data_seek($n = 0)
 	 * @return  object
 	 */
 	function _fetch_object()
-	{
-		// the PHP 4 version of the oracle functions do not
-		// have a fetch method so we call the array version
-		// and build an object from that
+	{	
+		$result = array();
 
-		$row = array();
-		$res = $this->_fetch_assoc($row);
-		if ($res != FALSE)
+		// If PHP 5 is being used we can fetch an result object
+		if (function_exists('oci_fetch_object'))
+		{
+			$id = ($this->curs_id) ? $this->curs_id : $this->stmt_id;
+			
+			while ($row = oci_fetch_object($id))
+			{
+				$result[] = $row;
+			}
+						
+			return $result;
+		}
+		
+		// If PHP 4 is being used we have to build our own result
+		foreach ($this->result_array() as $key => $val)
 		{
 			$obj = new stdClass();
-			foreach ($row as $key => $value)
+			if (is_array($val))
+			{
+				foreach ($val as $k => $v)
+				{
+					$obj->$k = $v;
+				}
+			}
+			else
 			{
-				$obj->{$key} = $value;
+				$obj->$key = $val;
 			}
 			
-			$res = $obj;
+			$result[] = $obj;
 		}
-		return $res;
+
+		return $result;
 	}
 
 	// --------------------------------------------------------------------
@@ -226,24 +220,34 @@ function result_array()
 			return $this->result_array;
 		}
 
-		// oracle's fetch functions do not
-		// return arrays, the information
-		// is returned in reference parameters
-		//
+		// oracle's fetch functions do not return arrays.
+		// The information is returned in reference parameters
 		$row = NULL;
 		while ($this->_fetch_assoc($row))
 		{
 			$this->result_array[] = $row;
 		}
 
-		if (count($this->result_array) == 0)
-		{
-			return FALSE;
-		}
-
 		return $this->result_array;
 	}
 
+	// --------------------------------------------------------------------
+
+	/**
+	 * Data Seek
+	 *
+	 * Moves the internal pointer to the desired offset.  We call
+	 * this internally before fetching results to make sure the
+	 * result set starts at zero
+	 *
+	 * @access	private
+	 * @return	array
+	 */
+	function _data_seek($n = 0)
+	{
+		return FALSE; // Not needed
+	}
+
 }
 
 ?>
\ No newline at end of file

From 0e5ca047896c92c490d038f54e4623cb4db4ad76 Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 27 Oct 2006 17:57:30 +0000
Subject: [PATCH 0401/2544]

---
 system/libraries/Model.php | 2 +-
 user_guide/changelog.html  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/libraries/Model.php b/system/libraries/Model.php
index e0335bf4..1c2b7afc 100644
--- a/system/libraries/Model.php
+++ b/system/libraries/Model.php
@@ -36,7 +36,7 @@ class Model {
 	function Model()
 	{
 		// If the magic __get() or __set() methods are used in a Model references can't be used.
-		$this->_assign_libraries( (method_exists($this, '__get') OR method_exists('__set')) ? FALSE : TRUE );
+		$this->_assign_libraries( (method_exists($this, '__get') OR method_exists($this, '__set')) ? FALSE : TRUE );
 		
 		// We don't want to assign the model object to itself when using the
 		// assign_libraries function below so we'll grab the name of the model parent
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index c4797224..16f830c1 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -84,6 +84,7 @@ 
              Version 1.5.0 Beta 3
              
 
            1. Added $query->list_fields() function to database class
              2. 
 
            2. Added $this->db->platform() function
              3. 
 
            3. Added new File Helper:  get_filenames()
              4. 
+
            4. Added more thorough initialization in the upload class so that all class variables are reset.
              5. 
 
            5. Added "is_numeric" to validation, which uses the native PHP is_numeric function.
              6. 
 
            6. Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
              7. 
 
            7. Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
              8. 

From 9e774ad7989f7fea33312407a8e25a2724f2ce8b Mon Sep 17 00:00:00 2001
From: admin 
Date: Fri, 27 Oct 2006 21:58:04 +0000
Subject: [PATCH 0402/2544]

---
 user_guide/libraries/ftp.html | 71 +++++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 15 deletions(-)

diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html
index 4df9c545..1fc82b49 100644
--- a/user_guide/libraries/ftp.html
+++ b/user_guide/libraries/ftp.html
@@ -63,8 +63,10 @@
 
 
              FTP Class
              
 
-
              Code Igniter's FTP Class permits files to be uploaded via FTP to your server.  It also includes a "mirroring" function
-that permits an local directory to be recreated remotely via FTP.
              
+
              Code Igniter's FTP Class permits files to be uploaded, moved, renamed, and deleted on your server.  It also includes a "mirroring" function
+that permits a local directory to be recreated remotely via FTP.
              
+
+
              Note:  SFTP and SSL FTP protocols are not supported, only standard FTP.
              
 
 
              Initializing the Class
              
 
@@ -176,10 +178,6 @@ 
              Available connection options:
          -

          $this->ftp->sconnect()

          - -

          Secure FTP connect. This function is identical to the function above, except that it initiates a secure connection.

          -

          $this->ftp->upload()

          @@ -195,26 +193,46 @@

          $this->ftp->upload()

          Permissions are available if you are running PHP 5 and can be passed as an octal value in the fourth parameter.

          -

          $this->ftp->mkdir()

          +

          $this->ftp->rename()

          +

          Permits you to rename a file. Supply the source file name/path and the new file name/path.

          + + +// Renames green.html to blue.html
          +$this->ftp->rename('/public_html/foo/green.html', '/public_html/foo/blue.html'); +           -

          Lets you create a directory on your server. Supply the path ending in the folder name you wish to create, with a trailing slash:

          +

          $this->ftp->move()

          +

          Lets you move a file. Supply the source and destination paths:

          -// Creates a folder named "bar"
          -$this->ftp->mkdir('/public_html/foo/bar/'); +// Moves blog.html from "joe" to "fred"
          +$this->ftp->move('/public_html/joe/blog.html', '/public_html/fred/blog.html');           +

          Note: if the destination file name is different the file will be renamed.

          -

          $this->ftp->chmod()

          -

          Permits you to set file permissions. Supply the path to the file or folder you wish to alter permissions on:

          +

          $this->ftp->delete_file()

          +

          Lets you delete a file. Supply the source path with the file name.

          -// Chmod "bar" to 777
          -$this->ftp->chmod('/public_html/foo/bar/', 0777); +$this->ftp->delete_file('/public_html/joe/blog.html'); +           + + +

          $this->ftp->delete_dir()

          +

          Lets you delete a directory and everything it contains. Supply the source path to the directory with a trailing slash.

          + +

          Important  Be VERY careful with this function. It will recursively delete +everything within the supplied path, including sub-folders and all files. Make absolutely sure your path is correct. +Try using the list_files() function first to verify that your path is correct.

          + + +$this->ftp->delete_dir('/public_html/path/to/folder/'); +

          $this->ftp->list_files()

          Permits you to retrieve a list of files on your server returned as an array. You must supply the path to the desired directory.

          @@ -228,7 +246,7 @@

          $this->ftp->list_files()

          $this->ftp->mirror()

          -

          Recursively reads a folder and everything it contains (including sub-folders) and creates a +

          Recursively reads a local folder and everything it contains (including sub-folders) and creates a mirror via FTP based on it. Whatever the directory structure of the original file path will be recreated on the server. You must supply a source path and a destination path:

          @@ -238,6 +256,29 @@

          $this->ftp->mirror()

          +

          $this->ftp->mkdir()

          + +

          Lets you create a directory on your server. Supply the path ending in the folder name you wish to create, with a trailing slash. +Permissions can be set by passed an octal value in the second parameter (if you are running PHP 5).

          + + +// Creates a folder named "bar"
          +$this->ftp->mkdir('/public_html/foo/bar/', 0777); +           + + +

          $this->ftp->chmod()

          + +

          Permits you to set file permissions. Supply the path to the file or folder you wish to alter permissions on:

          + + +// Chmod "bar" to 777
          +$this->ftp->chmod('/public_html/foo/bar/', 0777); +           + + + +

          $this->ftp->close();

          Closes the connection to your server. It's recommended that you use this when you are finished uploading.

          From 51e68c06d88a501f02df17d94539ba14e67b009f Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 27 Oct 2006 21:58:13 +0000 Subject: [PATCH 0403/2544] --- system/language/english/ftp_lang.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php index f666b4d5..a4320efa 100644 --- a/system/language/english/ftp_lang.php +++ b/system/language/english/ftp_lang.php @@ -7,6 +7,11 @@ $lang['ftp_unable_to_chmod'] = "Unable to set file permissions. Please check your path. Note: This feature is only available in PHP 5 or higher."; $lang['ftp_unable_to_upload'] = "Unable to upload the specified file. Please check your path."; $lang['ftp_no_source_file'] = "Unable to locate the source file. Please check your path."; +$lang['ftp_unable_to_remame'] = "Unable to rename the file."; +$lang['ftp_unable_to_delete'] = "Unable to delete the file."; +$lang['ftp_unable_to_move'] = "Unable to move the file. Please make sure the destination directory exists."; + + ?> \ No newline at end of file From 647e02637f72de3907b0a32139f286404a81f745 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 27 Oct 2006 21:58:22 +0000 Subject: [PATCH 0404/2544] --- system/language/english/ftp_lang.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php index a4320efa..99895cc0 100644 --- a/system/language/english/ftp_lang.php +++ b/system/language/english/ftp_lang.php @@ -11,7 +11,4 @@ $lang['ftp_unable_to_delete'] = "Unable to delete the file."; $lang['ftp_unable_to_move'] = "Unable to move the file. Please make sure the destination directory exists."; - - - ?> \ No newline at end of file From 6895a4b6045dd3fef3a2e742932721f6ccc2a569 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 27 Oct 2006 22:06:01 +0000 Subject: [PATCH 0405/2544] --- system/libraries/Ftp.php | 214 ++++++++++++++++++++++++++++++++++----- 1 file changed, 189 insertions(+), 25 deletions(-) diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index a0c6895b..3b2be23d 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -32,7 +32,7 @@ class CI_FTP { var $port = 21; var $passive = TRUE; var $debug = FALSE; - var $conn_id; + var $conn_id = FALSE; /** @@ -80,19 +80,16 @@ function initialize($config = array()) * * @access public * @param array the connection values - * @param bool whether to use a secure or standard connection * @return bool */ - function connect($config = array(), $secure = FALSE) + function connect($config = array()) { if (count($config) > 0) { $this->initialize($config); } - $method = ($secure == FALSE) ? 'ftp_connect' : 'ftp_ssl_connect'; - - if (FALSE === ($this->conn_id = @$method($this->hostname, $this->port))) + if (FALSE === ($this->conn_id = @ftp_connect($this->hostname, $this->port))) { if ($this->debug == TRUE) { @@ -122,32 +119,40 @@ function connect($config = array(), $secure = FALSE) // -------------------------------------------------------------------- /** - * Secure FTP Connect + * FTP Login * - * @access public - * @param array the connection values + * @access private * @return bool - */ - function sconnect($config = array()) + */ + function _login() { - return $this->connect($config, TRUE); + return @ftp_login($this->conn_id, $this->username, $this->password); } - + // -------------------------------------------------------------------- /** - * FTP Login + * Validates the connection ID * * @access private * @return bool */ - function _login() + function _is_conn() { - return @ftp_login($this->conn_id, $this->username, $this->password); + if ( ! is_resource($this->conn_id)) + { + if ($this->debug == TRUE) + { + $this->_error('ftp_no_connection'); + } + return FALSE; + } + return TRUE; } // -------------------------------------------------------------------- + /** * Change direcotry * @@ -160,11 +165,11 @@ function _login() * @access public * @param string * @param bool - * @return array + * @return bool */ function changedir($path = '', $supress_debug = FALSE) { - if ($path == '') + if ($path == '' OR ! $this->_is_conn()) { return FALSE; } @@ -190,11 +195,11 @@ function changedir($path = '', $supress_debug = FALSE) * * @access public * @param string - * @return array + * @return bool */ - function mkdir($path = '') + function mkdir($path = '', $permissions = NULL) { - if ($path == '') + if ($path == '' OR ! $this->_is_conn()) { return FALSE; } @@ -209,6 +214,12 @@ function mkdir($path = '') } return FALSE; } + + // Set file permissions if needed + if ( ! is_null($permissions)) + { + $this->chmod($path, (int)$permissions); + } return TRUE; } @@ -222,10 +233,15 @@ function mkdir($path = '') * @param string * @param string * @param string - * @return array + * @return bool */ function upload($locpath, $rempath, $mode = 'auto', $permissions = NULL) { + if ( ! $this->_is_conn()) + { + return FALSE; + } + if ( ! file_exists($locpath)) { $this->_error('ftp_no_source_file'); @@ -264,16 +280,149 @@ function upload($locpath, $rempath, $mode = 'auto', $permissions = NULL) // -------------------------------------------------------------------- + /** + * Rename (or move) a file + * + * @access public + * @param string + * @param string + * @param bool + * @return bool + */ + function rename($old_file, $new_file, $move = FALSE) + { + if ( ! $this->_is_conn()) + { + return FALSE; + } + + $result = @ftp_rename($this->conn_id, $old_file, $new_file); + + if ($result === FALSE) + { + if ($this->debug == TRUE) + { + $msg = ($move = FALSE) ? 'ftp_unable_to_remame' : 'ftp_unable_to_move'; + + $this->_error($msg); + } + return FALSE; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Move a file + * + * @access public + * @param string + * @param string + * @return bool + */ + function move($old_file, $new_file) + { + return $this->rename($old_file, $new_file, TRUE); + } + + // -------------------------------------------------------------------- + + /** + * Rename (or move) a file + * + * @access public + * @param string + * @return bool + */ + function delete_file($filepath) + { + if ( ! $this->_is_conn()) + { + return FALSE; + } + + $result = @ftp_delete($this->conn_id, $filepath); + + if ($result === FALSE) + { + if ($this->debug == TRUE) + { + $this->_error('ftp_unable_to_delete'); + } + return FALSE; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Delete a folder and recursively delete everything (including sub-folders) + * containted within it. + * + * @access public + * @param string + * @return bool + */ + function delete_dir($filepath) + { + if ( ! $this->_is_conn()) + { + return FALSE; + } + + // Add a trailing slash to the file path if needed + $filepath = preg_replace("/(.+?)\/*$/", "\\1/", $filepath); + + $list = $this->list_files($filepath); + + if ($list !== FALSE AND count($list) > 0) + { + foreach ($list as $item) + { + // If we can't delete the item it's probaly a folder so + // we'll recursively call delete_dir() + if ( ! @ftp_delete($this->conn_id, $filepath.$item)) + { + $this->delete_dir($filepath.$item); + } + } + } + + $result = @ftp_rmdir($this->conn_id, $filepath); + + if ($result === FALSE) + { + if ($this->debug == TRUE) + { + $this->_error('ftp_unable_to_delete'); + } + return FALSE; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + /** * Set file permissions * * @access public * @param string the file path * @param string the permissions - * @return array + * @return bool */ function chmod($path, $perm) { + if ( ! $this->_is_conn()) + { + return FALSE; + } + // Permissions can only be set when running PHP 5 if ( ! function_exists('ftp_chmod')) { @@ -307,7 +456,12 @@ function chmod($path, $perm) * @return array */ function list_files($path = '.') - { + { + if ( ! $this->_is_conn()) + { + return FALSE; + } + return ftp_nlist($this->conn_id, $path); } @@ -326,7 +480,12 @@ function list_files($path = '.') * @return bool */ function mirror($locpath, $rempath) - { + { + if ( ! $this->_is_conn()) + { + return FALSE; + } + // Open the local file path if ($fp = @opendir($locpath)) { @@ -427,6 +586,11 @@ function _settype($ext) */ function close() { + if ( ! $this->_is_conn()) + { + return FALSE; + } + @ftp_close($this->conn_id); } From 86c60398852a299aa4a485c7e9e3c1d45e8c2184 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 28 Oct 2006 02:50:53 +0000 Subject: [PATCH 0406/2544] --- system/helpers/text_helper.php | 105 +++++++++++++++++--------- system/language/english/ftp_lang.php | 1 + system/libraries/Email.php | 107 +++++++++++++++++---------- user_guide/changelog.html | 1 + 4 files changed, 139 insertions(+), 75 deletions(-) diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index fbc63a9b..1b917812 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -325,62 +325,97 @@ function highlight_phrase($str, $phrase, $tag_open = '', $tag_close = '< * Word Wrap * * Wraps text at the specified character. Maintains the integrity of words. + * Anything placed between {unwrap}{/unwrap} will not be word wrapped, nor + * will URLs. * * @access public * @param string the text string * @param integer the number of characters to wrap at * @return string */ -function word_wrap($str, $chars = '76') -{ - if ( ! is_numeric($chars)) - $chars = 76; +function word_wrap($str, $charlim = '76') +{ + // Se the character limit + if ( ! is_numeric($charlim)) + $charlim = 76; + + // Reduce multiple spaces + $str = preg_replace("| +|", " ", $str); - $str = preg_replace("/(\r\n|\r|\n)/", "\n", $str); - $lines = split("\n", $str); + // Standardize newlines + $str = preg_replace("/\r\n|\r/", "\n", $str); + // If the current word is surrounded by {unwrap} tags we'll + // strip the entire chunk and replace it with a marker. + $unwrap = array(); + if (preg_match_all("|(\{unwrap\}.+?\{/unwrap\})|s", $str, $matches)) + { + for ($i = 0; $i < count($matches['0']); $i++) + { + $unwrap[] = $matches['1'][$i]; + $str = str_replace($matches['1'][$i], "{{unwrapped".$i."}}", $str); + } + } + + // Use PHP's native function to do the initial wordwrap. + // We set the cut flag to FALSE so that any individual words that are + // too long get left alone. In the next step we'll deal with them. + $str = wordwrap($str, $charlim, "\n", FALSE); + + // Split the string into individual lines of text and cycle through them $output = ""; - while (list(, $thisline) = each($lines)) + foreach (explode("\n", $str) as $line) { - if (strlen($thisline) > $chars) + // Is the line within the allowed character count? + // If so we'll join it to the output and continue + if (strlen($line) <= $charlim) + { + $output .= $line.$this->newline; + continue; + } + + $temp = ''; + while((strlen($line)) > $charlim) { - $line = ""; - $words = split(" ", $thisline); - while(list(, $thisword) = each($words)) + // If the over-length word is a URL we won't wrap it + if (preg_match("!\[url.+\]|://|wwww.!", $line)) { - while((strlen($thisword)) > $chars) - { - $cur_pos = 0; - for($i=0; $i < $chars - 1; $i++) - { - $output .= $thisword[$i]; - $cur_pos++; - } - - $output .= "\n"; - $thisword = substr($thisword, $cur_pos, (strlen($thisword) - $cur_pos)); - } - - if ((strlen($line) + strlen($thisword)) > $chars) - { - $output .= $line."\n"; - $line = $thisword." "; - } - else - { - $line .= $thisword." "; - } + break; } - $output .= $line."\n"; + // Trim the word down + $temp .= substr($line, 0, $charlim-1); + $line = substr($line, $charlim-1); + } + + // If $temp contains data it means we had to split up an over-length + // word into smaller chunks so we'll add it back to our current line + if ($temp != '') + { + $output .= $temp.$this->newline.$line; } else { - $output .= $thisline."\n"; + $output .= $line; + } + + $output .= $this->newline; + } + + // Put our markers back + if (count($unwrap) > 0) + { + foreach ($unwrap as $key => $val) + { + $output = str_replace("{{unwrapped".$key."}}", $val, $output); } } + // Remove the unwrap tags + $output = str_replace(array('{unwrap}', '{/unwrap}'), '', $output); + return $output; } + ?> \ No newline at end of file diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php index 99895cc0..d6a1a40c 100644 --- a/system/language/english/ftp_lang.php +++ b/system/language/english/ftp_lang.php @@ -1,5 +1,6 @@ wrapchars == "") ? "76" : $this->wrapchars; + $charlim = ($this->wrapchars == "") ? "76" : $this->wrapchars; } + // Reduce multiple spaces $str = preg_replace("| +|", " ", $str); - - $str = preg_replace("|(\[url.+\])|", "{unwrap}\\1{/unwrap}", $str); - + + // Standardize newlines + $str = preg_replace("/\r\n|\r/", "\n", $str); + + // If the current word is surrounded by {unwrap} tags we'll + // strip the entire chunk and replace it with a marker. + $unwrap = array(); + if (preg_match_all("|(\{unwrap\}.+?\{/unwrap\})|s", $str, $matches)) + { + for ($i = 0; $i < count($matches['0']); $i++) + { + $unwrap[] = $matches['1'][$i]; + $str = str_replace($matches['1'][$i], "{{unwrapped".$i."}}", $str); + } + } + + // Use PHP's native function to do the initial wordwrap. + // We set the cut flag to FALSE so that any individual words that are + // too long get left alone. In the next step we'll deal with them. + $str = wordwrap($str, $charlim, "\n", FALSE); + + // Split the string into individual lines of text and cycle through them $output = ""; - foreach (split("\n", $str) as $current_line) + foreach (explode("\n", $str) as $line) { - if (strlen($current_line) > $chars) + // Is the line within the allowed character count? + // If so we'll join it to the output and continue + if (strlen($line) <= $charlim) { - $line = ""; - - foreach (split(" ", $current_line) as $words) + $output .= $line.$this->newline; + continue; + } + + $temp = ''; + while((strlen($line)) > $charlim) + { + // If the over-length word is a URL we won't wrap it + if (preg_match("!\[url.+\]|://|wwww.!", $line)) { - while((strlen($words)) > $chars) - { - if (stristr($words, '{unwrap}') !== FALSE OR stristr($words, '{/unwrap}') !== FALSE) - { - break; - } - - $output .= substr($words, 0, $chars-1); - $words = substr($words, $chars-1); - - $output .= $this->newline; - } - - if ((strlen($line) + strlen($words)) > $chars) - { - $output .= $line.$this->newline; - - $line = $words." "; - } - else - { - $line .= $words." "; - } + break; } - - $output .= $line.$this->newline; - } - else + + // Trim the word down + $temp .= substr($line, 0, $charlim-1); + $line = substr($line, $charlim-1); + } + + // If $temp contains data it means we had to split up an over-length + // word into smaller chunks so we'll add it back to our current line + if ($temp != '') + { + $output .= $temp.$this->newline.$line; + } + else + { + $output .= $line; + } + + $output .= $this->newline; + } + + // Put our markers back + if (count($unwrap) > 0) + { + foreach ($unwrap as $key => $val) { - $output .= $current_line.$this->newline; + $output = str_replace("{{unwrapped".$key."}}", $val, $output); } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 16f830c1..817b49bf 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -92,6 +92,7 @@

          Version 1.5.0 Beta 3

        • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
        • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
        • Fixed a bug in the Email class related to SMTP Helo data.
          • +
        • Fixed a bugin the word wrapping heper and function in the email class.
        • Fixed a bug in the validation class.
        • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
        • Fixed a problem in the form_prep() function that was double encoding entities.
          • From 05186616a0ba51cd7df168ac198b283815c89bf2 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 28 Oct 2006 03:28:01 +0000 Subject: [PATCH 0407/2544] --- system/application/config/config.php | 25 +++++++++++++++++--- system/application/config/database.php | 4 ++-- user_guide/changelog.html | 5 ++-- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/changelog.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/index.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/multiple_apps.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/index.html | 2 +- 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 | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/nav/nav.js | 1 + user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 4 +++- 104 files changed, 132 insertions(+), 109 deletions(-) diff --git a/system/application/config/config.php b/system/application/config/config.php index 0ed58d94..fc472401 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -147,9 +147,28 @@ | Error Logging |-------------------------------------------------------------------------- | +<<<<<<< .mine +| 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. +| +*/ +$config['time_reference'] = 'local'; + +/* +|-------------------------------------------------------------------------- +| Error Logging Threshold +|-------------------------------------------------------------------------- +| +| If you have enabled error logging, you can set an error threshold to +| determine what gets logged. Threshold options are: +======= | You can enable error logging by setting a threshold over zero. The | threshold determines what gets logged. Threshold options are: -| +>>>>>>> .r388 +| +| 0 = Disables logging | 0 = Error logging TURNED OFF | 1 = Error Messages (including PHP errors) | 2 = Debug Messages @@ -220,8 +239,8 @@ $config['sess_cookie_name'] = 'ci_session'; $config['sess_expiration'] = 7200; $config['sess_encrypt_cookie'] = FALSE; -$config['sess_use_database'] = FALSE; -$config['sess_table_name'] = ''; +$config['sess_use_database'] = TRUE; +$config['sess_table_name'] = 'ci_sessions'; $config['sess_match_ip'] = TRUE; $config['sess_match_useragent'] = TRUE; diff --git a/system/application/config/database.php b/system/application/config/database.php index b3246b6e..5cfd7634 100644 --- a/system/application/config/database.php +++ b/system/application/config/database.php @@ -36,13 +36,13 @@ $db['default']['hostname'] = "localhost"; $db['default']['username'] = "root"; $db['default']['password'] = ""; -$db['default']['database'] = "tester"; +$db['default']['database'] = "test"; $db['default']['dbdriver'] = "mysql"; $db['default']['dbprefix'] = ""; $db['default']['active_r'] = TRUE; $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; -$db['default']['cache_on'] = TRUE; +$db['default']['cache_on'] = FALSE; $db['default']['cachedir'] = APPPATH.'dbcache/'; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 817b49bf..593a1f2a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -33,7 +33,7 @@
          - +

          Code Igniter User Guide Version 1.5.0b3

          Code Igniter User Guide Version 1.5.0
          @@ -63,7 +63,7 @@

          Change Log

          -

          Version 1.5.0 Beta 3

          +

          Version 1.5.0

          Release Date: October 30, 2006

            @@ -84,6 +84,7 @@

            Version 1.5.0 Beta 3

          • Added $query->list_fields() function to database class
          • Added $this->db->platform() function
          • Added new File Helper: get_filenames()
            • +
          • Added new helper: Smiley Helper
          • Added more thorough initialization in the upload class so that all class variables are reset.
          • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
          • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
            • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index b5c94a2c..e9f9b680 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index ce5535c2..c1062690 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index a437b43a..da3279a6 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 830f8188..1fe0825a 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index ced94794..466af04e 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 79631042..2d38dba0 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 8f206638..31332f70 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 19fe4799..63164169 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/index.html b/user_guide/database/index.html index f83aab22..9d047705 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index e558e3d8..41a28abd 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/results.html b/user_guide/database/results.html index bae8a75c..32662280 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 68119336..954ce668 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 4677ed6f..3f272c56 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index cbc79153..e7685857 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 2e2e562e..7e8de7c0 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 71d88f3b..3634dc32 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index bbb839dd..3a5876f3 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 1e3a6bca..9a8afd59 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html index 44412b96..81235cae 100644 --- a/user_guide/general/changelog.html +++ b/user_guide/general/changelog.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index fd6a4bdf..b33c76ef 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index c5d021e6..9318f066 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 12f8f9fc..124fa02e 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 45554904..cbc3641e 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 70ee1021..f4295ec1 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index e9283e9a..4447a887 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 341451aa..05c304d3 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/index.html b/user_guide/general/index.html index b2e89faf..f0905d92 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index de34a7a0..00679c56 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 18e57589..f25b87fe 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html index e7e45850..f9e9ab38 100644 --- a/user_guide/general/multiple_apps.html +++ b/user_guide/general/multiple_apps.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 85190af9..4226b8a6 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 2a933e3f..029dbf02 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 20d3fec9..31a823ff 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 3efb3bba..bd208507 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index a0bb6713..5e633bc7 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index dbe9cb12..08d8a27c 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/security.html b/user_guide/general/security.html index e8f935d5..ef076c66 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index c90e90f7..366e9992 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 602d5825..4fe808ff 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 854d0bab..38b7f57b 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index ec27e548..6e9b5eb8 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 727ce520..b7eb6bc5 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 34450b13..cd9d2928 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 14dba661..7a3f0b01 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index cbbf810a..0d5f2388 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 68d44e66..d983c1da 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index e32cbc93..72743106 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index 129e424e..ce62f433 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 65cc795e..02f76ee7 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 3953e8b2..110e45e1 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            @@ -122,7 +122,7 @@

            encode_php_tags()

               ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  String Helper +Next Topic:  Smiley Helper

            Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

            diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index f43dfc48..e2908701 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -33,7 +33,7 @@
            - +

            Code Igniter User Guide Version 1.5.0b3

            Code Igniter User Guide Version 1.5.0
            @@ -131,7 +131,7 @@

            repeater()

          From 49439ff0a4deaac47e078c137216b0c410bd6ec4 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Oct 2006 04:39:12 +0000 Subject: [PATCH 0423/2544] --- system/application/config/config.php | 29 +++++++++++------------- system/codeigniter/Common.php | 6 ++--- system/libraries/Config.php | 2 +- system/libraries/Loader.php | 4 ++-- system/libraries/Log.php | 2 +- user_guide/installation/upgrade_150.html | 14 +++++++++++- 6 files changed, 33 insertions(+), 24 deletions(-) diff --git a/system/application/config/config.php b/system/application/config/config.php index fc472401..3c3b423d 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -142,20 +142,6 @@ $config['controller_trigger'] = 'c'; $config['function_trigger'] = 'm'; -/* -|-------------------------------------------------------------------------- -| Error Logging -|-------------------------------------------------------------------------- -| -<<<<<<< .mine -| 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. -| -*/ -$config['time_reference'] = 'local'; - /* |-------------------------------------------------------------------------- | Error Logging Threshold @@ -163,10 +149,8 @@ | | If you have enabled error logging, you can set an error threshold to | determine what gets logged. Threshold options are: -======= | You can enable error logging by setting a threshold over zero. The | threshold determines what gets logged. Threshold options are: ->>>>>>> .r388 | | 0 = Disables logging | 0 = Error logging TURNED OFF @@ -302,4 +286,17 @@ $config['time_reference'] = 'local'; +/* +|-------------------------------------------------------------------------- +| Rewrite PHP Short Tags +|-------------------------------------------------------------------------- +| +| 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) +| +*/ +$config['rewrite_short_tags'] = FALSE; + + ?> \ No newline at end of file diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index 06e92208..41e13bee 100644 --- a/system/codeigniter/Common.php +++ b/system/codeigniter/Common.php @@ -127,7 +127,7 @@ function &get_config() * @access public * @return mixed */ -function &config_item($item) +function config_item($item) { static $config_item = array(); @@ -197,7 +197,7 @@ function log_message($level = 'error', $message, $php_error = FALSE) { static $LOG; - $config = get_config(); + $config =& get_config(); if ($config['log_threshold'] == 0) { return; @@ -247,7 +247,7 @@ function _exception_handler($severity, $message, $filepath, $line) } // Should we log the error? No? We're done... - $config = get_config(); + $config =& get_config(); if ($config['log_threshold'] == 0) { return; diff --git a/system/libraries/Config.php b/system/libraries/Config.php index c4ea9b4e..28409fbc 100644 --- a/system/libraries/Config.php +++ b/system/libraries/Config.php @@ -44,7 +44,7 @@ class CI_Config { */ function CI_Config() { - $this->config = get_config(); + $this->config =& get_config(); log_message('debug', "Config Class Initialized"); } diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 709d9fe3..11762656 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -606,7 +606,7 @@ function _ci_load($data) // do a little string replacement, changing the short tags // to standard PHP echo statements. - if ((bool) @ini_get('short_open_tag') === FALSE) + if ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE) { echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace('log_path = ($config['log_path'] != '') ? $config['log_path'] : BASEPATH.'logs/'; diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 6ebc331d..06d0c702 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -101,7 +101,7 @@

          Step 2: Update your database.php file

          Step 2: Update your config.php file

          -

          Open your application/config/config.php file and ADD this new item:

          +

          Open your application/config/config.php file and ADD these new items:

           /*
@@ -117,6 +117,18 @@ 
          Step 2: Update your config.php file
          
 |
 */
 $config['subclass_prefix'] = 'MY_';
+
+/*
+|--------------------------------------------------------------------------
+| Rewrite PHP Short Tags
+|--------------------------------------------------------------------------
+|
+| 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)
+|
+*/
+$config['rewrite_short_tags'] = FALSE;

          In that same file REMOVE this item:

          From b79b42af353a3070fd19f234ff3ee17502ac57b5 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Oct 2006 17:11:46 +0000 Subject: [PATCH 0424/2544] --- user_guide/general/managing_apps.html | 139 ++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 user_guide/general/managing_apps.html diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html new file mode 100644 index 00000000..9b5c68d7 --- /dev/null +++ b/user_guide/general/managing_apps.html @@ -0,0 +1,139 @@ + + + + +Code Igniter User Guide + + + + + + + + + + + + + + + + + + + + + + +
          + + + + + +

          Code Igniter User Guide Version 1.5.0

          +
          + + + + + + + + + +
          + + +
          + + + +
          + +

          Managing your Applications

          + +

          By default it is assumed that you only intend to use Code Igniter to manage one application, which you will build in your +system/application/ directory. It is possible, however, to have multiple sets of applications that share a single +Code Igniter installation, or even to rename or relocate your application folder.

          + +

          Renaming the Application Folder

          + +

          If you would like to rename your applicaiton folder you may do so as long as you open your main index.php +file and set its name using the $application_folder variable:

          + +$application_folder = "application"; + +

          Relocating your Application Folder

          + +

          It is possible to move your application folder to a different location on your server than your system folder. +To do so open your main index.php and set a full server path in the $application_folder variable.

          + + +$application_folder = "/Path/to/your/application"; + + +

          Running Multiple Applications with one Code Igniter Installation

          + +

          If you would like to share a common Code Igniter installation to manage several different applications simply +put all of the directories located inside your application folder into their +own sub-folder.

          + +

          For example, let's say you want to create two applications, "foo" and "bar". You will structure your +application folder like this: + +system/application/foo/
          +system/application/foo/config/
          +system/application/foo/controllers/
          +system/application/foo/errors/
          +system/application/foo/libraries/
          +system/application/foo/models/
          +system/application/foo/views/
          +system/application/bar/
          +system/application/bar/config/
          +system/application/bar/controllers/
          +system/application/bar/errors/
          +system/application/bar/libraries/
          +system/application/bar/models/
          +system/application/bar/views/           + + +

          To select a particular application for use requires that you open your main index.php file and set the $application_folder +variable. For example, to select the "foo" application for use you would do this:

          + +$application_folder = "application/foo"; + +

          Note:  Each of your applications will need its own index.php file which +calls the desired application. The index.php file can be named anything you want.

          + + + + + +
          + + + + + + + \ No newline at end of file From a42bf30be502fa46f61ba77575e71fb587b30102 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Oct 2006 17:12:14 +0000 Subject: [PATCH 0425/2544] --- user_guide/general/multiple_apps.html | 33 +++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html index f9e9ab38..9b5c68d7 100644 --- a/user_guide/general/multiple_apps.html +++ b/user_guide/general/multiple_apps.html @@ -47,7 +47,7 @@ Code Igniter Home  ›  User Guide Home  ›  -Running Multiple Applications +Managing your Applications
          Search User Guide   
          @@ -60,11 +60,32 @@
          -

          Running Multiple Applications with one Code Igniter Installation

          +

          Managing your Applications

          By default it is assumed that you only intend to use Code Igniter to manage one application, which you will build in your system/application/ directory. It is possible, however, to have multiple sets of applications that share a single -Code Igniter installation. To do this you will put all of the directories located inside your application folder into their +Code Igniter installation, or even to rename or relocate your application folder.

          + +

          Renaming the Application Folder

          + +

          If you would like to rename your applicaiton folder you may do so as long as you open your main index.php +file and set its name using the $application_folder variable:

          + +$application_folder = "application"; + +

          Relocating your Application Folder

          + +

          It is possible to move your application folder to a different location on your server than your system folder. +To do so open your main index.php and set a full server path in the $application_folder variable.

          + + +$application_folder = "/Path/to/your/application"; + + +

          Running Multiple Applications with one Code Igniter Installation

          + +

          If you would like to share a common Code Igniter installation to manage several different applications simply +put all of the directories located inside your application folder into their own sub-folder.

          For example, let's say you want to create two applications, "foo" and "bar". You will structure your @@ -89,9 +110,11 @@

          Running Multiple Applications with one Code Igniter Installation

          To select a particular application for use requires that you open your main index.php file and set the $application_folder variable. For example, to select the "foo" application for use you would do this:

          -$application_folder = "foo"; +$application_folder = "application/foo"; + +

          Note:  Each of your applications will need its own index.php file which +calls the desired application. The index.php file can be named anything you want.

          -

          Note: Each of your applications will need its own index.php file (the index.php file can be named anything you want).

          From cef2106de1c7044072499aa5d4e529a01c3db8a4 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Oct 2006 17:13:13 +0000 Subject: [PATCH 0426/2544] --- index.php | 16 ++- system/codeigniter/CodeIgniter.php | 4 +- system/libraries/Controller.php | 4 +- user_guide/changelog.html | 8 +- user_guide/general/alternative_php.html | 10 +- user_guide/general/caching.html | 2 +- user_guide/general/changelog.html | 2 +- user_guide/general/managing_apps.html | 139 ----------------------- user_guide/general/profiling.html | 2 +- user_guide/installation/upgrade_150.html | 8 +- user_guide/nav/nav.js | 2 +- user_guide/toc.html | 2 +- 12 files changed, 41 insertions(+), 158 deletions(-) delete mode 100644 user_guide/general/managing_apps.html diff --git a/index.php b/index.php index 0386ed6e..6c839ec5 100644 --- a/index.php +++ b/index.php @@ -32,7 +32,11 @@ |--------------------------------------------------------------- | | If you want this front controller to use a different "application" -| folder then the default one you can set its name here. +| folder then the default one you can set its name here. +| The folder can also be relocated anywhere on your server. For +| more info please see the user guide: +| http://www.codeigniter.com/user_guide/general/managing_apps.html +| | | NO TRAILING SLASH! | @@ -77,7 +81,15 @@ define('FCPATH', __FILE__); define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); define('BASEPATH', $system_folder.'/'); -define('APPPATH', BASEPATH.$application_folder.'/'); + +if ( ! is_dir($application_folder)) +{ + define($application_folder.'/'); +} +else +{ + define('APPPATH', BASEPATH.$application_folder.'/'); +} // Load the front controller and away we go!.... require_once BASEPATH.'codeigniter/CodeIgniter'.EXT; diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index fb27191c..5b3f54ae 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -115,11 +115,9 @@ * Note: The Loader class needs to be included first * */ - -load_class('Loader', FALSE); - if (floor(phpversion()) < 5) { + load_class('Loader', FALSE); require(BASEPATH.'codeigniter/Base4'.EXT); } else diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 922382ab..c8fa646c 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -74,11 +74,11 @@ function _ci_initialize() $this->$var =& load_class($class); } - // In PHP 5 the Controller class is run as a discreet + // In PHP 5 the Loader class is run as a discreet // class. In PHP 4 it extends the Controller if (floor(phpversion()) >= 5) { - $this->load = new CI_Loader(); + $this->load =& load_class('Loader'); $this->load->_ci_autoloader(); } else diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 1d48e125..099614d6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -86,6 +86,8 @@

          Version 1.5.0

        • Added new File Helper: get_filenames()
        • Added new helper: Smiley Helper
        • Added support for <ul> and <ol> lists in the HTML Helper
          • +
        • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
          • +
        • Added the ability to rename or relocate the "application" folder.
        • Added more thorough initialization in the upload class so that all class variables are reset.
        • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
        • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
          • @@ -94,12 +96,12 @@

          Version 1.5.0

        • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
        • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
        • Fixed a bug in the Email class related to SMTP Helo data.
          • -
        • Fixed a bugin the word wrapping heper and function in the email class.
          • +
        • Fixed a bug in the word wrapping helper and function in the email class.
        • Fixed a bug in the validation class.
        • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
        • Fixed a problem in the form_prep() function that was double encoding entities.
        • Fixed a bug that affects some versions of PHP when output buffering is nested.
          • -
        • Fixed a bug that caused CI to stop working when the PHP magic __get() function was used within models or controllers.
          • +
        • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
        • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
        • Deprecated $this->db->field_names() USE $this->db->list_fields()
        • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
          • @@ -315,7 +317,7 @@

          Version Beta 1.1

          • Added a Calendaring class.
            • -
          • Added support for running multiple applications that share a common Code Igniter backend.
            • +
          • Added support for running multiple applications that share a common Code Igniter backend.
          • Moved the "uri protocol" variable from the index.php file into the config.php file
          • Fixed a problem that was preventing certain function calls from working within constructors.
          • Fixed a problem that was preventing the $this->load->library function from working in constructors.
            • diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 7e8de7c0..564dc323 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -67,6 +67,12 @@

            Alternate PHP Syntax for View Files

            syntax for control structures and echo statements. If you are not familiar with this syntax, it allows you to eliminate the braces from your code, and eliminate "echo" statements.

            +

            Note: If you find that the syntax described in this page does not work on your server it might +be that "short tags" are disabled in your PHP ini file. Code Igniter will optionally rewrite short tags on-the-fly, +allowing you to use that syntax even if your server doesn't support it. This feature can be enabled in your +config/config.php file.

            + +

            Alternative Echos

            Normally to echo, or print out a variable you would do this:

            @@ -77,8 +83,6 @@

            Alternative Echos

            <?=$variable?> -

            Note: If you find that the syntax described in this page does not work on your server it might -be that "short tags" are disabled in your PHP ini file.

            Alternative Control Structures

            @@ -129,7 +133,7 @@

            Alternative Control Structures

            diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html index 81235cae..9058f03b 100644 --- a/user_guide/general/changelog.html +++ b/user_guide/general/changelog.html @@ -304,7 +304,7 @@

            Version Beta 1.1

            • Added a Calendaring class.
              • -
            • Added support for running multiple applications that share a common Code Igniter backend.
              • +
            • Added support for running multiple applications that share a common Code Igniter backend.
            • Moved the "uri protocol" variable from the index.php file into the config.php file
            • Fixed a problem that was preventing certain function calls from working within constructors.
            • Fixed a problem that was preventing the $this->load->library function from working in constructors.
              • diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html deleted file mode 100644 index 9b5c68d7..00000000 --- a/user_guide/general/managing_apps.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - -Code Igniter User Guide - - - - - - - - - - - - - - - - - - - - - - -
              - - - - - -

              Code Igniter User Guide Version 1.5.0

              -
              - - - - - - - - - -
              - - -
              - - - -
              - -

              Managing your Applications

              - -

              By default it is assumed that you only intend to use Code Igniter to manage one application, which you will build in your -system/application/ directory. It is possible, however, to have multiple sets of applications that share a single -Code Igniter installation, or even to rename or relocate your application folder.

              - -

              Renaming the Application Folder

              - -

              If you would like to rename your applicaiton folder you may do so as long as you open your main index.php -file and set its name using the $application_folder variable:

              - -$application_folder = "application"; - -

              Relocating your Application Folder

              - -

              It is possible to move your application folder to a different location on your server than your system folder. -To do so open your main index.php and set a full server path in the $application_folder variable.

              - - -$application_folder = "/Path/to/your/application"; - - -

              Running Multiple Applications with one Code Igniter Installation

              - -

              If you would like to share a common Code Igniter installation to manage several different applications simply -put all of the directories located inside your application folder into their -own sub-folder.

              - -

              For example, let's say you want to create two applications, "foo" and "bar". You will structure your -application folder like this: - -system/application/foo/
              -system/application/foo/config/
              -system/application/foo/controllers/
              -system/application/foo/errors/
              -system/application/foo/libraries/
              -system/application/foo/models/
              -system/application/foo/views/
              -system/application/bar/
              -system/application/bar/config/
              -system/application/bar/controllers/
              -system/application/bar/errors/
              -system/application/bar/libraries/
              -system/application/bar/models/
              -system/application/bar/views/               - - -

              To select a particular application for use requires that you open your main index.php file and set the $application_folder -variable. For example, to select the "foo" application for use you would do this:

              - -$application_folder = "application/foo"; - -

              Note:  Each of your applications will need its own index.php file which -calls the desired application. The index.php file can be named anything you want.

              - - - - - -
              - - - - - - - \ No newline at end of file diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 029dbf02..0f74f1e2 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -110,7 +110,7 @@

              Setting Benchmark Points

                 ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  Running Multiple Applications +Next Topic:  Managing Applications

              Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

          diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 06d0c702..79632ece 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -155,7 +155,13 @@

          Step 2: Update your config.php file

          Step 4: Update your main index.php file

          If you are running a stock index.php file simply replace your version with the new one. If you are running one with -internal modifications, open it and add this line of code near the bottom:

          +internal modifications, open it and make these two changes:

          + +

          Find the $application_folder variable and make sure it contains the name of your "application" directory:

          + +$application_folder = "application"; + +

          Next, at add this line of code near the bottom of the page:

          define('FCPATH', __FILE__); diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index dafe22e8..253700e6 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -54,7 +54,7 @@ function create_menu(basepath) '
        • Error Handling
          • ' + '
        • Caching
          • ' + '
        • Profiling Your Application
          • ' + - '
        • Running Multiple Applications
          • ' + + '
        • Managing Applications
          • ' + '
        • Alternative PHP Syntax
          • ' + '
        • Security
          • ' + '
        ' + diff --git a/user_guide/toc.html b/user_guide/toc.html index 7d6178de..95ea19bd 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -109,7 +109,7 @@

        General Topics

      • Error Handling
      • Caching
      • Profiling Your Application
        • -
      • Running Multiple Applications
        • +
      • Managing Applications
      • Alternative PHP Syntax
      • Security
      From c0d5d5201075ff0babbab84e251373cd6b012e4e Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Oct 2006 19:40:35 +0000 Subject: [PATCH 0427/2544] --- system/application/config/config.php | 2 +- user_guide/changelog.html | 2 +- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/changelog.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/index.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/multiple_apps.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/index.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/nav/nav.js | 5 ++++- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 13 +++++++++++++ 104 files changed, 119 insertions(+), 103 deletions(-) diff --git a/system/application/config/config.php b/system/application/config/config.php index 3c3b423d..2f385a6e 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -78,7 +78,7 @@ | setting this variable to TRUE (boolean). See the user guide for details. | */ -$config['enable_hooks'] = TRUE; +$config['enable_hooks'] = FALSE; /* diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 099614d6..53c44224 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index e9f9b680..0db83d2d 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index c1062690..9a16a8f8 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index da3279a6..b19d9d70 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 1fe0825a..f49184d0 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 466af04e..f50f530a 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 2d38dba0..560c6f0e 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 31332f70..dbeb541e 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 63164169..2b552f1c 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 9d047705..812fcaad 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 41a28abd..916ff227 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 32662280..c886f4e3 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 954ce668..109f988a 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 3f272c56..27f1ba9f 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index bccce555..a9227ab2 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 564dc323..888123ed 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 3634dc32..d79de4c1 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 3a5876f3..89768569 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 88f6c8c0..b4b3dab7 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html index 9058f03b..938d43a7 100644 --- a/user_guide/general/changelog.html +++ b/user_guide/general/changelog.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index b33c76ef..a388b9f7 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 9318f066..f7e308ac 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 124fa02e..8e17ad3f 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index cbc3641e..3ff4b175 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index f4295ec1..99dba91f 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 4447a887..823a4275 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 05c304d3..a932d743 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/index.html b/user_guide/general/index.html index f0905d92..8d3eb07f 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 00679c56..3d834b8e 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/models.html b/user_guide/general/models.html index f25b87fe..b0a10834 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html index 9b5c68d7..387368b6 100644 --- a/user_guide/general/multiple_apps.html +++ b/user_guide/general/multiple_apps.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 4226b8a6..ca8df3cd 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 0f74f1e2..92b77a79 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 31a823ff..13bd1f82 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index bd208507..2a2db5ad 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 5e633bc7..d5377f15 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index 08d8a27c..a9c8db28 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/security.html b/user_guide/general/security.html index ef076c66..d7e552e3 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 366e9992..9e65e4f4 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 4fe808ff..147667ce 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 38b7f57b..b3d59c53 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 6e9b5eb8..d6b64160 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index b7eb6bc5..68e30682 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index cd9d2928..822e29af 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 7a3f0b01..9a29abb1 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 0d5f2388..aeba68d2 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index d983c1da..6d1402df 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 303adc34..d246c927 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index ce62f433..4222405b 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 02f76ee7..db203cdd 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 110e45e1..1fcb9115 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index de847957..d818d008 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index e2908701..04310241 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index e35d333f..f84acce9 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 733fbdcb..19550059 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 6dcdef53..33a933d7 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 3ff8d2ad..5d7496f6 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/index.html b/user_guide/index.html index 02399b6b..b2a0dcb9 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index a7fe28be..1f84a405 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index dd85bfc8..f339fe83 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index ea8037fc..168e5977 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index cab53361..93757c87 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index a6b78cc9..da4ad405 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index fae42797..101ac537 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 73e04f45..99571c16 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 3d5bd841..e8220bdc 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 82421167..dbc628a6 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index f5cabf91..929608c2 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 79632ece..f180f8f8 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index d3462fc4..9a78dd55 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 3b77e274..51be6897 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 2daa997e..7ed45586 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 50cbbd36..03035170 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 7dde4451..d22881fa 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 18900867..42d11255 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 03eae7d2..34cacf5c 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 6be1db9f..6a2317da 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 2d80a99b..0bec3a82 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 00ce88e6..726f8c92 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 9036d694..292f967b 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 5e8b3b23..3ecadec4 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 53dc60a9..61ed6bff 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 97f1314f..0ebaaedd 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 50519a4d..a2bfc25f 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 77657781..e187c49a 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 00e25761..ed6260f4 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 410bd405..fe2f0c29 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 292931a8..4a4d9948 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 2439ce9b..692df003 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index f1006e07..efb0a874 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index fb843818..1426a4a5 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 22ae56ff..0c1288f5 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 82a97fde..9421e0fe 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 9503f16f..67dc039c 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/license.html b/user_guide/license.html index 55bd9f07..a0b68766 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -34,7 +34,7 @@ - +

      Code Igniter User Guide Version 1.5.0
      diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index 253700e6..46272984 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -6,7 +6,10 @@ function create_menu(basepath) '' + ' - +result() as $row): ?> From 1aef55e44d0aff547e4c016796734412fbe710ae Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 02:42:11 +0000 Subject: [PATCH 0434/2544] --- system/language/english/calendar_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php index 4a399af8..02475e1f 100644 --- a/system/language/english/calendar_lang.php +++ b/system/language/english/calendar_lang.php @@ -1,6 +1,6 @@ Date: Tue, 31 Oct 2006 03:26:00 +0000 Subject: [PATCH 0435/2544] --- user_guide/general/managing_apps.html | 139 ++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 user_guide/general/managing_apps.html diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html new file mode 100644 index 00000000..387368b6 --- /dev/null +++ b/user_guide/general/managing_apps.html @@ -0,0 +1,139 @@ + + + + +Code Igniter User Guide + + + + + + + + + + + + + + + + + + + + + + +
      +
      ' + - '

      User Guide Home

      ' + + '' + '

      Basic Info

      ' + '
        ' + diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 9cc19a2e..69cc2550 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -34,7 +34,7 @@ - +

        Code Igniter User Guide Version 1.5.0
        diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 2cfeee02..38cb203d 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -34,7 +34,7 @@ - +

        Code Igniter User Guide Version 1.5.0
        diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 5d8ae734..6b570d86 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -34,7 +34,7 @@ - +

        Code Igniter User Guide Version 1.5.0
        diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index a9c42aef..dff233cd 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -34,7 +34,7 @@ - +

        Code Igniter User Guide Version 1.5.0
        diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 3f1e984f..b8e9fd78 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -34,7 +34,7 @@ - +

        Code Igniter User Guide Version 1.5.0
        diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 1be86c6d..21ac6aa4 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -34,7 +34,7 @@ - +

        Code Igniter User Guide Version 1.5.0
        diff --git a/user_guide/toc.html b/user_guide/toc.html index 95ea19bd..7b5bd695 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -63,6 +63,9 @@

        Table of Contents

        + + + + + + + +

        Basic Info

          @@ -90,6 +93,9 @@

          Introduction

        +        		 +

        General Topics

        +

        Class Reference

        @@ -144,6 +152,8 @@

        Class Reference

        +

        Helper Reference

          @@ -174,6 +184,9 @@

          Additional Resources

        +
        From 47cf6993fed3d5baefd891d7ec774295bf81bf9b Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Oct 2006 20:24:06 +0000 Subject: [PATCH 0428/2544] --- user_guide/installation/upgrade_150.html | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index f180f8f8..f975f532 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -154,17 +154,9 @@

        Step 2: Update your config.php file

        Step 4: Update your main index.php file

        -

        If you are running a stock index.php file simply replace your version with the new one. If you are running one with -internal modifications, open it and make these two changes:

        - -

        Find the $application_folder variable and make sure it contains the name of your "application" directory:

        - -$application_folder = "application"; - -

        Next, at add this line of code near the bottom of the page:

        - -define('FCPATH', __FILE__); +

        If you are running a stock index.php file simply replace your version with the new one.

        +

        If your index.php file has internal modifications, please add your modifications to the new file and use it.

        From 784add749c806c52327615d47b8c6fabe2bd3438 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Oct 2006 20:24:26 +0000 Subject: [PATCH 0429/2544] --- index.php | 91 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 32 deletions(-) diff --git a/index.php b/index.php index 6c839ec5..315b43c8 100644 --- a/index.php +++ b/index.php @@ -7,9 +7,10 @@ | | By default CI runs with error reporting set to ALL. For security | reasons you are encouraged to change this when your site goes live. +| For more info visit: http://www.php.net/error_reporting | */ -error_reporting(E_ALL); + error_reporting(E_ALL); /* |--------------------------------------------------------------- @@ -23,7 +24,6 @@ | NO TRAILING SLASH! | */ - $system_folder = "system"; /* @@ -32,65 +32,92 @@ |--------------------------------------------------------------- | | 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 relocated anywhere on your server. For -| more info please see the user guide: +| folder then the default one you can set its name here. The folder +| can also be renamed or relocated anywhere on your server. +| For more info please see the user guide: | http://www.codeigniter.com/user_guide/general/managing_apps.html | | | NO TRAILING SLASH! | */ - $application_folder = "application"; + /* |=============================================================== -| END OF USER CONFIGURABLE SETTINGS +| END OF USER CONFIGURABLE SETTINGS |=============================================================== */ -// Let's attempt to determine the full-server path to the "system" -// folder in order to reduce the possibility of path problems. + +/* +|--------------------------------------------------------------- +| SET THE SERVER PATH +|--------------------------------------------------------------- +| +| Let's attempt to determine the full-server path to the "system" +| folder in order to reduce the possibility of path problems. +| +*/ if (function_exists('realpath') AND @realpath(dirname(__FILE__)) !== FALSE) { $system_folder = str_replace("\\", "/", realpath(dirname(__FILE__))).'/'.$system_folder; } -// Is the $aplication variable blank? If so, we'll assume the folder is called "application" -if ($application_folder == '') -{ - $application_folder = 'application'; -} - -// 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')) -{ - define('E_STRICT', 2048); -} - -// 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. -// BASEPATH - contains the full server path to the "system" folder -// APPPATH - contains the full server path to the "application" folder - +/* +|--------------------------------------------------------------- +| DEFINE APPLICATION CONSTANTS +|--------------------------------------------------------------- +| +| EXT - The file extension. Typically ".php" +| FCPATH - The full server path to THIS file +| SELF - The name of THIS file (typically "index.php) +| BASEPATH - The full server path to the "system" folder +| APPPATH - The full server path to the "application" folder +| +*/ define('EXT', '.'.pathinfo(__FILE__, PATHINFO_EXTENSION)); define('FCPATH', __FILE__); define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); define('BASEPATH', $system_folder.'/'); -if ( ! is_dir($application_folder)) +if (is_dir($application_folder)) { - define($application_folder.'/'); + define('APPPATH', $application_folder.'/'); } else { + if ($application_folder == '') + { + $application_folder = 'application'; + } + define('APPPATH', BASEPATH.$application_folder.'/'); } -// Load the front controller and away we go!.... +/* +|--------------------------------------------------------------- +| DEFINE E_STRICT +|--------------------------------------------------------------- +| +| Some older versions of PHP don't support the E_STRICT constant +| so we need to explicitly define it otherwise the Exception class +| will generate errors. +| +*/ +if ( ! defined('E_STRICT')) +{ + define('E_STRICT', 2048); +} + +/* +|--------------------------------------------------------------- +| LOAD THE FRONT CONTROLLER +|--------------------------------------------------------------- +| +| And away we go... +| +*/ require_once BASEPATH.'codeigniter/CodeIgniter'.EXT; ?> \ No newline at end of file From b93464db656fe017fe434b0fc917921ded88a12c Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 00:36:32 +0000 Subject: [PATCH 0430/2544] --- system/codeigniter/CodeIgniter.php | 9 +++- system/libraries/Calendar.php | 11 +++- system/libraries/Pagination.php | 5 +- user_guide/general/alternative_php.html | 12 +++-- user_guide/libraries/calendar.html | 64 +++++++++++------------- user_guide/libraries/file_uploading.html | 5 +- 6 files changed, 65 insertions(+), 41 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 5b3f54ae..3e2b99de 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -125,9 +125,16 @@ require(BASEPATH.'codeigniter/Base5'.EXT); } +// Load the base controller class load_class('Controller', FALSE); -require(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT); +// Load the local application controller +// Note: The Router class automatically validates the controller path. If this include fails it +// means that the default controller in the Routes.php file is not resolving to something valid. +if ( ! @include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) +{ + show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); +} // Set a mark point for benchmarking $BM->mark('loading_time_base_classes_end'); diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php index 84b096c8..fdef5dd7 100644 --- a/system/libraries/Calendar.php +++ b/system/libraries/Calendar.php @@ -45,7 +45,7 @@ class CI_Calendar { * * @access public */ - function CI_Calendar() + function CI_Calendar($config = array()) { $this->CI =& get_instance(); @@ -55,6 +55,12 @@ function CI_Calendar() } $this->local_time = time(); + + if (count($config) > 0) + { + $this->initialize($config); + } + log_message('debug', "Calendar Class Initialized"); } @@ -153,6 +159,9 @@ function generate($year = '', $month = '', $data = array()) // "previous" month link if ($this->show_next_prev == TRUE) { + // Add a trailing slash to the URL if needed + $this->next_prev_url = preg_replace("/(.+?)\/*$/", "\\1/", $this->next_prev_url); + $adjusted_date = $this->adjust_date($month - 1, $year); $out .= str_replace('{previous_url}', $this->next_prev_url.$adjusted_date['year'].'/'.$adjusted_date['month'], $this->temp['heading_previous_cell']); $out .= "\n"; diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index c66d570c..07ad6a68 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -120,8 +120,11 @@ function create_links() if ($CI->uri->segment($this->uri_segment) != 0) { $this->cur_page = $CI->uri->segment($this->uri_segment); + + // Prep the current page - no funny business! + $this->cur_page = preg_replace("/[a-z\-]/", "", $this->cur_page); } - + if ( ! is_numeric($this->cur_page)) { $this->cur_page = 0; diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 888123ed..2018bf26 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -63,15 +63,21 @@

        Alternate PHP Syntax for View Files

        If you do not utilize Code Igniter's template engine, you'll be using pure PHP -in your View files. To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use PHPs alternative -syntax for control structures and echo statements. If you are not familiar with this syntax, it allows you to eliminate the braces from your code, +in your View files. To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use +PHPs alternative syntax for control structures and short tag echo statements. If you are not familiar with this syntax, it allows you to eliminate the braces from your code, and eliminate "echo" statements.

        -

        Note: If you find that the syntax described in this page does not work on your server it might +

        Automatic Short Tag Support

        + +

        Note: If you find that the syntax described in this page does not work on your server it might be that "short tags" are disabled in your PHP ini file. Code Igniter will optionally rewrite short tags on-the-fly, allowing you to use that syntax even if your server doesn't support it. This feature can be enabled in your config/config.php file.

        +

        Please note that if you do use this feature, if PHP errors are encountered +in your view files, the error message and line number will not be accurately shown. Instead, all errors +will be shown as eval() errors.

        +

        Alternative Echos

        diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 03035170..ff61701a 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -119,19 +119,18 @@

        Passing Data to your Calendar Cells

        Setting Display Preferences

        -

        There are seven preferences you can set to control various aspects of the calendar. Preferences are set using an initialization -function similar to other classes. Here is an example: +

        There are seven preferences you can set to control various aspects of the calendar. Preferences are set by passing an +array of preferences in the second parameter of the loading function. Here is an example:

        -$this->load->library('calendar');
        -
        + $prefs = array (
                       'start_day'    => 'saturday',
                       'month_type'   => 'long',
                       'day_type'     => 'short'
                     );

        -$this->calendar->initialize($prefs);
        +$this->load->library('calendar', $prefs);

        echo $this->calendar->generate();         @@ -166,6 +165,30 @@

        Setting Display Preferences

        +

        Showing Next/Previous Month Links

        + +

        To allow your calendar to dynamically increment/decrement via the next/previous links requires that you set up your calendar +code similar to this example:

        + + +$this->load->library('calendar');
        +
        +$prefs = array (
        +               'show_next_prev'  => TRUE,
        +               'next_prev_url'   => 'http://www.your-site.com/index.php/calendar/show/'
        +             );
        +
        +echo $this->calendar->generate($this->uri->segment(3), $this->uri->segment(4), $prefs);         + +

        You'll notice a few things about the above example:

        + +
          +
        • You must set the "show_next_prev" to TRUE.
          • +
        • You must supply the URL to the controller containing your calendar in the "next_prev_url" preference.
          • +
        • You must supply the "year" and "month" to the calendar generating function via the URI segments where they appear (Note: The calendar class automatically adds the year/month to the base URL you provide.).
          • +
        + +

        Creating a Calendar Template

        @@ -173,7 +196,7 @@

        Creating a Calendar Template

        calendar will be placed within a pair of pseudo-variables as shown here:

        -$this->load->library('calendar');

        + $prefs['template'] = '

           {table_open}<table border="0" cellpadding="0" cellspacing="0">{/table_open}

        @@ -206,39 +229,12 @@

        Creating a Calendar Template

           {table_close}</table>{/table_close}
        ';

        -$this->calendar->initialize($prefs);
        +$this->load->library('calendar', $prefs);

        echo $this->calendar->generate();         -

        Showing Next/Previous Month Links

        - -

        To allow your calendar to dynamically increment/decrement via the next/previous links requires that you set up your calendar -code similar to this example:

        - - -$this->load->library('calendar');
        -
        -$prefs = array (
        -               'show_next_prev'  => TRUE,
        -               'next_prev_url'   => 'http://www.your-site.com/index.php/calendar/show/'
        -             );
        -
        -$this->calendar->initialize($prefs);
        -
        -echo $this->calendar->generate($this->uri->segment(3), $this->uri->segment(4));         - -

        You'll notice a few things about the above example:

        - -
          -
        • You must set the "show_next_prev" to TRUE.
          • -
        • You must supply the URL to the controller containing your calendar in the "next_prev_url" preference.
          • -
        • You must supply the "year" and "month" to the calendar generating function via the URI segments where they appear (Note: The calendar class automatically adds the year/month to the base URL you provide.).
          • -
        - - - diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 6a2317da..1fa93bf1 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -171,7 +171,7 @@

        The Controller

        $config['max_width'] = '1024'; $config['max_height'] = '768'; - $this->upload->initialize($config); + $this->load->library('upload', $config); if ( ! $this->upload->do_upload()) { @@ -230,6 +230,9 @@

        Setting Preferences

        $config['max_width'] = '1024';
        $config['max_height'] = '768';

        +$this->load->library('ftp', $config);

        + +// Alternately you can set preferences by calling the initialize function. Useful if you auto-load the class:
        $this->upload->initialize($config);

        The above preferences should be fairly self-explanatory. Below is a table describing all available preferences.

        From 2c9b09f2bb81061fc20610127c7e5b2e54aa4473 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 00:37:48 +0000 Subject: [PATCH 0431/2544] --- user_guide/changelog.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 53c44224..c9dc7406 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -102,6 +102,8 @@

        Version 1.5.0

      • Fixed a problem in the form_prep() function that was double encoding entities.
      • Fixed a bug that affects some versions of PHP when output buffering is nested.
      • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
        • +
      • Fixed a pagination bug that was permitting negative values in the URL.
        • +
      • Fixed an oversight in which the Loader class was not allowed to be exteneded.
      • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
      • Deprecated $this->db->field_names() USE $this->db->list_fields()
      • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
        • From bf9ee3f82dda6c738b65f2b558579b6cab7f7774 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 02:35:04 +0000 Subject: [PATCH 0432/2544] --- system/database/DB_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 77069d1a..03631d69 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -137,7 +137,7 @@ function initialize($params = '') { return TRUE; } - + // Connect to the database $this->conn_id = ($this->pconnect == FALSE) ? $this->db_connect() : $this->db_pconnect(); From 57cd6e21cd94f5cc278f5f979a2c7071724e73f6 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 02:36:32 +0000 Subject: [PATCH 0433/2544] --- system/scaffolding/views/view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/scaffolding/views/view.php b/system/scaffolding/views/view.php index fd20a174..e7abda6d 100644 --- a/system/scaffolding/views/view.php +++ b/system/scaffolding/views/view.php @@ -7,7 +7,7 @@
      + + + + +

      Code Igniter User Guide Version 1.5.0

      + + + + + + + + + + +
      + + +
      + + + +
      + +

      Managing your Applications

      + +

      By default it is assumed that you only intend to use Code Igniter to manage one application, which you will build in your +system/application/ directory. It is possible, however, to have multiple sets of applications that share a single +Code Igniter installation, or even to rename or relocate your application folder.

      + +

      Renaming the Application Folder

      + +

      If you would like to rename your applicaiton folder you may do so as long as you open your main index.php +file and set its name using the $application_folder variable:

      + +$application_folder = "application"; + +

      Relocating your Application Folder

      + +

      It is possible to move your application folder to a different location on your server than your system folder. +To do so open your main index.php and set a full server path in the $application_folder variable.

      + + +$application_folder = "/Path/to/your/application"; + + +

      Running Multiple Applications with one Code Igniter Installation

      + +

      If you would like to share a common Code Igniter installation to manage several different applications simply +put all of the directories located inside your application folder into their +own sub-folder.

      + +

      For example, let's say you want to create two applications, "foo" and "bar". You will structure your +application folder like this: + +system/application/foo/
      +system/application/foo/config/
      +system/application/foo/controllers/
      +system/application/foo/errors/
      +system/application/foo/libraries/
      +system/application/foo/models/
      +system/application/foo/views/
      +system/application/bar/
      +system/application/bar/config/
      +system/application/bar/controllers/
      +system/application/bar/errors/
      +system/application/bar/libraries/
      +system/application/bar/models/
      +system/application/bar/views/       + + +

      To select a particular application for use requires that you open your main index.php file and set the $application_folder +variable. For example, to select the "foo" application for use you would do this:

      + +$application_folder = "application/foo"; + +

      Note:  Each of your applications will need its own index.php file which +calls the desired application. The index.php file can be named anything you want.

      + + + + + +
      + + + + + + + \ No newline at end of file From 57b9e5c5350ffb20048d36c508d1e310603b12f8 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 07:11:36 +0000 Subject: [PATCH 0436/2544] --- system/libraries/Ftp.php | 4 +- system/libraries/Model.php | 9 +- user_guide/general/multiple_apps.html | 139 -------------------------- user_guide/libraries/loader.html | 11 -- 4 files changed, 4 insertions(+), 159 deletions(-) delete mode 100644 user_guide/general/multiple_apps.html diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 3b2be23d..1572a587 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -178,7 +178,7 @@ function changedir($path = '', $supress_debug = FALSE) if ($result === FALSE) { - if ($this->debug == TRUE AND $supress_debug != TRUE) + if ($this->debug == TRUE AND $supress_debug == FALSE) { $this->_error('ftp_unable_to_changedir'); } @@ -251,7 +251,7 @@ function upload($locpath, $rempath, $mode = 'auto', $permissions = NULL) // Set the mode if not specified if ($mode == 'auto') { - // Get the file extension so we can se the upload type + // Get the file extension so we can set the upload type $ext = $this->_getext($locpath); $mode = $this->_settype($ext); } diff --git a/system/libraries/Model.php b/system/libraries/Model.php index 1c2b7afc..6f4f7e7e 100644 --- a/system/libraries/Model.php +++ b/system/libraries/Model.php @@ -40,12 +40,7 @@ function Model() // We don't want to assign the model object to itself when using the // assign_libraries function below so we'll grab the name of the model parent - $methods = get_class_methods($this); - - if (isset($methods[0])) - { - $this->_parent_name = $methods[0]; - } + $this->_parent_name = ucfirst(get_class($this)); log_message('debug', "Model Class Initialized"); } @@ -65,7 +60,7 @@ function _assign_libraries($use_reference = TRUE) foreach (array_keys(get_object_vars($CI)) as $key) { if ( ! isset($this->$key) AND $key != $this->_parent_name) - { + { // In some cases using references can cause // problems so we'll conditionally use them if ($use_reference == TRUE) diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html deleted file mode 100644 index 387368b6..00000000 --- a/user_guide/general/multiple_apps.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - -Code Igniter User Guide - - - - - - - - - - - - - - - - - - - - - - -
      - - - - - -

      Code Igniter User Guide Version 1.5.0

      -
      - - - - - - - - - -
      - - -
      - - - -
      - -

      Managing your Applications

      - -

      By default it is assumed that you only intend to use Code Igniter to manage one application, which you will build in your -system/application/ directory. It is possible, however, to have multiple sets of applications that share a single -Code Igniter installation, or even to rename or relocate your application folder.

      - -

      Renaming the Application Folder

      - -

      If you would like to rename your applicaiton folder you may do so as long as you open your main index.php -file and set its name using the $application_folder variable:

      - -$application_folder = "application"; - -

      Relocating your Application Folder

      - -

      It is possible to move your application folder to a different location on your server than your system folder. -To do so open your main index.php and set a full server path in the $application_folder variable.

      - - -$application_folder = "/Path/to/your/application"; - - -

      Running Multiple Applications with one Code Igniter Installation

      - -

      If you would like to share a common Code Igniter installation to manage several different applications simply -put all of the directories located inside your application folder into their -own sub-folder.

      - -

      For example, let's say you want to create two applications, "foo" and "bar". You will structure your -application folder like this: - -system/application/foo/
      -system/application/foo/config/
      -system/application/foo/controllers/
      -system/application/foo/errors/
      -system/application/foo/libraries/
      -system/application/foo/models/
      -system/application/foo/views/
      -system/application/bar/
      -system/application/bar/config/
      -system/application/bar/controllers/
      -system/application/bar/errors/
      -system/application/bar/libraries/
      -system/application/bar/models/
      -system/application/bar/views/       - - -

      To select a particular application for use requires that you open your main index.php file and set the $application_folder -variable. For example, to select the "foo" application for use you would do this:

      - -$application_folder = "application/foo"; - -

      Note:  Each of your applications will need its own index.php file which -calls the desired application. The index.php file can be named anything you want.

      - - - - - -
      - - - - - - - \ No newline at end of file diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 61ed6bff..c7cf82d4 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -88,17 +88,6 @@

      $this->load->library('class_name')

      Parameters can be passed to the library via an array in the second parameter. - -

      If you would like your libraries assigned to a different variable name then the default you can specify the name in the second parameter:

      - - -$this->load->library('email', 'E'); // Assigns the email object to "E"
      -
      -$this->E->some_function() -       - - -

      $this->load->view('file_name', $data, true/false)

      This function is used to load your View files. If you haven't read the Views section of the From 9139b0c4d57a6052b54838aedb54e70eb683f34c Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 17:59:16 +0000 Subject: [PATCH 0437/2544] --- system/libraries/Loader.php | 107 ++++++++++++++++++++---------------- 1 file changed, 60 insertions(+), 47 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 11762656..aa1ae8cb 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -34,6 +34,7 @@ class CI_Loader { var $_ci_is_php5 = FALSE; var $_ci_is_instance = FALSE; // Whether we should use $this or $CI =& get_instance() var $_ci_cached_vars = array(); + var $_ci_classes = array(); var $_ci_models = array(); var $_ci_helpers = array(); var $_ci_plugins = array(); @@ -305,17 +306,17 @@ function helper($helpers = array()) } foreach ($helpers as $helper) - { + { + $helper = strtolower(str_replace(EXT, '', str_replace('_helper', '', $helper)).'_helper'); + if (isset($this->_ci_helpers[$helper])) { continue; } - - $helper = strtolower(str_replace(EXT, '', str_replace('_helper', '', $helper)).'_helper'); - + if (file_exists(APPPATH.'helpers/'.$helper.EXT)) - { - include(APPPATH.'helpers/'.$helper.EXT); + { + include_once(APPPATH.'helpers/'.$helper.EXT); } else { @@ -330,6 +331,7 @@ function helper($helpers = array()) } $this->_ci_helpers[$helper] = TRUE; + } log_message('debug', 'Helpers loaded: '.implode(', ', $helpers)); @@ -371,14 +373,14 @@ function plugin($plugins = array()) } foreach ($plugins as $plugin) - { + { + $plugin = strtolower(str_replace(EXT, '', str_replace('_plugin.', '', $plugin)).'_pi'); + if (isset($this->_ci_plugins[$plugin])) { continue; } - - $plugin = strtolower(str_replace(EXT, '', str_replace('_plugin.', '', $plugin)).'_pi'); - + if (file_exists(APPPATH.'plugins/'.$plugin.EXT)) { include(APPPATH.'plugins/'.$plugin.EXT); @@ -441,13 +443,13 @@ function script($scripts = array()) } foreach ($scripts as $script) - { + { + $script = strtolower(str_replace(EXT, '', $script)); + if (isset($this->_ci_scripts[$script])) { continue; } - - $script = strtolower(str_replace(EXT, '', $script)); if ( ! file_exists(APPPATH.'scripts/'.$script.EXT)) { @@ -455,8 +457,6 @@ function script($scripts = array()) } include(APPPATH.'scripts/'.$script.EXT); - - $this->_ci_scripts[$script] = TRUE; } log_message('debug', 'Scripts loaded: '.implode(', ', $scripts)); @@ -534,6 +534,30 @@ function scaffolding($table = '') */ function _ci_load($data) { + // Set the default data variables + foreach (array('view', 'vars', 'path', 'return') as $val) + { + $$val = ( ! isset($data[$val])) ? FALSE : $data[$val]; + } + + // Set the path to the requested file + if ($path == '') + { + $ext = pathinfo($view, PATHINFO_EXTENSION); + $file = ($ext == '') ? $view.EXT : $view; + $path = $this->_ci_view_path.$file; + } + else + { + $x = explode('/', $path); + $file = end($x); + } + + if ( ! file_exists($path)) + { + show_error('Unable to load the requested file: '.$file); + } + // This allows anything loaded using $this->load (views, files, etc.) // to become accessible from within the Controller and Model functions. // Only needed when running PHP 5 @@ -550,12 +574,6 @@ function _ci_load($data) } } - // Set the default data variables - foreach (array('view', 'vars', 'path', 'return') as $val) - { - $$val = ( ! isset($data[$val])) ? FALSE : $data[$val]; - } - /* * Extract and cache variables * @@ -570,19 +588,6 @@ function _ci_load($data) } extract($this->_ci_cached_vars); - // Set the path to the requested file - if ($path == '') - { - $ext = pathinfo($view, PATHINFO_EXTENSION); - $file = ($ext == '') ? $view.EXT : $view; - $path = $this->_ci_view_path.$file; - } - else - { - $x = explode('/', $path); - $file = end($x); - } - /* * Buffer the output * @@ -595,11 +600,6 @@ function _ci_load($data) * can intercept the content right before it's sent to * the browser and then stop the timer it won't be accurate. */ - if ( ! file_exists($path)) - { - show_error('Unable to load the requested file: '.$file); - } - ob_start(); // If the PHP installation does not support short tags we'll @@ -682,19 +682,32 @@ function _ci_load_class($class, $params = NULL) } // Lets search for the requested library file and load it. + $is_duplicate = FALSE; for ($i = 1; $i < 3; $i++) { - $path = ($i % 2) ? APPPATH : BASEPATH; - if (file_exists($path.'libraries/'.$class.EXT)) + $path = ($i % 2) ? APPPATH : BASEPATH; + + $fp = $path.'libraries/'.$class.EXT; + + // Safety: Was the class already loaded by a previous call? + if (in_array($fp, $this->_ci_classes) OR ! file_exists($fp)) { - include($path.'libraries/'.$class.EXT); - return $this->_ci_init_class($class, '', $params); + $is_duplicate = TRUE; + continue; } + + include($fp); + $this->_ci_classes[] = $fp; + return $this->_ci_init_class($class, '', $params); + } + + // If we got this far we were unable to find the requested class. + // We do not issue errors if the load call failed due to a duplicate request + if ($is_duplicate == FALSE) + { + log_message('error', "Unable to load the requested class: ".$class); + show_error("Unable to load the requested class: ".$class); } - - // If we got this far we were unable to find the requested class - log_message('error', "Unable to load the requested class: ".$class); - show_error("Unable to load the requested class: ".$class); } // -------------------------------------------------------------------- From 69d3984b0b2ee417c98573185edfd47c3087539b Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 18:01:00 +0000 Subject: [PATCH 0438/2544] --- system/libraries/Loader.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index aa1ae8cb..5db9886b 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -686,11 +686,16 @@ function _ci_load_class($class, $params = NULL) for ($i = 1; $i < 3; $i++) { $path = ($i % 2) ? APPPATH : BASEPATH; - $fp = $path.'libraries/'.$class.EXT; + // Does the file exist? No? Bummer... + if ( ! file_exists($fp)) + { + continue; + } + // Safety: Was the class already loaded by a previous call? - if (in_array($fp, $this->_ci_classes) OR ! file_exists($fp)) + if (in_array($fp, $this->_ci_classes)) { $is_duplicate = TRUE; continue; From 41ac09fa04db283003f7eab7adac0c584e0e6a84 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 18:10:10 +0000 Subject: [PATCH 0439/2544] --- system/application/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 system/application/index.html diff --git a/system/application/index.html b/system/application/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/application/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

      Directory access is forbidden.

      + + + + \ No newline at end of file From 7c807cba83ab368d027a28f4b84ee6a301430e80 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 18:13:24 +0000 Subject: [PATCH 0440/2544] --- system/helpers/text_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 1b917812..655d6e53 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -370,7 +370,7 @@ function word_wrap($str, $charlim = '76') // If so we'll join it to the output and continue if (strlen($line) <= $charlim) { - $output .= $line.$this->newline; + $output .= $line."\n"; continue; } @@ -399,7 +399,7 @@ function word_wrap($str, $charlim = '76') $output .= $line; } - $output .= $this->newline; + $output .= "\n"; } // Put our markers back From c6317e8747953575d3d4f553de37533889f504d1 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 18:16:12 +0000 Subject: [PATCH 0441/2544] --- system/libraries/Profiler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index e03097ab..1d78da8a 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -83,7 +83,7 @@ function _compile_benchmarks() foreach ($profile as $key => $val) { $key = ucwords(str_replace(array('_', '-'), ' ', $key)); - $output .= "".$key."  ".$val."\n"; + $output .= "".$key."  ".$val."\n"; } $output .= "\n"; @@ -165,7 +165,7 @@ function _compile_post() $key = "'".$key."'"; } - $output .= "$_POST[".$key."]  ".htmlspecialchars(stripslashes($val))."\n"; + $output .= "$_POST[".$key."]  ".htmlspecialchars(stripslashes($val))."\n"; } $output .= "\n"; From 3fc979dd87dbda346c0f8b7da78de15b6d84c64d Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 18:22:11 +0000 Subject: [PATCH 0442/2544] --- user_guide/general/changelog.html | 347 ------------------------------ 1 file changed, 347 deletions(-) delete mode 100644 user_guide/general/changelog.html diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html deleted file mode 100644 index 938d43a7..00000000 --- a/user_guide/general/changelog.html +++ /dev/null @@ -1,347 +0,0 @@ - - - - -Code Igniter User Guide - - - - - - - - - - - - - - - - - - - - -

      - -
      - - - - - -

      Code Igniter User Guide Version 1.5.0

      -
      - - - - - - - - - -
      - - -
      - - - -
      - -

      Change Log

      - - -

      Version 1.5.0 Beta

      -

      Release Date: October 11, 2006

      - -
        -
      • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
        • -
      • Added Database Caching Class.
        • -
      • Added transaction support to the database classes.
        • -
      • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
        • -
      • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
        • -
      • Added HTML Table Class , enabling tables to be generated from arrays or database results.
        • -
      • Added Zip Encoding Library.
        • -
      • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
        • -
      • Added support for storing models within sub-folders.
        • -
      • Added Download Helper.
        • -
      • Added simple_query() function to the database classes
        • -
      • Added standard_date() function to the Date Helper.
        • -
      • Added $query->free_result() to database class.
        • -
      • Added $query->list_fields() function to database class
        • -
      • Added $this->db->platform() function
        • -
      • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
        • -
      • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
        • -
      • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
        • -
      • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
        • -
      • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
        • -
      • Fixed a bug in the Email class related to SMTP Helo data.
        • -
      • Fixed a bug in the validation class.
        • -
      • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
        • -
      • Deprecated $this->db->field_names() USE $this->db->list_fields()
        • - -
      - - - - -

      Version 1.4.1

      -

      Release Date: September 21, 2006

      - -
        -
      • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
        • -
      • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
        • -
      • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
        • -
      • Added $this->output->set_header() function, which allows you to set server headers.
        • -
      • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
        • -
      • Added Inflector helper.
        • -
      • Added element() function in the array helper.
        • -
      • Added RAND() to active record orderby() function.
        • -
      • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
        • -
      • Added Oracle database driver (still undergoing testing so it might have some bugs).
        • -
      • Added the ability to combine pseudo-variables and php variables in the template parser class.
        • -
      • Added output compression option to the config file.
        • -
      • Removed the is_numeric test from the db->escape() function.
        • -
      • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
        • -
      • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
        • -
      • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
        • -
      • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
        • -
      • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
        • -
      • Added some code to allow email attachments to be reset when sending batches of email.
        • -
      • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own -libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
        • -
      • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
        • -
      • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().
        • -
      - - - -

      Version 1.4.0

      -

      Release Date: September 17, 2006

      - -
        -
      • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
        • -
      • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
        • -
      • Added regular expressions support for routing rules.
        • -
      • Added the ability to remap function calls within your controllers.
        • -
      • Added the ability to replace core system classes with your own classes.
        • -
      • Added support for % character in URL.
        • -
      • Added the ability to supply full URLs using the anchor() helper function.
        • -
      • Added mode parameter to file_write() helper.
        • -
      • Added support for changing the port number in the Postgre driver.
        • -
      • Moved the list of "allowed URI characters" out of the Router class and into the config file.
        • -
      • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
        • -
      • Updated the Upload class to allow the upload field name to be set when calling do_upload().
        • -
      • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
        • -
      • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
        • -
      • Updated the form_open() helper to allow the GET method to be used.
        • -
      • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
        • -
      • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
        • -
      • Updated the Models loader function to allow multiple loads of the same model.
        • -
      • Updated the MS SQL driver so that single quotes are escaped.
        • -
      • Updated the Postgre and ODBC drivers for better compatibility.
        • -
      • Removed a strtolower() call that was changing URL segments to lower case.
        • -
      • Removed some references that were interfering with PHP 4.4.1 compatibility.
        • -
      • Removed backticks from Postgre class since these are not needed.
        • -
      • Renamed display() to _display() in the Output class to make it clear that it's a private function.
        • -
      • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
        • -
      • Fixed an bug that was preventing the input class from unsetting GET variables.
        • -
      • Fixed a router bug that was making it too greedy when matching end segments.
        • -
      • Fixed a bug that was preventing multiple discreet database calls.
        • -
      • Fixed a bug in which loading a language file was producing a "file contains no data" message.
        • -
      • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
        • -
      • Fixed some missing prefixes when using the database prefix feature.
        • -
      • Fixed a typo in the Calendar class (cal_november).
        • -
      • Fixed a bug in the form_checkbox() helper.
        • -
      • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
        • -
      • Fixed an evaluation bug in the database initialization function.
        • -
      • Fixed a minor bug in one of the error messages in the language class.
        • -
      • Fixed a bug in the date helper timespan function.
        • -
      • Fixed an undefined variable in the DB Driver class.
        • -
      • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
        • -
      • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
        • -
      • Fixed a couple bugs in the Unit Testing class.
        • -
      • Fixed an incorrectly named variable in the Validation class.
        • -
      • Fixed an incorrectly named variable in the URI class.
        • -
      • Fixed a bug in the config class that was preventing the base URL from being called properly.
        • -
      • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
        • -
      • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
        • -
      • Fixed some MS SQL bugs.
        • -
      • Fixed some doc typos.
        • -
      - - - -

      Version 1.3.3

      -

      Release Date: June 1, 2006

      - -
        - -
      • Models do not connect automatically to the database as of this version. More info here. -
      • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
        • -
      • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
        • -
      • Fixed a bug in the active record "having" function.
        • -
      • Fixed a problem in the validation class which was making checkboxes be ignored when required.
        • -
      • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
        • -
      • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
        • -
      • Fixed a validation bug that was preventing rules from being set twice in one controller.
        • -
      • Fixed a calendar bug that was not letting it use dynamically loaded languages.
        • -
      • Fixed a bug in the active record class when using WHERE clauses with LIKE
        • -
      • Fixed a bug in the hash() security helper.
        • -
      • Fixed some typos.
        • -
      - - - - -

      Version 1.3.2

      -

      Release Date: April 17, 2006

      - -
        -
      • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
        • -
      • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
        • -
      • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
        • -
      • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
        • -
      • Fixed a couple bugs in the Model class.
        • -
      • Fixed some documentation typos and errata.
        • -
      - - - -

      Version 1.3.1

      -

      Release Date: April 11, 2006

      - -
        -
      • Added a Unit Testing Library.
        • -
      • Added the ability to pass objects to the insert() and update() database functions. -This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
        • -
      • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
        • -
      • Added getwhere function to Active Record class.
        • -
      • Added count_all function to Active Record class.
        • -
      • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
        • -
      • Added $this->db->last_query(), which allows you to view your last query that was run.
        • -
      • Added a new mime type to the upload class for better compatibility.
        • -
      • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
        • -
      • Fixed a bug in a couple of the active record functions (where and orderby).
        • -
      • Fixed a bug in the image library when realpath() returns false.
        • -
      • Fixed a bug in the Models that was preventing libraries from being used within them.
        • -
      • Fixed a bug in the "exact_length" function of the validation class.
        • -
      • Fixed some typos in the user guide
        • -
      - - -

      Version 1.3

      -

      Release Date: April 3, 2006

      - -
        -
      • Added support for Models.
        • -
      • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
        • -
      • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
        • -
      • Added a feature to the database class that lets you run custom function calls.
        • -
      • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
        • -
      • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
        • -
      • Added support for running standard query string URLs. These can be optionally enabled in your config file.
        • -
      • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
        • -
      • Added a new error template for use with native PHP errors.
        • -
      • Added "alternator" function in the string helpers.

        -
      • Removed slashing from the input class. After much debate we decided to kill this feature.
        • -
      • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
        • -
      • Added better class and function name-spacing to avoid collisions with user developed classes. All Code Igniter classes are now prefixed with CI_ and -all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
        • -
      • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
        • -
      • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
        • -
      • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
        • -
      • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
        • -
      • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
        • -
      • Fixed some typos in the default calendar template
        • -
      • Fixed some typos in the user guide
        • -
      - - - - - - - - -

      Version 1.2

      -

      Release Date: March 21, 2006

      - -
        -
      • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
        • -
      • Added a global function named get_instance() allowing the main Code Igniter object to be accessible throughout your own classes.
        • -
      • Added new File Helper: delete_files()
        • -
      • Added new URL Helpers: base_url(), index_page()
        • -
      • Added the ability to create your own core libraries and store them in your local application directory.
        • -
      • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
        • -
      • Added Javascript Calendar plugin.
        • -
      • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
        • -
      • Updated the parser class so that it allows tag pars within other tag pairs.
        • -
      • Fixed a bug in the DB "where" function.
        • -
      • Fixed a bug that was preventing custom config files to be auto-loaded.
        • -
      • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
        • -
      • Fixed some bugs in the xss_clean function
        • -
      - - - - - -

      Version Beta 1.1

      -

      Release Date: March 10, 2006

      - -
        -
      • Added a Calendaring class.
        • -
      • Added support for running multiple applications that share a common Code Igniter backend.
        • -
      • Moved the "uri protocol" variable from the index.php file into the config.php file
        • -
      • Fixed a problem that was preventing certain function calls from working within constructors.
        • -
      • Fixed a problem that was preventing the $this->load->library function from working in constructors.
        • -
      • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
        • -
      • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
        • -
      • Fixed a data type error in the form_radio function (form helper)
        • -
      • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
        • -
      • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
        • -
      • Fixed a pagination problem in the scaffolding.
        • -
      • Fixed a bug in the mysql class "where" function.
        • -
      • Fixed a regex problem in some code that trimmed duplicate slashes.
        • -
      • Fixed a bug in the br() function in the HTML helper
        • -
      • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
        • -
      • Removed the "style" attributes form the form helpers.
        • -
      • Updated the documentation. Added "next/previous" links to each page and fixed various typos.
        • -
      - -

      Version Beta 1.0

      -

      Release Date: February 28, 2006

      -

      First publicly released version.

      - -
      - - - - - - - \ No newline at end of file From 1b90c27c46dde1b5cc79a295c5e36f402a144063 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 31 Oct 2006 18:22:29 +0000 Subject: [PATCH 0443/2544] --- system/codeigniter/CodeIgniter.php | 3 ++- user_guide/changelog.html | 11 +++++++++++ user_guide/images/appflowchart.gif | Bin 25273 -> 25276 bytes user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/license.html | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 3e2b99de..367d5eaa 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -27,7 +27,8 @@ * @link http://www.codeigniter.com/user_guide/ */ -define('APPVER', '1.5.0'); +// CI Version +define('APPVER', '1.5.0.1'); /* * ------------------------------------------------------ diff --git a/user_guide/changelog.html b/user_guide/changelog.html index c9dc7406..26d340b9 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -62,6 +62,16 @@

      Change Log

      +

      Version 1.5.0.1

      +

      Release Date: October 31, 2006

      +
        +
      • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
        • +
      • Fixed a bug in the word_wrap() helper function.
        • +
      • Fixed an invalid color Hex number in the Profiler class.
        • +
      • Fixed a corrupted image in the user guide.
        • +
      + +

      Version 1.5.0

      Release Date: October 30, 2006

      @@ -104,6 +114,7 @@

      Version 1.5.0

    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
      • +
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
      • diff --git a/user_guide/images/appflowchart.gif b/user_guide/images/appflowchart.gif index 5ca1ade4cdf77b99b919007ad91b3418ccc2ae94..422332c9e21ceb09a535d098407f52effc392baa 100644 GIT binary patch delta 816 zcmW-fe=O8-7{`6@{5pJe%K33|KRC_}7k8Z>Idw4#T9ka`&jCsa~X>mUy`hbXSVsNQj)vN$H7ne!Rg!8IR5l1|;dy7_TiD^2}U zSuQ;vQRTcse9a>N6Zkyy8NtCNK?DT7f_=r&A8w=K{hwfEQz!=d20Q?c2Y3P(0zQD; zFS-aa#R^oy=wwdtLkAS~yFW*3r7b|@UT`)fv&7ZFk75Hb?8q;mPsl6iSqnLeo!Jr# z@UH}KOC#k1E2Xe4>YcO<%SzcOa8JetdW5YqQEOtmu|YLGXV%u+C|nTf6b?O9P#Z)RivWJK+t z;?DGCL0`E}c>SEPL@X@(ipZ+SN-*7ul;O7ul+RhCc@v`O(Omo)e3j=xY*upcd;>AC zvYyo#J4mf1F5uL7vWVc3KawZmc`$_pL6Pc=g|yROAP}YPyXrHdA=Qyl1Z1f01AA26 zAjfAW;o3V{atLO!^n@KU@lgd2K6bVn9w$kScTuR8@sY=dB*8dTlF(hpk{e4GCh8BM zl(w3h#oG0yv8vsF@UyBn!NsI;CYUJu=G-P%pW-chNgGyx!%VK5Evi_)@ePqbb3>ub y>ufu|d00CHEXvaX-{x%qU+63hWUwmQ6%1ZLWS_nrievNXP)waF(BPgfgU5e1FA4Vm delta 832 zcmW-eYcNz{7{?vfvX6T#A=YMD#wEA4gvM?u_u6&a-PXFyXvnyfVJKsyv6G~BJEo>I zni!cRW1KIAaj9JTkeE@JQf`?sO+FYIF`1s%m)|+h|NlJy_dU-U9HZWhQN2?v3g}O) z7sx7O339-=hzo9ZHKWV7ggv_}cf^~!s|^m8hQLIzxrW$~YAQ!|nyQg3&TZs9P6~3B zGl}emXUJr;GZZkiSuPGRI~FxY_$arrCY9Fq6onmQc8kb%t~*K-+;`*_jZP<#<4z<} z=DdPN$T1yd4kfj95E(cg5Pb#cX_pvu?Ol736Ruy7t-SFg5Y(!9SU)$!Hc)C8%Tz|$ zz*M;9kz>B`KVwec@qSVi3Bs^=E;w||J@GW=oaZaz{1N&i1zwMl!(NWa1+N*jUwU6g zo3ZzikS|yGJpqW=>B>+WsB?fm@JmNA&A$dY>z|7hpZJAz4|t0+>j5Do**Rz#`7elU zOBKvRUJJ%;F;l^1#FmN%kOv|sq+{rsHQbMD(KW~?XUElA<7gY8EyOs(_=y`SM~G?W z^YgqjI}~?4ln*-6`sL=!O}YuK8M@TNBs-s4+OB8{>%$&$#jC`NW4ZVD*1ST}yp4=r#K^Bp(5b@#YR#2?2uOzmuo*StvogdX&L1J@l?bo`^ z#lh?Q2S5)gwlRcJT2j`Kesgx4mzC%u8ZmqwjR`XProcessing an Image $config['width'] = 75;
      $config['height'] = 50;

      -$this->image_lib->initialize($config); +$this->load->library('image_lib', $config);

      $this->image_lib->resize();       diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index c7cf82d4..448ba4c4 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -93,7 +93,7 @@

      $this->load->view('file_name', $data, true/fals

      This function is used to load your View files. If you haven't read the Views section of the user guide it is recommended that you do since it shows you how this function is typically used.

      -

      The first parameter is required. It is the name of the view file you would like to load.

      +

      The first parameter is required. It is the name of the view file you would like to load.  Note: The .php file extension does not need to be specified unless you use something other then .php.

      The second optional parameter can take an associative array or an object as input, which it runs through the PHP extract function to diff --git a/user_guide/license.html b/user_guide/license.html index a0b68766..3c07c79c 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -103,7 +103,7 @@

      Limitations of Liability

         ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  Change Log +Next Topic:  Change Log

      Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

      From afde68a64095e6408f5f28962405c4586d9eb4c6 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 1 Nov 2006 03:44:36 +0000 Subject: [PATCH 0444/2544] --- system/libraries/Input.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 8408b16f..b630bf6b 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -436,7 +436,6 @@ function xss_clean($str, $charset = 'ISO-8859-1') * these are the ones that will pose security problems. * */ - if (preg_match_all("/<(.+?)>/si", $str, $matches)) { for ($i = 0; $i < count($matches['0']); $i++) From fc84bd259cb4ce5143148a840c96d638945985f8 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 1 Nov 2006 05:25:41 +0000 Subject: [PATCH 0445/2544] --- system/database/drivers/mssql/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 system/database/drivers/mssql/index.html diff --git a/system/database/drivers/mssql/index.html b/system/database/drivers/mssql/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/database/drivers/mssql/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

      Directory access is forbidden.

      + + + + \ No newline at end of file From 06f3be8ac351235d6e6db4cd9f61c281f3a43cc2 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 1 Nov 2006 05:25:54 +0000 Subject: [PATCH 0446/2544] --- system/database/drivers/mysql/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 system/database/drivers/mysql/index.html diff --git a/system/database/drivers/mysql/index.html b/system/database/drivers/mysql/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/database/drivers/mysql/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

      Directory access is forbidden.

      + + + + \ No newline at end of file From 8508cae2ca1b98799f8fad55ca2e5c4c863b4c18 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 1 Nov 2006 05:26:06 +0000 Subject: [PATCH 0447/2544] --- system/database/drivers/mysqli/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 system/database/drivers/mysqli/index.html diff --git a/system/database/drivers/mysqli/index.html b/system/database/drivers/mysqli/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/database/drivers/mysqli/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

      Directory access is forbidden.

      + + + + \ No newline at end of file From a176f26c4a0e26443c073fe9ecc121df23e94502 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 1 Nov 2006 05:26:40 +0000 Subject: [PATCH 0448/2544] --- system/database/drivers/oci8/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 system/database/drivers/oci8/index.html diff --git a/system/database/drivers/oci8/index.html b/system/database/drivers/oci8/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/database/drivers/oci8/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

      Directory access is forbidden.

      + + + + \ No newline at end of file From b95b6d2dc7ffc3bcc18bfffdea3d43c0915590ce Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 1 Nov 2006 05:26:58 +0000 Subject: [PATCH 0449/2544] --- system/database/drivers/odbc/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 system/database/drivers/odbc/index.html diff --git a/system/database/drivers/odbc/index.html b/system/database/drivers/odbc/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/database/drivers/odbc/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

      Directory access is forbidden.

      + + + + \ No newline at end of file From 1a726a6a21d2ef2b6402d9027aab29544655760d Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 1 Nov 2006 05:27:15 +0000 Subject: [PATCH 0450/2544] --- system/database/drivers/postgre/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 system/database/drivers/postgre/index.html diff --git a/system/database/drivers/postgre/index.html b/system/database/drivers/postgre/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/database/drivers/postgre/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

      Directory access is forbidden.

      + + + + \ No newline at end of file From 2f0dc10e48e3f766ff558fd8856a45205881512f Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 1 Nov 2006 05:27:25 +0000 Subject: [PATCH 0451/2544] --- system/database/drivers/sqlite/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 system/database/drivers/sqlite/index.html diff --git a/system/database/drivers/sqlite/index.html b/system/database/drivers/sqlite/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/database/drivers/sqlite/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

      Directory access is forbidden.

      + + + + \ No newline at end of file From c50747cfe50a4c6b7e8bde81d0f56c3bd26bd29a Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 3 Nov 2006 17:17:02 +0000 Subject: [PATCH 0452/2544] --- system/database/DB_active_rec.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index b41b929d..90f58ae0 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -486,8 +486,9 @@ function get($table = '', $limit = null, $offset = null) $sql = $this->_compile_select(); + $result = $this->query($sql); $this->_reset_select(); - return $this->query($sql); + return $result; } // -------------------------------------------------------------------- @@ -522,8 +523,9 @@ function getwhere($table = '', $where = null, $limit = null, $offset = null) $sql = $this->_compile_select(); + $result = $this->query($sql); $this->_reset_select(); - return $this->query($sql); + return $result; } // -------------------------------------------------------------------- From be013b3270f751e248efcbe82d5ea28e9386ce05 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 4 Nov 2006 05:07:03 +0000 Subject: [PATCH 0453/2544] --- system/libraries/Loader.php | 106 +++++++++++++++++++++--------------- 1 file changed, 61 insertions(+), 45 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 5db9886b..41c0a9b9 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -71,12 +71,25 @@ function CI_Loader() * @param mixed the optional parameters * @return void */ - function library($class, $params = NULL) + function library($library = '', $params = NULL) { - if ($class == '') - return; - - $this->_ci_load_class($class, $params); + if ($library == '') + { + return FALSE; + } + + if (is_array($library)) + { + foreach ($library as $class) + { + $this->_ci_load_class($class, $params); + } + } + else + { + $this->_ci_load_class($library, $params); + } + $this->_ci_assign_to_models(); } @@ -621,8 +634,7 @@ function _ci_load($data) if ($return === TRUE) { $buffer = ob_get_contents(); - ob_end_clean(); - + @ob_end_clean(); return $buffer; } @@ -645,7 +657,7 @@ function _ci_load($data) // PHP 4 requires that we use a global global $OUT; $OUT->set_output(ob_get_contents()); - ob_end_clean(); + @ob_end_clean(); } } @@ -663,49 +675,53 @@ function _ci_load($data) */ function _ci_load_class($class, $params = NULL) { - // Prep the class name - $class = ucfirst(strtolower(str_replace(EXT, '', $class))); - - // Is this a class extension request? - if (file_exists(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT)) - { - if ( ! file_exists(BASEPATH.'libraries/'.$class.EXT)) - { - log_message('error', "Unable to load the requested class: ".$class); - show_error("Unable to load the requested class: ".$class); - } - - include(BASEPATH.'libraries/'.ucfirst($class).EXT); - include(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT); - - return $this->_ci_init_class($class, config_item('subclass_prefix'), $params); - } + // Get the class name + $class = str_replace(EXT, '', $class); - // Lets search for the requested library file and load it. - $is_duplicate = FALSE; - for ($i = 1; $i < 3; $i++) + // We'll test for both lowercase and capitalized versions of the file name + foreach (array(ucfirst($class), strtolower($class)) as $class) { - $path = ($i % 2) ? APPPATH : BASEPATH; - $fp = $path.'libraries/'.$class.EXT; - - // Does the file exist? No? Bummer... - if ( ! file_exists($fp)) + // Is this a class extension request? + if (file_exists(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT)) { - continue; + if ( ! file_exists(BASEPATH.'libraries/'.ucfirst($class).EXT)) + { + log_message('error', "Unable to load the requested class: ".$class); + show_error("Unable to load the requested class: ".$class); + } + + include(BASEPATH.'libraries/'.ucfirst($class).EXT); + include(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT); + + return $this->_ci_init_class($class, config_item('subclass_prefix'), $params); } - - // Safety: Was the class already loaded by a previous call? - if (in_array($fp, $this->_ci_classes)) + + // Lets search for the requested library file and load it. + $is_duplicate = FALSE; + for ($i = 1; $i < 3; $i++) { - $is_duplicate = TRUE; - continue; + $path = ($i % 2) ? APPPATH : BASEPATH; + $fp = $path.'libraries/'.$class.EXT; + + // Does the file exist? No? Bummer... + if ( ! file_exists($fp)) + { + continue; + } + + // Safety: Was the class already loaded by a previous call? + if (in_array($fp, $this->_ci_classes)) + { + $is_duplicate = TRUE; + continue; + } + + include($fp); + $this->_ci_classes[] = $fp; + return $this->_ci_init_class($class, '', $params); } - - include($fp); - $this->_ci_classes[] = $fp; - return $this->_ci_init_class($class, '', $params); - } - + } // END FOREACH + // If we got this far we were unable to find the requested class. // We do not issue errors if the load call failed due to a duplicate request if ($is_duplicate == FALSE) From 40d299e8221ba5d641e07c18ef19f4ac13ff9b85 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 4 Nov 2006 05:07:59 +0000 Subject: [PATCH 0454/2544] --- system/codeigniter/CodeIgniter.php | 2 +- system/helpers/html_helper.php | 21 +++++++++++++++++++++ system/helpers/url_helper.php | 4 ++-- system/scaffolding/views/header.php | 2 -- user_guide/changelog.html | 8 ++++++++ 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 367d5eaa..88659a74 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -132,7 +132,7 @@ // Load the local application controller // Note: The Router class automatically validates the controller path. If this include fails it // means that the default controller in the Routes.php file is not resolving to something valid. -if ( ! @include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) +if ( ! include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) { show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); } diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index e32abfbf..90a77638 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -178,6 +178,27 @@ function nbs($num = 1) return str_repeat(" ", $num); } +// ------------------------------------------------------------------------ + +/** + * Generates meta tags from an array of key/values + * + * @access public + * @param array + * @return string + */ +function meta($meta = array(), $newline = "\n") +{ + $str = ''; + foreach ($meta as $key => $val) + { + $str .= ''.$newline; + } + + return $str; +} + + ?> \ No newline at end of file diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 9010a06a..3ca59746 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -442,9 +442,9 @@ function redirect($uri = '', $method = 'location') { switch($method) { - case 'refresh' : header("Refresh:0;url=".site_url($uri)); + case 'refresh' : header("Refresh:0;url=".site_url($uri)); break; - default : header("location:".site_url($uri)); + default : header("location:".site_url($uri)); break; } exit; diff --git a/system/scaffolding/views/header.php b/system/scaffolding/views/header.php index 7ab60fd8..50f234a4 100644 --- a/system/scaffolding/views/header.php +++ b/system/scaffolding/views/header.php @@ -8,8 +8,6 @@ file(BASEPATH.'scaffolding/views/stylesheet.css'); ?> - - diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 26d340b9..644f24fe 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -62,6 +62,14 @@

      Change Log

      +

      Version 1.5.0.2

      +

      Release Date: November 4, 2006

      +
        +
      • Fixed a bug in the active record class that was not resetting query data after a completed query.
        • +
      • Fixed a bug that was supressing errors in controllers.
        • +
      + +

      Version 1.5.0.1

      Release Date: October 31, 2006

        From ebfa686046bb98c757d1b41c81eb867478036e68 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 5 Nov 2006 21:31:00 +0000 Subject: [PATCH 0455/2544] --- system/libraries/Ftp.php | 2 +- system/libraries/Profiler.php | 2 +- system/libraries/User_agent.php | 2 +- system/libraries/Zip.php | 2 +- user_guide/changelog.html | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 1572a587..f213736f 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Libraries * @author Rick Ellis - * @link http://www.codeigniter.com/user_guide/libraries/encryption.html + * @link http://www.codeigniter.com/user_guide/libraries/ftp.html */ class CI_FTP { diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 1d78da8a..5b0f6e2b 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -28,7 +28,7 @@ * @subpackage Libraries * @category Libraries * @author Rick Ellis - * @link http://www.codeigniter.com/user_guide/libraries/benchmark.html + * @link http://www.codeigniter.com/user_guide/general/profiling.html */ class CI_Profiler { diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index b217367f..8d160672 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -24,7 +24,7 @@ * @subpackage Libraries * @category User Agent * @author Rick Ellis - * @link http://www.codeigniter.com/user_guide/libraries/uri.html + * @link http://www.codeigniter.com/user_guide/libraries/user_agent.html */ class CI_User_agent { diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index 828ef0c2..1ff175fe 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -28,7 +28,7 @@ * @subpackage Libraries * @category Encryption * @author Rick Ellis - * @link http://www.codeigniter.com/user_guide/general/encryption.html + * @link http://www.codeigniter.com/user_guide/libraries/zip.html */ class CI_Zip { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 644f24fe..477814d7 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -65,6 +65,8 @@

        Change Log

        Version 1.5.0.2

        Release Date: November 4, 2006

          +
        • Added support for submitting arrays of libraries in the $this->load->library function.
          • +
        • Added support for naming custom library files in lower or uppercase.
        • Fixed a bug in the active record class that was not resetting query data after a completed query.
        • Fixed a bug that was supressing errors in controllers.
        From 325197e700564f8e4e0ba7c9fc82abfd85f451b0 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 20 Nov 2006 17:29:05 +0000 Subject: [PATCH 0456/2544] --- system/application/config/config.php | 4 ++-- system/codeigniter/Common.php | 8 +++---- system/database/drivers/oci8/oci8_result.php | 24 +++++++++----------- system/libraries/Exceptions.php | 6 +++-- system/libraries/Input.php | 6 +++-- system/libraries/User_agent.php | 1 + user_guide/changelog.html | 3 +++ user_guide/database/caching.html | 2 +- user_guide/database/helpers.html | 4 +++- user_guide/database/utilities.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/core_classes.html | 8 +++++++ user_guide/general/views.html | 8 +++++++ user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/text_helper.html | 8 +++---- user_guide/installation/downloads.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/ftp.html | 4 ++-- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- 23 files changed, 65 insertions(+), 41 deletions(-) diff --git a/system/application/config/config.php b/system/application/config/config.php index 2f385a6e..b1598b34 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -223,9 +223,9 @@ $config['sess_cookie_name'] = 'ci_session'; $config['sess_expiration'] = 7200; $config['sess_encrypt_cookie'] = FALSE; -$config['sess_use_database'] = TRUE; +$config['sess_use_database'] = FALSE; $config['sess_table_name'] = 'ci_sessions'; -$config['sess_match_ip'] = TRUE; +$config['sess_match_ip'] = FALSE; $config['sess_match_useragent'] = TRUE; /* diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index 41e13bee..4576cd96 100644 --- a/system/codeigniter/Common.php +++ b/system/codeigniter/Common.php @@ -106,14 +106,14 @@ function &get_config() { if ( ! file_exists(APPPATH.'config/config'.EXT)) { - show_error('The configuration file config'.EXT.' does not exist.'); + exit('The configuration file config'.EXT.' does not exist.'); } require(APPPATH.'config/config'.EXT); if ( ! isset($config) OR ! is_array($config)) { - show_error('Your config file does not appear to be formatted correctly.'); + exit('Your config file does not appear to be formatted correctly.'); } $main_conf[0] =& $config; @@ -210,8 +210,8 @@ function log_message($level = 'error', $message, $php_error = FALSE) /** * Exception Handler * -* This is the custom exception handler we defined at the -* top of this file. The main reason we use this is permit +* This is the custom exception handler that is declaired at the top +* of Codeigniter.php. The main reason we use this is permit * PHP errors to be logged in our own log files since we may * not have access to server logs. Since this function * effectively intercepts PHP errors, however, we also need diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index af30457b..fb4ed1f0 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -31,21 +31,24 @@ class CI_DB_oci8_result extends CI_DB_result { var $limit_used; /** - * Number of rows in the result set + * Number of rows in the result set. + * + * Oracle doesn't have a graceful way to retun the number of rows + * so we have to use what amounts to a hack. + * * * @access public * @return integer */ function num_rows() { - if (function_exists('oci_num_rows')) - { - return @oci_num_rows($this->stmt_id); - } - else + $rowcount = count($this->result_array()); + @ociexecute($this->stmt_id); + if ($this->curs_id) { - return @ocirowcount($this->stmt_id); + @ociexecute($this->curs_id); } + return $rowcount; } // -------------------------------------------------------------------- @@ -175,12 +178,7 @@ function _fetch_object() { $id = ($this->curs_id) ? $this->curs_id : $this->stmt_id; - while ($row = oci_fetch_object($id)) - { - $result[] = $row; - } - - return $result; + return @oci_fetch_object($id); } // If PHP 4 is being used we have to build our own result diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php index 8f90ff8f..83909391 100644 --- a/system/libraries/Exceptions.php +++ b/system/libraries/Exceptions.php @@ -30,6 +30,7 @@ class CI_Exceptions { var $message; var $filename; var $line; + var $ob_level; var $levels = array( E_ERROR => 'Error', @@ -53,6 +54,7 @@ class CI_Exceptions { */ function CI_Exceptions() { + $this->ob_level = ob_get_level(); // Note: Do not log messages from this constructor. } @@ -115,7 +117,7 @@ function show_error($heading, $message, $template = 'error_general') { $message = '

        '.implode('

        ', ( ! is_array($message)) ? array($message) : $message).'

        '; - if (ob_get_level() > 1) + if (ob_get_level() > $this->ob_level + 1) { ob_end_flush(); } @@ -151,7 +153,7 @@ function show_php_error($severity, $message, $filepath, $line) $filepath = $x[count($x)-2].'/'.end($x); } - if (ob_get_level() > 1) + if (ob_get_level() > $this->ob_level + 1) { ob_end_flush(); } diff --git a/system/libraries/Input.php b/system/libraries/Input.php index b630bf6b..80176207 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -73,13 +73,15 @@ function _sanitize_globals() { if ( ! is_array($global)) { - unset($$global); + global $global; + $$global = NULL; } else { foreach ($global as $key => $val) { - unset($$key); + global $$key; + $$key = NULL; } } } diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index 8d160672..95eccd12 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -186,6 +186,7 @@ function _set_browser() $this->is_browser = TRUE; $this->version = $match[1]; $this->browser = $val; + $this->_set_mobile(); return TRUE; } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 477814d7..461142fd 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,6 +69,9 @@

        Version 1.5.0.2

      • Added support for naming custom library files in lower or uppercase.
      • Fixed a bug in the active record class that was not resetting query data after a completed query.
      • Fixed a bug that was supressing errors in controllers.
        • +
      • Fixed a problem that can cause a loop to occur when the config file is missing.
        • +
      • Fixed some bugs in the Oracle DB driver.
        • +
      • Fixed some doc typos.
      diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 9a16a8f8..615f74c9 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -216,7 +216,7 @@

      $this->db->cache_delete_all()

         ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  Database Export Class +Next Topic:  Database Utilities Class

      Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

      diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 2b552f1c..5ffe0c85 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -117,6 +117,8 @@

      $this->db->insert_string();

      The first parameter is the table name, the second is an associative array with the data to be inserted. The above example produces:

      INSERT INTO table_name (name, email, url) VALUES ('Rick', 'rick@your-site.com', 'www.your-site.com') +

      Note: Values are automatically escaped, producing safer queries.

      +

      $this->db->update_string();

      @@ -132,7 +134,7 @@

      $this->db->update_string();

      The first parameter is the table name, the second is an associative array with the data to be inserted, and the third parameter is the "where" clause. The above example produces:

      UPDATE exp_weblog SET name = 'Rick', email = 'rick@your-site.com', url = 'www.your-site.com' WHERE author_id = 1 AND status = 'active' - +

      Note: Values are automatically escaped, producing safer queries.

      diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index a9227ab2..3027b68e 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -325,7 +325,7 @@

      Description of Backup Preferences

      diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 1fa93bf1..25054c7e 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -230,7 +230,7 @@

      Setting Preferences

      $config['max_width'] = '1024';
      $config['max_height'] = '768';

      -$this->load->library('ftp', $config);

      +$this->load->library('upload', $config);

      // Alternately you can set preferences by calling the initialize function. Useful if you auto-load the class:
      $this->upload->initialize($config);       diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 0bec3a82..014b94d2 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -63,8 +63,8 @@

      FTP Class

      -

      Code Igniter's FTP Class permits files to be uploaded, moved, renamed, and deleted on your server. It also includes a "mirroring" function -that permits a local directory to be recreated remotely via FTP.

      +

      Code Igniter's FTP Class permits files to be transfered to a remote server. Remote files can also be moved, renamed, +and deleted. The FTP class also includes a "mirroring" function that permits an entire local directory to be recreated remotely via FTP.

      Note:  SFTP and SSL FTP protocols are not supported, only standard FTP.

      diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index ed6260f4..01796528 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -238,7 +238,7 @@

      Session Preferences

      sess_encrypt_cookie -TRUE +FALSE TRUE/FALSE (boolean) Whether to encrypt the session data. diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 692df003..0ebb4011 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -155,7 +155,7 @@

      Strict Mode

      To enable strict mode use this:

      -$this->unit->strict(TRUE); +$this->unit->use_strict(TRUE);

      Enabling/Disabling Unit Testing

      diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 9421e0fe..01a88d78 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -485,7 +485,7 @@

      Data Types

         ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  Array Helper +Next Topic:  Zip Encoding Class

      Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

      From 205971012e9cd8e2cebf2ea798f45629f9849723 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 20 Nov 2006 17:33:06 +0000 Subject: [PATCH 0457/2544] --- user_guide/changelog.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 461142fd..45bafce1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -63,13 +63,15 @@

      Change Log

      Version 1.5.0.2

      -

      Release Date: November 4, 2006

      +

      Release Date: November 20, 2006

      • Added support for submitting arrays of libraries in the $this->load->library function.
      • Added support for naming custom library files in lower or uppercase.
        • +
      • Fixed a bug related to output buffering.
      • Fixed a bug in the active record class that was not resetting query data after a completed query.
        • -
      • Fixed a bug that was supressing errors in controllers.
        • +
      • Fixed a bug that was suppressing errors in controllers.
      • Fixed a problem that can cause a loop to occur when the config file is missing.
        • +
      • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
      • Fixed some bugs in the Oracle DB driver.
      • Fixed some doc typos.
      From 6b151050a80aa62808a5afc5a4c934f8bfb47512 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 23 Nov 2006 18:08:26 +0000 Subject: [PATCH 0458/2544] --- system/database/drivers/mysqli/mysqli_result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index be7ec356..57c89ea8 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php @@ -63,7 +63,7 @@ function num_fields() function list_fields() { $field_names = array(); - while ($field = mysql_fetch_field($this->result_id)) + while ($field = mysqli_fetch_field($this->result_id)) { $field_names[] = $field->name; } From 9241af3229855ace0b74f1929feec971ec61591d Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 23 Nov 2006 18:18:30 +0000 Subject: [PATCH 0459/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 45bafce1..06534af4 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -73,6 +73,7 @@

      Version 1.5.0.2

    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
      • +
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    From 257651d498cbd8c998520b12a1001524cfb88d69 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 23 Nov 2006 18:40:13 +0000 Subject: [PATCH 0460/2544] --- system/application/config/database.php | 2 +- system/codeigniter/CodeIgniter.php | 2 +- user_guide/changelog.html | 4 ++-- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/index.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/index.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 4 ++-- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 103 files changed, 105 insertions(+), 105 deletions(-) diff --git a/system/application/config/database.php b/system/application/config/database.php index 5cfd7634..5293a5a6 100644 --- a/system/application/config/database.php +++ b/system/application/config/database.php @@ -43,7 +43,7 @@ $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; -$db['default']['cachedir'] = APPPATH.'dbcache/'; +$db['default']['cachedir'] = ""; ?> \ No newline at end of file diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 88659a74..3008b2ff 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -28,7 +28,7 @@ */ // CI Version -define('APPVER', '1.5.0.1'); +define('APPVER', '1.5.0.2'); /* * ------------------------------------------------------ diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 06534af4..f9f53b1d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -33,7 +33,7 @@
    - +

    Code Igniter User Guide Version 1.5.0

    Code Igniter User Guide Version 1.5.1
    @@ -63,7 +63,7 @@

    Change Log

    Version 1.5.0.2

    -

    Release Date: November 20, 2006

    +

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
      • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 0db83d2d..6f842f47 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 615f74c9..6eb654ab 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index b19d9d70..831d6e8a 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index f49184d0..2e539597 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index f50f530a..cd09e07f 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 560c6f0e..80c0f233 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index dbeb541e..d6f273ed 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 5ffe0c85..ccd30696 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 812fcaad..d17e7052 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 916ff227..ca618f17 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/results.html b/user_guide/database/results.html index c886f4e3..846504fd 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 109f988a..b105b00c 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 27f1ba9f..9330faf4 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 3027b68e..dfe979c1 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 2018bf26..89e53fd0 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index d79de4c1..b40905c3 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 89768569..c16ad4cd 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index f62c53db..8352fcd0 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index a388b9f7..ef2d3fac 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 92c35c70..aa64bb43 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 8e17ad3f..11a62c97 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 3ff4b175..a3bfaa34 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 99dba91f..af7ae4b9 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 823a4275..e346bd67 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index a932d743..86082d2e 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/index.html b/user_guide/general/index.html index 8d3eb07f..daef0008 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 3d834b8e..74782269 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 387368b6..58712c70 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/models.html b/user_guide/general/models.html index b0a10834..5ca1ae8b 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index ca8df3cd..61f4574a 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 92b77a79..77bb9eb1 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 13bd1f82..b3154f40 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 2a2db5ad..1163e6d5 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index d5377f15..e8d074e7 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index a9c8db28..ea511373 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/security.html b/user_guide/general/security.html index d7e552e3..083be367 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 9e65e4f4..f493c69b 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/general/views.html b/user_guide/general/views.html index fa7f5eb7..a8d0fec2 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index b3d59c53..a3f66fb5 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index d6b64160..4592a2ff 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 0cf78848..c6df300b 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 822e29af..bc1e9050 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 9a29abb1..c89257af 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index aeba68d2..68ce66eb 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 6d1402df..3dcb147b 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index d246c927..8a81dde5 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index 4222405b..67016035 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index db203cdd..3ac47a04 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 1fcb9115..0fc96628 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 36ea2621..dd04451a 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 04310241..9a6fc358 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 9cdada2d..bafc6ac0 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 19550059..b1d08412 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 33a933d7..4f4ac95e 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 5d7496f6..119e8d20 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/index.html b/user_guide/index.html index b2a0dcb9..8c8ca265 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index ca0e5829..88ef4748 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -33,7 +33,7 @@
      - +

      Code Igniter User Guide Version 1.5.0

      Code Igniter User Guide Version 1.5.1
      @@ -63,7 +63,7 @@

      Downloading Code Igniter

        -
      • Code Igniter V 1.5.0 (Current version)
        • +
      • Code Igniter V 1.5.2 (Current version)
      • Code Igniter V 1.4.1
      • Code Igniter V 1.3.3
      • Code Igniter V 1.3.2
        • diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index f339fe83..4e4aa41d 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 168e5977..733012fa 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 93757c87..b3817668 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index da4ad405..ee26595e 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 101ac537..a494a092 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 99571c16..df1a0719 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index e8220bdc..e6570404 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index dbc628a6..bed67597 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 929608c2..850c8ea4 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index f975f532..5657595a 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 9a78dd55..79bf31d6 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 51be6897..04afb929 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 7ed45586..35ba9cec 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index ff61701a..a21812e0 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index c88b5d67..5c62f8a6 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 42d11255..0ce1813c 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 34cacf5c..3cb42dca 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 25054c7e..69fa2dfc 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 014b94d2..4e97f18c 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 5b4575b0..22c71c44 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 292f967b..7c3cc640 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 3ecadec4..139c2d52 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 448ba4c4..d1784c5e 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 0ebaaedd..ec76947b 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index a2bfc25f..c83f71ae 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index e187c49a..880d2d4e 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 01796528..184eaec1 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index fe2f0c29..1214d0e9 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 4a4d9948..247347d9 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 0ebb4011..d97fa6d4 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index efb0a874..546d936c 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 1426a4a5..9649b013 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 0c1288f5..dc74439b 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 01a88d78..5a6bebcf 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 67dc039c..fabe8a4f 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/license.html b/user_guide/license.html index 3c07c79c..e4801817 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 69cc2550..21d788d5 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 38cb203d..d3d5e805 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 6b570d86..ed3a670f 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index dff233cd..aea64f23 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index b8e9fd78..8796934b 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 21ac6aa4..d081161e 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -33,7 +33,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        diff --git a/user_guide/toc.html b/user_guide/toc.html index 7b5bd695..8632ac9f 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -34,7 +34,7 @@
        - +

        Code Igniter User Guide Version 1.5.0

        Code Igniter User Guide Version 1.5.1
        From d1c638f0e9d1d838d80ff3641f1dc889f488cbf6 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 23 Nov 2006 18:56:39 +0000 Subject: [PATCH 0461/2544] --- system/database/DB_driver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 03631d69..2a8510e1 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -372,8 +372,8 @@ function load_rdriver() if ( ! class_exists($driver)) { - include(BASEPATH.'database/DB_result'.EXT); - include(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_result'.EXT); + include_once(BASEPATH.'database/DB_result'.EXT); + include_once(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_result'.EXT); } return $driver; From 6f62816ef1212a501d5f6c27110e2e5d81a6ebe2 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 24 Nov 2006 01:17:45 +0000 Subject: [PATCH 0462/2544] --- system/libraries/Loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 41c0a9b9..0947046e 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -146,7 +146,7 @@ function model($model, $name = '', $db_conn = FALSE) show_error('Unable to locate the model you have specified: '.$model); } - if ($db_conn !== FALSE) + if ($db_conn !== FALSE AND ! class_exists('CI_DB')) { if ($db_conn === TRUE) $db_conn = ''; From 30c536dcd4e54613e3daa6af02ba6701b6d42832 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 24 Nov 2006 01:20:11 +0000 Subject: [PATCH 0463/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f9f53b1d..c5e369f3 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,6 +71,7 @@

        Version 1.5.0.2

      • Fixed a bug in the active record class that was not resetting query data after a completed query.
      • Fixed a bug that was suppressing errors in controllers.
      • Fixed a problem that can cause a loop to occur when the config file is missing.
        • +
      • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
      • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
      • Fixed some bugs in the Oracle DB driver.
      • Fixed an incorrectly named variable in the MySQLi result driver.
        • From fc38deab8b258cafb3fe7fefb26c70e38f7db6bc Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 9 Jan 2007 19:47:05 +0000 Subject: [PATCH 0464/2544] --- user_guide/libraries/input.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 7c3cc640..4fef7091 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -183,7 +183,7 @@

        $this->input->valid_ip($ip)

        Takes an IP address as input and returns TRUE or FALSE (boolean) if it is valid or not. Note: The $this->input->ip_address() function above validates the IP automatically.

        -if ( ! valid_id($ip))
        +if ( ! valid_ip($ip))
        {
             echo 'Not Valid';
        }
        From 40a7c6805f4a65605963f10dc2db0fc748710779 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Sat, 13 Jan 2007 00:03:37 +0000 Subject: [PATCH 0465/2544] --- system/libraries/Input.php | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 80176207..4fd2061c 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -366,14 +366,14 @@ function user_agent() * XSS Clean * * Sanitizes data so that Cross Site Scripting Hacks can be - * prevented.Ê This function does a fair amount of work but + * prevented.  This function does a fair amount of work but * it is extremely thorough, designed to prevent even the - * most obscure XSS attempts.Ê Nothing is ever 100% foolproof, + * most obscure XSS attempts.  Nothing is ever 100% foolproof, * of course, but I haven't been able to get anything passed * the filter. * * Note: This function should only be used to deal with data - * upon submission.Ê It's not something that should + * upon submission.  It's not something that should * be used for general runtime processing. * * This function was based in part on some code and ideas I @@ -447,6 +447,24 @@ function xss_clean($str, $charset = 'ISO-8859-1') $str); } } + + /* + * Not Allowed Under Any Conditions + */ + $bad = array( + 'document.cookie' => '[removed]', + 'document.write' => '[removed]', + 'window.location' => '[removed]', + "javascript\s*:" => '[removed]', + "Redirect\s+302" => '[removed]', + '' => '-->' + ); + + foreach ($bad as $key => $val) + { + $str = preg_replace("#".$key."#i", $val, $str); + } /* * Convert all tabs to spaces @@ -542,11 +560,11 @@ function xss_clean($str, $charset = 'ISO-8859-1') * */ $bad = array( - 'document.cookie' => '', - 'document.write' => '', - 'window.location' => '', - "javascript\s*:" => '', - "Redirect\s+302" => '', + 'document.cookie' => '[removed]', + 'document.write' => '[removed]', + 'window.location' => '[removed]', + "javascript\s*:" => '[removed]', + "Redirect\s+302" => '[removed]', '' => '-->' ); From 986cad50868e0762a861a936f66f99acbdddc972 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 24 Jan 2007 20:44:14 +0000 Subject: [PATCH 0466/2544] test commit --- license.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/license.txt b/license.txt index 4476208a..01ee741c 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2006, pMachine, Inc. +Copyright (c) 2006-2007, pMachine, Inc. All rights reserved. This license is a legal agreement between you and pMachine Inc. for the use From db0c780b5111702aba3a48087bacdbdfc746037c Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 24 Jan 2007 20:44:31 +0000 Subject: [PATCH 0467/2544] --- license.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/license.txt b/license.txt index 01ee741c..4476208a 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2006-2007, pMachine, Inc. +Copyright (c) 2006, pMachine, Inc. All rights reserved. This license is a legal agreement between you and pMachine Inc. for the use From c64099442e381a284b5b7cd1a86ef3dafe8a65c3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 27 Jan 2007 14:23:27 +0000 Subject: [PATCH 0468/2544] assoc_to_uri() incorrectly said assoc_to_str() --- user_guide/libraries/uri.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 546d936c..7e8f2d7d 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -183,7 +183,7 @@

        $this->uri->assoc_to_uri()

        $array = array('product' => 'shoes', 'size' => 'large', 'color' => 'red');

        -$str = $this->uri->assoc_to_str($array);
        +$str = $this->uri->assoc_to_uri($array);

        // Produces: product/shoes/size/large/color/red         From 17f4d73ff388dbcb4d9fbd4f79a0f9150ddc8c7e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 27 Jan 2007 17:23:13 +0000 Subject: [PATCH 0469/2544] unset the value attribute in textarea --- system/helpers/form_helper.php | 806 +++++++++++++++++---------------- 1 file changed, 404 insertions(+), 402 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 7d594d72..8186d4cc 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -1,403 +1,405 @@ -config->site_url($action).'"'; - - if ( ! isset($attributes['method'])) - { - $form .= ' method="post"'; - } - - if (is_array($attributes) AND count($attributes) > 0) - { - foreach ($attributes as $key => $val) - { - $form .= ' '.$key.'="'.$val.'"'; - } - } - - $form .= '>'; - - if (is_array($hidden) AND count($hidden > 0)) - { - $form .= form_hidden($hidden); - } - - return $form; -} - -// ------------------------------------------------------------------------ - -/** - * Form Declaration - Multipart type - * - * Creates the opening portion of the form, but with "multipart/form-data". - * - * @access public - * @param string the URI segments of the form destination - * @param array a key/value pair of attributes - * @param array a key/value pair hidden data - * @return string - */ -function form_open_multipart($action, $attributes = array(), $hidden = array()) -{ - $attributes['enctype'] = 'multipart/form-data'; - return form_open($action, $attributes, $hidden); -} - -// ------------------------------------------------------------------------ - -/** - * Hidden Input Field - * - * Generates hidden fields. You can pass a simple key/value string or an associative - * array with multiple values. - * - * @access public - * @param mixed - * @param string - * @return string - */ -function form_hidden($name, $value = '') -{ - if ( ! is_array($name)) - { - return ''; - } - - $form = ''; - foreach ($name as $name => $value) - { - $form .= ''; - } - - return $form; -} - -// ------------------------------------------------------------------------ - -/** - * Text Input Field - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -function form_input($data = '', $value = '', $extra = '') -{ - $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value, 'maxlength' => '500', 'size' => '50'); - - return "\n"; -} - -// ------------------------------------------------------------------------ - -/** - * Password Field - * - * Identical to the input function but adds the "password" type - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -function form_password($data = '', $value = '', $extra = '') -{ - if ( ! is_array($data)) - { - $data = array('name' => $data); - } - - $data['type'] = 'password'; - return form_input($data, $value, $extra); -} - -// ------------------------------------------------------------------------ - -/** - * Upload Field - * - * Identical to the input function but adds the "file" type - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -function form_upload($data = '', $value = '', $extra = '') -{ - if ( ! is_array($data)) - { - $data = array('name' => $data); - } - - $data['type'] = 'file'; - return form_input($data, $value, $extra); -} - -// ------------------------------------------------------------------------ - -/** - * Textarea field - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -function form_textarea($data = '', $value = '', $extra = '') -{ - $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); - - $val = (( ! is_array($data) OR ! isset($data['value'])) ? $value : $data['value']); - - return "\n"; -} - -// ------------------------------------------------------------------------ - -/** - * Drop-down Menu - * - * @access public - * @param string - * @param array - * @param string - * @param string - * @return string - */ -function form_dropdown($name = '', $options = array(), $selected = '', $extra = '') -{ - if ($extra != '') $extra = ' '.$extra; - - $form = ''; - - return $form; -} - -// ------------------------------------------------------------------------ - -/** - * Checkbox Field - * - * @access public - * @param mixed - * @param string - * @param bool - * @param string - * @return string - */ -function form_checkbox($data = '', $value = '', $checked = TRUE, $extra = '') -{ - $defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - - if (is_array($data) AND array_key_exists('checked', $data)) - { - $checked = $data['checked']; - - if ($checked == FALSE) - unset($data['checked']); - } - - if ($checked == TRUE) - $defaults['checked'] = 'checked'; - else - unset($defaults['checked']); - - return "\n"; -} - -// ------------------------------------------------------------------------ - -/** - * Radio Button - * - * @access public - * @param mixed - * @param string - * @param bool - * @param string - * @return string - */ -function form_radio($data = '', $value = '', $checked = TRUE, $extra = '') -{ - if ( ! is_array($data)) - { - $data = array('name' => $data); - } - - $data['type'] = 'radio'; - return form_checkbox($data, $value, $checked, $extra); -} - -// ------------------------------------------------------------------------ - -/** - * Submit Button - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -function form_submit($data = '', $value = '', $extra = '') -{ - $defaults = array('type' => 'submit', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - - return "\n"; -} - -// ------------------------------------------------------------------------ - -/** - * Form Close Tag - * - * @access public - * @param string - * @return string - */ -function form_close($extra = '') -{ - return "\n".$extra; -} - -// ------------------------------------------------------------------------ - -/** - * Form Prep - * - * Formats text so that it can be safely placed in a form field in the event it has HTML tags. - * - * @access public - * @param string - * @return string - */ -function form_prep($str = '') -{ - if ($str === '') - { - return ''; - } - - $temp = '__TEMP_AMPERSANDS__'; - - // Replace entities to temporary markers so that - // htmlspecialchars won't mess them up - $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); - $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); - - $str = htmlspecialchars($str); - - // In case htmlspecialchars misses these. - $str = str_replace(array("'", '"'), array("'", """), $str); - - // Decode the temp markers back to entities - $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); - $str = preg_replace("/$temp(\w+);/","&\\1;",$str); - - return $str; -} - -// ------------------------------------------------------------------------ - -/** - * Parse the form attributes - * - * Helper function used by some of the form helpers - * - * @access private - * @param array - * @param array - * @return string - */ -function parse_form_attributes($attributes, $default) -{ - if (is_array($attributes)) - { - foreach ($default as $key => $val) - { - if (isset($attributes[$key])) - { - $default[$key] = $attributes[$key]; - unset($attributes[$key]); - } - } - - if (count($attributes) > 0) - { - $default = array_merge($default, $attributes); - } - } - - $att = ''; - foreach ($default as $key => $val) - { - if ($key == 'value') - { - $val = form_prep($val); - } - - $att .= $key . '="' . $val . '" '; - } - - return $att; -} - +config->site_url($action).'"'; + + if ( ! isset($attributes['method'])) + { + $form .= ' method="post"'; + } + + if (is_array($attributes) AND count($attributes) > 0) + { + foreach ($attributes as $key => $val) + { + $form .= ' '.$key.'="'.$val.'"'; + } + } + + $form .= '>'; + + if (is_array($hidden) AND count($hidden > 0)) + { + $form .= form_hidden($hidden); + } + + return $form; +} + +// ------------------------------------------------------------------------ + +/** + * Form Declaration - Multipart type + * + * Creates the opening portion of the form, but with "multipart/form-data". + * + * @access public + * @param string the URI segments of the form destination + * @param array a key/value pair of attributes + * @param array a key/value pair hidden data + * @return string + */ +function form_open_multipart($action, $attributes = array(), $hidden = array()) +{ + $attributes['enctype'] = 'multipart/form-data'; + return form_open($action, $attributes, $hidden); +} + +// ------------------------------------------------------------------------ + +/** + * Hidden Input Field + * + * Generates hidden fields. You can pass a simple key/value string or an associative + * array with multiple values. + * + * @access public + * @param mixed + * @param string + * @return string + */ +function form_hidden($name, $value = '') +{ + if ( ! is_array($name)) + { + return ''; + } + + $form = ''; + foreach ($name as $name => $value) + { + $form .= ''; + } + + return $form; +} + +// ------------------------------------------------------------------------ + +/** + * Text Input Field + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_input($data = '', $value = '', $extra = '') +{ + $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value, 'maxlength' => '500', 'size' => '50'); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Password Field + * + * Identical to the input function but adds the "password" type + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_password($data = '', $value = '', $extra = '') +{ + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'password'; + return form_input($data, $value, $extra); +} + +// ------------------------------------------------------------------------ + +/** + * Upload Field + * + * Identical to the input function but adds the "file" type + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_upload($data = '', $value = '', $extra = '') +{ + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'file'; + return form_input($data, $value, $extra); +} + +// ------------------------------------------------------------------------ + +/** + * Textarea field + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_textarea($data = '', $value = '', $extra = '') +{ + $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); + + $val = (( ! is_array($data) OR ! isset($data['value'])) ? $value : $data['value']); + + unset ($data['value']); // textareas don't use the value attribute + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Drop-down Menu + * + * @access public + * @param string + * @param array + * @param string + * @param string + * @return string + */ +function form_dropdown($name = '', $options = array(), $selected = '', $extra = '') +{ + if ($extra != '') $extra = ' '.$extra; + + $form = ''; + + return $form; +} + +// ------------------------------------------------------------------------ + +/** + * Checkbox Field + * + * @access public + * @param mixed + * @param string + * @param bool + * @param string + * @return string + */ +function form_checkbox($data = '', $value = '', $checked = TRUE, $extra = '') +{ + $defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + if (is_array($data) AND array_key_exists('checked', $data)) + { + $checked = $data['checked']; + + if ($checked == FALSE) + unset($data['checked']); + } + + if ($checked == TRUE) + $defaults['checked'] = 'checked'; + else + unset($defaults['checked']); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Radio Button + * + * @access public + * @param mixed + * @param string + * @param bool + * @param string + * @return string + */ +function form_radio($data = '', $value = '', $checked = TRUE, $extra = '') +{ + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'radio'; + return form_checkbox($data, $value, $checked, $extra); +} + +// ------------------------------------------------------------------------ + +/** + * Submit Button + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_submit($data = '', $value = '', $extra = '') +{ + $defaults = array('type' => 'submit', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Form Close Tag + * + * @access public + * @param string + * @return string + */ +function form_close($extra = '') +{ + return "\n".$extra; +} + +// ------------------------------------------------------------------------ + +/** + * Form Prep + * + * Formats text so that it can be safely placed in a form field in the event it has HTML tags. + * + * @access public + * @param string + * @return string + */ +function form_prep($str = '') +{ + if ($str === '') + { + return ''; + } + + $temp = '__TEMP_AMPERSANDS__'; + + // Replace entities to temporary markers so that + // htmlspecialchars won't mess them up + $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); + $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); + + $str = htmlspecialchars($str); + + // In case htmlspecialchars misses these. + $str = str_replace(array("'", '"'), array("'", """), $str); + + // Decode the temp markers back to entities + $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); + $str = preg_replace("/$temp(\w+);/","&\\1;",$str); + + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Parse the form attributes + * + * Helper function used by some of the form helpers + * + * @access private + * @param array + * @param array + * @return string + */ +function parse_form_attributes($attributes, $default) +{ + if (is_array($attributes)) + { + foreach ($default as $key => $val) + { + if (isset($attributes[$key])) + { + $default[$key] = $attributes[$key]; + unset($attributes[$key]); + } + } + + if (count($attributes) > 0) + { + $default = array_merge($default, $attributes); + } + } + + $att = ''; + foreach ($default as $key => $val) + { + if ($key == 'value') + { + $val = form_prep($val); + } + + $att .= $key . '="' . $val . '" '; + } + + return $att; +} + ?> \ No newline at end of file From d66ba05d2968e68ff96c53ce96a243d965fb9bb9 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 27 Jan 2007 17:44:16 +0000 Subject: [PATCH 0470/2544] added set_caption() --- user_guide/libraries/table.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 1214d0e9..30968e25 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -184,6 +184,12 @@

        Function Reference

        $this->table->generate()

        Returns a string containing the generated table. Accepts an optional parameter which can be an array or a database result object.

        +

        $this->table->set_caption()

        + +

        Permits you to add a caption to the table.

        + +$this->table->set_caption('Colours'); +

        $this->table->set_heading()

        Permits you to set the table heading. You can submit an array or discreet params:

        From 5932c867a10ed38d58a51b40a3898ea70605f3cd Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 27 Jan 2007 17:44:54 +0000 Subject: [PATCH 0471/2544] added set_caption() --- system/libraries/Table.php | 853 +++++++++++++++++++------------------ 1 file changed, 438 insertions(+), 415 deletions(-) diff --git a/system/libraries/Table.php b/system/libraries/Table.php index 1b25a441..b8ce9491 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -1,416 +1,439 @@ -template = $template; - } - - // -------------------------------------------------------------------- - - /** - * Set the table heading - * - * Can be passed as an array or discreet params - * - * @access public - * @param mixed - * @return void - */ - function set_heading() - { - $args = func_get_args(); - $this->heading = (is_array($args[0])) ? $args[0] : $args; - } - - // -------------------------------------------------------------------- - - /** - * Set columns. Takes a one-dimensional array as input and creates - * a multi-dimensional array with a depth equal to the number of - * columns. This allows a single array with many elements to be - * displayed in a table that has a fixed column count. - * - * @access public - * @param array - * @param int - * @return void - */ - function make_columns($array = array(), $col_limit = 0) - { - if ( ! is_array($array) OR count($array) == 0) - { - return FALSE; - } - - // Turn off the auto-heading feature since it's doubtful we - // will want headings from a one-dimensional array - $this->auto_heading = FALSE; - - if ($col_limit == 0) - { - return $array; - } - - $new = array(); - while(count($array) > 0) - { - $temp = array_slice($array, 0, $col_limit); - $array = array_diff($array, $temp); - - if (count($temp) < $col_limit) - { - for ($i = count($temp); $i < $col_limit; $i++) - { - $temp[] = ' '; - } - } - - $new[] = $temp; - } - - return $new; - } - - // -------------------------------------------------------------------- - - /** - * Set "empty" cells - * - * Can be passed as an array or discreet params - * - * @access public - * @param mixed - * @return void - */ - function set_empty($value) - { - $this->empty_cells = $value; - } - - // -------------------------------------------------------------------- - - /** - * Add a table row - * - * Can be passed as an array or discreet params - * - * @access public - * @param mixed - * @return void - */ - function add_row() - { - $args = func_get_args(); - $this->rows[] = (is_array($args[0])) ? $args[0] : $args; - } - - // -------------------------------------------------------------------- - - /** - * Generate the table - * - * @access public - * @param mixed - * @return string - */ - function generate($table_data = NULL) - { - // The table data can optionally be passed to this function - // either as a database result object or an array - if ( ! is_null($table_data)) - { - if (is_object($table_data)) - { - $this->_set_from_object($table_data); - } - elseif (is_array($table_data)) - { - $set_heading = (count($this->heading) == 0 AND $this->auto_heading == FALSE) ? FALSE : TRUE; - $this->_set_from_array($table_data, $set_heading); - } - } - - // Is there anything to display? No? Smite them! - if (count($this->heading) == 0 AND count($this->rows) == 0) - { - return 'Undefined table data'; - } - - // Compile and validate the template date - $this->_compile_template(); - - - // Build the table! - - $out = $this->template['table_open']; - $out .= $this->newline; - - // Is there a table heading to display? - if (count($this->heading) > 0) - { - $out .= $this->template['heading_row_start']; - $out .= $this->newline; - - foreach($this->heading as $heading) - { - $out .= $this->template['heading_cell_start']; - $out .= $heading; - $out .= $this->template['heading_cell_end']; - } - - $out .= $this->template['heading_row_end']; - $out .= $this->newline; - } - - // Build the table rows - if (count($this->rows) > 0) - { - $i = 1; - foreach($this->rows as $row) - { - if ( ! is_array($row)) - { - break; - } - - // We use modulus to alternate the row colors - $name = (fmod($i++, 2)) ? '' : 'alt_'; - - $out .= $this->template['row_'.$name.'start']; - $out .= $this->newline; - - foreach($row as $cell) - { - $out .= $this->template['cell_'.$name.'start']; - - if ($cell == "") - { - $out .= $this->empty_cells; - } - else - { - $out .= $cell; - } - - $out .= $this->template['cell_'.$name.'end']; - } - - $out .= $this->template['row_'.$name.'end']; - $out .= $this->newline; - } - } - - $out .= $this->template['table_close']; - - return $out; - } - - // -------------------------------------------------------------------- - - /** - * Clears the table arrays. Useful if multiple tables are beting generated - * - * @access public - * @return void - */ - function clear() - { - $this->rows = array(); - $this->heading = array(); - $this->auto_heading = TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Set table data from a database result object - * - * @access public - * @param object - * @return void - */ - function _set_from_object($query) - { - if ( ! is_object($query)) - { - return FALSE; - } - - // First generate the headings from the table column names - if (count($this->heading) == 0) - { - if ( ! method_exists($query, 'list_fields')) - { - return FALSE; - } - - $this->heading = $query->list_fields(); - } - - // Next blast through the result array and build out the rows - - if ($query->num_rows() > 0) - { - foreach ($query->result_array() as $row) - { - $this->rows[] = $row; - } - } - } - - // -------------------------------------------------------------------- - - /** - * Set table data from an array - * - * @access public - * @param array - * @return void - */ - function _set_from_array($data, $set_heading = TRUE) - { - if ( ! is_array($data) OR count($data) == 0) - { - return FALSE; - } - - $i = 0; - foreach ($data as $row) - { - if ( ! is_array($row)) - { - $this->rows[] = $data; - break; - } - - // If a heading hasn't already been set we'll use the first row of the array as the heading - if ($i == 0 AND count($data) > 1 AND count($this->heading) == 0 AND $set_heading == TRUE) - { - $this->heading = $row; - } - else - { - $this->rows[] = $row; - } - - $i++; - } - } - - // -------------------------------------------------------------------- - - /** - * Compile Template - * - * @access private - * @return void - */ - function _compile_template() - { - if ($this->template == NULL) - { - $this->template = $this->_default_template(); - return; - } - - $this->temp = $this->_default_template(); - foreach (array('table_open','heading_row_start', 'heading_row_end', 'heading_cell_start', 'heading_cell_end', 'row_start', 'row_end', 'cell_start', 'cell_end', 'row_alt_start', 'row_alt_end', 'cell_alt_start', 'cell_alt_end', 'table_close') as $val) - { - if ( ! isset($this->template[$val])) - { - $this->template[$val] = $this->temp[$val]; - } - } - } - - // -------------------------------------------------------------------- - - /** - * Default Template - * - * @access private - * @return void - */ - function _default_template() - { - return array ( - 'table_open' => '', - - 'heading_row_start' => '', - 'heading_row_end' => '', - 'heading_cell_start' => '', - - 'row_start' => '', - 'row_end' => '', - 'cell_start' => '', - - 'row_alt_start' => '', - 'row_alt_end' => '', - 'cell_alt_start' => '', - - 'table_close' => '
        ', - 'heading_cell_end' => '
        ', - 'cell_end' => '
        ', - 'cell_alt_end' => '
        ' - ); - } - - -} - +template = $template; + } + + // -------------------------------------------------------------------- + + /** + * Set the table heading + * + * Can be passed as an array or discreet params + * + * @access public + * @param mixed + * @return void + */ + function set_heading() + { + $args = func_get_args(); + $this->heading = (is_array($args[0])) ? $args[0] : $args; + } + + // -------------------------------------------------------------------- + + /** + * Set columns. Takes a one-dimensional array as input and creates + * a multi-dimensional array with a depth equal to the number of + * columns. This allows a single array with many elements to be + * displayed in a table that has a fixed column count. + * + * @access public + * @param array + * @param int + * @return void + */ + function make_columns($array = array(), $col_limit = 0) + { + if ( ! is_array($array) OR count($array) == 0) + { + return FALSE; + } + + // Turn off the auto-heading feature since it's doubtful we + // will want headings from a one-dimensional array + $this->auto_heading = FALSE; + + if ($col_limit == 0) + { + return $array; + } + + $new = array(); + while(count($array) > 0) + { + $temp = array_slice($array, 0, $col_limit); + $array = array_diff($array, $temp); + + if (count($temp) < $col_limit) + { + for ($i = count($temp); $i < $col_limit; $i++) + { + $temp[] = ' '; + } + } + + $new[] = $temp; + } + + return $new; + } + + // -------------------------------------------------------------------- + + /** + * Set "empty" cells + * + * Can be passed as an array or discreet params + * + * @access public + * @param mixed + * @return void + */ + function set_empty($value) + { + $this->empty_cells = $value; + } + + // -------------------------------------------------------------------- + + /** + * Add a table row + * + * Can be passed as an array or discreet params + * + * @access public + * @param mixed + * @return void + */ + function add_row() + { + $args = func_get_args(); + $this->rows[] = (is_array($args[0])) ? $args[0] : $args; + } + + // -------------------------------------------------------------------- + + /** + * Add a table caption + * + * @access public + * @param string + * @return void + */ + function set_caption($caption) + { + $this->caption = $caption; + } + + // -------------------------------------------------------------------- + + /** + * Generate the table + * + * @access public + * @param mixed + * @return string + */ + function generate($table_data = NULL) + { + // The table data can optionally be passed to this function + // either as a database result object or an array + if ( ! is_null($table_data)) + { + if (is_object($table_data)) + { + $this->_set_from_object($table_data); + } + elseif (is_array($table_data)) + { + $set_heading = (count($this->heading) == 0 AND $this->auto_heading == FALSE) ? FALSE : TRUE; + $this->_set_from_array($table_data, $set_heading); + } + } + + // Is there anything to display? No? Smite them! + if (count($this->heading) == 0 AND count($this->rows) == 0) + { + return 'Undefined table data'; + } + + // Compile and validate the template date + $this->_compile_template(); + + + // Build the table! + + $out = $this->template['table_open']; + $out .= $this->newline; + + // Add any caption here + if ($this->caption) + { + $out .= $this->newline; + $out .= '' . $this->caption . ''; + $out .= $this->newline; + } + + // Is there a table heading to display? + if (count($this->heading) > 0) + { + $out .= $this->template['heading_row_start']; + $out .= $this->newline; + + foreach($this->heading as $heading) + { + $out .= $this->template['heading_cell_start']; + $out .= $heading; + $out .= $this->template['heading_cell_end']; + } + + $out .= $this->template['heading_row_end']; + $out .= $this->newline; + } + + // Build the table rows + if (count($this->rows) > 0) + { + $i = 1; + foreach($this->rows as $row) + { + if ( ! is_array($row)) + { + break; + } + + // We use modulus to alternate the row colors + $name = (fmod($i++, 2)) ? '' : 'alt_'; + + $out .= $this->template['row_'.$name.'start']; + $out .= $this->newline; + + foreach($row as $cell) + { + $out .= $this->template['cell_'.$name.'start']; + + if ($cell == "") + { + $out .= $this->empty_cells; + } + else + { + $out .= $cell; + } + + $out .= $this->template['cell_'.$name.'end']; + } + + $out .= $this->template['row_'.$name.'end']; + $out .= $this->newline; + } + } + + $out .= $this->template['table_close']; + + return $out; + } + + // -------------------------------------------------------------------- + + /** + * Clears the table arrays. Useful if multiple tables are beting generated + * + * @access public + * @return void + */ + function clear() + { + $this->rows = array(); + $this->heading = array(); + $this->auto_heading = TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Set table data from a database result object + * + * @access public + * @param object + * @return void + */ + function _set_from_object($query) + { + if ( ! is_object($query)) + { + return FALSE; + } + + // First generate the headings from the table column names + if (count($this->heading) == 0) + { + if ( ! method_exists($query, 'list_fields')) + { + return FALSE; + } + + $this->heading = $query->list_fields(); + } + + // Next blast through the result array and build out the rows + + if ($query->num_rows() > 0) + { + foreach ($query->result_array() as $row) + { + $this->rows[] = $row; + } + } + } + + // -------------------------------------------------------------------- + + /** + * Set table data from an array + * + * @access public + * @param array + * @return void + */ + function _set_from_array($data, $set_heading = TRUE) + { + if ( ! is_array($data) OR count($data) == 0) + { + return FALSE; + } + + $i = 0; + foreach ($data as $row) + { + if ( ! is_array($row)) + { + $this->rows[] = $data; + break; + } + + // If a heading hasn't already been set we'll use the first row of the array as the heading + if ($i == 0 AND count($data) > 1 AND count($this->heading) == 0 AND $set_heading == TRUE) + { + $this->heading = $row; + } + else + { + $this->rows[] = $row; + } + + $i++; + } + } + + // -------------------------------------------------------------------- + + /** + * Compile Template + * + * @access private + * @return void + */ + function _compile_template() + { + if ($this->template == NULL) + { + $this->template = $this->_default_template(); + return; + } + + $this->temp = $this->_default_template(); + foreach (array('table_open','heading_row_start', 'heading_row_end', 'heading_cell_start', 'heading_cell_end', 'row_start', 'row_end', 'cell_start', 'cell_end', 'row_alt_start', 'row_alt_end', 'cell_alt_start', 'cell_alt_end', 'table_close') as $val) + { + if ( ! isset($this->template[$val])) + { + $this->template[$val] = $this->temp[$val]; + } + } + } + + // -------------------------------------------------------------------- + + /** + * Default Template + * + * @access private + * @return void + */ + function _default_template() + { + return array ( + 'table_open' => '', + + 'heading_row_start' => '', + 'heading_row_end' => '', + 'heading_cell_start' => '', + + 'row_start' => '', + 'row_end' => '', + 'cell_start' => '', + + 'row_alt_start' => '', + 'row_alt_end' => '', + 'cell_alt_start' => '', + + 'table_close' => '
        ', + 'heading_cell_end' => '
        ', + 'cell_end' => '
        ', + 'cell_alt_end' => '
        ' + ); + } + + +} + ?> \ No newline at end of file From 7e26e6980ed547470a538c8c0f7a1af01377bf49 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 27 Jan 2007 17:47:59 +0000 Subject: [PATCH 0472/2544] detailed recent changes --- user_guide/changelog.html | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index c5e369f3..f0acc71f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -62,23 +62,28 @@

        Change Log

        +

        Version 1.5.0.3

        +

        Release Date: January 27, 2007

        +
          +
        • Added support for captions in the Table Library
          • +
        • Fixed a bug in the form helper that gave textarea a value attribute
          • +
        • Fixed some doc typos.
          • +

        Version 1.5.0.2

        Release Date: November 23, 2006

          -
        • Added support for submitting arrays of libraries in the $this->load->library function.
          • -
        • Added support for naming custom library files in lower or uppercase.
          • -
        • Fixed a bug related to output buffering.
          • -
        • Fixed a bug in the active record class that was not resetting query data after a completed query.
          • -
        • Fixed a bug that was suppressing errors in controllers.
          • -
        • Fixed a problem that can cause a loop to occur when the config file is missing.
          • -
        • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
          • -
        • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
          • -
        • Fixed some bugs in the Oracle DB driver.
          • -
        • Fixed an incorrectly named variable in the MySQLi result driver.
          • -
        • Fixed some doc typos.
          • +
        • Added support for submitting arrays of libraries in the $this->load->library function.
          • +
        • Added support for naming custom library files in lower or uppercase.
          • +
        • Fixed a bug related to output buffering.
          • +
        • Fixed a bug in the active record class that was not resetting query data after a completed query.
          • +
        • Fixed a bug that was suppressing errors in controllers.
          • +
        • Fixed a problem that can cause a loop to occur when the config file is missing.
          • +
        • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
          • +
        • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
          • +
        • Fixed some bugs in the Oracle DB driver.
          • +
        • Fixed an incorrectly named variable in the MySQLi result driver.
          • +
        • Fixed some doc typos.
        - -

        Version 1.5.0.1

        Release Date: October 31, 2006

          From c250b144dcfab2c2667b6eec3fcb1b396cdf3c28 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 27 Jan 2007 17:56:40 +0000 Subject: [PATCH 0473/2544] fixed $moble to $mobile --- system/libraries/User_agent.php | 998 ++++++++++++++++---------------- 1 file changed, 499 insertions(+), 499 deletions(-) diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index 95eccd12..afd012e3 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -1,500 +1,500 @@ -agent = trim($_SERVER['HTTP_USER_AGENT']); - } - - if ( ! is_null($this->agent)) - { - if ($this->_load_agent_file()) - { - $this->_compile_data(); - } - } - - log_message('debug', "Table Class Initialized"); - } - - // -------------------------------------------------------------------- - - /** - * Compile the User Agent Data - * - * @access private - * @return bool - */ - function _load_agent_file() - { - if ( ! @include(APPPATH.'config/user_agents'.EXT)) - { - return FALSE; - } - - $return = FALSE; - - if (isset($platforms)) - { - $this->platforms = $platforms; - unset($platforms); - $return = TRUE; - } - - if (isset($browsers)) - { - $this->browsers = $browsers; - unset($browsers); - $return = TRUE; - } - - if (isset($mobiles)) - { - $this->mobiles = $mobiles; - unset($mobiles); - $return = TRUE; - } - - if (isset($robots)) - { - $this->robots = $robots; - unset($robots); - $return = TRUE; - } - - return $return; - } - - // -------------------------------------------------------------------- - - /** - * Compile the User Agent Data - * - * @access private - * @return bool - */ - function _compile_data() - { - $this->_set_platform(); - - foreach (array('_set_browser', '_set_robot', '_set_mobile') as $function) - { - if ($this->$function() === TRUE) - { - break; - } - } - } - - // -------------------------------------------------------------------- - - /** - * Set the Platform - * - * @access private - * @return mixed - */ - function _set_platform() - { - if (is_array($this->platforms) AND count($this->platforms) > 0) - { - foreach ($this->platforms as $key => $val) - { - if (preg_match("|".preg_quote($key)."|i", $this->agent)) - { - $this->platform = $val; - return TRUE; - } - } - } - $this->platform = 'Unknown Platform'; - } - - // -------------------------------------------------------------------- - - /** - * Set the Browser - * - * @access private - * @return bool - */ - function _set_browser() - { - if (is_array($this->browsers) AND count($this->browsers) > 0) - { - foreach ($this->browsers as $key => $val) - { - if (preg_match("|".preg_quote($key).".*?([0-9\.]+)|i", $this->agent, $match)) - { - $this->is_browser = TRUE; - $this->version = $match[1]; - $this->browser = $val; - $this->_set_mobile(); - return TRUE; - } - } - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Set the Robot - * - * @access private - * @return bool - */ - function _set_robot() - { - if (is_array($this->robots) AND count($this->robots) > 0) - { - foreach ($this->robots as $key => $val) - { - if (preg_match("|".preg_quote($key)."|i", $this->agent)) - { - $this->is_robot = TRUE; - $this->robot = $val; - return TRUE; - } - } - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Set the Mobile Device - * - * @access private - * @return bool - */ - function _set_mobile() - { - if (is_array($this->mobiles) AND count($this->mobiles) > 0) - { - foreach ($this->mobiles as $key => $val) - { - if (FALSE !== (strpos(strtolower($this->agent), $key))) - { - $this->is_mobile = TRUE; - $this->mobile = $val; - return TRUE; - } - } - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Set the accepted languages - * - * @access private - * @return void - */ - function _set_languages() - { - if ((count($this->languages) == 0) AND isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) AND $_SERVER['HTTP_ACCEPT_LANGUAGE'] != '') - { - $languages = preg_replace('/(;q=.+)/i', '', trim($_SERVER['HTTP_ACCEPT_LANGUAGE'])); - - $this->languages = explode(',', $languages); - } - - if (count($this->languages) == 0) - { - $this->languages = array('Undefined'); - } - } - - // -------------------------------------------------------------------- - - /** - * Set the accepted character sets - * - * @access private - * @return void - */ - function _set_charsets() - { - if ((count($this->charsets) == 0) AND isset($_SERVER['HTTP_ACCEPT_CHARSET']) AND $_SERVER['HTTP_ACCEPT_CHARSET'] != '') - { - $charsets = preg_replace('/(;q=.+)/i', '', trim($_SERVER['HTTP_ACCEPT_CHARSET'])); - - $this->charsets = explode(',', $charsets); - } - - if (count($this->charsets) == 0) - { - $this->charsets = array('Undefined'); - } - } - - // -------------------------------------------------------------------- - - /** - * Is Browser - * - * @access public - * @return bool - */ - function is_browser() - { - return $this->is_browser; - } - - // -------------------------------------------------------------------- - - /** - * Is Robot - * - * @access public - * @return bool - */ - function is_robot() - { - return $this->is_robot; - } - - // -------------------------------------------------------------------- - - /** - * Is Mobile - * - * @access public - * @return bool - */ - function is_mobile() - { - return $this->is_mobile; - } - - // -------------------------------------------------------------------- - - /** - * Is this a referral from another site? - * - * @access public - * @return bool - */ - function is_referral() - { - return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Agent String - * - * @access public - * @return string - */ - function agent_string() - { - return $this->agent; - } - - // -------------------------------------------------------------------- - - /** - * Get Platform - * - * @access public - * @return string - */ - function platform() - { - return $this->platform; - } - - // -------------------------------------------------------------------- - - /** - * Get Browser Name - * - * @access public - * @return string - */ - function browser() - { - return $this->browser; - } - - // -------------------------------------------------------------------- - - /** - * Get the Browser Version - * - * @access public - * @return string - */ - function version() - { - return $this->version; - } - - // -------------------------------------------------------------------- - - /** - * Get The Robot Name - * - * @access public - * @return string - */ - function robot() - { - return $this->robot; - } - // -------------------------------------------------------------------- - - /** - * Get the Mobile Device - * - * @access public - * @return string - */ - function mobile() - { - return $this->mobile; - } - - // -------------------------------------------------------------------- - - /** - * Get the referrer - * - * @access public - * @return bool - */ - function referrer() - { - return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') ? '' : trim($_SERVER['HTTP_REFERER']); - } - - // -------------------------------------------------------------------- - - /** - * Get the accepted languages - * - * @access public - * @return array - */ - function languages() - { - if (count($this->languages) == 0) - { - $this->_set_languages(); - } - - return $this->languages; - } - - // -------------------------------------------------------------------- - - /** - * Get the accepted Character Sets - * - * @access public - * @return array - */ - function charsets() - { - if (count($this->charsets) == 0) - { - $this->_set_charsets(); - } - - return $this->charsets; - } - - // -------------------------------------------------------------------- - - /** - * Test for a particular language - * - * @access public - * @return bool - */ - function accept_lang($lang = 'en') - { - return (in_array(strtolower($lang), $this->languages(), TRUE)) ? TRUE : FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Test for a particular character set - * - * @access public - * @return bool - */ - function accept_charset($charset = 'utf-8') - { - return (in_array(strtolower($charset), $this->charsets(), TRUE)) ? TRUE : FALSE; - } - - -} - +agent = trim($_SERVER['HTTP_USER_AGENT']); + } + + if ( ! is_null($this->agent)) + { + if ($this->_load_agent_file()) + { + $this->_compile_data(); + } + } + + log_message('debug', "Table Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * Compile the User Agent Data + * + * @access private + * @return bool + */ + function _load_agent_file() + { + if ( ! @include(APPPATH.'config/user_agents'.EXT)) + { + return FALSE; + } + + $return = FALSE; + + if (isset($platforms)) + { + $this->platforms = $platforms; + unset($platforms); + $return = TRUE; + } + + if (isset($browsers)) + { + $this->browsers = $browsers; + unset($browsers); + $return = TRUE; + } + + if (isset($mobiles)) + { + $this->mobiles = $mobiles; + unset($mobiles); + $return = TRUE; + } + + if (isset($robots)) + { + $this->robots = $robots; + unset($robots); + $return = TRUE; + } + + return $return; + } + + // -------------------------------------------------------------------- + + /** + * Compile the User Agent Data + * + * @access private + * @return bool + */ + function _compile_data() + { + $this->_set_platform(); + + foreach (array('_set_browser', '_set_robot', '_set_mobile') as $function) + { + if ($this->$function() === TRUE) + { + break; + } + } + } + + // -------------------------------------------------------------------- + + /** + * Set the Platform + * + * @access private + * @return mixed + */ + function _set_platform() + { + if (is_array($this->platforms) AND count($this->platforms) > 0) + { + foreach ($this->platforms as $key => $val) + { + if (preg_match("|".preg_quote($key)."|i", $this->agent)) + { + $this->platform = $val; + return TRUE; + } + } + } + $this->platform = 'Unknown Platform'; + } + + // -------------------------------------------------------------------- + + /** + * Set the Browser + * + * @access private + * @return bool + */ + function _set_browser() + { + if (is_array($this->browsers) AND count($this->browsers) > 0) + { + foreach ($this->browsers as $key => $val) + { + if (preg_match("|".preg_quote($key).".*?([0-9\.]+)|i", $this->agent, $match)) + { + $this->is_browser = TRUE; + $this->version = $match[1]; + $this->browser = $val; + $this->_set_mobile(); + return TRUE; + } + } + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Set the Robot + * + * @access private + * @return bool + */ + function _set_robot() + { + if (is_array($this->robots) AND count($this->robots) > 0) + { + foreach ($this->robots as $key => $val) + { + if (preg_match("|".preg_quote($key)."|i", $this->agent)) + { + $this->is_robot = TRUE; + $this->robot = $val; + return TRUE; + } + } + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Set the Mobile Device + * + * @access private + * @return bool + */ + function _set_mobile() + { + if (is_array($this->mobiles) AND count($this->mobiles) > 0) + { + foreach ($this->mobiles as $key => $val) + { + if (FALSE !== (strpos(strtolower($this->agent), $key))) + { + $this->is_mobile = TRUE; + $this->mobile = $val; + return TRUE; + } + } + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Set the accepted languages + * + * @access private + * @return void + */ + function _set_languages() + { + if ((count($this->languages) == 0) AND isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) AND $_SERVER['HTTP_ACCEPT_LANGUAGE'] != '') + { + $languages = preg_replace('/(;q=.+)/i', '', trim($_SERVER['HTTP_ACCEPT_LANGUAGE'])); + + $this->languages = explode(',', $languages); + } + + if (count($this->languages) == 0) + { + $this->languages = array('Undefined'); + } + } + + // -------------------------------------------------------------------- + + /** + * Set the accepted character sets + * + * @access private + * @return void + */ + function _set_charsets() + { + if ((count($this->charsets) == 0) AND isset($_SERVER['HTTP_ACCEPT_CHARSET']) AND $_SERVER['HTTP_ACCEPT_CHARSET'] != '') + { + $charsets = preg_replace('/(;q=.+)/i', '', trim($_SERVER['HTTP_ACCEPT_CHARSET'])); + + $this->charsets = explode(',', $charsets); + } + + if (count($this->charsets) == 0) + { + $this->charsets = array('Undefined'); + } + } + + // -------------------------------------------------------------------- + + /** + * Is Browser + * + * @access public + * @return bool + */ + function is_browser() + { + return $this->is_browser; + } + + // -------------------------------------------------------------------- + + /** + * Is Robot + * + * @access public + * @return bool + */ + function is_robot() + { + return $this->is_robot; + } + + // -------------------------------------------------------------------- + + /** + * Is Mobile + * + * @access public + * @return bool + */ + function is_mobile() + { + return $this->is_mobile; + } + + // -------------------------------------------------------------------- + + /** + * Is this a referral from another site? + * + * @access public + * @return bool + */ + function is_referral() + { + return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Agent String + * + * @access public + * @return string + */ + function agent_string() + { + return $this->agent; + } + + // -------------------------------------------------------------------- + + /** + * Get Platform + * + * @access public + * @return string + */ + function platform() + { + return $this->platform; + } + + // -------------------------------------------------------------------- + + /** + * Get Browser Name + * + * @access public + * @return string + */ + function browser() + { + return $this->browser; + } + + // -------------------------------------------------------------------- + + /** + * Get the Browser Version + * + * @access public + * @return string + */ + function version() + { + return $this->version; + } + + // -------------------------------------------------------------------- + + /** + * Get The Robot Name + * + * @access public + * @return string + */ + function robot() + { + return $this->robot; + } + // -------------------------------------------------------------------- + + /** + * Get the Mobile Device + * + * @access public + * @return string + */ + function mobile() + { + return $this->mobile; + } + + // -------------------------------------------------------------------- + + /** + * Get the referrer + * + * @access public + * @return bool + */ + function referrer() + { + return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') ? '' : trim($_SERVER['HTTP_REFERER']); + } + + // -------------------------------------------------------------------- + + /** + * Get the accepted languages + * + * @access public + * @return array + */ + function languages() + { + if (count($this->languages) == 0) + { + $this->_set_languages(); + } + + return $this->languages; + } + + // -------------------------------------------------------------------- + + /** + * Get the accepted Character Sets + * + * @access public + * @return array + */ + function charsets() + { + if (count($this->charsets) == 0) + { + $this->_set_charsets(); + } + + return $this->charsets; + } + + // -------------------------------------------------------------------- + + /** + * Test for a particular language + * + * @access public + * @return bool + */ + function accept_lang($lang = 'en') + { + return (in_array(strtolower($lang), $this->languages(), TRUE)) ? TRUE : FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Test for a particular character set + * + * @access public + * @return bool + */ + function accept_charset($charset = 'utf-8') + { + return (in_array(strtolower($charset), $this->charsets(), TRUE)) ? TRUE : FALSE; + } + + +} + ?> \ No newline at end of file From 7a1f5162029b8bc7d62171bd487a6954f1cf0bfc Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 27 Jan 2007 18:02:09 +0000 Subject: [PATCH 0474/2544] typo fix: thih to this --- user_guide/general/creating_libraries.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 11a62c97..86cd1528 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -220,7 +220,7 @@

          Replacing Native Libraries with Your Versions

          $this->load->library('email'); -

          Note: At thit time the Database classes can not be replaced with your own versions.

          +

          Note: At this time the Database classes can not be replaced with your own versions.

          Extending Native Libraries

          From b29d37c1d070b1e3790c7ce7429c59d789a5ed4b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 28 Jan 2007 16:05:51 +0000 Subject: [PATCH 0475/2544] log_exception() printed severity twice... fixed. --- system/libraries/Exceptions.php | 338 ++++++++++++++++---------------- 1 file changed, 169 insertions(+), 169 deletions(-) diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php index 83909391..03588acb 100644 --- a/system/libraries/Exceptions.php +++ b/system/libraries/Exceptions.php @@ -1,170 +1,170 @@ - 'Error', - E_WARNING => 'Warning', - E_PARSE => 'Parsing Error', - E_NOTICE => 'Notice', - E_CORE_ERROR => 'Core Error', - E_CORE_WARNING => 'Core Warning', - E_COMPILE_ERROR => 'Compile Error', - E_COMPILE_WARNING => 'Compile Warning', - E_USER_ERROR => 'User Error', - E_USER_WARNING => 'User Warning', - E_USER_NOTICE => 'User Notice', - E_STRICT => 'Runtime Notice' - ); - - - /** - * Constructor - * - */ - function CI_Exceptions() - { - $this->ob_level = ob_get_level(); - // Note: Do not log messages from this constructor. - } - - // -------------------------------------------------------------------- - - /** - * Exception Logger - * - * This function logs PHP generated error messages - * - * @access private - * @param string the error severity - * @param string the error string - * @param string the error filepath - * @param string the error line number - * @return string - */ - function log_exception($severity, $message, $filepath, $line) - { - $severity = ( ! isset($this->levels[$severity])) ? $severity : $this->levels[$severity]; - - log_message('error', 'Severity: '.$severity.' '.$severity.' --> '.$message. ' '.$filepath.' '.$line, TRUE); - } - - // -------------------------------------------------------------------- - - /** - * 404 Page Not Found Handler - * - * @access private - * @param string - * @return string - */ - function show_404($page = '') - { - $heading = "404 Page Not Found"; - $message = "The page you requested was not found."; - - log_message('error', '404 Page Not Found --> '.$page); - echo $this->show_error($heading, $message, 'error_404'); - exit; - } - - // -------------------------------------------------------------------- - - /** - * General Error Page - * - * This function takes an error message as input - * (either as a string or an array) and displays - * it using the specified template. - * - * @access private - * @param string the heading - * @param string the message - * @param string the template name - * @return string - */ - function show_error($heading, $message, $template = 'error_general') - { - $message = '

          '.implode('

          ', ( ! is_array($message)) ? array($message) : $message).'

          '; - - if (ob_get_level() > $this->ob_level + 1) - { - ob_end_flush(); - } - ob_start(); - include(APPPATH.'errors/'.$template.EXT); - $buffer = ob_get_contents(); - ob_end_clean(); - return $buffer; - } - - // -------------------------------------------------------------------- - - /** - * Native PHP error handler - * - * @access private - * @param string the error severity - * @param string the error string - * @param string the error filepath - * @param string the error line number - * @return string - */ - function show_php_error($severity, $message, $filepath, $line) - { - $severity = ( ! isset($this->levels[$severity])) ? $severity : $this->levels[$severity]; - - $filepath = str_replace("\\", "/", $filepath); - - // For safety reasons we do not show the full file path - if (FALSE !== strpos($filepath, '/')) - { - $x = explode('/', $filepath); - $filepath = $x[count($x)-2].'/'.end($x); - } - - if (ob_get_level() > $this->ob_level + 1) - { - ob_end_flush(); - } - ob_start(); - include(APPPATH.'errors/error_php'.EXT); - $buffer = ob_get_contents(); - ob_end_clean(); - echo $buffer; - } - - -} -// END Exceptions Class + 'Error', + E_WARNING => 'Warning', + E_PARSE => 'Parsing Error', + E_NOTICE => 'Notice', + E_CORE_ERROR => 'Core Error', + E_CORE_WARNING => 'Core Warning', + E_COMPILE_ERROR => 'Compile Error', + E_COMPILE_WARNING => 'Compile Warning', + E_USER_ERROR => 'User Error', + E_USER_WARNING => 'User Warning', + E_USER_NOTICE => 'User Notice', + E_STRICT => 'Runtime Notice' + ); + + + /** + * Constructor + * + */ + function CI_Exceptions() + { + $this->ob_level = ob_get_level(); + // Note: Do not log messages from this constructor. + } + + // -------------------------------------------------------------------- + + /** + * Exception Logger + * + * This function logs PHP generated error messages + * + * @access private + * @param string the error severity + * @param string the error string + * @param string the error filepath + * @param string the error line number + * @return string + */ + 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); + } + + // -------------------------------------------------------------------- + + /** + * 404 Page Not Found Handler + * + * @access private + * @param string + * @return string + */ + function show_404($page = '') + { + $heading = "404 Page Not Found"; + $message = "The page you requested was not found."; + + log_message('error', '404 Page Not Found --> '.$page); + echo $this->show_error($heading, $message, 'error_404'); + exit; + } + + // -------------------------------------------------------------------- + + /** + * General Error Page + * + * This function takes an error message as input + * (either as a string or an array) and displays + * it using the specified template. + * + * @access private + * @param string the heading + * @param string the message + * @param string the template name + * @return string + */ + function show_error($heading, $message, $template = 'error_general') + { + $message = '

          '.implode('

          ', ( ! is_array($message)) ? array($message) : $message).'

          '; + + if (ob_get_level() > $this->ob_level + 1) + { + ob_end_flush(); + } + ob_start(); + include(APPPATH.'errors/'.$template.EXT); + $buffer = ob_get_contents(); + ob_end_clean(); + return $buffer; + } + + // -------------------------------------------------------------------- + + /** + * Native PHP error handler + * + * @access private + * @param string the error severity + * @param string the error string + * @param string the error filepath + * @param string the error line number + * @return string + */ + function show_php_error($severity, $message, $filepath, $line) + { + $severity = ( ! isset($this->levels[$severity])) ? $severity : $this->levels[$severity]; + + $filepath = str_replace("\\", "/", $filepath); + + // For safety reasons we do not show the full file path + if (FALSE !== strpos($filepath, '/')) + { + $x = explode('/', $filepath); + $filepath = $x[count($x)-2].'/'.end($x); + } + + if (ob_get_level() > $this->ob_level + 1) + { + ob_end_flush(); + } + ob_start(); + include(APPPATH.'errors/error_php'.EXT); + $buffer = ob_get_contents(); + ob_end_clean(); + echo $buffer; + } + + +} +// END Exceptions Class ?> \ No newline at end of file From b0712d04eee3c2c85c8f10579c31cbc83961b3d6 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 28 Jan 2007 17:08:03 +0000 Subject: [PATCH 0476/2544] updated version number --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f0acc71f..013c0e57 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -62,7 +62,7 @@

          Change Log

          -

          Version 1.5.0.3

          +

          Version 1.5.1.1

          Release Date: January 27, 2007

          • Added support for captions in the Table Library
            • From 394d0b2d1b5e1633566a3ea56b9dd63118ac7dbf Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 29 Jan 2007 16:00:28 +0000 Subject: [PATCH 0477/2544] changed to('$array') into to($array) --- user_guide/libraries/email.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 0ce1813c..d794d140 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -119,7 +119,7 @@

            Setting Email Preferences

            Note: Most of the preferences have default values that will be used if you do not set them.

            Setting Email Preferences in a Config File +>

            Setting Email Preferences in a Config File

            If you prefer not to set preferences using the above method, you can instead put them into a config file. Simply create a new file called the email.php, add the $config @@ -196,7 +196,7 @@

            $this->email->to()

            $this->email->to('one@some-site.com, two@some-site.com, three@some-site.com'); $list = array('one@some-site.com, two@some-site.com, three@some-site.com');

            -$this->email->to('$list');             +$this->email->to($list);

            $this->email->cc()

            Sets the CC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

            From a72b60d96cbdbfc10fbe20d2c4a3c4a62358b4d3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 31 Jan 2007 23:56:11 +0000 Subject: [PATCH 0478/2544] removed unescaped variable that could be used in XSS --- system/libraries/Input.php | 1278 +++++++++++++++++------------------ system/libraries/Router.php | 1120 +++++++++++++++--------------- 2 files changed, 1199 insertions(+), 1199 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 4fd2061c..f346caba 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -1,640 +1,640 @@ -use_xss_clean = ($CFG->item('global_xss_filtering') === TRUE) ? TRUE : FALSE; - $this->allow_get_array = ($CFG->item('enable_query_strings') === TRUE) ? TRUE : FALSE; - $this->_sanitize_globals(); - } - - // -------------------------------------------------------------------- - - /** - * Sanitize Globals - * - * This function does the following: - * - * Unsets $_GET data (if query strings are not enabled) - * - * Unsets all globals if register_globals is enabled - * - * Standardizes newline characters to \n - * - * @access private - * @return void - */ - function _sanitize_globals() - { - // Unset globals. This is effectively the same as register_globals = off - foreach (array($_GET, $_POST, $_COOKIE) as $global) - { - if ( ! is_array($global)) - { - global $global; - $$global = NULL; - } - else - { - foreach ($global as $key => $val) - { - global $$key; - $$key = NULL; - } - } - } - - // Is $_GET data allowed? If not we'll set the $_GET to an empty array - if ($this->allow_get_array == FALSE) - { - $_GET = array(); - } - - // Clean $_POST Data - if (is_array($_POST) AND count($_POST) > 0) - { - foreach($_POST as $key => $val) - { - $_POST[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); - } - } - - // Clean $_COOKIE Data - if (is_array($_COOKIE) AND count($_COOKIE) > 0) - { - foreach($_COOKIE as $key => $val) - { - $_COOKIE[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); - } - } - - log_message('debug', "Global POST and COOKIE data sanitized"); - } - - // -------------------------------------------------------------------- - - /** - * Clean Input Data - * - * This is a helper function. It escapes data and - * standardizes newline characters to \n - * - * @access private - * @param string - * @return string - */ - function _clean_input_data($str) - { - if (is_array($str)) - { - $new_array = array(); - foreach ($str as $key => $val) - { - $new_array[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); - } - return $new_array; - } - - if ($this->use_xss_clean === TRUE) - { - $str = $this->xss_clean($str); - } - - // Standardize newlines - return preg_replace("/\015\012|\015|\012/", "\n", $str); - } - - // -------------------------------------------------------------------- - - /** - * Clean Keys - * - * This is a helper function. To prevent malicious users - * from trying to exploit keys we make sure that keys are - * only named with alpha-numeric text and a few other items. - * - * @access private - * @param string - * @return string - */ - function _clean_input_keys($str) - { - if ( ! preg_match("/^[a-z0-9:_\/-]+$/i", $str)) - { - exit('Disallowed Key Characters: '.$str); - } - - if ( ! get_magic_quotes_gpc()) - { - return addslashes($str); - } - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the POST array - * - * @access public - * @param string - * @param bool - * @return string - */ - function post($index = '', $xss_clean = FALSE) - { - if ( ! isset($_POST[$index])) - { - return FALSE; - } - - if ($xss_clean === TRUE) - { - if (is_array($_POST[$index])) - { - foreach($_POST[$index] as $key => $val) - { - $_POST[$index][$key] = $this->xss_clean($val); - } - } - else - { - return $this->xss_clean($_POST[$index]); - } - } - - return $_POST[$index]; - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the COOKIE array - * - * @access public - * @param string - * @param bool - * @return string - */ - function cookie($index = '', $xss_clean = FALSE) - { - if ( ! isset($_COOKIE[$index])) - { - return FALSE; - } - - if ($xss_clean === TRUE) - { - if (is_array($_COOKIE[$index])) - { - $cookie = array(); - foreach($_COOKIE[$index] as $key => $val) - { - $cookie[$key] = $this->xss_clean($val); - } - - return $cookie; - } - else - { - return $this->xss_clean($_COOKIE[$index]); - } - } - else - { - return $_COOKIE[$index]; - } - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the SERVER array - * - * @access public - * @param string - * @param bool - * @return string - */ - function server($index = '', $xss_clean = FALSE) - { - if ( ! isset($_SERVER[$index])) - { - return FALSE; - } - - if ($xss_clean === TRUE) - { - return $this->xss_clean($_SERVER[$index]); - } - - return $_SERVER[$index]; - } - - // -------------------------------------------------------------------- - - /** - * Fetch the IP Address - * - * @access public - * @return string - */ - function ip_address() - { - if ($this->ip_address !== FALSE) - { - return $this->ip_address; - } - - if ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP')) - { - $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; - } - elseif ($this->server('REMOTE_ADDR')) - { - $this->ip_address = $_SERVER['REMOTE_ADDR']; - } - elseif ($this->server('HTTP_CLIENT_IP')) - { - $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; - } - elseif ($this->server('HTTP_X_FORWARDED_FOR')) - { - $this->ip_address = $_SERVER['HTTP_X_FORWARDED_FOR']; - } - - if ($this->ip_address === FALSE) - { - $this->ip_address = '0.0.0.0'; - return $this->ip_address; - } - - if (strstr($this->ip_address, ',')) - { - $x = explode(',', $this->ip_address); - $this->ip_address = end($x); - } - - if ( ! $this->valid_ip($this->ip_address)) - { - $this->ip_address = '0.0.0.0'; - } - - return $this->ip_address; - } - - // -------------------------------------------------------------------- - - /** - * Validate IP Address - * - * @access public - * @param string - * @return string - */ - function valid_ip($ip) - { - return ( ! preg_match( "/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $ip)) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * User Agent - * - * @access public - * @return string - */ - function user_agent() - { - if ($this->user_agent !== FALSE) - { - return $this->user_agent; - } - - $this->user_agent = ( ! isset($_SERVER['HTTP_USER_AGENT'])) ? FALSE : $_SERVER['HTTP_USER_AGENT']; - - return $this->user_agent; - } - - // -------------------------------------------------------------------- - - /** - * XSS Clean - * - * Sanitizes data so that Cross Site Scripting Hacks can be - * prevented.  This function does a fair amount of work but - * it is extremely thorough, designed to prevent even the - * most obscure XSS attempts.  Nothing is ever 100% foolproof, - * of course, but I haven't been able to get anything passed - * the filter. - * - * Note: This function should only be used to deal with data - * upon submission.  It's not something that should - * be used for general runtime processing. - * - * This function was based in part on some code and ideas I - * got from Bitflux: http://blog.bitflux.ch/wiki/XSS_Prevention - * - * To help develop this script I used this great list of - * vulnerabilities along with a few other hacks I've - * harvested from examining vulnerabilities in other programs: - * http://ha.ckers.org/xss.html - * - * @access public - * @param string - * @return string - */ - function xss_clean($str, $charset = 'ISO-8859-1') - { - /* - * Remove Null Characters - * - * This prevents sandwiching null characters - * between ascii characters, like Java\0script. - * - */ - $str = preg_replace('/\0+/', '', $str); - $str = preg_replace('/(\\\\0)+/', '', $str); - - /* - * Validate standard character entities - * - * Add a semicolon if missing. We do this to enable - * the conversion of entities to ASCII later. - * - */ - $str = preg_replace('#(&\#*\w+)[\x00-\x20]+;#u',"\\1;",$str); - - /* - * Validate UTF16 two byte encoding (x00) - * - * Just as above, adds a semicolon if missing. - * - */ - $str = preg_replace('#(&\#x*)([0-9A-F]+);*#iu',"\\1\\2;",$str); - - /* - * URL Decode - * - * Just in case stuff like this is submitted: - * - * Google - * - * Note: Normally urldecode() would be easier but it removes plus signs - * - */ - $str = preg_replace("/%u0([a-z0-9]{3})/i", "&#x\\1;", $str); - $str = preg_replace("/%([a-z0-9]{2})/i", "&#x\\1;", $str); - - /* - * Convert character entities to ASCII - * - * This permits our tests below to work reliably. - * We only convert entities that are within tags since - * these are the ones that will pose security problems. - * - */ - if (preg_match_all("/<(.+?)>/si", $str, $matches)) - { - for ($i = 0; $i < count($matches['0']); $i++) - { - $str = str_replace($matches['1'][$i], - $this->_html_entity_decode($matches['1'][$i], $charset), - $str); - } - } - - /* - * Not Allowed Under Any Conditions - */ - $bad = array( - 'document.cookie' => '[removed]', - 'document.write' => '[removed]', - 'window.location' => '[removed]', - "javascript\s*:" => '[removed]', - "Redirect\s+302" => '[removed]', - '' => '-->' - ); - - foreach ($bad as $key => $val) - { - $str = preg_replace("#".$key."#i", $val, $str); - } - - /* - * Convert all tabs to spaces - * - * This prevents strings like this: ja vascript - * Note: we deal with spaces between characters later. - * - */ - $str = preg_replace("#\t+#", " ", $str); - - /* - * Makes PHP tags safe - * - * Note: XML tags are inadvertently replaced too: - * - * '), array('<?php', '<?PHP', '<?', '?>'), $str); - - /* - * Compact any exploded words - * - * This corrects words like: j a v a s c r i p t - * These words are compacted back to their correct state. - * - */ - $words = array('javascript', 'vbscript', 'script', 'applet', 'alert', 'document', 'write', 'cookie', 'window'); - foreach ($words as $word) - { - $temp = ''; - for ($i = 0; $i < strlen($word); $i++) - { - $temp .= substr($word, $i, 1)."\s*"; - } - - $temp = substr($temp, 0, -3); - $str = preg_replace('#'.$temp.'#s', $word, $str); - $str = preg_replace('#'.ucfirst($temp).'#s', ucfirst($word), $str); - } - - /* - * Remove disallowed Javascript in links or img tags - */ - $str = preg_replace("#.*?#si", "", $str); - $str = preg_replace("##si", "", $str); - $str = preg_replace("#<(script|xss).*?\>#si", "", $str); - - /* - * Remove JavaScript Event Handlers - * - * Note: This code is a little blunt. It removes - * the event handler and anything up to the closing >, - * but it's unlikely to be a problem. - * - */ - $str = preg_replace('#(<[^>]+.*?)(onblur|onchange|onclick|onfocus|onload|onmouseover|onmouseup|onmousedown|onselect|onsubmit|onunload|onkeypress|onkeydown|onkeyup|onresize)[^>]*>#iU',"\\1>",$str); - - /* - * Sanitize naughty HTML elements - * - * If a tag containing any of the words in the list - * below is found, the tag gets converted to entities. - * - * So this: - * Becomes: <blink> - * - */ - $str = preg_replace('#<(/*\s*)(alert|applet|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|layer|link|meta|object|plaintext|style|script|textarea|title|xml|xss)([^>]*)>#is', "<\\1\\2\\3>", $str); - - /* - * Sanitize naughty scripting elements - * - * Similar to above, only instead of looking for - * tags it looks for PHP and JavaScript commands - * that are disallowed. Rather than removing the - * code, it simply converts the parenthesis to entities - * rendering the code un-executable. - * - * For example: eval('some code') - * Becomes: eval('some code') - * - */ - $str = preg_replace('#(alert|cmd|passthru|eval|exec|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str); - - /* - * Final clean up - * - * This adds a bit of extra precaution in case - * something got through the above filters - * - */ - $bad = array( - 'document.cookie' => '[removed]', - 'document.write' => '[removed]', - 'window.location' => '[removed]', - "javascript\s*:" => '[removed]', - "Redirect\s+302" => '[removed]', - '' => '-->' - ); - - foreach ($bad as $key => $val) - { - $str = preg_replace("#".$key."#i", $val, $str); - } - - - log_message('debug', "XSS Filtering completed"); - return $str; - } - - // -------------------------------------------------------------------- - - /** - * HTML Entities Decode - * - * This function is a replacement for html_entity_decode() - * - * In some versions of PHP the native function does not work - * when UTF-8 is the specified character set, so this gives us - * a work-around. More info here: - * http://bugs.php.net/bug.php?id=25670 - * - * @access private - * @param string - * @param string - * @return string - */ - /* ------------------------------------------------- - /* Replacement for html_entity_decode() - /* -------------------------------------------------*/ - - /* - NOTE: html_entity_decode() has a bug in some PHP versions when UTF-8 is the - character set, and the PHP developers said they were not back porting the - fix to versions other than PHP 5.x. - */ - function _html_entity_decode($str, $charset='ISO-8859-1') - { - if (stristr($str, '&') === FALSE) return $str; - - // The reason we are not using html_entity_decode() by itself is because - // while it is not technically correct to leave out the semicolon - // at the end of an entity most browsers will still interpret the entity - // correctly. html_entity_decode() does not convert entities without - // semicolons, so we are left with our own little solution here. Bummer. - - if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR version_compare(phpversion(), '5.0.0', '>='))) - { - $str = html_entity_decode($str, ENT_COMPAT, $charset); - $str = preg_replace('~&#x([0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str); - return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str); - } - - // Numeric Entities - $str = preg_replace('~&#x([0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str); - $str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str); - - // Literal Entities - Slightly slow so we do another check - if (stristr($str, '&') === FALSE) - { - $str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES))); - } - - return $str; - } - -} -// END Input class +use_xss_clean = ($CFG->item('global_xss_filtering') === TRUE) ? TRUE : FALSE; + $this->allow_get_array = ($CFG->item('enable_query_strings') === TRUE) ? TRUE : FALSE; + $this->_sanitize_globals(); + } + + // -------------------------------------------------------------------- + + /** + * Sanitize Globals + * + * This function does the following: + * + * Unsets $_GET data (if query strings are not enabled) + * + * Unsets all globals if register_globals is enabled + * + * Standardizes newline characters to \n + * + * @access private + * @return void + */ + function _sanitize_globals() + { + // Unset globals. This is effectively the same as register_globals = off + foreach (array($_GET, $_POST, $_COOKIE) as $global) + { + if ( ! is_array($global)) + { + global $global; + $$global = NULL; + } + else + { + foreach ($global as $key => $val) + { + global $$key; + $$key = NULL; + } + } + } + + // Is $_GET data allowed? If not we'll set the $_GET to an empty array + if ($this->allow_get_array == FALSE) + { + $_GET = array(); + } + + // Clean $_POST Data + if (is_array($_POST) AND count($_POST) > 0) + { + foreach($_POST as $key => $val) + { + $_POST[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); + } + } + + // Clean $_COOKIE Data + if (is_array($_COOKIE) AND count($_COOKIE) > 0) + { + foreach($_COOKIE as $key => $val) + { + $_COOKIE[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); + } + } + + log_message('debug', "Global POST and COOKIE data sanitized"); + } + + // -------------------------------------------------------------------- + + /** + * Clean Input Data + * + * This is a helper function. It escapes data and + * standardizes newline characters to \n + * + * @access private + * @param string + * @return string + */ + function _clean_input_data($str) + { + if (is_array($str)) + { + $new_array = array(); + foreach ($str as $key => $val) + { + $new_array[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); + } + return $new_array; + } + + if ($this->use_xss_clean === TRUE) + { + $str = $this->xss_clean($str); + } + + // Standardize newlines + return preg_replace("/\015\012|\015|\012/", "\n", $str); + } + + // -------------------------------------------------------------------- + + /** + * Clean Keys + * + * This is a helper function. To prevent malicious users + * from trying to exploit keys we make sure that keys are + * only named with alpha-numeric text and a few other items. + * + * @access private + * @param string + * @return string + */ + function _clean_input_keys($str) + { + if ( ! preg_match("/^[a-z0-9:_\/-]+$/i", $str)) + { + exit('Disallowed Key Characters.'); + } + + if ( ! get_magic_quotes_gpc()) + { + return addslashes($str); + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the POST array + * + * @access public + * @param string + * @param bool + * @return string + */ + function post($index = '', $xss_clean = FALSE) + { + if ( ! isset($_POST[$index])) + { + return FALSE; + } + + if ($xss_clean === TRUE) + { + if (is_array($_POST[$index])) + { + foreach($_POST[$index] as $key => $val) + { + $_POST[$index][$key] = $this->xss_clean($val); + } + } + else + { + return $this->xss_clean($_POST[$index]); + } + } + + return $_POST[$index]; + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the COOKIE array + * + * @access public + * @param string + * @param bool + * @return string + */ + function cookie($index = '', $xss_clean = FALSE) + { + if ( ! isset($_COOKIE[$index])) + { + return FALSE; + } + + if ($xss_clean === TRUE) + { + if (is_array($_COOKIE[$index])) + { + $cookie = array(); + foreach($_COOKIE[$index] as $key => $val) + { + $cookie[$key] = $this->xss_clean($val); + } + + return $cookie; + } + else + { + return $this->xss_clean($_COOKIE[$index]); + } + } + else + { + return $_COOKIE[$index]; + } + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the SERVER array + * + * @access public + * @param string + * @param bool + * @return string + */ + function server($index = '', $xss_clean = FALSE) + { + if ( ! isset($_SERVER[$index])) + { + return FALSE; + } + + if ($xss_clean === TRUE) + { + return $this->xss_clean($_SERVER[$index]); + } + + return $_SERVER[$index]; + } + + // -------------------------------------------------------------------- + + /** + * Fetch the IP Address + * + * @access public + * @return string + */ + function ip_address() + { + if ($this->ip_address !== FALSE) + { + return $this->ip_address; + } + + if ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP')) + { + $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; + } + elseif ($this->server('REMOTE_ADDR')) + { + $this->ip_address = $_SERVER['REMOTE_ADDR']; + } + elseif ($this->server('HTTP_CLIENT_IP')) + { + $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; + } + elseif ($this->server('HTTP_X_FORWARDED_FOR')) + { + $this->ip_address = $_SERVER['HTTP_X_FORWARDED_FOR']; + } + + if ($this->ip_address === FALSE) + { + $this->ip_address = '0.0.0.0'; + return $this->ip_address; + } + + if (strstr($this->ip_address, ',')) + { + $x = explode(',', $this->ip_address); + $this->ip_address = end($x); + } + + if ( ! $this->valid_ip($this->ip_address)) + { + $this->ip_address = '0.0.0.0'; + } + + return $this->ip_address; + } + + // -------------------------------------------------------------------- + + /** + * Validate IP Address + * + * @access public + * @param string + * @return string + */ + function valid_ip($ip) + { + return ( ! preg_match( "/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $ip)) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * User Agent + * + * @access public + * @return string + */ + function user_agent() + { + if ($this->user_agent !== FALSE) + { + return $this->user_agent; + } + + $this->user_agent = ( ! isset($_SERVER['HTTP_USER_AGENT'])) ? FALSE : $_SERVER['HTTP_USER_AGENT']; + + return $this->user_agent; + } + + // -------------------------------------------------------------------- + + /** + * XSS Clean + * + * Sanitizes data so that Cross Site Scripting Hacks can be + * prevented.  This function does a fair amount of work but + * it is extremely thorough, designed to prevent even the + * most obscure XSS attempts.  Nothing is ever 100% foolproof, + * of course, but I haven't been able to get anything passed + * the filter. + * + * Note: This function should only be used to deal with data + * upon submission.  It's not something that should + * be used for general runtime processing. + * + * This function was based in part on some code and ideas I + * got from Bitflux: http://blog.bitflux.ch/wiki/XSS_Prevention + * + * To help develop this script I used this great list of + * vulnerabilities along with a few other hacks I've + * harvested from examining vulnerabilities in other programs: + * http://ha.ckers.org/xss.html + * + * @access public + * @param string + * @return string + */ + function xss_clean($str, $charset = 'ISO-8859-1') + { + /* + * Remove Null Characters + * + * This prevents sandwiching null characters + * between ascii characters, like Java\0script. + * + */ + $str = preg_replace('/\0+/', '', $str); + $str = preg_replace('/(\\\\0)+/', '', $str); + + /* + * Validate standard character entities + * + * Add a semicolon if missing. We do this to enable + * the conversion of entities to ASCII later. + * + */ + $str = preg_replace('#(&\#*\w+)[\x00-\x20]+;#u',"\\1;",$str); + + /* + * Validate UTF16 two byte encoding (x00) + * + * Just as above, adds a semicolon if missing. + * + */ + $str = preg_replace('#(&\#x*)([0-9A-F]+);*#iu',"\\1\\2;",$str); + + /* + * URL Decode + * + * Just in case stuff like this is submitted: + * + * Google + * + * Note: Normally urldecode() would be easier but it removes plus signs + * + */ + $str = preg_replace("/%u0([a-z0-9]{3})/i", "&#x\\1;", $str); + $str = preg_replace("/%([a-z0-9]{2})/i", "&#x\\1;", $str); + + /* + * Convert character entities to ASCII + * + * This permits our tests below to work reliably. + * We only convert entities that are within tags since + * these are the ones that will pose security problems. + * + */ + if (preg_match_all("/<(.+?)>/si", $str, $matches)) + { + for ($i = 0; $i < count($matches['0']); $i++) + { + $str = str_replace($matches['1'][$i], + $this->_html_entity_decode($matches['1'][$i], $charset), + $str); + } + } + + /* + * Not Allowed Under Any Conditions + */ + $bad = array( + 'document.cookie' => '[removed]', + 'document.write' => '[removed]', + 'window.location' => '[removed]', + "javascript\s*:" => '[removed]', + "Redirect\s+302" => '[removed]', + '' => '-->' + ); + + foreach ($bad as $key => $val) + { + $str = preg_replace("#".$key."#i", $val, $str); + } + + /* + * Convert all tabs to spaces + * + * This prevents strings like this: ja vascript + * Note: we deal with spaces between characters later. + * + */ + $str = preg_replace("#\t+#", " ", $str); + + /* + * Makes PHP tags safe + * + * Note: XML tags are inadvertently replaced too: + * + * '), array('<?php', '<?PHP', '<?', '?>'), $str); + + /* + * Compact any exploded words + * + * This corrects words like: j a v a s c r i p t + * These words are compacted back to their correct state. + * + */ + $words = array('javascript', 'vbscript', 'script', 'applet', 'alert', 'document', 'write', 'cookie', 'window'); + foreach ($words as $word) + { + $temp = ''; + for ($i = 0; $i < strlen($word); $i++) + { + $temp .= substr($word, $i, 1)."\s*"; + } + + $temp = substr($temp, 0, -3); + $str = preg_replace('#'.$temp.'#s', $word, $str); + $str = preg_replace('#'.ucfirst($temp).'#s', ucfirst($word), $str); + } + + /* + * Remove disallowed Javascript in links or img tags + */ + $str = preg_replace("#.*?#si", "", $str); + $str = preg_replace("##si", "", $str); + $str = preg_replace("#<(script|xss).*?\>#si", "", $str); + + /* + * Remove JavaScript Event Handlers + * + * Note: This code is a little blunt. It removes + * the event handler and anything up to the closing >, + * but it's unlikely to be a problem. + * + */ + $str = preg_replace('#(<[^>]+.*?)(onblur|onchange|onclick|onfocus|onload|onmouseover|onmouseup|onmousedown|onselect|onsubmit|onunload|onkeypress|onkeydown|onkeyup|onresize)[^>]*>#iU',"\\1>",$str); + + /* + * Sanitize naughty HTML elements + * + * If a tag containing any of the words in the list + * below is found, the tag gets converted to entities. + * + * So this: + * Becomes: <blink> + * + */ + $str = preg_replace('#<(/*\s*)(alert|applet|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|layer|link|meta|object|plaintext|style|script|textarea|title|xml|xss)([^>]*)>#is', "<\\1\\2\\3>", $str); + + /* + * Sanitize naughty scripting elements + * + * Similar to above, only instead of looking for + * tags it looks for PHP and JavaScript commands + * that are disallowed. Rather than removing the + * code, it simply converts the parenthesis to entities + * rendering the code un-executable. + * + * For example: eval('some code') + * Becomes: eval('some code') + * + */ + $str = preg_replace('#(alert|cmd|passthru|eval|exec|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str); + + /* + * Final clean up + * + * This adds a bit of extra precaution in case + * something got through the above filters + * + */ + $bad = array( + 'document.cookie' => '[removed]', + 'document.write' => '[removed]', + 'window.location' => '[removed]', + "javascript\s*:" => '[removed]', + "Redirect\s+302" => '[removed]', + '' => '-->' + ); + + foreach ($bad as $key => $val) + { + $str = preg_replace("#".$key."#i", $val, $str); + } + + + log_message('debug', "XSS Filtering completed"); + return $str; + } + + // -------------------------------------------------------------------- + + /** + * HTML Entities Decode + * + * This function is a replacement for html_entity_decode() + * + * In some versions of PHP the native function does not work + * when UTF-8 is the specified character set, so this gives us + * a work-around. More info here: + * http://bugs.php.net/bug.php?id=25670 + * + * @access private + * @param string + * @param string + * @return string + */ + /* ------------------------------------------------- + /* Replacement for html_entity_decode() + /* -------------------------------------------------*/ + + /* + NOTE: html_entity_decode() has a bug in some PHP versions when UTF-8 is the + character set, and the PHP developers said they were not back porting the + fix to versions other than PHP 5.x. + */ + function _html_entity_decode($str, $charset='ISO-8859-1') + { + if (stristr($str, '&') === FALSE) return $str; + + // The reason we are not using html_entity_decode() by itself is because + // while it is not technically correct to leave out the semicolon + // at the end of an entity most browsers will still interpret the entity + // correctly. html_entity_decode() does not convert entities without + // semicolons, so we are left with our own little solution here. Bummer. + + if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR version_compare(phpversion(), '5.0.0', '>='))) + { + $str = html_entity_decode($str, ENT_COMPAT, $charset); + $str = preg_replace('~&#x([0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str); + return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str); + } + + // Numeric Entities + $str = preg_replace('~&#x([0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str); + $str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str); + + // Literal Entities - Slightly slow so we do another check + if (stristr($str, '&') === FALSE) + { + $str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES))); + } + + return $str; + } + +} +// END Input class ?> \ No newline at end of file diff --git a/system/libraries/Router.php b/system/libraries/Router.php index 6d925a1c..8dfc8258 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -1,561 +1,561 @@ -config =& load_class('Config'); - $this->_set_route_mapping(); - log_message('debug', "Router Class Initialized"); - } - - // -------------------------------------------------------------------- - - /** - * Set the route mapping - * - * This function determines what should be served based on the URI request, - * as well as any "routes" that have been set in the routing config file. - * - * @access private - * @return void - */ - function _set_route_mapping() - { - // Are query strings enabled in the config file? - // If so, we're done since segment based URIs are not used with query strings. - if ($this->config->item('enable_query_strings') === TRUE AND isset($_GET[$this->config->item('controller_trigger')])) - { - $this->set_class($_GET[$this->config->item('controller_trigger')]); - - if (isset($_GET[$this->config->item('function_trigger')])) - { - $this->set_method($_GET[$this->config->item('function_trigger')]); - } - - return; - } - - // Load the routes.php file. - @include(APPPATH.'config/routes'.EXT); - $this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route; - unset($route); - - // Set the default controller so we can display it in the event - // 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']); - - // Fetch the complete URI string - $this->uri_string = $this->_get_uri_string(); - - // If the URI contains only a slash we'll kill it - if ($this->uri_string == '/') - { - $this->uri_string = ''; - } - - // Is there a URI string? If not, the default controller specified in the "routes" file will be shown. - if ($this->uri_string == '') - { - if ($this->default_controller === FALSE) - { - show_error("Unable to determine what should be displayed. A default route has not been specified in the routing file."); - } - - $this->set_class($this->default_controller); - $this->set_method('index'); - - log_message('debug', "No URI present. Default controller set."); - return; - } - unset($this->routes['default_controller']); - - // Do we need to remove the suffix specified in the config file? - if ($this->config->item('url_suffix') != "") - { - $this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string); - } - - // Explode the URI Segments. The individual segments will - // be stored in the $this->segments array. - foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) - { - // Filter segments for security - $val = trim($this->_filter_uri($val)); - - if ($val != '') - $this->segments[] = $val; - } - - // Parse any custom routing that may exist - $this->_parse_routes(); - - // Re-index the segment array so that it starts with 1 rather than 0 - $this->_reindex_segments(); - } - - // -------------------------------------------------------------------- - - /** - * Compile Segments - * - * This function takes an array of URI segments as - * input, and puts it into the $this->segments array. - * It also sets the current class/method - * - * @access private - * @param array - * @param bool - * @return void - */ - function _compile_segments($segments = array()) - { - $segments = $this->_validate_segments($segments); - - if (count($segments) == 0) - { - return; - } - - $this->set_class($segments[0]); - - if (isset($segments[1])) - { - // A scaffolding request. No funny business with the URL - if ($this->routes['scaffolding_trigger'] == $segments[1] AND $segments[1] != '_ci_scaffolding') - { - $this->scaffolding_request = TRUE; - unset($this->routes['scaffolding_trigger']); - } - else - { - // A standard method request - $this->set_method($segments[1]); - } - } - - // Update our "routed" segment array to contain the segments. - // Note: If there is no custom routing, this array will be - // identical to $this->segments - $this->rsegments = $segments; - } - - // -------------------------------------------------------------------- - - /** - * Validates the supplied segments. Attempts to determine the path to - * the controller. - * - * @access private - * @param array - * @return array - */ - function _validate_segments($segments) - { - // Does the requested controller exist in the root folder? - if (file_exists(APPPATH.'controllers/'.$segments[0].EXT)) - { - return $segments; - } - - // Is the controller in a sub-folder? - if (is_dir(APPPATH.'controllers/'.$segments[0])) - { - // Set the directory and remove it from the segment array - $this->set_directory($segments[0]); - $segments = array_slice($segments, 1); - - if (count($segments) > 0) - { - // Does the requested controller exist in the sub-folder? - if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$segments[0].EXT)) - { - show_404(); - } - } - else - { - $this->set_class($this->default_controller); - $this->set_method('index'); - - // Does the default controller exist in the sub-folder? - if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$this->default_controller.EXT)) - { - $this->directory = ''; - return array(); - } - - } - - return $segments; - } - - // Can't find the requested controller... - show_404(); - } - - // -------------------------------------------------------------------- - /** - * Re-index Segments - * - * This function re-indexes the $this->segment array so that it - * starts at 1 rather then 0. Doing so makes it simpler to - * use functions like $this->uri->segment(n) since there is - * a 1:1 relationship between the segment array and the actual segments. - * - * @access private - * @return void - */ - function _reindex_segments() - { - // Is the routed segment array different then the main segment array? - $diff = (count(array_diff($this->rsegments, $this->segments)) == 0) ? FALSE : TRUE; - - $i = 1; - foreach ($this->segments as $val) - { - $this->segments[$i++] = $val; - } - unset($this->segments[0]); - - if ($diff == FALSE) - { - $this->rsegments = $this->segments; - } - else - { - $i = 1; - foreach ($this->rsegments as $val) - { - $this->rsegments[$i++] = $val; - } - unset($this->rsegments[0]); - } - } - - // -------------------------------------------------------------------- - - /** - * Get the URI String - * - * @access private - * @return string - */ - function _get_uri_string() - { - if (strtoupper($this->config->item('uri_protocol')) == 'AUTO') - { - // If the URL has a question mark then it's simplest to just - // build the URI string from the zero index of the $_GET array. - // This avoids having to deal with $_SERVER variables, which - // can be unreliable in some environments - if (is_array($_GET) AND count($_GET) == 1) - { - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - $keys = array_keys($_GET); - return current($keys); - } - - // Is there a PATH_INFO variable? - // Note: some servers seem to have trouble with getenv() so we'll test it two ways - $path = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO'); - if ($path != '' AND $path != "/".SELF) - { - return $path; - } - - // No PATH_INFO?... What about QUERY_STRING? - $path = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING'); - if ($path != '') - { - return $path; - } - - // No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists? - $path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO'); - if ($path != '' AND $path != "/".SELF) - { - return $path; - } - - // We've exhausted all our options... - return ''; - } - else - { - $uri = strtoupper($this->config->item('uri_protocol')); - - if ($uri == 'REQUEST_URI') - { - return $this->_parse_request_uri(); - } - - return (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri); - } - } - - // -------------------------------------------------------------------- - - /** - * Parse the REQUEST_URI - * - * Due to the way REQUEST_URI works it usually contains path info - * that makes it unusable as URI data. We'll trim off the unnecessary - * data, hopefully arriving at a valid URI that we can use. - * - * @access private - * @return string - */ - function _parse_request_uri() - { - if ( ! isset($_SERVER['REQUEST_URI']) OR $_SERVER['REQUEST_URI'] == '') - { - return ''; - } - - $request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI'])); - - if ($request_uri == '' OR $request_uri == SELF) - { - return ''; - } - - $fc_path = FCPATH; - if (strpos($request_uri, '?') !== FALSE) - { - $fc_path .= '?'; - } - - $parsed_uri = explode("/", $request_uri); - - $i = 0; - foreach(explode("/", $fc_path) as $segment) - { - if (isset($parsed_uri[$i]) AND $segment == $parsed_uri[$i]) - { - $i++; - } - } - - $parsed_uri = implode("/", array_slice($parsed_uri, $i)); - - if ($parsed_uri != '') - { - $parsed_uri = '/'.$parsed_uri; - } - - return $parsed_uri; - } - - // -------------------------------------------------------------------- - - /** - * Filter segments for malicious characters - * - * @access private - * @param string - * @return string - */ - function _filter_uri($str) - { - if ($this->config->item('permitted_uri_chars') != '') - { - if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str)) - { - exit('The URI you submitted has disallowed characters: '.$str); - } - } - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Parse Routes - * - * This function matches any routes that may exist in - * the config/routes.php file against the URI to - * determine if the class/method need to be remapped. - * - * @access private - * @return void - */ - function _parse_routes() - { - // Do we even have any custom routing to deal with? - if (count($this->routes) == 0) - { - $this->_compile_segments($this->segments); - return; - } - - // Turn the segment array into a URI string - $uri = implode('/', $this->segments); - $num = count($this->segments); - - // Is there a literal match? If so we're done - if (isset($this->routes[$uri])) - { - $this->_compile_segments(explode('/', $this->routes[$uri])); - return; - } - - // Loop through the route array looking for wild-cards - foreach (array_slice($this->routes, 1) as $key => $val) - { - // Convert wild-cards to RegEx - $key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key)); - - // Does the RegEx match? - if (preg_match('#^'.$key.'$#', $uri)) - { - // Do we have a back-reference? - if (strpos($val, '$') !== FALSE AND strpos($key, '(') !== FALSE) - { - $val = preg_replace('#^'.$key.'$#', $val, $uri); - } - - $this->_compile_segments(explode('/', $val)); - return; - } - } - - // If we got this far it means we didn't encounter a - // matching route so we'll set the site default route - $this->_compile_segments($this->segments); - } - - // -------------------------------------------------------------------- - - /** - * Set the class name - * - * @access public - * @param string - * @return void - */ - function set_class($class) - { - $this->class = $class; - } - - // -------------------------------------------------------------------- - - /** - * Fetch the current class - * - * @access public - * @return string - */ - function fetch_class() - { - return $this->class; - } - - // -------------------------------------------------------------------- - - /** - * Set the method name - * - * @access public - * @param string - * @return void - */ - function set_method($method) - { - $this->method = $method; - } - - // -------------------------------------------------------------------- - - /** - * Fetch the current method - * - * @access public - * @return string - */ - function fetch_method() - { - if ($this->method == $this->fetch_class()) - { - return 'index'; - } - - return $this->method; - } - - // -------------------------------------------------------------------- - - /** - * Set the directory name - * - * @access public - * @param string - * @return void - */ - function set_directory($dir) - { - $this->directory = $dir.'/'; - } - - // -------------------------------------------------------------------- - - /** - * Fetch the sub-directory (if any) that contains the requested controller class - * - * @access public - * @return string - */ - function fetch_directory() - { - return $this->directory; - } - -} -// END Router Class +config =& load_class('Config'); + $this->_set_route_mapping(); + log_message('debug', "Router Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * Set the route mapping + * + * This function determines what should be served based on the URI request, + * as well as any "routes" that have been set in the routing config file. + * + * @access private + * @return void + */ + function _set_route_mapping() + { + // Are query strings enabled in the config file? + // If so, we're done since segment based URIs are not used with query strings. + if ($this->config->item('enable_query_strings') === TRUE AND isset($_GET[$this->config->item('controller_trigger')])) + { + $this->set_class($_GET[$this->config->item('controller_trigger')]); + + if (isset($_GET[$this->config->item('function_trigger')])) + { + $this->set_method($_GET[$this->config->item('function_trigger')]); + } + + return; + } + + // Load the routes.php file. + @include(APPPATH.'config/routes'.EXT); + $this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route; + unset($route); + + // Set the default controller so we can display it in the event + // 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']); + + // Fetch the complete URI string + $this->uri_string = $this->_get_uri_string(); + + // If the URI contains only a slash we'll kill it + if ($this->uri_string == '/') + { + $this->uri_string = ''; + } + + // Is there a URI string? If not, the default controller specified in the "routes" file will be shown. + if ($this->uri_string == '') + { + if ($this->default_controller === FALSE) + { + show_error("Unable to determine what should be displayed. A default route has not been specified in the routing file."); + } + + $this->set_class($this->default_controller); + $this->set_method('index'); + + log_message('debug', "No URI present. Default controller set."); + return; + } + unset($this->routes['default_controller']); + + // Do we need to remove the suffix specified in the config file? + if ($this->config->item('url_suffix') != "") + { + $this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string); + } + + // Explode the URI Segments. The individual segments will + // be stored in the $this->segments array. + foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) + { + // Filter segments for security + $val = trim($this->_filter_uri($val)); + + if ($val != '') + $this->segments[] = $val; + } + + // Parse any custom routing that may exist + $this->_parse_routes(); + + // Re-index the segment array so that it starts with 1 rather than 0 + $this->_reindex_segments(); + } + + // -------------------------------------------------------------------- + + /** + * Compile Segments + * + * This function takes an array of URI segments as + * input, and puts it into the $this->segments array. + * It also sets the current class/method + * + * @access private + * @param array + * @param bool + * @return void + */ + function _compile_segments($segments = array()) + { + $segments = $this->_validate_segments($segments); + + if (count($segments) == 0) + { + return; + } + + $this->set_class($segments[0]); + + if (isset($segments[1])) + { + // A scaffolding request. No funny business with the URL + if ($this->routes['scaffolding_trigger'] == $segments[1] AND $segments[1] != '_ci_scaffolding') + { + $this->scaffolding_request = TRUE; + unset($this->routes['scaffolding_trigger']); + } + else + { + // A standard method request + $this->set_method($segments[1]); + } + } + + // Update our "routed" segment array to contain the segments. + // Note: If there is no custom routing, this array will be + // identical to $this->segments + $this->rsegments = $segments; + } + + // -------------------------------------------------------------------- + + /** + * Validates the supplied segments. Attempts to determine the path to + * the controller. + * + * @access private + * @param array + * @return array + */ + function _validate_segments($segments) + { + // Does the requested controller exist in the root folder? + if (file_exists(APPPATH.'controllers/'.$segments[0].EXT)) + { + return $segments; + } + + // Is the controller in a sub-folder? + if (is_dir(APPPATH.'controllers/'.$segments[0])) + { + // Set the directory and remove it from the segment array + $this->set_directory($segments[0]); + $segments = array_slice($segments, 1); + + if (count($segments) > 0) + { + // Does the requested controller exist in the sub-folder? + if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$segments[0].EXT)) + { + show_404(); + } + } + else + { + $this->set_class($this->default_controller); + $this->set_method('index'); + + // Does the default controller exist in the sub-folder? + if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$this->default_controller.EXT)) + { + $this->directory = ''; + return array(); + } + + } + + return $segments; + } + + // Can't find the requested controller... + show_404(); + } + + // -------------------------------------------------------------------- + /** + * Re-index Segments + * + * This function re-indexes the $this->segment array so that it + * starts at 1 rather then 0. Doing so makes it simpler to + * use functions like $this->uri->segment(n) since there is + * a 1:1 relationship between the segment array and the actual segments. + * + * @access private + * @return void + */ + function _reindex_segments() + { + // Is the routed segment array different then the main segment array? + $diff = (count(array_diff($this->rsegments, $this->segments)) == 0) ? FALSE : TRUE; + + $i = 1; + foreach ($this->segments as $val) + { + $this->segments[$i++] = $val; + } + unset($this->segments[0]); + + if ($diff == FALSE) + { + $this->rsegments = $this->segments; + } + else + { + $i = 1; + foreach ($this->rsegments as $val) + { + $this->rsegments[$i++] = $val; + } + unset($this->rsegments[0]); + } + } + + // -------------------------------------------------------------------- + + /** + * Get the URI String + * + * @access private + * @return string + */ + function _get_uri_string() + { + if (strtoupper($this->config->item('uri_protocol')) == 'AUTO') + { + // If the URL has a question mark then it's simplest to just + // build the URI string from the zero index of the $_GET array. + // This avoids having to deal with $_SERVER variables, which + // can be unreliable in some environments + if (is_array($_GET) AND count($_GET) == 1) + { + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + $keys = array_keys($_GET); + return current($keys); + } + + // Is there a PATH_INFO variable? + // Note: some servers seem to have trouble with getenv() so we'll test it two ways + $path = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO'); + if ($path != '' AND $path != "/".SELF) + { + return $path; + } + + // No PATH_INFO?... What about QUERY_STRING? + $path = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING'); + if ($path != '') + { + return $path; + } + + // No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists? + $path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO'); + if ($path != '' AND $path != "/".SELF) + { + return $path; + } + + // We've exhausted all our options... + return ''; + } + else + { + $uri = strtoupper($this->config->item('uri_protocol')); + + if ($uri == 'REQUEST_URI') + { + return $this->_parse_request_uri(); + } + + return (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri); + } + } + + // -------------------------------------------------------------------- + + /** + * Parse the REQUEST_URI + * + * Due to the way REQUEST_URI works it usually contains path info + * that makes it unusable as URI data. We'll trim off the unnecessary + * data, hopefully arriving at a valid URI that we can use. + * + * @access private + * @return string + */ + function _parse_request_uri() + { + if ( ! isset($_SERVER['REQUEST_URI']) OR $_SERVER['REQUEST_URI'] == '') + { + return ''; + } + + $request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI'])); + + if ($request_uri == '' OR $request_uri == SELF) + { + return ''; + } + + $fc_path = FCPATH; + if (strpos($request_uri, '?') !== FALSE) + { + $fc_path .= '?'; + } + + $parsed_uri = explode("/", $request_uri); + + $i = 0; + foreach(explode("/", $fc_path) as $segment) + { + if (isset($parsed_uri[$i]) AND $segment == $parsed_uri[$i]) + { + $i++; + } + } + + $parsed_uri = implode("/", array_slice($parsed_uri, $i)); + + if ($parsed_uri != '') + { + $parsed_uri = '/'.$parsed_uri; + } + + return $parsed_uri; + } + + // -------------------------------------------------------------------- + + /** + * Filter segments for malicious characters + * + * @access private + * @param string + * @return string + */ + function _filter_uri($str) + { + if ($this->config->item('permitted_uri_chars') != '') + { + if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str)) + { + exit('The URI you submitted has disallowed characters.'); + } + } + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Parse Routes + * + * This function matches any routes that may exist in + * the config/routes.php file against the URI to + * determine if the class/method need to be remapped. + * + * @access private + * @return void + */ + function _parse_routes() + { + // Do we even have any custom routing to deal with? + if (count($this->routes) == 0) + { + $this->_compile_segments($this->segments); + return; + } + + // Turn the segment array into a URI string + $uri = implode('/', $this->segments); + $num = count($this->segments); + + // Is there a literal match? If so we're done + if (isset($this->routes[$uri])) + { + $this->_compile_segments(explode('/', $this->routes[$uri])); + return; + } + + // Loop through the route array looking for wild-cards + foreach (array_slice($this->routes, 1) as $key => $val) + { + // Convert wild-cards to RegEx + $key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key)); + + // Does the RegEx match? + if (preg_match('#^'.$key.'$#', $uri)) + { + // Do we have a back-reference? + if (strpos($val, '$') !== FALSE AND strpos($key, '(') !== FALSE) + { + $val = preg_replace('#^'.$key.'$#', $val, $uri); + } + + $this->_compile_segments(explode('/', $val)); + return; + } + } + + // If we got this far it means we didn't encounter a + // matching route so we'll set the site default route + $this->_compile_segments($this->segments); + } + + // -------------------------------------------------------------------- + + /** + * Set the class name + * + * @access public + * @param string + * @return void + */ + function set_class($class) + { + $this->class = $class; + } + + // -------------------------------------------------------------------- + + /** + * Fetch the current class + * + * @access public + * @return string + */ + function fetch_class() + { + return $this->class; + } + + // -------------------------------------------------------------------- + + /** + * Set the method name + * + * @access public + * @param string + * @return void + */ + function set_method($method) + { + $this->method = $method; + } + + // -------------------------------------------------------------------- + + /** + * Fetch the current method + * + * @access public + * @return string + */ + function fetch_method() + { + if ($this->method == $this->fetch_class()) + { + return 'index'; + } + + return $this->method; + } + + // -------------------------------------------------------------------- + + /** + * Set the directory name + * + * @access public + * @param string + * @return void + */ + function set_directory($dir) + { + $this->directory = $dir.'/'; + } + + // -------------------------------------------------------------------- + + /** + * Fetch the sub-directory (if any) that contains the requested controller class + * + * @access public + * @return string + */ + function fetch_directory() + { + return $this->directory; + } + +} +// END Router Class ?> \ No newline at end of file From eec852be74d523db209c7c3b0edbd21105463059 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 1 Feb 2007 03:11:11 +0000 Subject: [PATCH 0479/2544] fixed incorrect version number --- user_guide/installation/downloads.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 88ef4748..5acf04e5 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -63,7 +63,7 @@

            Downloading Code Igniter

              -
            • Code Igniter V 1.5.2 (Current version)
              • +
            • Code Igniter V 1.5.1 (Current version)
            • Code Igniter V 1.4.1
            • Code Igniter V 1.3.3
            • Code Igniter V 1.3.2
              • From c47f6e7a490f623e2cf83e8c70a35eb7c7f3abee Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 1 Feb 2007 03:11:25 +0000 Subject: [PATCH 0480/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 013c0e57..21935898 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -67,6 +67,7 @@

              Version 1.5.1.1

              • Added support for captions in the Table Library
              • Fixed a bug in the form helper that gave textarea a value attribute
                • +
              • Fixed a bug in the Image Library that was ignoring resizing the same size image
              • Fixed some doc typos.

              Version 1.5.0.2

              From c5d887941fac6754972e87979e180cc043c4d0fe Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 1 Feb 2007 03:12:32 +0000 Subject: [PATCH 0481/2544] fixed resize bug that was comparing height to width instead of height to original height --- system/libraries/Image_lib.php | 3052 ++++++++++++++++---------------- 1 file changed, 1526 insertions(+), 1526 deletions(-) diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 561c5c03..28e1bfbb 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -1,1527 +1,1527 @@ - 0) - { - $this->initialize($props); - } - - log_message('debug', "Image Lib Class Initialized"); - } - - // -------------------------------------------------------------------- - - /** - * Initialize image properties - * - * Resets values in case this class is used in a loop - * - * @access public - * @return void - */ - function clear() - { - $props = array('source_folder', 'dest_folder', 'source_image', 'full_src_path', 'full_dst_path', 'new_image', 'image_type', 'size_str', 'quality', 'orig_width', 'orig_height', 'rotation_angle', 'x_axis', 'y_axis', 'create_fnc', 'copy_fnc', 'wm_overlay_path', 'wm_use_truetype', 'dynamic_output', 'wm_font_size', 'wm_text', 'wm_vrt_alignment', 'wm_hor_alignment', 'wm_padding', 'wm_hor_offset', 'wm_vrt_offset', 'wm_font_color', 'wm_use_drop_shadow', 'wm_shadow_color', 'wm_shadow_distance', 'wm_opacity'); - - foreach ($props as $val) - { - $this->$val = ''; - } - } - - // -------------------------------------------------------------------- - - /** - * initialize image preferences - * - * @access public - * @param array - * @return void - */ - function initialize($props = array()) - { - /* - * Convert array elements into class variables - */ - if (count($props) > 0) - { - foreach ($props as $key => $val) - { - $this->$key = $val; - } - } - - /* - * Is there a source image? - * - * If not, there's no reason to continue - * - */ - if ($this->source_image == '') - { - $this->set_error('imglib_source_image_required'); - return FALSE; - } - - /* - * Is getimagesize() Available? - * - * We use it to determine the image properties (width/height). - * Note: We need to figure out how to determine image - * properties using ImageMagick and NetPBM - * - */ - if ( ! function_exists('getimagesize')) - { - $this->set_error('imglib_gd_required_for_props'); - return FALSE; - } - - $this->image_library = strtolower($this->image_library); - - /* - * Set the full server path - * - * The source image may or may not contain a path. - * Either way, we'll try use realpath to generate the - * full server path in order to more reliably read it. - * - */ - if (function_exists('realpath') AND @realpath($this->source_image) !== FALSE) - { - $full_source_path = str_replace("\\", "/", realpath($this->source_image)); - } - else - { - $full_source_path = $this->source_image; - } - - $x = explode('/', $full_source_path); - $this->source_image = end($x); - $this->source_folder = str_replace($this->source_image, '', $full_source_path); - - // Set the Image Properties - if ( ! $this->get_image_properties($this->source_folder.$this->source_image)) - { - return FALSE; - } - - /* - * Assign the "new" image name/path - * - * If the user has set a "new_image" name it means - * we are making a copy of the source image. If not - * it means we are altering the original. We'll - * set the destination filename and path accordingly. - * - */ - if ($this->new_image == '') - { - $this->dest_image = $this->source_image; - $this->dest_folder = $this->source_folder; - } - else - { - if (strpos($this->new_image, '/') === FALSE) - { - $this->dest_folder = $this->source_folder; - $this->dest_image = $this->new_image; - } - else - { - if (function_exists('realpath') AND @realpath($this->new_image) !== FALSE) - { - $full_dest_path = str_replace("\\", "/", realpath($this->new_image)); - } - else - { - $full_dest_path = $this->new_image; - } - - // Is there a file name? - if ( ! preg_match("#[\.jpg|\.jpeg|\.gif|\.png]$#i", $full_dest_path)) - { - $this->dest_folder = $full_dest_path.'/'; - $this->dest_image = $this->source_image; - } - else - { - $x = explode('/', $full_dest_path); - $this->dest_image = end($x); - $this->dest_folder = str_replace($this->dest_image, '', $full_dest_path); - } - } - } - - /* - * Compile the finalized filenames/paths - * - * We'll create two master strings containing the - * full server path to the source image and the - * full server path to the destination image. - * We'll also split the destination image name - * so we can insert the thumbnail marker if needed. - * - */ - if ($this->create_thumb === FALSE OR $this->thumb_marker == '') - { - $this->thumb_marker = ''; - } - - $xp = $this->explode_name($this->dest_image); - - $filename = $xp['name']; - $file_ext = $xp['ext']; - - $this->full_src_path = $this->source_folder.$this->source_image; - $this->full_dst_path = $this->dest_folder.$filename.$this->thumb_marker.$file_ext; - - /* - * Should we maintain image proportions? - * - * When creating thumbs or copies, the target width/height - * might not be in correct proportion with the source - * image's width/height. We'll recalculate it here. - * - */ - if ($this->maintain_ratio === TRUE && ($this->width != '' AND $this->height != '')) - { - $this->image_reproportion(); - } - - /* - * Was a width and height specified? - * - * If the destination width/height was - * not submitted we will use the values - * from the actual file - * - */ - if ($this->width == '') - $this->width = $this->orig_width; - - if ($this->height == '') - $this->height = $this->orig_height; - - // Set the quality - $this->quality = trim(str_replace("%", "", $this->quality)); - - if ($this->quality == '' OR $this->quality == 0 OR ! is_numeric($this->quality)) - $this->quality = 90; - - // Set the x/y coordinates - $this->x_axis = ($this->x_axis == '' OR ! is_numeric($this->x_axis)) ? 0 : $this->x_axis; - $this->y_axis = ($this->y_axis == '' OR ! is_numeric($this->y_axis)) ? 0 : $this->y_axis; - - // Watermark-related Stuff... - if ($this->wm_font_color != '') - { - if (strlen($this->wm_font_color) == 6) - { - $this->wm_font_color = '#'.$this->wm_font_color; - } - } - - if ($this->wm_shadow_color != '') - { - if (strlen($this->wm_shadow_color) == 6) - { - $this->wm_shadow_color = '#'.$this->wm_shadow_color; - } - } - - if ($this->wm_overlay_path != '') - { - $this->wm_overlay_path = str_replace("\\", "/", realpath($this->wm_overlay_path)); - } - - if ($this->wm_shadow_color != '') - { - $this->wm_use_drop_shadow = TRUE; - } - - if ($this->wm_font_path != '') - { - $this->wm_use_truetype = TRUE; - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Image Resize - * - * This is a wrapper function that chooses the proper - * resize function based on the protocol specified - * - * @access public - * @return bool - */ - function resize() - { - $protocol = 'image_process_'.$this->image_library; - - if (eregi("gd2$", $protocol)) - { - $protocol = 'image_process_gd'; - } - - return $this->$protocol('resize'); - } - - // -------------------------------------------------------------------- - - /** - * Image Crop - * - * This is a wrapper function that chooses the proper - * cropping function based on the protocol specified - * - * @access public - * @return bool - */ - function crop() - { - $protocol = 'image_process_'.$this->image_library; - - if (eregi("gd2$", $protocol)) - { - $protocol = 'image_process_gd'; - } - - return $this->$protocol('crop'); - } - - // -------------------------------------------------------------------- - - /** - * Image Rotate - * - * This is a wrapper function that chooses the proper - * rotation function based on the protocol specified - * - * @access public - * @return bool - */ - function rotate() - { - // Allowed rotation values - $degs = array(90, 180, 270, 'vrt', 'hor'); - - if ($this->rotation_angle == '' OR ! in_array($this->rotation_angle, $degs, TRUE)) - { - $this->set_error('imglib_rotation_angle_required'); - return FALSE; - } - - // Reassign the width and height - if ($this->rotation_angle == 90 OR $this->rotation_angle == 270) - { - $this->width = $this->orig_height; - $this->height = $this->orig_width; - } - else - { - $this->width = $this->orig_width; - $this->height = $this->orig_height; - } - - - // Choose resizing function - if ($this->image_library == 'imagemagick' OR $this->image_library == 'netpbm') - { - $protocol = 'image_process_'.$this->image_library; - - return $this->$protocol('rotate'); - } - - if ($this->rotation_angle == 'hor' OR $this->rotation_angle == 'vrt') - { - return $this->image_mirror_gd(); - } - else - { - return $this->image_rotate_gd(); - } - } - - // -------------------------------------------------------------------- - - /** - * Image Process Using GD/GD2 - * - * This function will resize or crop - * - * @access public - * @param string - * @return bool - */ - function image_process_gd($action = 'resize') - { - $v2_override = FALSE; - - if ($action == 'crop') - { - // If the target width/height match the source then it's pointless to crop, right? - if ($this->width >= $this->orig_width AND $this->height >= $this->orig_width) - { - // We'll return true so the user thinks the process succeeded. - // It'll be our little secret... - - return TRUE; - } - - // Reassign the source width/height if cropping - $this->orig_width = $this->width; - $this->orig_height = $this->height; - - // GD 2.0 has a cropping bug so we'll test for it - if ($this->gd_version() !== FALSE) - { - $gd_version = str_replace('0', '', $this->gd_version()); - $v2_override = ($gd_version == 2) ? TRUE : FALSE; - } - } - else - { - // If the target width/height match the source, AND if - // the new file name is not equal to the old file name - // we'll simply make a copy of the original with the new name - if (($this->orig_width == $this->width AND $this->orig_height == $this->height) AND ($this->source_image != $this->dest_image)) - { - if ( ! @copy($this->full_src_path, $this->full_dst_path)) - { - $this->set_error('imglib_copy_failed'); - return FALSE; - } - - @chmod($this->full_dst_path, 0777); - return TRUE; - } - - // If resizing the x/y axis must be zero - $this->x_axis = 0; - $this->y_axis = 0; - } - - // Create the image handle - if ( ! ($src_img = $this->image_create_gd())) - { - return FALSE; - } - - // Create The Image - if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor') AND $v2_override == FALSE) - { - $create = 'imagecreatetruecolor'; - $copy = 'imagecopyresampled'; - } - else - { - $create = 'imagecreate'; - $copy = 'imagecopyresized'; - } - - $dst_img = $create($this->width, $this->height); - $copy($dst_img, $src_img, 0, 0, $this->x_axis, $this->y_axis, $this->width, $this->height, $this->orig_width, $this->orig_height); - - // Show the image - if ($this->dynamic_output == TRUE) - { - $this->image_display_gd($dst_img); - } - else - { - // Or save it - if ( ! $this->image_save_gd($dst_img)) - { - return FALSE; - } - } - - // Kill the file handles - imagedestroy($dst_img); - imagedestroy($src_img); - - // Set the file to 777 - @chmod($this->full_dst_path, 0777); - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Image Process Using ImageMagick - * - * This function will resize, crop or rotate - * - * @access public - * @param string - * @return bool - */ - function image_process_imagemagick($action = 'resize') - { - // Do we have a vaild library path? - if ($this->library_path == '') - { - $this->set_error('imglib_libpath_invalid'); - return FALSE; - } - - if ( ! eregi("convert$", $this->library_path)) - { - if ( ! eregi("/$", $this->library_path)) $this->library_path .= "/"; - - $this->library_path .= 'convert'; - } - - // Execute the command - $cmd = $this->library_path." -quality ".$this->quality; - - if ($action == 'crop') - { - $cmd .= " -crop ".$this->width."x".$this->height."+".$this->x_axis."+".$this->y_axis." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1"; - } - elseif ($action == 'rotate') - { - switch ($this->rotation_angle) - { - case 'hor' : $angle = '-flop'; - break; - case 'vrt' : $angle = '-flip'; - break; - default : $angle = '-rotate '.$this->rotation_angle; - break; - } - - $cmd .= " ".$angle." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1"; - } - else // Resize - { - $cmd .= " -resize ".$this->width."x".$this->height." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1"; - } - - $retval = 1; - - @exec($cmd, $output, $retval); - - // Did it work? - if ($retval > 0) - { - $this->set_error('imglib_image_process_failed'); - return FALSE; - } - - // Set the file to 777 - @chmod($this->full_dst_path, 0777); - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Image Process Using NetPBM - * - * This function will resize, crop or rotate - * - * @access public - * @param string - * @return bool - */ - function image_process_netpbm($action = 'resize') - { - if ($this->library_path == '') - { - $this->set_error('imglib_libpath_invalid'); - return FALSE; - } - - // Build the resizing command - switch ($this->image_type) - { - case 1 : - $cmd_in = 'giftopnm'; - $cmd_out = 'ppmtogif'; - break; - case 2 : - $cmd_in = 'jpegtopnm'; - $cmd_out = 'ppmtojpeg'; - break; - case 3 : - $cmd_in = 'pngtopnm'; - $cmd_out = 'ppmtopng'; - break; - } - - if ($action == 'crop') - { - $cmd_inner = 'pnmcut -left '.$this->x_axis.' -top '.$this->y_axis.' -width '.$this->width.' -height '.$this->height; - } - elseif ($action == 'rotate') - { - switch ($this->rotation_angle) - { - case 90 : $angle = 'r270'; - break; - case 180 : $angle = 'r180'; - break; - case 270 : $angle = 'r90'; - break; - case 'vrt' : $angle = 'tb'; - break; - case 'hor' : $angle = 'lr'; - break; - } - - $cmd_inner = 'pnmflip -'.$angle.' '; - } - else // Resize - { - $cmd_inner = 'pnmscale -xysize '.$this->width.' '.$this->height; - } - - $cmd = $this->library_path.$cmd_in.' '.$this->full_src_path.' | '.$cmd_inner.' | '.$cmd_out.' > '.$this->dest_folder.'netpbm.tmp'; - - $retval = 1; - - @exec($cmd, $output, $retval); - - // Did it work? - if ($retval > 0) - { - $this->set_error('imglib_image_process_failed'); - return FALSE; - } - - // With NetPBM we have to create a temporary image. - // If you try manipulating the original it fails so - // we have to rename the temp file. - copy ($this->dest_folder.'netpbm.tmp', $this->full_dst_path); - unlink ($this->dest_folder.'netpbm.tmp'); - @chmod($dst_image, 0777); - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Image Rotate Using GD - * - * @access public - * @return bool - */ - function image_rotate_gd() - { - // Is Image Rotation Supported? - // this function is only supported as of PHP 4.3 - if ( ! function_exists('imagerotate')) - { - $this->set_error('imglib_rotate_unsupported'); - return FALSE; - } - - // Create the image handle - if ( ! ($src_img = $this->image_create_gd())) - { - return FALSE; - } - - // Set the background color - // This won't work with transparent PNG files so we are - // going to have to figure out how to determine the color - // of the alpha channel in a future release. - - $white = imagecolorallocate($src_img, 255, 255, 255); - - // Rotate it! - $dst_img = imagerotate($src_img, $this->rotation_angle, $white); - - // Save the Image - if ($this->dynamic_output == TRUE) - { - $this->image_display_gd($dst_img); - } - else - { - // Or save it - if ( ! $this->image_save_gd($dst_img)) - { - return FALSE; - } - } - - // Kill the file handles - imagedestroy($dst_img); - imagedestroy($src_img); - - // Set the file to 777 - - @chmod($this->full_dst_path, 0777); - - return true; - } - - // -------------------------------------------------------------------- - - /** - * Create Mirror Image using GD - * - * This function will flip horizontal or vertical - * - * @access public - * @return bool - */ - function image_mirror_gd() - { - if ( ! $src_img = $this->image_create_gd()) - { - return FALSE; - } - - $width = $this->orig_width; - $height = $this->orig_height; - - if ($this->rotation_angle == 'hor') - { - for ($i = 0; $i < $height; $i++) - { - $left = 0; - $right = $width-1; - - while ($left < $right) - { - $cl = imagecolorat($src_img, $left, $i); - $cr = imagecolorat($src_img, $right, $i); - - imagesetpixel($src_img, $left, $i, $cr); - imagesetpixel($src_img, $right, $i, $cl); - - $left++; - $right--; - } - } - } - else - { - for ($i = 0; $i < $width; $i++) - { - $top = 0; - $bot = $height-1; - - while ($top < $bot) - { - $ct = imagecolorat($src_img, $i, $top); - $cb = imagecolorat($src_img, $i, $bot); - - imagesetpixel($src_img, $i, $top, $cb); - imagesetpixel($src_img, $i, $bot, $ct); - - $top++; - $bot--; - } - } - } - - // Show the image - if ($this->dynamic_output == TRUE) - { - $this->image_display_gd($src_img); - } - else - { - // Or save it - if ( ! $this->image_save_gd($src_img)) - { - return FALSE; - } - } - - // Kill the file handles - imagedestroy($src_img); - - // Set the file to 777 - @chmod($this->full_dst_path, 0777); - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Image Watermark - * - * This is a wrapper function that chooses the type - * of watermarking based on the specified preference. - * - * @access public - * @param string - * @return bool - */ - function watermark() - { - if ($this->wm_type == 'overlay') - { - return $this->overlay_watermark(); - } - else - { - return $this->text_watermark(); - } - } - - // -------------------------------------------------------------------- - - /** - * Watermark - Graphic Version - * - * @access public - * @return bool - */ - function overlay_watermark() - { - if ( ! function_exists('imagecolortransparent')) - { - $this->set_error('imglib_gd_required'); - return FALSE; - } - - // Fetch source image properties - $this->get_image_properties(); - - // Fetch watermark image properties - $props = $this->get_image_properties($this->wm_overlay_path, TRUE); - $wm_img_type = $props['image_type']; - $wm_width = $props['width']; - $wm_height = $props['height']; - - // Create two image resources - $wm_img = $this->image_create_gd($this->wm_overlay_path, $wm_img_type); - $src_img = $this->image_create_gd($this->full_src_path); - - // Reverse the offset if necessary - // When the image is positioned at the bottom - // we don't want the vertical offset to push it - // further down. We want the reverse, so we'll - // invert the offset. Same with the horizontal - // offset when the image is at the right - - $this->wm_vrt_alignment = strtoupper(substr($this->wm_vrt_alignment, 0, 1)); - $this->wm_hor_alignment = strtoupper(substr($this->wm_hor_alignment, 0, 1)); - - if ($this->wm_vrt_alignment == 'B') - $this->wm_vrt_offset = $this->wm_vrt_offset * -1; - - if ($this->wm_hor_alignment == 'R') - $this->wm_hor_offset = $this->wm_hor_offset * -1; - - // Set the base x and y axis values - $x_axis = $this->wm_hor_offset + $this->wm_padding; - $y_axis = $this->wm_vrt_offset + $this->wm_padding; - - // Set the vertical position - switch ($this->wm_vrt_alignment) - { - case 'T': - break; - case 'M': $y_axis += ($this->orig_height / 2) - ($wm_height / 2); - break; - case 'B': $y_axis += $this->orig_height - $wm_height; - break; - } - - // Set the horizontal position - switch ($this->wm_hor_alignment) - { - case 'L': - break; - case 'C': $x_axis += ($this->orig_width / 2) - ($wm_width / 2); - break; - case 'R': $x_axis += $this->orig_width - $wm_width; - break; - } - - // Build the finalized image - if ($wm_img_type == 3 AND function_exists('imagealphablending')) - { - @imagealphablending($src_img, TRUE); - } - - // Set RGB values for text and shadow - imagecolortransparent($wm_img, imagecolorat($wm_img, $this->wm_x_transp, $this->wm_y_transp)); - imagecopymerge($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height, $this->wm_opacity); - - // Output the image - if ($this->dynamic_output == TRUE) - { - $this->image_display_gd($src_img); - } - else - { - if ( ! $this->image_save_gd($src_img)) - { - return FALSE; - } - } - - imagedestroy($src_img); - imagedestroy($wm_img); - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Watermark - Text Version - * - * @access public - * @return bool - */ - function text_watermark() - { - if ( ! ($src_img = $this->image_create_gd())) - { - return FALSE; - } - - if ($this->wm_use_truetype == TRUE AND ! file_exists($this->wm_font_path)) - { - $this->set_error('imglib_missing_font'); - return FALSE; - } - - // Fetch source image properties - $this->get_image_properties(); - - // Set RGB values for text and shadow - $this->wm_font_color = str_replace('#', '', $this->wm_font_color); - $this->wm_shadow_color = str_replace('#', '', $this->wm_shadow_color); - - $R1 = hexdec(substr($this->wm_font_color, 0, 2)); - $G1 = hexdec(substr($this->wm_font_color, 2, 2)); - $B1 = hexdec(substr($this->wm_font_color, 4, 2)); - - $R2 = hexdec(substr($this->wm_shadow_color, 0, 2)); - $G2 = hexdec(substr($this->wm_shadow_color, 2, 2)); - $B2 = hexdec(substr($this->wm_shadow_color, 4, 2)); - - $txt_color = imagecolorclosest($src_img, $R1, $G1, $B1); - $drp_color = imagecolorclosest($src_img, $R2, $G2, $B2); - - // Reverse the vertical offset - // When the image is positioned at the bottom - // we don't want the vertical offset to push it - // further down. We want the reverse, so we'll - // invert the offset. Note: The horizontal - // offset flips itself automatically - - if ($this->wm_vrt_alignment == 'B') - $this->wm_vrt_offset = $this->wm_vrt_offset * -1; - - if ($this->wm_hor_alignment == 'R') - $this->wm_hor_offset = $this->wm_hor_offset * -1; - - // Set font width and height - // These are calculated differently depending on - // whether we are using the true type font or not - if ($this->wm_use_truetype == TRUE) - { - if ($this->wm_font_size == '') - $this->wm_font_size = '17'; - - $fontwidth = $this->wm_font_size-($this->wm_font_size/4); - $fontheight = $this->wm_font_size; - $this->wm_vrt_offset += $this->wm_font_size; - } - else - { - $fontwidth = imagefontwidth($this->wm_font_size); - $fontheight = imagefontheight($this->wm_font_size); - } - - // Set base X and Y axis values - $x_axis = $this->wm_hor_offset + $this->wm_padding; - $y_axis = $this->wm_vrt_offset + $this->wm_padding; - - // Set verticle alignment - if ($this->wm_use_drop_shadow == FALSE) - $this->wm_shadow_distance = 0; - - $this->wm_vrt_alignment = strtoupper(substr($this->wm_vrt_alignment, 0, 1)); - $this->wm_hor_alignment = strtoupper(substr($this->wm_hor_alignment, 0, 1)); - - switch ($this->wm_vrt_alignment) - { - case "T" : - break; - case "M": $y_axis += ($this->orig_height/2)+($fontheight/2); - break; - case "B": $y_axis += ($this->orig_height - $fontheight - $this->wm_shadow_distance - ($fontheight/2)); - break; - } - - $x_shad = $x_axis + $this->wm_shadow_distance; - $y_shad = $y_axis + $this->wm_shadow_distance; - - // Set horizontal alignment - switch ($this->wm_hor_alignment) - { - case "L": - break; - case "R": - if ($this->wm_use_drop_shadow) - $x_shad += ($this->orig_width - $fontwidth*strlen($this->wm_text)); - $x_axis += ($this->orig_width - $fontwidth*strlen($this->wm_text)); - break; - case "C": - if ($this->wm_use_drop_shadow) - $x_shad += floor(($this->orig_width - $fontwidth*strlen($this->wm_text))/2); - $x_axis += floor(($this->orig_width -$fontwidth*strlen($this->wm_text))/2); - break; - } - - // Add the text to the source image - if ($this->wm_use_truetype) - { - if ($this->wm_use_drop_shadow) - imagettftext($src_img, $this->wm_font_size, 0, $x_shad, $y_shad, $drp_color, $this->wm_font_path, $this->wm_text); - imagettftext($src_img, $this->wm_font_size, 0, $x_axis, $y_axis, $txt_color, $this->wm_font_path, $this->wm_text); - } - else - { - if ($this->wm_use_drop_shadow) - imagestring($src_img, $this->wm_font_size, $x_shad, $y_shad, $this->wm_text, $drp_color); - imagestring($src_img, $this->wm_font_size, $x_axis, $y_axis, $this->wm_text, $txt_color); - } - - // Output the final image - if ($this->dynamic_output == TRUE) - { - $this->image_display_gd($src_img); - } - else - { - $this->image_save_gd($src_img); - } - - imagedestroy($src_img); - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Create Image - GD - * - * This simply creates an image resource handle - * based on the type of image being processed - * - * @access public - * @param string - * @return resource - */ - function image_create_gd($path = '', $image_type = '') - { - if ($path == '') - $path = $this->full_src_path; - - if ($image_type == '') - $image_type = $this->image_type; - - - switch ($image_type) - { - case 1 : - if ( ! function_exists('imagecreatefromgif')) - { - $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_gif_not_supported')); - return FALSE; - } - - return imagecreatefromgif($path); - break; - case 2 : - if ( ! function_exists('imagecreatefromjpeg')) - { - $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_jpg_not_supported')); - return FALSE; - } - - return imagecreatefromjpeg($path); - break; - case 3 : - if ( ! function_exists('imagecreatefrompng')) - { - $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_png_not_supported')); - return FALSE; - } - - return imagecreatefrompng($path); - break; - - } - - $this->set_error(array('imglib_unsupported_imagecreate')); - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Write image file to disk - GD - * - * Takes an image resource as input and writes the file - * to the specified destination - * - * @access public - * @param resource - * @return bool - */ - function image_save_gd($resource) - { - switch ($this->image_type) - { - case 1 : - if ( ! function_exists('imagegif')) - { - $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_gif_not_supported')); - return FALSE; - } - - @imagegif($resource, $this->full_dst_path); - break; - case 2 : - if ( ! function_exists('imagejpeg')) - { - $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_jpg_not_supported')); - return FALSE; - } - - if (phpversion() == '4.4.1') - { - @touch($this->full_dst_path); // PHP 4.4.1 bug #35060 - workaround - } - - @imagejpeg($resource, $this->full_dst_path, $this->quality); - break; - case 3 : - if ( ! function_exists('imagepng')) - { - $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_png_not_supported')); - return FALSE; - } - - @imagepng($resource, $this->full_dst_path); - break; - default : - $this->set_error(array('imglib_unsupported_imagecreate')); - return FALSE; - break; - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Dynamically outputs an image - * - * @access public - * @param resource - * @return void - */ - function image_display_gd($resource) - { - header("Content-Disposition: filename={$this->source_image};"); - header("Content-Type: {$this->mime_type}"); - header('Content-Transfer-Encoding: binary'); - header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT'); - - switch ($this->image_type) - { - case 1 : imagegif($resource); - break; - case 2 : imagejpeg($resource, '', $this->quality); - break; - case 3 : imagepng($resource); - break; - default : echo 'Unable to display the image'; - break; - } - } - - // -------------------------------------------------------------------- - - /** - * Re-proportion Image Width/Height - * - * When creating thumbs, the desired width/height - * can end up warping the image due to an incorrect - * ratio between the full-sized image and the thumb. - * - * This function lets us re-proportion the width/height - * if users choose to maintain the aspect ratio when resizing. - * - * @access public - * @return void - */ - function image_reproportion() - { - if ( ! is_numeric($this->width) OR ! is_numeric($this->height) OR $this->width == 0 OR $this->height == 0) - return; - - if ( ! is_numeric($this->orig_width) OR ! is_numeric($this->orig_height) OR $this->orig_width == 0 OR $this->orig_height == 0) - return; - - $new_width = ceil($this->orig_width*$this->height/$this->orig_height); - $new_height = ceil($this->width*$this->orig_height/$this->orig_width); - - $ratio = (($this->orig_height/$this->orig_width) - ($this->height/$this->width)); - - if ($this->master_dim != 'width' AND $this->master_dim != 'height') - { - $this->master_dim = ($ratio < 0) ? 'width' : 'height'; - } - - if (($this->width != $new_width) AND ($this->height != $new_height)) - { - if ($this->master_dim == 'height') - { - $this->width = $new_width; - } - else - { - $this->height = $new_height; - } - } - } - - // -------------------------------------------------------------------- - - /** - * Get image properties - * - * A helper function that gets info about the file - * - * @access public - * @param string - * @return mixed - */ - function get_image_properties($path = '', $return = FALSE) - { - // For now we require GD but we should - // find a way to determine this using IM or NetPBM - - if ($path == '') - $path = $this->full_src_path; - - if ( ! file_exists($path)) - { - $this->set_error('imglib_invalid_path'); - return FALSE; - } - - $vals = @getimagesize($path); - - $types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png'); - - $mime = (isset($types[$vals['2']])) ? 'image/'.$types[$vals['2']] : 'image/jpg'; - - if ($return == TRUE) - { - $v['width'] = $vals['0']; - $v['height'] = $vals['1']; - $v['image_type'] = $vals['2']; - $v['size_str'] = $vals['3']; - $v['mime_type'] = $mime; - - return $v; - } - - $this->orig_width = $vals['0']; - $this->orig_height = $vals['1']; - $this->image_type = $vals['2']; - $this->size_str = $vals['3']; - $this->mime_type = $mime; - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Size calculator - * - * This function takes a known width x height and - * recalculates it to a new size. Only one - * new variable needs to be known - * - * $props = array( - * 'width' => $width, - * 'height' => $height, - * 'new_width' => 40, - * 'new_height' => '' - * ); - * - * @access public - * @param array - * @return array - */ - function size_calculator($vals) - { - if ( ! is_array($vals)) - return; - - $allowed = array('new_width', 'new_height', 'width', 'height'); - - foreach ($allowed as $item) - { - if ( ! isset($vals[$item]) OR $vals[$item] == '') - $vals[$item] = 0; - } - - if ($vals['width'] == 0 OR $vals['height'] == 0) - { - return $vals; - } - - if ($vals['new_width'] == 0) - { - $vals['new_width'] = ceil($vals['width']*$vals['new_height']/$vals['height']); - } - elseif ($vals['new_height'] == 0) - { - $vals['new_height'] = ceil($vals['new_width']*$vals['height']/$vals['width']); - } - - return $vals; - } - - // -------------------------------------------------------------------- - - /** - * Explode source_image - * - * This is a helper function that extracts the extension - * from the source_image. This function lets us deal with - * source_images with multiple periods, like: my.cool.jpg - * It returns an associative array with two elements: - * $array['ext'] = '.jpg'; - * $array['name'] = 'my.cool'; - * - * @access public - * @param array - * @return array - */ - function explode_name($source_image) - { - $x = explode('.', $source_image); - $ret['ext'] = '.'.end($x); - - $name = ''; - - $ct = count($x)-1; - - for ($i = 0; $i < $ct; $i++) - { - $name .= $x[$i]; - - if ($i < ($ct - 1)) - { - $name .= '.'; - } - } - - $ret['name'] = $name; - - return $ret; - } - - // -------------------------------------------------------------------- - - /** - * Is GD Installed? - * - * @access public - * @return bool - */ - function gd_loaded() - { - if ( ! extension_loaded('gd')) - { - if ( ! dl('gd.so')) - { - return FALSE; - } - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Get GD version - * - * @access public - * @return mixed - */ - function gd_version() - { - if (function_exists('gd_info')) - { - $gd_version = @gd_info(); - $gd_version = preg_replace("/\D/", "", $gd_version['GD Version']); - - return $gd_version; - } - - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Set error message - * - * @access public - * @param string - * @return void - */ - function set_error($msg) - { - $CI =& get_instance(); - $CI->lang->load('imglib'); - - if (is_array($msg)) - { - foreach ($msg as $val) - { - - $msg = ($CI->lang->line($val) == FALSE) ? $val : $CI->lang->line($val); - $this->error_msg[] = $msg; - log_message('error', $msg); - } - } - else - { - $msg = ($CI->lang->line($msg) == FALSE) ? $msg : $CI->lang->line($msg); - $this->error_msg[] = $msg; - log_message('error', $msg); - } - } - - // -------------------------------------------------------------------- - - /** - * Show error messages - * - * @access public - * @param string - * @return string - */ - function display_errors($open = '

              ', $close = '

              ') - { - $str = ''; - foreach ($this->error_msg as $val) - { - $str .= $open.$val.$close; - } - - return $str; - } - -} -// END Image_lib Class + 0) + { + $this->initialize($props); + } + + log_message('debug', "Image Lib Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * Initialize image properties + * + * Resets values in case this class is used in a loop + * + * @access public + * @return void + */ + function clear() + { + $props = array('source_folder', 'dest_folder', 'source_image', 'full_src_path', 'full_dst_path', 'new_image', 'image_type', 'size_str', 'quality', 'orig_width', 'orig_height', 'rotation_angle', 'x_axis', 'y_axis', 'create_fnc', 'copy_fnc', 'wm_overlay_path', 'wm_use_truetype', 'dynamic_output', 'wm_font_size', 'wm_text', 'wm_vrt_alignment', 'wm_hor_alignment', 'wm_padding', 'wm_hor_offset', 'wm_vrt_offset', 'wm_font_color', 'wm_use_drop_shadow', 'wm_shadow_color', 'wm_shadow_distance', 'wm_opacity'); + + foreach ($props as $val) + { + $this->$val = ''; + } + } + + // -------------------------------------------------------------------- + + /** + * initialize image preferences + * + * @access public + * @param array + * @return void + */ + function initialize($props = array()) + { + /* + * Convert array elements into class variables + */ + if (count($props) > 0) + { + foreach ($props as $key => $val) + { + $this->$key = $val; + } + } + + /* + * Is there a source image? + * + * If not, there's no reason to continue + * + */ + if ($this->source_image == '') + { + $this->set_error('imglib_source_image_required'); + return FALSE; + } + + /* + * Is getimagesize() Available? + * + * We use it to determine the image properties (width/height). + * Note: We need to figure out how to determine image + * properties using ImageMagick and NetPBM + * + */ + if ( ! function_exists('getimagesize')) + { + $this->set_error('imglib_gd_required_for_props'); + return FALSE; + } + + $this->image_library = strtolower($this->image_library); + + /* + * Set the full server path + * + * The source image may or may not contain a path. + * Either way, we'll try use realpath to generate the + * full server path in order to more reliably read it. + * + */ + if (function_exists('realpath') AND @realpath($this->source_image) !== FALSE) + { + $full_source_path = str_replace("\\", "/", realpath($this->source_image)); + } + else + { + $full_source_path = $this->source_image; + } + + $x = explode('/', $full_source_path); + $this->source_image = end($x); + $this->source_folder = str_replace($this->source_image, '', $full_source_path); + + // Set the Image Properties + if ( ! $this->get_image_properties($this->source_folder.$this->source_image)) + { + return FALSE; + } + + /* + * Assign the "new" image name/path + * + * If the user has set a "new_image" name it means + * we are making a copy of the source image. If not + * it means we are altering the original. We'll + * set the destination filename and path accordingly. + * + */ + if ($this->new_image == '') + { + $this->dest_image = $this->source_image; + $this->dest_folder = $this->source_folder; + } + else + { + if (strpos($this->new_image, '/') === FALSE) + { + $this->dest_folder = $this->source_folder; + $this->dest_image = $this->new_image; + } + else + { + if (function_exists('realpath') AND @realpath($this->new_image) !== FALSE) + { + $full_dest_path = str_replace("\\", "/", realpath($this->new_image)); + } + else + { + $full_dest_path = $this->new_image; + } + + // Is there a file name? + if ( ! preg_match("#[\.jpg|\.jpeg|\.gif|\.png]$#i", $full_dest_path)) + { + $this->dest_folder = $full_dest_path.'/'; + $this->dest_image = $this->source_image; + } + else + { + $x = explode('/', $full_dest_path); + $this->dest_image = end($x); + $this->dest_folder = str_replace($this->dest_image, '', $full_dest_path); + } + } + } + + /* + * Compile the finalized filenames/paths + * + * We'll create two master strings containing the + * full server path to the source image and the + * full server path to the destination image. + * We'll also split the destination image name + * so we can insert the thumbnail marker if needed. + * + */ + if ($this->create_thumb === FALSE OR $this->thumb_marker == '') + { + $this->thumb_marker = ''; + } + + $xp = $this->explode_name($this->dest_image); + + $filename = $xp['name']; + $file_ext = $xp['ext']; + + $this->full_src_path = $this->source_folder.$this->source_image; + $this->full_dst_path = $this->dest_folder.$filename.$this->thumb_marker.$file_ext; + + /* + * Should we maintain image proportions? + * + * When creating thumbs or copies, the target width/height + * might not be in correct proportion with the source + * image's width/height. We'll recalculate it here. + * + */ + if ($this->maintain_ratio === TRUE && ($this->width != '' AND $this->height != '')) + { + $this->image_reproportion(); + } + + /* + * Was a width and height specified? + * + * If the destination width/height was + * not submitted we will use the values + * from the actual file + * + */ + if ($this->width == '') + $this->width = $this->orig_width; + + if ($this->height == '') + $this->height = $this->orig_height; + + // Set the quality + $this->quality = trim(str_replace("%", "", $this->quality)); + + if ($this->quality == '' OR $this->quality == 0 OR ! is_numeric($this->quality)) + $this->quality = 90; + + // Set the x/y coordinates + $this->x_axis = ($this->x_axis == '' OR ! is_numeric($this->x_axis)) ? 0 : $this->x_axis; + $this->y_axis = ($this->y_axis == '' OR ! is_numeric($this->y_axis)) ? 0 : $this->y_axis; + + // Watermark-related Stuff... + if ($this->wm_font_color != '') + { + if (strlen($this->wm_font_color) == 6) + { + $this->wm_font_color = '#'.$this->wm_font_color; + } + } + + if ($this->wm_shadow_color != '') + { + if (strlen($this->wm_shadow_color) == 6) + { + $this->wm_shadow_color = '#'.$this->wm_shadow_color; + } + } + + if ($this->wm_overlay_path != '') + { + $this->wm_overlay_path = str_replace("\\", "/", realpath($this->wm_overlay_path)); + } + + if ($this->wm_shadow_color != '') + { + $this->wm_use_drop_shadow = TRUE; + } + + if ($this->wm_font_path != '') + { + $this->wm_use_truetype = TRUE; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Image Resize + * + * This is a wrapper function that chooses the proper + * resize function based on the protocol specified + * + * @access public + * @return bool + */ + function resize() + { + $protocol = 'image_process_'.$this->image_library; + + if (eregi("gd2$", $protocol)) + { + $protocol = 'image_process_gd'; + } + + return $this->$protocol('resize'); + } + + // -------------------------------------------------------------------- + + /** + * Image Crop + * + * This is a wrapper function that chooses the proper + * cropping function based on the protocol specified + * + * @access public + * @return bool + */ + function crop() + { + $protocol = 'image_process_'.$this->image_library; + + if (eregi("gd2$", $protocol)) + { + $protocol = 'image_process_gd'; + } + + return $this->$protocol('crop'); + } + + // -------------------------------------------------------------------- + + /** + * Image Rotate + * + * This is a wrapper function that chooses the proper + * rotation function based on the protocol specified + * + * @access public + * @return bool + */ + function rotate() + { + // Allowed rotation values + $degs = array(90, 180, 270, 'vrt', 'hor'); + + if ($this->rotation_angle == '' OR ! in_array($this->rotation_angle, $degs, TRUE)) + { + $this->set_error('imglib_rotation_angle_required'); + return FALSE; + } + + // Reassign the width and height + if ($this->rotation_angle == 90 OR $this->rotation_angle == 270) + { + $this->width = $this->orig_height; + $this->height = $this->orig_width; + } + else + { + $this->width = $this->orig_width; + $this->height = $this->orig_height; + } + + + // Choose resizing function + if ($this->image_library == 'imagemagick' OR $this->image_library == 'netpbm') + { + $protocol = 'image_process_'.$this->image_library; + + return $this->$protocol('rotate'); + } + + if ($this->rotation_angle == 'hor' OR $this->rotation_angle == 'vrt') + { + return $this->image_mirror_gd(); + } + else + { + return $this->image_rotate_gd(); + } + } + + // -------------------------------------------------------------------- + + /** + * Image Process Using GD/GD2 + * + * This function will resize or crop + * + * @access public + * @param string + * @return bool + */ + function image_process_gd($action = 'resize') + { + $v2_override = FALSE; + + if ($action == 'crop') + { + // If the target width/height match the source then it's pointless to crop, right? + if ($this->width >= $this->orig_width AND $this->height >= $this->orig_height) + { + // We'll return true so the user thinks the process succeeded. + // It'll be our little secret... + + return TRUE; + } + + // Reassign the source width/height if cropping + $this->orig_width = $this->width; + $this->orig_height = $this->height; + + // GD 2.0 has a cropping bug so we'll test for it + if ($this->gd_version() !== FALSE) + { + $gd_version = str_replace('0', '', $this->gd_version()); + $v2_override = ($gd_version == 2) ? TRUE : FALSE; + } + } + else + { + // If the target width/height match the source, AND if + // the new file name is not equal to the old file name + // we'll simply make a copy of the original with the new name + if (($this->orig_width == $this->width AND $this->orig_height == $this->height) AND ($this->source_image != $this->dest_image)) + { + if ( ! @copy($this->full_src_path, $this->full_dst_path)) + { + $this->set_error('imglib_copy_failed'); + return FALSE; + } + + @chmod($this->full_dst_path, 0777); + return TRUE; + } + + // If resizing the x/y axis must be zero + $this->x_axis = 0; + $this->y_axis = 0; + } + + // Create the image handle + if ( ! ($src_img = $this->image_create_gd())) + { + return FALSE; + } + + // Create The Image + if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor') AND $v2_override == FALSE) + { + $create = 'imagecreatetruecolor'; + $copy = 'imagecopyresampled'; + } + else + { + $create = 'imagecreate'; + $copy = 'imagecopyresized'; + } + + $dst_img = $create($this->width, $this->height); + $copy($dst_img, $src_img, 0, 0, $this->x_axis, $this->y_axis, $this->width, $this->height, $this->orig_width, $this->orig_height); + + // Show the image + if ($this->dynamic_output == TRUE) + { + $this->image_display_gd($dst_img); + } + else + { + // Or save it + if ( ! $this->image_save_gd($dst_img)) + { + return FALSE; + } + } + + // Kill the file handles + imagedestroy($dst_img); + imagedestroy($src_img); + + // Set the file to 777 + @chmod($this->full_dst_path, 0777); + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Image Process Using ImageMagick + * + * This function will resize, crop or rotate + * + * @access public + * @param string + * @return bool + */ + function image_process_imagemagick($action = 'resize') + { + // Do we have a vaild library path? + if ($this->library_path == '') + { + $this->set_error('imglib_libpath_invalid'); + return FALSE; + } + + if ( ! eregi("convert$", $this->library_path)) + { + if ( ! eregi("/$", $this->library_path)) $this->library_path .= "/"; + + $this->library_path .= 'convert'; + } + + // Execute the command + $cmd = $this->library_path." -quality ".$this->quality; + + if ($action == 'crop') + { + $cmd .= " -crop ".$this->width."x".$this->height."+".$this->x_axis."+".$this->y_axis." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1"; + } + elseif ($action == 'rotate') + { + switch ($this->rotation_angle) + { + case 'hor' : $angle = '-flop'; + break; + case 'vrt' : $angle = '-flip'; + break; + default : $angle = '-rotate '.$this->rotation_angle; + break; + } + + $cmd .= " ".$angle." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1"; + } + else // Resize + { + $cmd .= " -resize ".$this->width."x".$this->height." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1"; + } + + $retval = 1; + + @exec($cmd, $output, $retval); + + // Did it work? + if ($retval > 0) + { + $this->set_error('imglib_image_process_failed'); + return FALSE; + } + + // Set the file to 777 + @chmod($this->full_dst_path, 0777); + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Image Process Using NetPBM + * + * This function will resize, crop or rotate + * + * @access public + * @param string + * @return bool + */ + function image_process_netpbm($action = 'resize') + { + if ($this->library_path == '') + { + $this->set_error('imglib_libpath_invalid'); + return FALSE; + } + + // Build the resizing command + switch ($this->image_type) + { + case 1 : + $cmd_in = 'giftopnm'; + $cmd_out = 'ppmtogif'; + break; + case 2 : + $cmd_in = 'jpegtopnm'; + $cmd_out = 'ppmtojpeg'; + break; + case 3 : + $cmd_in = 'pngtopnm'; + $cmd_out = 'ppmtopng'; + break; + } + + if ($action == 'crop') + { + $cmd_inner = 'pnmcut -left '.$this->x_axis.' -top '.$this->y_axis.' -width '.$this->width.' -height '.$this->height; + } + elseif ($action == 'rotate') + { + switch ($this->rotation_angle) + { + case 90 : $angle = 'r270'; + break; + case 180 : $angle = 'r180'; + break; + case 270 : $angle = 'r90'; + break; + case 'vrt' : $angle = 'tb'; + break; + case 'hor' : $angle = 'lr'; + break; + } + + $cmd_inner = 'pnmflip -'.$angle.' '; + } + else // Resize + { + $cmd_inner = 'pnmscale -xysize '.$this->width.' '.$this->height; + } + + $cmd = $this->library_path.$cmd_in.' '.$this->full_src_path.' | '.$cmd_inner.' | '.$cmd_out.' > '.$this->dest_folder.'netpbm.tmp'; + + $retval = 1; + + @exec($cmd, $output, $retval); + + // Did it work? + if ($retval > 0) + { + $this->set_error('imglib_image_process_failed'); + return FALSE; + } + + // With NetPBM we have to create a temporary image. + // If you try manipulating the original it fails so + // we have to rename the temp file. + copy ($this->dest_folder.'netpbm.tmp', $this->full_dst_path); + unlink ($this->dest_folder.'netpbm.tmp'); + @chmod($dst_image, 0777); + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Image Rotate Using GD + * + * @access public + * @return bool + */ + function image_rotate_gd() + { + // Is Image Rotation Supported? + // this function is only supported as of PHP 4.3 + if ( ! function_exists('imagerotate')) + { + $this->set_error('imglib_rotate_unsupported'); + return FALSE; + } + + // Create the image handle + if ( ! ($src_img = $this->image_create_gd())) + { + return FALSE; + } + + // Set the background color + // This won't work with transparent PNG files so we are + // going to have to figure out how to determine the color + // of the alpha channel in a future release. + + $white = imagecolorallocate($src_img, 255, 255, 255); + + // Rotate it! + $dst_img = imagerotate($src_img, $this->rotation_angle, $white); + + // Save the Image + if ($this->dynamic_output == TRUE) + { + $this->image_display_gd($dst_img); + } + else + { + // Or save it + if ( ! $this->image_save_gd($dst_img)) + { + return FALSE; + } + } + + // Kill the file handles + imagedestroy($dst_img); + imagedestroy($src_img); + + // Set the file to 777 + + @chmod($this->full_dst_path, 0777); + + return true; + } + + // -------------------------------------------------------------------- + + /** + * Create Mirror Image using GD + * + * This function will flip horizontal or vertical + * + * @access public + * @return bool + */ + function image_mirror_gd() + { + if ( ! $src_img = $this->image_create_gd()) + { + return FALSE; + } + + $width = $this->orig_width; + $height = $this->orig_height; + + if ($this->rotation_angle == 'hor') + { + for ($i = 0; $i < $height; $i++) + { + $left = 0; + $right = $width-1; + + while ($left < $right) + { + $cl = imagecolorat($src_img, $left, $i); + $cr = imagecolorat($src_img, $right, $i); + + imagesetpixel($src_img, $left, $i, $cr); + imagesetpixel($src_img, $right, $i, $cl); + + $left++; + $right--; + } + } + } + else + { + for ($i = 0; $i < $width; $i++) + { + $top = 0; + $bot = $height-1; + + while ($top < $bot) + { + $ct = imagecolorat($src_img, $i, $top); + $cb = imagecolorat($src_img, $i, $bot); + + imagesetpixel($src_img, $i, $top, $cb); + imagesetpixel($src_img, $i, $bot, $ct); + + $top++; + $bot--; + } + } + } + + // Show the image + if ($this->dynamic_output == TRUE) + { + $this->image_display_gd($src_img); + } + else + { + // Or save it + if ( ! $this->image_save_gd($src_img)) + { + return FALSE; + } + } + + // Kill the file handles + imagedestroy($src_img); + + // Set the file to 777 + @chmod($this->full_dst_path, 0777); + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Image Watermark + * + * This is a wrapper function that chooses the type + * of watermarking based on the specified preference. + * + * @access public + * @param string + * @return bool + */ + function watermark() + { + if ($this->wm_type == 'overlay') + { + return $this->overlay_watermark(); + } + else + { + return $this->text_watermark(); + } + } + + // -------------------------------------------------------------------- + + /** + * Watermark - Graphic Version + * + * @access public + * @return bool + */ + function overlay_watermark() + { + if ( ! function_exists('imagecolortransparent')) + { + $this->set_error('imglib_gd_required'); + return FALSE; + } + + // Fetch source image properties + $this->get_image_properties(); + + // Fetch watermark image properties + $props = $this->get_image_properties($this->wm_overlay_path, TRUE); + $wm_img_type = $props['image_type']; + $wm_width = $props['width']; + $wm_height = $props['height']; + + // Create two image resources + $wm_img = $this->image_create_gd($this->wm_overlay_path, $wm_img_type); + $src_img = $this->image_create_gd($this->full_src_path); + + // Reverse the offset if necessary + // When the image is positioned at the bottom + // we don't want the vertical offset to push it + // further down. We want the reverse, so we'll + // invert the offset. Same with the horizontal + // offset when the image is at the right + + $this->wm_vrt_alignment = strtoupper(substr($this->wm_vrt_alignment, 0, 1)); + $this->wm_hor_alignment = strtoupper(substr($this->wm_hor_alignment, 0, 1)); + + if ($this->wm_vrt_alignment == 'B') + $this->wm_vrt_offset = $this->wm_vrt_offset * -1; + + if ($this->wm_hor_alignment == 'R') + $this->wm_hor_offset = $this->wm_hor_offset * -1; + + // Set the base x and y axis values + $x_axis = $this->wm_hor_offset + $this->wm_padding; + $y_axis = $this->wm_vrt_offset + $this->wm_padding; + + // Set the vertical position + switch ($this->wm_vrt_alignment) + { + case 'T': + break; + case 'M': $y_axis += ($this->orig_height / 2) - ($wm_height / 2); + break; + case 'B': $y_axis += $this->orig_height - $wm_height; + break; + } + + // Set the horizontal position + switch ($this->wm_hor_alignment) + { + case 'L': + break; + case 'C': $x_axis += ($this->orig_width / 2) - ($wm_width / 2); + break; + case 'R': $x_axis += $this->orig_width - $wm_width; + break; + } + + // Build the finalized image + if ($wm_img_type == 3 AND function_exists('imagealphablending')) + { + @imagealphablending($src_img, TRUE); + } + + // Set RGB values for text and shadow + imagecolortransparent($wm_img, imagecolorat($wm_img, $this->wm_x_transp, $this->wm_y_transp)); + imagecopymerge($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height, $this->wm_opacity); + + // Output the image + if ($this->dynamic_output == TRUE) + { + $this->image_display_gd($src_img); + } + else + { + if ( ! $this->image_save_gd($src_img)) + { + return FALSE; + } + } + + imagedestroy($src_img); + imagedestroy($wm_img); + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Watermark - Text Version + * + * @access public + * @return bool + */ + function text_watermark() + { + if ( ! ($src_img = $this->image_create_gd())) + { + return FALSE; + } + + if ($this->wm_use_truetype == TRUE AND ! file_exists($this->wm_font_path)) + { + $this->set_error('imglib_missing_font'); + return FALSE; + } + + // Fetch source image properties + $this->get_image_properties(); + + // Set RGB values for text and shadow + $this->wm_font_color = str_replace('#', '', $this->wm_font_color); + $this->wm_shadow_color = str_replace('#', '', $this->wm_shadow_color); + + $R1 = hexdec(substr($this->wm_font_color, 0, 2)); + $G1 = hexdec(substr($this->wm_font_color, 2, 2)); + $B1 = hexdec(substr($this->wm_font_color, 4, 2)); + + $R2 = hexdec(substr($this->wm_shadow_color, 0, 2)); + $G2 = hexdec(substr($this->wm_shadow_color, 2, 2)); + $B2 = hexdec(substr($this->wm_shadow_color, 4, 2)); + + $txt_color = imagecolorclosest($src_img, $R1, $G1, $B1); + $drp_color = imagecolorclosest($src_img, $R2, $G2, $B2); + + // Reverse the vertical offset + // When the image is positioned at the bottom + // we don't want the vertical offset to push it + // further down. We want the reverse, so we'll + // invert the offset. Note: The horizontal + // offset flips itself automatically + + if ($this->wm_vrt_alignment == 'B') + $this->wm_vrt_offset = $this->wm_vrt_offset * -1; + + if ($this->wm_hor_alignment == 'R') + $this->wm_hor_offset = $this->wm_hor_offset * -1; + + // Set font width and height + // These are calculated differently depending on + // whether we are using the true type font or not + if ($this->wm_use_truetype == TRUE) + { + if ($this->wm_font_size == '') + $this->wm_font_size = '17'; + + $fontwidth = $this->wm_font_size-($this->wm_font_size/4); + $fontheight = $this->wm_font_size; + $this->wm_vrt_offset += $this->wm_font_size; + } + else + { + $fontwidth = imagefontwidth($this->wm_font_size); + $fontheight = imagefontheight($this->wm_font_size); + } + + // Set base X and Y axis values + $x_axis = $this->wm_hor_offset + $this->wm_padding; + $y_axis = $this->wm_vrt_offset + $this->wm_padding; + + // Set verticle alignment + if ($this->wm_use_drop_shadow == FALSE) + $this->wm_shadow_distance = 0; + + $this->wm_vrt_alignment = strtoupper(substr($this->wm_vrt_alignment, 0, 1)); + $this->wm_hor_alignment = strtoupper(substr($this->wm_hor_alignment, 0, 1)); + + switch ($this->wm_vrt_alignment) + { + case "T" : + break; + case "M": $y_axis += ($this->orig_height/2)+($fontheight/2); + break; + case "B": $y_axis += ($this->orig_height - $fontheight - $this->wm_shadow_distance - ($fontheight/2)); + break; + } + + $x_shad = $x_axis + $this->wm_shadow_distance; + $y_shad = $y_axis + $this->wm_shadow_distance; + + // Set horizontal alignment + switch ($this->wm_hor_alignment) + { + case "L": + break; + case "R": + if ($this->wm_use_drop_shadow) + $x_shad += ($this->orig_width - $fontwidth*strlen($this->wm_text)); + $x_axis += ($this->orig_width - $fontwidth*strlen($this->wm_text)); + break; + case "C": + if ($this->wm_use_drop_shadow) + $x_shad += floor(($this->orig_width - $fontwidth*strlen($this->wm_text))/2); + $x_axis += floor(($this->orig_width -$fontwidth*strlen($this->wm_text))/2); + break; + } + + // Add the text to the source image + if ($this->wm_use_truetype) + { + if ($this->wm_use_drop_shadow) + imagettftext($src_img, $this->wm_font_size, 0, $x_shad, $y_shad, $drp_color, $this->wm_font_path, $this->wm_text); + imagettftext($src_img, $this->wm_font_size, 0, $x_axis, $y_axis, $txt_color, $this->wm_font_path, $this->wm_text); + } + else + { + if ($this->wm_use_drop_shadow) + imagestring($src_img, $this->wm_font_size, $x_shad, $y_shad, $this->wm_text, $drp_color); + imagestring($src_img, $this->wm_font_size, $x_axis, $y_axis, $this->wm_text, $txt_color); + } + + // Output the final image + if ($this->dynamic_output == TRUE) + { + $this->image_display_gd($src_img); + } + else + { + $this->image_save_gd($src_img); + } + + imagedestroy($src_img); + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Create Image - GD + * + * This simply creates an image resource handle + * based on the type of image being processed + * + * @access public + * @param string + * @return resource + */ + function image_create_gd($path = '', $image_type = '') + { + if ($path == '') + $path = $this->full_src_path; + + if ($image_type == '') + $image_type = $this->image_type; + + + switch ($image_type) + { + case 1 : + if ( ! function_exists('imagecreatefromgif')) + { + $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_gif_not_supported')); + return FALSE; + } + + return imagecreatefromgif($path); + break; + case 2 : + if ( ! function_exists('imagecreatefromjpeg')) + { + $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_jpg_not_supported')); + return FALSE; + } + + return imagecreatefromjpeg($path); + break; + case 3 : + if ( ! function_exists('imagecreatefrompng')) + { + $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_png_not_supported')); + return FALSE; + } + + return imagecreatefrompng($path); + break; + + } + + $this->set_error(array('imglib_unsupported_imagecreate')); + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Write image file to disk - GD + * + * Takes an image resource as input and writes the file + * to the specified destination + * + * @access public + * @param resource + * @return bool + */ + function image_save_gd($resource) + { + switch ($this->image_type) + { + case 1 : + if ( ! function_exists('imagegif')) + { + $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_gif_not_supported')); + return FALSE; + } + + @imagegif($resource, $this->full_dst_path); + break; + case 2 : + if ( ! function_exists('imagejpeg')) + { + $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_jpg_not_supported')); + return FALSE; + } + + if (phpversion() == '4.4.1') + { + @touch($this->full_dst_path); // PHP 4.4.1 bug #35060 - workaround + } + + @imagejpeg($resource, $this->full_dst_path, $this->quality); + break; + case 3 : + if ( ! function_exists('imagepng')) + { + $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_png_not_supported')); + return FALSE; + } + + @imagepng($resource, $this->full_dst_path); + break; + default : + $this->set_error(array('imglib_unsupported_imagecreate')); + return FALSE; + break; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Dynamically outputs an image + * + * @access public + * @param resource + * @return void + */ + function image_display_gd($resource) + { + header("Content-Disposition: filename={$this->source_image};"); + header("Content-Type: {$this->mime_type}"); + header('Content-Transfer-Encoding: binary'); + header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT'); + + switch ($this->image_type) + { + case 1 : imagegif($resource); + break; + case 2 : imagejpeg($resource, '', $this->quality); + break; + case 3 : imagepng($resource); + break; + default : echo 'Unable to display the image'; + break; + } + } + + // -------------------------------------------------------------------- + + /** + * Re-proportion Image Width/Height + * + * When creating thumbs, the desired width/height + * can end up warping the image due to an incorrect + * ratio between the full-sized image and the thumb. + * + * This function lets us re-proportion the width/height + * if users choose to maintain the aspect ratio when resizing. + * + * @access public + * @return void + */ + function image_reproportion() + { + if ( ! is_numeric($this->width) OR ! is_numeric($this->height) OR $this->width == 0 OR $this->height == 0) + return; + + if ( ! is_numeric($this->orig_width) OR ! is_numeric($this->orig_height) OR $this->orig_width == 0 OR $this->orig_height == 0) + return; + + $new_width = ceil($this->orig_width*$this->height/$this->orig_height); + $new_height = ceil($this->width*$this->orig_height/$this->orig_width); + + $ratio = (($this->orig_height/$this->orig_width) - ($this->height/$this->width)); + + if ($this->master_dim != 'width' AND $this->master_dim != 'height') + { + $this->master_dim = ($ratio < 0) ? 'width' : 'height'; + } + + if (($this->width != $new_width) AND ($this->height != $new_height)) + { + if ($this->master_dim == 'height') + { + $this->width = $new_width; + } + else + { + $this->height = $new_height; + } + } + } + + // -------------------------------------------------------------------- + + /** + * Get image properties + * + * A helper function that gets info about the file + * + * @access public + * @param string + * @return mixed + */ + function get_image_properties($path = '', $return = FALSE) + { + // For now we require GD but we should + // find a way to determine this using IM or NetPBM + + if ($path == '') + $path = $this->full_src_path; + + if ( ! file_exists($path)) + { + $this->set_error('imglib_invalid_path'); + return FALSE; + } + + $vals = @getimagesize($path); + + $types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png'); + + $mime = (isset($types[$vals['2']])) ? 'image/'.$types[$vals['2']] : 'image/jpg'; + + if ($return == TRUE) + { + $v['width'] = $vals['0']; + $v['height'] = $vals['1']; + $v['image_type'] = $vals['2']; + $v['size_str'] = $vals['3']; + $v['mime_type'] = $mime; + + return $v; + } + + $this->orig_width = $vals['0']; + $this->orig_height = $vals['1']; + $this->image_type = $vals['2']; + $this->size_str = $vals['3']; + $this->mime_type = $mime; + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Size calculator + * + * This function takes a known width x height and + * recalculates it to a new size. Only one + * new variable needs to be known + * + * $props = array( + * 'width' => $width, + * 'height' => $height, + * 'new_width' => 40, + * 'new_height' => '' + * ); + * + * @access public + * @param array + * @return array + */ + function size_calculator($vals) + { + if ( ! is_array($vals)) + return; + + $allowed = array('new_width', 'new_height', 'width', 'height'); + + foreach ($allowed as $item) + { + if ( ! isset($vals[$item]) OR $vals[$item] == '') + $vals[$item] = 0; + } + + if ($vals['width'] == 0 OR $vals['height'] == 0) + { + return $vals; + } + + if ($vals['new_width'] == 0) + { + $vals['new_width'] = ceil($vals['width']*$vals['new_height']/$vals['height']); + } + elseif ($vals['new_height'] == 0) + { + $vals['new_height'] = ceil($vals['new_width']*$vals['height']/$vals['width']); + } + + return $vals; + } + + // -------------------------------------------------------------------- + + /** + * Explode source_image + * + * This is a helper function that extracts the extension + * from the source_image. This function lets us deal with + * source_images with multiple periods, like: my.cool.jpg + * It returns an associative array with two elements: + * $array['ext'] = '.jpg'; + * $array['name'] = 'my.cool'; + * + * @access public + * @param array + * @return array + */ + function explode_name($source_image) + { + $x = explode('.', $source_image); + $ret['ext'] = '.'.end($x); + + $name = ''; + + $ct = count($x)-1; + + for ($i = 0; $i < $ct; $i++) + { + $name .= $x[$i]; + + if ($i < ($ct - 1)) + { + $name .= '.'; + } + } + + $ret['name'] = $name; + + return $ret; + } + + // -------------------------------------------------------------------- + + /** + * Is GD Installed? + * + * @access public + * @return bool + */ + function gd_loaded() + { + if ( ! extension_loaded('gd')) + { + if ( ! dl('gd.so')) + { + return FALSE; + } + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Get GD version + * + * @access public + * @return mixed + */ + function gd_version() + { + if (function_exists('gd_info')) + { + $gd_version = @gd_info(); + $gd_version = preg_replace("/\D/", "", $gd_version['GD Version']); + + return $gd_version; + } + + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Set error message + * + * @access public + * @param string + * @return void + */ + function set_error($msg) + { + $CI =& get_instance(); + $CI->lang->load('imglib'); + + if (is_array($msg)) + { + foreach ($msg as $val) + { + + $msg = ($CI->lang->line($val) == FALSE) ? $val : $CI->lang->line($val); + $this->error_msg[] = $msg; + log_message('error', $msg); + } + } + else + { + $msg = ($CI->lang->line($msg) == FALSE) ? $msg : $CI->lang->line($msg); + $this->error_msg[] = $msg; + log_message('error', $msg); + } + } + + // -------------------------------------------------------------------- + + /** + * Show error messages + * + * @access public + * @param string + * @return string + */ + function display_errors($open = '

              ', $close = '

              ') + { + $str = ''; + foreach ($this->error_msg as $val) + { + $str .= $open.$val.$close; + } + + return $str; + } + +} +// END Image_lib Class ?> \ No newline at end of file From 13a0d736b6678c589afec1864edb0ad0d05a84d3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 1 Feb 2007 19:35:54 +0000 Subject: [PATCH 0482/2544] error in update example fixed --- user_guide/database/active_record.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 6f842f47..087d3e1f 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -525,8 +525,9 @@

              $this->db->update();

              $object = new Myclass;

              $this->db->where('id', $id);
              -$this->db->update('mytable', $object, $where); -

              +$this->db->update('mytable', $object); +
              +
              // Produces:
              // UPDATE mytable
              // SET title = '{$title}', name = '{$name}', date = '{$date}'
              From ace387ac78117d7053d77ee1fe07d6c50a3fc6bc Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 1 Feb 2007 20:15:32 +0000 Subject: [PATCH 0483/2544] changed example to crazy US way of spelling "colour" for consistency --- user_guide/libraries/table.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 30968e25..8cd4a1e9 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -188,7 +188,7 @@

              $this->table->set_caption()

              Permits you to add a caption to the table.

              -$this->table->set_caption('Colours'); +$this->table->set_caption('Colors');

              $this->table->set_heading()

              From 11b76a37d20348c153ba77c39f6158f443de2ba0 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 2 Feb 2007 03:46:31 +0000 Subject: [PATCH 0484/2544] result() now returns an empty array when no results are found --- user_guide/database/results.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 846504fd..53f4713e 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -71,7 +71,7 @@

              Generating Query Results

              result()

              -

              This function returns the query result as an array of objects, or FALSE on failure. +

              This function returns the query result as an array of objects, or an empty array on failure. Typically you'll use this in a foreach loop, like this:

              From f553b113416c3631cf2fd6120c8c273023ea545f Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 2 Feb 2007 03:47:13 +0000 Subject: [PATCH 0485/2544] typo in example --- user_guide/database/active_record.html | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 087d3e1f..d0657cda 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -405,14 +405,14 @@

              $this->db->insert();

              $data = array(
              -               'title' => $title,
              -               'name' => $name,
              -               'date' => $date
              +               'title' => 'My title' ,
              +               'name' => 'My Name' ,
              +               'date' => 'My date'
                          );

              $this->db->insert('mytable', $data);

              -// Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')               +// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')

              The first parameter will contain the table name, the second is an associative array of values.

              @@ -421,9 +421,9 @@

              $this->db->insert();

              /*
                  class Myclass {
              -        var = $title = 'My Title';
              -        var = $content = 'My Content';
              -        var = $date = 'My Date';
              +        var $title = 'My Title';
              +        var $content = 'My Content';
              +        var $date = 'My Date';
                  }
              */

              @@ -431,7 +431,7 @@

              $this->db->insert();


              $this->db->insert('mytable', $object);

              -// Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')               +// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')

              The first parameter will contain the table name, the second is an associative array of values.

              @@ -474,9 +474,9 @@

              $this->db->set();

              /*
                  class Myclass {
              -        var = $title = 'My Title';
              -        var = $content = 'My Content';
              -        var = $date = 'My Date';
              +        var $title = 'My Title';
              +        var $content = 'My Content';
              +        var $date = 'My Date';
                  }
              */

              @@ -516,9 +516,9 @@

              $this->db->update();

              /*
                  class Myclass {
              -        var = $title = 'My Title';
              -        var = $content = 'My Content';
              -        var = $date = 'My Date';
              +        var $title = 'My Title';
              +        var $content = 'My Content';
              +        var $date = 'My Date';
                  }
              */

              From e0135cfe9c23f2cb9312bcd2fbcfa3dbf024f8d6 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 2 Feb 2007 03:47:40 +0000 Subject: [PATCH 0486/2544] added sess_destroy() into docs --- user_guide/libraries/sessions.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 184eaec1..b1ce8472 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -210,8 +210,10 @@

              Saving Session Data to a Database

              do not need to write your own routine to do it.

              +

              Destroying a Session

              +

              To clear the current session:

              +$this->session->sess_destroy();

              Session Preferences

              -

              You'll find the following Session related preferences in your application/config/config.php file:

              From 715935ed8ba8b39e5dd8b0e47190867d479815ff Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 2 Feb 2007 03:48:30 +0000 Subject: [PATCH 0487/2544] broken link to creating_libraries fixed --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 21935898..035e5d60 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -138,7 +138,7 @@

              Version 1.5.0

            • Fixed a pagination bug that was permitting negative values in the URL.
            • Fixed an oversight in which the Loader class was not allowed to be exteneded.
            • Changed _get_config() to get_config() since the function is not a private one.
              • -
            • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
              • +
            • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
            • Deprecated $this->db->field_names() USE $this->db->list_fields()
            • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
            From 356da23d8cc237674228f2383b72e878d661d41e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 4 Feb 2007 15:05:26 +0000 Subject: [PATCH 0488/2544] $lang['ut_test_datatype'] = 'Test Datatype '; became (removed space) $lang['ut_test_datatype'] = 'Test Datatype'; --- system/language/english/unit_test_lang.php | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/system/language/english/unit_test_lang.php b/system/language/english/unit_test_lang.php index 33b20c56..a33cad5f 100644 --- a/system/language/english/unit_test_lang.php +++ b/system/language/english/unit_test_lang.php @@ -1,22 +1,22 @@ - \ No newline at end of file From c1ee65ba12164141b18aac49b0f210ed161f88b9 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 4 Feb 2007 16:18:03 +0000 Subject: [PATCH 0489/2544] added note: set_userdata() also supports setting one value at a time --- user_guide/libraries/sessions.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index b1ce8472..087d2d1f 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -161,14 +161,15 @@

            Adding Custom Session Data

            Where $array is an associative array containing your new data. Here's an example:

            -$newdata = array(
            -                   'username'  => 'johndoe',
            -                   'email'     => 'johndoe@some-site.com',
            -                   'logged_in' => TRUE
            -               );
            -
            -$this->session->set_userdata($newdata);             - +

            $newdata = array(
            +                    'username'  => 'johndoe',
            +                    'email'     => 'johndoe@some-site.com',
            +                    'logged_in' => TRUE
            +                );
            +
            + $this->session->set_userdata($newdata);

            +

            If you want to add userdata one value at a time, set_userdata() also supports this syntax.

            +

            $this->session->set_userdata('some_name', 'some_value');

            Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

            From bb433723c84e174ed87a1daf46017866c32c83c8 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 5 Feb 2007 22:32:49 +0000 Subject: [PATCH 0490/2544] --- system/database/DB_active_rec.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 90f58ae0..d27d3dc1 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -134,7 +134,17 @@ function join($table, $cond, $type = '') $type .= ' '; } } - + + // If a DB prefix is used we might need to add it to the column names + if ($this->dbprefix) + { + // First we remove any existing prefixes in the condition to avoid duplicates + $cond = preg_replace('|('.$this->dbprefix.')([\w\.]+)([\W\s]+)|', "$2$3", $cond); + + // Next we add the prefixes to the condition + $cond = preg_replace('|([\w\.]+)([\W\s]+)(.+)|', $this->dbprefix . "$1$2" . $this->dbprefix . "$3", $cond); + } + $this->ar_join[] = $type.'JOIN '.$this->dbprefix.$table.' ON '.$cond; return $this; } From 6fdadfa1593623cafaecad06f5bbb533b44c9a02 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 5 Feb 2007 22:34:03 +0000 Subject: [PATCH 0491/2544] --- user_guide/changelog.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 035e5d60..24a1d26c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,10 +66,13 @@

            Version 1.5.1.1

            Release Date: January 27, 2007

            • Added support for captions in the Table Library
              • +
            • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
            • Fixed a bug in the form helper that gave textarea a value attribute
            • Fixed a bug in the Image Library that was ignoring resizing the same size image
            • Fixed some doc typos.
            + +

            Version 1.5.0.2

            Release Date: November 23, 2006

              From 085c00ff6948bd21e72d24c53457f3bbf2274985 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 5 Feb 2007 22:36:56 +0000 Subject: [PATCH 0492/2544] --- system/libraries/Loader.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 0947046e..f76146ff 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -499,10 +499,10 @@ function language($file = '', $lang = '', $return = FALSE) * @param string * @return void */ - function config($file = '') - { + function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) + { $CI =& get_instance(); - $CI->config->load($file); + $CI->config->load($file, $use_sections, $fail_gracefully); } // -------------------------------------------------------------------- From 7fcf8ca599f21732a124b8d2610f32a9e4b01c7d Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 5 Feb 2007 22:46:56 +0000 Subject: [PATCH 0493/2544] --- system/libraries/Loader.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index f76146ff..38d7c35a 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -697,7 +697,6 @@ function _ci_load_class($class, $params = NULL) } // Lets search for the requested library file and load it. - $is_duplicate = FALSE; for ($i = 1; $i < 3; $i++) { $path = ($i % 2) ? APPPATH : BASEPATH; @@ -712,8 +711,8 @@ function _ci_load_class($class, $params = NULL) // Safety: Was the class already loaded by a previous call? if (in_array($fp, $this->_ci_classes)) { - $is_duplicate = TRUE; - continue; + log_message('debug', $class." class already loaded.Ê Second attempt ignored."); + return; } include($fp); From 29eff53d35fd2fb1ba8867eab20794ef0a53d5bb Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 5 Feb 2007 23:55:06 +0000 Subject: [PATCH 0494/2544] Fixed a typo in error message --- system/libraries/Loader.php | 1860 +++++++++++++++++------------------ 1 file changed, 930 insertions(+), 930 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 38d7c35a..d1163071 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -1,931 +1,931 @@ - 'unit', 'user_agent' => 'agent'); - - - /** - * Constructor - * - * Sets the path to the view files and gets the initial output buffering level - * - * @access public - */ - function CI_Loader() - { - $this->_ci_is_php5 = (floor(phpversion()) >= 5) ? TRUE : FALSE; - $this->_ci_view_path = APPPATH.'views/'; - $this->_ci_ob_level = ob_get_level(); - - log_message('debug', "Loader Class Initialized"); - } - - // -------------------------------------------------------------------- - - /** - * Class Loader - * - * This function lets users load and instantiate classes. - * It is designed to be called from a user's app controllers. - * - * @access public - * @param string the name of the class - * @param mixed the optional parameters - * @return void - */ - function library($library = '', $params = NULL) - { - if ($library == '') - { - return FALSE; - } - - if (is_array($library)) - { - foreach ($library as $class) - { - $this->_ci_load_class($class, $params); - } - } - else - { - $this->_ci_load_class($library, $params); - } - - $this->_ci_assign_to_models(); - } - - // -------------------------------------------------------------------- - - /** - * Model Loader - * - * This function lets users load and instantiate models. - * - * @access public - * @param string the name of the class - * @param mixed any initialization parameters - * @return void - */ - function model($model, $name = '', $db_conn = FALSE) - { - if ($model == '') - return; - - // Is the model in a sub-folder? If so, parse out the filename and path. - if (strpos($model, '/') === FALSE) - { - $path = ''; - } - else - { - $x = explode('/', $model); - $model = end($x); - unset($x[count($x)-1]); - $path = implode('/', $x).'/'; - } - - if ($name == '') - { - $name = $model; - } - - if (in_array($name, $this->_ci_models, TRUE)) - { - return; - } - - $CI =& get_instance(); - if (isset($CI->$name)) - { - show_error('The model name you are loading is the name of a resource that is already being used: '.$name); - } - - $model = strtolower($model); - - if ( ! file_exists(APPPATH.'models/'.$path.$model.EXT)) - { - show_error('Unable to locate the model you have specified: '.$model); - } - - if ($db_conn !== FALSE AND ! class_exists('CI_DB')) - { - if ($db_conn === TRUE) - $db_conn = ''; - - $CI->load->database($db_conn, FALSE, TRUE); - } - - if ( ! class_exists('Model')) - { - require_once(BASEPATH.'libraries/Model'.EXT); - } - - require_once(APPPATH.'models/'.$path.$model.EXT); - - $model = ucfirst($model); - - $CI->$name = new $model(); - $CI->$name->_assign_libraries(); - - $this->_ci_models[] = $name; - } - - // -------------------------------------------------------------------- - - /** - * Database Loader - * - * @access public - * @param string the DB credentials - * @param bool whether to return the DB object - * @param bool whether to enable active record (this allows us to override the config setting) - * @return object - */ - function database($params = '', $return = FALSE, $active_record = FALSE) - { - // Do we even need to load the database class? - if (class_exists('CI_DB') AND $return == FALSE AND $active_record == FALSE) - { - return FALSE; - } - - require_once(BASEPATH.'database/DB'.EXT); - - if ($return === TRUE) - { - return DB($params, $active_record); - } - - // Grab the super object - $CI =& get_instance(); - - // Initialize the db variable. Needed to prevent - // reference errors with some configurations - $CI->db = ''; - - // Load the DB class - $CI->db =& DB($params, $active_record); - - // Assign the DB object to any existing models - $this->_ci_assign_to_models(); - } - - // -------------------------------------------------------------------- - - /** - * Load the Utilities Class - * - * @access public - * @return string - */ - function dbutil() - { - if ( ! class_exists('CI_DB')) - { - $this->database(); - } - - $CI =& get_instance(); - - require_once(BASEPATH.'database/DB_utility'.EXT); - require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility'.EXT); - $class = 'CI_DB_'.$CI->db->dbdriver.'_utility'; - - $CI->dbutil = new $class(); - $CI->load->_ci_assign_to_models(); - } - - // -------------------------------------------------------------------- - - /** - * Load View - * - * 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 - * some cases it's advantageous to be able to return data so that - * a developer can process it in some way. - * - * @access public - * @param string - * @param array - * @param bool - * @return void - */ - function view($view, $vars = array(), $return = FALSE) - { - return $this->_ci_load(array('view' => $view, 'vars' => $this->_ci_object_to_array($vars), 'return' => $return)); - } - - // -------------------------------------------------------------------- - - /** - * Load File - * - * This is a generic file loader - * - * @access public - * @param string - * @param bool - * @return string - */ - function file($path, $return = FALSE) - { - return $this->_ci_load(array('path' => $path, 'return' => $return)); - } - - // -------------------------------------------------------------------- - - /** - * Set Variables - * - * Once variables are set they become available within - * the controller class and its "view" files. - * - * @access public - * @param array - * @return void - */ - function vars($vars = array()) - { - $vars = $this->_ci_object_to_array($vars); - - if (is_array($vars) AND count($vars) > 0) - { - foreach ($vars as $key => $val) - { - $this->_ci_cached_vars[$key] = $val; - } - } - } - - // -------------------------------------------------------------------- - - /** - * Load Helper - * - * This function loads the specified helper file. - * - * @access public - * @param mixed - * @return void - */ - function helper($helpers = array()) - { - if ( ! is_array($helpers)) - { - $helpers = array($helpers); - } - - foreach ($helpers as $helper) - { - $helper = strtolower(str_replace(EXT, '', str_replace('_helper', '', $helper)).'_helper'); - - if (isset($this->_ci_helpers[$helper])) - { - continue; - } - - if (file_exists(APPPATH.'helpers/'.$helper.EXT)) - { - include_once(APPPATH.'helpers/'.$helper.EXT); - } - else - { - if (file_exists(BASEPATH.'helpers/'.$helper.EXT)) - { - include(BASEPATH.'helpers/'.$helper.EXT); - } - else - { - show_error('Unable to load the requested file: helpers/'.$helper.EXT); - } - } - - $this->_ci_helpers[$helper] = TRUE; - - } - - log_message('debug', 'Helpers loaded: '.implode(', ', $helpers)); - } - - // -------------------------------------------------------------------- - - /** - * Load Helpers - * - * This is simply an alias to the above function in case the - * user has written the plural form of this function. - * - * @access public - * @param array - * @return void - */ - function helpers($helpers = array()) - { - $this->helper($helpers); - } - - // -------------------------------------------------------------------- - - /** - * Load Plugin - * - * This function loads the specified plugin. - * - * @access public - * @param array - * @return void - */ - function plugin($plugins = array()) - { - if ( ! is_array($plugins)) - { - $plugins = array($plugins); - } - - foreach ($plugins as $plugin) - { - $plugin = strtolower(str_replace(EXT, '', str_replace('_plugin.', '', $plugin)).'_pi'); - - if (isset($this->_ci_plugins[$plugin])) - { - continue; - } - - if (file_exists(APPPATH.'plugins/'.$plugin.EXT)) - { - include(APPPATH.'plugins/'.$plugin.EXT); - } - else - { - if (file_exists(BASEPATH.'plugins/'.$plugin.EXT)) - { - include(BASEPATH.'plugins/'.$plugin.EXT); - } - else - { - show_error('Unable to load the requested file: plugins/'.$plugin.EXT); - } - } - - $this->_ci_plugins[$plugin] = TRUE; - } - - log_message('debug', 'Plugins loaded: '.implode(', ', $plugins)); - } - - // -------------------------------------------------------------------- - - /** - * Load Plugins - * - * This is simply an alias to the above function in case the - * user has written the plural form of this function. - * - * @access public - * @param array - * @return void - */ - function plugins($plugins = array()) - { - $this->plugin($plugins); - } - - // -------------------------------------------------------------------- - - /** - * Load Script - * - * This function loads the specified include file from the - * application/scripts/ folder. - * - * NOTE: This feature has been deprecated but it will remain available - * for legacy users. - * - * @access public - * @param array - * @return void - */ - function script($scripts = array()) - { - if ( ! is_array($scripts)) - { - $scripts = array($scripts); - } - - foreach ($scripts as $script) - { - $script = strtolower(str_replace(EXT, '', $script)); - - if (isset($this->_ci_scripts[$script])) - { - continue; - } - - if ( ! file_exists(APPPATH.'scripts/'.$script.EXT)) - { - show_error('Unable to load the requested script: scripts/'.$script.EXT); - } - - include(APPPATH.'scripts/'.$script.EXT); - } - - log_message('debug', 'Scripts loaded: '.implode(', ', $scripts)); - } - - // -------------------------------------------------------------------- - - /** - * Loads a language file - * - * @access public - * @param string - * @return void - */ - function language($file = '', $lang = '', $return = FALSE) - { - $CI =& get_instance(); - return $CI->lang->load($file, $lang, $return); - } - - // -------------------------------------------------------------------- - - /** - * Loads a config file - * - * @access public - * @param string - * @return void - */ - function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) - { - $CI =& get_instance(); - $CI->config->load($file, $use_sections, $fail_gracefully); - } - - // -------------------------------------------------------------------- - - /** - * Scaffolding Loader - * - * This initializing function works a bit different than the - * others. It doesn't load the class. Instead, it simply - * sets a flag indicating that scaffolding is allowed to be - * used. The actual scaffolding function below is - * called by the front controller based on whether the - * second segment of the URL matches the "secret" scaffolding - * word stored in the application/config/routes.php - * - * @access public - * @param string - * @return void - */ - function scaffolding($table = '') - { - if ($table === FALSE) - { - show_error('You must include the name of the table you would like access when you initialize scaffolding'); - } - - $CI =& get_instance(); - $CI->_ci_scaffolding = TRUE; - $CI->_ci_scaff_table = $table; - } - - // -------------------------------------------------------------------- - - /** - * Loader - * - * This function is used to load views and files. - * - * @access private - * @param array - * @return void - */ - function _ci_load($data) - { - // Set the default data variables - foreach (array('view', 'vars', 'path', 'return') as $val) - { - $$val = ( ! isset($data[$val])) ? FALSE : $data[$val]; - } - - // Set the path to the requested file - if ($path == '') - { - $ext = pathinfo($view, PATHINFO_EXTENSION); - $file = ($ext == '') ? $view.EXT : $view; - $path = $this->_ci_view_path.$file; - } - else - { - $x = explode('/', $path); - $file = end($x); - } - - if ( ! file_exists($path)) - { - show_error('Unable to load the requested file: '.$file); - } - - // This allows anything loaded using $this->load (views, files, etc.) - // to become accessible from within the Controller and Model functions. - // Only needed when running PHP 5 - - if ($this->_ci_is_instance()) - { - $CI =& get_instance(); - foreach (get_object_vars($CI) as $key => $var) - { - if ( ! isset($this->$key)) - { - $this->$key =& $CI->$key; - } - } - } - - /* - * Extract and cache variables - * - * You can either set variables using the dedicated $this->load_vars() - * function or via the second parameter of this function. We'll merge - * the two types and cache them so that views that are embedded within - * other views can have access to these variables. - */ - if (is_array($vars)) - { - $this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $vars); - } - extract($this->_ci_cached_vars); - - /* - * Buffer the output - * - * 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 - * can intercept the content right before it's sent to - * the browser and then stop the timer it won't be accurate. - */ - ob_start(); - - // If the PHP installation does not support short tags we'll - // do a little string replacement, changing the short tags - // to standard PHP echo statements. - - if ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE) - { - echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace(' $this->_ci_ob_level + 1) - { - ob_end_flush(); - } - else - { - // PHP 4 requires that we use a global - global $OUT; - $OUT->set_output(ob_get_contents()); - @ob_end_clean(); - } - } - - // -------------------------------------------------------------------- - - /** - * Load class - * - * This function loads the requested class. - * - * @access private - * @param string the item that is being loaded - * @param mixed any additional parameters - * @return void - */ - function _ci_load_class($class, $params = NULL) - { - // Get the class name - $class = str_replace(EXT, '', $class); - - // We'll test for both lowercase and capitalized versions of the file name - foreach (array(ucfirst($class), strtolower($class)) as $class) - { - // Is this a class extension request? - if (file_exists(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT)) - { - if ( ! file_exists(BASEPATH.'libraries/'.ucfirst($class).EXT)) - { - log_message('error', "Unable to load the requested class: ".$class); - show_error("Unable to load the requested class: ".$class); - } - - include(BASEPATH.'libraries/'.ucfirst($class).EXT); - include(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT); - - return $this->_ci_init_class($class, config_item('subclass_prefix'), $params); - } - - // Lets search for the requested library file and load it. - for ($i = 1; $i < 3; $i++) - { - $path = ($i % 2) ? APPPATH : BASEPATH; - $fp = $path.'libraries/'.$class.EXT; - - // Does the file exist? No? Bummer... - if ( ! file_exists($fp)) - { - continue; - } - - // Safety: Was the class already loaded by a previous call? - if (in_array($fp, $this->_ci_classes)) - { - log_message('debug', $class." class already loaded.Ê Second attempt ignored."); - return; - } - - include($fp); - $this->_ci_classes[] = $fp; - return $this->_ci_init_class($class, '', $params); - } - } // END FOREACH - - // If we got this far we were unable to find the requested class. - // We do not issue errors if the load call failed due to a duplicate request - if ($is_duplicate == FALSE) - { - log_message('error', "Unable to load the requested class: ".$class); - show_error("Unable to load the requested class: ".$class); - } - } - - // -------------------------------------------------------------------- - - /** - * Instantiates a class - * - * @access private - * @param string - * @param string - * @return null - */ - function _ci_init_class($class, $prefix = '', $config = FALSE) - { - // Is there an associated config file for this class? - if ($config === NULL) - { - $config = NULL; - if (file_exists(APPPATH.'config/'.$class.EXT)) - { - include(APPPATH.'config/'.$class.EXT); - } - } - - if ($prefix == '') - { - $name = (class_exists('CI_'.$class)) ? 'CI_'.$class : $class; - } - else - { - $name = $prefix.$class; - } - - // Set the variable name we will assign the class to - $class = strtolower($class); - $classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class]; - - // Instantiate the class - $CI =& get_instance(); - if ($config !== NULL) - { - $CI->$classvar = new $name($config); - } - else - { - $CI->$classvar = new $name; - } - } - - // -------------------------------------------------------------------- - - /** - * Autoloader - * - * The config/autoload.php file contains an array that permits sub-systems, - * libraries, plugins, and helpers to be loaded automatically. - * - * @access private - * @param array - * @return void - */ - function _ci_autoloader() - { - include(APPPATH.'config/autoload'.EXT); - - if ( ! isset($autoload)) - { - return FALSE; - } - - // Load any custome config file - if (count($autoload['config']) > 0) - { - $CI =& get_instance(); - foreach ($autoload['config'] as $key => $val) - { - $CI->config->load($val); - } - } - - // Load plugins, helpers, and scripts - foreach (array('helper', 'plugin', 'script') as $type) - { - if (isset($autoload[$type]) AND count($autoload[$type]) > 0) - { - $this->$type($autoload[$type]); - } - } - - // A little tweak to remain backward compatible - // The $autoload['core'] item was deprecated - if ( ! isset($autoload['libraries'])) - { - $autoload['libraries'] = $autoload['core']; - } - - // Load libraries - if (isset($autoload['libraries']) AND count($autoload['libraries']) > 0) - { - // Load the database driver. - if (in_array('database', $autoload['libraries'])) - { - $this->database(); - $autoload['libraries'] = array_diff($autoload['libraries'], array('database')); - } - - // Load the model class. - if (in_array('model', $autoload['libraries'])) - { - $this->model(); - $autoload['libraries'] = array_diff($autoload['libraries'], array('model')); - } - - // Load scaffolding - if (in_array('scaffolding', $autoload['libraries'])) - { - $this->scaffolding(); - $autoload['libraries'] = array_diff($autoload['libraries'], array('scaffolding')); - } - - // Load all other libraries - foreach ($autoload['libraries'] as $item) - { - $this->library($item); - } - } - } - - // -------------------------------------------------------------------- - - /** - * Assign to Models - * - * Makes sure that anything loaded by the loader class (libraries, plugins, etc.) - * will be available to models, if any exist. - * - * @access private - * @param object - * @return array - */ - function _ci_assign_to_models() - { - if (count($this->_ci_models) == 0) - { - return; - } - - if ($this->_ci_is_instance()) - { - $CI =& get_instance(); - foreach ($this->_ci_models as $model) - { - $CI->$model->_assign_libraries(); - } - } - else - { - foreach ($this->_ci_models as $model) - { - $this->$model->_assign_libraries(); - } - } - } - - // -------------------------------------------------------------------- - - /** - * Object to Array - * - * Takes an object as input and converts the class variables to array key/vals - * - * @access private - * @param object - * @return array - */ - function _ci_object_to_array($object) - { - return (is_object($object)) ? get_object_vars($object) : $object; - } - - // -------------------------------------------------------------------- - - /** - * Determines whether we should use the CI instance or $this - * - * @access private - * @return bool - */ - function _ci_is_instance() - { - if ($this->_ci_is_php5 == TRUE) - { - return TRUE; - } - - global $CI; - return (is_object($CI)) ? TRUE : FALSE; - } - -} + 'unit', 'user_agent' => 'agent'); + + + /** + * Constructor + * + * Sets the path to the view files and gets the initial output buffering level + * + * @access public + */ + function CI_Loader() + { + $this->_ci_is_php5 = (floor(phpversion()) >= 5) ? TRUE : FALSE; + $this->_ci_view_path = APPPATH.'views/'; + $this->_ci_ob_level = ob_get_level(); + + log_message('debug', "Loader Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * Class Loader + * + * This function lets users load and instantiate classes. + * It is designed to be called from a user's app controllers. + * + * @access public + * @param string the name of the class + * @param mixed the optional parameters + * @return void + */ + function library($library = '', $params = NULL) + { + if ($library == '') + { + return FALSE; + } + + if (is_array($library)) + { + foreach ($library as $class) + { + $this->_ci_load_class($class, $params); + } + } + else + { + $this->_ci_load_class($library, $params); + } + + $this->_ci_assign_to_models(); + } + + // -------------------------------------------------------------------- + + /** + * Model Loader + * + * This function lets users load and instantiate models. + * + * @access public + * @param string the name of the class + * @param mixed any initialization parameters + * @return void + */ + function model($model, $name = '', $db_conn = FALSE) + { + if ($model == '') + return; + + // Is the model in a sub-folder? If so, parse out the filename and path. + if (strpos($model, '/') === FALSE) + { + $path = ''; + } + else + { + $x = explode('/', $model); + $model = end($x); + unset($x[count($x)-1]); + $path = implode('/', $x).'/'; + } + + if ($name == '') + { + $name = $model; + } + + if (in_array($name, $this->_ci_models, TRUE)) + { + return; + } + + $CI =& get_instance(); + if (isset($CI->$name)) + { + show_error('The model name you are loading is the name of a resource that is already being used: '.$name); + } + + $model = strtolower($model); + + if ( ! file_exists(APPPATH.'models/'.$path.$model.EXT)) + { + show_error('Unable to locate the model you have specified: '.$model); + } + + if ($db_conn !== FALSE AND ! class_exists('CI_DB')) + { + if ($db_conn === TRUE) + $db_conn = ''; + + $CI->load->database($db_conn, FALSE, TRUE); + } + + if ( ! class_exists('Model')) + { + require_once(BASEPATH.'libraries/Model'.EXT); + } + + require_once(APPPATH.'models/'.$path.$model.EXT); + + $model = ucfirst($model); + + $CI->$name = new $model(); + $CI->$name->_assign_libraries(); + + $this->_ci_models[] = $name; + } + + // -------------------------------------------------------------------- + + /** + * Database Loader + * + * @access public + * @param string the DB credentials + * @param bool whether to return the DB object + * @param bool whether to enable active record (this allows us to override the config setting) + * @return object + */ + function database($params = '', $return = FALSE, $active_record = FALSE) + { + // Do we even need to load the database class? + if (class_exists('CI_DB') AND $return == FALSE AND $active_record == FALSE) + { + return FALSE; + } + + require_once(BASEPATH.'database/DB'.EXT); + + if ($return === TRUE) + { + return DB($params, $active_record); + } + + // Grab the super object + $CI =& get_instance(); + + // Initialize the db variable. Needed to prevent + // reference errors with some configurations + $CI->db = ''; + + // Load the DB class + $CI->db =& DB($params, $active_record); + + // Assign the DB object to any existing models + $this->_ci_assign_to_models(); + } + + // -------------------------------------------------------------------- + + /** + * Load the Utilities Class + * + * @access public + * @return string + */ + function dbutil() + { + if ( ! class_exists('CI_DB')) + { + $this->database(); + } + + $CI =& get_instance(); + + require_once(BASEPATH.'database/DB_utility'.EXT); + require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility'.EXT); + $class = 'CI_DB_'.$CI->db->dbdriver.'_utility'; + + $CI->dbutil = new $class(); + $CI->load->_ci_assign_to_models(); + } + + // -------------------------------------------------------------------- + + /** + * Load View + * + * 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 + * some cases it's advantageous to be able to return data so that + * a developer can process it in some way. + * + * @access public + * @param string + * @param array + * @param bool + * @return void + */ + function view($view, $vars = array(), $return = FALSE) + { + return $this->_ci_load(array('view' => $view, 'vars' => $this->_ci_object_to_array($vars), 'return' => $return)); + } + + // -------------------------------------------------------------------- + + /** + * Load File + * + * This is a generic file loader + * + * @access public + * @param string + * @param bool + * @return string + */ + function file($path, $return = FALSE) + { + return $this->_ci_load(array('path' => $path, 'return' => $return)); + } + + // -------------------------------------------------------------------- + + /** + * Set Variables + * + * Once variables are set they become available within + * the controller class and its "view" files. + * + * @access public + * @param array + * @return void + */ + function vars($vars = array()) + { + $vars = $this->_ci_object_to_array($vars); + + if (is_array($vars) AND count($vars) > 0) + { + foreach ($vars as $key => $val) + { + $this->_ci_cached_vars[$key] = $val; + } + } + } + + // -------------------------------------------------------------------- + + /** + * Load Helper + * + * This function loads the specified helper file. + * + * @access public + * @param mixed + * @return void + */ + function helper($helpers = array()) + { + if ( ! is_array($helpers)) + { + $helpers = array($helpers); + } + + foreach ($helpers as $helper) + { + $helper = strtolower(str_replace(EXT, '', str_replace('_helper', '', $helper)).'_helper'); + + if (isset($this->_ci_helpers[$helper])) + { + continue; + } + + if (file_exists(APPPATH.'helpers/'.$helper.EXT)) + { + include_once(APPPATH.'helpers/'.$helper.EXT); + } + else + { + if (file_exists(BASEPATH.'helpers/'.$helper.EXT)) + { + include(BASEPATH.'helpers/'.$helper.EXT); + } + else + { + show_error('Unable to load the requested file: helpers/'.$helper.EXT); + } + } + + $this->_ci_helpers[$helper] = TRUE; + + } + + log_message('debug', 'Helpers loaded: '.implode(', ', $helpers)); + } + + // -------------------------------------------------------------------- + + /** + * Load Helpers + * + * This is simply an alias to the above function in case the + * user has written the plural form of this function. + * + * @access public + * @param array + * @return void + */ + function helpers($helpers = array()) + { + $this->helper($helpers); + } + + // -------------------------------------------------------------------- + + /** + * Load Plugin + * + * This function loads the specified plugin. + * + * @access public + * @param array + * @return void + */ + function plugin($plugins = array()) + { + if ( ! is_array($plugins)) + { + $plugins = array($plugins); + } + + foreach ($plugins as $plugin) + { + $plugin = strtolower(str_replace(EXT, '', str_replace('_plugin.', '', $plugin)).'_pi'); + + if (isset($this->_ci_plugins[$plugin])) + { + continue; + } + + if (file_exists(APPPATH.'plugins/'.$plugin.EXT)) + { + include(APPPATH.'plugins/'.$plugin.EXT); + } + else + { + if (file_exists(BASEPATH.'plugins/'.$plugin.EXT)) + { + include(BASEPATH.'plugins/'.$plugin.EXT); + } + else + { + show_error('Unable to load the requested file: plugins/'.$plugin.EXT); + } + } + + $this->_ci_plugins[$plugin] = TRUE; + } + + log_message('debug', 'Plugins loaded: '.implode(', ', $plugins)); + } + + // -------------------------------------------------------------------- + + /** + * Load Plugins + * + * This is simply an alias to the above function in case the + * user has written the plural form of this function. + * + * @access public + * @param array + * @return void + */ + function plugins($plugins = array()) + { + $this->plugin($plugins); + } + + // -------------------------------------------------------------------- + + /** + * Load Script + * + * This function loads the specified include file from the + * application/scripts/ folder. + * + * NOTE: This feature has been deprecated but it will remain available + * for legacy users. + * + * @access public + * @param array + * @return void + */ + function script($scripts = array()) + { + if ( ! is_array($scripts)) + { + $scripts = array($scripts); + } + + foreach ($scripts as $script) + { + $script = strtolower(str_replace(EXT, '', $script)); + + if (isset($this->_ci_scripts[$script])) + { + continue; + } + + if ( ! file_exists(APPPATH.'scripts/'.$script.EXT)) + { + show_error('Unable to load the requested script: scripts/'.$script.EXT); + } + + include(APPPATH.'scripts/'.$script.EXT); + } + + log_message('debug', 'Scripts loaded: '.implode(', ', $scripts)); + } + + // -------------------------------------------------------------------- + + /** + * Loads a language file + * + * @access public + * @param string + * @return void + */ + function language($file = '', $lang = '', $return = FALSE) + { + $CI =& get_instance(); + return $CI->lang->load($file, $lang, $return); + } + + // -------------------------------------------------------------------- + + /** + * Loads a config file + * + * @access public + * @param string + * @return void + */ + function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) + { + $CI =& get_instance(); + $CI->config->load($file, $use_sections, $fail_gracefully); + } + + // -------------------------------------------------------------------- + + /** + * Scaffolding Loader + * + * This initializing function works a bit different than the + * others. It doesn't load the class. Instead, it simply + * sets a flag indicating that scaffolding is allowed to be + * used. The actual scaffolding function below is + * called by the front controller based on whether the + * second segment of the URL matches the "secret" scaffolding + * word stored in the application/config/routes.php + * + * @access public + * @param string + * @return void + */ + function scaffolding($table = '') + { + if ($table === FALSE) + { + show_error('You must include the name of the table you would like access when you initialize scaffolding'); + } + + $CI =& get_instance(); + $CI->_ci_scaffolding = TRUE; + $CI->_ci_scaff_table = $table; + } + + // -------------------------------------------------------------------- + + /** + * Loader + * + * This function is used to load views and files. + * + * @access private + * @param array + * @return void + */ + function _ci_load($data) + { + // Set the default data variables + foreach (array('view', 'vars', 'path', 'return') as $val) + { + $$val = ( ! isset($data[$val])) ? FALSE : $data[$val]; + } + + // Set the path to the requested file + if ($path == '') + { + $ext = pathinfo($view, PATHINFO_EXTENSION); + $file = ($ext == '') ? $view.EXT : $view; + $path = $this->_ci_view_path.$file; + } + else + { + $x = explode('/', $path); + $file = end($x); + } + + if ( ! file_exists($path)) + { + show_error('Unable to load the requested file: '.$file); + } + + // This allows anything loaded using $this->load (views, files, etc.) + // to become accessible from within the Controller and Model functions. + // Only needed when running PHP 5 + + if ($this->_ci_is_instance()) + { + $CI =& get_instance(); + foreach (get_object_vars($CI) as $key => $var) + { + if ( ! isset($this->$key)) + { + $this->$key =& $CI->$key; + } + } + } + + /* + * Extract and cache variables + * + * You can either set variables using the dedicated $this->load_vars() + * function or via the second parameter of this function. We'll merge + * the two types and cache them so that views that are embedded within + * other views can have access to these variables. + */ + if (is_array($vars)) + { + $this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $vars); + } + extract($this->_ci_cached_vars); + + /* + * Buffer the output + * + * 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 + * can intercept the content right before it's sent to + * the browser and then stop the timer it won't be accurate. + */ + ob_start(); + + // If the PHP installation does not support short tags we'll + // do a little string replacement, changing the short tags + // to standard PHP echo statements. + + if ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE) + { + echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace(' $this->_ci_ob_level + 1) + { + ob_end_flush(); + } + else + { + // PHP 4 requires that we use a global + global $OUT; + $OUT->set_output(ob_get_contents()); + @ob_end_clean(); + } + } + + // -------------------------------------------------------------------- + + /** + * Load class + * + * This function loads the requested class. + * + * @access private + * @param string the item that is being loaded + * @param mixed any additional parameters + * @return void + */ + function _ci_load_class($class, $params = NULL) + { + // Get the class name + $class = str_replace(EXT, '', $class); + + // We'll test for both lowercase and capitalized versions of the file name + foreach (array(ucfirst($class), strtolower($class)) as $class) + { + // Is this a class extension request? + if (file_exists(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT)) + { + if ( ! file_exists(BASEPATH.'libraries/'.ucfirst($class).EXT)) + { + log_message('error', "Unable to load the requested class: ".$class); + show_error("Unable to load the requested class: ".$class); + } + + include(BASEPATH.'libraries/'.ucfirst($class).EXT); + include(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT); + + return $this->_ci_init_class($class, config_item('subclass_prefix'), $params); + } + + // Lets search for the requested library file and load it. + for ($i = 1; $i < 3; $i++) + { + $path = ($i % 2) ? APPPATH : BASEPATH; + $fp = $path.'libraries/'.$class.EXT; + + // Does the file exist? No? Bummer... + if ( ! file_exists($fp)) + { + continue; + } + + // Safety: Was the class already loaded by a previous call? + if (in_array($fp, $this->_ci_classes)) + { + log_message('debug', $class." class already loaded. Second attempt ignored."); + return; + } + + include($fp); + $this->_ci_classes[] = $fp; + return $this->_ci_init_class($class, '', $params); + } + } // END FOREACH + + // If we got this far we were unable to find the requested class. + // We do not issue errors if the load call failed due to a duplicate request + if ($is_duplicate == FALSE) + { + log_message('error', "Unable to load the requested class: ".$class); + show_error("Unable to load the requested class: ".$class); + } + } + + // -------------------------------------------------------------------- + + /** + * Instantiates a class + * + * @access private + * @param string + * @param string + * @return null + */ + function _ci_init_class($class, $prefix = '', $config = FALSE) + { + // Is there an associated config file for this class? + if ($config === NULL) + { + $config = NULL; + if (file_exists(APPPATH.'config/'.$class.EXT)) + { + include(APPPATH.'config/'.$class.EXT); + } + } + + if ($prefix == '') + { + $name = (class_exists('CI_'.$class)) ? 'CI_'.$class : $class; + } + else + { + $name = $prefix.$class; + } + + // Set the variable name we will assign the class to + $class = strtolower($class); + $classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class]; + + // Instantiate the class + $CI =& get_instance(); + if ($config !== NULL) + { + $CI->$classvar = new $name($config); + } + else + { + $CI->$classvar = new $name; + } + } + + // -------------------------------------------------------------------- + + /** + * Autoloader + * + * The config/autoload.php file contains an array that permits sub-systems, + * libraries, plugins, and helpers to be loaded automatically. + * + * @access private + * @param array + * @return void + */ + function _ci_autoloader() + { + include(APPPATH.'config/autoload'.EXT); + + if ( ! isset($autoload)) + { + return FALSE; + } + + // Load any custome config file + if (count($autoload['config']) > 0) + { + $CI =& get_instance(); + foreach ($autoload['config'] as $key => $val) + { + $CI->config->load($val); + } + } + + // Load plugins, helpers, and scripts + foreach (array('helper', 'plugin', 'script') as $type) + { + if (isset($autoload[$type]) AND count($autoload[$type]) > 0) + { + $this->$type($autoload[$type]); + } + } + + // A little tweak to remain backward compatible + // The $autoload['core'] item was deprecated + if ( ! isset($autoload['libraries'])) + { + $autoload['libraries'] = $autoload['core']; + } + + // Load libraries + if (isset($autoload['libraries']) AND count($autoload['libraries']) > 0) + { + // Load the database driver. + if (in_array('database', $autoload['libraries'])) + { + $this->database(); + $autoload['libraries'] = array_diff($autoload['libraries'], array('database')); + } + + // Load the model class. + if (in_array('model', $autoload['libraries'])) + { + $this->model(); + $autoload['libraries'] = array_diff($autoload['libraries'], array('model')); + } + + // Load scaffolding + if (in_array('scaffolding', $autoload['libraries'])) + { + $this->scaffolding(); + $autoload['libraries'] = array_diff($autoload['libraries'], array('scaffolding')); + } + + // Load all other libraries + foreach ($autoload['libraries'] as $item) + { + $this->library($item); + } + } + } + + // -------------------------------------------------------------------- + + /** + * Assign to Models + * + * Makes sure that anything loaded by the loader class (libraries, plugins, etc.) + * will be available to models, if any exist. + * + * @access private + * @param object + * @return array + */ + function _ci_assign_to_models() + { + if (count($this->_ci_models) == 0) + { + return; + } + + if ($this->_ci_is_instance()) + { + $CI =& get_instance(); + foreach ($this->_ci_models as $model) + { + $CI->$model->_assign_libraries(); + } + } + else + { + foreach ($this->_ci_models as $model) + { + $this->$model->_assign_libraries(); + } + } + } + + // -------------------------------------------------------------------- + + /** + * Object to Array + * + * Takes an object as input and converts the class variables to array key/vals + * + * @access private + * @param object + * @return array + */ + function _ci_object_to_array($object) + { + return (is_object($object)) ? get_object_vars($object) : $object; + } + + // -------------------------------------------------------------------- + + /** + * Determines whether we should use the CI instance or $this + * + * @access private + * @return bool + */ + function _ci_is_instance() + { + if ($this->_ci_is_php5 == TRUE) + { + return TRUE; + } + + global $CI; + return (is_object($CI)) ? TRUE : FALSE; + } + +} ?> \ No newline at end of file From 320f3dfd8f6ea948d08660b57b29ed9c0de8d712 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 6 Feb 2007 04:06:08 +0000 Subject: [PATCH 0495/2544] changed app_ver to 1.5.1.1 --- system/codeigniter/CodeIgniter.php | 516 ++++++++++++++--------------- 1 file changed, 258 insertions(+), 258 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 3008b2ff..1caf7c96 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -1,259 +1,259 @@ -mark('total_execution_time_start'); -$BM->mark('loading_time_base_classes_start'); - -/* - * ------------------------------------------------------ - * Instantiate the hooks class - * ------------------------------------------------------ - */ - -$EXT =& load_class('Hooks'); - -/* - * ------------------------------------------------------ - * Is there a "pre_system" hook? - * ------------------------------------------------------ - */ -$EXT->_call_hook('pre_system'); - -/* - * ------------------------------------------------------ - * Instantiate the base classes - * ------------------------------------------------------ - */ - -$CFG =& load_class('Config'); -$RTR =& load_class('Router'); -$OUT =& load_class('Output'); - -/* - * ------------------------------------------------------ - * Is there a valid cache file? If so, we're done... - * ------------------------------------------------------ - */ - -if ($EXT->_call_hook('cache_override') === FALSE) -{ - if ($OUT->_display_cache($CFG, $RTR) == TRUE) - { - exit; - } -} - -/* - * ------------------------------------------------------ - * Load the remaining base classes - * ------------------------------------------------------ - */ - -$IN =& load_class('Input'); -$URI =& load_class('URI'); -$LANG =& load_class('Language'); - -/* - * ------------------------------------------------------ - * Load the app controller and local controller - * ------------------------------------------------------ - * - * Note: Due to the poor object handling in PHP 4 we'll - * conditionally load different versions of the base - * class. Retaining PHP 4 compatibility requires a bit of a hack. - * - * Note: The Loader class needs to be included first - * - */ -if (floor(phpversion()) < 5) -{ - load_class('Loader', FALSE); - require(BASEPATH.'codeigniter/Base4'.EXT); -} -else -{ - require(BASEPATH.'codeigniter/Base5'.EXT); -} - -// Load the base controller class -load_class('Controller', FALSE); - -// Load the local application controller -// Note: The Router class automatically validates the controller path. If this include fails it -// means that the default controller in the Routes.php file is not resolving to something valid. -if ( ! include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) -{ - show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); -} - -// Set a mark point for benchmarking -$BM->mark('loading_time_base_classes_end'); - - -/* - * ------------------------------------------------------ - * 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 - */ -$class = $RTR->fetch_class(); -$method = $RTR->fetch_method(); - - -if ( ! class_exists($class) - OR $method == 'controller' - OR substr($method, 0, 1) == '_' - OR in_array($method, get_class_methods('Controller'), TRUE) - ) -{ - show_404(); -} - -/* - * ------------------------------------------------------ - * Is there a "pre_controller" hook? - * ------------------------------------------------------ - */ -$EXT->_call_hook('pre_controller'); - -/* - * ------------------------------------------------------ - * Instantiate the controller and call requested method - * ------------------------------------------------------ - */ - -// Mark a start point so we can benchmark the controller -$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); - -// Instantiate the Controller -$CI = new $class(); - -// Is this a scaffolding request? -if ($RTR->scaffolding_request === TRUE) -{ - if ($EXT->_call_hook('scaffolding_override') === FALSE) - { - $CI->_ci_scaffolding(); - } -} -else -{ - /* - * ------------------------------------------------------ - * Is there a "post_controller_constructor" hook? - * ------------------------------------------------------ - */ - $EXT->_call_hook('post_controller_constructor'); - - // Is there a "remap" function? - if (method_exists($CI, '_remap')) - { - $CI->_remap($method); - } - else - { - if ( ! method_exists($CI, $method)) - { - show_404(); - } - - // Call the requested method. - // Any URI segments present (besides the class/function) will be passed to the method for convenience - call_user_func_array(array(&$CI, $method), array_slice($RTR->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3))); - } -} - -// Mark a benchmark end point -$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end'); - -/* - * ------------------------------------------------------ - * Is there a "post_controller" hook? - * ------------------------------------------------------ - */ -$EXT->_call_hook('post_controller'); - -/* - * ------------------------------------------------------ - * Send the final rendered output to the browser - * ------------------------------------------------------ - */ - -if ($EXT->_call_hook('display_override') === FALSE) -{ - $OUT->_display(); -} - -/* - * ------------------------------------------------------ - * Is there a "post_system" hook? - * ------------------------------------------------------ - */ -$EXT->_call_hook('post_system'); - -/* - * ------------------------------------------------------ - * Close the DB connection if one exists - * ------------------------------------------------------ - */ -if (class_exists('CI_DB') AND isset($CI->db)) -{ - $CI->db->close(); -} - - +mark('total_execution_time_start'); +$BM->mark('loading_time_base_classes_start'); + +/* + * ------------------------------------------------------ + * Instantiate the hooks class + * ------------------------------------------------------ + */ + +$EXT =& load_class('Hooks'); + +/* + * ------------------------------------------------------ + * Is there a "pre_system" hook? + * ------------------------------------------------------ + */ +$EXT->_call_hook('pre_system'); + +/* + * ------------------------------------------------------ + * Instantiate the base classes + * ------------------------------------------------------ + */ + +$CFG =& load_class('Config'); +$RTR =& load_class('Router'); +$OUT =& load_class('Output'); + +/* + * ------------------------------------------------------ + * Is there a valid cache file? If so, we're done... + * ------------------------------------------------------ + */ + +if ($EXT->_call_hook('cache_override') === FALSE) +{ + if ($OUT->_display_cache($CFG, $RTR) == TRUE) + { + exit; + } +} + +/* + * ------------------------------------------------------ + * Load the remaining base classes + * ------------------------------------------------------ + */ + +$IN =& load_class('Input'); +$URI =& load_class('URI'); +$LANG =& load_class('Language'); + +/* + * ------------------------------------------------------ + * Load the app controller and local controller + * ------------------------------------------------------ + * + * Note: Due to the poor object handling in PHP 4 we'll + * conditionally load different versions of the base + * class. Retaining PHP 4 compatibility requires a bit of a hack. + * + * Note: The Loader class needs to be included first + * + */ +if (floor(phpversion()) < 5) +{ + load_class('Loader', FALSE); + require(BASEPATH.'codeigniter/Base4'.EXT); +} +else +{ + require(BASEPATH.'codeigniter/Base5'.EXT); +} + +// Load the base controller class +load_class('Controller', FALSE); + +// Load the local application controller +// Note: The Router class automatically validates the controller path. If this include fails it +// means that the default controller in the Routes.php file is not resolving to something valid. +if ( ! include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) +{ + show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); +} + +// Set a mark point for benchmarking +$BM->mark('loading_time_base_classes_end'); + + +/* + * ------------------------------------------------------ + * 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 + */ +$class = $RTR->fetch_class(); +$method = $RTR->fetch_method(); + + +if ( ! class_exists($class) + OR $method == 'controller' + OR substr($method, 0, 1) == '_' + OR in_array($method, get_class_methods('Controller'), TRUE) + ) +{ + show_404(); +} + +/* + * ------------------------------------------------------ + * Is there a "pre_controller" hook? + * ------------------------------------------------------ + */ +$EXT->_call_hook('pre_controller'); + +/* + * ------------------------------------------------------ + * Instantiate the controller and call requested method + * ------------------------------------------------------ + */ + +// Mark a start point so we can benchmark the controller +$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); + +// Instantiate the Controller +$CI = new $class(); + +// Is this a scaffolding request? +if ($RTR->scaffolding_request === TRUE) +{ + if ($EXT->_call_hook('scaffolding_override') === FALSE) + { + $CI->_ci_scaffolding(); + } +} +else +{ + /* + * ------------------------------------------------------ + * Is there a "post_controller_constructor" hook? + * ------------------------------------------------------ + */ + $EXT->_call_hook('post_controller_constructor'); + + // Is there a "remap" function? + if (method_exists($CI, '_remap')) + { + $CI->_remap($method); + } + else + { + if ( ! method_exists($CI, $method)) + { + show_404(); + } + + // Call the requested method. + // Any URI segments present (besides the class/function) will be passed to the method for convenience + call_user_func_array(array(&$CI, $method), array_slice($RTR->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3))); + } +} + +// Mark a benchmark end point +$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end'); + +/* + * ------------------------------------------------------ + * Is there a "post_controller" hook? + * ------------------------------------------------------ + */ +$EXT->_call_hook('post_controller'); + +/* + * ------------------------------------------------------ + * Send the final rendered output to the browser + * ------------------------------------------------------ + */ + +if ($EXT->_call_hook('display_override') === FALSE) +{ + $OUT->_display(); +} + +/* + * ------------------------------------------------------ + * Is there a "post_system" hook? + * ------------------------------------------------------ + */ +$EXT->_call_hook('post_system'); + +/* + * ------------------------------------------------------ + * Close the DB connection if one exists + * ------------------------------------------------------ + */ +if (class_exists('CI_DB') AND isset($CI->db)) +{ + $CI->db->close(); +} + + ?> \ No newline at end of file From abd98ca5d86487008e61175ebfb384604f1a07c7 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 6 Feb 2007 18:30:04 +0000 Subject: [PATCH 0496/2544] removed a duplicate call to load the library --- user_guide/libraries/file_uploading.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 69fa2dfc..71b330f1 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -163,8 +163,6 @@

              The Controller

              function do_upload() { - $this->load->library('upload'); - $config['upload_path'] = './uploads/'; $config['allowed_types'] = 'gif|jpg|png'; $config['max_size'] = '100'; From c4e9dc961c67084294d1050545c451ba0319fbb5 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 6 Feb 2007 19:52:30 +0000 Subject: [PATCH 0497/2544] added missing 'quotes' in a few examples --- user_guide/helpers/url_helper.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 4f4ac95e..ad8ada3e 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -128,11 +128,11 @@

              anchor()

              Here are some examples:

              -echo anchor(news/local/123, My News); +echo anchor('news/local/123', 'My News');

              Would produce: <a href="http://www.your-site.com/index.php/news/local/123" title="My News">My News</a>

              -echo anchor(news/local/123, My News, array('title' => 'The best news!')); +echo anchor('news/local/123', 'My News', array('title' => 'The best news!'));

              Would produce: <a href="http://www.your-site.com/index.php/news/local/123" title="The best news!">My News</a>

              @@ -162,7 +162,7 @@

              anchor_popup()

              Note: The above attributes are the function defaults so you only need to set the ones that are different from what you need. If you want the function to use all of its defaults simply pass an empty array in the third parameter:

              -echo anchor_popup(news/local/123, 'Click Me!', array()); +echo anchor_popup('news/local/123', 'Click Me!', array());

              mailto()

              From 655bc02b4992d0ed764363f8181459d6390be24b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 6 Feb 2007 23:45:33 +0000 Subject: [PATCH 0498/2544] fixed grammer error in show_error message --- system/libraries/Loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index d1163071..aede38d7 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -526,7 +526,7 @@ function scaffolding($table = '') { if ($table === FALSE) { - show_error('You must include the name of the table you would like access when you initialize scaffolding'); + show_error('You must include the name of the table you would like to access when you initialize scaffolding'); } $CI =& get_instance(); From dbbe40862c895296a9e3d9e184ff2da3788800d4 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 13 Feb 2007 23:46:23 +0000 Subject: [PATCH 0499/2544] changed Content-Disposition: from "inline" to "attachment" for MSIE in force_download() --- system/helpers/download_helper.php | 190 ++++++++++++++--------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index dbedd872..34cc152c 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -1,96 +1,96 @@ - \ No newline at end of file From d62052a5333079984ee2e15602ef9adf4234e348 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 13 Feb 2007 23:48:54 +0000 Subject: [PATCH 0500/2544] download helper change note --- user_guide/changelog.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 24a1d26c..3e81cf0e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,8 +66,9 @@

              Version 1.5.1.1

              Release Date: January 27, 2007

              • Added support for captions in the Table Library
                • -
              • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
                • -
              • Fixed a bug in the form helper that gave textarea a value attribute
                • +
              • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
                • +
              • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
                • +
              • Fixed a bug in the form helper that gave textarea a value attribute
              • Fixed a bug in the Image Library that was ignoring resizing the same size image
              • Fixed some doc typos.
              From 6aa124847aae699f76c013343283a11bbb474f84 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 14 Feb 2007 00:00:07 +0000 Subject: [PATCH 0501/2544] added a few more changes to changelog --- user_guide/changelog.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3e81cf0e..ff7a8c22 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -68,6 +68,8 @@

              Version 1.5.1.1

            • Added support for captions in the Table Library
            • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
            • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
              • +
            • Removed unescaped variables in error messages of Input and Router classes
              • +
            • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
            • Fixed a bug in the form helper that gave textarea a value attribute
            • Fixed a bug in the Image Library that was ignoring resizing the same size image
            • Fixed some doc typos.
              • From 561b6bb7ca046f2e047560a7c8b0db5a6a9b2a51 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 14 Feb 2007 01:34:52 +0000 Subject: [PATCH 0502/2544] updated app_version --- system/codeigniter/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 1caf7c96..12f1a0d5 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -28,7 +28,7 @@ */ // CI Version -define('APPVER', '1.5.1.1'); +define('APPVER', '1.5.2'); /* * ------------------------------------------------------ From 09de1854b1ac78f81264ca7a6b9d849ddcd1d159 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 14 Feb 2007 01:35:56 +0000 Subject: [PATCH 0503/2544] updated AR join() to accommodate database prefixes --- system/database/DB_active_rec.php | 1777 +++++++++++++++-------------- 1 file changed, 891 insertions(+), 886 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index d27d3dc1..1c72528e 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1,887 +1,892 @@ -ar_select[] = $val; - } - return $this; - } - - // -------------------------------------------------------------------- - - /** - * DISTINCT - * - * Sets a flag which tells the query string compiler to add DISTINCT - * - * @access public - * @param bool - * @return object - */ - function distinct($val = TRUE) - { - $this->ar_distinct = (is_bool($val)) ? $val : TRUE; - return $this; - } - - // -------------------------------------------------------------------- - - /** - * From - * - * Generates the FROM portion of the query - * - * @access public - * @param mixed can be a string or array - * @return object - */ - function from($from) - { - foreach ((array)$from as $val) - { - $this->ar_from[] = $this->dbprefix.$val; - } - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Join - * - * Generates the JOIN portion of the query - * - * @access public - * @param string - * @param string the join condition - * @param string the type of join - * @return object - */ - function join($table, $cond, $type = '') - { - if ($type != '') - { - $type = strtoupper(trim($type)); - - if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER'), TRUE)) - { - $type = ''; - } - else - { - $type .= ' '; - } - } - - // If a DB prefix is used we might need to add it to the column names - if ($this->dbprefix) - { - // First we remove any existing prefixes in the condition to avoid duplicates - $cond = preg_replace('|('.$this->dbprefix.')([\w\.]+)([\W\s]+)|', "$2$3", $cond); - - // Next we add the prefixes to the condition - $cond = preg_replace('|([\w\.]+)([\W\s]+)(.+)|', $this->dbprefix . "$1$2" . $this->dbprefix . "$3", $cond); - } - - $this->ar_join[] = $type.'JOIN '.$this->dbprefix.$table.' ON '.$cond; - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Where - * - * Generates the WHERE portion of the query. Separates - * multiple calls with AND - * - * @access public - * @param mixed - * @param mixed - * @return object - */ - function where($key, $value = NULL) - { - return $this->_where($key, $value, 'AND '); - } - - // -------------------------------------------------------------------- - - /** - * OR Where - * - * Generates the WHERE portion of the query. Separates - * multiple calls with OR - * - * @access public - * @param mixed - * @param mixed - * @return object - */ - function orwhere($key, $value = NULL) - { - return $this->_where($key, $value, 'OR '); - } - - // -------------------------------------------------------------------- - - /** - * Where - * - * Called by where() or orwhere() - * - * @access private - * @param mixed - * @param mixed - * @param string - * @return object - */ - function _where($key, $value = NULL, $type = 'AND ') - { - if ( ! is_array($key)) - { - $key = array($key => $value); - } - - foreach ($key as $k => $v) - { - $prefix = (count($this->ar_where) == 0) ? '' : $type; - - if ( ! is_null($v)) - { - if ( ! $this->_has_operator($k)) - { - $k .= ' ='; - } - - $v = ' '.$this->escape($v); - } - - $this->ar_where[] = $prefix.$k.$v; - } - return $this; - } - - - - // -------------------------------------------------------------------- - - /** - * Like - * - * Generates a %LIKE% portion of the query. Separates - * multiple calls with AND - * - * @access public - * @param mixed - * @param mixed - * @return object - */ - function like($field, $match = '') - { - return $this->_like($field, $match, 'AND '); - } - - // -------------------------------------------------------------------- - - /** - * OR Like - * - * Generates a %LIKE% portion of the query. Separates - * multiple calls with OR - * - * @access public - * @param mixed - * @param mixed - * @return object - */ - function orlike($field, $match = '') - { - return $this->_like($field, $match, 'OR '); - } - - // -------------------------------------------------------------------- - - /** - * Like - * - * Called by like() or orlike() - * - * @access private - * @param mixed - * @param mixed - * @param string - * @return object - */ - function _like($field, $match = '', $type = 'AND ') - { - if ( ! is_array($field)) - { - $field = array($field => $match); - } - - foreach ($field as $k => $v) - { - $prefix = (count($this->ar_like) == 0) ? '' : $type; - - $v = $this->escape_str($v); - - $this->ar_like[] = $prefix." $k LIKE '%{$v}%'"; - } - return $this; - } - - // -------------------------------------------------------------------- - - /** - * GROUP BY - * - * @access public - * @param string - * @return object - */ - function groupby($by) - { - if (is_string($by)) - { - $by = explode(',', $by); - } - - foreach ($by as $val) - { - $val = trim($val); - - if ($val != '') - $this->ar_groupby[] = $val; - } - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Sets the HAVING value - * - * Separates multiple calls with AND - * - * @access public - * @param string - * @param string - * @return object - */ - function having($key, $value = '') - { - return $this->_having($key, $value, 'AND '); - } - - // -------------------------------------------------------------------- - - /** - * Sets the OR HAVING value - * - * Separates multiple calls with OR - * - * @access public - * @param string - * @param string - * @return object - */ - function orhaving($key, $value = '') - { - return $this->_having($key, $value, 'OR '); - } - - // -------------------------------------------------------------------- - - /** - * Sets the HAVING values - * - * Called by having() or orhaving() - * - * @access private - * @param string - * @param string - * @return object - */ - function _having($key, $value = '', $type = 'AND ') - { - if ( ! is_array($key)) - { - $key = array($key => $value); - } - - foreach ($key as $k => $v) - { - $prefix = (count($this->ar_having) == 0) ? '' : $type; - - if ($v != '') - { - $v = ' '.$this->escape($v); - } - - $this->ar_having[] = $prefix.$k.$v; - } - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Sets the ORDER BY value - * - * @access public - * @param string - * @param string direction: asc or desc - * @return object - */ - function orderby($orderby, $direction = '') - { - if (trim($direction) != '') - { - $direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC', 'RAND()'), TRUE)) ? ' '.$direction : ' ASC'; - } - - $this->ar_orderby[] = $orderby.$direction; - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Sets the LIMIT value - * - * @access public - * @param integer the limit value - * @param integer the offset value - * @return object - */ - function limit($value, $offset = '') - { - $this->ar_limit = $value; - - if ($offset != '') - $this->ar_offset = $offset; - - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Sets the OFFSET value - * - * @access public - * @param integer the offset value - * @return object - */ - function offset($value) - { - $this->ar_offset = $value; - return $this; - } - - // -------------------------------------------------------------------- - - /** - * The "set" function. Allows key/value pairs to be set for inserting or updating - * - * @access public - * @param mixed - * @param string - * @return object - */ - function set($key, $value = '') - { - $key = $this->_object_to_array($key); - - if ( ! is_array($key)) - { - $key = array($key => $value); - } - - foreach ($key as $k => $v) - { - $this->ar_set[$k] = $this->escape($v); - } - - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Get - * - * Compiles the select statement based on the other functions called - * and runs the query - * - * @access public - * @param string the limit clause - * @param string the offset clause - * @return object - */ - function get($table = '', $limit = null, $offset = null) - { - if ($table != '') - { - $this->from($table); - } - - if ( ! is_null($limit)) - { - $this->limit($limit, $offset); - } - - $sql = $this->_compile_select(); - - $result = $this->query($sql); - $this->_reset_select(); - return $result; - } - - // -------------------------------------------------------------------- - - /** - * GetWhere - * - * Allows the where clause, limit and offset to be added directly - * - * @access public - * @param string the where clause - * @param string the limit clause - * @param string the offset clause - * @return object - */ - function getwhere($table = '', $where = null, $limit = null, $offset = null) - { - if ($table != '') - { - $this->from($table); - } - - if ( ! is_null($where)) - { - $this->where($where); - } - - if ( ! is_null($limit)) - { - $this->limit($limit, $offset); - } - - $sql = $this->_compile_select(); - - $result = $this->query($sql); - $this->_reset_select(); - return $result; - } - - // -------------------------------------------------------------------- - - /** - * Insert - * - * Compiles an insert string and runs the query - * - * @access public - * @param string the table to retrieve the results from - * @param array an associative array of insert values - * @return object - */ - function insert($table = '', $set = NULL) - { - if ( ! is_null($set)) - { - $this->set($set); - } - - if (count($this->ar_set) == 0) - { - if ($this->db_debug) - { - return $this->display_error('db_must_use_set'); - } - return FALSE; - } - - if ($table == '') - { - if ( ! isset($this->ar_from[0])) - { - if ($this->db_debug) - { - return $this->display_error('db_must_set_table'); - } - return FALSE; - } - - $table = $this->ar_from[0]; - } - - $sql = $this->_insert($this->dbprefix.$table, array_keys($this->ar_set), array_values($this->ar_set)); - - $this->_reset_write(); - return $this->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Update - * - * Compiles an update string and runs the query - * - * @access public - * @param string the table to retrieve the results from - * @param array an associative array of update values - * @param mixed the where clause - * @return object - */ - function update($table = '', $set = NULL, $where = null) - { - if ( ! is_null($set)) - { - $this->set($set); - } - - if (count($this->ar_set) == 0) - { - if ($this->db_debug) - { - return $this->display_error('db_must_use_set'); - } - return FALSE; - } - - if ($table == '') - { - if ( ! isset($this->ar_from[0])) - { - if ($this->db_debug) - { - return $this->display_error('db_must_set_table'); - } - return FALSE; - } - - $table = $this->ar_from[0]; - } - - if ($where != null) - { - $this->where($where); - } - - $sql = $this->_update($this->dbprefix.$table, $this->ar_set, $this->ar_where); - - $this->_reset_write(); - return $this->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Delete - * - * Compiles a delete string and runs the query - * - * @access public - * @param string the table to retrieve the results from - * @param mixed the where clause - * @return object - */ - function delete($table = '', $where = '') - { - if ($table == '') - { - if ( ! isset($this->ar_from[0])) - { - if ($this->db_debug) - { - return $this->display_error('db_must_set_table'); - } - return FALSE; - } - - $table = $this->ar_from[0]; - } - - if ($where != '') - { - $this->where($where); - } - - if (count($this->ar_where) == 0) - { - if ($this->db_debug) - { - return $this->display_error('db_del_must_use_where'); - } - return FALSE; - } - - $sql = $this->_delete($this->dbprefix.$table, $this->ar_where); - - $this->_reset_write(); - return $this->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Use Table - DEPRECATED - * - * @deprecated use $this->db->from instead - */ - function use_table($table) - { - return $this->from($table); - return $this; - } - - // -------------------------------------------------------------------- - - /** - * ORDER BY - DEPRECATED - * - * @deprecated use $this->db->orderby() instead - */ - function order_by($orderby, $direction = '') - { - return $this->orderby($orderby, $direction); - } - - // -------------------------------------------------------------------- - - /** - * Tests whether the string has an SQL operator - * - * @access private - * @param string - * @return bool - */ - function _has_operator($str) - { - $str = trim($str); - if ( ! preg_match("/(\s|<|>|!|=|is null|is not null)/i", $str)) - { - return FALSE; - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Compile the SELECT statement - * - * Generates a query string based on which functions were used. - * Should not be called directly. The get() function calls it. - * - * @access private - * @return string - */ - function _compile_select() - { - $sql = ( ! $this->ar_distinct) ? 'SELECT ' : 'SELECT DISTINCT '; - - $sql .= (count($this->ar_select) == 0) ? '*' : implode(', ', $this->ar_select); - - if (count($this->ar_from) > 0) - { - $sql .= "\nFROM "; - $sql .= implode(', ', $this->ar_from); - } - - if (count($this->ar_join) > 0) - { - $sql .= "\n"; - $sql .= implode("\n", $this->ar_join); - } - - if (count($this->ar_where) > 0 OR count($this->ar_like) > 0) - { - $sql .= "\nWHERE "; - } - - $sql .= implode("\n", $this->ar_where); - - if (count($this->ar_like) > 0) - { - if (count($this->ar_where) > 0) - { - $sql .= " AND "; - } - - $sql .= implode("\n", $this->ar_like); - } - - if (count($this->ar_groupby) > 0) - { - $sql .= "\nGROUP BY "; - $sql .= implode(', ', $this->ar_groupby); - } - - if (count($this->ar_having) > 0) - { - $sql .= "\nHAVING "; - $sql .= implode("\n", $this->ar_having); - } - - if (count($this->ar_orderby) > 0) - { - $sql .= "\nORDER BY "; - $sql .= implode(', ', $this->ar_orderby); - - if ($this->ar_order !== FALSE) - { - $sql .= ($this->ar_order == 'desc') ? ' DESC' : ' ASC'; - } - } - - if (is_numeric($this->ar_limit)) - { - $sql .= "\n"; - $sql = $this->_limit($sql, $this->ar_limit, $this->ar_offset); - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Object to Array - * - * Takes an object as input and converts the class variables to array key/vals - * - * @access public - * @param object - * @return array - */ - function _object_to_array($object) - { - if ( ! is_object($object)) - { - return $object; - } - - $array = array(); - foreach (get_object_vars($object) as $key => $val) - { - if ( ! is_object($val) AND ! is_array($val)) - { - $array[$key] = $val; - } - } - - return $array; - } - - // -------------------------------------------------------------------- - - /** - * Resets the active record values. Called by the get() function - * - * @access private - * @return void - */ - function _reset_select() - { - $this->ar_select = array(); - $this->ar_distinct = FALSE; - $this->ar_from = array(); - $this->ar_join = array(); - $this->ar_where = array(); - $this->ar_like = array(); - $this->ar_groupby = array(); - $this->ar_having = array(); - $this->ar_limit = FALSE; - $this->ar_offset = FALSE; - $this->ar_order = FALSE; - $this->ar_orderby = array(); - } - - // -------------------------------------------------------------------- - - /** - * Resets the active record "write" values. - * - * Called by the insert() or update() functions - * - * @access private - * @return void - */ - function _reset_write() - { - $this->ar_set = array(); - $this->ar_from = array(); - $this->ar_where = array(); - } - -} - +ar_select[] = $val; + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * DISTINCT + * + * Sets a flag which tells the query string compiler to add DISTINCT + * + * @access public + * @param bool + * @return object + */ + function distinct($val = TRUE) + { + $this->ar_distinct = (is_bool($val)) ? $val : TRUE; + return $this; + } + + // -------------------------------------------------------------------- + + /** + * From + * + * Generates the FROM portion of the query + * + * @access public + * @param mixed can be a string or array + * @return object + */ + function from($from) + { + foreach ((array)$from as $val) + { + $this->ar_from[] = $this->dbprefix.$val; + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Join + * + * Generates the JOIN portion of the query + * + * @access public + * @param string + * @param string the join condition + * @param string the type of join + * @return object + */ + function join($table, $cond, $type = '') + { + if ($type != '') + { + $type = strtoupper(trim($type)); + + if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER'), TRUE)) + { + $type = ''; + } + else + { + $type .= ' '; + } + } + + if ($this->dbprefix) + { + $cond = preg_replace('|([\w\.]+)([\W\s]+)(.+)|', $this->dbprefix . "$1$2" . $this->dbprefix . "$3", $cond); + } + + // If a DB prefix is used we might need to add it to the column names + if ($this->dbprefix) + { + // First we remove any existing prefixes in the condition to avoid duplicates + $cond = preg_replace('|('.$this->dbprefix.')([\w\.]+)([\W\s]+)|', "$2$3", $cond); + + // Next we add the prefixes to the condition + $cond = preg_replace('|([\w\.]+)([\W\s]+)(.+)|', $this->dbprefix . "$1$2" . $this->dbprefix . "$3", $cond); + } + + $this->ar_join[] = $type.'JOIN '.$this->dbprefix.$table.' ON '.$cond; + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Where + * + * Generates the WHERE portion of the query. Separates + * multiple calls with AND + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function where($key, $value = NULL) + { + return $this->_where($key, $value, 'AND '); + } + + // -------------------------------------------------------------------- + + /** + * OR Where + * + * Generates the WHERE portion of the query. Separates + * multiple calls with OR + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function orwhere($key, $value = NULL) + { + return $this->_where($key, $value, 'OR '); + } + + // -------------------------------------------------------------------- + + /** + * Where + * + * Called by where() or orwhere() + * + * @access private + * @param mixed + * @param mixed + * @param string + * @return object + */ + function _where($key, $value = NULL, $type = 'AND ') + { + if ( ! is_array($key)) + { + $key = array($key => $value); + } + + foreach ($key as $k => $v) + { + $prefix = (count($this->ar_where) == 0) ? '' : $type; + + if ( ! is_null($v)) + { + if ( ! $this->_has_operator($k)) + { + $k .= ' ='; + } + + $v = ' '.$this->escape($v); + } + + $this->ar_where[] = $prefix.$k.$v; + } + return $this; + } + + + + // -------------------------------------------------------------------- + + /** + * Like + * + * Generates a %LIKE% portion of the query. Separates + * multiple calls with AND + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function like($field, $match = '') + { + return $this->_like($field, $match, 'AND '); + } + + // -------------------------------------------------------------------- + + /** + * OR Like + * + * Generates a %LIKE% portion of the query. Separates + * multiple calls with OR + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function orlike($field, $match = '') + { + return $this->_like($field, $match, 'OR '); + } + + // -------------------------------------------------------------------- + + /** + * Like + * + * Called by like() or orlike() + * + * @access private + * @param mixed + * @param mixed + * @param string + * @return object + */ + function _like($field, $match = '', $type = 'AND ') + { + if ( ! is_array($field)) + { + $field = array($field => $match); + } + + foreach ($field as $k => $v) + { + $prefix = (count($this->ar_like) == 0) ? '' : $type; + + $v = $this->escape_str($v); + + $this->ar_like[] = $prefix." $k LIKE '%{$v}%'"; + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * GROUP BY + * + * @access public + * @param string + * @return object + */ + function groupby($by) + { + if (is_string($by)) + { + $by = explode(',', $by); + } + + foreach ($by as $val) + { + $val = trim($val); + + if ($val != '') + $this->ar_groupby[] = $val; + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Sets the HAVING value + * + * Separates multiple calls with AND + * + * @access public + * @param string + * @param string + * @return object + */ + function having($key, $value = '') + { + return $this->_having($key, $value, 'AND '); + } + + // -------------------------------------------------------------------- + + /** + * Sets the OR HAVING value + * + * Separates multiple calls with OR + * + * @access public + * @param string + * @param string + * @return object + */ + function orhaving($key, $value = '') + { + return $this->_having($key, $value, 'OR '); + } + + // -------------------------------------------------------------------- + + /** + * Sets the HAVING values + * + * Called by having() or orhaving() + * + * @access private + * @param string + * @param string + * @return object + */ + function _having($key, $value = '', $type = 'AND ') + { + if ( ! is_array($key)) + { + $key = array($key => $value); + } + + foreach ($key as $k => $v) + { + $prefix = (count($this->ar_having) == 0) ? '' : $type; + + if ($v != '') + { + $v = ' '.$this->escape($v); + } + + $this->ar_having[] = $prefix.$k.$v; + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Sets the ORDER BY value + * + * @access public + * @param string + * @param string direction: asc or desc + * @return object + */ + function orderby($orderby, $direction = '') + { + if (trim($direction) != '') + { + $direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC', 'RAND()'), TRUE)) ? ' '.$direction : ' ASC'; + } + + $this->ar_orderby[] = $orderby.$direction; + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Sets the LIMIT value + * + * @access public + * @param integer the limit value + * @param integer the offset value + * @return object + */ + function limit($value, $offset = '') + { + $this->ar_limit = $value; + + if ($offset != '') + $this->ar_offset = $offset; + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Sets the OFFSET value + * + * @access public + * @param integer the offset value + * @return object + */ + function offset($value) + { + $this->ar_offset = $value; + return $this; + } + + // -------------------------------------------------------------------- + + /** + * The "set" function. Allows key/value pairs to be set for inserting or updating + * + * @access public + * @param mixed + * @param string + * @return object + */ + function set($key, $value = '') + { + $key = $this->_object_to_array($key); + + if ( ! is_array($key)) + { + $key = array($key => $value); + } + + foreach ($key as $k => $v) + { + $this->ar_set[$k] = $this->escape($v); + } + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Get + * + * Compiles the select statement based on the other functions called + * and runs the query + * + * @access public + * @param string the limit clause + * @param string the offset clause + * @return object + */ + function get($table = '', $limit = null, $offset = null) + { + if ($table != '') + { + $this->from($table); + } + + if ( ! is_null($limit)) + { + $this->limit($limit, $offset); + } + + $sql = $this->_compile_select(); + + $result = $this->query($sql); + $this->_reset_select(); + return $result; + } + + // -------------------------------------------------------------------- + + /** + * GetWhere + * + * Allows the where clause, limit and offset to be added directly + * + * @access public + * @param string the where clause + * @param string the limit clause + * @param string the offset clause + * @return object + */ + function getwhere($table = '', $where = null, $limit = null, $offset = null) + { + if ($table != '') + { + $this->from($table); + } + + if ( ! is_null($where)) + { + $this->where($where); + } + + if ( ! is_null($limit)) + { + $this->limit($limit, $offset); + } + + $sql = $this->_compile_select(); + + $result = $this->query($sql); + $this->_reset_select(); + return $result; + } + + // -------------------------------------------------------------------- + + /** + * Insert + * + * Compiles an insert string and runs the query + * + * @access public + * @param string the table to retrieve the results from + * @param array an associative array of insert values + * @return object + */ + function insert($table = '', $set = NULL) + { + if ( ! is_null($set)) + { + $this->set($set); + } + + if (count($this->ar_set) == 0) + { + if ($this->db_debug) + { + return $this->display_error('db_must_use_set'); + } + return FALSE; + } + + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + $sql = $this->_insert($this->dbprefix.$table, array_keys($this->ar_set), array_values($this->ar_set)); + + $this->_reset_write(); + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Update + * + * Compiles an update string and runs the query + * + * @access public + * @param string the table to retrieve the results from + * @param array an associative array of update values + * @param mixed the where clause + * @return object + */ + function update($table = '', $set = NULL, $where = null) + { + if ( ! is_null($set)) + { + $this->set($set); + } + + if (count($this->ar_set) == 0) + { + if ($this->db_debug) + { + return $this->display_error('db_must_use_set'); + } + return FALSE; + } + + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + if ($where != null) + { + $this->where($where); + } + + $sql = $this->_update($this->dbprefix.$table, $this->ar_set, $this->ar_where); + + $this->_reset_write(); + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Delete + * + * Compiles a delete string and runs the query + * + * @access public + * @param string the table to retrieve the results from + * @param mixed the where clause + * @return object + */ + function delete($table = '', $where = '') + { + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + if ($where != '') + { + $this->where($where); + } + + if (count($this->ar_where) == 0) + { + if ($this->db_debug) + { + return $this->display_error('db_del_must_use_where'); + } + return FALSE; + } + + $sql = $this->_delete($this->dbprefix.$table, $this->ar_where); + + $this->_reset_write(); + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Use Table - DEPRECATED + * + * @deprecated use $this->db->from instead + */ + function use_table($table) + { + return $this->from($table); + return $this; + } + + // -------------------------------------------------------------------- + + /** + * ORDER BY - DEPRECATED + * + * @deprecated use $this->db->orderby() instead + */ + function order_by($orderby, $direction = '') + { + return $this->orderby($orderby, $direction); + } + + // -------------------------------------------------------------------- + + /** + * Tests whether the string has an SQL operator + * + * @access private + * @param string + * @return bool + */ + function _has_operator($str) + { + $str = trim($str); + if ( ! preg_match("/(\s|<|>|!|=|is null|is not null)/i", $str)) + { + return FALSE; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Compile the SELECT statement + * + * Generates a query string based on which functions were used. + * Should not be called directly. The get() function calls it. + * + * @access private + * @return string + */ + function _compile_select() + { + $sql = ( ! $this->ar_distinct) ? 'SELECT ' : 'SELECT DISTINCT '; + + $sql .= (count($this->ar_select) == 0) ? '*' : implode(', ', $this->ar_select); + + if (count($this->ar_from) > 0) + { + $sql .= "\nFROM "; + $sql .= implode(', ', $this->ar_from); + } + + if (count($this->ar_join) > 0) + { + $sql .= "\n"; + $sql .= implode("\n", $this->ar_join); + } + + if (count($this->ar_where) > 0 OR count($this->ar_like) > 0) + { + $sql .= "\nWHERE "; + } + + $sql .= implode("\n", $this->ar_where); + + if (count($this->ar_like) > 0) + { + if (count($this->ar_where) > 0) + { + $sql .= " AND "; + } + + $sql .= implode("\n", $this->ar_like); + } + + if (count($this->ar_groupby) > 0) + { + $sql .= "\nGROUP BY "; + $sql .= implode(', ', $this->ar_groupby); + } + + if (count($this->ar_having) > 0) + { + $sql .= "\nHAVING "; + $sql .= implode("\n", $this->ar_having); + } + + if (count($this->ar_orderby) > 0) + { + $sql .= "\nORDER BY "; + $sql .= implode(', ', $this->ar_orderby); + + if ($this->ar_order !== FALSE) + { + $sql .= ($this->ar_order == 'desc') ? ' DESC' : ' ASC'; + } + } + + if (is_numeric($this->ar_limit)) + { + $sql .= "\n"; + $sql = $this->_limit($sql, $this->ar_limit, $this->ar_offset); + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Object to Array + * + * Takes an object as input and converts the class variables to array key/vals + * + * @access public + * @param object + * @return array + */ + function _object_to_array($object) + { + if ( ! is_object($object)) + { + return $object; + } + + $array = array(); + foreach (get_object_vars($object) as $key => $val) + { + if ( ! is_object($val) AND ! is_array($val)) + { + $array[$key] = $val; + } + } + + return $array; + } + + // -------------------------------------------------------------------- + + /** + * Resets the active record values. Called by the get() function + * + * @access private + * @return void + */ + function _reset_select() + { + $this->ar_select = array(); + $this->ar_distinct = FALSE; + $this->ar_from = array(); + $this->ar_join = array(); + $this->ar_where = array(); + $this->ar_like = array(); + $this->ar_groupby = array(); + $this->ar_having = array(); + $this->ar_limit = FALSE; + $this->ar_offset = FALSE; + $this->ar_order = FALSE; + $this->ar_orderby = array(); + } + + // -------------------------------------------------------------------- + + /** + * Resets the active record "write" values. + * + * Called by the insert() or update() functions + * + * @access private + * @return void + */ + function _reset_write() + { + $this->ar_set = array(); + $this->ar_from = array(); + $this->ar_where = array(); + } + +} + ?> \ No newline at end of file From f743c737d13025336672c99c7c9b8a0dff447d08 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 14 Feb 2007 01:36:46 +0000 Subject: [PATCH 0504/2544] Changed version number, added upgrade instructions --- user_guide/changelog.html | 9 +++++---- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/index.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/index.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 10 ++++++---- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 4 ++-- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 4 ++-- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 101 files changed, 112 insertions(+), 109 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ff7a8c22..dfde9185 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -33,7 +33,7 @@
              - +

              Code Igniter User Guide Version 1.5.1

              Code Igniter User Guide Version 1.5.2
              @@ -62,10 +62,11 @@

              Change Log

              -

              Version 1.5.1.1

              -

              Release Date: January 27, 2007

              +

              Version 1.5.2

              +

              Release Date: February 13, 2007

                -
              • Added support for captions in the Table Library
                • +
              • Added subversion information to the downloads page.
                • +
              • Added support for captions in the Table Library
              • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
              • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
              • Removed unescaped variables in error messages of Input and Router classes
                • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index d0657cda..7e0c14c8 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 6eb654ab..fa00e4ad 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 831d6e8a..9522c5d9 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 2e539597..e6d9a89d 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index cd09e07f..aa60af5d 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 80c0f233..6b1a2a1e 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index d6f273ed..091faaf6 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index ccd30696..b3bd3f68 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/index.html b/user_guide/database/index.html index d17e7052..d9c62169 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index ca618f17..cefcf234 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 53f4713e..c941d5b9 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index b105b00c..621f6fe0 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 9330faf4..5c59d786 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index dfe979c1..e9012740 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 89e53fd0..c97f4ba5 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index b40905c3..78c3620d 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index c16ad4cd..c63ed72c 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 8352fcd0..b5d5c80a 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index ef2d3fac..945791a4 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index aa64bb43..5121b7d8 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 86cd1528..7ab97d60 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index a3bfaa34..77c080cb 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index af7ae4b9..60456d33 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index e346bd67..2bae2639 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 86082d2e..1b9ad7a8 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/index.html b/user_guide/general/index.html index daef0008..2d3ad90a 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 74782269..d293920d 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 58712c70..13bd6b76 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 5ca1ae8b..d7e0e60a 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 61f4574a..0e83c5ca 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 77bb9eb1..688531e0 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index b3154f40..2a7fee2f 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 1163e6d5..e1d32417 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index e8d074e7..a4ca8dca 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index ea511373..ba1a804f 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 083be367..48c8ce81 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index f493c69b..e2ebbf23 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/general/views.html b/user_guide/general/views.html index a8d0fec2..21f8b5c0 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index a3f66fb5..328ca79a 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 4592a2ff..53418c8b 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index c6df300b..436ac88b 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index bc1e9050..497ac99b 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index c89257af..06b56ed7 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 68ce66eb..4d759a72 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 3dcb147b..8eea9610 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 8a81dde5..b89fc1c3 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index 67016035..66a0feec 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 3ac47a04..c52cf030 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 0fc96628..91392ad0 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index dd04451a..b0bbf8af 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 9a6fc358..2c39bb36 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index bafc6ac0..c5c413d2 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index b1d08412..b1137e8d 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index ad8ada3e..53cad703 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 119e8d20..af95ae55 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/index.html b/user_guide/index.html index 8c8ca265..10fee4bd 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 5acf04e5..1f5922a8 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                @@ -63,7 +63,8 @@

                Downloading Code Igniter

                +

                Subversion Server

                +

                Public subversion access is now available via http://dev.ellislab.com/svn/CodeIgniter/trunk please note that while every effort is made to keep this codebase functional, we cannot guarantee the functionality of code taken from the repository.

                +

                Subversion is a version control system.

                diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 4e4aa41d..60fa2acf 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 733012fa..ac131c46 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index b3817668..45f30eb2 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index ee26595e..ce0359d8 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index a494a092..085e6f14 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index df1a0719..1999ac08 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index e6570404..4e6916b3 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index bed67597..24676304 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 850c8ea4..ae1a2f99 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 5657595a..2114dfd0 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                @@ -99,7 +99,7 @@

                Step 2: Update your database.php file

                -

                Step 2: Update your config.php file

                +

                Step 3: Update your config.php file

                Open your application/config/config.php file and ADD these new items:

                diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 79bf31d6..3a24e9ee 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 04afb929..b6ac6338 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 35ba9cec..9d286aa5 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index a21812e0..499a4328 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 5c62f8a6..9196ea4c 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index d794d140..c38eafbf 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 3cb42dca..a69577c8 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 71b330f1..01f9b685 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 4e97f18c..898f769b 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 22c71c44..87b68d2e 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 4fef7091..9efa3017 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 139c2d52..e84773cc 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index d1784c5e..4bc5d634 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index ec76947b..82c2187b 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index c83f71ae..35c43504 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 880d2d4e..2907b786 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 087d2d1f..b212b697 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 8cd4a1e9..f62d2780 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 247347d9..be6779fd 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index d97fa6d4..401876ba 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 7e8f2d7d..b6d51bef 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 9649b013..7772ade7 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index dc74439b..0f8b141d 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 5a6bebcf..5f556388 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index fabe8a4f..3df99bf4 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/license.html b/user_guide/license.html index e4801817..f8806271 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 21d788d5..f9dcd30c 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.1

                Code Igniter User Guide Version 1.5.2
                @@ -65,7 +65,7 @@

                Application Flow Chart

                The following graphic illustrates how data flows throughout the system:

                -
                +
                  diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index d3d5e805..35f20540 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -33,7 +33,7 @@
                  - +

                  Code Igniter User Guide Version 1.5.1

                  Code Igniter User Guide Version 1.5.2
                  diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index ed3a670f..af7c2d4a 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -33,7 +33,7 @@
                  - +

                  Code Igniter User Guide Version 1.5.1

                  Code Igniter User Guide Version 1.5.2
                  diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index aea64f23..3c325069 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -33,7 +33,7 @@
                  - +

                  Code Igniter User Guide Version 1.5.1

                  Code Igniter User Guide Version 1.5.2
                  diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 8796934b..1166dee2 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -33,7 +33,7 @@
                  - +

                  Code Igniter User Guide Version 1.5.1

                  Code Igniter User Guide Version 1.5.2
                  diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index d081161e..ba863dd6 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -33,7 +33,7 @@
                  - +

                  Code Igniter User Guide Version 1.5.1

                  Code Igniter User Guide Version 1.5.2
                  diff --git a/user_guide/toc.html b/user_guide/toc.html index 8632ac9f..59eb9e60 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -34,7 +34,7 @@
                  - +

                  Code Igniter User Guide Version 1.5.1

                  Code Igniter User Guide Version 1.5.2
                  From b3e1c6a0d53cd0a09e0f2f674c9095acf8a5c41e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 14 Feb 2007 01:43:31 +0000 Subject: [PATCH 0505/2544] added link to upgrade instructions --- user_guide/installation/upgrading.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index b6ac6338..32907cda 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -65,6 +65,7 @@

                  Upgrading From a Previous Version

                  Please read the upgrade notes corresponding to the version you are upgrading from.

                    +
                  • Upgrading from 1.5.0 or 1.5.1 to 1.5.2
                  • Upgrading from 1.4.1 to 1.5.0
                  • Upgrading from 1.4.0 to 1.4.1
                  • Upgrading from 1.3.3 to 1.4.0
                    • From 4dde0de7576872c075171c75363dfad7e5528952 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 14 Feb 2007 22:44:36 +0000 Subject: [PATCH 0506/2544] fixed an undefined var --- system/libraries/Loader.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index aede38d7..e634c388 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -697,6 +697,7 @@ function _ci_load_class($class, $params = NULL) } // Lets search for the requested library file and load it. + $is_duplicate = FALSE; for ($i = 1; $i < 3; $i++) { $path = ($i % 2) ? APPPATH : BASEPATH; @@ -711,6 +712,7 @@ function _ci_load_class($class, $params = NULL) // Safety: Was the class already loaded by a previous call? if (in_array($fp, $this->_ci_classes)) { + $is_duplicate = TRUE; log_message('debug', $class." class already loaded. Second attempt ignored."); return; } From b4bca8e7344ad1d1c3e9d165a3a5b6a7650e2a28 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 15 Feb 2007 02:31:23 +0000 Subject: [PATCH 0507/2544] incorrect directory fixed --- user_guide/installation/upgrade_152.html | 116 +++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 user_guide/installation/upgrade_152.html diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html new file mode 100644 index 00000000..730b6f38 --- /dev/null +++ b/user_guide/installation/upgrade_152.html @@ -0,0 +1,116 @@ + + + + +Code Igniter User Guide + + + + + + + + + + + + + + + + + + + + + + +
                    + + + + + +

                    Code Igniter User Guide Version 1.5.2

                    +
                    + + + + + + + + + +
                    + + +
                    + + + +
                    + +

                    Upgrading from 1.5.0 to 1.5.2

                    + +

                    Note: The instructions on this page assume you are running version 1.5.0 or 1.5.1. If you +have not upgraded to that version please do so first.

                    + +

                    Before performing an update you should take your site offline by replacing the index.php file with a static one.

                    + + + +

                    Step 1: Update your Code Igniter files

                    + +

                    Replace these files and directories in your "system" folder with the new versions: + +

                      + +
                    • system/helpers/download_helper.php
                      • +
                    • system/helpers/form_helper.php
                      • +
                    • system/libraries/Table.php
                      • +
                    • system/libraries/User_agent.php
                      • +
                    • system/libraries/Exceptions.php
                      • +
                    • system/libraries/Input.php
                      • +
                    • system/libraries/Router.php
                      • +
                    • system/libraries/Loader.php
                      • +
                    • system/libraries/Image_lib.php
                      • +
                    • system/language/english/unit_test_lang.php
                      • +
                    • system/database/DB_active_rec.php
                      • +
                    • codeigniter/
                      • +
                    + +

                    Note: If you have any custom developed files in these folders please make copies of them first.

                    + + +

                    Step 2: Update your user guide

                    + +

                    Please also replace your local copy of the user guide with the new version.

                    + +
                    + + + + + + + \ No newline at end of file From c4ac15f47a73a2db99406d901d53803b87f255bb Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 15 Feb 2007 17:22:31 +0000 Subject: [PATCH 0508/2544] fixed a a value bug introduced when clearing value from textarea --- system/helpers/form_helper.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 8186d4cc..a166198f 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -196,9 +196,15 @@ function form_textarea($data = '', $value = '', $extra = '') { $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); - $val = (( ! is_array($data) OR ! isset($data['value'])) ? $value : $data['value']); - - unset ($data['value']); // textareas don't use the value attribute + if ( ! is_array($data) OR ! isset($data['value'])) + { + $val = $value; + } + else + { + $val = $data['value']; + unset($data['value']); // textareas don't use the value attribute + } return "\n"; } From a8b10bed6b1064548b8af605e5b16113b457de02 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 15 Feb 2007 18:20:05 +0000 Subject: [PATCH 0509/2544] allow for extending models --- system/libraries/Loader.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index e634c388..8438cc0b 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -154,10 +154,7 @@ function model($model, $name = '', $db_conn = FALSE) $CI->load->database($db_conn, FALSE, TRUE); } - if ( ! class_exists('Model')) - { - require_once(BASEPATH.'libraries/Model'.EXT); - } + load_class('Model', false); require_once(APPPATH.'models/'.$path.$model.EXT); From ac0eb4543ce713d0d25125614489de3b8b2fd296 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 15 Feb 2007 18:42:22 +0000 Subject: [PATCH 0510/2544] reverted a change user testing revealed a flaw. --- system/libraries/Loader.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 8438cc0b..e634c388 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -154,7 +154,10 @@ function model($model, $name = '', $db_conn = FALSE) $CI->load->database($db_conn, FALSE, TRUE); } - load_class('Model', false); + if ( ! class_exists('Model')) + { + require_once(BASEPATH.'libraries/Model'.EXT); + } require_once(APPPATH.'models/'.$path.$model.EXT); From 9e772fc9ab36f77c83f28dd1f19796f64cd2925a Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 15 Feb 2007 21:03:15 +0000 Subject: [PATCH 0511/2544] fixed another version number --- user_guide/changelog.html | 2 +- user_guide/installation/upgrade_152.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index dfde9185..bbc205a6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -77,7 +77,7 @@

                    Version 1.5.2

                  -

                  Version 1.5.0.2

                  +

                  Version 1.5.1

                  Release Date: November 23, 2006

                  • Added support for submitting arrays of libraries in the $this->load->library function.
                    • diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 730b6f38..947cd71d 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -86,6 +86,7 @@

                    Step 1: Update your Code Igniter files

                  • system/libraries/Image_lib.php
                  • system/language/english/unit_test_lang.php
                  • system/database/DB_active_rec.php
                    • +
                  • system/database/drivers/mysqli/mysqli_driver.php
                  • codeigniter/
                  From 5811bf1da422839d8dd6cfc7e6bac65649fceacd Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 20 Feb 2007 01:26:08 +0000 Subject: [PATCH 0512/2544] added a space to redirect Location to conform to w3c http spec --- system/helpers/url_helper.php | 984 +++++++++++++++++----------------- 1 file changed, 492 insertions(+), 492 deletions(-) diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 3ca59746..baac0e5d 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -1,493 +1,493 @@ -config->site_url($uri); -} - -// ------------------------------------------------------------------------ - -/** - * Base URL - * - * Returns the "base_url" item from your config file - * - * @access public - * @return string - */ -function base_url() -{ - $CI =& get_instance(); - return $CI->config->slash_item('base_url'); -} - -// ------------------------------------------------------------------------ - -/** - * Index page - * - * Returns the "index_page" from your config file - * - * @access public - * @return string - */ -function index_page() -{ - $CI =& get_instance(); - return $CI->config->item('index_page'); -} - -// ------------------------------------------------------------------------ - -/** - * Anchor Link - * - * Creates an anchor based on the local URL. - * - * @access public - * @param string the URL - * @param string the link title - * @param mixed any attributes - * @return string - */ -function anchor($uri = '', $title = '', $attributes = '') -{ - if ( ! is_array($uri)) - { - $site_url = ( ! preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri; - } - else - { - $site_url = site_url($uri); - } - - if ($title == '') - { - $title = $site_url; - } - - if ($attributes == '') - { - $attributes = ' title="'.$title.'"'; - } - else - { - $attributes = _parse_attributes($attributes); - } - - return ''.$title.''; -} - -// ------------------------------------------------------------------------ - -/** - * Anchor Link - Pop-up version - * - * Creates an anchor based on the local URL. The link - * opens a new window based on the attributes specified. - * - * @access public - * @param string the URL - * @param string the link title - * @param mixed any attributes - * @return string - */ -function anchor_popup($uri = '', $title = '', $attributes = FALSE) -{ - $site_url = ( ! preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri; - - if ($title == '') - { - $title = $site_url; - } - - if ($attributes === FALSE) - { - return "".$title.""; - } - - if ( ! is_array($attributes)) - { - $attributes = array(); - } - - foreach (array('width' => '800', 'height' => '600', 'scrollbars' => 'yes', 'status' => 'yes', 'resizable' => 'yes', 'screenx' => '0', 'screeny' => '0', ) as $key => $val) - { - $atts[$key] = ( ! isset($attributes[$key])) ? $val : $attributes[$key]; - } - - return "".$title.""; -} - -// ------------------------------------------------------------------------ - -/** - * Mailto Link - * - * @access public - * @param string the email address - * @param string the link title - * @param mixed any attributes - * @return string - */ -function mailto($email, $title = '', $attributes = '') -{ - if ($title == "") - { - $title = $email; - } - - $attributes = _parse_attributes($attributes); - - return ''.$title.''; -} - -// ------------------------------------------------------------------------ - -/** - * Encoded Mailto Link - * - * Create a spam-protected mailto link written in Javascript - * - * @access public - * @param string the email address - * @param string the link title - * @param mixed any attributes - * @return string - */ -function safe_mailto($email, $title = '', $attributes = '') -{ - if ($title == "") - { - $title = $email; - } - - for ($i = 0; $i < 16; $i++) - { - $x[] = substr(' $val) - { - $x[] = ' '.$key.'="'; - for ($i = 0; $i < strlen($val); $i++) - { - $x[] = "|".ord(substr($val, $i, 1)); - } - $x[] = '"'; - } - } - else - { - for ($i = 0; $i < strlen($attributes); $i++) - { - $x[] = substr($attributes, $i, 1); - } - } - } - - $x[] = '>'; - - $temp = array(); - for ($i = 0; $i < strlen($title); $i++) - { - $ordinal = ord($title[$i]); - - if ($ordinal < 128) - { - $x[] = "|".$ordinal; - } - else - { - if (count($temp) == 0) - { - $count = ($ordinal < 224) ? 2 : 3; - } - - $temp[] = $ordinal; - if (count($temp) == $count) - { - $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64); - $x[] = "|".$number; - $count = 1; - $temp = array(); - } - } - } - - $x[] = '<'; $x[] = '/'; $x[] = 'a'; $x[] = '>'; - - $x = array_reverse($x); - ob_start(); - -?>http'. - $matches['4'][$i].'://'. - $matches['5'][$i]. - $matches['6'][$i].''. - $period, $str); - } - } - } - - if ($type != 'url') - { - if (preg_match_all("/([a-zA-Z0-9_\.\-]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)/i", $str, $matches)) - { - for ($i = 0; $i < sizeof($matches['0']); $i++) - { - $period = ''; - if (preg_match("|\.$|", $matches['3'][$i])) - { - $period = '.'; - $matches['3'][$i] = substr($matches['3'][$i], 0, -1); - } - - $str = str_replace($matches['0'][$i], safe_mailto($matches['1'][$i].'@'.$matches['2'][$i].'.'.$matches['3'][$i]).$period, $str); - } - - } - } - return $str; -} - -// ------------------------------------------------------------------------ - -/** - * Prep URL - * - * Simply adds the http:// part if missing - * - * @access public - * @param string the URL - * @return string - */ -function prep_url($str = '') -{ - if ($str == 'http://' OR $str == '') - { - return ''; - } - - if (substr($str, 0, 7) != 'http://' && substr($str, 0, 8) != 'https://') - { - $str = 'http://'.$str; - } - - return $str; -} - -// ------------------------------------------------------------------------ - -/** - * Create URL Title - * - * Takes a "title" string as input and creates a - * human-friendly URL string with either a dash - * or an underscore as the word separator. - * - * @access public - * @param string the string - * @param string the separator: dash, or underscore - * @return string - */ -function url_title($str, $separator = 'dash') -{ - if ($separator == 'dash') - { - $search = '_'; - $replace = '-'; - } - else - { - $search = '-'; - $replace = '_'; - } - - $trans = array( - $search => $replace, - "\s+" => $replace, - "[^a-z0-9".$replace."]" => '', - $replace."+" => $replace, - $replace."$" => '', - "^".$replace => '' - ); - - $str = strip_tags(strtolower($str)); - - foreach ($trans as $key => $val) - { - $str = preg_replace("#".$key."#", $val, $str); - } - - return trim(stripslashes($str)); -} - -// ------------------------------------------------------------------------ - -/** - * Header Redirect - * - * Header redirect in two flavors - * - * @access public - * @param string the URL - * @param string the method: location or redirect - * @return string - */ -function redirect($uri = '', $method = 'location') -{ - switch($method) - { - case 'refresh' : header("Refresh:0;url=".site_url($uri)); - break; - default : header("location:".site_url($uri)); - break; - } - exit; -} - -// ------------------------------------------------------------------------ - -/** - * Parse out the attributes - * - * Some of the functions use this - * - * @access private - * @param array - * @param bool - * @return string - */ -function _parse_attributes($attributes, $javascript = FALSE) -{ - if (is_string($attributes)) - { - return ($attributes != '') ? ' '.$attributes : ''; - } - - $att = ''; - foreach ($attributes as $key => $val) - { - if ($javascript == TRUE) - { - $att .= $key . '=' . $val . ','; - } - else - { - $att .= ' ' . $key . '="' . $val . '"'; - } - } - - if ($javascript == TRUE AND $att != '') - { - $att = substr($att, 0, -1); - } - - return $att; -} - +config->site_url($uri); +} + +// ------------------------------------------------------------------------ + +/** + * Base URL + * + * Returns the "base_url" item from your config file + * + * @access public + * @return string + */ +function base_url() +{ + $CI =& get_instance(); + return $CI->config->slash_item('base_url'); +} + +// ------------------------------------------------------------------------ + +/** + * Index page + * + * Returns the "index_page" from your config file + * + * @access public + * @return string + */ +function index_page() +{ + $CI =& get_instance(); + return $CI->config->item('index_page'); +} + +// ------------------------------------------------------------------------ + +/** + * Anchor Link + * + * Creates an anchor based on the local URL. + * + * @access public + * @param string the URL + * @param string the link title + * @param mixed any attributes + * @return string + */ +function anchor($uri = '', $title = '', $attributes = '') +{ + if ( ! is_array($uri)) + { + $site_url = ( ! preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri; + } + else + { + $site_url = site_url($uri); + } + + if ($title == '') + { + $title = $site_url; + } + + if ($attributes == '') + { + $attributes = ' title="'.$title.'"'; + } + else + { + $attributes = _parse_attributes($attributes); + } + + return ''.$title.''; +} + +// ------------------------------------------------------------------------ + +/** + * Anchor Link - Pop-up version + * + * Creates an anchor based on the local URL. The link + * opens a new window based on the attributes specified. + * + * @access public + * @param string the URL + * @param string the link title + * @param mixed any attributes + * @return string + */ +function anchor_popup($uri = '', $title = '', $attributes = FALSE) +{ + $site_url = ( ! preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri; + + if ($title == '') + { + $title = $site_url; + } + + if ($attributes === FALSE) + { + return "".$title.""; + } + + if ( ! is_array($attributes)) + { + $attributes = array(); + } + + foreach (array('width' => '800', 'height' => '600', 'scrollbars' => 'yes', 'status' => 'yes', 'resizable' => 'yes', 'screenx' => '0', 'screeny' => '0', ) as $key => $val) + { + $atts[$key] = ( ! isset($attributes[$key])) ? $val : $attributes[$key]; + } + + return "".$title.""; +} + +// ------------------------------------------------------------------------ + +/** + * Mailto Link + * + * @access public + * @param string the email address + * @param string the link title + * @param mixed any attributes + * @return string + */ +function mailto($email, $title = '', $attributes = '') +{ + if ($title == "") + { + $title = $email; + } + + $attributes = _parse_attributes($attributes); + + return ''.$title.''; +} + +// ------------------------------------------------------------------------ + +/** + * Encoded Mailto Link + * + * Create a spam-protected mailto link written in Javascript + * + * @access public + * @param string the email address + * @param string the link title + * @param mixed any attributes + * @return string + */ +function safe_mailto($email, $title = '', $attributes = '') +{ + if ($title == "") + { + $title = $email; + } + + for ($i = 0; $i < 16; $i++) + { + $x[] = substr(' $val) + { + $x[] = ' '.$key.'="'; + for ($i = 0; $i < strlen($val); $i++) + { + $x[] = "|".ord(substr($val, $i, 1)); + } + $x[] = '"'; + } + } + else + { + for ($i = 0; $i < strlen($attributes); $i++) + { + $x[] = substr($attributes, $i, 1); + } + } + } + + $x[] = '>'; + + $temp = array(); + for ($i = 0; $i < strlen($title); $i++) + { + $ordinal = ord($title[$i]); + + if ($ordinal < 128) + { + $x[] = "|".$ordinal; + } + else + { + if (count($temp) == 0) + { + $count = ($ordinal < 224) ? 2 : 3; + } + + $temp[] = $ordinal; + if (count($temp) == $count) + { + $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64); + $x[] = "|".$number; + $count = 1; + $temp = array(); + } + } + } + + $x[] = '<'; $x[] = '/'; $x[] = 'a'; $x[] = '>'; + + $x = array_reverse($x); + ob_start(); + +?>http'. + $matches['4'][$i].'://'. + $matches['5'][$i]. + $matches['6'][$i].''. + $period, $str); + } + } + } + + if ($type != 'url') + { + if (preg_match_all("/([a-zA-Z0-9_\.\-]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)/i", $str, $matches)) + { + for ($i = 0; $i < sizeof($matches['0']); $i++) + { + $period = ''; + if (preg_match("|\.$|", $matches['3'][$i])) + { + $period = '.'; + $matches['3'][$i] = substr($matches['3'][$i], 0, -1); + } + + $str = str_replace($matches['0'][$i], safe_mailto($matches['1'][$i].'@'.$matches['2'][$i].'.'.$matches['3'][$i]).$period, $str); + } + + } + } + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Prep URL + * + * Simply adds the http:// part if missing + * + * @access public + * @param string the URL + * @return string + */ +function prep_url($str = '') +{ + if ($str == 'http://' OR $str == '') + { + return ''; + } + + if (substr($str, 0, 7) != 'http://' && substr($str, 0, 8) != 'https://') + { + $str = 'http://'.$str; + } + + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Create URL Title + * + * Takes a "title" string as input and creates a + * human-friendly URL string with either a dash + * or an underscore as the word separator. + * + * @access public + * @param string the string + * @param string the separator: dash, or underscore + * @return string + */ +function url_title($str, $separator = 'dash') +{ + if ($separator == 'dash') + { + $search = '_'; + $replace = '-'; + } + else + { + $search = '-'; + $replace = '_'; + } + + $trans = array( + $search => $replace, + "\s+" => $replace, + "[^a-z0-9".$replace."]" => '', + $replace."+" => $replace, + $replace."$" => '', + "^".$replace => '' + ); + + $str = strip_tags(strtolower($str)); + + foreach ($trans as $key => $val) + { + $str = preg_replace("#".$key."#", $val, $str); + } + + return trim(stripslashes($str)); +} + +// ------------------------------------------------------------------------ + +/** + * Header Redirect + * + * Header redirect in two flavors + * + * @access public + * @param string the URL + * @param string the method: location or redirect + * @return string + */ +function redirect($uri = '', $method = 'location') +{ + switch($method) + { + case 'refresh' : header("Refresh:0;url=".site_url($uri)); + break; + default : header("Location: ".site_url($uri)); + break; + } + exit; +} + +// ------------------------------------------------------------------------ + +/** + * Parse out the attributes + * + * Some of the functions use this + * + * @access private + * @param array + * @param bool + * @return string + */ +function _parse_attributes($attributes, $javascript = FALSE) +{ + if (is_string($attributes)) + { + return ($attributes != '') ? ' '.$attributes : ''; + } + + $att = ''; + foreach ($attributes as $key => $val) + { + if ($javascript == TRUE) + { + $att .= $key . '=' . $val . ','; + } + else + { + $att .= ' ' . $key . '="' . $val . '"'; + } + } + + if ($javascript == TRUE AND $att != '') + { + $att = substr($att, 0, -1); + } + + return $att; +} + ?> \ No newline at end of file From 7184e31bf641e181045dcfa95128e5a06b916130 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 20 Feb 2007 12:34:28 +0000 Subject: [PATCH 0513/2544] fixed a capitalize error --- user_guide/libraries/email.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index c38eafbf..c8d1c6e8 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -122,8 +122,8 @@

                  Setting Email Preferences

                  >

                  Setting Email Preferences in a Config File

                  If you prefer not to set preferences using the above method, you can instead put them into a config file. -Simply create a new file called the email.php, add the $config -array in that file. Then save the file at config/email.php and it will be used automatically. You +Simply create a new file called the Email.php, add the $config +array in that file. Then save the file at config/Email.php and it will be used automatically. You will NOT need to use the $this->email->initialize() function if you save your preferences in a config file.

                  From 67e1053780a45dbeedc3ed98361aa1fc3d4931b8 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 24 Feb 2007 15:13:17 +0000 Subject: [PATCH 0514/2544] result_array() returns an empty array when no result is produced. --- user_guide/database/results.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/database/results.html b/user_guide/database/results.html index c941d5b9..7b46d21b 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -105,7 +105,7 @@

                  result()

                  result_array()

                  -

                  This function returns the query result as a pure array, or FALSE on failure. Typically you'll use this in a foreach loop, like this:

                  +

                  This function returns the query result as a pure array, or an empty array when no result is produced. Typically you'll use this in a foreach loop, like this:

                  $query = $this->db->query("YOUR QUERY");

                  From 4d8c7bb4697aabe173fdd8e08ae182e1d5ba488e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 24 Feb 2007 17:26:33 +0000 Subject: [PATCH 0515/2544] image was corrupted. --- user_guide/images/ci_quick_ref.png | Bin 94906 -> 94476 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/user_guide/images/ci_quick_ref.png b/user_guide/images/ci_quick_ref.png index 1e74a4290eacd449a46769a33f9c856f4007842c..c07d6b46970bfde2affac0e50644db91414e41c0 100644 GIT binary patch delta 2361 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 From 112569db87d01a04b98eb6c37d9c9ced03b52f3f Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 26 Feb 2007 19:19:08 +0000 Subject: [PATCH 0516/2544] --- system/libraries/Input.php | 74 +++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index f346caba..0d41b0a9 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -91,6 +91,16 @@ function _sanitize_globals() { $_GET = array(); } + else + { + if (is_array($_GET) AND count($_GET) > 0) + { + foreach($_GET as $key => $val) + { + $_GET[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); + } + } + } // Clean $_POST Data if (is_array($_POST) AND count($_POST) > 0) @@ -173,6 +183,41 @@ function _clean_input_keys($str) return $str; } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the GET array + * + * @access public + * @param string + * @param bool + * @return string + */ + function post($index = '', $xss_clean = FALSE) + { + if ( ! isset($_GET[$index])) + { + return FALSE; + } + + if ($xss_clean === TRUE) + { + if (is_array($_GET[$index])) + { + foreach($_GET[$index] as $key => $val) + { + $_GET[$index][$key] = $this->xss_clean($val); + } + } + else + { + return $this->xss_clean($_GET[$index]); + } + } + + return $_GET[$index]; + } // -------------------------------------------------------------------- @@ -337,7 +382,34 @@ function ip_address() */ function valid_ip($ip) { - return ( ! preg_match( "/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $ip)) ? FALSE : TRUE; + if ( ! preg_match( "/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $ip)) + { + return FALSE; + } + + $octets = explode('.', $ip); + + for ($i = 1; $i <= 4; $i++) + { + $octet = intval($octets[($i-1)]); + if ($i === 1) + { + if ($octet > 223 OR $octet < 1) + return FALSE; + } + elseif ($i === 4) + { + if ($octet < 1) + return FALSE; + } + else + { + if ($octet > 254) + return FALSE; + } + } + + return TRUE; } // -------------------------------------------------------------------- From 090b2f7f2e9109b8cf03a3f64d520b50da4fc57a Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 1 Mar 2007 12:57:52 +0000 Subject: [PATCH 0517/2544] fixed a note in the xmlrpc server section --- user_guide/libraries/xmlrpc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 5f556388..5afbae98 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -183,7 +183,7 @@

                  Creating an XML-RPC Server

                  Here is an example to illustrate:

                  -$this->load->library('xmlrpcs');
                  +$this->load->library('xmlrpc');
                  $this->load->library('xmlrpcs');

                  $config['functions']['new_post'];  = array('function' => 'My_blog.new_entry');
                  From 87d1eeb9e1f5678c78e06c3a685fb3aa1a88ece3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 1 Mar 2007 13:20:43 +0000 Subject: [PATCH 0518/2544] function post() duplicated, changed the second to function get() --- system/libraries/Input.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 0d41b0a9..3a35f498 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -194,7 +194,7 @@ function _clean_input_keys($str) * @param bool * @return string */ - function post($index = '', $xss_clean = FALSE) + function get($index = '', $xss_clean = FALSE) { if ( ! isset($_GET[$index])) { From ba0dd638336d2617066b67cf4f59667aaff8c531 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 7 Mar 2007 12:10:58 +0000 Subject: [PATCH 0519/2544] pg_version() doesn't exist. Changed reference to version() which does. --- .../drivers/postgre/postgre_driver.php | 968 +++++++++--------- 1 file changed, 484 insertions(+), 484 deletions(-) diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index a66fddbd..58cc69a9 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -1,485 +1,485 @@ -port == '') ? '' : " port=".$this->port; - - return @pg_connect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - $port = ($this->port == '') ? '' : " port=".$this->port; - - return @pg_pconnect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - // Not needed for Postgre so we'll return TRUE - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT version() AS ver"; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - return @pg_query($this->conn_id, $sql); - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - return @pg_exec($this->conn_id, "begin"); - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - return @pg_exec($this->conn_id, "commit"); - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - return @pg_exec($this->conn_id, "rollback"); - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - return pg_escape_string($str); - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @pg_affected_rows($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - $v = pg_version($this->conn_id); - $v = $v['server']; - - $table = func_num_args() > 0 ? func_get_arg(0) : null; - $column = func_num_args() > 1 ? func_get_arg(1) : null; - - if ($table == null && $v >= '8.1') - { - $sql='SELECT LASTVAL() as ins_id'; - } - elseif ($table != null && $column != null && $v >= '8.0') - { - $sql = sprintf("SELECT pg_get_serial_sequence('%s','%s') as seq", $table, $column); - $query = $this->query($sql); - $row = $query->row(); - $sql = sprintf("SELECT CURRVAL('%s') as ins_id", $row->seq); - } - elseif ($table != null) - { - // seq_name passed in table parameter - $sql = sprintf("SELECT CURRVAL('%s') as ins_id", $table); - } - else - { - return pg_last_oid($this->result_id); - } - $query = $this->query($sql); - $row = $query->row(); - return $row->ins_id; - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query('SELECT COUNT(*) AS numrows FROM "'.$this->dbprefix.$table.'"'); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * Show table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @return string - */ - function _list_tables() - { - return "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SELECT column_name FROM information_schema.columns WHERE table_name ='".$this->_escape_table($table)."'"; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1"; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - return pg_last_error($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - return ''; - } - - // -------------------------------------------------------------------- - - /** - * Escape Table Name - * - * This function adds backticks if the table name has a period - * in it. Some DBs will get cranky unless periods are escaped. - * - * @access private - * @param string the table name - * @return string - */ - function _escape_table($table) - { - if (stristr($table, '.')) - { - $table = '"'.preg_replace("/\./", '"."', $table).'"'; - } - - return $table; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @return string - */ - function _update($table, $values, $where) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @return string - */ - function _delete($table, $where) - { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - $sql .= "LIMIT ".$limit; - - if ($offset > 0) - { - $sql .= " OFFSET ".$offset; - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @pg_close($conn_id); - } - - -} - +port == '') ? '' : " port=".$this->port; + + return @pg_connect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + $port = ($this->port == '') ? '' : " port=".$this->port; + + return @pg_pconnect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + // Not needed for Postgre so we'll return TRUE + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @pg_query($this->conn_id, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + return @pg_exec($this->conn_id, "begin"); + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + return @pg_exec($this->conn_id, "commit"); + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + return @pg_exec($this->conn_id, "rollback"); + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + return pg_escape_string($str); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @pg_affected_rows($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + $v = version($this->conn_id); + $v = $v['server']; + + $table = func_num_args() > 0 ? func_get_arg(0) : null; + $column = func_num_args() > 1 ? func_get_arg(1) : null; + + if ($table == null && $v >= '8.1') + { + $sql='SELECT LASTVAL() as ins_id'; + } + elseif ($table != null && $column != null && $v >= '8.0') + { + $sql = sprintf("SELECT pg_get_serial_sequence('%s','%s') as seq", $table, $column); + $query = $this->query($sql); + $row = $query->row(); + $sql = sprintf("SELECT CURRVAL('%s') as ins_id", $row->seq); + } + elseif ($table != null) + { + // seq_name passed in table parameter + $sql = sprintf("SELECT CURRVAL('%s') as ins_id", $table); + } + else + { + return pg_last_oid($this->result_id); + } + $query = $this->query($sql); + $row = $query->row(); + return $row->ins_id; + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query('SELECT COUNT(*) AS numrows FROM "'.$this->dbprefix.$table.'"'); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @return string + */ + function _list_tables() + { + return "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SELECT column_name FROM information_schema.columns WHERE table_name ='".$this->_escape_table($table)."'"; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return pg_last_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return ''; + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped. + * + * @access private + * @param string the table name + * @return string + */ + function _escape_table($table) + { + if (stristr($table, '.')) + { + $table = '"'.preg_replace("/\./", '"."', $table).'"'; + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $sql .= "LIMIT ".$limit; + + if ($offset > 0) + { + $sql .= " OFFSET ".$offset; + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @pg_close($conn_id); + } + + +} + ?> \ No newline at end of file From 0ae7f300e65c0035bcf7c96c8728549eb23564b9 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 7 Mar 2007 12:12:46 +0000 Subject: [PATCH 0520/2544] --- user_guide/changelog.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index bbc205a6..b848b086 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -62,6 +62,11 @@

                  Change Log

                  +

                  Version 1.5.3

                  +

                  Release Date:

                  +
                    +
                  • Fixed a version but in the Postgre driver
                    • +

                  Version 1.5.2

                  Release Date: February 13, 2007

                    From 8389487656f0f8c027b0cfe38014b7035be10888 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 13 Mar 2007 20:51:52 +0000 Subject: [PATCH 0521/2544] removed duplicate 'DATE_RFC822' --- system/helpers/date_helper.php | 1129 ++++++++++++++++---------------- 1 file changed, 564 insertions(+), 565 deletions(-) diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index b8df03ed..504a962c 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -1,566 +1,565 @@ -config->item('time_reference')) == 'gmt') - { - $now = time(); - $system_time = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now)); - - if (strlen($system_time) < 10) - { - $system_time = time(); - log_message('error', 'The Date class could not set a proper GMT timestamp so the local time() value was used.'); - } - - return $system_time; - } - else - { - return time(); - } -} - -// ------------------------------------------------------------------------ - -/** - * Convert MySQL Style Datecodes - * - * This function is identical to PHPs date() function, - * except that it allows date codes to be formatted using - * the MySQL style, where each code letter is preceded - * with a percent sign: %Y %m %d etc... - * - * The benefit of doing dates this way is that you don't - * have to worry about escaping your text letters that - * match the date codes. - * - * @access public - * @param string - * @param integer - * @return integer - */ -function mdate($datestr = '', $time = '') -{ - if ($datestr == '') - return ''; - - if ($time == '') - $time = now(); - - $datestr = str_replace('%\\', '', preg_replace("/([a-z]+?){1}/i", "\\\\\\1", $datestr)); - return date($datestr, $time); -} - -// ------------------------------------------------------------------------ - -/** - * Standard Date - * - * Returns a date formatted according to the submitted standard. - * - * @access public - * @param string the chosen format - * @param integer Unix timestamp - * @return string - */ -function standard_date($fmt = 'DATE_RFC822', $time = '') -{ - $formats = array( - 'DATE_ATOM' => '%Y-%m-%dT%H:%i:%s%Q', - 'DATE_COOKIE' => '%l, %d-%M-%y %H:%i:%s UTC', - 'DATE_ISO8601' => '%Y-%m-%dT%H:%i:%s%O', - 'DATE_RFC822' => '%D, %d %M %y %H:%i:%s %O', - 'DATE_RFC850' => '%l, %d-%M-%y %H:%m:%i UTC', - 'DATE_RFC1036' => '%D, %d %M %y %H:%i:%s %O', - 'DATE_RFC1123' => '%D, %d %M %Y %H:%i:%s %O', - 'DATE_RFC2822' => '%D, %d %M %Y %H:%i:%s %O', - 'DATE_RSS' => '%D, %d %M %Y %H:%i:%s %O', - 'DATE_W3C' => '%Y-%m-%dT%H:%i:%s%Q' - ); - - if ( ! isset($formats[$fmt])) - { - return FALSE; - } - - return mdate($formats[$fmt], $time); -} - - -// ------------------------------------------------------------------------ - -/** - * Timespan - * - * Returns a span of seconds in this format: - * 10 days 14 hours 36 minutes 47 seconds - * - * @access public - * @param integer a number of seconds - * @param integer Unix timestamp - * @return integer - */ -function timespan($seconds = 1, $time = '') -{ - $CI =& get_instance(); - $CI->lang->load('date'); - - if ( ! is_numeric($seconds)) - { - $seconds = 1; - } - - if ( ! is_numeric($time)) - { - $time = time(); - } - - if ($time <= $seconds) - { - $seconds = 1; - } - else - { - $seconds = $time - $seconds; - } - - $str = ''; - $years = floor($seconds / 31536000); - - if ($years > 0) - { - $str .= $years.' '.$CI->lang->line((($years > 1) ? 'date_years' : 'date_year')).', '; - } - - $seconds -= $years * 31536000; - $months = floor($seconds / 2628000); - - if ($years > 0 OR $months > 0) - { - if ($months > 0) - { - $str .= $months.' '.$CI->lang->line((($months > 1) ? 'date_months' : 'date_month')).', '; - } - - $seconds -= $months * 2628000; - } - - $weeks = floor($seconds / 604800); - - if ($years > 0 OR $months > 0 OR $weeks > 0) - { - if ($weeks > 0) - { - $str .= $weeks.' '.$CI->lang->line((($weeks > 1) ? 'date_weeks' : 'date_week')).', '; - } - - $seconds -= $weeks * 604800; - } - - $days = floor($seconds / 86400); - - if ($months > 0 OR $weeks > 0 OR $days > 0) - { - if ($days > 0) - { - $str .= $days.' '.$CI->lang->line((($days > 1) ? 'date_days' : 'date_day')).', '; - } - - $seconds -= $days * 86400; - } - - $hours = floor($seconds / 3600); - - if ($days > 0 OR $hours > 0) - { - if ($hours > 0) - { - $str .= $hours.' '.$CI->lang->line((($hours > 1) ? 'date_hours' : 'date_hour')).', '; - } - - $seconds -= $hours * 3600; - } - - $minutes = floor($seconds / 60); - - if ($days > 0 OR $hours > 0 OR $minutes > 0) - { - if ($minutes > 0) - { - $str .= $minutes.' '.$CI->lang->line((($minutes > 1) ? 'date_minutes' : 'date_minute')).', '; - } - - $seconds -= $minutes * 60; - } - - if ($str == '') - { - $str .= $seconds.' '.$CI->lang->line((($seconds > 1) ? 'date_seconds' : 'date_second')).', '; - } - - return substr(trim($str), 0, -1); -} - -// ------------------------------------------------------------------------ - -/** - * Number of days in a month - * - * Takes a month/year as input and returns the number of days - * for the given month/year. Takes leap years into consideration. - * - * @access public - * @param integer a numeric month - * @param integer a numeric year - * @return integer - */ -function days_in_month($month = 0, $year = '') -{ - if ($month < 1 OR $month > 12) - { - return 0; - } - - if ( ! is_numeric($year) OR strlen($year) != 4) - { - $year = date('Y'); - } - - if ($month == 2) - { - if ($year % 400 == 0 OR ($year % 4 == 0 AND $year % 100 != 0)) - { - return 29; - } - } - - $days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); - return $days_in_month[$month - 1]; -} - -// ------------------------------------------------------------------------ - -/** - * Converts a local Unix timestamp to GMT - * - * @access public - * @param integer Unix timestamp - * @return integer - */ -function local_to_gmt($time = '') -{ - if ($time == '') - $time = time(); - - return mktime( gmdate("H", $time), gmdate("i", $time), gmdate("s", $time), gmdate("m", $time), gmdate("d", $time), gmdate("Y", $time)); -} - -// ------------------------------------------------------------------------ - -/** - * Converts GMT time to a localized value - * - * Takes a Unix timestamp (in GMT) as input, and returns - * at the local value based on the timezone and DST setting - * submitted - * - * @access public - * @param integer Unix timestamp - * @param string timezone - * @param bool whether DST is active - * @return integer - */ -function gmt_to_local($time = '', $timezone = 'UTC', $dst = FALSE) -{ - if ($time == '') - { - return now(); - } - - $time += timezones($timezone) * 3600; - - if ($dst == TRUE) - { - $time += 3600; - } - - return $time; -} - -// ------------------------------------------------------------------------ - -/** - * Converts a MySQL Timestamp to Unix - * - * @access public - * @param integer Unix timestamp - * @return integer - */ -function mysql_to_unix($time = '') -{ - // We'll remove certain characters for backward compatibility - // since the formatting changed with MySQL 4.1 - // YYYY-MM-DD HH:MM:SS - - $time = str_replace('-', '', $time); - $time = str_replace(':', '', $time); - $time = str_replace(' ', '', $time); - - // YYYYMMDDHHMMSS - return mktime( - substr($time, 8, 2), - substr($time, 10, 2), - substr($time, 12, 2), - substr($time, 4, 2), - substr($time, 6, 2), - substr($time, 0, 4) - ); -} - -// ------------------------------------------------------------------------ - -/** - * Unix to "Human" - * - * Formats Unix timestamp to the following prototype: 2006-08-21 11:35 PM - * - * @access public - * @param integer Unix timestamp - * @param bool whether to show seconds - * @param string format: us or euro - * @return string - */ -function unix_to_human($time = '', $seconds = FALSE, $fmt = 'us') -{ - $r = date('Y', $time).'-'.date('m', $time).'-'.date('d', $time).' '; - - if ($fmt == 'us') - { - $r .= date('h', $time).':'.date('i', $time); - } - else - { - $r .= date('H', $time).':'.date('i', $time); - } - - if ($seconds) - { - $r .= ':'.date('s', $time); - } - - if ($fmt == 'us') - { - $r .= ' '.date('A', $time); - } - - return $r; -} - -// ------------------------------------------------------------------------ - -/** - * Convert "human" date to GMT - * - * Reverses the above process - * - * @access public - * @param string format: us or euro - * @return integer - */ -function human_to_unix($datestr = '') -{ - if ($datestr == '') - { - return FALSE; - } - - $datestr = trim($datestr); - $datestr = preg_replace("/\040+/", "\040", $datestr); - - if ( ! ereg("^[0-9]{2,4}\-[0-9]{1,2}\-[0-9]{1,2}\040[0-9]{1,2}:[0-9]{1,2}.*$", $datestr)) - { - return FALSE; - } - - $split = preg_split("/\040/", $datestr); - - $ex = explode("-", $split['0']); - - $year = (strlen($ex['0']) == 2) ? '20'.$ex['0'] : $ex['0']; - $month = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; - $day = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; - - $ex = explode(":", $split['1']); - - $hour = (strlen($ex['0']) == 1) ? '0'.$ex['0'] : $ex['0']; - $min = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; - - if (isset($ex['2']) AND ereg("[0-9]{1,2}", $ex['2'])) - { - $sec = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; - } - else - { - // Unless specified, seconds get set to zero. - $sec = '00'; - } - - if (isset($split['2'])) - { - $ampm = strtolower($split['2']); - - if (substr($ampm, 0, 1) == 'p' AND $hour < 12) - $hour = $hour + 12; - - if (substr($ampm, 0, 1) == 'a' AND $hour == 12) - $hour = '00'; - - if (strlen($hour) == 1) - $hour = '0'.$hour; - } - - return mktime($hour, $min, $sec, $month, $day, $year); -} - -// ------------------------------------------------------------------------ - -/** - * Timezone Menu - * - * Generates a drop-down menu of timezones. - * - * @access public - * @param string timezone - * @param string classname - * @param string menu name - * @return string - */ -function timezone_menu($default = 'UTC', $class = "", $name = 'timezones') -{ - $CI =& get_instance(); - $CI->lang->load('date'); - - if ($default == 'GMT') - $default = 'UTC'; - - $menu = '"; - - return $menu; -} - -// ------------------------------------------------------------------------ - -/** - * Timezones - * - * Returns an array of timezones. This is a helper function - * for various other ones in this library - * - * @access public - * @param string timezone - * @return string - */ -function timezones($tz = '') -{ - // Note: Don't change the order of these even though - // some items appear to be in the wrong order - - $zones = array( - 'UM12' => -12, - 'UM11' => -11, - 'UM10' => -10, - 'UM9' => -9, - 'UM8' => -8, - 'UM7' => -7, - 'UM6' => -6, - 'UM5' => -5, - 'UM4' => -4, - 'UM25' => -2.5, - 'UM3' => -3, - 'UM2' => -2, - 'UM1' => -1, - 'UTC' => 0, - 'UP1' => +1, - 'UP2' => +2, - 'UP3' => +3, - 'UP25' => +2.5, - 'UP4' => +4, - 'UP35' => +3.5, - 'UP5' => +5, - 'UP45' => +4.5, - 'UP6' => +6, - 'UP7' => +7, - 'UP8' => +8, - 'UP9' => +9, - 'UP85' => +8.5, - 'UP10' => +10, - 'UP11' => +11, - 'UP12' => +12 - ); - - if ($tz == '') - { - return $zones; - } - - if ($tz == 'GMT') - $tz = 'UTC'; - - return ( ! isset($zones[$tz])) ? 0 : $zones[$tz]; -} - - +config->item('time_reference')) == 'gmt') + { + $now = time(); + $system_time = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now)); + + if (strlen($system_time) < 10) + { + $system_time = time(); + log_message('error', 'The Date class could not set a proper GMT timestamp so the local time() value was used.'); + } + + return $system_time; + } + else + { + return time(); + } +} + +// ------------------------------------------------------------------------ + +/** + * Convert MySQL Style Datecodes + * + * This function is identical to PHPs date() function, + * except that it allows date codes to be formatted using + * the MySQL style, where each code letter is preceded + * with a percent sign: %Y %m %d etc... + * + * The benefit of doing dates this way is that you don't + * have to worry about escaping your text letters that + * match the date codes. + * + * @access public + * @param string + * @param integer + * @return integer + */ +function mdate($datestr = '', $time = '') +{ + if ($datestr == '') + return ''; + + if ($time == '') + $time = now(); + + $datestr = str_replace('%\\', '', preg_replace("/([a-z]+?){1}/i", "\\\\\\1", $datestr)); + return date($datestr, $time); +} + +// ------------------------------------------------------------------------ + +/** + * Standard Date + * + * Returns a date formatted according to the submitted standard. + * + * @access public + * @param string the chosen format + * @param integer Unix timestamp + * @return string + */ +function standard_date($fmt = 'DATE_RFC822', $time = '') +{ + $formats = array( + 'DATE_ATOM' => '%Y-%m-%dT%H:%i:%s%Q', + 'DATE_COOKIE' => '%l, %d-%M-%y %H:%i:%s UTC', + 'DATE_ISO8601' => '%Y-%m-%dT%H:%i:%s%O', + 'DATE_RFC822' => '%D, %d %M %y %H:%i:%s %O', + 'DATE_RFC850' => '%l, %d-%M-%y %H:%m:%i UTC', + 'DATE_RFC1036' => '%D, %d %M %y %H:%i:%s %O', + 'DATE_RFC1123' => '%D, %d %M %Y %H:%i:%s %O', + 'DATE_RSS' => '%D, %d %M %Y %H:%i:%s %O', + 'DATE_W3C' => '%Y-%m-%dT%H:%i:%s%Q' + ); + + if ( ! isset($formats[$fmt])) + { + return FALSE; + } + + return mdate($formats[$fmt], $time); +} + + +// ------------------------------------------------------------------------ + +/** + * Timespan + * + * Returns a span of seconds in this format: + * 10 days 14 hours 36 minutes 47 seconds + * + * @access public + * @param integer a number of seconds + * @param integer Unix timestamp + * @return integer + */ +function timespan($seconds = 1, $time = '') +{ + $CI =& get_instance(); + $CI->lang->load('date'); + + if ( ! is_numeric($seconds)) + { + $seconds = 1; + } + + if ( ! is_numeric($time)) + { + $time = time(); + } + + if ($time <= $seconds) + { + $seconds = 1; + } + else + { + $seconds = $time - $seconds; + } + + $str = ''; + $years = floor($seconds / 31536000); + + if ($years > 0) + { + $str .= $years.' '.$CI->lang->line((($years > 1) ? 'date_years' : 'date_year')).', '; + } + + $seconds -= $years * 31536000; + $months = floor($seconds / 2628000); + + if ($years > 0 OR $months > 0) + { + if ($months > 0) + { + $str .= $months.' '.$CI->lang->line((($months > 1) ? 'date_months' : 'date_month')).', '; + } + + $seconds -= $months * 2628000; + } + + $weeks = floor($seconds / 604800); + + if ($years > 0 OR $months > 0 OR $weeks > 0) + { + if ($weeks > 0) + { + $str .= $weeks.' '.$CI->lang->line((($weeks > 1) ? 'date_weeks' : 'date_week')).', '; + } + + $seconds -= $weeks * 604800; + } + + $days = floor($seconds / 86400); + + if ($months > 0 OR $weeks > 0 OR $days > 0) + { + if ($days > 0) + { + $str .= $days.' '.$CI->lang->line((($days > 1) ? 'date_days' : 'date_day')).', '; + } + + $seconds -= $days * 86400; + } + + $hours = floor($seconds / 3600); + + if ($days > 0 OR $hours > 0) + { + if ($hours > 0) + { + $str .= $hours.' '.$CI->lang->line((($hours > 1) ? 'date_hours' : 'date_hour')).', '; + } + + $seconds -= $hours * 3600; + } + + $minutes = floor($seconds / 60); + + if ($days > 0 OR $hours > 0 OR $minutes > 0) + { + if ($minutes > 0) + { + $str .= $minutes.' '.$CI->lang->line((($minutes > 1) ? 'date_minutes' : 'date_minute')).', '; + } + + $seconds -= $minutes * 60; + } + + if ($str == '') + { + $str .= $seconds.' '.$CI->lang->line((($seconds > 1) ? 'date_seconds' : 'date_second')).', '; + } + + return substr(trim($str), 0, -1); +} + +// ------------------------------------------------------------------------ + +/** + * Number of days in a month + * + * Takes a month/year as input and returns the number of days + * for the given month/year. Takes leap years into consideration. + * + * @access public + * @param integer a numeric month + * @param integer a numeric year + * @return integer + */ +function days_in_month($month = 0, $year = '') +{ + if ($month < 1 OR $month > 12) + { + return 0; + } + + if ( ! is_numeric($year) OR strlen($year) != 4) + { + $year = date('Y'); + } + + if ($month == 2) + { + if ($year % 400 == 0 OR ($year % 4 == 0 AND $year % 100 != 0)) + { + return 29; + } + } + + $days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); + return $days_in_month[$month - 1]; +} + +// ------------------------------------------------------------------------ + +/** + * Converts a local Unix timestamp to GMT + * + * @access public + * @param integer Unix timestamp + * @return integer + */ +function local_to_gmt($time = '') +{ + if ($time == '') + $time = time(); + + return mktime( gmdate("H", $time), gmdate("i", $time), gmdate("s", $time), gmdate("m", $time), gmdate("d", $time), gmdate("Y", $time)); +} + +// ------------------------------------------------------------------------ + +/** + * Converts GMT time to a localized value + * + * Takes a Unix timestamp (in GMT) as input, and returns + * at the local value based on the timezone and DST setting + * submitted + * + * @access public + * @param integer Unix timestamp + * @param string timezone + * @param bool whether DST is active + * @return integer + */ +function gmt_to_local($time = '', $timezone = 'UTC', $dst = FALSE) +{ + if ($time == '') + { + return now(); + } + + $time += timezones($timezone) * 3600; + + if ($dst == TRUE) + { + $time += 3600; + } + + return $time; +} + +// ------------------------------------------------------------------------ + +/** + * Converts a MySQL Timestamp to Unix + * + * @access public + * @param integer Unix timestamp + * @return integer + */ +function mysql_to_unix($time = '') +{ + // We'll remove certain characters for backward compatibility + // since the formatting changed with MySQL 4.1 + // YYYY-MM-DD HH:MM:SS + + $time = str_replace('-', '', $time); + $time = str_replace(':', '', $time); + $time = str_replace(' ', '', $time); + + // YYYYMMDDHHMMSS + return mktime( + substr($time, 8, 2), + substr($time, 10, 2), + substr($time, 12, 2), + substr($time, 4, 2), + substr($time, 6, 2), + substr($time, 0, 4) + ); +} + +// ------------------------------------------------------------------------ + +/** + * Unix to "Human" + * + * Formats Unix timestamp to the following prototype: 2006-08-21 11:35 PM + * + * @access public + * @param integer Unix timestamp + * @param bool whether to show seconds + * @param string format: us or euro + * @return string + */ +function unix_to_human($time = '', $seconds = FALSE, $fmt = 'us') +{ + $r = date('Y', $time).'-'.date('m', $time).'-'.date('d', $time).' '; + + if ($fmt == 'us') + { + $r .= date('h', $time).':'.date('i', $time); + } + else + { + $r .= date('H', $time).':'.date('i', $time); + } + + if ($seconds) + { + $r .= ':'.date('s', $time); + } + + if ($fmt == 'us') + { + $r .= ' '.date('A', $time); + } + + return $r; +} + +// ------------------------------------------------------------------------ + +/** + * Convert "human" date to GMT + * + * Reverses the above process + * + * @access public + * @param string format: us or euro + * @return integer + */ +function human_to_unix($datestr = '') +{ + if ($datestr == '') + { + return FALSE; + } + + $datestr = trim($datestr); + $datestr = preg_replace("/\040+/", "\040", $datestr); + + if ( ! ereg("^[0-9]{2,4}\-[0-9]{1,2}\-[0-9]{1,2}\040[0-9]{1,2}:[0-9]{1,2}.*$", $datestr)) + { + return FALSE; + } + + $split = preg_split("/\040/", $datestr); + + $ex = explode("-", $split['0']); + + $year = (strlen($ex['0']) == 2) ? '20'.$ex['0'] : $ex['0']; + $month = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; + $day = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; + + $ex = explode(":", $split['1']); + + $hour = (strlen($ex['0']) == 1) ? '0'.$ex['0'] : $ex['0']; + $min = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; + + if (isset($ex['2']) AND ereg("[0-9]{1,2}", $ex['2'])) + { + $sec = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; + } + else + { + // Unless specified, seconds get set to zero. + $sec = '00'; + } + + if (isset($split['2'])) + { + $ampm = strtolower($split['2']); + + if (substr($ampm, 0, 1) == 'p' AND $hour < 12) + $hour = $hour + 12; + + if (substr($ampm, 0, 1) == 'a' AND $hour == 12) + $hour = '00'; + + if (strlen($hour) == 1) + $hour = '0'.$hour; + } + + return mktime($hour, $min, $sec, $month, $day, $year); +} + +// ------------------------------------------------------------------------ + +/** + * Timezone Menu + * + * Generates a drop-down menu of timezones. + * + * @access public + * @param string timezone + * @param string classname + * @param string menu name + * @return string + */ +function timezone_menu($default = 'UTC', $class = "", $name = 'timezones') +{ + $CI =& get_instance(); + $CI->lang->load('date'); + + if ($default == 'GMT') + $default = 'UTC'; + + $menu = '"; + + return $menu; +} + +// ------------------------------------------------------------------------ + +/** + * Timezones + * + * Returns an array of timezones. This is a helper function + * for various other ones in this library + * + * @access public + * @param string timezone + * @return string + */ +function timezones($tz = '') +{ + // Note: Don't change the order of these even though + // some items appear to be in the wrong order + + $zones = array( + 'UM12' => -12, + 'UM11' => -11, + 'UM10' => -10, + 'UM9' => -9, + 'UM8' => -8, + 'UM7' => -7, + 'UM6' => -6, + 'UM5' => -5, + 'UM4' => -4, + 'UM25' => -2.5, + 'UM3' => -3, + 'UM2' => -2, + 'UM1' => -1, + 'UTC' => 0, + 'UP1' => +1, + 'UP2' => +2, + 'UP3' => +3, + 'UP25' => +2.5, + 'UP4' => +4, + 'UP35' => +3.5, + 'UP5' => +5, + 'UP45' => +4.5, + 'UP6' => +6, + 'UP7' => +7, + 'UP8' => +8, + 'UP9' => +9, + 'UP85' => +8.5, + 'UP10' => +10, + 'UP11' => +11, + 'UP12' => +12 + ); + + if ($tz == '') + { + return $zones; + } + + if ($tz == 'GMT') + $tz = 'UTC'; + + return ( ! isset($zones[$tz])) ? 0 : $zones[$tz]; +} + + ?> \ No newline at end of file From 0cb3404d5e03b370805b2059addcaf325a0604cf Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 23 Mar 2007 21:02:11 +0000 Subject: [PATCH 0522/2544] --- user_guide/general/views.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 21f8b5c0..dd97c361 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -133,7 +133,7 @@

                    Adding Dynamic Data to the View

                    $data = array(
                                   'title' => 'My Title',
                    -               'heading' => 'My Heading'
                    +               'heading' => 'My Heading',
                                   'message' => 'My Message'
                              );

                    From 5c3905b4241b4ff68f768a81151f8c6e7a75fa5d Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 24 Mar 2007 11:08:55 +0000 Subject: [PATCH 0523/2544] passes hostname and not database now --- system/database/drivers/odbc/odbc_driver.php | 904 +++++++++---------- 1 file changed, 452 insertions(+), 452 deletions(-) diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 7dd9295f..9d540c77 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -1,453 +1,453 @@ -database, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - return @odbc_pconnect($this->database, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - // Not needed for ODBC - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT version() AS ver"; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - return @odbc_exec($this->conn_id, $sql); - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - return odbc_autocommit($this->conn_id, FALSE); - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $ret = odbc_commit($this->conn_id); - odbc_autocommit($this->conn_id, TRUE); - return $ret; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $ret = odbc_rollback($this->conn_id); - odbc_autocommit($this->conn_id, TRUE); - return $ret; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - // ODBC doesn't require escaping - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @odbc_num_rows($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - return @odbc_insert_id($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * Show table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @return string - */ - function _list_tables() - { - return "SHOW TABLES FROM `".$this->database."`"; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SHOW COLUMNS FROM ".$this->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT TOP 1 FROM ".$this->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - return odbc_errormsg($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - return odbc_error($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Escape Table Name - * - * This function adds backticks if the table name has a period - * in it. Some DBs will get cranky unless periods are escaped - * - * @access private - * @param string the table name - * @return string - */ - function _escape_table($table) - { - if (stristr($table, '.')) - { - $table = preg_replace("/\./", "`.`", $table); - } - - return $table; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @return string - */ - function _update($table, $values, $where) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @return string - */ - function _delete($table, $where) - { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - // Does ODBC doesn't use the LIMIT clause? - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @odbc_close($conn_id); - } - - -} - - +hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return @odbc_pconnect($this->hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + // Not needed for ODBC + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @odbc_exec($this->conn_id, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + return odbc_autocommit($this->conn_id, FALSE); + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $ret = odbc_commit($this->conn_id); + odbc_autocommit($this->conn_id, TRUE); + return $ret; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $ret = odbc_rollback($this->conn_id); + odbc_autocommit($this->conn_id, TRUE); + return $ret; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + // ODBC doesn't require escaping + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @odbc_num_rows($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @odbc_insert_id($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @return string + */ + function _list_tables() + { + return "SHOW TABLES FROM `".$this->database."`"; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SHOW COLUMNS FROM ".$this->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT TOP 1 FROM ".$this->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return odbc_errormsg($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return odbc_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access private + * @param string the table name + * @return string + */ + function _escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + // Does ODBC doesn't use the LIMIT clause? + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @odbc_close($conn_id); + } + + +} + + ?> \ No newline at end of file From d8b92a38e755564c62b57a3ed1d3441c212ef4b9 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 28 Mar 2007 01:26:32 +0000 Subject: [PATCH 0524/2544] typo fix --- user_guide/libraries/loader.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 4bc5d634..d9fb64d3 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -103,7 +103,7 @@

                    $this->load->view('file_name', $data, true/fals

                    The third optional parameter lets you change the behavior of the function so that it returns data as a string rather than sending it to your browser. This can be useful if you want to process the data in some way. If you set the parameter to true (boolean) it will return data. The default behavior is false, which sends it -to your browser. Remember to assign it to a variable if you wan the data returned:

                    +to your browser. Remember to assign it to a variable if you want the data returned:

                    $string = $this->load->view('myfile', '', true); From 6d1ef22e5dca5790044e027583ee360624d272af Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 28 Mar 2007 01:26:37 +0000 Subject: [PATCH 0525/2544] typo fix --- user_guide/helpers/inflector_helper.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index c52cf030..2a9f4193 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -76,7 +76,7 @@

                    Loading this Helper

                    singular()

                    -

                    Changes a singular word to plural. Example:

                    +

                    Changes a plural word to singular. Example:

                    $word = "dogs";
                    @@ -86,7 +86,7 @@

                    singular()

                    plural()

                    -

                    Changes a plural word to singular. Example:

                    +

                    Changes a singular word to plural. Example:

                    $word = "dog";
                    From 2749c80ae5ebb46bceb82db8a8683b9e09a469f2 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 29 Mar 2007 21:09:04 +0000 Subject: [PATCH 0526/2544] fixed broken link --- user_guide/libraries/ftp.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 898f769b..48c3451e 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -295,7 +295,7 @@

                    $this->ftp->close();

                    From a06681fad3008fcaeb3f30468e516bc0b4b9009d Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 1 Apr 2007 16:40:51 +0000 Subject: [PATCH 0528/2544] missing                     fixed --- user_guide/libraries/benchmark.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 9d286aa5..0f447cdd 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -145,11 +145,11 @@

                    Profiling Your Benchmark Points

                    // Some more code happens here...

                    $this->benchmark->mark('another_mark_end'); +

                    Please read the Profiler page for more information.

                    -

                    Displaying Total Execution Time

                    From c2f90e23b62c7155a49e38a2958796e6a886e868 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 3 Apr 2007 11:17:44 +0000 Subject: [PATCH 0529/2544] array to string addition http://codeigniter.com/forums/viewthread/46994/ --- system/libraries/Profiler.php | 414 +++++++++++++++++----------------- 1 file changed, 212 insertions(+), 202 deletions(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 5b0f6e2b..37b34518 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -1,203 +1,213 @@ -CI =& get_instance(); - $this->CI->load->language('profiler'); - } - - // -------------------------------------------------------------------- - - /** - * Auto Profiler - * - * This function cycles through the entire array of mark points and - * matches any two points that are named identically (ending in "_start" - * and "_end" respectively). It then compiles the execution times for - * all points and returns it as an array - * - * @access private - * @return array - */ - function _compile_benchmarks() - { - $profile = array(); - foreach ($this->CI->benchmark->marker as $key => $val) - { - // We match the "end" marker so that the list ends - // up in the order that it was defined - if (preg_match("/(.+?)_end/i", $key, $match)) - { - if (isset($this->CI->benchmark->marker[$match[1].'_end']) AND isset($this->CI->benchmark->marker[$match[1].'_start'])) - { - $profile[$match[1]] = $this->CI->benchmark->elapsed_time($match[1].'_start', $key); - } - } - } - - // Build a table containing the profile data. - // Note: At some point we should turn this into a template that can - // be modified. We also might want to make this data available to be logged - - $output = "\n\n"; - $output .= '
                    '; - $output .= "\n"; - $output .= '  '.$this->CI->lang->line('profiler_benchmarks').'  '; - $output .= "\n"; - $output .= "\n\n\n"; - - foreach ($profile as $key => $val) - { - $key = ucwords(str_replace(array('_', '-'), ' ', $key)); - $output .= "\n"; - } - - $output .= "
                    ".$key."  ".$val."
                    \n"; - $output .= "
                    "; - - return $output; - } - - // -------------------------------------------------------------------- - - /** - * Compile Queries - * - * @access private - * @return string - */ - function _compile_queries() - { - $output = "\n\n"; - $output .= '
                    '; - $output .= "\n"; - $output .= '  '.$this->CI->lang->line('profiler_queries').'  '; - $output .= "\n"; - - if ( ! class_exists('CI_DB_driver')) - { - $output .= "
                    ".$this->CI->lang->line('profiler_no_db')."
                    "; - } - else - { - if (count($this->CI->db->queries) == 0) - { - $output .= "
                    ".$this->CI->lang->line('profiler_no_queries')."
                    "; - } - else - { - foreach ($this->CI->db->queries as $val) - { - $output .= '
                    '; - $output .= $val; - $output .= "
                    \n"; - } - } - } - - $output .= "
                    "; - - return $output; - } - - // -------------------------------------------------------------------- - - /** - * Compile $_POST Data - * - * @access private - * @return string - */ - function _compile_post() - { - $output = "\n\n"; - $output .= '
                    '; - $output .= "\n"; - $output .= '  '.$this->CI->lang->line('profiler_post_data').'  '; - $output .= "\n"; - - if (count($_POST) == 0) - { - $output .= "
                    ".$this->CI->lang->line('profiler_no_post')."
                    "; - } - else - { - $output .= "\n\n\n"; - - foreach ($_POST as $key => $val) - { - if ( ! is_numeric($key)) - { - $key = "'".$key."'"; - } - - $output .= "\n"; - } - - $output .= "
                    $_POST[".$key."]  ".htmlspecialchars(stripslashes($val))."
                    \n"; - } - $output .= "
                    "; - - return $output; - } - - // -------------------------------------------------------------------- - - /** - * Run the Profiler - * - * @access private - * @return string - */ - function run($output = '') - { - $output = '
                    '; - $output .= "
                    "; - - $output .= $this->_compile_benchmarks(); - $output .= $this->_compile_post(); - $output .= $this->_compile_queries(); - - $output .= '
                    '; - - return $output; - } - -} - -// END CI_Profiler class +CI =& get_instance(); + $this->CI->load->language('profiler'); + } + + // -------------------------------------------------------------------- + + /** + * Auto Profiler + * + * This function cycles through the entire array of mark points and + * matches any two points that are named identically (ending in "_start" + * and "_end" respectively). It then compiles the execution times for + * all points and returns it as an array + * + * @access private + * @return array + */ + function _compile_benchmarks() + { + $profile = array(); + foreach ($this->CI->benchmark->marker as $key => $val) + { + // We match the "end" marker so that the list ends + // up in the order that it was defined + if (preg_match("/(.+?)_end/i", $key, $match)) + { + if (isset($this->CI->benchmark->marker[$match[1].'_end']) AND isset($this->CI->benchmark->marker[$match[1].'_start'])) + { + $profile[$match[1]] = $this->CI->benchmark->elapsed_time($match[1].'_start', $key); + } + } + } + + // Build a table containing the profile data. + // Note: At some point we should turn this into a template that can + // be modified. We also might want to make this data available to be logged + + $output = "\n\n"; + $output .= '
                    '; + $output .= "\n"; + $output .= '  '.$this->CI->lang->line('profiler_benchmarks').'  '; + $output .= "\n"; + $output .= "\n\n\n"; + + foreach ($profile as $key => $val) + { + $key = ucwords(str_replace(array('_', '-'), ' ', $key)); + $output .= "\n"; + } + + $output .= "
                    ".$key."  ".$val."
                    \n"; + $output .= "
                    "; + + return $output; + } + + // -------------------------------------------------------------------- + + /** + * Compile Queries + * + * @access private + * @return string + */ + function _compile_queries() + { + $output = "\n\n"; + $output .= '
                    '; + $output .= "\n"; + $output .= '  '.$this->CI->lang->line('profiler_queries').'  '; + $output .= "\n"; + + if ( ! class_exists('CI_DB_driver')) + { + $output .= "
                    ".$this->CI->lang->line('profiler_no_db')."
                    "; + } + else + { + if (count($this->CI->db->queries) == 0) + { + $output .= "
                    ".$this->CI->lang->line('profiler_no_queries')."
                    "; + } + else + { + foreach ($this->CI->db->queries as $val) + { + $output .= '
                    '; + $output .= $val; + $output .= "
                    \n"; + } + } + } + + $output .= "
                    "; + + return $output; + } + + // -------------------------------------------------------------------- + + /** + * Compile $_POST Data + * + * @access private + * @return string + */ + function _compile_post() + { + $output = "\n\n"; + $output .= '
                    '; + $output .= "\n"; + $output .= '  '.$this->CI->lang->line('profiler_post_data').'  '; + $output .= "\n"; + + if (count($_POST) == 0) + { + $output .= "
                    ".$this->CI->lang->line('profiler_no_post')."
                    "; + } + else + { + $output .= "\n\n\n"; + + foreach ($_POST as $key => $val) + { + if ( ! is_numeric($key)) + { + $key = "'".$key."'"; + } + +// $output .= "\n"; + $output .= "\n"; + } + + $output .= "
                    $_POST[".$key."]  ".htmlspecialchars(stripslashes($val))."
                    $_POST[".$key."] "; + if (is_array($val)) + { + $output .= "
                    " . htmlspecialchars(stripslashes(print_r($val, true))) . "
                    "; + } + else + { + $output .= htmlspecialchars(stripslashes($val)); + } + $output .= "
                    \n"; + } + $output .= "
                    "; + + return $output; + } + + // -------------------------------------------------------------------- + + /** + * Run the Profiler + * + * @access private + * @return string + */ + function run($output = '') + { + $output = '
                    '; + $output .= "
                    "; + + $output .= $this->_compile_benchmarks(); + $output .= $this->_compile_post(); + $output .= $this->_compile_queries(); + + $output .= '
                    '; + + return $output; + } + +} + +// END CI_Profiler class ?> \ No newline at end of file From d9f3e177bac9b11aa29acf7e609c8cf57475a7f6 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 3 Apr 2007 11:19:52 +0000 Subject: [PATCH 0530/2544] added array to string in profiler --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b848b086..7771abac 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,6 +66,7 @@

                    Version 1.5.3

                    Release Date:

                    • Fixed a version but in the Postgre driver
                      • +
                    • Array to string now supported in profiler

                    Version 1.5.2

                    Release Date: February 13, 2007

                    From 9da4dbc58ccae4f903e8a5c8d464fa00cd850381 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 3 Apr 2007 11:39:35 +0000 Subject: [PATCH 0531/2544] next and previous links fixed up --- user_guide/database/active_record.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/table_data.html | 4 ++-- user_guide/database/transactions.html | 5 ++--- user_guide/database/utilities.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/helpers/array_helper.html | 3 +-- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/inflector_helper.html | 4 ++-- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/table.html | 3 +-- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/overview/mvc.html | 2 +- 23 files changed, 26 insertions(+), 29 deletions(-) diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 7e0c14c8..d1598c55 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -598,7 +598,7 @@

                    Method Chaining

                    diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 091faaf6..af76e336 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -160,7 +160,7 @@

                    $this->db->field_data()

                    diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 2bae2639..37a71180 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -133,7 +133,7 @@

                    Now What?

                     diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index af76e336..710fc917 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -166,7 +166,7 @@

                    $this->db->field_data()

                    User Guide Home   ·   Next Topic:  Custom Function Calls

                    -

                    Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                    +

                    Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                  diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index b3bd3f68..6c25a557 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -149,7 +149,7 @@

                  $this->db->update_string();

                  User Guide Home   ·   Next Topic:  Active Record Pattern

                  -

                  Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                  +

                  Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                  diff --git a/user_guide/database/index.html b/user_guide/database/index.html index d9c62169..2321675e 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -96,7 +96,7 @@

                  The Database Class

                  User Guide Home   ·   Next Topic:  Quick Start: Usage Examples

                  -

                  Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                  +

                  Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                  diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index cefcf234..4217e4e4 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -135,7 +135,7 @@

                  Query Bindings

                  User Guide Home   ·   Next Topic:  Query Results

                  -

                  Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                  +

                  Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                  diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 7b46d21b..2f3be85c 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -236,7 +236,7 @@

                  $query->free_result()

                  User Guide Home   ·   Next Topic:  Query Helper Functions

                  -

                  Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                  +

                  Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                  diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 3d931ad0..23fa7c76 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -111,7 +111,7 @@

                  $this->db->table_exists();

                  User Guide Home   ·   Next Topic:   Field Metadata

                  -

                  Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                  +

                  Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 06ed295b..d2222e00 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -191,7 +191,7 @@

                Running Transactions Manually

                User Guide Home   ·   Next Topic:  Table Metadata

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 7ed52cb2..f4977b16 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -331,7 +331,7 @@

                Description of Backup Preferences

                User Guide Home   ·   Next Topic:   Email Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 23a41732..f603f1f0 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -145,7 +145,7 @@

                Alternative Control Structures

                User Guide Home   ·   Next Topic:  Security

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 78c3620d..7bf285f4 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -115,7 +115,7 @@

                get_instance()

                User Guide Home   ·   Next Topic:  Auto-loading Resources

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index c63ed72c..f3127ccb 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -98,7 +98,7 @@

                Auto-loading Resources

                User Guide Home   ·   Next Topic:  Scaffolding

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index bb743c50..9371ed3c 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -112,7 +112,7 @@

                Deleting Caches

                User Guide Home   ·   Next Topic:  Profiling Your Application

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 945791a4..0bb4ac44 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -428,7 +428,7 @@

                That's it!

                Next Topic:  Views

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 5121b7d8..0e13ce7d 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -167,7 +167,7 @@

                Setting Your Own Prefix

                User Guide Home   ·   Next Topic:  Hooks - Extending the Core

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 7ab97d60..d8fdb389 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -290,7 +290,7 @@

                Setting Your Own Prefix

                User Guide Home   ·   Next Topic:  Creating Core System Classes

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 77c080cb..c87c24b2 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -63,7 +63,7 @@

                Credits

                Code Igniter was developed by Rick Ellis, who in his other life is CEO of -pMachine, Inc. The core framework was written +Ellislab, Inc. The core framework was written specifically for this application, while many of the class libraries, helpers, and sub-systems borrow from the code-base of ExpressionEngine, a Content Management System written by Rick Ellis and Paul Burdick.

                @@ -89,7 +89,7 @@

                Credits

                Next Topic:  Downloading Code Igniter

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 60456d33..86e18881 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -135,7 +135,7 @@

                log_message('level', 'message')

                User Guide Home   ·   Next Topic:  Page Caching

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 37a71180..df522e95 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -139,7 +139,7 @@

                Now What?

                User Guide Home   ·   Next Topic:  Plugins

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 1b9ad7a8..14a2404f 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -186,7 +186,7 @@

                Hook Points

                User Guide Home   ·   Next Topic:  Auto-loading Resources

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/index.html b/user_guide/general/index.html index 2d3ad90a..1354f871 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -92,7 +92,7 @@

                Getting Started With Code Igniter

                User Guide Home   ·   Next Topic:  Code Igniter URLs

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index d293920d..b5b63cea 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -92,7 +92,7 @@

                Creating Your Own Libraries

                User Guide Home   ·   Next Topic:  Creating Libraries

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 706b1a36..558e202a 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -132,7 +132,7 @@

                Running Multiple Applications with one Code Igniter Installation

                Next Topic:  Alternative PHP Syntax

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/models.html b/user_guide/general/models.html index d7e0e60a..cd93a429 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -252,7 +252,7 @@

                Connecting to your Database

                User Guide Home   ·   Next Topic:  Helpers

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 0e83c5ca..9358530e 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -125,7 +125,7 @@

                Using a Plugin

                User Guide Home   ·   Next Topic:  Using Libraries

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 688531e0..f02440b0 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -112,7 +112,7 @@

                Setting Benchmark Points

                User Guide Home   ·   Next Topic:  Managing Applications

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 2a7fee2f..e4bdb6c5 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -76,7 +76,7 @@

                Quick Reference Chart

                User Guide Home

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index e1d32417..0d7b33e8 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -81,7 +81,7 @@

                Server Requirements

                Next Topic:  License Agreement

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index a4ca8dca..5789b721 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -179,7 +179,7 @@

                Reserved Routes

                User Guide Home   ·   Next Topic:  Error Handling

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index ba1a804f..3d3ecac2 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -146,7 +146,7 @@

                A Final Note:

                User Guide Home   ·   Next Topic:  URI Routing

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 48c8ce81..e5602d30 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -152,7 +152,7 @@

                Best Practices

                User Guide Home   ·   Next Topic:  Benchmarking Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index e2ebbf23..1d24312b 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -152,7 +152,7 @@

                Enabling Query Strings

                User Guide Home   ·   Next Topic:  Controllers

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/general/views.html b/user_guide/general/views.html index dd97c361..4e749a6f 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -250,7 +250,7 @@

                My Todo List

                User Guide Home   ·   Next Topic:  Models

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 2d98a57d..76ceabc3 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -118,7 +118,7 @@

                random_element()

                User Guide Home   ·   Next Topic:  Cookie Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 53418c8b..db0f1a13 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -150,7 +150,7 @@

                delete_cookie()

                User Guide Home   ·   Next Topic:  Date Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 436ac88b..941ee9a0 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -364,7 +364,7 @@

                Timezone Reference

                User Guide Home   ·   Next Topic:  Directory Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 497ac99b..809ee3f4 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -138,7 +138,7 @@

                directory_map('source directory')

                User Guide Home   ·   Next Topic:  Download Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 06b56ed7..a48f2a08 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -111,7 +111,7 @@

                force_download('filename', 'data')

                User Guide Home   ·   Next Topic:  File Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 4d759a72..d2101314 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -147,7 +147,7 @@

                get_filenames('path/to/directory/')

                User Guide Home   ·   Next Topic:  Form Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 8eea9610..e3b6e9de 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -336,7 +336,7 @@

                form_prep()

                User Guide Home   ·   Next Topic:  HTML Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index baee88fe..316c3697 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -228,7 +228,7 @@

                br()

                User Guide Home   ·   Next Topic:   Inflector Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index 66a0feec..3c99212b 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -124,7 +124,7 @@

                Now What?

                diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 9593999d..34eb56ba 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -146,7 +146,7 @@

                humanize()

                User Guide Home   ·   Next Topic:  Security Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index c0add4aa..81f41a2e 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -124,7 +124,7 @@

                encode_php_tags()

                User Guide Home   ·   Next Topic:  Smiley Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 54b6db03..619fac80 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -201,7 +201,7 @@

                parse_smileys()

                User Guide Home   ·   Next Topic:  String Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 2c39bb36..3d0cb7bd 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -137,7 +137,7 @@

                repeater()

                User Guide Home   ·   Next Topic:  Text Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index c5c413d2..c6db2792 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -190,7 +190,7 @@

                word_wrap()

                User Guide Home   ·   Next Topic:  Typography Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index b1137e8d..b7f10651 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -122,7 +122,7 @@

                nl2br_except_pre()

                User Guide Home   ·   Next Topic:  URL Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 53cad703..bedc8668 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -264,7 +264,7 @@

                redirect()

                User Guide Home   ·   Next Topic:  XML Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index af95ae55..175a44d0 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -103,7 +103,7 @@

                xml_convert('string')

                Top of Page   ·   User Guide Home

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/index.html b/user_guide/index.html index 10fee4bd..1e0f6cfe 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -98,7 +98,7 @@

                Who is Code Igniter For?

                diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 1f5922a8..081fddc3 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -94,7 +94,7 @@

                Subversion Server

                Next Topic:  Installation Instructions

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 60fa2acf..2f7977cd 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -95,7 +95,7 @@

                Installation Instructions

                Next Topic:  Upgrading from a Previous Version

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index ac131c46..fd8632dd 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -89,7 +89,7 @@

                Troubleshooting

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 45f30eb2..4885f3d9 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -91,7 +91,7 @@

                Upgrading From Beta 1.0 to Final 1.2

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index ce0359d8..694395c3 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -202,7 +202,7 @@

                Step 6: Update your user guide

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 085e6f14..4509f157 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -101,7 +101,7 @@

                Step 2: Update your user guide

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 1999ac08..a0dfe57d 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -99,7 +99,7 @@

                Step 2: Update your user guide

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 4e6916b3..c9277c65 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -111,7 +111,7 @@

                Step 3: Update your user guide

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 24676304..fc3c4e56 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -144,7 +144,7 @@

                Step 3: Update your user guide

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index ae1a2f99..31a5e94a 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -148,7 +148,7 @@

                Step 4: Update your user guide

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 2114dfd0..196231eb 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -177,7 +177,7 @@

                Step 5: Update your user guide

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 947cd71d..c0411a57 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -110,7 +110,7 @@

                Step 2: Update your user guide

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 3a24e9ee..3e4799b5 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -143,7 +143,7 @@

                Step 5: Edit your config file

                Next Topic:  Code Igniter at a Glance

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 32907cda..68c6e5eb 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -91,7 +91,7 @@

                Upgrading From a Previous Version

                Next Topic:  Troubleshooting

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 7176d059..ce4eb899 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -195,7 +195,7 @@

                Displaying Memory Consumption

                User Guide Home   ·   Next Topic:  Calendaring Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 499a4328..7f043546 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -247,7 +247,7 @@

                Creating a Calendar Template

                User Guide Home   ·   Next Topic:  Config Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 9196ea4c..eeec28c7 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -181,7 +181,7 @@

                $this->config->system_url();

                User Guide Home   ·   Next Topic:  Database Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index c8d1c6e8..7ce56564 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -296,7 +296,7 @@

                Overriding Word Wrapping

                User Guide Home   ·   Next Topic:  Encryption Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index a69577c8..7a25e764 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -180,7 +180,7 @@

                $this->encrypt->sha1();

                User Guide Home   ·   Next Topic:  File Uploading Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 8a26a3e0..eea1feb6 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -429,7 +429,7 @@

                Explanation

                User Guide Home   ·   Next Topic:  FTP Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 48c3451e..8b50dee5 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -301,7 +301,7 @@

                $this->ftp->close();

                User Guide Home   ·   Next Topic:  HTML Table Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 87b68d2e..50063d3e 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -662,7 +662,7 @@

                Overlay Preferences

                User Guide Home   ·   Next Topic:  Input Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 9efa3017..f666bcf7 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -212,7 +212,7 @@

                $this->input->user_agent()

                User Guide Home   ·   Next Topic:  Loader Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index e84773cc..9bc90391 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -133,7 +133,7 @@

                Fetching a Line of Text

                User Guide Home   ·   Next Topic:  Output Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index d9fb64d3..d80695a6 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -165,7 +165,7 @@

                $this->load->config('file_name')

                User Guide Home   ·   Next Topic:  Language Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 82c2187b..6d2f9ae2 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -132,7 +132,7 @@

                $this->output->enable_profiler();

                User Guide Home   ·   Next Topic:  Pagination Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 35c43504..8f55628f 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -211,7 +211,7 @@

                $config['num_tag_close'] = '</div>';

                User Guide Home   ·   Next Topic:  Session Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index e851561e..7238bcb4 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -208,7 +208,7 @@

                Variable Pairs

                User Guide Home   ·   Next Topic:  Unit Testing Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index b212b697..d86f9053 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -287,7 +287,7 @@

                Session Preferences

                User Guide Home   ·   Next Topic:  Trackback Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index d6661781..22fb610a 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -290,7 +290,7 @@

                $this->table->clear()

                User Guide Home   ·   Next Topic:  Image Manipulation Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 9d869980..e60a38e5 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -244,7 +244,7 @@

                Notes:

                User Guide Home   ·   Next Topic:  Template Parser Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 3941a7de..4351c4c3 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -203,7 +203,7 @@

                Creating a Template

                User Guide Home   ·   Next Topic:  URI Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 5472ee90..163d02db 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -251,7 +251,7 @@

                $this->uri->rsegment_array(n)

                User Guide Home   ·   Next Topic:  User Agent Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 7772ade7..725a0186 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -202,7 +202,7 @@

                $this->agent->accept_charset()

                User Guide Home   ·   Next Topic:  Validation Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index f4beb56f..ce06cf88 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -715,7 +715,7 @@

                set_radio()

                User Guide Home   ·   Next Topic:  XML-RPC Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 5afbae98..e786d39e 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -487,7 +487,7 @@

                Data Types

                User Guide Home   ·   Next Topic:  Zip Encoding Class

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 8629bc15..dc39e9b1 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -276,7 +276,7 @@

                $this->zip->clear_data()

                User Guide Home   ·   Next Topic:  Array Helper

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/license.html b/user_guide/license.html index f8806271..f346c14d 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -106,7 +106,7 @@

                Limitations of Liability

                Next Topic:  Change Log

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index f9dcd30c..44f20211 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -94,7 +94,7 @@

                Application Flow Chart

                Next Topic:  Model-View-Controller

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 35f20540..2183d018 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -171,7 +171,7 @@

                Code Igniter has a Friendly Community of Users

                Next Topic:  Code Igniter Features

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index af7c2d4a..afebeb74 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -119,7 +119,7 @@

                Code Igniter Features

                Next Topic:  Application Flow Chart

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 3c325069..07549ed4 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -96,7 +96,7 @@

                Design and Architectural Goals

                User Guide Home   ·   Next Topic:  Getting Started

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 1166dee2..e8d60f37 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -82,7 +82,7 @@

                Code Igniter Overview

                diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index ccd8f204..c718ff50 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -98,7 +98,7 @@

                Model-View-Controller

                User Guide Home   ·   Next Topic:  Architectural Goals

                -

                Code Igniter  ·  Copyright © 2006  ·  pMachine, Inc.

                +

                Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                diff --git a/user_guide/toc.html b/user_guide/toc.html index 59eb9e60..69d5f822 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -194,7 +194,7 @@

                Additional Resources

                From e1c29d2b6e1958890c3dcdf387c9b1dddb9493c5 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 3 Apr 2007 20:31:07 +0000 Subject: [PATCH 0535/2544] example fix --- user_guide/database/examples.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 167c98bb..64ec3473 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -150,10 +150,10 @@

                Standard Query With Single Result (Array version)

                $query = $this->db->query('SELECT name FROM my_table LIMIT 1');

                $row = $query->row_array();
                -echo $row->['name'];
                +echo $row['name'];
                 -

                The above row_array() function returns an array. Example: $row->['name']

                +

                The above row_array() function returns an array. Example: $row['name']

                Standard Insert

                From 72b58ca3afbf507d0b6fcedcecae01cc876ddd1f Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 7 Apr 2007 20:58:23 +0000 Subject: [PATCH 0536/2544] repeater won't return any results if it is set to repeat 0 times. --- system/helpers/string_helper.php | 306 +++++++++++++++---------------- 1 file changed, 153 insertions(+), 153 deletions(-) diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index ba704df9..c0a8854d 100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php @@ -1,154 +1,154 @@ - 0) ? str_repeat($data, $num) : ''); +} + + ?> \ No newline at end of file From b8f3504b218f96c63ae6943476b6fcbdd31df21c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 9 Apr 2007 02:03:32 +0000 Subject: [PATCH 0537/2544] typo fix --- user_guide/general/managing_apps.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 558e202a..5d20efac 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -68,7 +68,7 @@

                Managing your Applications

                Renaming the Application Folder

                -

                If you would like to rename your applicaiton folder you may do so as long as you open your main index.php +

                If you would like to rename your application folder you may do so as long as you open your main index.php file and set its name using the $application_folder variable:

                $application_folder = "application"; From 0e254f16f26387e8f8feb0668c1d06a5fe97fa99 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 10 Apr 2007 21:53:38 +0000 Subject: [PATCH 0538/2544] typo fix --- system/libraries/Table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Table.php b/system/libraries/Table.php index b8ce9491..32223708 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -286,7 +286,7 @@ function generate($table_data = NULL) // -------------------------------------------------------------------- /** - * Clears the table arrays. Useful if multiple tables are beting generated + * Clears the table arrays. Useful if multiple tables are being generated * * @access public * @return void From 308462133f4a9cad38b5c0dbd725ec32b7ab5a45 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 10 Apr 2007 21:53:49 +0000 Subject: [PATCH 0539/2544] typo fix --- user_guide/helpers/smiley_helper.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 619fac80..f76a4de8 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -188,7 +188,7 @@

                parse_smileys()

                $str = parse_smileys($str, "http://www.your-site.com/images/smileys/"); echo $str; - +
                From 9613e2c136c96fbb1d055b36a0a5055811f03451 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 14 Apr 2007 19:05:16 +0000 Subject: [PATCH 0540/2544] updates listed --- user_guide/changelog.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 217b34f6..318dae7e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -67,6 +67,8 @@

                Version 1.5.3

                • Fixed a version but in the Postgre driver
                • Array to string now supported in profiler
                  • +
                • Fixed a bug in the textarea function of the form helper for use with strings
                  • +
                • Fixed doc typos.

                Version 1.5.2

                Release Date: February 13, 2007

                From d2df9bc7cc9d4b3e53818470c5d0977c9a36677c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 15 Apr 2007 17:41:17 +0000 Subject: [PATCH 0541/2544] update pMachine to EllisLab update copyright year update Code Igniter to CodeIgniter --- license.txt | 104 +- system/application/config/config.php | 602 +-- system/application/views/welcome_message.php | 122 +- system/codeigniter/Base4.php | 132 +- system/codeigniter/Base5.php | 106 +- system/codeigniter/CodeIgniter.php | 4 +- system/codeigniter/Common.php | 518 +-- system/database/DB.php | 170 +- system/database/DB_active_rec.php | 4 +- system/database/DB_cache.php | 386 +- system/database/DB_driver.php | 2132 +++++----- system/database/DB_result.php | 578 +-- system/database/DB_utility.php | 908 ++--- .../database/drivers/mssql/mssql_driver.php | 914 ++--- .../database/drivers/mssql/mssql_result.php | 344 +- .../database/drivers/mssql/mssql_utility.php | 258 +- .../database/drivers/mysql/mysql_driver.php | 982 ++--- .../database/drivers/mysql/mysql_result.php | 344 +- .../database/drivers/mysql/mysql_utility.php | 486 +-- .../database/drivers/mysqli/mysqli_driver.php | 964 ++--- .../database/drivers/mysqli/mysqli_result.php | 344 +- .../drivers/mysqli/mysqli_utility.php | 488 +-- system/database/drivers/oci8/oci8_driver.php | 1208 +++--- system/database/drivers/oci8/oci8_result.php | 500 +-- system/database/drivers/oci8/oci8_utility.php | 256 +- system/database/drivers/odbc/odbc_driver.php | 4 +- system/database/drivers/odbc/odbc_result.php | 466 +-- system/database/drivers/odbc/odbc_utility.php | 320 +- .../drivers/postgre/postgre_driver.php | 4 +- .../drivers/postgre/postgre_result.php | 344 +- .../drivers/postgre/postgre_utility.php | 256 +- .../database/drivers/sqlite/sqlite_driver.php | 966 ++--- .../database/drivers/sqlite/sqlite_result.php | 350 +- .../drivers/sqlite/sqlite_utility.php | 306 +- system/helpers/array_helper.php | 140 +- system/helpers/cookie_helper.php | 250 +- system/helpers/date_helper.php | 6 +- system/helpers/directory_helper.php | 132 +- system/helpers/download_helper.php | 6 +- system/helpers/file_helper.php | 356 +- system/helpers/form_helper.php | 6 +- system/helpers/html_helper.php | 406 +- system/helpers/inflector_helper.php | 278 +- system/helpers/security_helper.php | 222 +- system/helpers/smiley_helper.php | 328 +- system/helpers/string_helper.php | 6 +- system/helpers/text_helper.php | 840 ++-- system/helpers/typography_helper.php | 1078 +++--- system/helpers/url_helper.php | 6 +- system/helpers/xml_helper.php | 114 +- system/libraries/Benchmark.php | 220 +- system/libraries/Calendar.php | 948 ++--- system/libraries/Config.php | 488 +-- system/libraries/Controller.php | 228 +- system/libraries/Email.php | 3436 ++++++++--------- system/libraries/Encrypt.php | 792 ++-- system/libraries/Exceptions.php | 4 +- system/libraries/Ftp.php | 1230 +++--- system/libraries/Hooks.php | 446 +-- system/libraries/Image_lib.php | 4 +- system/libraries/Input.php | 4 +- system/libraries/Language.php | 240 +- system/libraries/Loader.php | 4 +- system/libraries/Log.php | 234 +- system/libraries/Model.php | 162 +- system/libraries/Output.php | 726 ++-- system/libraries/Pagination.php | 420 +- system/libraries/Parser.php | 340 +- system/libraries/Profiler.php | 6 +- system/libraries/Router.php | 4 +- system/libraries/Session.php | 974 ++--- system/libraries/Sha1.php | 496 +-- system/libraries/Table.php | 4 +- system/libraries/Trackback.php | 1094 +++--- system/libraries/URI.php | 732 ++-- system/libraries/Unit_test.php | 660 ++-- system/libraries/Upload.php | 1616 ++++---- system/libraries/User_agent.php | 4 +- system/libraries/Validation.php | 1468 +++---- system/libraries/Xmlrpc.php | 2822 +++++++------- system/libraries/Xmlrpcs.php | 1004 ++--- system/libraries/Zip.php | 758 ++-- system/plugins/captcha_pi.php | 690 ++-- system/plugins/js_calendar_pi.php | 1206 +++--- system/scaffolding/Scaffolding.php | 576 +-- system/scaffolding/views/footer.php | 18 +- user_guide/changelog.html | 27 +- user_guide/database/active_record.html | 16 +- user_guide/database/caching.html | 14 +- user_guide/database/call_function.html | 14 +- user_guide/database/configuration.html | 14 +- user_guide/database/connecting.html | 10 +- user_guide/database/examples.html | 10 +- user_guide/database/fields.html | 10 +- user_guide/database/helpers.html | 10 +- user_guide/database/index.html | 12 +- user_guide/database/queries.html | 12 +- user_guide/database/results.html | 10 +- user_guide/database/table_data.html | 10 +- user_guide/database/transactions.html | 16 +- user_guide/database/utilities.html | 10 +- user_guide/general/alternative_php.html | 14 +- user_guide/general/ancillary_classes.html | 24 +- user_guide/general/autoloader.html | 12 +- user_guide/general/caching.html | 14 +- user_guide/general/controllers.html | 26 +- user_guide/general/core_classes.html | 20 +- user_guide/general/creating_libraries.html | 36 +- user_guide/general/credits.html | 18 +- user_guide/general/errors.html | 20 +- user_guide/general/helpers.html | 18 +- user_guide/general/hooks.html | 14 +- user_guide/general/index.html | 16 +- user_guide/general/libraries.html | 14 +- user_guide/general/managing_apps.html | 18 +- user_guide/general/models.html | 12 +- user_guide/general/plugins.html | 14 +- user_guide/general/profiling.html | 10 +- user_guide/general/quick_reference.html | 10 +- user_guide/general/requirements.html | 10 +- user_guide/general/routing.html | 12 +- user_guide/general/scaffolding.html | 18 +- user_guide/general/security.html | 22 +- user_guide/general/urls.html | 20 +- user_guide/general/views.html | 10 +- user_guide/helpers/array_helper.html | 10 +- user_guide/helpers/cookie_helper.html | 10 +- user_guide/helpers/date_helper.html | 10 +- user_guide/helpers/directory_helper.html | 10 +- user_guide/helpers/download_helper.html | 10 +- user_guide/helpers/file_helper.html | 14 +- user_guide/helpers/form_helper.html | 10 +- user_guide/helpers/html_helper.html | 10 +- user_guide/helpers/index.html | 16 +- user_guide/helpers/inflector_helper.html | 10 +- user_guide/helpers/security_helper.html | 10 +- user_guide/helpers/smiley_helper.html | 10 +- user_guide/helpers/string_helper.html | 10 +- user_guide/helpers/text_helper.html | 10 +- user_guide/helpers/typography_helper.html | 10 +- user_guide/helpers/url_helper.html | 10 +- user_guide/helpers/xml_helper.html | 10 +- user_guide/index.html | 22 +- user_guide/installation/downloads.html | 34 +- user_guide/installation/index.html | 18 +- user_guide/installation/troubleshooting.html | 14 +- user_guide/installation/upgrade_120.html | 12 +- user_guide/installation/upgrade_130.html | 16 +- user_guide/installation/upgrade_131.html | 14 +- user_guide/installation/upgrade_132.html | 14 +- user_guide/installation/upgrade_133.html | 18 +- user_guide/installation/upgrade_140.html | 14 +- user_guide/installation/upgrade_141.html | 14 +- user_guide/installation/upgrade_150.html | 14 +- user_guide/installation/upgrade_152.html | 14 +- user_guide/installation/upgrade_b11.html | 14 +- user_guide/installation/upgrading.html | 10 +- user_guide/libraries/benchmark.html | 16 +- user_guide/libraries/calendar.html | 12 +- user_guide/libraries/config.html | 16 +- user_guide/libraries/email.html | 18 +- user_guide/libraries/encryption.html | 12 +- user_guide/libraries/file_uploading.html | 16 +- user_guide/libraries/ftp.html | 14 +- user_guide/libraries/image_lib.html | 16 +- user_guide/libraries/input.html | 18 +- user_guide/libraries/language.html | 14 +- user_guide/libraries/loader.html | 12 +- user_guide/libraries/output.html | 14 +- user_guide/libraries/pagination.html | 12 +- user_guide/libraries/parser.html | 14 +- user_guide/libraries/sessions.html | 12 +- user_guide/libraries/table.html | 12 +- user_guide/libraries/trackback.html | 12 +- user_guide/libraries/unit_testing.html | 14 +- user_guide/libraries/uri.html | 22 +- user_guide/libraries/user_agent.html | 12 +- user_guide/libraries/validation.html | 20 +- user_guide/libraries/xmlrpc.html | 14 +- user_guide/libraries/zip.html | 14 +- user_guide/license.html | 20 +- user_guide/nav/nav.js | 252 +- user_guide/overview/appflow.html | 14 +- user_guide/overview/at_a_glance.html | 64 +- user_guide/overview/features.html | 16 +- user_guide/overview/goals.html | 20 +- user_guide/overview/index.html | 16 +- user_guide/overview/mvc.html | 18 +- user_guide/toc.html | 18 +- 189 files changed, 22951 insertions(+), 22944 deletions(-) diff --git a/license.txt b/license.txt index 4476208a..e93f3f55 100644 --- a/license.txt +++ b/license.txt @@ -1,52 +1,52 @@ -Copyright (c) 2006, pMachine, Inc. -All rights reserved. - -This license is a legal agreement between you and pMachine Inc. for the use -of Code Igniter Software (the "Software"). By obtaining the Software you -agree to comply with the terms and conditions of this license. - -PERMITTED USE -You are permitted to use, copy, modify, and distribute the Software and its -documentation, with or without modification, for any purpose, provided that -the following conditions are met: - -1. A copy of this license agreement must be included with the distribution. - -2. Redistributions of source code must retain the above copyright notice in - all source code files. - -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 - of the change and the names of those who changed them. - -5. Products derived from the Software must include an acknowledgment that - they are derived from Code Igniter in their documentation and/or other - 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 - 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 -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. - -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 -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. +Copyright (c) 2006, 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 +agree to comply with the terms and conditions of this license. + +PERMITTED USE +You are permitted to use, copy, modify, and distribute the Software and its +documentation, with or without modification, for any purpose, provided that +the following conditions are met: + +1. A copy of this license agreement must be included with the distribution. + +2. Redistributions of source code must retain the above copyright notice in + all source code files. + +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 + of the change and the names of those who changed them. + +5. Products derived from the Software must include an acknowledgment that + they are derived from CodeIgniter in their documentation and/or other + materials provided with the distribution. + +6. Products derived from the Software may not be called "CodeIgniter", + nor may "CodeIgniter" appear in their name, without prior written + permission from EllisLab, 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 +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. + +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 +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. diff --git a/system/application/config/config.php b/system/application/config/config.php index b1598b34..3bb9d1d2 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -1,302 +1,302 @@ - \ No newline at end of file diff --git a/system/application/views/welcome_message.php b/system/application/views/welcome_message.php index 393fb56e..8313059e 100644 --- a/system/application/views/welcome_message.php +++ b/system/application/views/welcome_message.php @@ -1,62 +1,62 @@ - - -Welcome to Code Igniter - - - - - -

                Welcome to Code Igniter!

                - -

                The page you are looking at is being generated dynamically by Code Igniter.

                - -

                If you would like to edit this page you'll find it located at:

                -system/application/views/welcome_message.php - -

                The corresponding controller for this page is found at:

                -system/application/controllers/welcome.php - -

                If you are exploring Code Igniter for the very first time, you should start by reading the User Guide.

                - - -


                Page rendered in {elapsed_time} seconds

                - - + + +Welcome to CodeIgniter + + + + + +

                Welcome to CodeIgniter!

                + +

                The page you are looking at is being generated dynamically by CodeIgniter.

                + +

                If you would like to edit this page you'll find it located at:

                +system/application/views/welcome_message.php + +

                The corresponding controller for this page is found at:

                +system/application/controllers/welcome.php + +

                If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.

                + + +


                Page rendered in {elapsed_time} seconds

                + + \ No newline at end of file diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php index b2713b66..b00da8ba 100644 --- a/system/codeigniter/Base4.php +++ b/system/codeigniter/Base4.php @@ -1,67 +1,67 @@ -load->library('email') to instantiate - * classes that can then be used within controllers as $this->email->send() - * - * PHP 4 also has trouble referencing the CI super object within application - * constructors since objects do not exist until the class is fully - * instantiated. Basically PHP 4 sucks... - * - * Since PHP 5 doesn't suffer from this problem so we load one of - * two files based on the version of PHP being run. - * - * @package CodeIgniter - * @subpackage codeigniter - * @category front-controller - * @author Rick Ellis - * @link http://www.codeigniter.com/user_guide/ - */ - class CI_Base extends CI_Loader { - - function CI_Base() - { - // This allows syntax like $this->load->foo() to work - parent::CI_Loader(); - $this->load =& $this; - - // This allows resources used within controller constructors to work - global $OBJ; - $OBJ = $this->load; // Do NOT use a reference. - } -} - -function &get_instance() -{ - global $CI, $OBJ; - - if (is_object($CI)) - { - return $CI; - } - - return $OBJ->load; -} - +load->library('email') to instantiate + * classes that can then be used within controllers as $this->email->send() + * + * PHP 4 also has trouble referencing the CI super object within application + * constructors since objects do not exist until the class is fully + * instantiated. Basically PHP 4 sucks... + * + * Since PHP 5 doesn't suffer from this problem so we load one of + * two files based on the version of PHP being run. + * + * @package CodeIgniter + * @subpackage codeigniter + * @category front-controller + * @author Rick Ellis + * @link http://www.codeigniter.com/user_guide/ + */ + class CI_Base extends CI_Loader { + + function CI_Base() + { + // This allows syntax like $this->load->foo() to work + parent::CI_Loader(); + $this->load =& $this; + + // This allows resources used within controller constructors to work + global $OBJ; + $OBJ = $this->load; // Do NOT use a reference. + } +} + +function &get_instance() +{ + global $CI, $OBJ; + + if (is_object($CI)) + { + return $CI; + } + + return $OBJ->load; +} + ?> \ No newline at end of file diff --git a/system/codeigniter/Base5.php b/system/codeigniter/Base5.php index 0d036fae..d1531a57 100644 --- a/system/codeigniter/Base5.php +++ b/system/codeigniter/Base5.php @@ -1,54 +1,54 @@ - \ No newline at end of file diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 12f1a0d5..aed05ddc 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -1,12 +1,12 @@ show_error('An Error Was Encountered', $message); - exit; -} - - -/** -* 404 Page Handler -* -* This function is similar to the show_error() function above -* However, instead of the standard error template it displays -* 404 errors. -* -* @access public -* @return void -*/ -function show_404($page = '') -{ - $error =& load_class('Exceptions'); - $error->show_404($page); - exit; -} - - -/** -* Error Logging Interface -* -* We use this as a simple mechanism to access the logging -* class and send messages to be logged. -* -* @access public -* @return void -*/ -function log_message($level = 'error', $message, $php_error = FALSE) -{ - static $LOG; - - $config =& get_config(); - if ($config['log_threshold'] == 0) - { - return; - } - - $LOG =& load_class('Log'); - $LOG->write_log($level, $message, $php_error); -} - -/** -* Exception Handler -* -* This is the custom exception handler that is declaired at the top -* of Codeigniter.php. The main reason we use this is permit -* PHP errors to be logged in our own log files since we may -* not have access to server logs. Since this function -* effectively intercepts PHP errors, however, we also need -* to display errors based on the current error_reporting level. -* We do that with the use of a PHP error template. -* -* @access private -* @return void -*/ -function _exception_handler($severity, $message, $filepath, $line) -{ - // We don't bother with "strict" notices since they will fill up - // the log file with information that isn't normally very - // helpful. For example, if you are running PHP 5 and you - // use version 4 style class functions (without prefixes - // like "public", "private", etc.) you'll get notices telling - // you that these have been deprecated. - - if ($severity == E_STRICT) - { - return; - } - - $error =& load_class('Exceptions'); - - // Should we display the error? - // We'll get the current error_reporting level and add its bits - // with the severity bits to find out. - - if (($severity & error_reporting()) == $severity) - { - $error->show_php_error($severity, $message, $filepath, $line); - } - - // Should we log the error? No? We're done... - $config =& get_config(); - if ($config['log_threshold'] == 0) - { - return; - } - - $error->log_exception($severity, $message, $filepath, $line); -} - - +show_error('An Error Was Encountered', $message); + exit; +} + + +/** +* 404 Page Handler +* +* This function is similar to the show_error() function above +* However, instead of the standard error template it displays +* 404 errors. +* +* @access public +* @return void +*/ +function show_404($page = '') +{ + $error =& load_class('Exceptions'); + $error->show_404($page); + exit; +} + + +/** +* Error Logging Interface +* +* We use this as a simple mechanism to access the logging +* class and send messages to be logged. +* +* @access public +* @return void +*/ +function log_message($level = 'error', $message, $php_error = FALSE) +{ + static $LOG; + + $config =& get_config(); + if ($config['log_threshold'] == 0) + { + return; + } + + $LOG =& load_class('Log'); + $LOG->write_log($level, $message, $php_error); +} + +/** +* Exception Handler +* +* This is the custom exception handler that is declaired at the top +* of Codeigniter.php. The main reason we use this is permit +* PHP errors to be logged in our own log files since we may +* not have access to server logs. Since this function +* effectively intercepts PHP errors, however, we also need +* to display errors based on the current error_reporting level. +* We do that with the use of a PHP error template. +* +* @access private +* @return void +*/ +function _exception_handler($severity, $message, $filepath, $line) +{ + // We don't bother with "strict" notices since they will fill up + // the log file with information that isn't normally very + // helpful. For example, if you are running PHP 5 and you + // use version 4 style class functions (without prefixes + // like "public", "private", etc.) you'll get notices telling + // you that these have been deprecated. + + if ($severity == E_STRICT) + { + return; + } + + $error =& load_class('Exceptions'); + + // Should we display the error? + // We'll get the current error_reporting level and add its bits + // with the severity bits to find out. + + if (($severity & error_reporting()) == $severity) + { + $error->show_php_error($severity, $message, $filepath, $line); + } + + // Should we log the error? No? We're done... + $config =& get_config(); + if ($config['log_threshold'] == 0) + { + return; + } + + $error->log_exception($severity, $message, $filepath, $line); +} + + ?> \ No newline at end of file diff --git a/system/database/DB.php b/system/database/DB.php index c6bd365d..4a119d04 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -1,86 +1,86 @@ - \ No newline at end of file diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 1c72528e..d79a068e 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1,12 +1,12 @@ CI - // and load the file helper since we use it a lot - $this->CI =& get_instance(); - $this->CI->load->helper('file'); - } - - // -------------------------------------------------------------------- - - /** - * Set Cache Directory Path - * - * @access public - * @param string the path to the cache directory - * @return bool - */ - function check_path($path = '') - { - if ($path == '') - { - if ($this->CI->db->cachedir == '') - { - return $this->CI->db->cache_off(); - } - - $path = $this->CI->db->cachedir; - } - - // Add a trailing slash to the path if needed - $path = preg_replace("/(.+?)\/*$/", "\\1/", $path); - - if ( ! is_dir($path) OR ! is_writable($path)) - { - if ($this->CI->db->db_debug) - { - return $this->CI->db->display_error('db_invalid_cache_path'); - } - - // If the path is wrong we'll turn off caching - return $this->CI->db->cache_off(); - } - - $this->CI->db->cachedir = $path; - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Retrieve a cached query - * - * The URI being requested will become the name of the cache sub-folder. - * An MD5 hash of the SQL statement will become the cache file name - * - * @access public - * @return string - */ - function read($sql) - { - if ( ! $this->check_path()) - { - return $this->CI->db->cache_off(); - } - - $uri = ($this->CI->uri->segment(1) == FALSE) ? 'default.' : $this->CI->uri->segment(1).'+'; - $uri .= ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); - - $filepath = $uri.'/'.md5($sql); - - if (FALSE === ($cachedata = read_file($this->CI->db->cachedir.$filepath))) - { - return FALSE; - } - - return unserialize($cachedata); - } - - // -------------------------------------------------------------------- - - /** - * Write a query to a cache file - * - * @access public - * @return bool - */ - function write($sql, $object) - { - if ( ! $this->check_path()) - { - return $this->CI->db->cache_off(); - } - - $uri = ($this->CI->uri->segment(1) == FALSE) ? 'default.' : $this->CI->uri->segment(1).'+'; - $uri .= ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); - - $dir_path = $this->CI->db->cachedir.$uri.'/'; - - $filename = md5($sql); - - if ( ! @is_dir($dir_path)) - { - if ( ! @mkdir($dir_path, 0777)) - { - return FALSE; - } - - @chmod($dir_path, 0777); - } - - if (write_file($dir_path.$filename, serialize($object)) === FALSE) - { - return FALSE; - } - - @chmod($dir_path.$filename, 0777); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Delete cache files within a particular directory - * - * @access public - * @return bool - */ - function delete($segment_one = '', $segment_two = '') - { - if ($segment_one == '') - { - $segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(2); - } - - if ($segment_two == '') - { - $segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); - } - - $dir_path = $this->CI->db->cachedir.$segment_one.'+'.$segment_two.'/'; - - delete_files($dir_path, TRUE); - } - - // -------------------------------------------------------------------- - - /** - * Delete all existing cache files - * - * @access public - * @return bool - */ - function delete_all() - { - delete_files($this->CI->db->cachedir, TRUE); - } - -} - +CI + // and load the file helper since we use it a lot + $this->CI =& get_instance(); + $this->CI->load->helper('file'); + } + + // -------------------------------------------------------------------- + + /** + * Set Cache Directory Path + * + * @access public + * @param string the path to the cache directory + * @return bool + */ + function check_path($path = '') + { + if ($path == '') + { + if ($this->CI->db->cachedir == '') + { + return $this->CI->db->cache_off(); + } + + $path = $this->CI->db->cachedir; + } + + // Add a trailing slash to the path if needed + $path = preg_replace("/(.+?)\/*$/", "\\1/", $path); + + if ( ! is_dir($path) OR ! is_writable($path)) + { + if ($this->CI->db->db_debug) + { + return $this->CI->db->display_error('db_invalid_cache_path'); + } + + // If the path is wrong we'll turn off caching + return $this->CI->db->cache_off(); + } + + $this->CI->db->cachedir = $path; + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Retrieve a cached query + * + * The URI being requested will become the name of the cache sub-folder. + * An MD5 hash of the SQL statement will become the cache file name + * + * @access public + * @return string + */ + function read($sql) + { + if ( ! $this->check_path()) + { + return $this->CI->db->cache_off(); + } + + $uri = ($this->CI->uri->segment(1) == FALSE) ? 'default.' : $this->CI->uri->segment(1).'+'; + $uri .= ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); + + $filepath = $uri.'/'.md5($sql); + + if (FALSE === ($cachedata = read_file($this->CI->db->cachedir.$filepath))) + { + return FALSE; + } + + return unserialize($cachedata); + } + + // -------------------------------------------------------------------- + + /** + * Write a query to a cache file + * + * @access public + * @return bool + */ + function write($sql, $object) + { + if ( ! $this->check_path()) + { + return $this->CI->db->cache_off(); + } + + $uri = ($this->CI->uri->segment(1) == FALSE) ? 'default.' : $this->CI->uri->segment(1).'+'; + $uri .= ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); + + $dir_path = $this->CI->db->cachedir.$uri.'/'; + + $filename = md5($sql); + + if ( ! @is_dir($dir_path)) + { + if ( ! @mkdir($dir_path, 0777)) + { + return FALSE; + } + + @chmod($dir_path, 0777); + } + + if (write_file($dir_path.$filename, serialize($object)) === FALSE) + { + return FALSE; + } + + @chmod($dir_path.$filename, 0777); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Delete cache files within a particular directory + * + * @access public + * @return bool + */ + function delete($segment_one = '', $segment_two = '') + { + if ($segment_one == '') + { + $segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(2); + } + + if ($segment_two == '') + { + $segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); + } + + $dir_path = $this->CI->db->cachedir.$segment_one.'+'.$segment_two.'/'; + + delete_files($dir_path, TRUE); + } + + // -------------------------------------------------------------------- + + /** + * Delete all existing cache files + * + * @access public + * @return bool + */ + function delete_all() + { + delete_files($this->CI->db->cachedir, TRUE); + } + +} + ?> \ No newline at end of file diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 2a8510e1..7ff33246 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1,1067 +1,1067 @@ -initialize($params); - log_message('debug', 'Database Driver Class Initialized'); - } - - // -------------------------------------------------------------------- - - /** - * Initialize Database Settings - * - * @access private Called by the constructor - * @param mixed - * @return void - */ - function initialize($params = '') - { - if (is_array($params)) - { - $defaults = array( - 'hostname' => '', - 'username' => '', - 'password' => '', - 'database' => '', - 'conn_id' => FALSE, - 'dbdriver' => 'mysql', - 'dbprefix' => '', - 'port' => '', - 'pconnect' => FALSE, - 'db_debug' => FALSE, - 'cachedir' => '', - 'cache_on' => FALSE - ); - - foreach ($defaults as $key => $val) - { - $this->$key = ( ! isset($params[$key])) ? $val : $params[$key]; - } - } - elseif (strpos($params, '://')) - { - if (FALSE === ($dsn = @parse_url($params))) - { - log_message('error', 'Invalid DB Connection String'); - - if ($this->db_debug) - { - return $this->display_error('db_invalid_connection_str'); - } - return FALSE; - } - - $this->hostname = ( ! isset($dsn['host'])) ? '' : rawurldecode($dsn['host']); - $this->username = ( ! isset($dsn['user'])) ? '' : rawurldecode($dsn['user']); - $this->password = ( ! isset($dsn['pass'])) ? '' : rawurldecode($dsn['pass']); - $this->database = ( ! isset($dsn['path'])) ? '' : rawurldecode(substr($dsn['path'], 1)); - } - - // If an existing DB connection resource is supplied - // there is no need to connect and select the database - if (is_resource($this->conn_id)) - { - return TRUE; - } - - // Connect to the database - $this->conn_id = ($this->pconnect == FALSE) ? $this->db_connect() : $this->db_pconnect(); - - // No connection? Throw an error - if ( ! $this->conn_id) - { - log_message('error', 'Unable to connect to the database'); - - if ($this->db_debug) - { - $this->display_error('db_unable_to_connect'); - } - return FALSE; - } - - // Select the database - if ($this->database != '') - { - if ( ! $this->db_select()) - { - log_message('error', 'Unable to select database: '.$this->database); - - if ($this->db_debug) - { - $this->display_error('db_unable_to_select', $this->database); - } - return FALSE; - } - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * The name of the platform in use (mysql, mssql, etc...) - * - * @access public - * @return string - */ - function platform() - { - return $this->dbdriver; - } - - // -------------------------------------------------------------------- - - /** - * Database Version Number. Returns a string containing the - * version of the database being used - * - * @access public - * @return string - */ - function version() - { - if (FALSE === ($sql = $this->_version())) - { - if ($this->db_debug) - { - return $this->display_error('db_unsupported_function'); - } - return FALSE; - } - - if ($this->dbdriver == 'oci8') - { - return $sql; - } - - $query = $this->query($sql); - $row = $query->row(); - return $row->ver; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * Accepts an SQL string as input and returns a result object upon - * successful execution of a "read" type query. Returns boolean TRUE - * upon successful execution of a "write" type query. Returns boolean - * FALSE upon failure, and if the $db_debug variable is set to TRUE - * will raise an error. - * - * @access public - * @param string An SQL query string - * @param array An array of binding data - * @return mixed - */ - function query($sql, $binds = FALSE, $return_object = TRUE) - { - if ($sql == '') - { - if ($this->db_debug) - { - log_message('error', 'Invalid query: '.$sql); - return $this->display_error('db_invalid_query'); - } - return FALSE; - } - - // Is query caching enabled? If the query is a "read type" - // we will load the caching class and return the previously - // cached query if it exists - if ($this->cache_on == TRUE AND stristr($sql, 'SELECT')) - { - if ($this->_cache_init()) - { - $this->load_rdriver(); - if (FALSE !== ($cache = $this->CACHE->read($sql))) - { - return $cache; - } - } - } - - // Compile binds if needed - if ($binds !== FALSE) - { - $sql = $this->compile_binds($sql, $binds); - } - - // Save the query for debugging - $this->queries[] = $sql; - - // Start the Query Timer - $time_start = list($sm, $ss) = explode(' ', microtime()); - - // Run the Query - if (FALSE === ($this->result_id = $this->simple_query($sql))) - { - // This will trigger a rollback if transactions are being used - $this->_trans_failure = TRUE; - - if ($this->db_debug) - { - log_message('error', 'Query error: '.$this->_error_message()); - return $this->display_error( - array( - 'Error Number: '.$this->_error_number(), - $this->_error_message(), - $sql - ) - ); - } - - return FALSE; - } - - // Stop and aggregate the query time results - $time_end = list($em, $es) = explode(' ', microtime()); - $this->benchmark += ($em + $es) - ($sm + $ss); - - // Increment the query counter - $this->query_count++; - - // Was the query a "write" type? - // If so we'll simply return true - if ($this->is_write_type($sql) === TRUE) - { - // If caching is enabled we'll auto-cleanup any - // existing files related to this particular URI - if ($this->cache_on == TRUE AND $this->cache_autodel == TRUE AND $this->_cache_init()) - { - $this->CACHE->delete(); - } - - return TRUE; - } - - // Return TRUE if we don't need to create a result object - // Currently only the Oracle driver uses this when stored - // procedures are used - if ($return_object !== TRUE) - { - return TRUE; - } - - // Load and instantiate the result driver - - $driver = $this->load_rdriver(); - $RES = new $driver(); - $RES->conn_id = $this->conn_id; - $RES->result_id = $this->result_id; - - if ($this->dbdriver == 'oci8') - { - $RES->stmt_id = $this->stmt_id; - $RES->curs_id = NULL; - $RES->limit_used = $this->limit_used; - } - - // Is query caching enabled? If so, we'll serialize the - // result object and save it to a cache file. - if ($this->cache_on == TRUE AND $this->_cache_init()) - { - // We'll create a new instance of the result object - // only without the platform specific driver since - // we can't use it with cached data (the query result - // resource ID won't be any good once we've cached the - // result object, so we'll have to compile the data - // and save it) - $CR = new CI_DB_result(); - $CR->num_rows = $RES->num_rows(); - $CR->result_object = $RES->result_object(); - $CR->result_array = $RES->result_array(); - - // Reset these since cached objects can not utilize resource IDs. - $CR->conn_id = NULL; - $CR->result_id = NULL; - - $this->CACHE->write($sql, $CR); - } - - return $RES; - } - - // -------------------------------------------------------------------- - - /** - * Load the result drivers - * - * @access public - * @return string the name of the result class - */ - function load_rdriver() - { - $driver = 'CI_DB_'.$this->dbdriver.'_result'; - - if ( ! class_exists($driver)) - { - include_once(BASEPATH.'database/DB_result'.EXT); - include_once(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_result'.EXT); - } - - return $driver; - } - - // -------------------------------------------------------------------- - - /** - * Simple Query - * This is a simplified version of the query() function. Internally - * we only use it when running transaction commands since they do - * not require all the features of the main query() function. - * - * @access public - * @param string the sql query - * @return mixed - */ - function simple_query($sql) - { - if ( ! $this->conn_id) - { - $this->initialize(); - } - - return $this->_execute($sql); - } - - // -------------------------------------------------------------------- - - /** - * Disable Transactions - * This permits transactions to be disabled at run-time. - * - * @access public - * @return void - */ - function trans_off() - { - $this->trans_enabled = FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Start Transaction - * - * @access public - * @return void - */ - function trans_start($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return FALSE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - $this->_trans_depth += 1; - return; - } - - $this->trans_begin($test_mode); - } - - // -------------------------------------------------------------------- - - /** - * Complete Transaction - * - * @access public - * @return bool - */ - function trans_complete() - { - if ( ! $this->trans_enabled) - { - return FALSE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 1) - { - $this->_trans_depth -= 1; - return TRUE; - } - - // The query() function will set this flag to TRUE in the event that a query failed - if ($this->_trans_failure === TRUE) - { - $this->trans_rollback(); - - if ($this->db_debug) - { - return $this->display_error('db_transaction_failure'); - } - return FALSE; - } - - $this->trans_commit(); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Lets you retrieve the transaction flag to determine if it has failed - * - * @access public - * @return bool - */ - function trans_status() - { - return $this->_trans_failure; - } - - // -------------------------------------------------------------------- - - /** - * Compile Bindings - * - * @access public - * @param string the sql statement - * @param array an array of bind data - * @return string - */ - function compile_binds($sql, $binds) - { - if (FALSE === strpos($sql, $this->bind_marker)) - { - return $sql; - } - - if ( ! is_array($binds)) - { - $binds = array($binds); - } - - foreach ($binds as $val) - { - $val = $this->escape($val); - - // Just in case the replacement string contains the bind - // character we'll temporarily replace it with a marker - $val = str_replace($this->bind_marker, '{%bind_marker%}', $val); - $sql = preg_replace("#".preg_quote($this->bind_marker, '#')."#", str_replace('$', '\$', $val), $sql, 1); - } - - return str_replace('{%bind_marker%}', $this->bind_marker, $sql); - } - - // -------------------------------------------------------------------- - - /** - * Determines if a query is a "write" type. - * - * @access public - * @param string An SQL query string - * @return boolean - */ - function is_write_type($sql) - { - if ( ! preg_match('/^\s*"?(INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|LOAD DATA|COPY|ALTER|GRANT|REVOKE|LOCK|UNLOCK)\s+/i', $sql)) - { - return FALSE; - } - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Calculate the aggregate query elapsed time - * - * @access public - * @param integer The number of decimal places - * @return integer - */ - function elapsed_time($decimals = 6) - { - return number_format($this->benchmark, $decimals); - } - - // -------------------------------------------------------------------- - - /** - * Returns the total number of queries - * - * @access public - * @return integer - */ - function total_queries() - { - return $this->query_count; - } - - // -------------------------------------------------------------------- - - /** - * Returns the last query that was executed - * - * @access public - * @return void - */ - function last_query() - { - return end($this->queries); - } - - // -------------------------------------------------------------------- - - /** - * "Smart" Escape String - * - * Escapes data based on type - * Sets boolean and null types - * - * @access public - * @param string - * @return integer - */ - function escape($str) - { - switch (gettype($str)) - { - case 'string' : $str = "'".$this->escape_str($str)."'"; - break; - case 'boolean' : $str = ($str === FALSE) ? 0 : 1; - break; - default : $str = ($str === NULL) ? 'NULL' : $str; - break; - } - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Primary - * - * Retrieves the primary key. It assumes that the row in the first - * position is the primary key - * - * @access public - * @param string the table name - * @return string - */ - function primary($table = '') - { - $fields = $this->list_fields($table); - - if ( ! is_array($fields)) - { - return FALSE; - } - - return current($fields); - } - - // -------------------------------------------------------------------- - - /** - * Returns an array of table names - * - * @access public - * @return array - */ - function list_tables() - { - // Is there a cached result? - if (isset($this->data_cache['table_names'])) - { - return $this->data_cache['table_names']; - } - - if (FALSE === ($sql = $this->_list_tables())) - { - if ($this->db_debug) - { - return $this->display_error('db_unsupported_function'); - } - return FALSE; - } - - $retval = array(); - $query = $this->query($sql); - - if ($query->num_rows() > 0) - { - foreach($query->result_array() as $row) - { - if (isset($row['TABLE_NAME'])) - { - $retval[] = $row['TABLE_NAME']; - } - else - { - $retval[] = array_shift($row); - } - } - } - - $this->data_cache['table_names'] = $retval; - return $this->data_cache['table_names']; - } - - // -------------------------------------------------------------------- - - /** - * Determine if a particular table exists - * @access public - * @return boolean - */ - function table_exists($table_name) - { - return ( ! in_array($this->dbprefix.$table_name, $this->list_tables())) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Fetch MySQL Field Names - * - * @access public - * @param string the table name - * @return array - */ - function list_fields($table = '') - { - // Is there a cached result? - if (isset($this->data_cache['field_names'][$table])) - { - return $this->data_cache['field_names'][$table]; - } - - if ($table == '') - { - if ($this->db_debug) - { - return $this->display_error('db_field_param_missing'); - } - return FALSE; - } - - if (FALSE === ($sql = $this->_list_columns($this->dbprefix.$table))) - { - if ($this->db_debug) - { - return $this->display_error('db_unsupported_function'); - } - return FALSE; - } - - $query = $this->query($sql); - - $retval = array(); - foreach($query->result_array() as $row) - { - if (isset($row['COLUMN_NAME'])) - { - $retval[] = $row['COLUMN_NAME']; - } - else - { - $retval[] = current($row); - } - } - - $this->data_cache['field_names'][$table] = $retval; - return $this->data_cache['field_names'][$table]; - } - - // -------------------------------------------------------------------- - - /** - * Determine if a particular field exists - * @access public - * @param string - * @param string - * @return boolean - */ - function field_exists($field_name, $table_name) - { - return ( ! in_array($field_name, $this->list_fields($table_name))) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * DEPRECATED - use list_fields() - */ - function field_names($table = '') - { - return $this->list_fields($table); - } - - // -------------------------------------------------------------------- - - /** - * Returns an object with field data - * - * @access public - * @param string the table name - * @return object - */ - function field_data($table = '') - { - if ($table == '') - { - if ($this->db_debug) - { - return $this->display_error('db_field_param_missing'); - } - return FALSE; - } - - $query = $this->query($this->_field_data($this->dbprefix.$table)); - return $query->field_data(); - } - - // -------------------------------------------------------------------- - - /** - * Generate an insert string - * - * @access public - * @param string the table upon which the query will be performed - * @param array an associative array data of key/values - * @return string - */ - function insert_string($table, $data) - { - $fields = array(); - $values = array(); - - foreach($data as $key => $val) - { - $fields[] = $key; - $values[] = $this->escape($val); - } - - return $this->_insert($this->dbprefix.$table, $fields, $values); - } - - // -------------------------------------------------------------------- - - /** - * Generate an update string - * - * @access public - * @param string the table upon which the query will be performed - * @param array an associative array data of key/values - * @param mixed the "where" statement - * @return string - */ - function update_string($table, $data, $where) - { - if ($where == '') - return false; - - $fields = array(); - foreach($data as $key => $val) - { - $fields[$key] = $this->escape($val); - } - - if ( ! is_array($where)) - { - $dest = array($where); - } - else - { - $dest = array(); - foreach ($where as $key => $val) - { - $prefix = (count($dest) == 0) ? '' : ' AND '; - - if ($val != '') - { - if ( ! $this->_has_operator($key)) - { - $key .= ' ='; - } - - $val = ' '.$this->escape($val); - } - - $dest[] = $prefix.$key.$val; - } - } - - return $this->_update($this->dbprefix.$table, $fields, $dest); - } - - // -------------------------------------------------------------------- - - /** - * Enables a native PHP function to be run, using a platform agnostic wrapper. - * - * @access public - * @param string the function name - * @param mixed any parameters needed by the function - * @return mixed - */ - function call_function($function) - { - $driver = ($this->dbdriver == 'postgre') ? 'pg_' : $this->dbdriver.'_'; - - if (FALSE === strpos($driver, $function)) - { - $function = $driver.$function; - } - - if ( ! function_exists($function)) - { - if ($this->db_debug) - { - return $this->display_error('db_unsupported_function'); - } - return FALSE; - } - else - { - $args = (func_num_args() > 1) ? array_splice(func_get_args(), 1) : null; - - return call_user_func_array($function, $args); - } - } - - // -------------------------------------------------------------------- - - /** - * Set Cache Directory Path - * - * @access public - * @param string the path to the cache directory - * @return void - */ - function cache_set_path($path = '') - { - $this->cachedir = $path; - } - - // -------------------------------------------------------------------- - - /** - * Enable Query Caching - * - * @access public - * @return void - */ - function cache_on() - { - $this->cache_on = TRUE; - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Disable Query Caching - * - * @access public - * @return void - */ - function cache_off() - { - $this->cache_on = FALSE; - return FALSE; - } - - - // -------------------------------------------------------------------- - - /** - * Delete the cache files associated with a particular URI - * - * @access public - * @return void - */ - function cache_delete($segment_one = '', $segment_two = '') - { - if ( ! $this->_cache_init()) - { - return FALSE; - } - return $this->CACHE->delete($segment_one, $segment_two); - } - - // -------------------------------------------------------------------- - - /** - * Delete All cache files - * - * @access public - * @return void - */ - function cache_delete_all() - { - if ( ! $this->_cache_init()) - { - return FALSE; - } - - return $this->CACHE->delete_all(); - } - - // -------------------------------------------------------------------- - - /** - * Initialize the Cache Class - * - * @access private - * @return void - */ - function _cache_init() - { - if (is_object($this->CACHE) AND class_exists('CI_DB_Cache')) - { - return TRUE; - } - - if ( ! @include(BASEPATH.'database/DB_cache'.EXT)) - { - return $this->cache_off(); - } - - $this->CACHE = new CI_DB_Cache; - return TRUE; - } - - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @return void - */ - function close() - { - if (is_resource($this->conn_id)) - { - $this->_close($this->conn_id); - } - $this->conn_id = FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Display an error message - * - * @access public - * @param string the error message - * @param string any "swap" values - * @param boolean whether to localize the message - * @return string sends the application/error_db.php template - */ - function display_error($error = '', $swap = '', $native = FALSE) - { - $LANG = new CI_Language(); - $LANG->load('db'); - - $heading = 'MySQL Error'; - - if ($native == TRUE) - { - $message = $error; - } - else - { - $message = ( ! is_array($error)) ? array(str_replace('%s', $swap, $LANG->line($error))) : $error; - } - - if ( ! class_exists('CI_Exceptions')) - { - include(BASEPATH.'libraries/Exceptions'.EXT); - } - - $error = new CI_Exceptions(); - echo $error->show_error('An Error Was Encountered', $message, 'error_db'); - exit; - } - -} - +initialize($params); + log_message('debug', 'Database Driver Class Initialized'); + } + + // -------------------------------------------------------------------- + + /** + * Initialize Database Settings + * + * @access private Called by the constructor + * @param mixed + * @return void + */ + function initialize($params = '') + { + if (is_array($params)) + { + $defaults = array( + 'hostname' => '', + 'username' => '', + 'password' => '', + 'database' => '', + 'conn_id' => FALSE, + 'dbdriver' => 'mysql', + 'dbprefix' => '', + 'port' => '', + 'pconnect' => FALSE, + 'db_debug' => FALSE, + 'cachedir' => '', + 'cache_on' => FALSE + ); + + foreach ($defaults as $key => $val) + { + $this->$key = ( ! isset($params[$key])) ? $val : $params[$key]; + } + } + elseif (strpos($params, '://')) + { + if (FALSE === ($dsn = @parse_url($params))) + { + log_message('error', 'Invalid DB Connection String'); + + if ($this->db_debug) + { + return $this->display_error('db_invalid_connection_str'); + } + return FALSE; + } + + $this->hostname = ( ! isset($dsn['host'])) ? '' : rawurldecode($dsn['host']); + $this->username = ( ! isset($dsn['user'])) ? '' : rawurldecode($dsn['user']); + $this->password = ( ! isset($dsn['pass'])) ? '' : rawurldecode($dsn['pass']); + $this->database = ( ! isset($dsn['path'])) ? '' : rawurldecode(substr($dsn['path'], 1)); + } + + // If an existing DB connection resource is supplied + // there is no need to connect and select the database + if (is_resource($this->conn_id)) + { + return TRUE; + } + + // Connect to the database + $this->conn_id = ($this->pconnect == FALSE) ? $this->db_connect() : $this->db_pconnect(); + + // No connection? Throw an error + if ( ! $this->conn_id) + { + log_message('error', 'Unable to connect to the database'); + + if ($this->db_debug) + { + $this->display_error('db_unable_to_connect'); + } + return FALSE; + } + + // Select the database + if ($this->database != '') + { + if ( ! $this->db_select()) + { + log_message('error', 'Unable to select database: '.$this->database); + + if ($this->db_debug) + { + $this->display_error('db_unable_to_select', $this->database); + } + return FALSE; + } + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * The name of the platform in use (mysql, mssql, etc...) + * + * @access public + * @return string + */ + function platform() + { + return $this->dbdriver; + } + + // -------------------------------------------------------------------- + + /** + * Database Version Number. Returns a string containing the + * version of the database being used + * + * @access public + * @return string + */ + function version() + { + if (FALSE === ($sql = $this->_version())) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + + if ($this->dbdriver == 'oci8') + { + return $sql; + } + + $query = $this->query($sql); + $row = $query->row(); + return $row->ver; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * Accepts an SQL string as input and returns a result object upon + * successful execution of a "read" type query. Returns boolean TRUE + * upon successful execution of a "write" type query. Returns boolean + * FALSE upon failure, and if the $db_debug variable is set to TRUE + * will raise an error. + * + * @access public + * @param string An SQL query string + * @param array An array of binding data + * @return mixed + */ + function query($sql, $binds = FALSE, $return_object = TRUE) + { + if ($sql == '') + { + if ($this->db_debug) + { + log_message('error', 'Invalid query: '.$sql); + return $this->display_error('db_invalid_query'); + } + return FALSE; + } + + // Is query caching enabled? If the query is a "read type" + // we will load the caching class and return the previously + // cached query if it exists + if ($this->cache_on == TRUE AND stristr($sql, 'SELECT')) + { + if ($this->_cache_init()) + { + $this->load_rdriver(); + if (FALSE !== ($cache = $this->CACHE->read($sql))) + { + return $cache; + } + } + } + + // Compile binds if needed + if ($binds !== FALSE) + { + $sql = $this->compile_binds($sql, $binds); + } + + // Save the query for debugging + $this->queries[] = $sql; + + // Start the Query Timer + $time_start = list($sm, $ss) = explode(' ', microtime()); + + // Run the Query + if (FALSE === ($this->result_id = $this->simple_query($sql))) + { + // This will trigger a rollback if transactions are being used + $this->_trans_failure = TRUE; + + if ($this->db_debug) + { + log_message('error', 'Query error: '.$this->_error_message()); + return $this->display_error( + array( + 'Error Number: '.$this->_error_number(), + $this->_error_message(), + $sql + ) + ); + } + + return FALSE; + } + + // Stop and aggregate the query time results + $time_end = list($em, $es) = explode(' ', microtime()); + $this->benchmark += ($em + $es) - ($sm + $ss); + + // Increment the query counter + $this->query_count++; + + // Was the query a "write" type? + // If so we'll simply return true + if ($this->is_write_type($sql) === TRUE) + { + // If caching is enabled we'll auto-cleanup any + // existing files related to this particular URI + if ($this->cache_on == TRUE AND $this->cache_autodel == TRUE AND $this->_cache_init()) + { + $this->CACHE->delete(); + } + + return TRUE; + } + + // Return TRUE if we don't need to create a result object + // Currently only the Oracle driver uses this when stored + // procedures are used + if ($return_object !== TRUE) + { + return TRUE; + } + + // Load and instantiate the result driver + + $driver = $this->load_rdriver(); + $RES = new $driver(); + $RES->conn_id = $this->conn_id; + $RES->result_id = $this->result_id; + + if ($this->dbdriver == 'oci8') + { + $RES->stmt_id = $this->stmt_id; + $RES->curs_id = NULL; + $RES->limit_used = $this->limit_used; + } + + // Is query caching enabled? If so, we'll serialize the + // result object and save it to a cache file. + if ($this->cache_on == TRUE AND $this->_cache_init()) + { + // We'll create a new instance of the result object + // only without the platform specific driver since + // we can't use it with cached data (the query result + // resource ID won't be any good once we've cached the + // result object, so we'll have to compile the data + // and save it) + $CR = new CI_DB_result(); + $CR->num_rows = $RES->num_rows(); + $CR->result_object = $RES->result_object(); + $CR->result_array = $RES->result_array(); + + // Reset these since cached objects can not utilize resource IDs. + $CR->conn_id = NULL; + $CR->result_id = NULL; + + $this->CACHE->write($sql, $CR); + } + + return $RES; + } + + // -------------------------------------------------------------------- + + /** + * Load the result drivers + * + * @access public + * @return string the name of the result class + */ + function load_rdriver() + { + $driver = 'CI_DB_'.$this->dbdriver.'_result'; + + if ( ! class_exists($driver)) + { + include_once(BASEPATH.'database/DB_result'.EXT); + include_once(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_result'.EXT); + } + + return $driver; + } + + // -------------------------------------------------------------------- + + /** + * Simple Query + * This is a simplified version of the query() function. Internally + * we only use it when running transaction commands since they do + * not require all the features of the main query() function. + * + * @access public + * @param string the sql query + * @return mixed + */ + function simple_query($sql) + { + if ( ! $this->conn_id) + { + $this->initialize(); + } + + return $this->_execute($sql); + } + + // -------------------------------------------------------------------- + + /** + * Disable Transactions + * This permits transactions to be disabled at run-time. + * + * @access public + * @return void + */ + function trans_off() + { + $this->trans_enabled = FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Start Transaction + * + * @access public + * @return void + */ + function trans_start($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return FALSE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + $this->_trans_depth += 1; + return; + } + + $this->trans_begin($test_mode); + } + + // -------------------------------------------------------------------- + + /** + * Complete Transaction + * + * @access public + * @return bool + */ + function trans_complete() + { + if ( ! $this->trans_enabled) + { + return FALSE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 1) + { + $this->_trans_depth -= 1; + return TRUE; + } + + // The query() function will set this flag to TRUE in the event that a query failed + if ($this->_trans_failure === TRUE) + { + $this->trans_rollback(); + + if ($this->db_debug) + { + return $this->display_error('db_transaction_failure'); + } + return FALSE; + } + + $this->trans_commit(); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Lets you retrieve the transaction flag to determine if it has failed + * + * @access public + * @return bool + */ + function trans_status() + { + return $this->_trans_failure; + } + + // -------------------------------------------------------------------- + + /** + * Compile Bindings + * + * @access public + * @param string the sql statement + * @param array an array of bind data + * @return string + */ + function compile_binds($sql, $binds) + { + if (FALSE === strpos($sql, $this->bind_marker)) + { + return $sql; + } + + if ( ! is_array($binds)) + { + $binds = array($binds); + } + + foreach ($binds as $val) + { + $val = $this->escape($val); + + // Just in case the replacement string contains the bind + // character we'll temporarily replace it with a marker + $val = str_replace($this->bind_marker, '{%bind_marker%}', $val); + $sql = preg_replace("#".preg_quote($this->bind_marker, '#')."#", str_replace('$', '\$', $val), $sql, 1); + } + + return str_replace('{%bind_marker%}', $this->bind_marker, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Determines if a query is a "write" type. + * + * @access public + * @param string An SQL query string + * @return boolean + */ + function is_write_type($sql) + { + if ( ! preg_match('/^\s*"?(INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|LOAD DATA|COPY|ALTER|GRANT|REVOKE|LOCK|UNLOCK)\s+/i', $sql)) + { + return FALSE; + } + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Calculate the aggregate query elapsed time + * + * @access public + * @param integer The number of decimal places + * @return integer + */ + function elapsed_time($decimals = 6) + { + return number_format($this->benchmark, $decimals); + } + + // -------------------------------------------------------------------- + + /** + * Returns the total number of queries + * + * @access public + * @return integer + */ + function total_queries() + { + return $this->query_count; + } + + // -------------------------------------------------------------------- + + /** + * Returns the last query that was executed + * + * @access public + * @return void + */ + function last_query() + { + return end($this->queries); + } + + // -------------------------------------------------------------------- + + /** + * "Smart" Escape String + * + * Escapes data based on type + * Sets boolean and null types + * + * @access public + * @param string + * @return integer + */ + function escape($str) + { + switch (gettype($str)) + { + case 'string' : $str = "'".$this->escape_str($str)."'"; + break; + case 'boolean' : $str = ($str === FALSE) ? 0 : 1; + break; + default : $str = ($str === NULL) ? 'NULL' : $str; + break; + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Primary + * + * Retrieves the primary key. It assumes that the row in the first + * position is the primary key + * + * @access public + * @param string the table name + * @return string + */ + function primary($table = '') + { + $fields = $this->list_fields($table); + + if ( ! is_array($fields)) + { + return FALSE; + } + + return current($fields); + } + + // -------------------------------------------------------------------- + + /** + * Returns an array of table names + * + * @access public + * @return array + */ + function list_tables() + { + // Is there a cached result? + if (isset($this->data_cache['table_names'])) + { + return $this->data_cache['table_names']; + } + + if (FALSE === ($sql = $this->_list_tables())) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + + $retval = array(); + $query = $this->query($sql); + + if ($query->num_rows() > 0) + { + foreach($query->result_array() as $row) + { + if (isset($row['TABLE_NAME'])) + { + $retval[] = $row['TABLE_NAME']; + } + else + { + $retval[] = array_shift($row); + } + } + } + + $this->data_cache['table_names'] = $retval; + return $this->data_cache['table_names']; + } + + // -------------------------------------------------------------------- + + /** + * Determine if a particular table exists + * @access public + * @return boolean + */ + function table_exists($table_name) + { + return ( ! in_array($this->dbprefix.$table_name, $this->list_tables())) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Fetch MySQL Field Names + * + * @access public + * @param string the table name + * @return array + */ + function list_fields($table = '') + { + // Is there a cached result? + if (isset($this->data_cache['field_names'][$table])) + { + return $this->data_cache['field_names'][$table]; + } + + if ($table == '') + { + if ($this->db_debug) + { + return $this->display_error('db_field_param_missing'); + } + return FALSE; + } + + if (FALSE === ($sql = $this->_list_columns($this->dbprefix.$table))) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + + $query = $this->query($sql); + + $retval = array(); + foreach($query->result_array() as $row) + { + if (isset($row['COLUMN_NAME'])) + { + $retval[] = $row['COLUMN_NAME']; + } + else + { + $retval[] = current($row); + } + } + + $this->data_cache['field_names'][$table] = $retval; + return $this->data_cache['field_names'][$table]; + } + + // -------------------------------------------------------------------- + + /** + * Determine if a particular field exists + * @access public + * @param string + * @param string + * @return boolean + */ + function field_exists($field_name, $table_name) + { + return ( ! in_array($field_name, $this->list_fields($table_name))) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * DEPRECATED - use list_fields() + */ + function field_names($table = '') + { + return $this->list_fields($table); + } + + // -------------------------------------------------------------------- + + /** + * Returns an object with field data + * + * @access public + * @param string the table name + * @return object + */ + function field_data($table = '') + { + if ($table == '') + { + if ($this->db_debug) + { + return $this->display_error('db_field_param_missing'); + } + return FALSE; + } + + $query = $this->query($this->_field_data($this->dbprefix.$table)); + return $query->field_data(); + } + + // -------------------------------------------------------------------- + + /** + * Generate an insert string + * + * @access public + * @param string the table upon which the query will be performed + * @param array an associative array data of key/values + * @return string + */ + function insert_string($table, $data) + { + $fields = array(); + $values = array(); + + foreach($data as $key => $val) + { + $fields[] = $key; + $values[] = $this->escape($val); + } + + return $this->_insert($this->dbprefix.$table, $fields, $values); + } + + // -------------------------------------------------------------------- + + /** + * Generate an update string + * + * @access public + * @param string the table upon which the query will be performed + * @param array an associative array data of key/values + * @param mixed the "where" statement + * @return string + */ + function update_string($table, $data, $where) + { + if ($where == '') + return false; + + $fields = array(); + foreach($data as $key => $val) + { + $fields[$key] = $this->escape($val); + } + + if ( ! is_array($where)) + { + $dest = array($where); + } + else + { + $dest = array(); + foreach ($where as $key => $val) + { + $prefix = (count($dest) == 0) ? '' : ' AND '; + + if ($val != '') + { + if ( ! $this->_has_operator($key)) + { + $key .= ' ='; + } + + $val = ' '.$this->escape($val); + } + + $dest[] = $prefix.$key.$val; + } + } + + return $this->_update($this->dbprefix.$table, $fields, $dest); + } + + // -------------------------------------------------------------------- + + /** + * Enables a native PHP function to be run, using a platform agnostic wrapper. + * + * @access public + * @param string the function name + * @param mixed any parameters needed by the function + * @return mixed + */ + function call_function($function) + { + $driver = ($this->dbdriver == 'postgre') ? 'pg_' : $this->dbdriver.'_'; + + if (FALSE === strpos($driver, $function)) + { + $function = $driver.$function; + } + + if ( ! function_exists($function)) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + else + { + $args = (func_num_args() > 1) ? array_splice(func_get_args(), 1) : null; + + return call_user_func_array($function, $args); + } + } + + // -------------------------------------------------------------------- + + /** + * Set Cache Directory Path + * + * @access public + * @param string the path to the cache directory + * @return void + */ + function cache_set_path($path = '') + { + $this->cachedir = $path; + } + + // -------------------------------------------------------------------- + + /** + * Enable Query Caching + * + * @access public + * @return void + */ + function cache_on() + { + $this->cache_on = TRUE; + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Disable Query Caching + * + * @access public + * @return void + */ + function cache_off() + { + $this->cache_on = FALSE; + return FALSE; + } + + + // -------------------------------------------------------------------- + + /** + * Delete the cache files associated with a particular URI + * + * @access public + * @return void + */ + function cache_delete($segment_one = '', $segment_two = '') + { + if ( ! $this->_cache_init()) + { + return FALSE; + } + return $this->CACHE->delete($segment_one, $segment_two); + } + + // -------------------------------------------------------------------- + + /** + * Delete All cache files + * + * @access public + * @return void + */ + function cache_delete_all() + { + if ( ! $this->_cache_init()) + { + return FALSE; + } + + return $this->CACHE->delete_all(); + } + + // -------------------------------------------------------------------- + + /** + * Initialize the Cache Class + * + * @access private + * @return void + */ + function _cache_init() + { + if (is_object($this->CACHE) AND class_exists('CI_DB_Cache')) + { + return TRUE; + } + + if ( ! @include(BASEPATH.'database/DB_cache'.EXT)) + { + return $this->cache_off(); + } + + $this->CACHE = new CI_DB_Cache; + return TRUE; + } + + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @return void + */ + function close() + { + if (is_resource($this->conn_id)) + { + $this->_close($this->conn_id); + } + $this->conn_id = FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Display an error message + * + * @access public + * @param string the error message + * @param string any "swap" values + * @param boolean whether to localize the message + * @return string sends the application/error_db.php template + */ + function display_error($error = '', $swap = '', $native = FALSE) + { + $LANG = new CI_Language(); + $LANG->load('db'); + + $heading = 'MySQL Error'; + + if ($native == TRUE) + { + $message = $error; + } + else + { + $message = ( ! is_array($error)) ? array(str_replace('%s', $swap, $LANG->line($error))) : $error; + } + + if ( ! class_exists('CI_Exceptions')) + { + include(BASEPATH.'libraries/Exceptions'.EXT); + } + + $error = new CI_Exceptions(); + echo $error->show_error('An Error Was Encountered', $message, 'error_db'); + exit; + } + +} + ?> \ No newline at end of file diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 9784561d..7d85ebb9 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -1,290 +1,290 @@ -result_object() : $this->result_array(); - } - - // -------------------------------------------------------------------- - - /** - * Query result. "object" version. - * - * @access public - * @return object - */ - function result_object() - { - if (count($this->result_object) > 0) - { - return $this->result_object; - } - - // In the event that query caching is on the result_id variable - // will return FALSE since there isn't a valid SQL resource so - // we'll simply return an empty array. - if ($this->result_id === FALSE OR $this->num_rows() == 0) - { - return array(); - } - - $this->_data_seek(0); - while ($row = $this->_fetch_object()) - { - $this->result_object[] = $row; - } - - return $this->result_object; - } - - // -------------------------------------------------------------------- - - /** - * Query result. "array" version. - * - * @access public - * @return array - */ - function result_array() - { - if (count($this->result_array) > 0) - { - return $this->result_array; - } - - // In the event that query caching is on the result_id variable - // will return FALSE since there isn't a valid SQL resource so - // we'll simply return an empty array. - if ($this->result_id === FALSE OR $this->num_rows() == 0) - { - return array(); - } - - $this->_data_seek(0); - while ($row = $this->_fetch_assoc()) - { - $this->result_array[] = $row; - } - - return $this->result_array; - } - - // -------------------------------------------------------------------- - - /** - * Query result. Acts as a wrapper function for the following functions. - * - * @access public - * @param string can be "object" or "array" - * @return mixed either a result object or array - */ - function row($n = 0, $type = 'object') - { - return ($type == 'object') ? $this->row_object($n) : $this->row_array($n); - } - - // -------------------------------------------------------------------- - - /** - * Returns a single result row - object version - * - * @access public - * @return object - */ - function row_object($n = 0) - { - $result = $this->result_object(); - - if (count($result) == 0) - { - return $result; - } - - if ($n != $this->current_row AND isset($result[$n])) - { - $this->current_row = $n; - } - - return $result[$this->current_row]; - } - - // -------------------------------------------------------------------- - - /** - * Returns a single result row - array version - * - * @access public - * @return array - */ - function row_array($n = 0) - { - $result = $this->result_array(); - - if (count($result) == 0) - { - return $result; - } - - if ($n != $this->current_row AND isset($result[$n])) - { - $this->current_row = $n; - } - - return $result[$this->current_row]; - } - - - // -------------------------------------------------------------------- - - /** - * Returns the "first" row - * - * @access public - * @return object - */ - function first_row($type = 'object') - { - $result = $this->result($type); - - if (count($result) == 0) - { - return $result; - } - return $result[0]; - } - - // -------------------------------------------------------------------- - - /** - * Returns the "last" row - * - * @access public - * @return object - */ - function last_row($type = 'object') - { - $result = $this->result($type); - - if (count($result) == 0) - { - return $result; - } - return $result[count($result) -1]; - } - - // -------------------------------------------------------------------- - - /** - * Returns the "next" row - * - * @access public - * @return object - */ - function next_row($type = 'object') - { - $result = $this->result($type); - - if (count($result) == 0) - { - return $result; - } - - if (isset($result[$this->current_row + 1])) - { - ++$this->current_row; - } - - return $result[$this->current_row]; - } - - // -------------------------------------------------------------------- - - /** - * Returns the "previous" row - * - * @access public - * @return object - */ - function previous_row($type = 'object') - { - $result = $this->result($type); - - if (count($result) == 0) - { - return $result; - } - - if (isset($result[$this->current_row - 1])) - { - --$this->current_row; - } - return $result[$this->current_row]; - } - - // -------------------------------------------------------------------- - - /** - * The following functions are normally overloaded by the identically named - * methods in the platform-specific driver -- except when query caching - * is used. When caching is enabled we do not load the other driver. - * These functions are primarily here to prevent undefined function errors - * when a cached result object is in use. They are not otherwise fully - * operational due to the unavailability of the database resource IDs with - * cached results. - */ - function num_rows() { return $this->num_rows; } - function num_fields() { return 0; } - function list_fields() { return array(); } - function field_names() { return array(); } // Deprecated - function field_data() { return array(); } - function free_result() { return TRUE; } - function _data_seek() { return TRUE; } - function _fetch_assoc() { return array(); } - function _fetch_object() { return array(); } - -} -// END DB_result class +result_object() : $this->result_array(); + } + + // -------------------------------------------------------------------- + + /** + * Query result. "object" version. + * + * @access public + * @return object + */ + function result_object() + { + if (count($this->result_object) > 0) + { + return $this->result_object; + } + + // In the event that query caching is on the result_id variable + // will return FALSE since there isn't a valid SQL resource so + // we'll simply return an empty array. + if ($this->result_id === FALSE OR $this->num_rows() == 0) + { + return array(); + } + + $this->_data_seek(0); + while ($row = $this->_fetch_object()) + { + $this->result_object[] = $row; + } + + return $this->result_object; + } + + // -------------------------------------------------------------------- + + /** + * Query result. "array" version. + * + * @access public + * @return array + */ + function result_array() + { + if (count($this->result_array) > 0) + { + return $this->result_array; + } + + // In the event that query caching is on the result_id variable + // will return FALSE since there isn't a valid SQL resource so + // we'll simply return an empty array. + if ($this->result_id === FALSE OR $this->num_rows() == 0) + { + return array(); + } + + $this->_data_seek(0); + while ($row = $this->_fetch_assoc()) + { + $this->result_array[] = $row; + } + + return $this->result_array; + } + + // -------------------------------------------------------------------- + + /** + * Query result. Acts as a wrapper function for the following functions. + * + * @access public + * @param string can be "object" or "array" + * @return mixed either a result object or array + */ + function row($n = 0, $type = 'object') + { + return ($type == 'object') ? $this->row_object($n) : $this->row_array($n); + } + + // -------------------------------------------------------------------- + + /** + * Returns a single result row - object version + * + * @access public + * @return object + */ + function row_object($n = 0) + { + $result = $this->result_object(); + + if (count($result) == 0) + { + return $result; + } + + if ($n != $this->current_row AND isset($result[$n])) + { + $this->current_row = $n; + } + + return $result[$this->current_row]; + } + + // -------------------------------------------------------------------- + + /** + * Returns a single result row - array version + * + * @access public + * @return array + */ + function row_array($n = 0) + { + $result = $this->result_array(); + + if (count($result) == 0) + { + return $result; + } + + if ($n != $this->current_row AND isset($result[$n])) + { + $this->current_row = $n; + } + + return $result[$this->current_row]; + } + + + // -------------------------------------------------------------------- + + /** + * Returns the "first" row + * + * @access public + * @return object + */ + function first_row($type = 'object') + { + $result = $this->result($type); + + if (count($result) == 0) + { + return $result; + } + return $result[0]; + } + + // -------------------------------------------------------------------- + + /** + * Returns the "last" row + * + * @access public + * @return object + */ + function last_row($type = 'object') + { + $result = $this->result($type); + + if (count($result) == 0) + { + return $result; + } + return $result[count($result) -1]; + } + + // -------------------------------------------------------------------- + + /** + * Returns the "next" row + * + * @access public + * @return object + */ + function next_row($type = 'object') + { + $result = $this->result($type); + + if (count($result) == 0) + { + return $result; + } + + if (isset($result[$this->current_row + 1])) + { + ++$this->current_row; + } + + return $result[$this->current_row]; + } + + // -------------------------------------------------------------------- + + /** + * Returns the "previous" row + * + * @access public + * @return object + */ + function previous_row($type = 'object') + { + $result = $this->result($type); + + if (count($result) == 0) + { + return $result; + } + + if (isset($result[$this->current_row - 1])) + { + --$this->current_row; + } + return $result[$this->current_row]; + } + + // -------------------------------------------------------------------- + + /** + * The following functions are normally overloaded by the identically named + * methods in the platform-specific driver -- except when query caching + * is used. When caching is enabled we do not load the other driver. + * These functions are primarily here to prevent undefined function errors + * when a cached result object is in use. They are not otherwise fully + * operational due to the unavailability of the database resource IDs with + * cached results. + */ + function num_rows() { return $this->num_rows; } + function num_fields() { return 0; } + function list_fields() { return array(); } + function field_names() { return array(); } // Deprecated + function field_data() { return array(); } + function free_result() { return TRUE; } + function _data_seek() { return TRUE; } + function _fetch_assoc() { return array(); } + function _fetch_object() { return array(); } + +} +// END DB_result class ?> \ No newline at end of file diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index 9533ec60..d48425d7 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -1,455 +1,455 @@ -db - $CI =& get_instance(); - $this->db =& $CI->db; - - log_message('debug', "Database Utility Class Initialized"); - } - - // -------------------------------------------------------------------- - - /** - * Create database - * - * @access public - * @param string the database name - * @return bool - */ - function create_database($db_name) - { - $sql = $this->_create_database($db_name); - - if (is_bool($sql)) - { - return $sql; - } - - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access public - * @param string the database name - * @return bool - */ - function drop_database($db_name) - { - $sql = $this->_drop_database($db_name); - - if (is_bool($sql)) - { - return $sql; - } - - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * List databases - * - * @access public - * @return bool - */ - function list_databases() - { - // Is there a cached result? - if (isset($this->data_cache['db_names'])) - { - return $this->data_cache['db_names']; - } - - $query = $this->db->query($this->_list_databases()); - $dbs = array(); - if ($query->num_rows() > 0) - { - foreach ($query->result_array() as $row) - { - $dbs[] = current($row); - } - } - - $this->data_cache['db_names'] = $dbs; - return $this->data_cache['db_names']; - } - - // -------------------------------------------------------------------- - - /** - * Optimize Table - * - * @access public - * @param string the table name - * @return bool - */ - function optimize_table($table_name) - { - $sql = $this->_optimize_table($table_name); - - if (is_bool($sql)) - { - return $sql; - } - - $query = $this->db->query($sql); - $res = $query->result_array(); - - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - return current($res); - } - - // -------------------------------------------------------------------- - - /** - * Optimize Database - * - * @access public - * @return array - */ - function optimize_database() - { - $result = array(); - foreach ($this->db->list_tables() as $table_name) - { - $sql = $this->_optimize_table($table_name); - - if (is_bool($sql)) - { - return $sql; - } - - $query = $this->db->query($sql); - - // Build the result array... - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - $res = $query->result_array(); - $res = current($res); - $key = str_replace($this->db->database.'.', '', current($res)); - $keys = array_keys($res); - unset($res[$keys[0]]); - - $result[$key] = $res; - } - - return $result; - } - - // -------------------------------------------------------------------- - - /** - * Optimize Table - * - * @access public - * @param string the table name - * @return bool - */ - - function repair_table($table_name) - { - $sql = $this->_repair_table($table_name); - - if (is_bool($sql)) - { - return $sql; - } - - $query = $this->db->query($sql); - - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - $res = $query->result_array(); - return current($res); - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * @access public - * @param string the table name - * @return bool - */ - function drop_table($table_name) - { - $sql = $this->_drop_table($table_name); - - if (is_bool($sql)) - { - return $sql; - } - - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Generate CSV from a query result object - * - * @access public - * @param object The query result object - * @param string The delimiter - tab by default - * @param string The newline character - \n by default - * @return string - */ - function csv_from_result($query, $delim = "\t", $newline = "\n") - { - if ( ! is_object($query) OR ! method_exists($query, 'field_names')) - { - show_error('You must submit a valid result object'); - } - - $out = ''; - - // First generate the headings from the table column names - foreach ($query->list_fields() as $name) - { - $out .= $name.$delim; - } - - $out = rtrim($out); - $out .= $newline; - - // Next blast through the result array and build out the rows - foreach ($query->result_array() as $row) - { - foreach ($row as $item) - { - $out .= $item.$delim; - } - $out = rtrim($out); - $out .= $newline; - } - - return $out; - } - - // -------------------------------------------------------------------- - - /** - * Generate XML data from a query result object - * - * @access public - * @param object The query result object - * @param array Any preferences - * @return string - */ - function xml_from_result($query, $params = array()) - { - if ( ! is_object($query) OR ! method_exists($query, 'field_names')) - { - show_error('You must submit a valid result object'); - } - - // Set our default values - foreach (array('root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t") as $key => $val) - { - if ( ! isset($params[$key])) - { - $params[$key] = $val; - } - } - - // Create variables for convenience - extract($params); - - // Load the xml helper - $CI =& get_instance(); - $CI->load->helper('xml'); - - // Generate the result - $xml = "<{$root}>".$newline; - foreach ($query->result_array() as $row) - { - $xml .= $tab."<{$element}>".$newline; - - foreach ($row as $key => $val) - { - $xml .= $tab.$tab."<{$key}>".xml_convert($val)."".$newline; - } - $xml .= $tab."".$newline; - } - $xml .= "".$newline; - - return $xml; - } - - // -------------------------------------------------------------------- - - /** - * Database Backup - * - * @access public - * @return void - */ - function backup($params = array()) - { - // If the parameters have not been submitted as an - // array then we know that it is simply the table - // name, which is a valid short cut. - if (is_string($params)) - { - $params = array('tables' => $params); - } - - // ------------------------------------------------------ - - // Set up our default preferences - $prefs = array( - 'tables' => array(), - 'ignore' => array(), - 'filename' => '', - 'format' => 'gzip', // gzip, zip, txt - 'add_drop' => TRUE, - 'add_insert' => TRUE, - 'newline' => "\n" - ); - - // Did the user submit any preferences? If so set them.... - if (count($params) > 0) - { - foreach ($prefs as $key => $val) - { - if (isset($params[$key])) - { - $prefs[$key] = $params[$key]; - } - } - } - - // ------------------------------------------------------ - - // Are we backing up a complete database or individual tables? - // If no table names were submitted we'll fetch the entire table list - if (count($prefs['tables']) == 0) - { - $prefs['tables'] = $this->db->list_tables(); - } - - // ------------------------------------------------------ - - // Validate the format - if ( ! in_array($prefs['format'], array('gzip', 'zip', 'txt'), TRUE)) - { - $prefs['format'] = 'txt'; - } - - // ------------------------------------------------------ - - // Is the encoder supported? If not, we'll either issue an - // error or use plain text depending on the debug settings - if (($prefs['format'] == 'gzip' AND ! @function_exists('gzencode')) - OR ($prefs['format'] == 'zip' AND ! @function_exists('gzcompress'))) - { - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_compression'); - } - - $prefs['format'] = 'txt'; - } - - // ------------------------------------------------------ - - // Set the filename if not provided - Only needed with Zip files - if ($prefs['filename'] == '' AND $prefs['format'] == 'zip') - { - $prefs['filename'] = (count($prefs['tables']) == 1) ? $prefs['tables'] : $this->db->database; - $prefs['filename'] .= '_'.date('Y-m-d_H-i', time()); - } - - // ------------------------------------------------------ - - // Was a Gzip file requested? - if ($prefs['format'] == 'gzip') - { - return gzencode($this->_backup($prefs)); - } - - // ------------------------------------------------------ - - // Was a text file requested? - if ($prefs['format'] == 'txt') - { - return $this->_backup($prefs); - } - - // ------------------------------------------------------ - - // Was a Zip file requested? - if ($prefs['format'] == 'zip') - { - // If they included the .zip file extension we'll remove it - if (preg_match("|.+?\.zip$|", $prefs['filename'])) - { - $prefs['filename'] = str_replace('.zip', '', $prefs['filename']); - } - - // Tack on the ".sql" file extension if needed - if ( ! preg_match("|.+?\.sql$|", $prefs['filename'])) - { - $prefs['filename'] .= '.sql'; - } - - // Load the Zip class and output it - - $CI =& get_instance(); - $CI->load->library('zip'); - $CI->zip->add_data($prefs['filename'], $this->_backup($prefs)); - return $CI->zip->get_zip(); - } - - } - - - - - - -} - +db + $CI =& get_instance(); + $this->db =& $CI->db; + + log_message('debug', "Database Utility Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * Create database + * + * @access public + * @param string the database name + * @return bool + */ + function create_database($db_name) + { + $sql = $this->_create_database($db_name); + + if (is_bool($sql)) + { + return $sql; + } + + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access public + * @param string the database name + * @return bool + */ + function drop_database($db_name) + { + $sql = $this->_drop_database($db_name); + + if (is_bool($sql)) + { + return $sql; + } + + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * List databases + * + * @access public + * @return bool + */ + function list_databases() + { + // Is there a cached result? + if (isset($this->data_cache['db_names'])) + { + return $this->data_cache['db_names']; + } + + $query = $this->db->query($this->_list_databases()); + $dbs = array(); + if ($query->num_rows() > 0) + { + foreach ($query->result_array() as $row) + { + $dbs[] = current($row); + } + } + + $this->data_cache['db_names'] = $dbs; + return $this->data_cache['db_names']; + } + + // -------------------------------------------------------------------- + + /** + * Optimize Table + * + * @access public + * @param string the table name + * @return bool + */ + function optimize_table($table_name) + { + $sql = $this->_optimize_table($table_name); + + if (is_bool($sql)) + { + return $sql; + } + + $query = $this->db->query($sql); + $res = $query->result_array(); + + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + return current($res); + } + + // -------------------------------------------------------------------- + + /** + * Optimize Database + * + * @access public + * @return array + */ + function optimize_database() + { + $result = array(); + foreach ($this->db->list_tables() as $table_name) + { + $sql = $this->_optimize_table($table_name); + + if (is_bool($sql)) + { + return $sql; + } + + $query = $this->db->query($sql); + + // Build the result array... + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + $res = $query->result_array(); + $res = current($res); + $key = str_replace($this->db->database.'.', '', current($res)); + $keys = array_keys($res); + unset($res[$keys[0]]); + + $result[$key] = $res; + } + + return $result; + } + + // -------------------------------------------------------------------- + + /** + * Optimize Table + * + * @access public + * @param string the table name + * @return bool + */ + + function repair_table($table_name) + { + $sql = $this->_repair_table($table_name); + + if (is_bool($sql)) + { + return $sql; + } + + $query = $this->db->query($sql); + + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + $res = $query->result_array(); + return current($res); + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * @access public + * @param string the table name + * @return bool + */ + function drop_table($table_name) + { + $sql = $this->_drop_table($table_name); + + if (is_bool($sql)) + { + return $sql; + } + + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Generate CSV from a query result object + * + * @access public + * @param object The query result object + * @param string The delimiter - tab by default + * @param string The newline character - \n by default + * @return string + */ + function csv_from_result($query, $delim = "\t", $newline = "\n") + { + if ( ! is_object($query) OR ! method_exists($query, 'field_names')) + { + show_error('You must submit a valid result object'); + } + + $out = ''; + + // First generate the headings from the table column names + foreach ($query->list_fields() as $name) + { + $out .= $name.$delim; + } + + $out = rtrim($out); + $out .= $newline; + + // Next blast through the result array and build out the rows + foreach ($query->result_array() as $row) + { + foreach ($row as $item) + { + $out .= $item.$delim; + } + $out = rtrim($out); + $out .= $newline; + } + + return $out; + } + + // -------------------------------------------------------------------- + + /** + * Generate XML data from a query result object + * + * @access public + * @param object The query result object + * @param array Any preferences + * @return string + */ + function xml_from_result($query, $params = array()) + { + if ( ! is_object($query) OR ! method_exists($query, 'field_names')) + { + show_error('You must submit a valid result object'); + } + + // Set our default values + foreach (array('root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t") as $key => $val) + { + if ( ! isset($params[$key])) + { + $params[$key] = $val; + } + } + + // Create variables for convenience + extract($params); + + // Load the xml helper + $CI =& get_instance(); + $CI->load->helper('xml'); + + // Generate the result + $xml = "<{$root}>".$newline; + foreach ($query->result_array() as $row) + { + $xml .= $tab."<{$element}>".$newline; + + foreach ($row as $key => $val) + { + $xml .= $tab.$tab."<{$key}>".xml_convert($val)."".$newline; + } + $xml .= $tab."".$newline; + } + $xml .= "".$newline; + + return $xml; + } + + // -------------------------------------------------------------------- + + /** + * Database Backup + * + * @access public + * @return void + */ + function backup($params = array()) + { + // If the parameters have not been submitted as an + // array then we know that it is simply the table + // name, which is a valid short cut. + if (is_string($params)) + { + $params = array('tables' => $params); + } + + // ------------------------------------------------------ + + // Set up our default preferences + $prefs = array( + 'tables' => array(), + 'ignore' => array(), + 'filename' => '', + 'format' => 'gzip', // gzip, zip, txt + 'add_drop' => TRUE, + 'add_insert' => TRUE, + 'newline' => "\n" + ); + + // Did the user submit any preferences? If so set them.... + if (count($params) > 0) + { + foreach ($prefs as $key => $val) + { + if (isset($params[$key])) + { + $prefs[$key] = $params[$key]; + } + } + } + + // ------------------------------------------------------ + + // Are we backing up a complete database or individual tables? + // If no table names were submitted we'll fetch the entire table list + if (count($prefs['tables']) == 0) + { + $prefs['tables'] = $this->db->list_tables(); + } + + // ------------------------------------------------------ + + // Validate the format + if ( ! in_array($prefs['format'], array('gzip', 'zip', 'txt'), TRUE)) + { + $prefs['format'] = 'txt'; + } + + // ------------------------------------------------------ + + // Is the encoder supported? If not, we'll either issue an + // error or use plain text depending on the debug settings + if (($prefs['format'] == 'gzip' AND ! @function_exists('gzencode')) + OR ($prefs['format'] == 'zip' AND ! @function_exists('gzcompress'))) + { + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_compression'); + } + + $prefs['format'] = 'txt'; + } + + // ------------------------------------------------------ + + // Set the filename if not provided - Only needed with Zip files + if ($prefs['filename'] == '' AND $prefs['format'] == 'zip') + { + $prefs['filename'] = (count($prefs['tables']) == 1) ? $prefs['tables'] : $this->db->database; + $prefs['filename'] .= '_'.date('Y-m-d_H-i', time()); + } + + // ------------------------------------------------------ + + // Was a Gzip file requested? + if ($prefs['format'] == 'gzip') + { + return gzencode($this->_backup($prefs)); + } + + // ------------------------------------------------------ + + // Was a text file requested? + if ($prefs['format'] == 'txt') + { + return $this->_backup($prefs); + } + + // ------------------------------------------------------ + + // Was a Zip file requested? + if ($prefs['format'] == 'zip') + { + // If they included the .zip file extension we'll remove it + if (preg_match("|.+?\.zip$|", $prefs['filename'])) + { + $prefs['filename'] = str_replace('.zip', '', $prefs['filename']); + } + + // Tack on the ".sql" file extension if needed + if ( ! preg_match("|.+?\.sql$|", $prefs['filename'])) + { + $prefs['filename'] .= '.sql'; + } + + // Load the Zip class and output it + + $CI =& get_instance(); + $CI->load->library('zip'); + $CI->zip->add_data($prefs['filename'], $this->_backup($prefs)); + return $CI->zip->get_zip(); + } + + } + + + + + + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 47cfa6bb..ef66e3f3 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -1,458 +1,458 @@ -hostname, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - return @mssql_pconnect($this->hostname, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - return @mssql_select_db($this->database, $this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT version() AS ver"; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - return @mssql_query($sql, $this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - $this->simple_query('BEGIN TRAN'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('COMMIT TRAN'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('ROLLBACK TRAN'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - // Escape single quotes - return str_replace("'", "''", $str); - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @mssql_rows_affected($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - // Not supported in MS SQL? - return 0; - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query("SELECT COUNT(*) AS numrows FROM ".$this->dbprefix.$table); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * List table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @return string - */ - function _list_tables() - { - return "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name"; - } - - // -------------------------------------------------------------------- - - /** - * List column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access private - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SELECT * FROM INFORMATION_SCHEMA.Columns WHERE TABLE_NAME = '".$this->_escape_table($table)."'"; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT TOP 1 * FROM ".$this->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - // Are errros even supported in MS SQL? - return ''; - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - // Are error numbers supported? - return ''; - } - - // -------------------------------------------------------------------- - - /** - * Escape Table Name - * - * This function adds backticks if the table name has a period - * in it. Some DBs will get cranky unless periods are escaped - * - * @access private - * @param string the table name - * @return string - */ - function _escape_table($table) - { - // I don't believe this is necessary with MS SQL. Not sure, though. - Rick - - /* - if (stristr($table, '.')) - { - $table = preg_replace("/\./", "`.`", $table); - } - */ - - return $table; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @return string - */ - function _update($table, $values, $where) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @return string - */ - function _delete($table, $where) - { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - $i = $limit + $offset; - - return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$i.' ', $sql); - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @mssql_close($conn_id); - } - -} - - +hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return @mssql_pconnect($this->hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return @mssql_select_db($this->database, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @mssql_query($sql, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + $this->simple_query('BEGIN TRAN'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('COMMIT TRAN'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('ROLLBACK TRAN'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + // Escape single quotes + return str_replace("'", "''", $str); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @mssql_rows_affected($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + // Not supported in MS SQL? + return 0; + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM ".$this->dbprefix.$table); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * List table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @return string + */ + function _list_tables() + { + return "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name"; + } + + // -------------------------------------------------------------------- + + /** + * List column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access private + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SELECT * FROM INFORMATION_SCHEMA.Columns WHERE TABLE_NAME = '".$this->_escape_table($table)."'"; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT TOP 1 * FROM ".$this->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + // Are errros even supported in MS SQL? + return ''; + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + // Are error numbers supported? + return ''; + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access private + * @param string the table name + * @return string + */ + function _escape_table($table) + { + // I don't believe this is necessary with MS SQL. Not sure, though. - Rick + + /* + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + */ + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $i = $limit + $offset; + + return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$i.' ', $sql); + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @mssql_close($conn_id); + } + +} + + ?> \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php index eb7afef7..eb471e4b 100644 --- a/system/database/drivers/mssql/mssql_result.php +++ b/system/database/drivers/mssql/mssql_result.php @@ -1,173 +1,173 @@ -result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @mssql_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - while ($field = mssql_fetch_field($this->result_id)) - { - $field_names[] = $field->name; - } - - return $field_names; - } - - // Deprecated - function field_names() - { - return $this->list_fields(); - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - while ($field = mssql_fetch_field($this->result_id)) - { - $F = new stdClass(); - $F->name = $field->name; - $F->type = $field->type; - $F->max_length = $field->max_length; - $F->primary_key = 0; - $F->default = ''; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - mssql_free_result($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return mssql_data_seek($this->result_id, $n); - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - return mssql_fetch_assoc($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - return mssql_fetch_object($this->result_id); - } - -} - +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @mssql_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + while ($field = mssql_fetch_field($this->result_id)) + { + $field_names[] = $field->name; + } + + return $field_names; + } + + // Deprecated + function field_names() + { + return $this->list_fields(); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + while ($field = mssql_fetch_field($this->result_id)) + { + $F = new stdClass(); + $F->name = $field->name; + $F->type = $field->type; + $F->max_length = $field->max_length; + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + mssql_free_result($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return mssql_data_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return mssql_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return mssql_fetch_object($this->result_id); + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php index b2464612..7f4e7308 100644 --- a/system/database/drivers/mssql/mssql_utility.php +++ b/system/database/drivers/mssql/mssql_utility.php @@ -1,130 +1,130 @@ -db->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * List databases - * - * @access private - * @return bool - */ - function _list_databases() - { - return "EXEC sp_helpdb"; // Can also be: EXEC sp_databases - } - - // -------------------------------------------------------------------- - - /** - * Optimize table query - * - * Generates a platform-specific query so that a table can be optimized - * - * @access private - * @param string the table name - * @return object - */ - function _optimize_table($table) - { - return FALSE; // Is this supported in MS SQL? - } - - // -------------------------------------------------------------------- - - /** - * Repair table query - * - * Generates a platform-specific query so that a table can be repaired - * - * @access private - * @param string the table name - * @return object - */ - function _repair_table($table) - { - return FALSE; // Is this supported in MS SQL? - } - - // -------------------------------------------------------------------- - - /** - * MSSQL Export - * - * @access private - * @param array Preferences - * @return mixed - */ - function _backup($params = array()) - { - // Currently unsupported - return $this->db->display_error('db_unsuported_feature'); - } - - -} - +db->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * List databases + * + * @access private + * @return bool + */ + function _list_databases() + { + return "EXEC sp_helpdb"; // Can also be: EXEC sp_databases + } + + // -------------------------------------------------------------------- + + /** + * Optimize table query + * + * Generates a platform-specific query so that a table can be optimized + * + * @access private + * @param string the table name + * @return object + */ + function _optimize_table($table) + { + return FALSE; // Is this supported in MS SQL? + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Generates a platform-specific query so that a table can be repaired + * + * @access private + * @param string the table name + * @return object + */ + function _repair_table($table) + { + return FALSE; // Is this supported in MS SQL? + } + + // -------------------------------------------------------------------- + + /** + * MSSQL Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + // Currently unsupported + return $this->db->display_error('db_unsuported_feature'); + } + + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 2104b9ab..367c2d11 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -1,492 +1,492 @@ -hostname, $this->username, $this->password, TRUE); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - return @mysql_pconnect($this->hostname, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - return @mysql_select_db($this->database, $this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT version() AS ver"; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - return @mysql_query($sql, $this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - // "DELETE FROM TABLE" returns 0 affected rows This hack modifies - // the query so that it returns the number of affected rows - if ($this->delete_hack === TRUE) - { - if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) - { - $sql = preg_replace("/^\s*DELETE\s+FROM\s+(\S+)\s*$/", "DELETE FROM \\1 WHERE 1=1", $sql); - } - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - $this->simple_query('SET AUTOCOMMIT=0'); - $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('COMMIT'); - $this->simple_query('SET AUTOCOMMIT=1'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('ROLLBACK'); - $this->simple_query('SET AUTOCOMMIT=1'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - if (get_magic_quotes_gpc()) - { - return $str; - } - - if (function_exists('mysql_real_escape_string')) - { - return mysql_real_escape_string($str, $this->conn_id); - } - elseif (function_exists('mysql_escape_string')) - { - return mysql_escape_string($str); - } - else - { - return addslashes($str); - } - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @mysql_affected_rows($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - return @mysql_insert_id($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * List table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @return string - */ - function _list_tables() - { - return "SHOW TABLES FROM `".$this->database."`"; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SHOW COLUMNS FROM ".$this->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1"; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - return mysql_error($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - return mysql_errno($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Escape Table Name - * - * This function adds backticks if the table name has a period - * in it. Some DBs will get cranky unless periods are escaped - * - * @access private - * @param string the table name - * @return string - */ - function _escape_table($table) - { - if (stristr($table, '.')) - { - $table = preg_replace("/\./", "`.`", $table); - } - - return $table; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @return string - */ - function _update($table, $values, $where) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @return string - */ - function _delete($table, $where) - { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - if ($offset == 0) - { - $offset = ''; - } - else - { - $offset .= ", "; - } - - return $sql."LIMIT ".$offset.$limit; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @mysql_close($conn_id); - } - -} - +hostname, $this->username, $this->password, TRUE); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return @mysql_pconnect($this->hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return @mysql_select_db($this->database, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @mysql_query($sql, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + // "DELETE FROM TABLE" returns 0 affected rows This hack modifies + // the query so that it returns the number of affected rows + if ($this->delete_hack === TRUE) + { + if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) + { + $sql = preg_replace("/^\s*DELETE\s+FROM\s+(\S+)\s*$/", "DELETE FROM \\1 WHERE 1=1", $sql); + } + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + $this->simple_query('SET AUTOCOMMIT=0'); + $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('COMMIT'); + $this->simple_query('SET AUTOCOMMIT=1'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('ROLLBACK'); + $this->simple_query('SET AUTOCOMMIT=1'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + if (get_magic_quotes_gpc()) + { + return $str; + } + + if (function_exists('mysql_real_escape_string')) + { + return mysql_real_escape_string($str, $this->conn_id); + } + elseif (function_exists('mysql_escape_string')) + { + return mysql_escape_string($str); + } + else + { + return addslashes($str); + } + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @mysql_affected_rows($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @mysql_insert_id($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * List table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @return string + */ + function _list_tables() + { + return "SHOW TABLES FROM `".$this->database."`"; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SHOW COLUMNS FROM ".$this->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return mysql_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return mysql_errno($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access private + * @param string the table name + * @return string + */ + function _escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + if ($offset == 0) + { + $offset = ''; + } + else + { + $offset .= ", "; + } + + return $sql."LIMIT ".$offset.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @mysql_close($conn_id); + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php index 9b28dead..7dcd5cb0 100644 --- a/system/database/drivers/mysql/mysql_result.php +++ b/system/database/drivers/mysql/mysql_result.php @@ -1,173 +1,173 @@ -result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @mysql_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - while ($field = mysql_fetch_field($this->result_id)) - { - $field_names[] = $field->name; - } - - return $field_names; - } - - // Deprecated - function field_names() - { - return $this->list_fields(); - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - while ($field = mysql_fetch_field($this->result_id)) - { - $F = new stdClass(); - $F->name = $field->name; - $F->type = $field->type; - $F->default = $field->def; - $F->max_length = $field->max_length; - $F->primary_key = $field->primary_key; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - mysql_free_result($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return mysql_data_seek($this->result_id, $n); - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - return mysql_fetch_assoc($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - return mysql_fetch_object($this->result_id); - } - -} - +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @mysql_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + while ($field = mysql_fetch_field($this->result_id)) + { + $field_names[] = $field->name; + } + + return $field_names; + } + + // Deprecated + function field_names() + { + return $this->list_fields(); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + while ($field = mysql_fetch_field($this->result_id)) + { + $F = new stdClass(); + $F->name = $field->name; + $F->type = $field->type; + $F->default = $field->def; + $F->max_length = $field->max_length; + $F->primary_key = $field->primary_key; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + mysql_free_result($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return mysql_data_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return mysql_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return mysql_fetch_object($this->result_id); + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php index 32007d22..b357f47d 100644 --- a/system/database/drivers/mysql/mysql_utility.php +++ b/system/database/drivers/mysql/mysql_utility.php @@ -1,244 +1,244 @@ -db->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * Optimize table query - * - * Generates a platform-specific query so that a table can be optimized - * - * @access private - * @param string the table name - * @return object - */ - function _optimize_table($table) - { - return "OPTIMIZE TABLE ".$this->db->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * Repair table query - * - * Generates a platform-specific query so that a table can be repaired - * - * @access private - * @param string the table name - * @return object - */ - function _repair_table($table) - { - return "REPAIR TABLE ".$this->db->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * MySQL Export - * - * @access private - * @param array Preferences - * @return mixed - */ - function _backup($params = array()) - { - if (count($params) == 0) - { - return FALSE; - } - - // Extract the prefs for simplicity - extract($params); - - // Build the output - $output = ''; - foreach ((array)$tables as $table) - { - // Is the table in the "ignore" list? - if (in_array($table, (array)$ignore, TRUE)) - { - continue; - } - - // Get the table schema - $query = $this->db->query("SHOW CREATE TABLE `".$this->db->database.'`.'.$table); - - // No result means the table name was invalid - if ($query === FALSE) - { - continue; - } - - // Write out the table schema - $output .= '#'.$newline.'# TABLE STRUCTURE FOR: '.$table.$newline.'#'.$newline.$newline; - - if ($add_drop == TRUE) - { - $output .= 'DROP TABLE IF EXISTS '.$table.';'.$newline.$newline; - } - - $i = 0; - $result = $query->result_array(); - foreach ($result[0] as $val) - { - if ($i++ % 2) - { - $output .= $val.';'.$newline.$newline; - } - } - - // If inserts are not needed we're done... - if ($add_insert == FALSE) - { - continue; - } - - // Grab all the data from the current table - $query = $this->db->query("SELECT * FROM $table"); - - if ($query->num_rows() == 0) - { - continue; - } - - // Fetch the field names and determine if the field is an - // integer type. We use this info to decide whether to - // surround the data with quotes or not - - $i = 0; - $field_str = ''; - $is_int = array(); - while ($field = mysql_fetch_field($query->result_id)) - { - $is_int[$i] = (in_array( - strtolower(mysql_field_type($query->result_id, $i)), - array('tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'timestamp'), - TRUE) - ) ? TRUE : FALSE; - - // Create a string of field names - $field_str .= $field->name.', '; - $i++; - } - - // Trim off the end comma - $field_str = preg_replace( "/, $/" , "" , $field_str); - - - // Build the insert string - foreach ($query->result_array() as $row) - { - $val_str = ''; - - $i = 0; - foreach ($row as $v) - { - // Do a little formatting... - $v = str_replace(array("\x00", "\x0a", "\x0d", "\x1a"), array('\0', '\n', '\r', '\Z'), $v); - $v = str_replace(array("\n", "\r", "\t"), array('\n', '\r', '\t'), $v); - $v = str_replace('\\', '\\\\', $v); - $v = str_replace('\'', '\\\'', $v); - $v = str_replace('\\\n', '\n', $v); - $v = str_replace('\\\r', '\r', $v); - $v = str_replace('\\\t', '\t', $v); - - // Escape the data if it's not an integer type - $val_str .= ($is_int[$i] == FALSE) ? $this->db->escape($v) : $v; - $val_str .= ', '; - - $i++; - } - - $val_str = preg_replace( "/, $/" , "" , $val_str); - - // Build the INSERT string - $output .= 'INSERT INTO '.$table.' ('.$field_str.') VALUES ('.$val_str.');'.$newline; - } - - $output .= $newline.$newline; - } - - return $output; - } - - -} - +db->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * Optimize table query + * + * Generates a platform-specific query so that a table can be optimized + * + * @access private + * @param string the table name + * @return object + */ + function _optimize_table($table) + { + return "OPTIMIZE TABLE ".$this->db->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Generates a platform-specific query so that a table can be repaired + * + * @access private + * @param string the table name + * @return object + */ + function _repair_table($table) + { + return "REPAIR TABLE ".$this->db->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * MySQL Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + if (count($params) == 0) + { + return FALSE; + } + + // Extract the prefs for simplicity + extract($params); + + // Build the output + $output = ''; + foreach ((array)$tables as $table) + { + // Is the table in the "ignore" list? + if (in_array($table, (array)$ignore, TRUE)) + { + continue; + } + + // Get the table schema + $query = $this->db->query("SHOW CREATE TABLE `".$this->db->database.'`.'.$table); + + // No result means the table name was invalid + if ($query === FALSE) + { + continue; + } + + // Write out the table schema + $output .= '#'.$newline.'# TABLE STRUCTURE FOR: '.$table.$newline.'#'.$newline.$newline; + + if ($add_drop == TRUE) + { + $output .= 'DROP TABLE IF EXISTS '.$table.';'.$newline.$newline; + } + + $i = 0; + $result = $query->result_array(); + foreach ($result[0] as $val) + { + if ($i++ % 2) + { + $output .= $val.';'.$newline.$newline; + } + } + + // If inserts are not needed we're done... + if ($add_insert == FALSE) + { + continue; + } + + // Grab all the data from the current table + $query = $this->db->query("SELECT * FROM $table"); + + if ($query->num_rows() == 0) + { + continue; + } + + // Fetch the field names and determine if the field is an + // integer type. We use this info to decide whether to + // surround the data with quotes or not + + $i = 0; + $field_str = ''; + $is_int = array(); + while ($field = mysql_fetch_field($query->result_id)) + { + $is_int[$i] = (in_array( + strtolower(mysql_field_type($query->result_id, $i)), + array('tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'timestamp'), + TRUE) + ) ? TRUE : FALSE; + + // Create a string of field names + $field_str .= $field->name.', '; + $i++; + } + + // Trim off the end comma + $field_str = preg_replace( "/, $/" , "" , $field_str); + + + // Build the insert string + foreach ($query->result_array() as $row) + { + $val_str = ''; + + $i = 0; + foreach ($row as $v) + { + // Do a little formatting... + $v = str_replace(array("\x00", "\x0a", "\x0d", "\x1a"), array('\0', '\n', '\r', '\Z'), $v); + $v = str_replace(array("\n", "\r", "\t"), array('\n', '\r', '\t'), $v); + $v = str_replace('\\', '\\\\', $v); + $v = str_replace('\'', '\\\'', $v); + $v = str_replace('\\\n', '\n', $v); + $v = str_replace('\\\r', '\r', $v); + $v = str_replace('\\\t', '\t', $v); + + // Escape the data if it's not an integer type + $val_str .= ($is_int[$i] == FALSE) ? $this->db->escape($v) : $v; + $val_str .= ', '; + + $i++; + } + + $val_str = preg_replace( "/, $/" , "" , $val_str); + + // Build the INSERT string + $output .= 'INSERT INTO '.$table.' ('.$field_str.') VALUES ('.$val_str.');'.$newline; + } + + $output .= $newline.$newline; + } + + return $output; + } + + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index f8d3acf2..98e7f6c7 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -1,483 +1,483 @@ -hostname, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - return $this->db_connect(); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - return @mysqli_select_db($this->conn_id, $this->database); - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT version() AS ver"; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - $result = @mysqli_query($this->conn_id, $sql); - return $result; - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - // "DELETE FROM TABLE" returns 0 affected rows This hack modifies - // the query so that it returns the number of affected rows - if ($this->delete_hack === TRUE) - { - if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) - { - $sql = preg_replace("/^\s*DELETE\s+FROM\s+(\S+)\s*$/", "DELETE FROM \\1 WHERE 1=1", $sql); - } - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - $this->simple_query('SET AUTOCOMMIT=0'); - $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('COMMIT'); - $this->simple_query('SET AUTOCOMMIT=1'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('ROLLBACK'); - $this->simple_query('SET AUTOCOMMIT=1'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - if (get_magic_quotes_gpc()) - { - return $str; - } - - return mysqli_real_escape_string($this->conn_id, $str); - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @mysqli_affected_rows($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - return @mysqli_insert_id($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * List table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @return string - */ - function _list_tables() - { - return "SHOW TABLES FROM `".$this->database."`"; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SHOW COLUMNS FROM ".$this->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1"; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - return mysqli_error($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - return mysqli_errno($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Escape Table Name - * - * This function adds backticks if the table name has a period - * in it. Some DBs will get cranky unless periods are escaped - * - * @access private - * @param string the table name - * @return string - */ - function _escape_table($table) - { - if (stristr($table, '.')) - { - $table = preg_replace("/\./", "`.`", $table); - } - - return $table; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @return string - */ - function _update($table, $values, $where) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @return string - */ - function _delete($table, $where) - { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - $sql .= "LIMIT ".$limit; - - if ($offset > 0) - { - $sql .= " OFFSET ".$offset; - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @mysqli_close($conn_id); - } - - -} - +hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return $this->db_connect(); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return @mysqli_select_db($this->conn_id, $this->database); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + $result = @mysqli_query($this->conn_id, $sql); + return $result; + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + // "DELETE FROM TABLE" returns 0 affected rows This hack modifies + // the query so that it returns the number of affected rows + if ($this->delete_hack === TRUE) + { + if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) + { + $sql = preg_replace("/^\s*DELETE\s+FROM\s+(\S+)\s*$/", "DELETE FROM \\1 WHERE 1=1", $sql); + } + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + $this->simple_query('SET AUTOCOMMIT=0'); + $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('COMMIT'); + $this->simple_query('SET AUTOCOMMIT=1'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('ROLLBACK'); + $this->simple_query('SET AUTOCOMMIT=1'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + if (get_magic_quotes_gpc()) + { + return $str; + } + + return mysqli_real_escape_string($this->conn_id, $str); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @mysqli_affected_rows($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @mysqli_insert_id($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * List table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @return string + */ + function _list_tables() + { + return "SHOW TABLES FROM `".$this->database."`"; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SHOW COLUMNS FROM ".$this->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return mysqli_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return mysqli_errno($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access private + * @param string the table name + * @return string + */ + function _escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $sql .= "LIMIT ".$limit; + + if ($offset > 0) + { + $sql .= " OFFSET ".$offset; + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @mysqli_close($conn_id); + } + + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index 57c89ea8..0f2eb534 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php @@ -1,173 +1,173 @@ -result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @mysqli_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - while ($field = mysqli_fetch_field($this->result_id)) - { - $field_names[] = $field->name; - } - - return $field_names; - } - - // Deprecated - function field_names() - { - return $this->list_fields(); - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - while ($field = mysqli_fetch_field($this->result_id)) - { - $F = new stdClass(); - $F->name = $field->name; - $F->type = $field->type; - $F->default = $field->def; - $F->max_length = $field->max_length; - $F->primary_key = ($field->flags & MYSQLI_PRI_KEY_FLAG) ? 1 : 0; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - mysqli_free_result($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return mysqli_data_seek($this->result_id, $n); - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - return mysqli_fetch_assoc($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - return mysqli_fetch_object($this->result_id); - } - -} - +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @mysqli_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + while ($field = mysqli_fetch_field($this->result_id)) + { + $field_names[] = $field->name; + } + + return $field_names; + } + + // Deprecated + function field_names() + { + return $this->list_fields(); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + while ($field = mysqli_fetch_field($this->result_id)) + { + $F = new stdClass(); + $F->name = $field->name; + $F->type = $field->type; + $F->default = $field->def; + $F->max_length = $field->max_length; + $F->primary_key = ($field->flags & MYSQLI_PRI_KEY_FLAG) ? 1 : 0; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + mysqli_free_result($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return mysqli_data_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return mysqli_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return mysqli_fetch_object($this->result_id); + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php index d5dbf2fb..3e2b8da6 100644 --- a/system/database/drivers/mysqli/mysqli_utility.php +++ b/system/database/drivers/mysqli/mysqli_utility.php @@ -1,245 +1,245 @@ -db->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * List databases - * - * @access private - * @return bool - */ - function _list_databases() - { - return "SHOW DATABASES"; - } - - // -------------------------------------------------------------------- - - /** - * Optimize table query - * - * Generates a platform-specific query so that a table can be optimized - * - * @access private - * @param string the table name - * @return object - */ - function _optimize_table($table) - { - return "OPTIMIZE TABLE ".$this->db->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * Repair table query - * - * Generates a platform-specific query so that a table can be repaired - * - * @access private - * @param string the table name - * @return object - */ - function _repair_table($table) - { - return "REPAIR TABLE ".$this->db->_escape_table($table); - } - - // -------------------------------------------------------------------- - - /** - * MySQLi Export - * - * @access private - * @param array Preferences - * @return mixed - */ - function _backup($params = array()) - { - if (count($params) == 0) - { - return FALSE; - } - - // Extract the prefs for simplicity - extract($params); - - // Build the output - $output = ''; - foreach ((array)$tables as $table) - { - // Is the table in the "ignore" list? - if (in_array($table, (array)$ignore, TRUE)) - { - continue; - } - - // Get the table schema - $query = $this->db->query("SHOW CREATE TABLE `".$this->db->database.'`.'.$table); - - // No result means the table name was invalid - if ($query === FALSE) - { - continue; - } - - // Write out the table schema - $output .= '#'.$newline.'# TABLE STRUCTURE FOR: '.$table.$newline.'#'.$newline.$newline; - - if ($add_drop == TRUE) - { - $output .= 'DROP TABLE IF EXISTS '.$table.';'.$newline.$newline; - } - - $i = 0; - $result = $query->result_array(); - foreach ($result[0] as $val) - { - if ($i++ % 2) - { - $output .= $val.';'.$newline.$newline; - } - } - - // If inserts are not needed we're done... - if ($add_insert == FALSE) - { - continue; - } - - // Grab all the data from the current table - $query = $this->db->query("SELECT * FROM $table"); - - if ($query->num_rows() == 0) - { - continue; - } - - // Fetch the field names and determine if the field is an - // integer type. We use this info to decide whether to - // surround the data with quotes or not - - $i = 0; - $field_str = ''; - $is_int = array(); - while ($field = mysqli_fetch_field($query->result_id)) - { - $is_int[$i] = (in_array( - strtolower(mysql_field_type($query->result_id, $i)), - array('tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'timestamp'), - TRUE) - ) ? TRUE : FALSE; - - // Create a string of field names - $field_str .= $field->name.', '; - $i++; - } - - // Trim off the end comma - $field_str = preg_replace( "/, $/" , "" , $field_str); - - - // Build the insert string - foreach ($query->result_array() as $row) - { - $val_str = ''; - - $i = 0; - foreach ($row as $v) - { - // Do a little formatting... - $v = str_replace(array("\x00", "\x0a", "\x0d", "\x1a"), array('\0', '\n', '\r', '\Z'), $v); - $v = str_replace(array("\n", "\r", "\t"), array('\n', '\r', '\t'), $v); - $v = str_replace('\\', '\\\\', $v); - $v = str_replace('\'', '\\\'', $v); - $v = str_replace('\\\n', '\n', $v); - $v = str_replace('\\\r', '\r', $v); - $v = str_replace('\\\t', '\t', $v); - - // Escape the data if it's not an integer type - $val_str .= ($is_int[$i] == FALSE) ? $this->db->escape($v) : $v; - $val_str .= ', '; - - $i++; - } - - $val_str = preg_replace( "/, $/" , "" , $val_str); - - // Build the INSERT string - $output .= 'INSERT INTO '.$table.' ('.$field_str.') VALUES ('.$val_str.');'.$newline; - } - - $output .= $newline.$newline; - } - - return $output; - } - - - -} - +db->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * List databases + * + * @access private + * @return bool + */ + function _list_databases() + { + return "SHOW DATABASES"; + } + + // -------------------------------------------------------------------- + + /** + * Optimize table query + * + * Generates a platform-specific query so that a table can be optimized + * + * @access private + * @param string the table name + * @return object + */ + function _optimize_table($table) + { + return "OPTIMIZE TABLE ".$this->db->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Generates a platform-specific query so that a table can be repaired + * + * @access private + * @param string the table name + * @return object + */ + function _repair_table($table) + { + return "REPAIR TABLE ".$this->db->_escape_table($table); + } + + // -------------------------------------------------------------------- + + /** + * MySQLi Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + if (count($params) == 0) + { + return FALSE; + } + + // Extract the prefs for simplicity + extract($params); + + // Build the output + $output = ''; + foreach ((array)$tables as $table) + { + // Is the table in the "ignore" list? + if (in_array($table, (array)$ignore, TRUE)) + { + continue; + } + + // Get the table schema + $query = $this->db->query("SHOW CREATE TABLE `".$this->db->database.'`.'.$table); + + // No result means the table name was invalid + if ($query === FALSE) + { + continue; + } + + // Write out the table schema + $output .= '#'.$newline.'# TABLE STRUCTURE FOR: '.$table.$newline.'#'.$newline.$newline; + + if ($add_drop == TRUE) + { + $output .= 'DROP TABLE IF EXISTS '.$table.';'.$newline.$newline; + } + + $i = 0; + $result = $query->result_array(); + foreach ($result[0] as $val) + { + if ($i++ % 2) + { + $output .= $val.';'.$newline.$newline; + } + } + + // If inserts are not needed we're done... + if ($add_insert == FALSE) + { + continue; + } + + // Grab all the data from the current table + $query = $this->db->query("SELECT * FROM $table"); + + if ($query->num_rows() == 0) + { + continue; + } + + // Fetch the field names and determine if the field is an + // integer type. We use this info to decide whether to + // surround the data with quotes or not + + $i = 0; + $field_str = ''; + $is_int = array(); + while ($field = mysqli_fetch_field($query->result_id)) + { + $is_int[$i] = (in_array( + strtolower(mysql_field_type($query->result_id, $i)), + array('tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'timestamp'), + TRUE) + ) ? TRUE : FALSE; + + // Create a string of field names + $field_str .= $field->name.', '; + $i++; + } + + // Trim off the end comma + $field_str = preg_replace( "/, $/" , "" , $field_str); + + + // Build the insert string + foreach ($query->result_array() as $row) + { + $val_str = ''; + + $i = 0; + foreach ($row as $v) + { + // Do a little formatting... + $v = str_replace(array("\x00", "\x0a", "\x0d", "\x1a"), array('\0', '\n', '\r', '\Z'), $v); + $v = str_replace(array("\n", "\r", "\t"), array('\n', '\r', '\t'), $v); + $v = str_replace('\\', '\\\\', $v); + $v = str_replace('\'', '\\\'', $v); + $v = str_replace('\\\n', '\n', $v); + $v = str_replace('\\\r', '\r', $v); + $v = str_replace('\\\t', '\t', $v); + + // Escape the data if it's not an integer type + $val_str .= ($is_int[$i] == FALSE) ? $this->db->escape($v) : $v; + $val_str .= ', '; + + $i++; + } + + $val_str = preg_replace( "/, $/" , "" , $val_str); + + // Build the INSERT string + $output .= 'INSERT INTO '.$table.' ('.$field_str.') VALUES ('.$val_str.');'.$newline; + } + + $output .= $newline.$newline; + } + + return $output; + } + + + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index ff301a57..291e168e 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -1,605 +1,605 @@ -username, $this->password, $this->hostname); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - return @ociplogon($this->username, $this->password, $this->hostname); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return ociserverversion($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - // oracle must parse the query before it is run. All of the actions with - // the query are based on the statement id returned by ociparse - $this->_set_stmt_id($sql); - ocisetprefetch($this->stmt_id, 1000); - return @ociexecute($this->stmt_id, $this->_commit); - } - - /** - * Generate a statement ID - * - * @access private - * @param string an SQL query - * @return none - */ - function _set_stmt_id($sql) - { - if ( ! is_resource($this->stmt_id)) - { - $this->stmt_id = ociparse($this->conn_id, $this->_prep_query($sql)); - } - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * getCursor. Returns a cursor from the datbase - * - * @access public - * @return cursor id - */ - function get_cursor() - { - $this->curs_id = ocinewcursor($this->conn_id); - return $this->curs_id; - } - - // -------------------------------------------------------------------- - - /** - * Stored Procedure. Executes a stored procedure - * - * @access public - * @param package package stored procedure is in - * @param procedure stored procedure to execute - * @param params array of parameters - * @return array - * - * params array keys - * - * KEY OPTIONAL NOTES - * name no the name of the parameter should be in : format - * value no the value of the parameter. If this is an OUT or IN OUT parameter, - * this should be a reference to a variable - * type yes the type of the parameter - * length yes the max size of the parameter - */ - function stored_procedure($package, $procedure, $params) - { - if ($package == '' OR $procedure == '' OR ! is_array($params)) - { - if ($this->db_debug) - { - log_message('error', 'Invalid query: '.$package.'.'.$procedure); - return $this->display_error('db_invalid_query'); - } - return FALSE; - } - - // build the query string - $sql = "begin $package.$procedure("; - - $have_cursor = FALSE; - foreach($params as $param) - { - $sql .= $param['name'] . ","; - - if (array_key_exists('type', $param) && ($param['type'] == OCI_B_CURSOR)) - { - $have_cursor = TRUE; - } - } - $sql = trim($sql, ",") . "); end;"; - - $this->stmt_id = FALSE; - $this->_set_stmt_id($sql); - $this->_bind_params($params); - $this->query($sql, FALSE, $have_cursor); - } - - // -------------------------------------------------------------------- - - /** - * Bind parameters - * - * @access private - * @return none - */ - function _bind_params($params) - { - if ( ! is_array($params) OR ! is_resource($this->stmt_id)) - { - return; - } - - foreach ($params as $param) - { - foreach (array('name', 'value', 'type', 'length') as $val) - { - if ( ! isset($param[$val])) - { - $param[$val] = ''; - } - } - - ocibindbyname($this->stmt_id, $param['name'], $param['value'], $param['length'], $param['type']); - } - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - $this->_commit = OCI_DEFAULT; - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $ret = OCIcommit($this->conn_id); - $this->_commit = OCI_COMMIT_ON_SUCCESS; - return $ret; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $ret = OCIrollback($this->conn_id); - $this->_commit = OCI_COMMIT_ON_SUCCESS; - return $ret; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @ocirowcount($this->stmt_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - // not supported in oracle - return 0; - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query("SELECT COUNT(1) AS numrows FROM ".$table); - - if ($query == FALSE) - { - return 0; - } - - $row = $query->row(); - return $row->NUMROWS; - } - - // -------------------------------------------------------------------- - - /** - * Show table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @return string - */ - function _list_tables() - { - return "SELECT TABLE_NAME FROM ALL_TABLES"; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SELECT COLUMN_NAME FROM all_tab_columns WHERE table_name = '$table'"; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT * FROM ".$this->_escape_table($table)." where rownum = 1"; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - $error = ocierror($this->conn_id); - return $error['message']; - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - $error = ocierror($this->conn_id); - return $error['code']; - } - - // -------------------------------------------------------------------- - - /** - * Escape Table Name - * - * This function adds backticks if the table name has a period - * in it. Some DBs will get cranky unless periods are escaped - * - * @access private - * @param string the table name - * @return string - */ - function _escape_table($table) - { - if (stristr($table, '.')) - { - $table = preg_replace("/\./", "`.`", $table); - } - - return $table; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @return string - */ - function _update($table, $values, $where) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @return string - */ - function _delete($table, $where) - { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - $limit = $offset + $limit; - $newsql = "SELECT * FROM (select inner_query.*, rownum rnum FROM ($sql) inner_query WHERE rownum < $limit)"; - - if ($offset != 0) - { - $newsql .= " WHERE rnum >= $offset"; - } - - // remember that we used limits - $this->limit_used = TRUE; - - return $newsql; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @ocilogoff($conn_id); - } - - -} - - +username, $this->password, $this->hostname); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return @ociplogon($this->username, $this->password, $this->hostname); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return ociserverversion($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + // oracle must parse the query before it is run. All of the actions with + // the query are based on the statement id returned by ociparse + $this->_set_stmt_id($sql); + ocisetprefetch($this->stmt_id, 1000); + return @ociexecute($this->stmt_id, $this->_commit); + } + + /** + * Generate a statement ID + * + * @access private + * @param string an SQL query + * @return none + */ + function _set_stmt_id($sql) + { + if ( ! is_resource($this->stmt_id)) + { + $this->stmt_id = ociparse($this->conn_id, $this->_prep_query($sql)); + } + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * getCursor. Returns a cursor from the datbase + * + * @access public + * @return cursor id + */ + function get_cursor() + { + $this->curs_id = ocinewcursor($this->conn_id); + return $this->curs_id; + } + + // -------------------------------------------------------------------- + + /** + * Stored Procedure. Executes a stored procedure + * + * @access public + * @param package package stored procedure is in + * @param procedure stored procedure to execute + * @param params array of parameters + * @return array + * + * params array keys + * + * KEY OPTIONAL NOTES + * name no the name of the parameter should be in : format + * value no the value of the parameter. If this is an OUT or IN OUT parameter, + * this should be a reference to a variable + * type yes the type of the parameter + * length yes the max size of the parameter + */ + function stored_procedure($package, $procedure, $params) + { + if ($package == '' OR $procedure == '' OR ! is_array($params)) + { + if ($this->db_debug) + { + log_message('error', 'Invalid query: '.$package.'.'.$procedure); + return $this->display_error('db_invalid_query'); + } + return FALSE; + } + + // build the query string + $sql = "begin $package.$procedure("; + + $have_cursor = FALSE; + foreach($params as $param) + { + $sql .= $param['name'] . ","; + + if (array_key_exists('type', $param) && ($param['type'] == OCI_B_CURSOR)) + { + $have_cursor = TRUE; + } + } + $sql = trim($sql, ",") . "); end;"; + + $this->stmt_id = FALSE; + $this->_set_stmt_id($sql); + $this->_bind_params($params); + $this->query($sql, FALSE, $have_cursor); + } + + // -------------------------------------------------------------------- + + /** + * Bind parameters + * + * @access private + * @return none + */ + function _bind_params($params) + { + if ( ! is_array($params) OR ! is_resource($this->stmt_id)) + { + return; + } + + foreach ($params as $param) + { + foreach (array('name', 'value', 'type', 'length') as $val) + { + if ( ! isset($param[$val])) + { + $param[$val] = ''; + } + } + + ocibindbyname($this->stmt_id, $param['name'], $param['value'], $param['length'], $param['type']); + } + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + $this->_commit = OCI_DEFAULT; + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $ret = OCIcommit($this->conn_id); + $this->_commit = OCI_COMMIT_ON_SUCCESS; + return $ret; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $ret = OCIrollback($this->conn_id); + $this->_commit = OCI_COMMIT_ON_SUCCESS; + return $ret; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @ocirowcount($this->stmt_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + // not supported in oracle + return 0; + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(1) AS numrows FROM ".$table); + + if ($query == FALSE) + { + return 0; + } + + $row = $query->row(); + return $row->NUMROWS; + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @return string + */ + function _list_tables() + { + return "SELECT TABLE_NAME FROM ALL_TABLES"; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SELECT COLUMN_NAME FROM all_tab_columns WHERE table_name = '$table'"; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$this->_escape_table($table)." where rownum = 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + $error = ocierror($this->conn_id); + return $error['message']; + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + $error = ocierror($this->conn_id); + return $error['code']; + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access private + * @param string the table name + * @return string + */ + function _escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $limit = $offset + $limit; + $newsql = "SELECT * FROM (select inner_query.*, rownum rnum FROM ($sql) inner_query WHERE rownum < $limit)"; + + if ($offset != 0) + { + $newsql .= " WHERE rnum >= $offset"; + } + + // remember that we used limits + $this->limit_used = TRUE; + + return $newsql; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @ocilogoff($conn_id); + } + + +} + + ?> \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index fb4ed1f0..07f15448 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -1,251 +1,251 @@ -result_array()); - @ociexecute($this->stmt_id); - if ($this->curs_id) - { - @ociexecute($this->curs_id); - } - return $rowcount; - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - $count = @ocinumcols($this->stmt_id); - - // if we used a limit we subtract it - if ($this->limit_used) - { - $count = $count - 1; - } - - return $count; - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - $fieldCount = $this->num_fields(); - for ($c = 1; $c <= $fieldCount; $c++) - { - $field_names[] = ocicolumnname($this->stmt_id, $c); - } - return $field_names; - } - - // Deprecated - function field_names() - { - return $this->list_fields(); - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - $fieldCount = $this->num_fields(); - for ($c = 1; $c <= $fieldCount; $c++) - { - $F = new stdClass(); - $F->name = ocicolumnname($this->stmt_id, $c); - $F->type = ocicolumntype($this->stmt_id, $c); - $F->max_length = ocicolumnsize($this->stmt_id, $c); - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - ocifreestatement($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc(&$row) - { - $id = ($this->curs_id) ? $this->curs_id : $this->stmt_id; - - return ocifetchinto($id, $row, OCI_ASSOC + OCI_RETURN_NULLS); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - $result = array(); - - // If PHP 5 is being used we can fetch an result object - if (function_exists('oci_fetch_object')) - { - $id = ($this->curs_id) ? $this->curs_id : $this->stmt_id; - - return @oci_fetch_object($id); - } - - // If PHP 4 is being used we have to build our own result - foreach ($this->result_array() as $key => $val) - { - $obj = new stdClass(); - if (is_array($val)) - { - foreach ($val as $k => $v) - { - $obj->$k = $v; - } - } - else - { - $obj->$key = $val; - } - - $result[] = $obj; - } - - return $result; - } - - // -------------------------------------------------------------------- - - /** - * Query result. "array" version. - * - * @access public - * @return array - */ - function result_array() - { - if (count($this->result_array) > 0) - { - return $this->result_array; - } - - // oracle's fetch functions do not return arrays. - // The information is returned in reference parameters - $row = NULL; - while ($this->_fetch_assoc($row)) - { - $this->result_array[] = $row; - } - - return $this->result_array; - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return FALSE; // Not needed - } - -} - +result_array()); + @ociexecute($this->stmt_id); + if ($this->curs_id) + { + @ociexecute($this->curs_id); + } + return $rowcount; + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + $count = @ocinumcols($this->stmt_id); + + // if we used a limit we subtract it + if ($this->limit_used) + { + $count = $count - 1; + } + + return $count; + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + $fieldCount = $this->num_fields(); + for ($c = 1; $c <= $fieldCount; $c++) + { + $field_names[] = ocicolumnname($this->stmt_id, $c); + } + return $field_names; + } + + // Deprecated + function field_names() + { + return $this->list_fields(); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + $fieldCount = $this->num_fields(); + for ($c = 1; $c <= $fieldCount; $c++) + { + $F = new stdClass(); + $F->name = ocicolumnname($this->stmt_id, $c); + $F->type = ocicolumntype($this->stmt_id, $c); + $F->max_length = ocicolumnsize($this->stmt_id, $c); + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + ocifreestatement($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc(&$row) + { + $id = ($this->curs_id) ? $this->curs_id : $this->stmt_id; + + return ocifetchinto($id, $row, OCI_ASSOC + OCI_RETURN_NULLS); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + $result = array(); + + // If PHP 5 is being used we can fetch an result object + if (function_exists('oci_fetch_object')) + { + $id = ($this->curs_id) ? $this->curs_id : $this->stmt_id; + + return @oci_fetch_object($id); + } + + // If PHP 4 is being used we have to build our own result + foreach ($this->result_array() as $key => $val) + { + $obj = new stdClass(); + if (is_array($val)) + { + foreach ($val as $k => $v) + { + $obj->$k = $v; + } + } + else + { + $obj->$key = $val; + } + + $result[] = $obj; + } + + return $result; + } + + // -------------------------------------------------------------------- + + /** + * Query result. "array" version. + * + * @access public + * @return array + */ + function result_array() + { + if (count($this->result_array) > 0) + { + return $this->result_array; + } + + // oracle's fetch functions do not return arrays. + // The information is returned in reference parameters + $row = NULL; + while ($this->_fetch_assoc($row)) + { + $this->result_array[] = $row; + } + + return $this->result_array; + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return FALSE; // Not needed + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php index 1d83af1f..1b49f413 100644 --- a/system/database/drivers/oci8/oci8_utility.php +++ b/system/database/drivers/oci8/oci8_utility.php @@ -1,129 +1,129 @@ -db->display_error('db_unsuported_feature'); - } - -} - +db->display_error('db_unsuported_feature'); + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 9d540c77..d6451e04 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -1,12 +1,12 @@ result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @odbc_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $field_names[] = odbc_field_name($this->result_id, $i); - } - - return $field_names; - } - - // Deprecated - function field_names() - { - return $this->list_fields(); - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $F = new stdClass(); - $F->name = odbc_field_name($this->result_id, $i); - $F->type = odbc_field_type($this->result_id, $i); - $F->max_length = odbc_field_len($this->result_id, $i); - $F->primary_key = 0; - $F->default = ''; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - odbc_free_result($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - if (function_exists('odbc_fetch_object')) - { - return odbc_fetch_array($this->result_id); - } - else - { - return $this->_odbc_fetch_array($this->result_id); - } - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - if (function_exists('odbc_fetch_object')) - { - return odbc_fetch_object($this->result_id); - } - else - { - return $this->_odbc_fetch_object($this->result_id); - } - } - - - /** - * Result - object - * - * subsititutes the odbc_fetch_object function when - * not available (odbc_fetch_object requires unixODBC) - * - * @access private - * @return object - */ - - function _odbc_fetch_object(& $odbc_result) { - $rs = array(); - $rs_obj = false; - if (odbc_fetch_into($odbc_result, $rs)) { - foreach ($rs as $k=>$v) { - $field_name= odbc_field_name($odbc_result, $k+1); - $rs_obj->$field_name = $v; - } - } - return $rs_obj; - } - - - /** - * Result - array - * - * subsititutes the odbc_fetch_array function when - * not available (odbc_fetch_array requires unixODBC) - * - * @access private - * @return array - */ - - function _odbc_fetch_array(& $odbc_result) { - $rs = array(); - $rs_assoc = false; - if (odbc_fetch_into($odbc_result, $rs)) { - $rs_assoc=array(); - foreach ($rs as $k=>$v) { - $field_name= odbc_field_name($odbc_result, $k+1); - $rs_assoc[$field_name] = $v; - } - } - return $rs_assoc; - } - -} - +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @odbc_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $field_names[] = odbc_field_name($this->result_id, $i); + } + + return $field_names; + } + + // Deprecated + function field_names() + { + return $this->list_fields(); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $F = new stdClass(); + $F->name = odbc_field_name($this->result_id, $i); + $F->type = odbc_field_type($this->result_id, $i); + $F->max_length = odbc_field_len($this->result_id, $i); + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + odbc_free_result($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + if (function_exists('odbc_fetch_object')) + { + return odbc_fetch_array($this->result_id); + } + else + { + return $this->_odbc_fetch_array($this->result_id); + } + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + if (function_exists('odbc_fetch_object')) + { + return odbc_fetch_object($this->result_id); + } + else + { + return $this->_odbc_fetch_object($this->result_id); + } + } + + + /** + * Result - object + * + * subsititutes the odbc_fetch_object function when + * not available (odbc_fetch_object requires unixODBC) + * + * @access private + * @return object + */ + + function _odbc_fetch_object(& $odbc_result) { + $rs = array(); + $rs_obj = false; + if (odbc_fetch_into($odbc_result, $rs)) { + foreach ($rs as $k=>$v) { + $field_name= odbc_field_name($odbc_result, $k+1); + $rs_obj->$field_name = $v; + } + } + return $rs_obj; + } + + + /** + * Result - array + * + * subsititutes the odbc_fetch_array function when + * not available (odbc_fetch_array requires unixODBC) + * + * @access private + * @return array + */ + + function _odbc_fetch_array(& $odbc_result) { + $rs = array(); + $rs_assoc = false; + if (odbc_fetch_into($odbc_result, $rs)) { + $rs_assoc=array(); + foreach ($rs as $k=>$v) { + $field_name= odbc_field_name($odbc_result, $k+1); + $rs_assoc[$field_name] = $v; + } + } + return $rs_assoc; + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php index 8af463b1..f8d9e3c4 100644 --- a/system/database/drivers/odbc/odbc_utility.php +++ b/system/database/drivers/odbc/odbc_utility.php @@ -1,161 +1,161 @@ -db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - // ODBC has no "drop database" command since it's - // designed to connect to an existing database - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * List databases - * - * @access private - * @return bool - */ - function _list_databases() - { - // Not sure if ODBC lets you list all databases... - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * @access private - * @return bool - */ - function _drop_table($table) - { - // Not a supported ODBC feature - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Optimize table query - * - * Generates a platform-specific query so that a table can be optimized - * - * @access private - * @param string the table name - * @return object - */ - function _optimize_table($table) - { - // Not a supported ODBC feature - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Repair table query - * - * Generates a platform-specific query so that a table can be repaired - * - * @access private - * @param string the table name - * @return object - */ - function _repair_table($table) - { - // Not a supported ODBC feature - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * ODBC Export - * - * @access private - * @param array Preferences - * @return mixed - */ - function _backup($params = array()) - { - // Currently unsupported - return $this->db->display_error('db_unsuported_feature'); - } - -} - +db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access private + * @param string the database name + * @return bool + */ + function _drop_database($name) + { + // ODBC has no "drop database" command since it's + // designed to connect to an existing database + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * List databases + * + * @access private + * @return bool + */ + function _list_databases() + { + // Not sure if ODBC lets you list all databases... + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * @access private + * @return bool + */ + function _drop_table($table) + { + // Not a supported ODBC feature + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Optimize table query + * + * Generates a platform-specific query so that a table can be optimized + * + * @access private + * @param string the table name + * @return object + */ + function _optimize_table($table) + { + // Not a supported ODBC feature + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Generates a platform-specific query so that a table can be repaired + * + * @access private + * @param string the table name + * @return object + */ + function _repair_table($table) + { + // Not a supported ODBC feature + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * ODBC Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + // Currently unsupported + return $this->db->display_error('db_unsuported_feature'); + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 58cc69a9..bfb212cf 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -1,12 +1,12 @@ result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @pg_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $Ffield_names[] = pg_field_name($this->result_id, $i); - } - - return $field_names; - } - - // Deprecated - function field_names() - { - return $this->list_fields(); - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $F = new stdClass(); - $F->name = pg_field_name($this->result_id, $i); - $F->type = pg_field_type($this->result_id, $i); - $F->max_length = pg_field_size($this->result_id, $i); - $F->primary_key = $i == 0; - $F->default = ''; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - pg_free_result($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return pg_result_seek($this->result_id, $n); - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - return pg_fetch_assoc($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - return pg_fetch_object($this->result_id); - } - -} - +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @pg_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $Ffield_names[] = pg_field_name($this->result_id, $i); + } + + return $field_names; + } + + // Deprecated + function field_names() + { + return $this->list_fields(); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $F = new stdClass(); + $F->name = pg_field_name($this->result_id, $i); + $F->type = pg_field_type($this->result_id, $i); + $F->max_length = pg_field_size($this->result_id, $i); + $F->primary_key = $i == 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + pg_free_result($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return pg_result_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return pg_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return pg_fetch_object($this->result_id); + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php index bebe0941..9d56af36 100644 --- a/system/database/drivers/postgre/postgre_utility.php +++ b/system/database/drivers/postgre/postgre_utility.php @@ -1,129 +1,129 @@ -db->_escape_table($table)." CASCADE"; - } - - // -------------------------------------------------------------------- - - /** - * Optimize table query - * - * Is table optimization supported in Postgre? - * - * @access private - * @param string the table name - * @return object - */ - function _optimize_table($table) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Repair table query - * - * Are table repairs supported in Postgre? - * - * @access private - * @param string the table name - * @return object - */ - function _repair_table($table) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Postgre Export - * - * @access private - * @param array Preferences - * @return mixed - */ - function _backup($params = array()) - { - // Currently unsupported - return $this->db->display_error('db_unsuported_feature'); - } - -} - +db->_escape_table($table)." CASCADE"; + } + + // -------------------------------------------------------------------- + + /** + * Optimize table query + * + * Is table optimization supported in Postgre? + * + * @access private + * @param string the table name + * @return object + */ + function _optimize_table($table) + { + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Are table repairs supported in Postgre? + * + * @access private + * @param string the table name + * @return object + */ + function _repair_table($table) + { + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Postgre Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + // Currently unsupported + return $this->db->display_error('db_unsuported_feature'); + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 877f445b..b82618c6 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -1,484 +1,484 @@ -database, 0666, $error)) - { - log_message('error', $error); - - if ($this->db_debug) - { - $this->display_error($error, '', TRUE); - } - - return FALSE; - } - - return $conn_id; - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - if ( ! $conn_id = @sqlite_popen($this->database, 0666, $error)) - { - log_message('error', $error); - - if ($this->db_debug) - { - $this->display_error($error, '', TRUE); - } - - return FALSE; - } - - return $conn_id; - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return sqlite_libversion(); - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - return @sqlite_query($this->conn_id, $sql); - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - $this->simple_query('BEGIN TRANSACTION'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('COMMIT'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('ROLLBACK'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - return sqlite_escape_string($str); - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return sqlite_changes($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - return @sqlite_last_insert_rowid($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * List table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @return string - */ - function _list_tables() - { - return "SELECT name from sqlite_master WHERE type='table'"; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - // Not supported - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1"; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - return sqlite_error_string(sqlite_last_error($this->conn_id)); - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - return sqlite_last_error($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Escape Table Name - * - * This function adds backticks if the table name has a period - * in it. Some DBs will get cranky unless periods are escaped - * - * @access private - * @param string the table name - * @return string - */ - function _escape_table($table) - { - if (stristr($table, '.')) - { - $table = preg_replace("/\./", "`.`", $table); - } - - return $table; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @return string - */ - function _update($table, $values, $where) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @return string - */ - function _delete($table, $where) - { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - if ($offset == 0) - { - $offset = ''; - } - else - { - $offset .= ", "; - } - - return $sql."LIMIT ".$offset.$limit; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @sqlite_close($conn_id); - } - - -} - +database, 0666, $error)) + { + log_message('error', $error); + + if ($this->db_debug) + { + $this->display_error($error, '', TRUE); + } + + return FALSE; + } + + return $conn_id; + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + if ( ! $conn_id = @sqlite_popen($this->database, 0666, $error)) + { + log_message('error', $error); + + if ($this->db_debug) + { + $this->display_error($error, '', TRUE); + } + + return FALSE; + } + + return $conn_id; + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return sqlite_libversion(); + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @sqlite_query($this->conn_id, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + $this->simple_query('BEGIN TRANSACTION'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('COMMIT'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('ROLLBACK'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + return sqlite_escape_string($str); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return sqlite_changes($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @sqlite_last_insert_rowid($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * List table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @return string + */ + function _list_tables() + { + return "SELECT name from sqlite_master WHERE type='table'"; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + // Not supported + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return sqlite_error_string(sqlite_last_error($this->conn_id)); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return sqlite_last_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape Table Name + * + * This function adds backticks if the table name has a period + * in it. Some DBs will get cranky unless periods are escaped + * + * @access private + * @param string the table name + * @return string + */ + function _escape_table($table) + { + if (stristr($table, '.')) + { + $table = preg_replace("/\./", "`.`", $table); + } + + return $table; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update($table, $values, $where) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @return string + */ + function _delete($table, $where) + { + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + if ($offset == 0) + { + $offset = ''; + } + else + { + $offset .= ", "; + } + + return $sql."LIMIT ".$offset.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @sqlite_close($conn_id); + } + + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php index a406a935..a16a5b05 100644 --- a/system/database/drivers/sqlite/sqlite_result.php +++ b/system/database/drivers/sqlite/sqlite_result.php @@ -1,176 +1,176 @@ -result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @sqlite_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $Ffield_names[] = sqlite_field_name($this->result_id, $i); - } - - return $field_names; - } - - // Deprecated - function field_names() - { - return $this->list_fields(); - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $F = new stdClass(); - $F->name = sqlite_field_name($this->result_id, $i); - $F->type = 'varchar'; - $F->max_length = 0; - $F->primary_key = 0; - $F->default = ''; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - // Not implemented in SQLite - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return sqlite_seek($this->result_id, $n); - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - return sqlite_fetch_array($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - if (function_exists('sqlite_fetch_object')) - { - return sqlite_fetch_object($this->result_id); - } - else - { - return $this->_fetch_assoc(); - } - } - -} - +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @sqlite_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $Ffield_names[] = sqlite_field_name($this->result_id, $i); + } + + return $field_names; + } + + // Deprecated + function field_names() + { + return $this->list_fields(); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $F = new stdClass(); + $F->name = sqlite_field_name($this->result_id, $i); + $F->type = 'varchar'; + $F->max_length = 0; + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + // Not implemented in SQLite + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return sqlite_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return sqlite_fetch_array($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + if (function_exists('sqlite_fetch_object')) + { + return sqlite_fetch_object($this->result_id); + } + else + { + return $this->_fetch_assoc(); + } + } + +} + ?> \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php index 91649c78..9683b175 100644 --- a/system/database/drivers/sqlite/sqlite_utility.php +++ b/system/database/drivers/sqlite/sqlite_utility.php @@ -1,154 +1,154 @@ -db->database) OR ! @unlink($this->db->database)) - { - if ($this->db->db_debug) - { - return $this->db->display_error('db_unable_to_drop'); - } - return FALSE; - } - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * List databases - * - * I don't believe you can do a database listing with SQLite - * since each database is its own file. I suppose we could - * try reading a directory looking for SQLite files, but - * that doesn't seem like a terribly good idea - * - * @access private - * @return bool - */ - function _list_databases() - { - if ($this->db_debug) - { - return $this->display_error('db_unsuported_feature'); - } - return array(); - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * Unsupported feature in SQLite - * - * @access private - * @return bool - */ - function _drop_table($table) - { - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return array(); - } - - // -------------------------------------------------------------------- - - /** - * Optimize table query - * - * Is optimization even supported in SQLite? - * - * @access private - * @param string the table name - * @return object - */ - function _optimize_table($table) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Repair table query - * - * Are table repairs even supported in SQLite? - * - * @access private - * @param string the table name - * @return object - */ - function _repair_table($table) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * SQLite Export - * - * @access private - * @param array Preferences - * @return mixed - */ - function _backup($params = array()) - { - // Currently unsupported - return $this->db->display_error('db_unsuported_feature'); - } - -} - +db->database) OR ! @unlink($this->db->database)) + { + if ($this->db->db_debug) + { + return $this->db->display_error('db_unable_to_drop'); + } + return FALSE; + } + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * List databases + * + * I don't believe you can do a database listing with SQLite + * since each database is its own file. I suppose we could + * try reading a directory looking for SQLite files, but + * that doesn't seem like a terribly good idea + * + * @access private + * @return bool + */ + function _list_databases() + { + if ($this->db_debug) + { + return $this->display_error('db_unsuported_feature'); + } + return array(); + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * Unsupported feature in SQLite + * + * @access private + * @return bool + */ + function _drop_table($table) + { + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return array(); + } + + // -------------------------------------------------------------------- + + /** + * Optimize table query + * + * Is optimization even supported in SQLite? + * + * @access private + * @param string the table name + * @return object + */ + function _optimize_table($table) + { + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Are table repairs even supported in SQLite? + * + * @access private + * @param string the table name + * @return object + */ + function _repair_table($table) + { + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * SQLite Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + // Currently unsupported + return $this->db->display_error('db_unsuported_feature'); + } + +} + ?> \ No newline at end of file diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php index 491c6157..674ef3be 100644 --- a/system/helpers/array_helper.php +++ b/system/helpers/array_helper.php @@ -1,71 +1,71 @@ - \ No newline at end of file diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php index b117816e..9dc5df9b 100644 --- a/system/helpers/cookie_helper.php +++ b/system/helpers/cookie_helper.php @@ -1,126 +1,126 @@ -config->item('cookie_prefix') != '') - { - $CI->config->item('cookie_prefix'); - } - if ($domain == '' AND $CI->config->item('cookie_domain') != '') - { - $CI->config->item('cookie_domain'); - } - if ($prefix == '/' AND $CI->config->item('cookie_path') != '/') - { - $CI->config->item('cookie_path'); - } - - if ( ! is_numeric($expire)) - { - $expire = time() - 86500; - } - else - { - if ($expire > 0) - { - $expire = time() + $expire; - } - else - { - $expire = 0; - } - } - - setcookie($prefix.$name, $value, $expire, $path, $domain, 0); -} - -// -------------------------------------------------------------------- - -/** - * Fetch an item from the COOKIE array - * - * @access public - * @param string - * @param bool - * @return mixed - */ -function get_cookie($index = '', $xss_clean = FALSE) -{ - $CI =& get_instance(); - return $CI->input->cookie($index, $xss_clean); -} - -// -------------------------------------------------------------------- - -/** - * Delete a COOKIE - * - * @param mixed - * @param string the cookie domain. Usually: .yourdomain.com - * @param string the cookie path - * @param string the cookie prefix - * @return void - */ -function delete_cookie($name = '', $domain = '', $path = '/', $prefix = '') -{ - set_cookie($name, '', '', $domain, $path, $prefix); -} - - +config->item('cookie_prefix') != '') + { + $CI->config->item('cookie_prefix'); + } + if ($domain == '' AND $CI->config->item('cookie_domain') != '') + { + $CI->config->item('cookie_domain'); + } + if ($prefix == '/' AND $CI->config->item('cookie_path') != '/') + { + $CI->config->item('cookie_path'); + } + + if ( ! is_numeric($expire)) + { + $expire = time() - 86500; + } + else + { + if ($expire > 0) + { + $expire = time() + $expire; + } + else + { + $expire = 0; + } + } + + setcookie($prefix.$name, $value, $expire, $path, $domain, 0); +} + +// -------------------------------------------------------------------- + +/** + * Fetch an item from the COOKIE array + * + * @access public + * @param string + * @param bool + * @return mixed + */ +function get_cookie($index = '', $xss_clean = FALSE) +{ + $CI =& get_instance(); + return $CI->input->cookie($index, $xss_clean); +} + +// -------------------------------------------------------------------- + +/** + * Delete a COOKIE + * + * @param mixed + * @param string the cookie domain. Usually: .yourdomain.com + * @param string the cookie path + * @param string the cookie prefix + * @return void + */ +function delete_cookie($name = '', $domain = '', $path = '/', $prefix = '') +{ + set_cookie($name, '', '', $domain, $path, $prefix); +} + + ?> \ No newline at end of file diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index 504a962c..c67e3da2 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -1,12 +1,12 @@ \ No newline at end of file diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index 34cc152c..c9d81f69 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -1,12 +1,12 @@ 0) - { - $data =& fread($fp, filesize($file)); - } - - flock($fp, LOCK_UN); - fclose($fp); - - return $data; -} - -// ------------------------------------------------------------------------ - -/** - * Write File - * - * Writes data to the file specified in the path. - * Creates a new file if non-existent. - * - * @access public - * @param string path to file - * @param string file data - * @return bool - */ -function write_file($path, $data, $mode = 'wb') -{ - if ( ! $fp = @fopen($path, $mode)) - { - return FALSE; - } - - flock($fp, LOCK_EX); - fwrite($fp, $data); - flock($fp, LOCK_UN); - fclose($fp); - - return TRUE; -} - -// ------------------------------------------------------------------------ - -/** - * Delete Files - * - * Deletes all files contained in the supplied directory path. - * Files must be writable or owned by the system in order to be deleted. - * If the second parameter is set to TRUE, any directories contained - * within the supplied base directory will be nuked as well. - * - * @access public - * @param string path to file - * @param bool whether to delete any directories found in the path - * @return bool - */ -function delete_files($path, $del_dir = FALSE, $level = 0) -{ - // Trim the trailing slash - $path = preg_replace("|^(.+?)/*$|", "\\1", $path); - - if ( ! $current_dir = @opendir($path)) - return; - - while(FALSE !== ($filename = @readdir($current_dir))) - { - if ($filename != "." and $filename != "..") - { - if (is_dir($path.'/'.$filename)) - { - $level++; - delete_files($path.'/'.$filename, $del_dir, $level); - } - else - { - unlink($path.'/'.$filename); - } - } - } - @closedir($current_dir); - - if ($del_dir == TRUE AND $level > 0) - { - @rmdir($path); - } -} - -// ------------------------------------------------------------------------ - -/** - * Get Filenames - * - * Reads the specified directory and builds an array containing the filenames. - * Any sub-folders contained within the specified path are read as well. - * - * @access public - * @param string path to source - * @param bool whether to include the path as part of the filename - * @return array - */ -function get_filenames($source_dir, $include_path = FALSE) -{ - static $_filedata = array(); - - if ($fp = @opendir($source_dir)) - { - while (FALSE !== ($file = readdir($fp))) - { - if (@is_dir($source_dir.$file) && substr($file, 0, 1) != '.') - { - get_filenames($source_dir.$file."/", $include_path); - } - elseif (substr($file, 0, 1) != ".") - { - - $_filedata[] = ($include_path == TRUE) ? $source_dir.$file : $file; - } - } - return $_filedata; - } -} - + 0) + { + $data =& fread($fp, filesize($file)); + } + + flock($fp, LOCK_UN); + fclose($fp); + + return $data; +} + +// ------------------------------------------------------------------------ + +/** + * Write File + * + * Writes data to the file specified in the path. + * Creates a new file if non-existent. + * + * @access public + * @param string path to file + * @param string file data + * @return bool + */ +function write_file($path, $data, $mode = 'wb') +{ + if ( ! $fp = @fopen($path, $mode)) + { + return FALSE; + } + + flock($fp, LOCK_EX); + fwrite($fp, $data); + flock($fp, LOCK_UN); + fclose($fp); + + return TRUE; +} + +// ------------------------------------------------------------------------ + +/** + * Delete Files + * + * Deletes all files contained in the supplied directory path. + * Files must be writable or owned by the system in order to be deleted. + * If the second parameter is set to TRUE, any directories contained + * within the supplied base directory will be nuked as well. + * + * @access public + * @param string path to file + * @param bool whether to delete any directories found in the path + * @return bool + */ +function delete_files($path, $del_dir = FALSE, $level = 0) +{ + // Trim the trailing slash + $path = preg_replace("|^(.+?)/*$|", "\\1", $path); + + if ( ! $current_dir = @opendir($path)) + return; + + while(FALSE !== ($filename = @readdir($current_dir))) + { + if ($filename != "." and $filename != "..") + { + if (is_dir($path.'/'.$filename)) + { + $level++; + delete_files($path.'/'.$filename, $del_dir, $level); + } + else + { + unlink($path.'/'.$filename); + } + } + } + @closedir($current_dir); + + if ($del_dir == TRUE AND $level > 0) + { + @rmdir($path); + } +} + +// ------------------------------------------------------------------------ + +/** + * Get Filenames + * + * Reads the specified directory and builds an array containing the filenames. + * Any sub-folders contained within the specified path are read as well. + * + * @access public + * @param string path to source + * @param bool whether to include the path as part of the filename + * @return array + */ +function get_filenames($source_dir, $include_path = FALSE) +{ + static $_filedata = array(); + + if ($fp = @opendir($source_dir)) + { + while (FALSE !== ($file = readdir($fp))) + { + if (@is_dir($source_dir.$file) && substr($file, 0, 1) != '.') + { + get_filenames($source_dir.$file."/", $include_path); + } + elseif (substr($file, 0, 1) != ".") + { + + $_filedata[] = ($include_path == TRUE) ? $source_dir.$file : $file; + } + } + return $_filedata; + } +} + ?> \ No newline at end of file diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index a166198f..adbddd5a 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -1,12 +1,12 @@ ".$data.""; -} - -// ------------------------------------------------------------------------ - -/** - * Unordered List - * - * Generates an HTML unordered list from an single or multi-dimensional array. - * - * @access public - * @param array - * @param mixed - * @return string - */ -function ul($list, $attributes = '') -{ - return _list('ul', $list, $attributes); -} - -// ------------------------------------------------------------------------ - -/** - * Ordered List - * - * Generates an HTML ordered list from an single or multi-dimensional array. - * - * @access public - * @param array - * @param mixed - * @return string - */ -function ol($list, $attributes = '') -{ - return _list('ol', $list, $attributes); -} - -// ------------------------------------------------------------------------ - -/** - * Generates the list - * - * Generates an HTML ordered list from an single or multi-dimensional array. - * - * @access private - * @param string - * @param mixed - * @param mixed - * @param intiger - * @return string - */ -function _list($type = 'ul', $list, $attributes = '', $depth = 0) -{ - // If an array wasn't submitted there's nothing to do... - if ( ! is_array($list)) - { - return $list; - } - - // Set the indentation based on the depth - $out = str_repeat(" ", $depth); - - // Were any attributes submitted? If so generate a string - if (is_array($attributes)) - { - $atts = ''; - foreach ($attributes as $key => $val) - { - $atts .= ' ' . $key . '="' . $val . '"'; - } - $attributes = $atts; - } - - // Write the opening list tag - $out .= "<".$type.$attributes.">\n"; - - // Cycle through the list elements. If an array is - // encountered we will recursively call _list() - - static $_last_list_item = ''; - foreach ($list as $key => $val) - { - $_last_list_item = $key; - - $out .= str_repeat(" ", $depth + 2); - $out .= "
              • "; - - if ( ! is_array($val)) - { - $out .= $val; - } - else - { - $out .= $_last_list_item."\n"; - $out .= _list($type, $val, '', $depth + 4); - $out .= str_repeat(" ", $depth + 2); - } - - $out .= "
                • \n"; - } - - // Set the indentation for the closing tag - $out .= str_repeat(" ", $depth); - - // Write the closing list tag - $out .= "\n"; - - return $out; -} - -// ------------------------------------------------------------------------ - -/** - * Generates HTML BR tags based on number supplied - * - * @access public - * @param integer - * @return string - */ -function br($num = 1) -{ - return str_repeat("
                ", $num); -} - -// ------------------------------------------------------------------------ - -/** - * Generates non-breaking space entities based on number supplied - * - * @access public - * @param integer - * @return string - */ -function nbs($num = 1) -{ - return str_repeat(" ", $num); -} - -// ------------------------------------------------------------------------ - -/** - * Generates meta tags from an array of key/values - * - * @access public - * @param array - * @return string - */ -function meta($meta = array(), $newline = "\n") -{ - $str = ''; - foreach ($meta as $key => $val) - { - $str .= ''.$newline; - } - - return $str; -} - - - - +".$data.""; +} + +// ------------------------------------------------------------------------ + +/** + * Unordered List + * + * Generates an HTML unordered list from an single or multi-dimensional array. + * + * @access public + * @param array + * @param mixed + * @return string + */ +function ul($list, $attributes = '') +{ + return _list('ul', $list, $attributes); +} + +// ------------------------------------------------------------------------ + +/** + * Ordered List + * + * Generates an HTML ordered list from an single or multi-dimensional array. + * + * @access public + * @param array + * @param mixed + * @return string + */ +function ol($list, $attributes = '') +{ + return _list('ol', $list, $attributes); +} + +// ------------------------------------------------------------------------ + +/** + * Generates the list + * + * Generates an HTML ordered list from an single or multi-dimensional array. + * + * @access private + * @param string + * @param mixed + * @param mixed + * @param intiger + * @return string + */ +function _list($type = 'ul', $list, $attributes = '', $depth = 0) +{ + // If an array wasn't submitted there's nothing to do... + if ( ! is_array($list)) + { + return $list; + } + + // Set the indentation based on the depth + $out = str_repeat(" ", $depth); + + // Were any attributes submitted? If so generate a string + if (is_array($attributes)) + { + $atts = ''; + foreach ($attributes as $key => $val) + { + $atts .= ' ' . $key . '="' . $val . '"'; + } + $attributes = $atts; + } + + // Write the opening list tag + $out .= "<".$type.$attributes.">\n"; + + // Cycle through the list elements. If an array is + // encountered we will recursively call _list() + + static $_last_list_item = ''; + foreach ($list as $key => $val) + { + $_last_list_item = $key; + + $out .= str_repeat(" ", $depth + 2); + $out .= "
              • "; + + if ( ! is_array($val)) + { + $out .= $val; + } + else + { + $out .= $_last_list_item."\n"; + $out .= _list($type, $val, '', $depth + 4); + $out .= str_repeat(" ", $depth + 2); + } + + $out .= "
                • \n"; + } + + // Set the indentation for the closing tag + $out .= str_repeat(" ", $depth); + + // Write the closing list tag + $out .= "\n"; + + return $out; +} + +// ------------------------------------------------------------------------ + +/** + * Generates HTML BR tags based on number supplied + * + * @access public + * @param integer + * @return string + */ +function br($num = 1) +{ + return str_repeat("
                ", $num); +} + +// ------------------------------------------------------------------------ + +/** + * Generates non-breaking space entities based on number supplied + * + * @access public + * @param integer + * @return string + */ +function nbs($num = 1) +{ + return str_repeat(" ", $num); +} + +// ------------------------------------------------------------------------ + +/** + * Generates meta tags from an array of key/values + * + * @access public + * @param array + * @return string + */ +function meta($meta = array(), $newline = "\n") +{ + $str = ''; + foreach ($meta as $key => $val) + { + $str .= ''.$newline; + } + + return $str; +} + + + + ?> \ No newline at end of file diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php index 666ec40b..fbe851f3 100644 --- a/system/helpers/inflector_helper.php +++ b/system/helpers/inflector_helper.php @@ -1,140 +1,140 @@ - \ No newline at end of file diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php index 06228468..eec04015 100644 --- a/system/helpers/security_helper.php +++ b/system/helpers/security_helper.php @@ -1,112 +1,112 @@ -input->xss_clean($str, $charset); -} - -// -------------------------------------------------------------------- - -/** - * Hash encode a string - * - * @access public - * @param string - * @return string - */ -function dohash($str, $type = 'sha1') -{ - if ($type == 'sha1') - { - if ( ! function_exists('sha1')) - { - if ( ! function_exists('mhash')) - { - require_once(BASEPATH.'libraries/Sha1'.EXT); - $SH = new CI_SHA; - return $SH->generate($str); - } - else - { - return bin2hex(mhash(MHASH_SHA1, $str)); - } - } - else - { - return sha1($str); - } - } - else - { - return md5($str); - } -} - -// ------------------------------------------------------------------------ - -/** - * Strip Image Tags - * - * @access public - * @param string - * @return string - */ -function strip_image_tags($str) -{ - $str = preg_replace("##", "\\1", $str); - $str = preg_replace("##", "\\1", $str); - - return $str; -} - -// ------------------------------------------------------------------------ - -/** - * Convert PHP tags to entities - * - * @access public - * @param string - * @return string - */ -function encode_php_tags($str) -{ - return str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); -} - +input->xss_clean($str, $charset); +} + +// -------------------------------------------------------------------- + +/** + * Hash encode a string + * + * @access public + * @param string + * @return string + */ +function dohash($str, $type = 'sha1') +{ + if ($type == 'sha1') + { + if ( ! function_exists('sha1')) + { + if ( ! function_exists('mhash')) + { + require_once(BASEPATH.'libraries/Sha1'.EXT); + $SH = new CI_SHA; + return $SH->generate($str); + } + else + { + return bin2hex(mhash(MHASH_SHA1, $str)); + } + } + else + { + return sha1($str); + } + } + else + { + return md5($str); + } +} + +// ------------------------------------------------------------------------ + +/** + * Strip Image Tags + * + * @access public + * @param string + * @return string + */ +function strip_image_tags($str) +{ + $str = preg_replace("##", "\\1", $str); + $str = preg_replace("##", "\\1", $str); + + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Convert PHP tags to entities + * + * @access public + * @param string + * @return string + */ +function encode_php_tags($str) +{ + return str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); +} + ?> \ No newline at end of file diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index a0733724..9f16d313 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -1,165 +1,165 @@ - - function insert_smiley(smiley) - { - document.{$form_name}.{$form_field}.value += " " + smiley; - } - -EOF; -} - -// ------------------------------------------------------------------------ - -/** - * Get Clickable Smileys - * - * Returns an array of image tag links that can be clicked to be inserted - * into a form field. - * - * @access public - * @param string the URL to the folder containing the smiley images - * @return array - */ -function get_clickable_smileys($image_url = '', $smileys = NULL) -{ - if ( ! is_array($smileys)) - { - if (FALSE === ($smileys = _get_smiley_array())) - { - return $str; - } - } - - // Add a trailing slash to the file path if needed - $image_url = preg_replace("/(.+?)\/*$/", "\\1/", $image_url); - - $used = array(); - foreach ($smileys as $key => $val) - { - // Keep duplicates from being used, which can happen if the - // mapping array contains multiple identical replacements. For example: - // :-) and :) might be replaced with the same image so both smileys - // will be in the array. - if (isset($used[$smileys[$key][0]])) - { - continue; - } - - $link[] = "\"".$smileys[$key][3]."\""; - - $used[$smileys[$key][0]] = TRUE; - } - - return $link; -} - -// ------------------------------------------------------------------------ - -/** - * Parse Smileys - * - * Takes a string as input and swaps any contained smileys for the actual image - * - * @access public - * @param string the text to be parsed - * @param string the URL to the folder containing the smiley images - * @return string - */ -function parse_smileys($str = '', $image_url = '', $smileys = NULL) -{ - if ($image_url == '') - { - return $str; - } - - if ( ! is_array($smileys)) - { - if (FALSE === ($smileys = _get_smiley_array())) - { - return $str; - } - } - - // Add a trailing slash to the file path if needed - $image_url = preg_replace("/(.+?)\/*$/", "\\1/", $image_url); - - foreach ($smileys as $key => $val) - { - $str = str_replace($key, "\"".$smileys[$key][3]."\"", $str); - } - - return $str; -} - -// ------------------------------------------------------------------------ - -/** - * Get Smiley Array - * - * Fetches the config/smiley.php file - * - * @access private - * @return mixed - */ -function _get_smiley_array() -{ - if ( ! file_exists(APPPATH.'config/smileys'.EXT)) - { - return FALSE; - } - - include(APPPATH.'config/smileys'.EXT); - - if ( ! isset($smileys) OR ! is_array($smileys)) - { - return FALSE; - } - - return $smileys; -} - - - - + + function insert_smiley(smiley) + { + document.{$form_name}.{$form_field}.value += " " + smiley; + } + +EOF; +} + +// ------------------------------------------------------------------------ + +/** + * Get Clickable Smileys + * + * Returns an array of image tag links that can be clicked to be inserted + * into a form field. + * + * @access public + * @param string the URL to the folder containing the smiley images + * @return array + */ +function get_clickable_smileys($image_url = '', $smileys = NULL) +{ + if ( ! is_array($smileys)) + { + if (FALSE === ($smileys = _get_smiley_array())) + { + return $str; + } + } + + // Add a trailing slash to the file path if needed + $image_url = preg_replace("/(.+?)\/*$/", "\\1/", $image_url); + + $used = array(); + foreach ($smileys as $key => $val) + { + // Keep duplicates from being used, which can happen if the + // mapping array contains multiple identical replacements. For example: + // :-) and :) might be replaced with the same image so both smileys + // will be in the array. + if (isset($used[$smileys[$key][0]])) + { + continue; + } + + $link[] = "\"".$smileys[$key][3]."\""; + + $used[$smileys[$key][0]] = TRUE; + } + + return $link; +} + +// ------------------------------------------------------------------------ + +/** + * Parse Smileys + * + * Takes a string as input and swaps any contained smileys for the actual image + * + * @access public + * @param string the text to be parsed + * @param string the URL to the folder containing the smiley images + * @return string + */ +function parse_smileys($str = '', $image_url = '', $smileys = NULL) +{ + if ($image_url == '') + { + return $str; + } + + if ( ! is_array($smileys)) + { + if (FALSE === ($smileys = _get_smiley_array())) + { + return $str; + } + } + + // Add a trailing slash to the file path if needed + $image_url = preg_replace("/(.+?)\/*$/", "\\1/", $image_url); + + foreach ($smileys as $key => $val) + { + $str = str_replace($key, "\"".$smileys[$key][3]."\"", $str); + } + + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Get Smiley Array + * + * Fetches the config/smiley.php file + * + * @access private + * @return mixed + */ +function _get_smiley_array() +{ + if ( ! file_exists(APPPATH.'config/smileys'.EXT)) + { + return FALSE; + } + + include(APPPATH.'config/smileys'.EXT); + + if ( ! isset($smileys) OR ! is_array($smileys)) + { + return FALSE; + } + + return $smileys; +} + + + + ?> \ No newline at end of file diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index c0a8854d..04c3a592 100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php @@ -1,12 +1,12 @@ = $n) - { - return trim($out).$end_char; - } - } -} - -// ------------------------------------------------------------------------ - -/** - * High ASCII to Entities - * - * Converts High ascii text and MS Word special characters to character entities - * - * @access public - * @param string - * @return string - */ -function ascii_to_entities($str) -{ - $count = 1; - $out = ''; - $temp = array(); - - for ($i = 0, $s = strlen($str); $i < $s; $i++) - { - $ordinal = ord($str[$i]); - - if ($ordinal < 128) - { - $out .= $str[$i]; - } - else - { - if (count($temp) == 0) - { - $count = ($ordinal < 224) ? 2 : 3; - } - - $temp[] = $ordinal; - - if (count($temp) == $count) - { - $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64); - - $out .= '&#'.$number.';'; - $count = 1; - $temp = array(); - } - } - } - - return $out; -} - -// ------------------------------------------------------------------------ - -/** - * Entities to ASCII - * - * Converts character entities back to ASCII - * - * @access public - * @param string - * @param bool - * @return string - */ -function entities_to_ascii($str, $all = TRUE) -{ - if (preg_match_all('/\&#(\d+)\;/', $str, $matches)) - { - for ($i = 0, $s = count($matches['0']); $i < $s; $i++) - { - $digits = $matches['1'][$i]; - - $out = ''; - - if ($digits < 128) - { - $out .= chr($digits); - - } - elseif ($digits < 2048) - { - $out .= chr(192 + (($digits - ($digits % 64)) / 64)); - $out .= chr(128 + ($digits % 64)); - } - else - { - $out .= chr(224 + (($digits - ($digits % 4096)) / 4096)); - $out .= chr(128 + ((($digits % 4096) - ($digits % 64)) / 64)); - $out .= chr(128 + ($digits % 64)); - } - - $str = str_replace($matches['0'][$i], $out, $str); - } - } - - if ($all) - { - $str = str_replace(array("&", "<", ">", """, "'", "-"), - array("&","<",">","\"", "'", "-"), - $str); - } - - return $str; -} - -// ------------------------------------------------------------------------ - -/** - * Word Censoring Function - * - * Supply a string and an array of disallowed words and any - * matched words will be converted to #### or to the replacement - * word you've submitted. - * - * @access public - * @param string the text string - * @param string the array of censoered words - * @param string the optional replacement value - * @return string - */ -function word_censor($str, $censored, $replacement = '') -{ - if ( ! is_array($censored)) - { - return $str; - } - - $str = ' '.$str.' '; - foreach ($censored as $badword) - { - if ($replacement != '') - { - $str = preg_replace("/\b(".str_replace('\*', '\w*?', preg_quote($badword)).")\b/i", $replacement, $str); - } - else - { - $str = preg_replace("/\b(".str_replace('\*', '\w*?', preg_quote($badword)).")\b/ie", "str_repeat('#', strlen('\\1'))", $str); - } - } - - return trim($str); -} - -// ------------------------------------------------------------------------ - -/** - * Code Highlighter - * - * Colorizes code strings - * - * @access public - * @param string the text string - * @return string - */ -function highlight_code($str) -{ - // The highlight string function encodes and highlights - // brackets so we need them to start raw - $str = str_replace(array('<', '>'), array('<', '>'), $str); - - // Replace any existing PHP tags to temporary markers so they don't accidentally - // break the string out of PHP, and thus, thwart the highlighting. - - $str = str_replace(array('<?php', '?>', '\\'), array('phptagopen', 'phptagclose', 'backslashtmp'), $str); - - // The highlight_string function requires that the text be surrounded - // by PHP tags. Since we don't know if A) the submitted text has PHP tags, - // or B) whether the PHP tags enclose the entire string, we will add our - // own PHP tags around the string along with some markers to make replacement easier later - - $str = ''; - - // All the magic happens here, baby! - $str = highlight_string($str, TRUE); - - // Prior to PHP 5, the highlight function used icky font tags - // so we'll replace them with span tags. - if (abs(phpversion()) < 5) - { - $str = str_replace(array(''), array(''), $str); - $str = preg_replace('#color="(.*?)"#', 'style="color: \\1"', $str); - } - - // Remove our artificially added PHP - $str = preg_replace("#\.+?//tempstart\
                \#is", "\n", $str); - $str = preg_replace("#\.+?//tempstart\
                #is", "\n", $str); - $str = preg_replace("#//tempend.+#is", "                \n", $str); - - // Replace our markers back to PHP tags. - $str = str_replace(array('phptagopen', 'phptagclose', 'backslashtmp'), array('<?php', '?>', '\\'), $str); //', $tag_close = '') -{ - if ($str == '') - { - return ''; - } - - if ($phrase != '') - { - return preg_replace('/('.preg_quote($phrase).')/i', $tag_open."\\1".$tag_close, $str); - } - - return $str; -} - -// ------------------------------------------------------------------------ - -/** - * Word Wrap - * - * Wraps text at the specified character. Maintains the integrity of words. - * Anything placed between {unwrap}{/unwrap} will not be word wrapped, nor - * will URLs. - * - * @access public - * @param string the text string - * @param integer the number of characters to wrap at - * @return string - */ -function word_wrap($str, $charlim = '76') -{ - // Se the character limit - if ( ! is_numeric($charlim)) - $charlim = 76; - - // Reduce multiple spaces - $str = preg_replace("| +|", " ", $str); - - // Standardize newlines - $str = preg_replace("/\r\n|\r/", "\n", $str); - - // If the current word is surrounded by {unwrap} tags we'll - // strip the entire chunk and replace it with a marker. - $unwrap = array(); - if (preg_match_all("|(\{unwrap\}.+?\{/unwrap\})|s", $str, $matches)) - { - for ($i = 0; $i < count($matches['0']); $i++) - { - $unwrap[] = $matches['1'][$i]; - $str = str_replace($matches['1'][$i], "{{unwrapped".$i."}}", $str); - } - } - - // Use PHP's native function to do the initial wordwrap. - // We set the cut flag to FALSE so that any individual words that are - // too long get left alone. In the next step we'll deal with them. - $str = wordwrap($str, $charlim, "\n", FALSE); - - // Split the string into individual lines of text and cycle through them - $output = ""; - foreach (explode("\n", $str) as $line) - { - // Is the line within the allowed character count? - // If so we'll join it to the output and continue - if (strlen($line) <= $charlim) - { - $output .= $line."\n"; - continue; - } - - $temp = ''; - while((strlen($line)) > $charlim) - { - // If the over-length word is a URL we won't wrap it - if (preg_match("!\[url.+\]|://|wwww.!", $line)) - { - break; - } - - // Trim the word down - $temp .= substr($line, 0, $charlim-1); - $line = substr($line, $charlim-1); - } - - // If $temp contains data it means we had to split up an over-length - // word into smaller chunks so we'll add it back to our current line - if ($temp != '') - { - $output .= $temp.$this->newline.$line; - } - else - { - $output .= $line; - } - - $output .= "\n"; - } - - // Put our markers back - if (count($unwrap) > 0) - { - foreach ($unwrap as $key => $val) - { - $output = str_replace("{{unwrapped".$key."}}", $val, $output); - } - } - - // Remove the unwrap tags - $output = str_replace(array('{unwrap}', '{/unwrap}'), '', $output); - - return $output; -} - - += $n) + { + return trim($out).$end_char; + } + } +} + +// ------------------------------------------------------------------------ + +/** + * High ASCII to Entities + * + * Converts High ascii text and MS Word special characters to character entities + * + * @access public + * @param string + * @return string + */ +function ascii_to_entities($str) +{ + $count = 1; + $out = ''; + $temp = array(); + + for ($i = 0, $s = strlen($str); $i < $s; $i++) + { + $ordinal = ord($str[$i]); + + if ($ordinal < 128) + { + $out .= $str[$i]; + } + else + { + if (count($temp) == 0) + { + $count = ($ordinal < 224) ? 2 : 3; + } + + $temp[] = $ordinal; + + if (count($temp) == $count) + { + $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64); + + $out .= '&#'.$number.';'; + $count = 1; + $temp = array(); + } + } + } + + return $out; +} + +// ------------------------------------------------------------------------ + +/** + * Entities to ASCII + * + * Converts character entities back to ASCII + * + * @access public + * @param string + * @param bool + * @return string + */ +function entities_to_ascii($str, $all = TRUE) +{ + if (preg_match_all('/\&#(\d+)\;/', $str, $matches)) + { + for ($i = 0, $s = count($matches['0']); $i < $s; $i++) + { + $digits = $matches['1'][$i]; + + $out = ''; + + if ($digits < 128) + { + $out .= chr($digits); + + } + elseif ($digits < 2048) + { + $out .= chr(192 + (($digits - ($digits % 64)) / 64)); + $out .= chr(128 + ($digits % 64)); + } + else + { + $out .= chr(224 + (($digits - ($digits % 4096)) / 4096)); + $out .= chr(128 + ((($digits % 4096) - ($digits % 64)) / 64)); + $out .= chr(128 + ($digits % 64)); + } + + $str = str_replace($matches['0'][$i], $out, $str); + } + } + + if ($all) + { + $str = str_replace(array("&", "<", ">", """, "'", "-"), + array("&","<",">","\"", "'", "-"), + $str); + } + + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Word Censoring Function + * + * Supply a string and an array of disallowed words and any + * matched words will be converted to #### or to the replacement + * word you've submitted. + * + * @access public + * @param string the text string + * @param string the array of censoered words + * @param string the optional replacement value + * @return string + */ +function word_censor($str, $censored, $replacement = '') +{ + if ( ! is_array($censored)) + { + return $str; + } + + $str = ' '.$str.' '; + foreach ($censored as $badword) + { + if ($replacement != '') + { + $str = preg_replace("/\b(".str_replace('\*', '\w*?', preg_quote($badword)).")\b/i", $replacement, $str); + } + else + { + $str = preg_replace("/\b(".str_replace('\*', '\w*?', preg_quote($badword)).")\b/ie", "str_repeat('#', strlen('\\1'))", $str); + } + } + + return trim($str); +} + +// ------------------------------------------------------------------------ + +/** + * Code Highlighter + * + * Colorizes code strings + * + * @access public + * @param string the text string + * @return string + */ +function highlight_code($str) +{ + // The highlight string function encodes and highlights + // brackets so we need them to start raw + $str = str_replace(array('<', '>'), array('<', '>'), $str); + + // Replace any existing PHP tags to temporary markers so they don't accidentally + // break the string out of PHP, and thus, thwart the highlighting. + + $str = str_replace(array('<?php', '?>', '\\'), array('phptagopen', 'phptagclose', 'backslashtmp'), $str); + + // The highlight_string function requires that the text be surrounded + // by PHP tags. Since we don't know if A) the submitted text has PHP tags, + // or B) whether the PHP tags enclose the entire string, we will add our + // own PHP tags around the string along with some markers to make replacement easier later + + $str = ''; + + // All the magic happens here, baby! + $str = highlight_string($str, TRUE); + + // Prior to PHP 5, the highlight function used icky font tags + // so we'll replace them with span tags. + if (abs(phpversion()) < 5) + { + $str = str_replace(array(''), array(''), $str); + $str = preg_replace('#color="(.*?)"#', 'style="color: \\1"', $str); + } + + // Remove our artificially added PHP + $str = preg_replace("#\.+?//tempstart\
                \#is", "\n", $str); + $str = preg_replace("#\.+?//tempstart\
                #is", "\n", $str); + $str = preg_replace("#//tempend.+#is", "                \n", $str); + + // Replace our markers back to PHP tags. + $str = str_replace(array('phptagopen', 'phptagclose', 'backslashtmp'), array('<?php', '?>', '\\'), $str); //', $tag_close = '') +{ + if ($str == '') + { + return ''; + } + + if ($phrase != '') + { + return preg_replace('/('.preg_quote($phrase).')/i', $tag_open."\\1".$tag_close, $str); + } + + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Word Wrap + * + * Wraps text at the specified character. Maintains the integrity of words. + * Anything placed between {unwrap}{/unwrap} will not be word wrapped, nor + * will URLs. + * + * @access public + * @param string the text string + * @param integer the number of characters to wrap at + * @return string + */ +function word_wrap($str, $charlim = '76') +{ + // Se the character limit + if ( ! is_numeric($charlim)) + $charlim = 76; + + // Reduce multiple spaces + $str = preg_replace("| +|", " ", $str); + + // Standardize newlines + $str = preg_replace("/\r\n|\r/", "\n", $str); + + // If the current word is surrounded by {unwrap} tags we'll + // strip the entire chunk and replace it with a marker. + $unwrap = array(); + if (preg_match_all("|(\{unwrap\}.+?\{/unwrap\})|s", $str, $matches)) + { + for ($i = 0; $i < count($matches['0']); $i++) + { + $unwrap[] = $matches['1'][$i]; + $str = str_replace($matches['1'][$i], "{{unwrapped".$i."}}", $str); + } + } + + // Use PHP's native function to do the initial wordwrap. + // We set the cut flag to FALSE so that any individual words that are + // too long get left alone. In the next step we'll deal with them. + $str = wordwrap($str, $charlim, "\n", FALSE); + + // Split the string into individual lines of text and cycle through them + $output = ""; + foreach (explode("\n", $str) as $line) + { + // Is the line within the allowed character count? + // If so we'll join it to the output and continue + if (strlen($line) <= $charlim) + { + $output .= $line."\n"; + continue; + } + + $temp = ''; + while((strlen($line)) > $charlim) + { + // If the over-length word is a URL we won't wrap it + if (preg_match("!\[url.+\]|://|wwww.!", $line)) + { + break; + } + + // Trim the word down + $temp .= substr($line, 0, $charlim-1); + $line = substr($line, $charlim-1); + } + + // If $temp contains data it means we had to split up an over-length + // word into smaller chunks so we'll add it back to our current line + if ($temp != '') + { + $output .= $temp.$this->newline.$line; + } + else + { + $output .= $line; + } + + $output .= "\n"; + } + + // Put our markers back + if (count($unwrap) > 0) + { + foreach ($unwrap as $key => $val) + { + $output = str_replace("{{unwrapped".$key."}}", $val, $output); + } + } + + // Remove the unwrap tags + $output = str_replace(array('{unwrap}', '{/unwrap}'), '', $output); + + return $output; +} + + ?> \ No newline at end of file diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php index 1681fa37..131358c6 100644 --- a/system/helpers/typography_helper.php +++ b/system/helpers/typography_helper.php @@ -1,540 +1,540 @@ -",$str); - $ct = count($ex); - - $newstr = ""; - for ($i = 0; $i < $ct; $i++) - { - if (($i % 2) == 0) - { - $newstr .= nl2br($ex[$i]); - } - else - { - $newstr .= $ex[$i]; - } - - if ($ct - 1 != $i) - $newstr .= "pre>"; - } - - return $newstr; -} - -// ------------------------------------------------------------------------ - -/** - * Auto Typography Wrapper Function - * - * - * @access public - * @param string - * @return string - */ -function auto_typography($str) -{ - $TYPE = new Auto_typography(); - return $TYPE->convert($str); -} - -// ------------------------------------------------------------------------ - -/** - * Auto Typography Class - * - * - * @access private - * @category Helpers - * @author Rick Ellis - * @author Paul Burdick - * @link http://www.codeigniter.com/user_guide/helpers/ - */ -class Auto_typography { - - // Block level elements that should not be wrapped inside

                tags - var $block_elements = 'div|blockquote|pre|code|h\d|script|ol|un'; - - // Elements that should not have

                and
                tags within them. - var $skip_elements = 'pre|ol|ul'; - - // Tags we want the parser to completely ignore when splitting the string. - var $ignore_elements = 'a|b|i|em|strong|span|img|li'; - - - /** - * Main Processing Function - * - */ - function convert($str) - { - if ($str == '') - { - return ''; - } - - $str = ' '.$str.' '; - - // Standardize Newlines to make matching easier - $str = preg_replace("/(\r\n|\r)/", "\n", $str); - - /* - * Reduce line breaks - * - * If there are more than two consecutive line - * breaks we'll compress them down to a maximum - * of two since there's no benefit to more. - * - */ - $str = preg_replace("/\n\n+/", "\n\n", $str); - - /* - * Convert quotes within tags to temporary marker - * - * We don't want quotes converted within - * tags so we'll temporarily convert them to - * {@DQ} and {@SQ} - * - */ - if (preg_match_all("#\<.+?>#si", $str, $matches)) - { - for ($i = 0; $i < count($matches['0']); $i++) - { - $str = str_replace($matches['0'][$i], - str_replace(array("'",'"'), array('{@SQ}', '{@DQ}'), $matches['0'][$i]), - $str); - } - } - - - /* - * Add closing/opening paragraph tags before/after "block" elements - * - * Since block elements (like , 

                , etc.) do not get
-		 * wrapped in paragraph tags we will add a closing 
                 tag just before
-		 * each block element starts and an opening 
                 tag right after the block element
-		 * ends.  Later on we'll do some further clean up.
-		 *
-		 */
-		$str = preg_replace("#(<.*?)(".$this->block_elements.")(.*?>)#", "
                \\1\\2\\3", $str);
-		$str = preg_replace("#(block_elements.")(.*?>)#", "\\1\\2\\3
                ", $str);
-	
-		/*
-		 * Convert "ignore" tags to temporary marker
-		 *
-		 * The parser splits out the string at every tag
-		 * it encounters.  Certain inline tags, like image
-		 * tags, links, span tags, etc. will be adversely
-		 * affected if they are split out so we'll convert
-		 * the opening < temporarily to: {@TAG}
-		 *
-		 */		
-		$str = preg_replace("#<(/*)(".$this->ignore_elements.")#i", "{@TAG}\\1\\2", $str);	
-		
-		/*
-		 * Split the string at every tag
-		 *
-		 * This creates an array with this prototype:
-		 *
-		 *	[array]
-		 *	{
-		 *		[0] = 
-		 *		[1] = Content contained between the tags
-		 *		[2] = 
-		 *		Etc...
-		 *	}
-		 *
-		 */			
-		$chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
-		
-		/*
-		 * Build our finalized string
-		 *
-		 * We'll cycle through the array, skipping tags,
-		 * and processing the contained text
-		 *
-		 */			
-		$str = '';
-		$process = TRUE;
-		foreach ($chunks as $chunk)
-		{
-			/*
-			 * Are we dealing with a tag?
-			 *
-			 * If so, we'll skip the processing for this cycle.
-			 * Well also set the "process" flag which allows us
-			 * to skip 
                 tags and a few other things.
-			 *
-			 */
-			if (preg_match("#<(/*)(".$this->block_elements.").*?\>#", $chunk, $match))
-			{
-				if (preg_match("#".$this->skip_elements."#", $match['2']))
-				{
-					$process =  ($match['1'] == '/') ? TRUE : FALSE;		
-				}
-		
-				$str .= $chunk;
-				continue;
-			}
-		
-			if ($process == FALSE)
-			{
-				$str .= $chunk;
-				continue;
-			}
-			
-			//  Convert Newlines into 
                 and 
                 tags
-			$str .= $this->format_newlines($chunk);
-		}
-
-		// FINAL CLEAN UP
-		// IMPORTANT:  DO NOT ALTER THE ORDER OF THE ITEMS BELOW!
-		
-		/*
-		 * Clean up paragraph tags before/after "block" elements
-		 *
-		 * Earlier we added 
                 tags before/after block level elements.
-		 * Then, we added paragraph tags around double line breaks.  This
-		 * potentially created incorrectly formatted paragraphs so we'll
-		 * clean it up here.
-		 *
-		 */
-		$str = preg_replace("#
                ({@TAG}.*?)(".$this->block_elements.")(.*?>)#", "\\1\\2\\3", $str);
-		$str = preg_replace("#({@TAG}/.*?)(".$this->block_elements.")(.*?>)
                #", "\\1\\2\\3", $str);
-
-		// Convert Quotes and other characters
-		$str = $this->format_characters($str);
-		
-		// Fix an artifact that happens during the paragraph replacement
-		$str = preg_replace('#(
                \n*
                )#', '', $str);
-
-		// If the user submitted their own paragraph tags with class data
-		// in them we will retain them instead of using our tags.
-		$str = preg_replace('#()
                #', "\\1", $str);
-
-		// Final clean up
-		$str = str_replace(
-							array(
-									'
                ',
-									'
                ',
-									'
                 ',
-									' 
                ',
-									'{@TAG}',
-									'{@DQ}',
-									'{@SQ}',
-									'
                '
-								),
-							array(
-									'
                ',
-									'
                ',
-									'
                ',
-									'
                ',
-									'<',
-									'"',
-									"'",
-									''
-								),
-							$str
-						);
-		
-		return $str;
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Format Characters
-	 *
-	 * This function mainly converts double and single quotes
-	 * to entities, but since these are directional, it does
-	 * it based on some rules.  It also converts em-dashes
-	 * and a couple other things.
-	 */
-	function format_characters($str)
-	{	
-		$table = array(
-						' "'		=> " “",
-						'" '		=> "” ",
-						" '"		=> " ‘",
-						"' "		=> "’ ",
-						
-						'>"'		=> ">“",
-						'"<'		=> "”<",
-						">'"		=> ">‘",
-						"'<"		=> "’<",
-
-						"\"."		=> "”.",
-						"\","		=> "”,",
-						"\";"		=> "”;",
-						"\":"		=> "”:",
-						"\"!"		=> "”!",
-						"\"?"		=> "”?",
-						
-						".  "		=> ".  ",
-						"?  "		=> "?  ",
-						"!  "		=> "!  ",
-						":  "		=> ":  ",
-					);
-
-		// These deal with quotes within quotes, like:  "'hi here'"
-		$start = 0;
-		$space = array("\n", "\t", " ");
-		
-		while(TRUE)
-		{
-			$current = strpos(substr($str, $start), "\"'");
-			
-			if ($current === FALSE) break;
-			
-			$one_before = substr($str, $start+$current-1, 1);
-			$one_after = substr($str, $start+$current+2, 1);
-			
-			if ( ! in_array($one_after, $space, TRUE) && $one_after != "<")
-			{
-				$str = str_replace(	$one_before."\"'".$one_after,
-									$one_before."“‘".$one_after,
-									$str);
-			}
-			elseif ( ! in_array($one_before, $space, TRUE) && (in_array($one_after, $space, TRUE) OR $one_after == '<'))
-			{
-				$str = str_replace(	$one_before."\"'".$one_after,
-									$one_before."”’".$one_after,
-									$str);
-			}
-			
-			$start = $start+$current+2;
-		}
-		
-		$start = 0;
-		
-		while(TRUE)
-		{
-			$current = strpos(substr($str, $start), "'\"");
-			
-			if ($current === FALSE) break;
-			
-			$one_before = substr($str, $start+$current-1, 1);
-			$one_after = substr($str, $start+$current+2, 1);
-			
-			if ( in_array($one_before, $space, TRUE) && ! in_array($one_after, $space, TRUE) && $one_after != "<")
-			{
-				$str = str_replace(	$one_before."'\"".$one_after,
-									$one_before."‘“".$one_after,
-									$str);
-			}
-			elseif ( ! in_array($one_before, $space, TRUE) && $one_before != ">")
-			{
-				$str = str_replace(	$one_before."'\"".$one_after,
-									$one_before."’”".$one_after,
-									$str);
-			}
-			
-			$start = $start+$current+2;
-		}
-		
-		// Are there quotes within a word, as in:  ("something")
-		if (preg_match_all("/(.)\"(\S+?)\"(.)/", $str, $matches))
-		{
-			for ($i=0, $s=sizeof($matches['0']); $i < $s; ++$i)
-			{
-				if ( ! in_array($matches['1'][$i], $space, TRUE) && ! in_array($matches['3'][$i], $space, TRUE))
-				{
-					$str = str_replace(	$matches['0'][$i],
-										$matches['1'][$i]."“".$matches['2'][$i]."”".$matches['3'][$i],
-										$str);
-				}
-			}
-		}
-		
-		if (preg_match_all("/(.)\'(\S+?)\'(.)/", $str, $matches))
-		{
-			for ($i=0, $s=sizeof($matches['0']); $i < $s; ++$i)
-			{
-				if ( ! in_array($matches['1'][$i], $space, TRUE) && ! in_array($matches['3'][$i], $space, TRUE))
-				{
-					$str = str_replace(	$matches['0'][$i],
-										$matches['1'][$i]."‘".$matches['2'][$i]."’".$matches['3'][$i],
-										$str);
-				}
-			}
-		}
-		
-		// How about one apostrophe, as in Rick's
-		$start = 0;
-		
-		while(TRUE)
-		{
-			$current = strpos(substr($str, $start), "'");
-			
-			if ($current === FALSE) break;
-			
-			$one_before = substr($str, $start+$current-1, 1);
-			$one_after = substr($str, $start+$current+1, 1);
-			
-			if ( ! in_array($one_before, $space, TRUE) && ! in_array($one_after, $space, TRUE))
-			{
-				$str = str_replace(	$one_before."'".$one_after,
-									$one_before."’".$one_after,
-									$str);
-			}
-			
-			$start = $start+$current+2;
-		}
-
-		// Em-dashes
-		$start = 0;
-		while(TRUE)
-		{
-			$current = strpos(substr($str, $start), "--");
-			
-			if ($current === FALSE) break;
-			
-			$one_before = substr($str, $start+$current-1, 1);
-			$one_after = substr($str, $start+$current+2, 1);
-			$two_before = substr($str, $start+$current-2, 1);
-			$two_after = substr($str, $start+$current+3, 1);
-			
-			if (( ! in_array($one_before, $space, TRUE) && ! in_array($one_after, $space, TRUE))
-				OR
-				( ! in_array($two_before, $space, TRUE) && ! in_array($two_after, $space, TRUE) && $one_before == ' ' && $one_after == ' ')
-				)
-			{
-				$str = str_replace(	$two_before.$one_before."--".$one_after.$two_after,
-									$two_before.trim($one_before)."—".trim($one_after).$two_after,
-									$str);
-			}
-			
-			$start = $start+$current+2;
-		}
-		
-		// Ellipsis
-		$str = preg_replace("#(\w)\.\.\.(\s|
                |
                )#", "\\1…\\2", $str);
-		$str = preg_replace("#(\s|
                |
                )\.\.\.(\w)#", "\\1…\\2", $str);
-		
-		// Run the translation array we defined above		
-		$str = str_replace(array_keys($table), array_values($table), $str);
-		
-		// If there are any stray double quotes we'll catch them here
-		
-		$start = 0;
-		
-		while(TRUE)
-		{
-			$current = strpos(substr($str, $start), '"');
-			
-			if ($current === FALSE) break;
-			
-			$one_before = substr($str, $start+$current-1, 1);
-			$one_after = substr($str, $start+$current+1, 1);
-			
-			if ( ! in_array($one_after, $space, TRUE))
-			{
-				$str = str_replace(	$one_before.'"'.$one_after,
-									$one_before."“".$one_after,
-									$str);
-			}
-			elseif( ! in_array($one_before, $space, TRUE))
-			{
-				$str = str_replace(	$one_before."'".$one_after,
-									$one_before."”".$one_after,
-									$str);
-			}
-			
-			$start = $start+$current+2;
-		}
-		
-		$start = 0;
-		
-		while(TRUE)
-		{
-			$current = strpos(substr($str, $start), "'");
-			
-			if ($current === FALSE) break;
-			
-			$one_before = substr($str, $start+$current-1, 1);
-			$one_after = substr($str, $start+$current+1, 1);
-			
-			if ( ! in_array($one_after, $space, TRUE))
-			{
-				$str = str_replace(	$one_before."'".$one_after,
-									$one_before."‘".$one_after,
-									$str);
-			}
-			elseif( ! in_array($one_before, $space, TRUE))
-			{
-				$str = str_replace(	$one_before."'".$one_after,
-									$one_before."’".$one_after,
-									$str);
-			}
-			
-			$start = $start+$current+2;
-		}
-		
-		return $str;
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Format Newlines
-	 *
-	 * Converts newline characters into either 
                 tags or 
                
-	 *
-	 */	
-	function format_newlines($str)
-	{
-		if ($str == '')
-		{
-			return $str;
-		}
-
-		if (strpos($str, "\n") === FALSE)
-		{
-			return '
                '.$str.'
                ';
-		}
-			
-		$str = str_replace("\n\n", "
                \n\n
                ", $str);
-		$str = preg_replace("/([^\n])(\n)([^\n])/", "\\1
                \\2\\3", $str);
-		
-		return '
                '.$str.'
                ';
-	}	
-}
-
-
+",$str);
+	$ct = count($ex);
+	
+	$newstr = "";
+	for ($i = 0; $i < $ct; $i++)
+	{
+		if (($i % 2) == 0)
+		{
+			$newstr .= nl2br($ex[$i]);
+		}
+		else
+		{
+			$newstr .= $ex[$i];
+		}
+		
+		if ($ct - 1 != $i)
+			$newstr .= "pre>";
+	}
+	
+	return $newstr;
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Auto Typography Wrapper Function
+ *
+ *
+ * @access	public
+ * @param	string
+ * @return	string
+ */
+function auto_typography($str)
+{
+	$TYPE = new Auto_typography();
+	return $TYPE->convert($str);
+}
+	
+// ------------------------------------------------------------------------
+
+/**
+ * Auto Typography Class
+ *
+ *
+ * @access		private
+ * @category	Helpers
+ * @author		Rick Ellis
+ * @author		Paul Burdick
+ * @link		http://www.codeigniter.com/user_guide/helpers/
+ */
+class Auto_typography {
+
+	// Block level elements that should not be wrapped inside 
                 tags
+	var $block_elements = 'div|blockquote|pre|code|h\d|script|ol|un';
+	
+	// Elements that should not have 
                 and 
                 tags within them.
+	var $skip_elements	= 'pre|ol|ul';
+	
+	// Tags we want the parser to completely ignore when splitting the string.
+	var $ignore_elements = 'a|b|i|em|strong|span|img|li';	
+
+
+	/**
+	 * Main Processing Function
+	 *
+	 */
+	function convert($str)
+	{
+		if ($str == '')
+		{
+			return '';
+		}
+		
+		$str = ' '.$str.' ';
+		
+		// Standardize Newlines to make matching easier
+		$str = preg_replace("/(\r\n|\r)/", "\n", $str);
+		
+		/*
+		 * Reduce line breaks
+		 *
+		 * If there are more than two consecutive line
+		 * breaks we'll compress them down to a maximum
+		 * of two since there's no benefit to more.
+		 *
+		 */
+		$str = preg_replace("/\n\n+/", "\n\n", $str);
+
+		/*
+		 * Convert quotes within tags to temporary marker
+		 *
+		 * We don't want quotes converted within
+		 * tags so we'll temporarily convert them to
+		 * {@DQ} and {@SQ}
+		 *
+		 */			
+		if (preg_match_all("#\<.+?>#si", $str, $matches))
+		{
+			for ($i = 0; $i < count($matches['0']); $i++)
+			{
+				$str = str_replace($matches['0'][$i],
+									str_replace(array("'",'"'), array('{@SQ}', '{@DQ}'), $matches['0'][$i]),
+									$str);
+			}
+		}
+	
+
+		/*
+		 * Add closing/opening paragraph tags before/after "block" elements
+		 *
+		 * Since block elements (like , 
                , etc.) do not get
+		 * wrapped in paragraph tags we will add a closing 
                 tag just before
+		 * each block element starts and an opening 
                 tag right after the block element
+		 * ends.  Later on we'll do some further clean up.
+		 *
+		 */
+		$str = preg_replace("#(<.*?)(".$this->block_elements.")(.*?>)#", "
                \\1\\2\\3", $str);
+		$str = preg_replace("#(block_elements.")(.*?>)#", "\\1\\2\\3
                ", $str);
+	
+		/*
+		 * Convert "ignore" tags to temporary marker
+		 *
+		 * The parser splits out the string at every tag
+		 * it encounters.  Certain inline tags, like image
+		 * tags, links, span tags, etc. will be adversely
+		 * affected if they are split out so we'll convert
+		 * the opening < temporarily to: {@TAG}
+		 *
+		 */		
+		$str = preg_replace("#<(/*)(".$this->ignore_elements.")#i", "{@TAG}\\1\\2", $str);	
+		
+		/*
+		 * Split the string at every tag
+		 *
+		 * This creates an array with this prototype:
+		 *
+		 *	[array]
+		 *	{
+		 *		[0] = 
+		 *		[1] = Content contained between the tags
+		 *		[2] = 
+		 *		Etc...
+		 *	}
+		 *
+		 */			
+		$chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+		
+		/*
+		 * Build our finalized string
+		 *
+		 * We'll cycle through the array, skipping tags,
+		 * and processing the contained text
+		 *
+		 */			
+		$str = '';
+		$process = TRUE;
+		foreach ($chunks as $chunk)
+		{
+			/*
+			 * Are we dealing with a tag?
+			 *
+			 * If so, we'll skip the processing for this cycle.
+			 * Well also set the "process" flag which allows us
+			 * to skip 
                 tags and a few other things.
+			 *
+			 */
+			if (preg_match("#<(/*)(".$this->block_elements.").*?\>#", $chunk, $match))
+			{
+				if (preg_match("#".$this->skip_elements."#", $match['2']))
+				{
+					$process =  ($match['1'] == '/') ? TRUE : FALSE;		
+				}
+		
+				$str .= $chunk;
+				continue;
+			}
+		
+			if ($process == FALSE)
+			{
+				$str .= $chunk;
+				continue;
+			}
+			
+			//  Convert Newlines into 
                 and 
                 tags
+			$str .= $this->format_newlines($chunk);
+		}
+
+		// FINAL CLEAN UP
+		// IMPORTANT:  DO NOT ALTER THE ORDER OF THE ITEMS BELOW!
+		
+		/*
+		 * Clean up paragraph tags before/after "block" elements
+		 *
+		 * Earlier we added 
                 tags before/after block level elements.
+		 * Then, we added paragraph tags around double line breaks.  This
+		 * potentially created incorrectly formatted paragraphs so we'll
+		 * clean it up here.
+		 *
+		 */
+		$str = preg_replace("#
                ({@TAG}.*?)(".$this->block_elements.")(.*?>)#", "\\1\\2\\3", $str);
+		$str = preg_replace("#({@TAG}/.*?)(".$this->block_elements.")(.*?>)
                #", "\\1\\2\\3", $str);
+
+		// Convert Quotes and other characters
+		$str = $this->format_characters($str);
+		
+		// Fix an artifact that happens during the paragraph replacement
+		$str = preg_replace('#(
                \n*
                )#', '', $str);
+
+		// If the user submitted their own paragraph tags with class data
+		// in them we will retain them instead of using our tags.
+		$str = preg_replace('#()
                #', "\\1", $str);
+
+		// Final clean up
+		$str = str_replace(
+							array(
+									'
                ',
+									'
                ',
+									'
                 ',
+									' 
                ',
+									'{@TAG}',
+									'{@DQ}',
+									'{@SQ}',
+									'
                '
+								),
+							array(
+									'
                ',
+									'
                ',
+									'
                ',
+									'
                ',
+									'<',
+									'"',
+									"'",
+									''
+								),
+							$str
+						);
+		
+		return $str;
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Format Characters
+	 *
+	 * This function mainly converts double and single quotes
+	 * to entities, but since these are directional, it does
+	 * it based on some rules.  It also converts em-dashes
+	 * and a couple other things.
+	 */
+	function format_characters($str)
+	{	
+		$table = array(
+						' "'		=> " “",
+						'" '		=> "” ",
+						" '"		=> " ‘",
+						"' "		=> "’ ",
+						
+						'>"'		=> ">“",
+						'"<'		=> "”<",
+						">'"		=> ">‘",
+						"'<"		=> "’<",
+
+						"\"."		=> "”.",
+						"\","		=> "”,",
+						"\";"		=> "”;",
+						"\":"		=> "”:",
+						"\"!"		=> "”!",
+						"\"?"		=> "”?",
+						
+						".  "		=> ".  ",
+						"?  "		=> "?  ",
+						"!  "		=> "!  ",
+						":  "		=> ":  ",
+					);
+
+		// These deal with quotes within quotes, like:  "'hi here'"
+		$start = 0;
+		$space = array("\n", "\t", " ");
+		
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), "\"'");
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+2, 1);
+			
+			if ( ! in_array($one_after, $space, TRUE) && $one_after != "<")
+			{
+				$str = str_replace(	$one_before."\"'".$one_after,
+									$one_before."“‘".$one_after,
+									$str);
+			}
+			elseif ( ! in_array($one_before, $space, TRUE) && (in_array($one_after, $space, TRUE) OR $one_after == '<'))
+			{
+				$str = str_replace(	$one_before."\"'".$one_after,
+									$one_before."”’".$one_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+		
+		$start = 0;
+		
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), "'\"");
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+2, 1);
+			
+			if ( in_array($one_before, $space, TRUE) && ! in_array($one_after, $space, TRUE) && $one_after != "<")
+			{
+				$str = str_replace(	$one_before."'\"".$one_after,
+									$one_before."‘“".$one_after,
+									$str);
+			}
+			elseif ( ! in_array($one_before, $space, TRUE) && $one_before != ">")
+			{
+				$str = str_replace(	$one_before."'\"".$one_after,
+									$one_before."’”".$one_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+		
+		// Are there quotes within a word, as in:  ("something")
+		if (preg_match_all("/(.)\"(\S+?)\"(.)/", $str, $matches))
+		{
+			for ($i=0, $s=sizeof($matches['0']); $i < $s; ++$i)
+			{
+				if ( ! in_array($matches['1'][$i], $space, TRUE) && ! in_array($matches['3'][$i], $space, TRUE))
+				{
+					$str = str_replace(	$matches['0'][$i],
+										$matches['1'][$i]."“".$matches['2'][$i]."”".$matches['3'][$i],
+										$str);
+				}
+			}
+		}
+		
+		if (preg_match_all("/(.)\'(\S+?)\'(.)/", $str, $matches))
+		{
+			for ($i=0, $s=sizeof($matches['0']); $i < $s; ++$i)
+			{
+				if ( ! in_array($matches['1'][$i], $space, TRUE) && ! in_array($matches['3'][$i], $space, TRUE))
+				{
+					$str = str_replace(	$matches['0'][$i],
+										$matches['1'][$i]."‘".$matches['2'][$i]."’".$matches['3'][$i],
+										$str);
+				}
+			}
+		}
+		
+		// How about one apostrophe, as in Rick's
+		$start = 0;
+		
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), "'");
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+1, 1);
+			
+			if ( ! in_array($one_before, $space, TRUE) && ! in_array($one_after, $space, TRUE))
+			{
+				$str = str_replace(	$one_before."'".$one_after,
+									$one_before."’".$one_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+
+		// Em-dashes
+		$start = 0;
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), "--");
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+2, 1);
+			$two_before = substr($str, $start+$current-2, 1);
+			$two_after = substr($str, $start+$current+3, 1);
+			
+			if (( ! in_array($one_before, $space, TRUE) && ! in_array($one_after, $space, TRUE))
+				OR
+				( ! in_array($two_before, $space, TRUE) && ! in_array($two_after, $space, TRUE) && $one_before == ' ' && $one_after == ' ')
+				)
+			{
+				$str = str_replace(	$two_before.$one_before."--".$one_after.$two_after,
+									$two_before.trim($one_before)."—".trim($one_after).$two_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+		
+		// Ellipsis
+		$str = preg_replace("#(\w)\.\.\.(\s|
                |
                )#", "\\1…\\2", $str);
+		$str = preg_replace("#(\s|
                |
                )\.\.\.(\w)#", "\\1…\\2", $str);
+		
+		// Run the translation array we defined above		
+		$str = str_replace(array_keys($table), array_values($table), $str);
+		
+		// If there are any stray double quotes we'll catch them here
+		
+		$start = 0;
+		
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), '"');
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+1, 1);
+			
+			if ( ! in_array($one_after, $space, TRUE))
+			{
+				$str = str_replace(	$one_before.'"'.$one_after,
+									$one_before."“".$one_after,
+									$str);
+			}
+			elseif( ! in_array($one_before, $space, TRUE))
+			{
+				$str = str_replace(	$one_before."'".$one_after,
+									$one_before."”".$one_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+		
+		$start = 0;
+		
+		while(TRUE)
+		{
+			$current = strpos(substr($str, $start), "'");
+			
+			if ($current === FALSE) break;
+			
+			$one_before = substr($str, $start+$current-1, 1);
+			$one_after = substr($str, $start+$current+1, 1);
+			
+			if ( ! in_array($one_after, $space, TRUE))
+			{
+				$str = str_replace(	$one_before."'".$one_after,
+									$one_before."‘".$one_after,
+									$str);
+			}
+			elseif( ! in_array($one_before, $space, TRUE))
+			{
+				$str = str_replace(	$one_before."'".$one_after,
+									$one_before."’".$one_after,
+									$str);
+			}
+			
+			$start = $start+$current+2;
+		}
+		
+		return $str;
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Format Newlines
+	 *
+	 * Converts newline characters into either 
                 tags or 
                
+	 *
+	 */	
+	function format_newlines($str)
+	{
+		if ($str == '')
+		{
+			return $str;
+		}
+
+		if (strpos($str, "\n") === FALSE)
+		{
+			return '
                '.$str.'
                ';
+		}
+			
+		$str = str_replace("\n\n", "
                \n\n
                ", $str);
+		$str = preg_replace("/([^\n])(\n)([^\n])/", "\\1
                \\2\\3", $str);
+		
+		return '
                '.$str.'
                ';
+	}	
+}
+
+
 ?>
\ No newline at end of file
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index baac0e5d..c05bc208 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -1,12 +1,12 @@
 ","\"", "'", "-"),
-					   array("&", "<", ">", """, "'", "-"),
-					   $str);
-
-	// Decode the temp markers back to entities		
-	$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
-	$str = preg_replace("/$temp(\w+);/","&\\1;", $str);
-		
-	return $str;
-}
-
-
+","\"", "'", "-"),
+					   array("&", "<", ">", """, "'", "-"),
+					   $str);
+
+	// Decode the temp markers back to entities		
+	$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
+	$str = preg_replace("/$temp(\w+);/","&\\1;", $str);
+		
+	return $str;
+}
+
+
 ?>
\ No newline at end of file
diff --git a/system/libraries/Benchmark.php b/system/libraries/Benchmark.php
index 66e8a24c..cf980a81 100644
--- a/system/libraries/Benchmark.php
+++ b/system/libraries/Benchmark.php
@@ -1,111 +1,111 @@
-marker[$name] = microtime();
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Calculates the time difference between two marked points.
-	 *
-	 * If the first parameter is empty this function instead returns the
-	 * {elapsed_time} pseudo-variable. This permits the full system
-	 * execution time to be shown in a template. The output class will
-	 * swap the real value for this variable.
-	 *
-	 * @access	public
-	 * @param	string	a particular marked point
-	 * @param	string	a particular marked point
-	 * @param	integer	the number of decimal places
-	 * @return	mixed
-	 */
-	function elapsed_time($point1 = '', $point2 = '', $decimals = 4)
-	{
-		if ($point1 == '')
-		{
-			return '{elapsed_time}';
-		}
-		
-		if ( ! isset($this->marker[$point1]))
-		{
-			return '';
-		}
-		
-		if ( ! isset($this->marker[$point2]))
-		{
-			$this->marker[$point2] = microtime();
-		}
-			
-		list($sm, $ss) = explode(' ', $this->marker[$point1]);
-		list($em, $es) = explode(' ', $this->marker[$point2]);
-
-		return number_format(($em + $es) - ($sm + $ss), $decimals);
-	}
- 	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Memory Usage
-	 *
-	 * This function returns the {memory_usage} pseudo-variable.
-	 * This permits it to be put it anywhere in a template
-	 * without the memory being calculated until the end.
-	 * The output class will swap the real value for this variable.
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	function memory_usage()
-	{
-		return '{memory_usage}';
-	}
-
-}
-
-// END CI_Benchmark class
+marker[$name] = microtime();
+	}
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Calculates the time difference between two marked points.
+	 *
+	 * If the first parameter is empty this function instead returns the
+	 * {elapsed_time} pseudo-variable. This permits the full system
+	 * execution time to be shown in a template. The output class will
+	 * swap the real value for this variable.
+	 *
+	 * @access	public
+	 * @param	string	a particular marked point
+	 * @param	string	a particular marked point
+	 * @param	integer	the number of decimal places
+	 * @return	mixed
+	 */
+	function elapsed_time($point1 = '', $point2 = '', $decimals = 4)
+	{
+		if ($point1 == '')
+		{
+			return '{elapsed_time}';
+		}
+		
+		if ( ! isset($this->marker[$point1]))
+		{
+			return '';
+		}
+		
+		if ( ! isset($this->marker[$point2]))
+		{
+			$this->marker[$point2] = microtime();
+		}
+			
+		list($sm, $ss) = explode(' ', $this->marker[$point1]);
+		list($em, $es) = explode(' ', $this->marker[$point2]);
+
+		return number_format(($em + $es) - ($sm + $ss), $decimals);
+	}
+ 	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Memory Usage
+	 *
+	 * This function returns the {memory_usage} pseudo-variable.
+	 * This permits it to be put it anywhere in a template
+	 * without the memory being calculated until the end.
+	 * The output class will swap the real value for this variable.
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function memory_usage()
+	{
+		return '{memory_usage}';
+	}
+
+}
+
+// END CI_Benchmark class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index fdef5dd7..ef6a3f84 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -1,475 +1,475 @@
-CI =& get_instance();
-		
-		if ( ! in_array('calendar_lang'.EXT, $this->CI->lang->is_loaded, TRUE))
-		{
-			$this->CI->lang->load('calendar');
-		}
-
-		$this->local_time = time();
-		
-		if (count($config) > 0)
-		{
-			$this->initialize($config);
-		}
-		
-		log_message('debug', "Calendar Class Initialized");
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Initialize the user preferences
-	 *
-	 * Accepts an associative array as input, containing display preferences
-	 *
-	 * @access	public
-	 * @param	array	config preferences
-	 * @return	void
-	 */	
-	function initialize($config = array())
-	{
-		foreach ($config as $key => $val)
-		{
-			if (isset($this->$key))
-			{
-				$this->$key = $val;
-			}
-		}
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Generate the calendar
-	 *
-	 * @access	public
-	 * @param	integer	the year
-	 * @param	integer	the month
-	 * @param	array	the data to be shown in the calendar cells
-	 * @return	string
-	 */
-	function generate($year = '', $month = '', $data = array())
-	{
-		// Set and validate the supplied month/year
-		if ($year == '')
-			$year  = date("Y", $this->local_time);
-			
-		if ($month == '')
-			$month = date("m", $this->local_time);
-			
- 		if (strlen($year) == 1)
-			$year = '200'.$year;
-		
- 		if (strlen($year) == 2)
-			$year = '20'.$year;
-
- 		if (strlen($month) == 1)
-			$month = '0'.$month;
-		
-		$adjusted_date = $this->adjust_date($month, $year);
-		
-		$month	= $adjusted_date['month'];
-		$year	= $adjusted_date['year'];
-		
-		// Determine the total days in the month
-		$total_days = $this->get_total_days($month, $year);
-						
-		// Set the starting day of the week
-		$start_days	= array('sunday' => 0, 'monday' => 1, 'tuesday' => 2, 'wednesday' => 3, 'thursday' => 4, 'friday' => 5, 'saturday' => 6);
-		$start_day = ( ! isset($start_days[$this->start_day])) ? 0 : $start_days[$this->start_day];
-		
-		// Set the starting day number
-		$local_date = mktime(12, 0, 0, $month, 1, $year);
-		$date = getdate($local_date);
-		$day  = $start_day + 1 - $date["wday"];
-		
-		while ($day > 1)
-		{
-			$day -= 7;
-		}
-		
-		// Set the current month/year/day
-		// We use this to determine the "today" date
-		$cur_year	= date("Y", $this->local_time);
-		$cur_month	= date("m", $this->local_time);
-		$cur_day	= date("j", $this->local_time);
-		
-		$is_current_month = ($cur_year == $year AND $cur_month == $month) ? TRUE : FALSE;
-	
-		// Generate the template data array
-		$this->parse_template();
-	
-		// Begin building the calendar output						
-		$out = $this->temp['table_open'];
-		$out .= "\n";	
-
-		$out .= "\n";		
-		$out .= $this->temp['heading_row_start'];
-		$out .= "\n";
-		
-		// "previous" month link
-		if ($this->show_next_prev == TRUE)
-		{
-			// Add a trailing slash to the  URL if needed
-			$this->next_prev_url = preg_replace("/(.+?)\/*$/", "\\1/",  $this->next_prev_url);
-		
-			$adjusted_date = $this->adjust_date($month - 1, $year);
-			$out .= str_replace('{previous_url}', $this->next_prev_url.$adjusted_date['year'].'/'.$adjusted_date['month'], $this->temp['heading_previous_cell']);
-			$out .= "\n";
-		}
-
-		// Heading containing the month/year
-		$colspan = ($this->show_next_prev == TRUE) ? 5 : 7;
-		
-		$this->temp['heading_title_cell'] = str_replace('{colspan}', $colspan, $this->temp['heading_title_cell']);
-		$this->temp['heading_title_cell'] = str_replace('{heading}', $this->get_month_name($month)." ".$year, $this->temp['heading_title_cell']);
-		
-		$out .= $this->temp['heading_title_cell'];
-		$out .= "\n";
-
-		// "next" month link
-		if ($this->show_next_prev == TRUE)
-		{		
-			$adjusted_date = $this->adjust_date($month + 1, $year);
-			$out .= str_replace('{next_url}', $this->next_prev_url.$adjusted_date['year'].'/'.$adjusted_date['month'], $this->temp['heading_next_cell']);
-		}
-
-		$out .= "\n";		
-		$out .= $this->temp['heading_row_end'];
-		$out .= "\n";
-
-		// Write the cells containing the days of the week
-		$out .= "\n";	
-		$out .= $this->temp['week_row_start'];
-		$out .= "\n";
-
-		$day_names = $this->get_day_names();
-
-		for ($i = 0; $i < 7; $i ++)
-		{
-			$out .= str_replace('{week_day}', $day_names[($start_day + $i) %7], $this->temp['week_day_cell']);
-		}
-
-		$out .= "\n";
-		$out .= $this->temp['week_row_end'];
-		$out .= "\n";
-
-		// Build the main body of the calendar
-		while ($day <= $total_days)
-		{
-			$out .= "\n";
-			$out .= $this->temp['cal_row_start'];
-			$out .= "\n";
-
-			for ($i = 0; $i < 7; $i++)
-			{
-				$out .= ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_start_today'] : $this->temp['cal_cell_start'];
-			
-				if ($day > 0 AND $day <= $total_days)
-				{ 					
-					if (isset($data[$day]))
-					{	
-						// Cells with content
-						$temp = ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_content_today'] : $this->temp['cal_cell_content'];
-						$out .= str_replace('{day}', $day, str_replace('{content}', $data[$day], $temp));
-					}
-					else
-					{
-						// Cells with no content
-						$temp = ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_no_content_today'] : $this->temp['cal_cell_no_content'];
-						$out .= str_replace('{day}', $day, $temp);
-					}
-				}
-				else
-				{
-					// Blank cells
-					$out .= $this->temp['cal_cell_blank'];
-				}
-				
-				$out .= ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_end_today'] : $this->temp['cal_cell_end'];					  	
-				$day++;
-			}
-			
-			$out .= "\n";		
-			$out .= $this->temp['cal_row_end'];
-			$out .= "\n";		
-		}
-
-		$out .= "\n";		
-		$out .= $this->temp['table_close'];
-
-		return $out;
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get Month Name
-	 *
-	 * Generates a textual month name based on the numeric
-	 * month provided.
-	 *
-	 * @access	public
-	 * @param	integer	the month
-	 * @return	string
-	 */
-	function get_month_name($month)
-	{
-		if ($this->month_type == 'short')
-		{
-			$month_names = array('01' => 'cal_jan', '02' => 'cal_feb', '03' => 'cal_mar', '04' => 'cal_apr', '05' => 'cal_may', '06' => 'cal_jun', '07' => 'cal_jul', '08' => 'cal_aug', '09' => 'cal_sep', '10' => 'cal_oct', '11' => 'cal_nov', '12' => 'cal_dec');
-		}
-		else
-		{
-			$month_names = array('01' => 'cal_january', '02' => 'cal_february', '03' => 'cal_march', '04' => 'cal_april', '05' => 'cal_mayl', '06' => 'cal_june', '07' => 'cal_july', '08' => 'cal_august', '09' => 'cal_september', '10' => 'cal_october', '11' => 'cal_november', '12' => 'cal_december');
-		}
-		
-		$month = $month_names[$month];
-		
-		if ($this->CI->lang->line($month) === FALSE)
-		{
-			return ucfirst(str_replace('cal_', '', $month));
-		}
-
-		return $this->CI->lang->line($month);
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get Day Names
-	 *
-	 * Returns an array of day names (Sunday, Monday, etc.) based
-	 * on the type.  Options: long, short, abrev
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	array
-	 */
-	function get_day_names($day_type = '')
-	{
-		if ($day_type != '')
-			$this->day_type = $day_type;
-	
-		if ($this->day_type == 'long')
-		{
-			$day_names = array('sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday');
-		}
-		elseif ($this->day_type == 'short')
-		{
-			$day_names = array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat');
-		}
-		else
-		{
-			$day_names = array('su', 'mo', 'tu', 'we', 'th', 'fr', 'sa');
-		}
-	
-		$days = array();
-		foreach ($day_names as $val)
-		{			
-			$days[] = ($this->CI->lang->line('cal_'.$val) === FALSE) ? ucfirst($val) : $this->CI->lang->line('cal_'.$val);
-		}
-	
-		return $days;
-	}
- 	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Adjust Date
-	 *
-	 * This function makes sure that we have a valid month/year.
-	 * For example, if you submit 13 as the month, the year will
-	 * increment and the month will become January.
-	 *
-	 * @access	public
-	 * @param	integer	the month
-	 * @param	integer	the year
-	 * @return	array
-	 */
-	function adjust_date($month, $year)
-	{
-		$date = array();
-
-		$date['month']	= $month;
-		$date['year']	= $year;
-
-		while ($date['month'] > 12)
-		{
-			$date['month'] -= 12;
-			$date['year']++;
-		}
-
-		while ($date['month'] <= 0)
-		{
-			$date['month'] += 12;
-			$date['year']--;
-		}
-
-		if (strlen($date['month']) == 1)
-		{
-			$date['month'] = '0'.$date['month'];
-		}
-
-		return $date;
-	}
- 	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Total days in a given month
-	 *
-	 * @access	public
-	 * @param	integer	the month
-	 * @param	integer	the year
-	 * @return	integer
-	 */
-	function get_total_days($month, $year)
-	{
-		$days_in_month	= array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-
-		if ($month < 1 OR $month > 12)
-		{
-			return 0;
-		}
-
-		// Is the year a leap year?
-		if ($month == 2)
-		{
-			if ($year % 400 == 0 OR ($year % 4 == 0 AND $year % 100 != 0))
-			{
-				return 29;
-			}
-		}
-
-		return $days_in_month[$month - 1];
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Default Template Data
-	 *
-	 * This is used in the event that the user has not created their own template
-	 *
-	 * @access	public
-	 * @return array
-	 */
-	function default_template()
-	{
-		return  array (
-						'table_open' 				=> '',
-						'heading_row_start' 		=> '',
-						'heading_previous_cell'		=> '',
-						'heading_title_cell' 		=> '',
-						'heading_next_cell' 		=> '',
-						'heading_row_end' 			=> '',
-						'week_row_start' 			=> '',
-						'week_day_cell' 			=> '',
-						'week_row_end' 				=> '',
-						'cal_row_start' 			=> '',
-						'cal_cell_start' 			=> '',
-						'cal_cell_end_today'		=> '',
-						'cal_row_end'				=> '',
-						'table_close'				=> '
                <<{heading}>>
                {week_day}
                ',
-						'cal_cell_start_today'		=> '',
-						'cal_cell_content'			=> '{day}',
-						'cal_cell_content_today'	=> '{day}',
-						'cal_cell_no_content'		=> '{day}',
-						'cal_cell_no_content_today'	=> '{day}',
-						'cal_cell_blank'			=> ' ',
-						'cal_cell_end'				=> '
                '
-					);	
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Parse Template
-	 *
-	 * Harvests the data within the template {pseudo-variables}
-	 * used to display the calendar
-	 *
-	 * @access	public
-	 * @return	void
-	 */
- 	function parse_template()
- 	{
-		$this->temp = $this->default_template();
- 	
- 		if ($this->template == '')
- 		{
- 			return;
- 		}
- 		
-		$today = array('cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today');
-		
-		foreach (array('table_open', 'table_close', 'heading_row_start', 'heading_previous_cell', 'heading_title_cell', 'heading_next_cell', 'heading_row_end', 'week_row_start', 'week_day_cell', 'week_row_end', 'cal_row_start', 'cal_cell_start', 'cal_cell_content', 'cal_cell_no_content',  'cal_cell_blank', 'cal_cell_end', 'cal_row_end', 'cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today') as $val)
-		{
-			if (preg_match("/\{".$val."\}(.*?)\{\/".$val."\}/si", $this->template, $match))
-			{
-				$this->temp[$val] = $match['1'];
-			}
-			else
-			{
-				if (in_array($val, $today, TRUE))
-				{
-					$this->temp[$val] = $this->temp[str_replace('_today', '', $val)];
-				}
-			}
-		} 	
- 	}
-
-}
-
-// END CI_Calendar class
+CI =& get_instance();
+		
+		if ( ! in_array('calendar_lang'.EXT, $this->CI->lang->is_loaded, TRUE))
+		{
+			$this->CI->lang->load('calendar');
+		}
+
+		$this->local_time = time();
+		
+		if (count($config) > 0)
+		{
+			$this->initialize($config);
+		}
+		
+		log_message('debug', "Calendar Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Initialize the user preferences
+	 *
+	 * Accepts an associative array as input, containing display preferences
+	 *
+	 * @access	public
+	 * @param	array	config preferences
+	 * @return	void
+	 */	
+	function initialize($config = array())
+	{
+		foreach ($config as $key => $val)
+		{
+			if (isset($this->$key))
+			{
+				$this->$key = $val;
+			}
+		}
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Generate the calendar
+	 *
+	 * @access	public
+	 * @param	integer	the year
+	 * @param	integer	the month
+	 * @param	array	the data to be shown in the calendar cells
+	 * @return	string
+	 */
+	function generate($year = '', $month = '', $data = array())
+	{
+		// Set and validate the supplied month/year
+		if ($year == '')
+			$year  = date("Y", $this->local_time);
+			
+		if ($month == '')
+			$month = date("m", $this->local_time);
+			
+ 		if (strlen($year) == 1)
+			$year = '200'.$year;
+		
+ 		if (strlen($year) == 2)
+			$year = '20'.$year;
+
+ 		if (strlen($month) == 1)
+			$month = '0'.$month;
+		
+		$adjusted_date = $this->adjust_date($month, $year);
+		
+		$month	= $adjusted_date['month'];
+		$year	= $adjusted_date['year'];
+		
+		// Determine the total days in the month
+		$total_days = $this->get_total_days($month, $year);
+						
+		// Set the starting day of the week
+		$start_days	= array('sunday' => 0, 'monday' => 1, 'tuesday' => 2, 'wednesday' => 3, 'thursday' => 4, 'friday' => 5, 'saturday' => 6);
+		$start_day = ( ! isset($start_days[$this->start_day])) ? 0 : $start_days[$this->start_day];
+		
+		// Set the starting day number
+		$local_date = mktime(12, 0, 0, $month, 1, $year);
+		$date = getdate($local_date);
+		$day  = $start_day + 1 - $date["wday"];
+		
+		while ($day > 1)
+		{
+			$day -= 7;
+		}
+		
+		// Set the current month/year/day
+		// We use this to determine the "today" date
+		$cur_year	= date("Y", $this->local_time);
+		$cur_month	= date("m", $this->local_time);
+		$cur_day	= date("j", $this->local_time);
+		
+		$is_current_month = ($cur_year == $year AND $cur_month == $month) ? TRUE : FALSE;
+	
+		// Generate the template data array
+		$this->parse_template();
+	
+		// Begin building the calendar output						
+		$out = $this->temp['table_open'];
+		$out .= "\n";	
+
+		$out .= "\n";		
+		$out .= $this->temp['heading_row_start'];
+		$out .= "\n";
+		
+		// "previous" month link
+		if ($this->show_next_prev == TRUE)
+		{
+			// Add a trailing slash to the  URL if needed
+			$this->next_prev_url = preg_replace("/(.+?)\/*$/", "\\1/",  $this->next_prev_url);
+		
+			$adjusted_date = $this->adjust_date($month - 1, $year);
+			$out .= str_replace('{previous_url}', $this->next_prev_url.$adjusted_date['year'].'/'.$adjusted_date['month'], $this->temp['heading_previous_cell']);
+			$out .= "\n";
+		}
+
+		// Heading containing the month/year
+		$colspan = ($this->show_next_prev == TRUE) ? 5 : 7;
+		
+		$this->temp['heading_title_cell'] = str_replace('{colspan}', $colspan, $this->temp['heading_title_cell']);
+		$this->temp['heading_title_cell'] = str_replace('{heading}', $this->get_month_name($month)." ".$year, $this->temp['heading_title_cell']);
+		
+		$out .= $this->temp['heading_title_cell'];
+		$out .= "\n";
+
+		// "next" month link
+		if ($this->show_next_prev == TRUE)
+		{		
+			$adjusted_date = $this->adjust_date($month + 1, $year);
+			$out .= str_replace('{next_url}', $this->next_prev_url.$adjusted_date['year'].'/'.$adjusted_date['month'], $this->temp['heading_next_cell']);
+		}
+
+		$out .= "\n";		
+		$out .= $this->temp['heading_row_end'];
+		$out .= "\n";
+
+		// Write the cells containing the days of the week
+		$out .= "\n";	
+		$out .= $this->temp['week_row_start'];
+		$out .= "\n";
+
+		$day_names = $this->get_day_names();
+
+		for ($i = 0; $i < 7; $i ++)
+		{
+			$out .= str_replace('{week_day}', $day_names[($start_day + $i) %7], $this->temp['week_day_cell']);
+		}
+
+		$out .= "\n";
+		$out .= $this->temp['week_row_end'];
+		$out .= "\n";
+
+		// Build the main body of the calendar
+		while ($day <= $total_days)
+		{
+			$out .= "\n";
+			$out .= $this->temp['cal_row_start'];
+			$out .= "\n";
+
+			for ($i = 0; $i < 7; $i++)
+			{
+				$out .= ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_start_today'] : $this->temp['cal_cell_start'];
+			
+				if ($day > 0 AND $day <= $total_days)
+				{ 					
+					if (isset($data[$day]))
+					{	
+						// Cells with content
+						$temp = ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_content_today'] : $this->temp['cal_cell_content'];
+						$out .= str_replace('{day}', $day, str_replace('{content}', $data[$day], $temp));
+					}
+					else
+					{
+						// Cells with no content
+						$temp = ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_no_content_today'] : $this->temp['cal_cell_no_content'];
+						$out .= str_replace('{day}', $day, $temp);
+					}
+				}
+				else
+				{
+					// Blank cells
+					$out .= $this->temp['cal_cell_blank'];
+				}
+				
+				$out .= ($is_current_month == TRUE AND $day == $cur_day) ? $this->temp['cal_cell_end_today'] : $this->temp['cal_cell_end'];					  	
+				$day++;
+			}
+			
+			$out .= "\n";		
+			$out .= $this->temp['cal_row_end'];
+			$out .= "\n";		
+		}
+
+		$out .= "\n";		
+		$out .= $this->temp['table_close'];
+
+		return $out;
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get Month Name
+	 *
+	 * Generates a textual month name based on the numeric
+	 * month provided.
+	 *
+	 * @access	public
+	 * @param	integer	the month
+	 * @return	string
+	 */
+	function get_month_name($month)
+	{
+		if ($this->month_type == 'short')
+		{
+			$month_names = array('01' => 'cal_jan', '02' => 'cal_feb', '03' => 'cal_mar', '04' => 'cal_apr', '05' => 'cal_may', '06' => 'cal_jun', '07' => 'cal_jul', '08' => 'cal_aug', '09' => 'cal_sep', '10' => 'cal_oct', '11' => 'cal_nov', '12' => 'cal_dec');
+		}
+		else
+		{
+			$month_names = array('01' => 'cal_january', '02' => 'cal_february', '03' => 'cal_march', '04' => 'cal_april', '05' => 'cal_mayl', '06' => 'cal_june', '07' => 'cal_july', '08' => 'cal_august', '09' => 'cal_september', '10' => 'cal_october', '11' => 'cal_november', '12' => 'cal_december');
+		}
+		
+		$month = $month_names[$month];
+		
+		if ($this->CI->lang->line($month) === FALSE)
+		{
+			return ucfirst(str_replace('cal_', '', $month));
+		}
+
+		return $this->CI->lang->line($month);
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get Day Names
+	 *
+	 * Returns an array of day names (Sunday, Monday, etc.) based
+	 * on the type.  Options: long, short, abrev
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	array
+	 */
+	function get_day_names($day_type = '')
+	{
+		if ($day_type != '')
+			$this->day_type = $day_type;
+	
+		if ($this->day_type == 'long')
+		{
+			$day_names = array('sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday');
+		}
+		elseif ($this->day_type == 'short')
+		{
+			$day_names = array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat');
+		}
+		else
+		{
+			$day_names = array('su', 'mo', 'tu', 'we', 'th', 'fr', 'sa');
+		}
+	
+		$days = array();
+		foreach ($day_names as $val)
+		{			
+			$days[] = ($this->CI->lang->line('cal_'.$val) === FALSE) ? ucfirst($val) : $this->CI->lang->line('cal_'.$val);
+		}
+	
+		return $days;
+	}
+ 	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Adjust Date
+	 *
+	 * This function makes sure that we have a valid month/year.
+	 * For example, if you submit 13 as the month, the year will
+	 * increment and the month will become January.
+	 *
+	 * @access	public
+	 * @param	integer	the month
+	 * @param	integer	the year
+	 * @return	array
+	 */
+	function adjust_date($month, $year)
+	{
+		$date = array();
+
+		$date['month']	= $month;
+		$date['year']	= $year;
+
+		while ($date['month'] > 12)
+		{
+			$date['month'] -= 12;
+			$date['year']++;
+		}
+
+		while ($date['month'] <= 0)
+		{
+			$date['month'] += 12;
+			$date['year']--;
+		}
+
+		if (strlen($date['month']) == 1)
+		{
+			$date['month'] = '0'.$date['month'];
+		}
+
+		return $date;
+	}
+ 	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Total days in a given month
+	 *
+	 * @access	public
+	 * @param	integer	the month
+	 * @param	integer	the year
+	 * @return	integer
+	 */
+	function get_total_days($month, $year)
+	{
+		$days_in_month	= array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+
+		if ($month < 1 OR $month > 12)
+		{
+			return 0;
+		}
+
+		// Is the year a leap year?
+		if ($month == 2)
+		{
+			if ($year % 400 == 0 OR ($year % 4 == 0 AND $year % 100 != 0))
+			{
+				return 29;
+			}
+		}
+
+		return $days_in_month[$month - 1];
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set Default Template Data
+	 *
+	 * This is used in the event that the user has not created their own template
+	 *
+	 * @access	public
+	 * @return array
+	 */
+	function default_template()
+	{
+		return  array (
+						'table_open' 				=> '',
+						'heading_row_start' 		=> '',
+						'heading_previous_cell'		=> '',
+						'heading_title_cell' 		=> '',
+						'heading_next_cell' 		=> '',
+						'heading_row_end' 			=> '',
+						'week_row_start' 			=> '',
+						'week_day_cell' 			=> '',
+						'week_row_end' 				=> '',
+						'cal_row_start' 			=> '',
+						'cal_cell_start' 			=> '',
+						'cal_cell_end_today'		=> '',
+						'cal_row_end'				=> '',
+						'table_close'				=> '
                <<{heading}>>
                {week_day}
                ',
+						'cal_cell_start_today'		=> '',
+						'cal_cell_content'			=> '{day}',
+						'cal_cell_content_today'	=> '{day}',
+						'cal_cell_no_content'		=> '{day}',
+						'cal_cell_no_content_today'	=> '{day}',
+						'cal_cell_blank'			=> ' ',
+						'cal_cell_end'				=> '
                '
+					);	
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Parse Template
+	 *
+	 * Harvests the data within the template {pseudo-variables}
+	 * used to display the calendar
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+ 	function parse_template()
+ 	{
+		$this->temp = $this->default_template();
+ 	
+ 		if ($this->template == '')
+ 		{
+ 			return;
+ 		}
+ 		
+		$today = array('cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today');
+		
+		foreach (array('table_open', 'table_close', 'heading_row_start', 'heading_previous_cell', 'heading_title_cell', 'heading_next_cell', 'heading_row_end', 'week_row_start', 'week_day_cell', 'week_row_end', 'cal_row_start', 'cal_cell_start', 'cal_cell_content', 'cal_cell_no_content',  'cal_cell_blank', 'cal_cell_end', 'cal_row_end', 'cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today') as $val)
+		{
+			if (preg_match("/\{".$val."\}(.*?)\{\/".$val."\}/si", $this->template, $match))
+			{
+				$this->temp[$val] = $match['1'];
+			}
+			else
+			{
+				if (in_array($val, $today, TRUE))
+				{
+					$this->temp[$val] = $this->temp[str_replace('_today', '', $val)];
+				}
+			}
+		} 	
+ 	}
+
+}
+
+// END CI_Calendar class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index 28409fbc..831ba925 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -1,245 +1,245 @@
-config =& get_config();
-		log_message('debug', "Config Class Initialized");
-	}  	
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Load Config File
-	 *
-	 * @access	public
-	 * @param	string	the config file name
-	 * @return	boolean	if the file was loaded correctly
-	 */	
-	function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
-	{
-		$file = ($file == '') ? 'config' : str_replace(EXT, '', $file);
-	
-		if (in_array($file, $this->is_loaded, TRUE))
-		{
-			return TRUE;
-		}
-
-		if ( ! file_exists(APPPATH.'config/'.$file.EXT))
-		{
-			if ($fail_gracefully === TRUE)
-			{
-				return FALSE;
-			}
-			show_error('The configuration file '.$file.EXT.' does not exist.');
-		}
-	
-		include(APPPATH.'config/'.$file.EXT);
-
-		if ( ! isset($config) OR ! is_array($config))
-		{
-			if ($fail_gracefully === TRUE)
-			{
-				return FALSE;
-			}		
-			show_error('Your '.$file.EXT.' file does not appear to contain a valid configuration array.');
-		}
-		
-		if ($use_sections === TRUE)
-		{
-			if (isset($this->config[$file]))
-			{
-				$this->config[$file] = array_merge($this->config[$file], $config);
-			}
-			else
-			{
-				$this->config[$file] = $config;
-			}
-		}
-		else
-		{
-			$this->config = array_merge($this->config, $config);
-		}
-
-		$this->is_loaded[] = $file;
-		unset($config);
-
-		log_message('debug', 'Config file loaded: config/'.$file.EXT);
-		return TRUE;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Fetch a config file item
-	 *
-	 *
-	 * @access	public
-	 * @param	string	the config item name
-	 * @param	string	the index name
-	 * @param	bool
-	 * @return	string
-	 */		
-	function item($item, $index = '')
-	{			
-		if ($index == '')
-		{	
-			if ( ! isset($this->config[$item]))
-			{
-				return FALSE;
-			}
-		
-			$pref = $this->config[$item];
-		}
-		else
-		{
-			if ( ! isset($this->config[$index]))
-			{
-				return FALSE;
-			}
-		
-			if ( ! isset($this->config[$index][$item]))
-			{
-				return FALSE;
-			}
-		
-			$pref = $this->config[$index][$item];
-		}
-
-		return $pref;
-	}
-  	
-  	// --------------------------------------------------------------------
-
-	/**
-	 * Fetch a config file item - adds slash after item
-	 *
-	 * The second parameter allows a slash to be added to the end of
-	 * the item, in the case of a path.
-	 *
-	 * @access	public
-	 * @param	string	the config item name
-	 * @param	bool
-	 * @return	string
-	 */		
-	function slash_item($item)
-	{
-		if ( ! isset($this->config[$item]))
-		{
-			return FALSE;
-		}
-		
-		$pref = $this->config[$item];
-		
-		if ($pref != '')
-		{			
-			if (ereg("/$", $pref) === FALSE)
-			{
-				$pref .= '/';
-			}
-		}
-
-		return $pref;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Site URL
-	 *
-	 * @access	public
-	 * @param	string	the URI string
-	 * @return	string
-	 */		
-	function site_url($uri = '')
-	{
-		if (is_array($uri))
-		{
-			$uri = implode('/', $uri);
-		}
-		
-		if ($uri == '')
-		{
-			return $this->slash_item('base_url').$this->item('index_page');
-		}
-		else
-		{
-			$suffix = ($this->item('url_suffix') == FALSE) ? '' : $this->item('url_suffix');		
-			return $this->slash_item('base_url').$this->slash_item('index_page').preg_replace("|^/*(.+?)/*$|", "\\1", $uri).$suffix;
-		}
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * System URL
-	 *
-	 * @access	public
-	 * @return	string
-	 */		
-	function system_url()
-	{
-		$x = explode("/", preg_replace("|/*(.+?)/*$|", "\\1", BASEPATH));
-		return $this->slash_item('base_url').end($x).'/';
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set a config file item
-	 *
-	 * @access	public
-	 * @param	string	the config item key
-	 * @param	string	the config item value
-	 * @return	void
-	 */		
-	function set_item($item, $value)
-	{
-		$this->config[$item] = $value;
-	}
-
-}
-
-// END CI_Config class
+config =& get_config();
+		log_message('debug', "Config Class Initialized");
+	}  	
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Load Config File
+	 *
+	 * @access	public
+	 * @param	string	the config file name
+	 * @return	boolean	if the file was loaded correctly
+	 */	
+	function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
+	{
+		$file = ($file == '') ? 'config' : str_replace(EXT, '', $file);
+	
+		if (in_array($file, $this->is_loaded, TRUE))
+		{
+			return TRUE;
+		}
+
+		if ( ! file_exists(APPPATH.'config/'.$file.EXT))
+		{
+			if ($fail_gracefully === TRUE)
+			{
+				return FALSE;
+			}
+			show_error('The configuration file '.$file.EXT.' does not exist.');
+		}
+	
+		include(APPPATH.'config/'.$file.EXT);
+
+		if ( ! isset($config) OR ! is_array($config))
+		{
+			if ($fail_gracefully === TRUE)
+			{
+				return FALSE;
+			}		
+			show_error('Your '.$file.EXT.' file does not appear to contain a valid configuration array.');
+		}
+		
+		if ($use_sections === TRUE)
+		{
+			if (isset($this->config[$file]))
+			{
+				$this->config[$file] = array_merge($this->config[$file], $config);
+			}
+			else
+			{
+				$this->config[$file] = $config;
+			}
+		}
+		else
+		{
+			$this->config = array_merge($this->config, $config);
+		}
+
+		$this->is_loaded[] = $file;
+		unset($config);
+
+		log_message('debug', 'Config file loaded: config/'.$file.EXT);
+		return TRUE;
+	}
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch a config file item
+	 *
+	 *
+	 * @access	public
+	 * @param	string	the config item name
+	 * @param	string	the index name
+	 * @param	bool
+	 * @return	string
+	 */		
+	function item($item, $index = '')
+	{			
+		if ($index == '')
+		{	
+			if ( ! isset($this->config[$item]))
+			{
+				return FALSE;
+			}
+		
+			$pref = $this->config[$item];
+		}
+		else
+		{
+			if ( ! isset($this->config[$index]))
+			{
+				return FALSE;
+			}
+		
+			if ( ! isset($this->config[$index][$item]))
+			{
+				return FALSE;
+			}
+		
+			$pref = $this->config[$index][$item];
+		}
+
+		return $pref;
+	}
+  	
+  	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch a config file item - adds slash after item
+	 *
+	 * The second parameter allows a slash to be added to the end of
+	 * the item, in the case of a path.
+	 *
+	 * @access	public
+	 * @param	string	the config item name
+	 * @param	bool
+	 * @return	string
+	 */		
+	function slash_item($item)
+	{
+		if ( ! isset($this->config[$item]))
+		{
+			return FALSE;
+		}
+		
+		$pref = $this->config[$item];
+		
+		if ($pref != '')
+		{			
+			if (ereg("/$", $pref) === FALSE)
+			{
+				$pref .= '/';
+			}
+		}
+
+		return $pref;
+	}
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Site URL
+	 *
+	 * @access	public
+	 * @param	string	the URI string
+	 * @return	string
+	 */		
+	function site_url($uri = '')
+	{
+		if (is_array($uri))
+		{
+			$uri = implode('/', $uri);
+		}
+		
+		if ($uri == '')
+		{
+			return $this->slash_item('base_url').$this->item('index_page');
+		}
+		else
+		{
+			$suffix = ($this->item('url_suffix') == FALSE) ? '' : $this->item('url_suffix');		
+			return $this->slash_item('base_url').$this->slash_item('index_page').preg_replace("|^/*(.+?)/*$|", "\\1", $uri).$suffix;
+		}
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * System URL
+	 *
+	 * @access	public
+	 * @return	string
+	 */		
+	function system_url()
+	{
+		$x = explode("/", preg_replace("|/*(.+?)/*$|", "\\1", BASEPATH));
+		return $this->slash_item('base_url').end($x).'/';
+	}
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set a config file item
+	 *
+	 * @access	public
+	 * @param	string	the config item key
+	 * @param	string	the config item value
+	 * @return	void
+	 */		
+	function set_item($item, $value)
+	{
+		$this->config[$item] = $value;
+	}
+
+}
+
+// END CI_Config class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index c8fa646c..81421cf3 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -1,115 +1,115 @@
-_ci_initialize();
-		log_message('debug', "Controller Class Initialized");
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Initialize
-	 *
-	 * Assigns all the bases classes loaded by the front controller to
-	 * variables in this class.  Also calls the autoload routine.
-	 *
-	 * @access	private
-	 * @return	void
-	 */
-	function _ci_initialize()
-	{
-		// Assign all the class objects that were instantiated by the
-		// front controller to local class variables so that CI can be
-		// run as one big super object.
-		$classes = array(
-							'config'	=> 'Config',
-							'input'		=> 'Input',
-							'benchmark'	=> 'Benchmark',
-							'uri'		=> 'URI',
-							'output'	=> 'Output',
-							'lang'		=> 'Language'
-							);
-		
-		foreach ($classes as $var => $class)
-		{
-			$this->$var =& load_class($class);
-		}
-
-		// In PHP 5 the Loader class is run as a discreet
-		// class.  In PHP 4 it extends the Controller
-		if (floor(phpversion()) >= 5)
-		{
-			$this->load =& load_class('Loader');
-			$this->load->_ci_autoloader();
-		}
-		else
-		{
-			$this->_ci_autoloader();
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Run Scaffolding
-	 *
-	 * @access	private
-	 * @return	void
-	 */	
-	function _ci_scaffolding()
-	{
-		if ($this->_ci_scaffolding === FALSE OR $this->_ci_scaff_table === FALSE)
-		{
-			show_404('Scaffolding unavailable');
-		}
-		
-		$method = ( ! in_array($this->uri->segment(3), array('add', 'insert', 'edit', 'update', 'view', 'delete', 'do_delete'), TRUE)) ? 'view' : $this->uri->segment(3);
-		
-		require_once(BASEPATH.'scaffolding/Scaffolding'.EXT);
-		$scaff = new Scaffolding($this->_ci_scaff_table);
-		$scaff->$method();
-	}
-
-
-}
-// END _Controller class
+_ci_initialize();
+		log_message('debug', "Controller Class Initialized");
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Initialize
+	 *
+	 * Assigns all the bases classes loaded by the front controller to
+	 * variables in this class.  Also calls the autoload routine.
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _ci_initialize()
+	{
+		// Assign all the class objects that were instantiated by the
+		// front controller to local class variables so that CI can be
+		// run as one big super object.
+		$classes = array(
+							'config'	=> 'Config',
+							'input'		=> 'Input',
+							'benchmark'	=> 'Benchmark',
+							'uri'		=> 'URI',
+							'output'	=> 'Output',
+							'lang'		=> 'Language'
+							);
+		
+		foreach ($classes as $var => $class)
+		{
+			$this->$var =& load_class($class);
+		}
+
+		// In PHP 5 the Loader class is run as a discreet
+		// class.  In PHP 4 it extends the Controller
+		if (floor(phpversion()) >= 5)
+		{
+			$this->load =& load_class('Loader');
+			$this->load->_ci_autoloader();
+		}
+		else
+		{
+			$this->_ci_autoloader();
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Run Scaffolding
+	 *
+	 * @access	private
+	 * @return	void
+	 */	
+	function _ci_scaffolding()
+	{
+		if ($this->_ci_scaffolding === FALSE OR $this->_ci_scaff_table === FALSE)
+		{
+			show_404('Scaffolding unavailable');
+		}
+		
+		$method = ( ! in_array($this->uri->segment(3), array('add', 'insert', 'edit', 'update', 'view', 'delete', 'do_delete'), TRUE)) ? 'view' : $this->uri->segment(3);
+		
+		require_once(BASEPATH.'scaffolding/Scaffolding'.EXT);
+		$scaff = new Scaffolding($this->_ci_scaff_table);
+		$scaff->$method();
+	}
+
+
+}
+// END _Controller class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index e6dd614f..a8acec67 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1,1719 +1,1719 @@
- 0)
-		{
-			$this->initialize($config);
-		}	
-
-		log_message('debug', "Email Class Initialized");
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Initialize preferences
-	 *
-	 * @access	public
-	 * @param	array
-	 * @return	void
-	 */	
-	function initialize($config = array())
-	{
-		$this->clear();
-		foreach ($config as $key => $val)
-		{
-			if (isset($this->$key))
-			{
-				$method = 'set_'.$key;
-				
-				if (method_exists($this, $method))
-				{
-					$this->$method($val);
-				}
-				else
-				{
-					$this->$key = $val;
-				}			
-			}
-		}
-		$this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE;			
-		$this->_safe_mode = (@ini_get("safe_mode") == 0) ? FALSE : TRUE;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Initialize the Email Data
-	 *
-	 * @access	public
-	 * @return	void
-	 */	
-	function clear($clear_attachments = FALSE)
-	{
-		$this->_subject		= "";
-		$this->_body		= "";
-		$this->_finalbody	= "";
-		$this->_header_str	= "";
-		$this->_replyto_flag = FALSE;
-		$this->_recipients	= array();
-		$this->_headers		= array();
-		$this->_debug_msg	= array();
-		
-		$this->_set_header('User-Agent', $this->useragent);				
-		$this->_set_header('Date', $this->_set_date());
-		
-		if ($clear_attachments !== FALSE)
-		{
-			$this->_attach_name = array();
-			$this->_attach_type = array();
-			$this->_attach_disp = array();
-		}   		
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set FROM
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	void
-	 */	
-	function from($from, $name = '')
-	{
-		if (preg_match( '/\<(.*)\>/', $from, $match))
-			$from = $match['1'];
-
-		if ($this->validate)
-			$this->validate_email($this->_str_to_array($from));
-			
-		if ($name != '' && substr($name, 0, 1) != '"')
-		{
-			$name = '"'.$name.'"';
-		}
-	
-		$this->_set_header('From', $name.' <'.$from.'>');
-		$this->_set_header('Return-Path', '<'.$from.'>');
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Reply-to
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	void
-	 */	
-	function reply_to($replyto, $name = '')
-	{
-		if (preg_match( '/\<(.*)\>/', $replyto, $match))
-			$replyto = $match['1'];
-
-		if ($this->validate)
-			$this->validate_email($this->_str_to_array($replyto));	
-
-		if ($name == '')
-		{
-			$name = $replyto;
-		}
-
-		if (substr($name, 0, 1) != '"')
-		{
-			$name = '"'.$name.'"';
-		}
-
-		$this->_set_header('Reply-To', $name.' <'.$replyto.'>');
-		$this->_replyto_flag = TRUE;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Recipients
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function to($to)
-	{
-		$to = $this->_str_to_array($to);
-		$to = $this->clean_email($to);
-	
-		if ($this->validate)
-			$this->validate_email($to);
-			
-		if ($this->_get_protocol() != 'mail')
-			$this->_set_header('To', implode(", ", $to));
-
-		switch ($this->_get_protocol())
-		{
-			case 'smtp'		: $this->_recipients = $to;
-			break;
-			case 'sendmail'	: $this->_recipients = implode(", ", $to);
-			break;
-			case 'mail'		: $this->_recipients = implode(", ", $to);
-			break;
-		}	
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set CC
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function cc($cc)
-	{	
-		$cc = $this->_str_to_array($cc);
-		$cc = $this->clean_email($cc);
-
-		if ($this->validate)
-			$this->validate_email($cc);
-
-		$this->_set_header('Cc', implode(", ", $cc));
-		
-		if ($this->_get_protocol() == "smtp")
-			$this->_cc_array = $cc;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set BCC
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	void
-	 */	
-	function bcc($bcc, $limit = '')
-	{
-		if ($limit != '' && is_numeric($limit))
-		{
-			$this->bcc_batch_mode = true;
-			$this->bcc_batch_size = $limit;
-		}
-
-		$bcc = $this->_str_to_array($bcc);
-		$bcc = $this->clean_email($bcc);
-		
-		if ($this->validate)
-			$this->validate_email($bcc);
-
-		if (($this->_get_protocol() == "smtp") OR ($this->bcc_batch_mode && count($bcc) > $this->bcc_batch_size))
-			$this->_bcc_array = $bcc;
-		else
-			$this->_set_header('Bcc', implode(", ", $bcc));
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Email Subject
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function subject($subject)
-	{
-		$subject = preg_replace("/(\r\n)|(\r)|(\n)/", "", $subject);
-		$subject = preg_replace("/(\t)/", " ", $subject);
-		
-		$this->_set_header('Subject', trim($subject));		
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Body
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function message($body)
-	{
-		$this->_body = stripslashes(rtrim(str_replace("\r", "", $body)));	
-	}	
- 	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Assign file attachments
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */		
-	function attach($filename, $disposition = 'attachment')
-	{			
-		$this->_attach_name[] = $filename;
-		$this->_attach_type[] = $this->_mime_types(next(explode('.', basename($filename))));
-		$this->_attach_disp[] = $disposition; // Can also be 'inline'  Not sure if it matters
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Add a Header Item
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	void
-	 */	
-	function _set_header($header, $value)
-	{
-		$this->_headers[$header] = $value;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Convert a String to an Array
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	array
-	 */	
-	function _str_to_array($email)
-	{
-		if ( ! is_array($email))
-		{	
-			if (ereg(',$', $email))
-				$email = substr($email, 0, -1);
-			
-			if (ereg('^,', $email))
-				$email = substr($email, 1);	
-					
-			if (ereg(',', $email))
-			{					
-				$x = explode(',', $email);
-				$email = array();
-				
-				for ($i = 0; $i < count($x); $i ++)
-					$email[] = trim($x[$i]);
-			}
-			else
-			{				
-				$email = trim($email);
-				settype($email, "array");
-			}
-		}
-		return $email;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Multipart Value
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_alt_message($str = '')
-	{
-		$this->alt_message = ($str == '') ? '' : $str;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Mailtype
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_mailtype($type = 'text')
-	{
-		$this->mailtype = ($type == 'html') ? 'html' : 'text';
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Wordwrap
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_wordwrap($wordwrap = TRUE)
-	{
-		$this->wordwrap = ($wordwrap === FALSE) ? FALSE : TRUE;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Protocol
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_protocol($protocol = 'mail')
-	{
-		$this->protocol = ( ! in_array($protocol, $this->_protocols, TRUE)) ? 'mail' : strtolower($protocol);
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Priority
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @return	void
-	 */	
-	function set_priority($n = 3)
-	{
-		if ( ! is_numeric($n))
-		{
-			$this->priority = 3;
-			return;
-		}
-	
-		if ($n < 1 OR $n > 5)
-		{
-			$this->priority = 3;
-			return;
-		}
-	
-		$this->priority = $n;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Newline Character
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_newline($newline = "\n")
-	{
-		if ($newline != "\n" OR $newline != "\r\n" OR $newline != "\r")
-		{
-			$this->newline	= "\n";	
-			return;
-		}
-	
-		$this->newline	= $newline;	
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Message Boundary
-	 *
-	 * @access	private
-	 * @return	void
-	 */	
-	function _set_boundaries()
-	{
-		$this->_alt_boundary = "B_ALT_".uniqid(''); // multipart/alternative
-		$this->_atc_boundary = "B_ATC_".uniqid(''); // attachment boundary
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get the Message ID
-	 *
-	 * @access	private
-	 * @return	string
-	 */	
-	function _get_message_id()
-	{
-		$from = $this->_headers['Return-Path'];
-		$from = str_replace(">", "", $from);
-		$from = str_replace("<", "", $from);
-	
-		return  "<".uniqid('').strstr($from, '@').">";	
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get Mail Protocol
-	 *
-	 * @access	private
-	 * @param	bool
-	 * @return	string
-	 */	
-	function _get_protocol($return = true)
-	{
-		$this->protocol = strtolower($this->protocol);
-		$this->protocol = ( ! in_array($this->protocol, $this->_protocols, TRUE)) ? 'mail' : $this->protocol;
-		
-		if ($return == true)
-			return $this->protocol;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get Mail Encoding
-	 *
-	 * @access	private
-	 * @param	bool
-	 * @return	string
-	 */	
-	function _get_encoding($return = true)
-	{		
-		$this->_encoding = ( ! in_array($this->_encoding, $this->_bit_depths)) ? '7bit' : $this->_encoding;
-		
-		if ( ! in_array($this->charset, $this->_base_charsets, TRUE))
-			$this->_encoding = "8bit";
-			
-		if ($return == true)
-			return $this->_encoding;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get content type (text/html/attachment)
-	 *
-	 * @access	private
-	 * @return	string
-	 */	
-	function _get_content_type()
-	{	
-			if	($this->mailtype == 'html' &&  count($this->_attach_name) == 0)
-				return 'html';
-	
-		elseif	($this->mailtype == 'html' &&  count($this->_attach_name)  > 0)
-				return 'html-attach';				
-				
-		elseif	($this->mailtype == 'text' &&  count($this->_attach_name)  > 0)
-				return 'plain-attach';
-				
-		  else	return 'plain';
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set RFC 822 Date
-	 *
-	 * @access	public
-	 * @return	string
-	 */	
-	function _set_date()
-	{
-		$timezone = date("Z");
-		$operator = (substr($timezone, 0, 1) == '-') ? '-' : '+';
-		$timezone = abs($timezone);
-		$timezone = ($timezone/3600) * 100 + ($timezone % 3600) /60;
-		
-		return sprintf("%s %s%04d", date("D, j M Y H:i:s"), $operator, $timezone);
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Mime message
-	 *
-	 * @access	private
-	 * @return	string
-	 */	
-	function _get_mime_message()
-	{
-		return "This is a multi-part message in MIME format.".$this->newline."Your email application may not support this format.";
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Validate Email Address
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */	
-	function validate_email($email)
-	{	
-		if ( ! is_array($email))
-		{
-			$this->_set_error_message('email_must_be_array');		
-			return FALSE;
-		}
-
-		foreach ($email as $val)
-		{
-			if ( ! $this->valid_email($val))
-			{
-				$this->_set_error_message('email_invalid_address', $val);				
-				return FALSE;
-			}
-		}
-	}	
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Email Validation
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */	
-	function valid_email($address)
-	{
-		if ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $address))
-			return FALSE;
-		else
-			return TRUE;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Clean Extended Email Address: Joe Smith 
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function clean_email($email)
-	{
-		if ( ! is_array($email))
-		{
-			if (preg_match('/\<(.*)\>/', $email, $match))
-		   		return $match['1'];
-		   	else
-		   		return $email;
-		}
-			
-		$clean_email = array();
-
-		for ($i=0; $i < count($email); $i++)
-		{
-			if (preg_match( '/\<(.*)\>/', $email[$i], $match))
-		   		$clean_email[] = $match['1'];
-		   	else
-		   		$clean_email[] = $email[$i];
-		}
-		
-		return $clean_email;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Build alternative plain text message
-	 *
-	 * This function provides the raw message for use
-	 * in plain-text headers of HTML-formatted emails.
-	 * If the user hasn't specified his own alternative message
-	 * it creates one by stripping the HTML
-	 *
-	 * @access	private
-	 * @return	string
-	 */	
-	function _get_alt_message()
-	{
-		if ($this->alt_message != "")
-		{
-			return $this->word_wrap($this->alt_message, '76');
-		}
-	
-		if (eregi( '\', $this->_body, $match))
-		{
-			$body = $match['1'];
-			$body = substr($body, strpos($body, ">") + 1);
-		}
-		else
-		{
-			$body = $this->_body;
-		}
-		
-		$body = trim(strip_tags($body));
-		$body = preg_replace( '# '.$msg."\n";
-		
-		flock($fp, LOCK_EX);	
-		fwrite($fp, $message);
-		flock($fp, LOCK_UN);
-		fclose($fp);
-	
-		@chmod($filepath, 0666); 		
-		return TRUE;
-	}
-
-}
-// END Log Class
+ '1', 'DEBUG' => '2',  'INFO' => '3', 'ALL' => '4');
+
+	/**
+	 * Constructor
+	 *
+	 * @access	public
+	 * @param	string	the log file path
+	 * @param	string	the error threshold
+	 * @param	string	the date formatting codes
+	 */
+	function CI_Log()
+	{
+		$config =& get_config();
+		
+		$this->log_path = ($config['log_path'] != '') ? $config['log_path'] : BASEPATH.'logs/';
+		
+		if ( ! is_dir($this->log_path) OR ! is_writable($this->log_path))
+		{
+			$this->_enabled = FALSE;
+		}
+		
+		if (is_numeric($config['log_threshold']))
+		{
+			$this->_threshold = $config['log_threshold'];
+		}
+			
+		if ($config['log_date_format'] != '')
+		{
+			$this->_date_fmt = $config['log_date_format'];
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Write Log File
+	 *
+	 * Generally this function will be called using the global log_message() function
+	 *
+	 * @access	public
+	 * @param	string	the error level
+	 * @param	string	the error message
+	 * @param	bool	whether the error is a native PHP error
+	 * @return	bool
+	 */		
+	function write_log($level = 'error', $msg, $php_error = FALSE)
+	{		
+		if ($this->_enabled === FALSE)
+		{
+			return FALSE;
+		}
+	
+		$level = strtoupper($level);
+		
+		if ( ! isset($this->_levels[$level]) OR ($this->_levels[$level] > $this->_threshold))
+		{
+			return FALSE;
+		}
+	
+		$filepath = $this->log_path.'log-'.date('Y-m-d').EXT;
+		$message  = '';
+		
+		if ( ! file_exists($filepath))
+		{
+			$message .= "<"."?php  if (!defined('BASEPATH')) exit('No direct script access allowed'); ?".">\n\n";
+		}
+			
+		if ( ! $fp = @fopen($filepath, "a"))
+		{
+			return FALSE;
+		}
+
+		$message .= $level.' '.(($level == 'INFO') ? ' -' : '-').' '.date($this->_date_fmt). ' --> '.$msg."\n";
+		
+		flock($fp, LOCK_EX);	
+		fwrite($fp, $message);
+		flock($fp, LOCK_UN);
+		fclose($fp);
+	
+		@chmod($filepath, 0666); 		
+		return TRUE;
+	}
+
+}
+// END Log Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Model.php b/system/libraries/Model.php
index 6f4f7e7e..3b4c2e14 100644
--- a/system/libraries/Model.php
+++ b/system/libraries/Model.php
@@ -1,82 +1,82 @@
-_assign_libraries( (method_exists($this, '__get') OR method_exists($this, '__set')) ? FALSE : TRUE );
-		
-		// We don't want to assign the model object to itself when using the
-		// assign_libraries function below so we'll grab the name of the model parent
-		$this->_parent_name = ucfirst(get_class($this));
-		
-		log_message('debug', "Model Class Initialized");
-	}
-
-	/**
-	 * Assign Libraries
-	 *
-	 * Creates local references to all currently instantiated objects
-	 * so that any syntax that can be legally used in a controller
-	 * can be used within models.  
-	 *
-	 * @access private
-	 */	
-	function _assign_libraries($use_reference = TRUE)
-	{
-		$CI =& get_instance();				
-		foreach (array_keys(get_object_vars($CI)) as $key)
-		{
-			if ( ! isset($this->$key) AND $key != $this->_parent_name)
-			{			
-				// In some cases using references can cause
-				// problems so we'll conditionally use them
-				if ($use_reference == TRUE)
-				{
-					// Needed to prevent reference errors with some configurations
-					$this->$key = '';
-					$this->$key =& $CI->$key;
-				}
-				else
-				{
-					$this->$key = $CI->$key;
-				}
-			}
-		}		
-	}
-
-}
-// END Model Class
+_assign_libraries( (method_exists($this, '__get') OR method_exists($this, '__set')) ? FALSE : TRUE );
+		
+		// We don't want to assign the model object to itself when using the
+		// assign_libraries function below so we'll grab the name of the model parent
+		$this->_parent_name = ucfirst(get_class($this));
+		
+		log_message('debug', "Model Class Initialized");
+	}
+
+	/**
+	 * Assign Libraries
+	 *
+	 * Creates local references to all currently instantiated objects
+	 * so that any syntax that can be legally used in a controller
+	 * can be used within models.  
+	 *
+	 * @access private
+	 */	
+	function _assign_libraries($use_reference = TRUE)
+	{
+		$CI =& get_instance();				
+		foreach (array_keys(get_object_vars($CI)) as $key)
+		{
+			if ( ! isset($this->$key) AND $key != $this->_parent_name)
+			{			
+				// In some cases using references can cause
+				// problems so we'll conditionally use them
+				if ($use_reference == TRUE)
+				{
+					// Needed to prevent reference errors with some configurations
+					$this->$key = '';
+					$this->$key =& $CI->$key;
+				}
+				else
+				{
+					$this->$key = $CI->$key;
+				}
+			}
+		}		
+	}
+
+}
+// END Model Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Output.php b/system/libraries/Output.php
index e5362740..743228e5 100644
--- a/system/libraries/Output.php
+++ b/system/libraries/Output.php
@@ -1,364 +1,364 @@
-final_output;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Output
-	 *
-	 * Sets the output string
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_output($output)
-	{
-		$this->final_output = $output;
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Header
-	 *
-	 * 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
-	 * how to permit header data to be saved with the cache data...
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_header($header)
-	{
-		$this->headers[] = $header;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Enable/disable Profiler
-	 *
-	 * @access	public
-	 * @param	bool
-	 * @return	void
-	 */	
-	function enable_profiler($val = TRUE)
-	{
-		$this->enable_profiler = (is_bool($val)) ? $val : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Cache
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @return	void
-	 */	
-	function cache($time)
-	{
-		$this->cache_expiration = ( ! is_numeric($time)) ? 0 : $time;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Display Output
-	 *
-	 * All "view" data is automatically put into this variable by the controller class:
-	 *
-	 * $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
-	 * benchmark timer so the page rendering speed and memory usage can be shown.
-	 *
-	 * @access	public
-	 * @return	mixed
-	 */		
-	function _display($output = '')
-	{	
-		// 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;
-		
-		// --------------------------------------------------------------------
-		
-		// Set the output data
-		if ($output == '')
-		{
-			$output =& $this->final_output;
-		}
-		
-		// --------------------------------------------------------------------
-		
-		// Do we need to write a cache file?
-		if ($this->cache_expiration > 0)
-		{
-			$this->_write_cache($output);
-		}
-		
-		// --------------------------------------------------------------------
-
-		// Parse out the elapsed time and memory usage,
-		// then swap the pseudo-variables with the data
-				
-		$elapsed = $BM->elapsed_time('total_execution_time_start', 'total_execution_time_end');		
-		$output = str_replace('{elapsed_time}', $elapsed, $output);
-		
-		$memory	 = ( ! function_exists('memory_get_usage')) ? '0' : round(memory_get_usage()/1024/1024, 2).'MB';
-		$output = str_replace('{memory_usage}', $memory, $output);		
-
-		// --------------------------------------------------------------------
-		
-		// Is compression requested?
-		if ($CFG->item('compress_output') === TRUE)
-		{
-			if (extension_loaded('zlib'))
-			{
-				if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) AND strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE)
-				{
-					ob_start('ob_gzhandler');
-				}
-			}
-		}
-
-		// --------------------------------------------------------------------
-		
-		// Are there any server headers to send?
-		if (count($this->headers) > 0)
-		{
-			foreach ($this->headers as $header)
-			{
-				@header($header);
-			}
-		}		
-
-		// --------------------------------------------------------------------
-		
-		// Does the get_instance() function exist?
-		// If not we know we are dealing with a cache file so we'll
-		// simply echo out the data and exit.
-		if ( ! function_exists('get_instance'))
-		{
-			echo $output;
-			log_message('debug', "Final output sent to browser");
-			log_message('debug', "Total execution time: ".$elapsed);
-			return TRUE;
-		}
-	
-		// --------------------------------------------------------------------
-
-		// Grab the super object.  We'll need it in a moment...
-		$CI =& get_instance();
-		
-		// Do we need to generate profile data?
-		// If so, load the Profile class and run it.
-		if ($this->enable_profiler == TRUE)
-		{
-			$CI->load->library('profiler');				
-										
-			// If the output data contains closing  and  tags
-			// we will remove them and add them back after we insert the profile data
-			if (preg_match("|.*?|is", $output))
-			{
-				$output  = preg_replace("|.*?|is", '', $output);
-				$output .= $CI->profiler->run();
-				$output .= '';
-			}
-			else
-			{
-				$output .= $CI->profiler->run();
-			}
-		}
-		
-		// --------------------------------------------------------------------
-
-		// Does the controller contain a function named _output()?
-		// 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!
-		}
-		
-		log_message('debug', "Final output sent to browser");
-		log_message('debug', "Total execution time: ".$elapsed);		
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Write a Cache File
-	 *
-	 * @access	public
-	 * @return	void
-	 */	
-	function _write_cache($output)
-	{
-		$CI =& get_instance();	
-		$path = $CI->config->item('cache_path');
-	
-		$cache_path = ($path == '') ? BASEPATH.'cache/' : $path;
-		
-		if ( ! is_dir($cache_path) OR ! is_writable($cache_path))
-		{
-			return;
-		}
-		
-		$uri =	$CI->config->item('base_url').
-				$CI->config->item('index_page').
-				$CI->uri->uri_string();
-		
-		$cache_path .= md5($uri);
-
-		if ( ! $fp = @fopen($cache_path, 'wb'))
-		{
-			log_message('error', "Unable to write ache file: ".$cache_path);
-			return;
-		}
-		
-		$expire = time() + ($this->cache_expiration * 60);
-		
-		flock($fp, LOCK_EX);
-		fwrite($fp, $expire.'TS--->'.$output);
-		flock($fp, LOCK_UN);
-		fclose($fp);
-		@chmod($cache_path, 0777);
-
-		log_message('debug', "Cache file written: ".$cache_path);
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Update/serve a cached file
-	 *
-	 * @access	public
-	 * @return	void
-	 */	
-	function _display_cache(&$CFG, &$RTR)
-	{
-		$CFG =& load_class('Config');
-		$RTR =& load_class('Router');
-	
-		$cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path');
-			
-		if ( ! is_dir($cache_path) OR ! is_writable($cache_path))
-		{
-			return FALSE;
-		}
-		
-		// Build the file path.  The file name is an MD5 hash of the full URI
-		$uri =	$CFG->item('base_url').
-				$CFG->item('index_page').
-				$RTR->uri_string;
-				
-		$filepath = $cache_path.md5($uri);
-		
-		if ( ! @file_exists($filepath))
-		{
-			return FALSE;
-		}
-	
-		if ( ! $fp = @fopen($filepath, 'rb'))
-		{
-			return FALSE;
-		}
-			
-		flock($fp, LOCK_SH);
-		
-		$cache = '';
-		if (filesize($filepath) > 0)
-		{
-			$cache = fread($fp, filesize($filepath));
-		}
-	
-		flock($fp, LOCK_UN);
-		fclose($fp);
-					
-		// Strip out the embedded timestamp		
-		if ( ! preg_match("/(\d+TS--->)/", $cache, $match))
-		{
-			return FALSE;
-		}
-		
-		// Has the file expired? If so we'll delete it.
-		if (time() >= trim(str_replace('TS--->', '', $match['1'])))
-		{ 		
-			@unlink($filepath);
-			log_message('debug', "Cache file has expired. File deleted");
-			return FALSE;
-		}
-
-		// Display the cache
-		$this->_display(str_replace($match['0'], '', $cache));
-		log_message('debug', "Cache file is current. Sending it to browser.");		
-		return TRUE;
-	}
-
-
-}
-// END Output Class
+final_output;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Output
+	 *
+	 * Sets the output string
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_output($output)
+	{
+		$this->final_output = $output;
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Header
+	 *
+	 * 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
+	 * how to permit header data to be saved with the cache data...
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_header($header)
+	{
+		$this->headers[] = $header;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Enable/disable Profiler
+	 *
+	 * @access	public
+	 * @param	bool
+	 * @return	void
+	 */	
+	function enable_profiler($val = TRUE)
+	{
+		$this->enable_profiler = (is_bool($val)) ? $val : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Cache
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @return	void
+	 */	
+	function cache($time)
+	{
+		$this->cache_expiration = ( ! is_numeric($time)) ? 0 : $time;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Display Output
+	 *
+	 * All "view" data is automatically put into this variable by the controller class:
+	 *
+	 * $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
+	 * benchmark timer so the page rendering speed and memory usage can be shown.
+	 *
+	 * @access	public
+	 * @return	mixed
+	 */		
+	function _display($output = '')
+	{	
+		// 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;
+		
+		// --------------------------------------------------------------------
+		
+		// Set the output data
+		if ($output == '')
+		{
+			$output =& $this->final_output;
+		}
+		
+		// --------------------------------------------------------------------
+		
+		// Do we need to write a cache file?
+		if ($this->cache_expiration > 0)
+		{
+			$this->_write_cache($output);
+		}
+		
+		// --------------------------------------------------------------------
+
+		// Parse out the elapsed time and memory usage,
+		// then swap the pseudo-variables with the data
+				
+		$elapsed = $BM->elapsed_time('total_execution_time_start', 'total_execution_time_end');		
+		$output = str_replace('{elapsed_time}', $elapsed, $output);
+		
+		$memory	 = ( ! function_exists('memory_get_usage')) ? '0' : round(memory_get_usage()/1024/1024, 2).'MB';
+		$output = str_replace('{memory_usage}', $memory, $output);		
+
+		// --------------------------------------------------------------------
+		
+		// Is compression requested?
+		if ($CFG->item('compress_output') === TRUE)
+		{
+			if (extension_loaded('zlib'))
+			{
+				if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) AND strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE)
+				{
+					ob_start('ob_gzhandler');
+				}
+			}
+		}
+
+		// --------------------------------------------------------------------
+		
+		// Are there any server headers to send?
+		if (count($this->headers) > 0)
+		{
+			foreach ($this->headers as $header)
+			{
+				@header($header);
+			}
+		}		
+
+		// --------------------------------------------------------------------
+		
+		// Does the get_instance() function exist?
+		// If not we know we are dealing with a cache file so we'll
+		// simply echo out the data and exit.
+		if ( ! function_exists('get_instance'))
+		{
+			echo $output;
+			log_message('debug', "Final output sent to browser");
+			log_message('debug', "Total execution time: ".$elapsed);
+			return TRUE;
+		}
+	
+		// --------------------------------------------------------------------
+
+		// Grab the super object.  We'll need it in a moment...
+		$CI =& get_instance();
+		
+		// Do we need to generate profile data?
+		// If so, load the Profile class and run it.
+		if ($this->enable_profiler == TRUE)
+		{
+			$CI->load->library('profiler');				
+										
+			// If the output data contains closing  and  tags
+			// we will remove them and add them back after we insert the profile data
+			if (preg_match("|.*?|is", $output))
+			{
+				$output  = preg_replace("|.*?|is", '', $output);
+				$output .= $CI->profiler->run();
+				$output .= '';
+			}
+			else
+			{
+				$output .= $CI->profiler->run();
+			}
+		}
+		
+		// --------------------------------------------------------------------
+
+		// Does the controller contain a function named _output()?
+		// 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!
+		}
+		
+		log_message('debug', "Final output sent to browser");
+		log_message('debug', "Total execution time: ".$elapsed);		
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Write a Cache File
+	 *
+	 * @access	public
+	 * @return	void
+	 */	
+	function _write_cache($output)
+	{
+		$CI =& get_instance();	
+		$path = $CI->config->item('cache_path');
+	
+		$cache_path = ($path == '') ? BASEPATH.'cache/' : $path;
+		
+		if ( ! is_dir($cache_path) OR ! is_writable($cache_path))
+		{
+			return;
+		}
+		
+		$uri =	$CI->config->item('base_url').
+				$CI->config->item('index_page').
+				$CI->uri->uri_string();
+		
+		$cache_path .= md5($uri);
+
+		if ( ! $fp = @fopen($cache_path, 'wb'))
+		{
+			log_message('error', "Unable to write ache file: ".$cache_path);
+			return;
+		}
+		
+		$expire = time() + ($this->cache_expiration * 60);
+		
+		flock($fp, LOCK_EX);
+		fwrite($fp, $expire.'TS--->'.$output);
+		flock($fp, LOCK_UN);
+		fclose($fp);
+		@chmod($cache_path, 0777);
+
+		log_message('debug', "Cache file written: ".$cache_path);
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Update/serve a cached file
+	 *
+	 * @access	public
+	 * @return	void
+	 */	
+	function _display_cache(&$CFG, &$RTR)
+	{
+		$CFG =& load_class('Config');
+		$RTR =& load_class('Router');
+	
+		$cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path');
+			
+		if ( ! is_dir($cache_path) OR ! is_writable($cache_path))
+		{
+			return FALSE;
+		}
+		
+		// Build the file path.  The file name is an MD5 hash of the full URI
+		$uri =	$CFG->item('base_url').
+				$CFG->item('index_page').
+				$RTR->uri_string;
+				
+		$filepath = $cache_path.md5($uri);
+		
+		if ( ! @file_exists($filepath))
+		{
+			return FALSE;
+		}
+	
+		if ( ! $fp = @fopen($filepath, 'rb'))
+		{
+			return FALSE;
+		}
+			
+		flock($fp, LOCK_SH);
+		
+		$cache = '';
+		if (filesize($filepath) > 0)
+		{
+			$cache = fread($fp, filesize($filepath));
+		}
+	
+		flock($fp, LOCK_UN);
+		fclose($fp);
+					
+		// Strip out the embedded timestamp		
+		if ( ! preg_match("/(\d+TS--->)/", $cache, $match))
+		{
+			return FALSE;
+		}
+		
+		// Has the file expired? If so we'll delete it.
+		if (time() >= trim(str_replace('TS--->', '', $match['1'])))
+		{ 		
+			@unlink($filepath);
+			log_message('debug', "Cache file has expired. File deleted");
+			return FALSE;
+		}
+
+		// Display the cache
+		$this->_display(str_replace($match['0'], '', $cache));
+		log_message('debug', "Cache file is current. Sending it to browser.");		
+		return TRUE;
+	}
+
+
+}
+// END Output Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 07ad6a68..27104c95 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -1,211 +1,211 @@
-';
-	var $cur_tag_close		= '';
-	var $next_tag_open		= ' ';
-	var $next_tag_close		= ' ';
-	var $prev_tag_open		= ' ';
-	var $prev_tag_close		= '';
-	var $num_tag_open		= ' ';
-	var $num_tag_close		= '';
-
-	/**
-	 * Constructor
-	 *
-	 * @access	public
-	 * @param	array	initialization parameters
-	 */
-	function CI_Pagination($params = array())
-	{
-		if (count($params) > 0)
-		{
-			$this->initialize($params);		
-		}
-		
-		log_message('debug', "Pagination Class Initialized");
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Initialize Preferences
-	 *
-	 * @access	public
-	 * @param	array	initialization parameters
-	 * @return	void
-	 */
-	function initialize($params = array())
-	{
-		if (count($params) > 0)
-		{
-			foreach ($params as $key => $val)
-			{
-				if (isset($this->$key))
-				{
-					$this->$key = $val;
-				}
-			}		
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Generate the pagination links
-	 *
-	 * @access	public
-	 * @return	string
-	 */	
-	function create_links()
-	{
-		// If our item count or per-page total is zero there is no need to continue.
-		if ($this->total_rows == 0 OR $this->per_page == 0)
-		{
-		   return '';
-		}
-
-		// Calculate the total number of pages
-		$num_pages = ceil($this->total_rows / $this->per_page);
-
-		// Is there only one page? Hm... nothing more to do here then.
-		if ($num_pages == 1)
-		{
-			return '';
-		}
-
-		// Determine the current page number.		
-		$CI =& get_instance();	
-		if ($CI->uri->segment($this->uri_segment) != 0)
-		{
-			$this->cur_page = $CI->uri->segment($this->uri_segment);
-			
-			// Prep the current page - no funny business!
-			$this->cur_page = preg_replace("/[a-z\-]/", "", $this->cur_page);
-		}
-				
-		if ( ! is_numeric($this->cur_page))
-		{
-			$this->cur_page = 0;
-		}
-		
-		// Is the page number beyond the result range?
-		// If so we show the last page
-		if ($this->cur_page > $this->total_rows)
-		{
-			$this->cur_page = ($num_pages - 1) * $this->per_page;
-		}
-		
-		$uri_page_number = $this->cur_page;
-		$this->cur_page = floor(($this->cur_page/$this->per_page) + 1);
-
-		// Calculate the start and end numbers. These determine
-		// which number to start and end the digit links with
-		$start = (($this->cur_page - $this->num_links) > 0) ? $this->cur_page - ($this->num_links - 1) : 1;
-		$end   = (($this->cur_page + $this->num_links) < $num_pages) ? $this->cur_page + $this->num_links : $num_pages;
-
-		// Add a trailing slash to the base URL if needed
-		$this->base_url = preg_replace("/(.+?)\/*$/", "\\1/",  $this->base_url);
-		
-  		// And here we go...
-		$output = '';
-
-		// Render the "First" link
-		if  ($this->cur_page > $this->num_links)
-		{
-			$output .= $this->first_tag_open.''.$this->first_link.''.$this->first_tag_close;
-		}
-
-		// Render the "previous" link
-		if  (($this->cur_page - $this->num_links) >= 0)
-		{
-			$i = $uri_page_number - $this->per_page;
-			if ($i == 0) $i = '';
-			$output .= $this->prev_tag_open.''.$this->prev_link.''.$this->prev_tag_close;
-		}
-
-		// Write the digit links
-		for ($loop = $start -1; $loop <= $end; $loop++)
-		{
-			$i = ($loop * $this->per_page) - $this->per_page;
-					
-			if ($i >= 0)
-			{
-				if ($this->cur_page == $loop)
-				{
-					$output .= $this->cur_tag_open.$loop.$this->cur_tag_close; // Current page
-				}
-				else
-				{
-					$n = ($i == 0) ? '' : $i;
-					$output .= $this->num_tag_open.''.$loop.''.$this->num_tag_close;
-				}
-			}
-		}
-
-		// Render the "next" link
-		if ($this->cur_page < $num_pages)
-		{
-			$output .= $this->next_tag_open.''.$this->next_link.''.$this->next_tag_close;
-		}
-
-		// Render the "Last" link
-		if (($this->cur_page + $this->num_links) < $num_pages)
-		{
-			$i = (($num_pages * $this->per_page) - $this->per_page);
-			$output .= $this->last_tag_open.''.$this->last_link.''.$this->last_tag_close;
-		}
-
-		// Kill double slashes.  Note: Sometimes we can end up with a double slash
-		// in the penultimate link so we'll kill all double slashes.
-		$output = preg_replace("#([^:])//+#", "\\1/", $output);
-
-		// Add the wrapper HTML if exists
-		$output = $this->full_tag_open.$output.$this->full_tag_close;
-		
-		return $output;		
-	}
-}
-// END Pagination Class
+';
+	var $cur_tag_close		= '';
+	var $next_tag_open		= ' ';
+	var $next_tag_close		= ' ';
+	var $prev_tag_open		= ' ';
+	var $prev_tag_close		= '';
+	var $num_tag_open		= ' ';
+	var $num_tag_close		= '';
+
+	/**
+	 * Constructor
+	 *
+	 * @access	public
+	 * @param	array	initialization parameters
+	 */
+	function CI_Pagination($params = array())
+	{
+		if (count($params) > 0)
+		{
+			$this->initialize($params);		
+		}
+		
+		log_message('debug', "Pagination Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Initialize Preferences
+	 *
+	 * @access	public
+	 * @param	array	initialization parameters
+	 * @return	void
+	 */
+	function initialize($params = array())
+	{
+		if (count($params) > 0)
+		{
+			foreach ($params as $key => $val)
+			{
+				if (isset($this->$key))
+				{
+					$this->$key = $val;
+				}
+			}		
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate the pagination links
+	 *
+	 * @access	public
+	 * @return	string
+	 */	
+	function create_links()
+	{
+		// If our item count or per-page total is zero there is no need to continue.
+		if ($this->total_rows == 0 OR $this->per_page == 0)
+		{
+		   return '';
+		}
+
+		// Calculate the total number of pages
+		$num_pages = ceil($this->total_rows / $this->per_page);
+
+		// Is there only one page? Hm... nothing more to do here then.
+		if ($num_pages == 1)
+		{
+			return '';
+		}
+
+		// Determine the current page number.		
+		$CI =& get_instance();	
+		if ($CI->uri->segment($this->uri_segment) != 0)
+		{
+			$this->cur_page = $CI->uri->segment($this->uri_segment);
+			
+			// Prep the current page - no funny business!
+			$this->cur_page = preg_replace("/[a-z\-]/", "", $this->cur_page);
+		}
+				
+		if ( ! is_numeric($this->cur_page))
+		{
+			$this->cur_page = 0;
+		}
+		
+		// Is the page number beyond the result range?
+		// If so we show the last page
+		if ($this->cur_page > $this->total_rows)
+		{
+			$this->cur_page = ($num_pages - 1) * $this->per_page;
+		}
+		
+		$uri_page_number = $this->cur_page;
+		$this->cur_page = floor(($this->cur_page/$this->per_page) + 1);
+
+		// Calculate the start and end numbers. These determine
+		// which number to start and end the digit links with
+		$start = (($this->cur_page - $this->num_links) > 0) ? $this->cur_page - ($this->num_links - 1) : 1;
+		$end   = (($this->cur_page + $this->num_links) < $num_pages) ? $this->cur_page + $this->num_links : $num_pages;
+
+		// Add a trailing slash to the base URL if needed
+		$this->base_url = preg_replace("/(.+?)\/*$/", "\\1/",  $this->base_url);
+		
+  		// And here we go...
+		$output = '';
+
+		// Render the "First" link
+		if  ($this->cur_page > $this->num_links)
+		{
+			$output .= $this->first_tag_open.''.$this->first_link.''.$this->first_tag_close;
+		}
+
+		// Render the "previous" link
+		if  (($this->cur_page - $this->num_links) >= 0)
+		{
+			$i = $uri_page_number - $this->per_page;
+			if ($i == 0) $i = '';
+			$output .= $this->prev_tag_open.''.$this->prev_link.''.$this->prev_tag_close;
+		}
+
+		// Write the digit links
+		for ($loop = $start -1; $loop <= $end; $loop++)
+		{
+			$i = ($loop * $this->per_page) - $this->per_page;
+					
+			if ($i >= 0)
+			{
+				if ($this->cur_page == $loop)
+				{
+					$output .= $this->cur_tag_open.$loop.$this->cur_tag_close; // Current page
+				}
+				else
+				{
+					$n = ($i == 0) ? '' : $i;
+					$output .= $this->num_tag_open.''.$loop.''.$this->num_tag_close;
+				}
+			}
+		}
+
+		// Render the "next" link
+		if ($this->cur_page < $num_pages)
+		{
+			$output .= $this->next_tag_open.''.$this->next_link.''.$this->next_tag_close;
+		}
+
+		// Render the "Last" link
+		if (($this->cur_page + $this->num_links) < $num_pages)
+		{
+			$i = (($num_pages * $this->per_page) - $this->per_page);
+			$output .= $this->last_tag_open.''.$this->last_link.''.$this->last_tag_close;
+		}
+
+		// Kill double slashes.  Note: Sometimes we can end up with a double slash
+		// in the penultimate link so we'll kill all double slashes.
+		$output = preg_replace("#([^:])//+#", "\\1/", $output);
+
+		// Add the wrapper HTML if exists
+		$output = $this->full_tag_open.$output.$this->full_tag_close;
+		
+		return $output;		
+	}
+}
+// END Pagination Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php
index 760d5d4d..613668ac 100644
--- a/system/libraries/Parser.php
+++ b/system/libraries/Parser.php
@@ -1,171 +1,171 @@
-load->view($template, $data, TRUE);
-		
-		if ($template == '')
-		{
-			return FALSE;
-		}
-		
-		foreach ($data as $key => $val)
-		{
-			if (is_string($val))
-			{
-				$template = $this->_parse_single($key, $val, $template);
-			}
-			elseif (is_array($val))
-			{
-				$template = $this->_parse_pair($key, $val, $template);		
-			}
-		}
-		
-		if ($return == FALSE)
-		{
-			$CI->output->final_output = $template;
-		}
-		
-		return $template;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 *  Set the left/right variable delimiters
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	void
-	 */
-	function set_delimiters($l = '{', $r = '}')
-	{
-		$this->l_delim = $l;
-		$this->r_delim = $r;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 *  Parse a single key/value
-	 *
-	 * @access	private
-	 * @param	string
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */
-	function _parse_single($key, $val, $string)
-	{
-		return str_replace($this->l_delim.$key.$this->r_delim, $val, $string);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 *  Parse a tag pair
-	 *
-	 * Parses tag pairs:  {some_tag} string... {/some_tag}
-	 *
-	 * @access	private
-	 * @param	string
-	 * @param	array
-	 * @param	string
-	 * @return	string
-	 */
-	function _parse_pair($variable, $data, $string)
-	{	
-		if (FALSE === ($match = $this->_match_pair($string, $variable)))
-		{
-			return $string;
-		}
-
-		$str = '';
-		foreach ($data as $row)
-		{
-			$temp = $match['1'];
-			foreach ($row as $key => $val)
-			{
-				if ( ! is_array($val))
-				{
-					$temp = $this->_parse_single($key, $val, $temp);
-				}
-				else
-				{
-					$temp = $this->_parse_pair($key, $val, $temp);
-				}
-			}
-			
-			$str .= $temp;
-		}
-		
-		return str_replace($match['0'], $str, $string);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 *  Matches a variable pair
-	 *
-	 * @access	private
-	 * @param	string
-	 * @param	string
-	 * @return	mixed
-	 */
-	function _match_pair($string, $variable)
-	{
-		if ( ! preg_match("|".$this->l_delim . $variable . $this->r_delim."(.+)".$this->l_delim . '/' . $variable . $this->r_delim."|s", $string, $match))
-		{
-			return FALSE;
-		}
-		
-		return $match;
-	}
-
-}
-// END Parser Class
+load->view($template, $data, TRUE);
+		
+		if ($template == '')
+		{
+			return FALSE;
+		}
+		
+		foreach ($data as $key => $val)
+		{
+			if (is_string($val))
+			{
+				$template = $this->_parse_single($key, $val, $template);
+			}
+			elseif (is_array($val))
+			{
+				$template = $this->_parse_pair($key, $val, $template);		
+			}
+		}
+		
+		if ($return == FALSE)
+		{
+			$CI->output->final_output = $template;
+		}
+		
+		return $template;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Set the left/right variable delimiters
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	void
+	 */
+	function set_delimiters($l = '{', $r = '}')
+	{
+		$this->l_delim = $l;
+		$this->r_delim = $r;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Parse a single key/value
+	 *
+	 * @access	private
+	 * @param	string
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */
+	function _parse_single($key, $val, $string)
+	{
+		return str_replace($this->l_delim.$key.$this->r_delim, $val, $string);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Parse a tag pair
+	 *
+	 * Parses tag pairs:  {some_tag} string... {/some_tag}
+	 *
+	 * @access	private
+	 * @param	string
+	 * @param	array
+	 * @param	string
+	 * @return	string
+	 */
+	function _parse_pair($variable, $data, $string)
+	{	
+		if (FALSE === ($match = $this->_match_pair($string, $variable)))
+		{
+			return $string;
+		}
+
+		$str = '';
+		foreach ($data as $row)
+		{
+			$temp = $match['1'];
+			foreach ($row as $key => $val)
+			{
+				if ( ! is_array($val))
+				{
+					$temp = $this->_parse_single($key, $val, $temp);
+				}
+				else
+				{
+					$temp = $this->_parse_pair($key, $val, $temp);
+				}
+			}
+			
+			$str .= $temp;
+		}
+		
+		return str_replace($match['0'], $str, $string);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 *  Matches a variable pair
+	 *
+	 * @access	private
+	 * @param	string
+	 * @param	string
+	 * @return	mixed
+	 */
+	function _match_pair($string, $variable)
+	{
+		if ( ! preg_match("|".$this->l_delim . $variable . $this->r_delim."(.+)".$this->l_delim . '/' . $variable . $this->r_delim."|s", $string, $match))
+		{
+			return FALSE;
+		}
+		
+		return $match;
+	}
+
+}
+// END Parser Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 37b34518..cdc4f6fc 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -1,12 +1,12 @@
 CI =& get_instance();
-
-		log_message('debug', "Session Class Initialized");
-		$this->sess_run();
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Run the session routines
-	 *
-	 * @access	public
-	 * @return	void
-	 */		
-	function sess_run()
-	{
-		/*
-		 *  Set the "now" time
-		 *
-		 * It can either set to GMT or time(). The pref
-		 * is set in the config file.  If the developer
-		 * is doing any sort of time localization they
-		 * might want to set the session time to GMT so
-		 * they can offset the "last_activity" and
-		 * "last_visit" times based on each user's locale.
-		 *
-		 */
-		if (strtolower($this->CI->config->item('time_reference')) == 'gmt')
-		{
-			$now = time();
-			$this->now = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now));
-	
-			if (strlen($this->now) < 10)
-			{
-				$this->now = time();
-				log_message('error', 'The session class could not set a proper GMT timestamp so the local time() value was used.');
-			}
-		}
-		else
-		{
-			$this->now = time();
-		}
-		
-		/*
-		 *  Set the session length
-		 *
-		 * If the session expiration is set to zero in
-		 * the config file we'll set the expiration
-		 * two years from now.
-		 *
-		 */
-		$expiration = $this->CI->config->item('sess_expiration');
-		
-		if (is_numeric($expiration))
-		{
-			if ($expiration > 0)
-			{
-				$this->sess_length = $this->CI->config->item('sess_expiration');
-			}
-			else
-			{
-				$this->sess_length = (60*60*24*365*2);
-			}
-		}
-		
-		// Do we need encryption?
-		$this->encryption = $this->CI->config->item('sess_encrypt_cookie');
-	
-		if ($this->encryption == TRUE)	
-		{
-			$this->CI->load->library('encrypt');
-		}		
-
-		// Are we using a database?
-		if ($this->CI->config->item('sess_use_database') === TRUE AND $this->CI->config->item('sess_table_name') != '')
-		{
-			$this->use_database = TRUE;
-			$this->session_table = $this->CI->config->item('sess_table_name');
-			$this->CI->load->database();
-		}
-		
-		// Set the cookie name
-		if ($this->CI->config->item('sess_cookie_name') != FALSE)
-		{
-			$this->sess_cookie = $this->CI->config->item('cookie_prefix').$this->CI->config->item('sess_cookie_name');
-		}
-	
-		/*
-		 *  Fetch the current session
-		 *
-		 * If a session doesn't exist we'll create
-		 * a new one.  If it does, we'll update it.
-		 *
-		 */
-		if ( ! $this->sess_read())
-		{
-			$this->sess_create();
-		}
-		else
-		{	
-			// We only update the session every five minutes
-			if (($this->userdata['last_activity'] + 300) < $this->now)
-			{
-				$this->sess_update();
-			}
-		}
-		
-		// Delete expired sessions if necessary
-		if ($this->use_database === TRUE)
-		{		
-			$this->sess_gc();
-		}	
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Fetch the current session data if it exists
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	function sess_read()
-	{	
-		// Fetch the cookie
-		$session = $this->CI->input->cookie($this->sess_cookie);
-		
-		if ($session === FALSE)
-		{
-			log_message('debug', 'A session cookie was not found.');
-			return FALSE;
-		}
-		
-		// Decrypt and unserialize the data
-		if ($this->encryption == TRUE)
-		{
-			$session = $this->CI->encrypt->decode($session);
-		}
-
-		$session = @unserialize($this->strip_slashes($session));
-		
-		if ( ! is_array($session) OR ! isset($session['last_activity']))
-		{
-			log_message('error', 'The session cookie data did not contain a valid array. This could be a possible hacking attempt.');
-			return FALSE;
-		}
-		
-		// Is the session current?
-		if (($session['last_activity'] + $this->sess_length) < $this->now)
-		{
-			$this->sess_destroy();
-			return FALSE;
-		}
-
-		// Does the IP Match?
-		if ($this->CI->config->item('sess_match_ip') == TRUE AND $session['ip_address'] != $this->CI->input->ip_address())
-		{
-			$this->sess_destroy();
-			return FALSE;
-		}
-		
-		// Does the User Agent Match?
-		if ($this->CI->config->item('sess_match_useragent') == TRUE AND $session['user_agent'] != substr($this->CI->input->user_agent(), 0, 50))
-		{
-			$this->sess_destroy();
-			return FALSE;
-		}
-		
-		// Is there a corresponding session in the DB?
-		if ($this->use_database === TRUE)
-		{
-			$this->CI->db->where('session_id', $session['session_id']);
-					
-			if ($this->CI->config->item('sess_match_ip') == TRUE)
-			{
-				$this->CI->db->where('ip_address', $session['ip_address']);
-			}
-
-			if ($this->CI->config->item('sess_match_useragent') == TRUE)
-			{
-				$this->CI->db->where('user_agent', $session['user_agent']);
-			}
-			
-			$query = $this->CI->db->get($this->session_table);
-
-			if ($query->num_rows() == 0)
-			{
-				$this->sess_destroy();
-				return FALSE;
-			}
-			else
-			{
-				$row = $query->row();
-				if (($row->last_activity + $this->sess_length) < $this->now)
-				{
-					$this->CI->db->where('session_id', $session['session_id']);
-					$this->CI->db->delete($this->session_table);
-					$this->sess_destroy();
-					return FALSE;
-				}
-			}
-		}
-	
-		// Session is valid!
-		$this->userdata = $session;
-		unset($session);
-		
-		return TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Write the session cookie
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	function sess_write()
-	{								
-		$cookie_data = serialize($this->userdata);
-		
-		if ($this->encryption == TRUE)
-		{
-			$cookie_data = $this->CI->encrypt->encode($cookie_data);
-		}
-
-		setcookie(
-					$this->sess_cookie,
-					$cookie_data,
-					$this->sess_length + time(),
-					$this->CI->config->item('cookie_path'),
-					$this->CI->config->item('cookie_domain'),
-					0
-				);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Create a new session
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	function sess_create()
-	{	
-		$sessid = '';
-		while (strlen($sessid) < 32)
-		{
-			$sessid .= mt_rand(0, mt_getrandmax());
-		}
-	
-		$this->userdata = array(
-							'session_id' 	=> md5(uniqid($sessid, TRUE)),
-							'ip_address' 	=> $this->CI->input->ip_address(),
-							'user_agent' 	=> substr($this->CI->input->user_agent(), 0, 50),
-							'last_activity'	=> $this->now
-							);
-		
-		
-		// Save the session in the DB if needed
-		if ($this->use_database === TRUE)
-		{
-			$this->CI->db->query($this->CI->db->insert_string($this->session_table, $this->userdata));
-		}
-			
-		// Write the cookie
-		$this->userdata['last_visit'] = 0;		
-		$this->sess_write();
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Update an existing session
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	function sess_update()
-	{	
-		if (($this->userdata['last_activity'] + $this->sess_length) < $this->now)
-		{
-			$this->userdata['last_visit'] = $this->userdata['last_activity'];
-		}
-	
-		$this->userdata['last_activity'] = $this->now;
-		
-		// Update the session in the DB if needed
-		if ($this->use_database === TRUE)
-		{		
-			$this->CI->db->query($this->CI->db->update_string($this->session_table, array('last_activity' => $this->now), array('session_id' => $this->userdata['session_id'])));
-		}
-		
-		// Write the cookie
-		$this->sess_write();
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Destroy the current session
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	function sess_destroy()
-	{
-		setcookie(
-					$this->sess_cookie,
-					addslashes(serialize(array())),
-					($this->now - 31500000),
-					$this->CI->config->item('cookie_path'),
-					$this->CI->config->item('cookie_domain'),
-					0
-				);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Garbage collection
-	 *
-	 * This deletes expired session rows from database
-	 * if the probability percentage is met
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	function sess_gc()
-	{
-		srand(time());
-		if ((rand() % 100) < $this->gc_probability)
-		{
-			$expire = $this->now - $this->sess_length;
-			
-			$this->CI->db->where("last_activity < {$expire}");
-			$this->CI->db->delete($this->session_table);
-
-			log_message('debug', 'Session garbage collection performed.');
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Fetch a specific item form  the session array
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */		
-	function userdata($item)
-	{
-		return ( ! isset($this->userdata[$item])) ? FALSE : $this->userdata[$item];
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Add or change data in the "userdata" array
-	 *
-	 * @access	public
-	 * @param	mixed
-	 * @param	string
-	 * @return	void
-	 */		
-	function set_userdata($newdata = array(), $newval = '')
-	{
-		if (is_string($newdata))
-		{
-			$newdata = array($newdata => $newval);
-		}
-	
-		if (count($newdata) > 0)
-		{
-			foreach ($newdata as $key => $val)
-			{
-				$this->userdata[$key] = $val;
-			}
-		}
-	
-		$this->sess_write();
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Delete a session variable from the "userdata" array
-	 *
-	 * @access	array
-	 * @return	void
-	 */		
-	function unset_userdata($newdata = array())
-	{
-		if (is_string($newdata))
-		{
-			$newdata = array($newdata => '');
-		}
-	
-		if (count($newdata) > 0)
-		{
-			foreach ($newdata as $key => $val)
-			{
-				unset($this->userdata[$key]);
-			}
-		}
-	
-		$this->sess_write();
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Strip slashes
-	 *
-	 * @access	public
-	 * @param	mixed
-	 * @return	mixed
-	 */
-	 function strip_slashes($vals)
-	 {
-	 	if (is_array($vals))
-	 	{	
-	 		foreach ($vals as $key=>$val)
-	 		{
-	 			$vals[$key] = $this->strip_slashes($val);
-	 		}
-	 	}
-	 	else
-	 	{
-	 		$vals = stripslashes($vals);
-	 	}
-	 	
-	 	return $vals;
-	}
-
-}
-// END Session Class
+CI =& get_instance();
+
+		log_message('debug', "Session Class Initialized");
+		$this->sess_run();
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Run the session routines
+	 *
+	 * @access	public
+	 * @return	void
+	 */		
+	function sess_run()
+	{
+		/*
+		 *  Set the "now" time
+		 *
+		 * It can either set to GMT or time(). The pref
+		 * is set in the config file.  If the developer
+		 * is doing any sort of time localization they
+		 * might want to set the session time to GMT so
+		 * they can offset the "last_activity" and
+		 * "last_visit" times based on each user's locale.
+		 *
+		 */
+		if (strtolower($this->CI->config->item('time_reference')) == 'gmt')
+		{
+			$now = time();
+			$this->now = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now));
+	
+			if (strlen($this->now) < 10)
+			{
+				$this->now = time();
+				log_message('error', 'The session class could not set a proper GMT timestamp so the local time() value was used.');
+			}
+		}
+		else
+		{
+			$this->now = time();
+		}
+		
+		/*
+		 *  Set the session length
+		 *
+		 * If the session expiration is set to zero in
+		 * the config file we'll set the expiration
+		 * two years from now.
+		 *
+		 */
+		$expiration = $this->CI->config->item('sess_expiration');
+		
+		if (is_numeric($expiration))
+		{
+			if ($expiration > 0)
+			{
+				$this->sess_length = $this->CI->config->item('sess_expiration');
+			}
+			else
+			{
+				$this->sess_length = (60*60*24*365*2);
+			}
+		}
+		
+		// Do we need encryption?
+		$this->encryption = $this->CI->config->item('sess_encrypt_cookie');
+	
+		if ($this->encryption == TRUE)	
+		{
+			$this->CI->load->library('encrypt');
+		}		
+
+		// Are we using a database?
+		if ($this->CI->config->item('sess_use_database') === TRUE AND $this->CI->config->item('sess_table_name') != '')
+		{
+			$this->use_database = TRUE;
+			$this->session_table = $this->CI->config->item('sess_table_name');
+			$this->CI->load->database();
+		}
+		
+		// Set the cookie name
+		if ($this->CI->config->item('sess_cookie_name') != FALSE)
+		{
+			$this->sess_cookie = $this->CI->config->item('cookie_prefix').$this->CI->config->item('sess_cookie_name');
+		}
+	
+		/*
+		 *  Fetch the current session
+		 *
+		 * If a session doesn't exist we'll create
+		 * a new one.  If it does, we'll update it.
+		 *
+		 */
+		if ( ! $this->sess_read())
+		{
+			$this->sess_create();
+		}
+		else
+		{	
+			// We only update the session every five minutes
+			if (($this->userdata['last_activity'] + 300) < $this->now)
+			{
+				$this->sess_update();
+			}
+		}
+		
+		// Delete expired sessions if necessary
+		if ($this->use_database === TRUE)
+		{		
+			$this->sess_gc();
+		}	
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch the current session data if it exists
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_read()
+	{	
+		// Fetch the cookie
+		$session = $this->CI->input->cookie($this->sess_cookie);
+		
+		if ($session === FALSE)
+		{
+			log_message('debug', 'A session cookie was not found.');
+			return FALSE;
+		}
+		
+		// Decrypt and unserialize the data
+		if ($this->encryption == TRUE)
+		{
+			$session = $this->CI->encrypt->decode($session);
+		}
+
+		$session = @unserialize($this->strip_slashes($session));
+		
+		if ( ! is_array($session) OR ! isset($session['last_activity']))
+		{
+			log_message('error', 'The session cookie data did not contain a valid array. This could be a possible hacking attempt.');
+			return FALSE;
+		}
+		
+		// Is the session current?
+		if (($session['last_activity'] + $this->sess_length) < $this->now)
+		{
+			$this->sess_destroy();
+			return FALSE;
+		}
+
+		// Does the IP Match?
+		if ($this->CI->config->item('sess_match_ip') == TRUE AND $session['ip_address'] != $this->CI->input->ip_address())
+		{
+			$this->sess_destroy();
+			return FALSE;
+		}
+		
+		// Does the User Agent Match?
+		if ($this->CI->config->item('sess_match_useragent') == TRUE AND $session['user_agent'] != substr($this->CI->input->user_agent(), 0, 50))
+		{
+			$this->sess_destroy();
+			return FALSE;
+		}
+		
+		// Is there a corresponding session in the DB?
+		if ($this->use_database === TRUE)
+		{
+			$this->CI->db->where('session_id', $session['session_id']);
+					
+			if ($this->CI->config->item('sess_match_ip') == TRUE)
+			{
+				$this->CI->db->where('ip_address', $session['ip_address']);
+			}
+
+			if ($this->CI->config->item('sess_match_useragent') == TRUE)
+			{
+				$this->CI->db->where('user_agent', $session['user_agent']);
+			}
+			
+			$query = $this->CI->db->get($this->session_table);
+
+			if ($query->num_rows() == 0)
+			{
+				$this->sess_destroy();
+				return FALSE;
+			}
+			else
+			{
+				$row = $query->row();
+				if (($row->last_activity + $this->sess_length) < $this->now)
+				{
+					$this->CI->db->where('session_id', $session['session_id']);
+					$this->CI->db->delete($this->session_table);
+					$this->sess_destroy();
+					return FALSE;
+				}
+			}
+		}
+	
+		// Session is valid!
+		$this->userdata = $session;
+		unset($session);
+		
+		return TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Write the session cookie
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_write()
+	{								
+		$cookie_data = serialize($this->userdata);
+		
+		if ($this->encryption == TRUE)
+		{
+			$cookie_data = $this->CI->encrypt->encode($cookie_data);
+		}
+
+		setcookie(
+					$this->sess_cookie,
+					$cookie_data,
+					$this->sess_length + time(),
+					$this->CI->config->item('cookie_path'),
+					$this->CI->config->item('cookie_domain'),
+					0
+				);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Create a new session
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_create()
+	{	
+		$sessid = '';
+		while (strlen($sessid) < 32)
+		{
+			$sessid .= mt_rand(0, mt_getrandmax());
+		}
+	
+		$this->userdata = array(
+							'session_id' 	=> md5(uniqid($sessid, TRUE)),
+							'ip_address' 	=> $this->CI->input->ip_address(),
+							'user_agent' 	=> substr($this->CI->input->user_agent(), 0, 50),
+							'last_activity'	=> $this->now
+							);
+		
+		
+		// Save the session in the DB if needed
+		if ($this->use_database === TRUE)
+		{
+			$this->CI->db->query($this->CI->db->insert_string($this->session_table, $this->userdata));
+		}
+			
+		// Write the cookie
+		$this->userdata['last_visit'] = 0;		
+		$this->sess_write();
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Update an existing session
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_update()
+	{	
+		if (($this->userdata['last_activity'] + $this->sess_length) < $this->now)
+		{
+			$this->userdata['last_visit'] = $this->userdata['last_activity'];
+		}
+	
+		$this->userdata['last_activity'] = $this->now;
+		
+		// Update the session in the DB if needed
+		if ($this->use_database === TRUE)
+		{		
+			$this->CI->db->query($this->CI->db->update_string($this->session_table, array('last_activity' => $this->now), array('session_id' => $this->userdata['session_id'])));
+		}
+		
+		// Write the cookie
+		$this->sess_write();
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Destroy the current session
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_destroy()
+	{
+		setcookie(
+					$this->sess_cookie,
+					addslashes(serialize(array())),
+					($this->now - 31500000),
+					$this->CI->config->item('cookie_path'),
+					$this->CI->config->item('cookie_domain'),
+					0
+				);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Garbage collection
+	 *
+	 * This deletes expired session rows from database
+	 * if the probability percentage is met
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function sess_gc()
+	{
+		srand(time());
+		if ((rand() % 100) < $this->gc_probability)
+		{
+			$expire = $this->now - $this->sess_length;
+			
+			$this->CI->db->where("last_activity < {$expire}");
+			$this->CI->db->delete($this->session_table);
+
+			log_message('debug', 'Session garbage collection performed.');
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a specific item form  the session array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */		
+	function userdata($item)
+	{
+		return ( ! isset($this->userdata[$item])) ? FALSE : $this->userdata[$item];
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Add or change data in the "userdata" array
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @param	string
+	 * @return	void
+	 */		
+	function set_userdata($newdata = array(), $newval = '')
+	{
+		if (is_string($newdata))
+		{
+			$newdata = array($newdata => $newval);
+		}
+	
+		if (count($newdata) > 0)
+		{
+			foreach ($newdata as $key => $val)
+			{
+				$this->userdata[$key] = $val;
+			}
+		}
+	
+		$this->sess_write();
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Delete a session variable from the "userdata" array
+	 *
+	 * @access	array
+	 * @return	void
+	 */		
+	function unset_userdata($newdata = array())
+	{
+		if (is_string($newdata))
+		{
+			$newdata = array($newdata => '');
+		}
+	
+		if (count($newdata) > 0)
+		{
+			foreach ($newdata as $key => $val)
+			{
+				unset($this->userdata[$key]);
+			}
+		}
+	
+		$this->sess_write();
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Strip slashes
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @return	mixed
+	 */
+	 function strip_slashes($vals)
+	 {
+	 	if (is_array($vals))
+	 	{	
+	 		foreach ($vals as $key=>$val)
+	 		{
+	 			$vals[$key] = $this->strip_slashes($val);
+	 		}
+	 	}
+	 	else
+	 	{
+	 		$vals = stripslashes($vals);
+	 	}
+	 	
+	 	return $vals;
+	}
+
+}
+// END Session Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php
index 4dde0403..451428de 100644
--- a/system/libraries/Sha1.php
+++ b/system/libraries/Sha1.php
@@ -1,249 +1,249 @@
-> 6) + 1;
-
-		for ($i = 0; $i < $n * 16; $i++)
-		{
-			$x[$i] = 0;
-		}
-
-		for ($i = 0; $i < strlen($str); $i++)
-		{
-			$x[$i >> 2] |= ord(substr($str, $i, 1)) << (24 - ($i % 4) * 8);
-		}
-
-		$x[$i >> 2] |= 0x80 << (24 - ($i % 4) * 8);
-
-		$x[$n * 16 - 1] = strlen($str) * 8;
-
-		$a =  1732584193;
-		$b = -271733879;
-		$c = -1732584194;
-		$d =  271733878;
-		$e = -1009589776;
-
-		for ($i = 0; $i < sizeof($x); $i += 16)
-		{
-			$olda = $a;
-			$oldb = $b;
-			$oldc = $c;
-			$oldd = $d;
-			$olde = $e;
-
-			for($j = 0; $j < 80; $j++)
-			{
-				if ($j < 16)
-				{
-					$w[$j] = $x[$i + $j];
-				}
-				else
-				{
-					$w[$j] = $this->_rol($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
-				}
-
-				$t = $this->_safe_add($this->_safe_add($this->_rol($a, 5), $this->_ft($j, $b, $c, $d)), $this->_safe_add($this->_safe_add($e, $w[$j]), $this->_kt($j)));
-
-				$e = $d;
-				$d = $c;
-				$c = $this->_rol($b, 30);
-				$b = $a;
-				$a = $t;
-			}
-
-			$a = $this->_safe_add($a, $olda);
-			$b = $this->_safe_add($b, $oldb);
-			$c = $this->_safe_add($c, $oldc);
-			$d = $this->_safe_add($d, $oldd);
-			$e = $this->_safe_add($e, $olde);
-		}
-
-		return $this->_hex($a).$this->_hex($b).$this->_hex($c).$this->_hex($d).$this->_hex($e);
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Convert a decimal to hex
-	 *
-	 * @access	private
-	 * @param	string
-	 * @return	string
-	 */	
-	function _hex($str)
-	{
-		$str = dechex($str);
-
-		if (strlen($str) == 7)
-		{
-			$str = '0'.$str;
-		}
-
-		return $str;
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 *  Return result based on iteration
-	 *
-	 * @access	private
-	 * @return	string
-	 */	
-	function _ft($t, $b, $c, $d)
-	{
-		if ($t < 20)
-			return ($b & $c) | ((~$b) & $d);
-		if ($t < 40)
-			return $b ^ $c ^ $d;
-		if ($t < 60)
-			return ($b & $c) | ($b & $d) | ($c & $d);
-
-		return $b ^ $c ^ $d;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Determine the additive constant
-	 *
-	 * @access	private
-	 * @return	string
-	 */	
-	function _kt($t)
-	{
-		if ($t < 20)
-		{
-			return 1518500249;
-		}
-		else if ($t < 40)
-		{
-			return 1859775393;
-		}
-		else if ($t < 60)
-		{
-			return -1894007588;
-		}
-		else
-		{
-			return -899497514;
-		}
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Add integers, wrapping at 2^32
-	 *
-	 * @access	private
-	 * @return	string
-	 */	
-	function _safe_add($x, $y)
-	{
-		$lsw = ($x & 0xFFFF) + ($y & 0xFFFF);
-		$msw = ($x >> 16) + ($y >> 16) + ($lsw >> 16);
-
-		return ($msw << 16) | ($lsw & 0xFFFF);
-	}
-  	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Bitwise rotate a 32-bit number
-	 *
-	 * @access	private
-	 * @return	integer
-	 */	
-	function _rol($num, $cnt)
-	{
-		return ($num << $cnt) | $this->_zero_fill($num, 32 - $cnt);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Pad string with zero
-	 *
-	 * @access	private
-	 * @return	string
-	 */	
-	function _zero_fill($a, $b)
-	{
-		$bin = decbin($a);
-
-		if (strlen($bin) < $b)
-		{
-			$bin = 0;
-		}
-		else
-		{
-			$bin = substr($bin, 0, strlen($bin) - $b);
-		}
-
-		for ($i=0; $i < $b; $i++)
-		{
-			$bin = "0".$bin;
-		}
-
-		return bindec($bin);
-	}
-}
-// END CI_SHA
+> 6) + 1;
+
+		for ($i = 0; $i < $n * 16; $i++)
+		{
+			$x[$i] = 0;
+		}
+
+		for ($i = 0; $i < strlen($str); $i++)
+		{
+			$x[$i >> 2] |= ord(substr($str, $i, 1)) << (24 - ($i % 4) * 8);
+		}
+
+		$x[$i >> 2] |= 0x80 << (24 - ($i % 4) * 8);
+
+		$x[$n * 16 - 1] = strlen($str) * 8;
+
+		$a =  1732584193;
+		$b = -271733879;
+		$c = -1732584194;
+		$d =  271733878;
+		$e = -1009589776;
+
+		for ($i = 0; $i < sizeof($x); $i += 16)
+		{
+			$olda = $a;
+			$oldb = $b;
+			$oldc = $c;
+			$oldd = $d;
+			$olde = $e;
+
+			for($j = 0; $j < 80; $j++)
+			{
+				if ($j < 16)
+				{
+					$w[$j] = $x[$i + $j];
+				}
+				else
+				{
+					$w[$j] = $this->_rol($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
+				}
+
+				$t = $this->_safe_add($this->_safe_add($this->_rol($a, 5), $this->_ft($j, $b, $c, $d)), $this->_safe_add($this->_safe_add($e, $w[$j]), $this->_kt($j)));
+
+				$e = $d;
+				$d = $c;
+				$c = $this->_rol($b, 30);
+				$b = $a;
+				$a = $t;
+			}
+
+			$a = $this->_safe_add($a, $olda);
+			$b = $this->_safe_add($b, $oldb);
+			$c = $this->_safe_add($c, $oldc);
+			$d = $this->_safe_add($d, $oldd);
+			$e = $this->_safe_add($e, $olde);
+		}
+
+		return $this->_hex($a).$this->_hex($b).$this->_hex($c).$this->_hex($d).$this->_hex($e);
+	}
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Convert a decimal to hex
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */	
+	function _hex($str)
+	{
+		$str = dechex($str);
+
+		if (strlen($str) == 7)
+		{
+			$str = '0'.$str;
+		}
+
+		return $str;
+	}
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 *  Return result based on iteration
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+	function _ft($t, $b, $c, $d)
+	{
+		if ($t < 20)
+			return ($b & $c) | ((~$b) & $d);
+		if ($t < 40)
+			return $b ^ $c ^ $d;
+		if ($t < 60)
+			return ($b & $c) | ($b & $d) | ($c & $d);
+
+		return $b ^ $c ^ $d;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Determine the additive constant
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+	function _kt($t)
+	{
+		if ($t < 20)
+		{
+			return 1518500249;
+		}
+		else if ($t < 40)
+		{
+			return 1859775393;
+		}
+		else if ($t < 60)
+		{
+			return -1894007588;
+		}
+		else
+		{
+			return -899497514;
+		}
+	}
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Add integers, wrapping at 2^32
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+	function _safe_add($x, $y)
+	{
+		$lsw = ($x & 0xFFFF) + ($y & 0xFFFF);
+		$msw = ($x >> 16) + ($y >> 16) + ($lsw >> 16);
+
+		return ($msw << 16) | ($lsw & 0xFFFF);
+	}
+  	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Bitwise rotate a 32-bit number
+	 *
+	 * @access	private
+	 * @return	integer
+	 */	
+	function _rol($num, $cnt)
+	{
+		return ($num << $cnt) | $this->_zero_fill($num, 32 - $cnt);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Pad string with zero
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+	function _zero_fill($a, $b)
+	{
+		$bin = decbin($a);
+
+		if (strlen($bin) < $b)
+		{
+			$bin = 0;
+		}
+		else
+		{
+			$bin = substr($bin, 0, strlen($bin) - $b);
+		}
+
+		for ($i=0; $i < $b; $i++)
+		{
+			$bin = "0".$bin;
+		}
+
+		return bindec($bin);
+	}
+}
+// END CI_SHA
 ?>
\ No newline at end of file
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 32223708..44acce65 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -1,12 +1,12 @@
  '', 'title' => '', 'excerpt' => '', 'blog_name' => '', 'charset' => '');
-	var $convert_ascii	= TRUE;
-	var $response		= '';
-	var $error_msg		= array();
-
-	/**
-	 * Constructor
-	 *
-	 * @access	public
-	 */
-	function CI_Trackback()
-	{
-		log_message('debug', "Trackback Class Initialized");
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Send Trackback
-	 *
-	 * @access	public
-	 * @param	array
-	 * @return	bool
-	 */	
-	function send($tb_data)
-	{		
-		if ( ! is_array($tb_data))
-		{
-			$this->set_error('The send() method must be passed an array');
-			return FALSE;
-		}
-		
-		// Pre-process the Trackback Data
-		foreach (array('url', 'title', 'excerpt', 'blog_name', 'ping_url') as $item)
-		{
-			if ( ! isset($tb_data[$item]))
-			{
-				$this->set_error('Required item missing: '.$item);
-				return FALSE;
-			}
-			
-			switch ($item)
-			{
-				case 'ping_url'	: $$item = $this->extract_urls($tb_data[$item]);
-					break;
-				case 'excerpt'	: $$item = $this->limit_characters($this->convert_xml(strip_tags(stripslashes($tb_data[$item]))));
-					break;
-				case 'url'	 	: $$item = str_replace('-', '-', $this->convert_xml(strip_tags(stripslashes($tb_data[$item]))));
-					break;
-				default			: $$item = $this->convert_xml(strip_tags(stripslashes($tb_data[$item])));
-					break;
-			}
-
-			// Convert High ASCII Characters
-			if ($this->convert_ascii == TRUE)
-			{
-				if ($item == 'excerpt')
-				{
-					$$item = $this->convert_ascii($$item);
-				}
-				elseif ($item == 'title')
-				{
-					$$item = $this->convert_ascii($$item);
-				}
-				elseif($item == 'blog_name')
-				{
-					$$item = $this->convert_ascii($$item);
-				}
-			}
-		}
-
-		// Build the Trackback data string
-		$charset = ( ! isset($tb_data['charset'])) ? $this->charset : $tb_data['charset'];
-		
-		$data = "url=".rawurlencode($url)."&title=".rawurlencode($title)."&blog_name=".rawurlencode($blog_name)."&excerpt=".rawurlencode($excerpt)."&charset=".rawurlencode($charset);
-				
-		// Send Trackback(s)
-		$return = TRUE;
-		if (count($ping_url) > 0)
-		{
-			foreach ($ping_url as $url)
-			{
-				if ($this->process($url, $data) == FALSE)
-				{
-					$return = FALSE;
-				}
-			}	
-		}
-
-		return $return;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Receive Trackback  Data
-	 *
-	 * This function simply validates the incoming TB data.
-	 * It returns false on failure and true on success.
-	 * If the data is valid it is set to the $this->data array
-	 * so that it can be inserted into a database.
-	 *
-	 * @access	public
-	 * @return	bool
-	 */	
-	function receive()
-	{  					
-		foreach (array('url', 'title', 'blog_name', 'excerpt') as $val)
-		{
-			if ( ! isset($_POST[$val]) OR $_POST[$val] == '')
-			{
-				$this->set_error('The following required POST variable is missing: '.$val);
-				return FALSE;
-			}
-			
-			$this->data['charset'] = ( ! isset($_POST['charset'])) ? 'auto' : strtoupper(trim($_POST['charset']));
-	
-			if ($val != 'url' && function_exists('mb_convert_encoding'))
-			{
-				$_POST[$val] = mb_convert_encoding($_POST[$val], $this->charset, $this->data['charset']);
-			}
-			
-			$_POST[$val] = ($val != 'url') ? $this->convert_xml(strip_tags($_POST[$val])) : strip_tags($_POST[$val]);
-			
-			if ($val == 'excerpt')
-			{
-				$_POST['excerpt'] = $this->limit_characters($_POST['excerpt']);
-			}
-			
-			$this->data[$val] = $_POST[$val];
-		}
-
-		return TRUE;
-	}	
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Send Trackback Error Message
-	 *
-	 * Allows custom errors to be set.  By default it
-	 * sends the "incomplete information" error, as that's
-	 * the most common one.
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function send_error($message = 'Incomplete Information')
-	{
-		echo "\n\n1\n".$message."\n";
-		exit;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Send Trackback Success Message
-	 *
-	 * This should be called when a trackback has been
-	 * successfully received and inserted.
-	 *
-	 * @access	public
-	 * @return	void
-	 */		
-	function send_success()
-	{
-		echo "\n\n0\n";
-		exit;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Fetch a particular item
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function data($item)
-	{
-		return ( ! isset($this->data[$item])) ? '' : $this->data[$item];
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Process Trackback
-	 *
-	 * Opens a socket connection and passes the data to
-	 * the server.  Returns true on success, false on failure
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	bool
-	 */	
-	function process($url, $data)
-	{
-		$target = parse_url($url);
-	
-		// Open the socket
-		if ( ! $fp = @fsockopen($target['host'], 80))
-		{
-			$this->set_error('Invalid Connection: '.$url);
-			return FALSE;
-		}
-
-		// Build the path
-		$ppath = ( ! isset($target['path'])) ? $url : $target['path'];
-		
-		$path = (isset($target['query']) && $target['query'] != "") ? $ppath.'?'.$target['query'] : $ppath;
-
-		// Add the Trackback ID to the data string
-		if ($id = $this->get_id($url))
-		{
-			$data = "tb_id=".$id."&".$data;
-		}
-
-		// Transfer the data
-		fputs ($fp, "POST " . $path . " HTTP/1.0\r\n" );
-		fputs ($fp, "Host: " . $target['host'] . "\r\n" );
-		fputs ($fp, "Content-type: application/x-www-form-urlencoded\r\n" );
-		fputs ($fp, "Content-length: " . strlen($data) . "\r\n" );
-		fputs ($fp, "Connection: close\r\n\r\n" );
-		fputs ($fp, $data);
-
-		// Was it successful?
-		$this->response = "";
-		
-		while(!feof($fp))
-		{
-			$this->response .= fgets($fp, 128);
-		}
-		@fclose($fp);
-		
-		if ( ! eregi("0", $this->response))
-		{
-			$message = 'An unknown error was encountered';
-			
-			if (preg_match("/(.*?)<\/message>/is", $this->response, $match))
-			{
-				$message = trim($match['1']);
-			}
-			
-			$this->set_error($message);
-			return FALSE;
-		}
-
-		return TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Extract Trackback URLs
-	 *
-	 * This function lets multiple trackbacks be sent.
-	 * It takes a string of URLs (separated by comma or
-	 * space) and puts each URL into an array
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function extract_urls($urls)
-	{		
-		// Remove the pesky white space and replace with a comma.
-		$urls = preg_replace("/\s*(\S+)\s*/", "\\1,", $urls);
-		
-		// If they use commas get rid of the doubles.
-		$urls = str_replace(",,", ",", $urls);
-		
-		// Remove any comma that might be at the end
-		if (substr($urls, -1) == ",")
-		{
-			$urls = substr($urls, 0, -1);
-		}
-				
-		// Break into an array via commas
-		$urls = preg_split('/[,]/', $urls);
-		
-		// Removes duplicates
-		$urls = array_unique($urls);
-		
-		array_walk($urls, array($this, 'validate_url'));
-		
-		return $urls;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Validate URL
-	 *
-	 * Simply adds "http://" if missing
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function validate_url($url)
-	{
-		$url = trim($url);
-
-		if (substr($url, 0, 4) != "http")
-		{
-			$url = "http://".$url;
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Find the Trackback URL's ID
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function get_id($url)
-	{	
-		$tb_id = "";
-		
-		if (strstr($url, '?'))
-		{
-			$tb_array = explode('/', $url);
-			$tb_end   = $tb_array[count($tb_array)-1];
-			
-			if ( ! is_numeric($tb_end))
-			{
-				$tb_end  = $tb_array[count($tb_array)-2];
-			}
-			
-			$tb_array = explode('=', $tb_end);
-			$tb_id	= $tb_array[count($tb_array)-1];
-		}
-		else
-		{
-			if (ereg("/$", $url))
-			{
-				$url = substr($url, 0, -1);
-			}
-				
-			$tb_array = explode('/', $url);
-			$tb_id	= $tb_array[count($tb_array)-1];
-			
-			if ( ! is_numeric($tb_id))
-			{
-				$tb_id  = $tb_array[count($tb_array)-2];
-			}
-		}	
-				
-		if ( ! preg_match ("/^([0-9]+)$/", $tb_id))
-		{
-			return false;
-		}
-		else
-		{
-			return $tb_id;
-		}		
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Convert Reserved XML characters to Entities
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */
-	function convert_xml($str)
-	{
-		$temp = '__TEMP_AMPERSANDS__';
-		
-		$str = preg_replace("/&#(\d+);/", "$temp\\1;", $str);
-		$str = preg_replace("/&(\w+);/",  "$temp\\1;", $str);
-		
-		$str = str_replace(array("&","<",">","\"", "'", "-"),
-						   array("&", "<", ">", """, "'", "-"),
-						   $str);
-			
-		$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
-		$str = preg_replace("/$temp(\w+);/","&\\1;", $str);
-			
-		return $str;
-	}	
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Character limiter
-	 *
-	 * Limits the string based on the character count. Will preserve complete words.
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	integer
-	 * @param	string
-	 * @return	string
-	 */
-	function limit_characters($str, $n = 500, $end_char = '…')
-	{
-		if (strlen($str) < $n)
-		{
-			return $str;
-		}
-			
-		$str = preg_replace("/\s+/", ' ', preg_replace("/(\r\n|\r|\n)/", " ", $str));
-	
-		if (strlen($str) <= $n)
-		{
-			return $str;
-		}
-										
-		$out = "";
-		foreach (explode(' ', trim($str)) as $val)
-		{
-			$out .= $val.' ';			
-			if (strlen($out) >= $n)
-			{
-				return trim($out).$end_char;
-			}		
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * High ASCII to Entities
-	 *
-	 * Converts Hight ascii text and MS Word special chars
-	 * to character entities
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */
-	function convert_ascii($str)
-	{
-	   $count	= 1;
-	   $out	= '';
-	   $temp	= array();
-		
-	   for ($i = 0, $s = strlen($str); $i < $s; $i++)
-	   {
-		   $ordinal = ord($str[$i]);
-		
-		   if ($ordinal < 128)
-		   {
-			   $out .= $str[$i];			
-		   }
-		   else
-		   {
-			   if (count($temp) == 0)
-			   {
-				   $count = ($ordinal < 224) ? 2 : 3;
-			   }
-			
-			   $temp[] = $ordinal;
-			
-			   if (count($temp) == $count)
-			   {
-				   $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64);
-	
-				   $out .= '&#'.$number.';';
-				   $count = 1;
-				   $temp = array();
-			   }
-		   }
-	   }
-	
-	   return $out;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set error message
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_error($msg)
-	{
-		log_message('error', $msg);
-		$this->error_msg[] = $msg;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Show error messages
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */	
-	function display_errors($open = '
                ', $close = '
                ')
-	{	
-		$str = '';
-		foreach ($this->error_msg as $val)
-		{
-			$str .= $open.$val.$close;
-		}
-	
-		return $str;
-	}
-
-}
-// END Trackback Class
+ '', 'title' => '', 'excerpt' => '', 'blog_name' => '', 'charset' => '');
+	var $convert_ascii	= TRUE;
+	var $response		= '';
+	var $error_msg		= array();
+
+	/**
+	 * Constructor
+	 *
+	 * @access	public
+	 */
+	function CI_Trackback()
+	{
+		log_message('debug', "Trackback Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Send Trackback
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	bool
+	 */	
+	function send($tb_data)
+	{		
+		if ( ! is_array($tb_data))
+		{
+			$this->set_error('The send() method must be passed an array');
+			return FALSE;
+		}
+		
+		// Pre-process the Trackback Data
+		foreach (array('url', 'title', 'excerpt', 'blog_name', 'ping_url') as $item)
+		{
+			if ( ! isset($tb_data[$item]))
+			{
+				$this->set_error('Required item missing: '.$item);
+				return FALSE;
+			}
+			
+			switch ($item)
+			{
+				case 'ping_url'	: $$item = $this->extract_urls($tb_data[$item]);
+					break;
+				case 'excerpt'	: $$item = $this->limit_characters($this->convert_xml(strip_tags(stripslashes($tb_data[$item]))));
+					break;
+				case 'url'	 	: $$item = str_replace('-', '-', $this->convert_xml(strip_tags(stripslashes($tb_data[$item]))));
+					break;
+				default			: $$item = $this->convert_xml(strip_tags(stripslashes($tb_data[$item])));
+					break;
+			}
+
+			// Convert High ASCII Characters
+			if ($this->convert_ascii == TRUE)
+			{
+				if ($item == 'excerpt')
+				{
+					$$item = $this->convert_ascii($$item);
+				}
+				elseif ($item == 'title')
+				{
+					$$item = $this->convert_ascii($$item);
+				}
+				elseif($item == 'blog_name')
+				{
+					$$item = $this->convert_ascii($$item);
+				}
+			}
+		}
+
+		// Build the Trackback data string
+		$charset = ( ! isset($tb_data['charset'])) ? $this->charset : $tb_data['charset'];
+		
+		$data = "url=".rawurlencode($url)."&title=".rawurlencode($title)."&blog_name=".rawurlencode($blog_name)."&excerpt=".rawurlencode($excerpt)."&charset=".rawurlencode($charset);
+				
+		// Send Trackback(s)
+		$return = TRUE;
+		if (count($ping_url) > 0)
+		{
+			foreach ($ping_url as $url)
+			{
+				if ($this->process($url, $data) == FALSE)
+				{
+					$return = FALSE;
+				}
+			}	
+		}
+
+		return $return;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Receive Trackback  Data
+	 *
+	 * This function simply validates the incoming TB data.
+	 * It returns false on failure and true on success.
+	 * If the data is valid it is set to the $this->data array
+	 * so that it can be inserted into a database.
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function receive()
+	{  					
+		foreach (array('url', 'title', 'blog_name', 'excerpt') as $val)
+		{
+			if ( ! isset($_POST[$val]) OR $_POST[$val] == '')
+			{
+				$this->set_error('The following required POST variable is missing: '.$val);
+				return FALSE;
+			}
+			
+			$this->data['charset'] = ( ! isset($_POST['charset'])) ? 'auto' : strtoupper(trim($_POST['charset']));
+	
+			if ($val != 'url' && function_exists('mb_convert_encoding'))
+			{
+				$_POST[$val] = mb_convert_encoding($_POST[$val], $this->charset, $this->data['charset']);
+			}
+			
+			$_POST[$val] = ($val != 'url') ? $this->convert_xml(strip_tags($_POST[$val])) : strip_tags($_POST[$val]);
+			
+			if ($val == 'excerpt')
+			{
+				$_POST['excerpt'] = $this->limit_characters($_POST['excerpt']);
+			}
+			
+			$this->data[$val] = $_POST[$val];
+		}
+
+		return TRUE;
+	}	
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Send Trackback Error Message
+	 *
+	 * Allows custom errors to be set.  By default it
+	 * sends the "incomplete information" error, as that's
+	 * the most common one.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function send_error($message = 'Incomplete Information')
+	{
+		echo "\n\n1\n".$message."\n";
+		exit;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Send Trackback Success Message
+	 *
+	 * This should be called when a trackback has been
+	 * successfully received and inserted.
+	 *
+	 * @access	public
+	 * @return	void
+	 */		
+	function send_success()
+	{
+		echo "\n\n0\n";
+		exit;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a particular item
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function data($item)
+	{
+		return ( ! isset($this->data[$item])) ? '' : $this->data[$item];
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Process Trackback
+	 *
+	 * Opens a socket connection and passes the data to
+	 * the server.  Returns true on success, false on failure
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	bool
+	 */	
+	function process($url, $data)
+	{
+		$target = parse_url($url);
+	
+		// Open the socket
+		if ( ! $fp = @fsockopen($target['host'], 80))
+		{
+			$this->set_error('Invalid Connection: '.$url);
+			return FALSE;
+		}
+
+		// Build the path
+		$ppath = ( ! isset($target['path'])) ? $url : $target['path'];
+		
+		$path = (isset($target['query']) && $target['query'] != "") ? $ppath.'?'.$target['query'] : $ppath;
+
+		// Add the Trackback ID to the data string
+		if ($id = $this->get_id($url))
+		{
+			$data = "tb_id=".$id."&".$data;
+		}
+
+		// Transfer the data
+		fputs ($fp, "POST " . $path . " HTTP/1.0\r\n" );
+		fputs ($fp, "Host: " . $target['host'] . "\r\n" );
+		fputs ($fp, "Content-type: application/x-www-form-urlencoded\r\n" );
+		fputs ($fp, "Content-length: " . strlen($data) . "\r\n" );
+		fputs ($fp, "Connection: close\r\n\r\n" );
+		fputs ($fp, $data);
+
+		// Was it successful?
+		$this->response = "";
+		
+		while(!feof($fp))
+		{
+			$this->response .= fgets($fp, 128);
+		}
+		@fclose($fp);
+		
+		if ( ! eregi("0", $this->response))
+		{
+			$message = 'An unknown error was encountered';
+			
+			if (preg_match("/(.*?)<\/message>/is", $this->response, $match))
+			{
+				$message = trim($match['1']);
+			}
+			
+			$this->set_error($message);
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Extract Trackback URLs
+	 *
+	 * This function lets multiple trackbacks be sent.
+	 * It takes a string of URLs (separated by comma or
+	 * space) and puts each URL into an array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function extract_urls($urls)
+	{		
+		// Remove the pesky white space and replace with a comma.
+		$urls = preg_replace("/\s*(\S+)\s*/", "\\1,", $urls);
+		
+		// If they use commas get rid of the doubles.
+		$urls = str_replace(",,", ",", $urls);
+		
+		// Remove any comma that might be at the end
+		if (substr($urls, -1) == ",")
+		{
+			$urls = substr($urls, 0, -1);
+		}
+				
+		// Break into an array via commas
+		$urls = preg_split('/[,]/', $urls);
+		
+		// Removes duplicates
+		$urls = array_unique($urls);
+		
+		array_walk($urls, array($this, 'validate_url'));
+		
+		return $urls;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Validate URL
+	 *
+	 * Simply adds "http://" if missing
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function validate_url($url)
+	{
+		$url = trim($url);
+
+		if (substr($url, 0, 4) != "http")
+		{
+			$url = "http://".$url;
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Find the Trackback URL's ID
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function get_id($url)
+	{	
+		$tb_id = "";
+		
+		if (strstr($url, '?'))
+		{
+			$tb_array = explode('/', $url);
+			$tb_end   = $tb_array[count($tb_array)-1];
+			
+			if ( ! is_numeric($tb_end))
+			{
+				$tb_end  = $tb_array[count($tb_array)-2];
+			}
+			
+			$tb_array = explode('=', $tb_end);
+			$tb_id	= $tb_array[count($tb_array)-1];
+		}
+		else
+		{
+			if (ereg("/$", $url))
+			{
+				$url = substr($url, 0, -1);
+			}
+				
+			$tb_array = explode('/', $url);
+			$tb_id	= $tb_array[count($tb_array)-1];
+			
+			if ( ! is_numeric($tb_id))
+			{
+				$tb_id  = $tb_array[count($tb_array)-2];
+			}
+		}	
+				
+		if ( ! preg_match ("/^([0-9]+)$/", $tb_id))
+		{
+			return false;
+		}
+		else
+		{
+			return $tb_id;
+		}		
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Convert Reserved XML characters to Entities
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function convert_xml($str)
+	{
+		$temp = '__TEMP_AMPERSANDS__';
+		
+		$str = preg_replace("/&#(\d+);/", "$temp\\1;", $str);
+		$str = preg_replace("/&(\w+);/",  "$temp\\1;", $str);
+		
+		$str = str_replace(array("&","<",">","\"", "'", "-"),
+						   array("&", "<", ">", """, "'", "-"),
+						   $str);
+			
+		$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
+		$str = preg_replace("/$temp(\w+);/","&\\1;", $str);
+			
+		return $str;
+	}	
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Character limiter
+	 *
+	 * Limits the string based on the character count. Will preserve complete words.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	integer
+	 * @param	string
+	 * @return	string
+	 */
+	function limit_characters($str, $n = 500, $end_char = '…')
+	{
+		if (strlen($str) < $n)
+		{
+			return $str;
+		}
+			
+		$str = preg_replace("/\s+/", ' ', preg_replace("/(\r\n|\r|\n)/", " ", $str));
+	
+		if (strlen($str) <= $n)
+		{
+			return $str;
+		}
+										
+		$out = "";
+		foreach (explode(' ', trim($str)) as $val)
+		{
+			$out .= $val.' ';			
+			if (strlen($out) >= $n)
+			{
+				return trim($out).$end_char;
+			}		
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * High ASCII to Entities
+	 *
+	 * Converts Hight ascii text and MS Word special chars
+	 * to character entities
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function convert_ascii($str)
+	{
+	   $count	= 1;
+	   $out	= '';
+	   $temp	= array();
+		
+	   for ($i = 0, $s = strlen($str); $i < $s; $i++)
+	   {
+		   $ordinal = ord($str[$i]);
+		
+		   if ($ordinal < 128)
+		   {
+			   $out .= $str[$i];			
+		   }
+		   else
+		   {
+			   if (count($temp) == 0)
+			   {
+				   $count = ($ordinal < 224) ? 2 : 3;
+			   }
+			
+			   $temp[] = $ordinal;
+			
+			   if (count($temp) == $count)
+			   {
+				   $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64);
+	
+				   $out .= '&#'.$number.';';
+				   $count = 1;
+				   $temp = array();
+			   }
+		   }
+	   }
+	
+	   return $out;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set error message
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_error($msg)
+	{
+		log_message('error', $msg);
+		$this->error_msg[] = $msg;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Show error messages
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function display_errors($open = '
                ', $close = '
                ')
+	{	
+		$str = '';
+		foreach ($this->error_msg as $val)
+		{
+			$str .= $open.$val.$close;
+		}
+	
+		return $str;
+	}
+
+}
+// END Trackback Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/URI.php b/system/libraries/URI.php
index 10654a69..5cedd8e0 100644
--- a/system/libraries/URI.php
+++ b/system/libraries/URI.php
@@ -1,367 +1,367 @@
-router =& load_class('Router');	
-		log_message('debug', "URI Class Initialized");
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Fetch a URI Segment
-	 *
-	 * This function returns the URI segment based on the number provided.
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @param	bool
-	 * @return	string
-	 */
-	function segment($n, $no_result = FALSE)
-	{
-		return ( ! isset($this->router->segments[$n])) ? $no_result : $this->router->segments[$n];
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Fetch a URI "routed" Segment
-	 *
-	 * This function returns the re-routed URI segment (assuming routing rules are used)
-	 * based on the number provided.  If there is no routing this function returns the
-	 * same result as $this->segment()
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @param	bool
-	 * @return	string
-	 */
-	function rsegment($n, $no_result = FALSE)
-	{
-		return ( ! isset($this->router->rsegments[$n])) ? $no_result : $this->router->rsegments[$n];
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Generate a key value pair from the URI string
-	 *
-	 * This function generates and associative array of URI data starting
-	 * at the supplied segment. For example, if this is your URI:
-	 *
-	 *	www.your-site.com/user/search/name/joe/location/UK/gender/male
-	 *
-	 * You can use this function to generate an array with this prototype:
-	 *
-	 * array (
-	 *			name => joe
-	 *			location => UK
-	 *			gender => male
-	 *		 )
-	 *
-	 * @access	public
-	 * @param	integer	the starting segment number
-	 * @param	array	an array of default values
-	 * @return	array
-	 */
-	function uri_to_assoc($n = 3, $default = array())
-	{
-	 	return $this->_uri_to_assoc($n, $default, 'segment');
-	}
-	/**
-	 * Identical to above only it uses the re-routed segment array
-	 *
-	 */
-	function ruri_to_assoc($n = 3, $default = array())
-	{
-	 	return $this->_uri_to_assoc($n, $default, 'rsegment');
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Generate a key value pair from the URI string or Re-routed URI string
-	 *
-	 * @access	private
-	 * @param	integer	the starting segment number
-	 * @param	array	an array of default values
-	 * @param	string	which array we should use
-	 * @return	array
-	 */
-	function _uri_to_assoc($n = 3, $default = array(), $which = 'segment')
-	{
-		if ($which == 'segment')
-		{
-			$total_segments = 'total_segments';
-			$segment_array = 'segment_array';
-		}
-		else
-		{
-			$total_segments = 'total_rsegments';
-			$segment_array = 'rsegment_array';
-		}
-		
-		if ( ! is_numeric($n))
-		{
-			return $default;
-		}
-	
-		if (isset($this->keyval[$n]))
-		{
-			return $this->keyval[$n];
-		}
-	
-		if ($this->$total_segments() < $n)
-		{
-			if (count($default) == 0)
-			{
-				return array();
-			}
-			
-			$retval = array();
-			foreach ($default as $val)
-			{
-				$retval[$val] = FALSE;
-			}		
-			return $retval;
-		}
-
-		$segments = array_slice($this->$segment_array(), ($n - 1));
-
-		$i = 0;
-		$lastval = '';
-		$retval  = array();
-		foreach ($segments as $seg)
-		{
-			if ($i % 2)
-			{
-				$retval[$lastval] = $seg;
-			}
-			else
-			{
-				$retval[$seg] = FALSE;
-				$lastval = $seg;
-			}
-		
-			$i++;
-		}
-
-		if (count($default) > 0)
-		{
-			foreach ($default as $val)
-			{
-				if ( ! array_key_exists($val, $retval))
-				{
-					$retval[$val] = FALSE;
-				}
-			}
-		}
-
-		// Cache the array for reuse
-		$this->keyval[$n] = $retval;
-		return $retval;
-	}
-
-	/**
-	 * Generate a URI string from an associative array
-	 *
-	 *
-	 * @access	public
-	 * @param	array	an associative array of key/values
-	 * @return	array
-	 */	function assoc_to_uri($array)
-	{	
-		$temp = array();
-		foreach ((array)$array as $key => $val)
-		{
-			$temp[] = $key;
-			$temp[] = $val;
-		}
-		
-		return implode('/', $temp);
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Fetch a URI Segment and add a trailing slash
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @param	string
-	 * @return	string
-	 */
-	function slash_segment($n, $where = 'trailing')
-	{
-		return $this->_slash_segment($n, $where, 'segment');
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Fetch a URI Segment and add a trailing slash
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @param	string
-	 * @return	string
-	 */
-	function slash_rsegment($n, $where = 'trailing')
-	{
-		return $this->_slash_segment($n, $where, 'rsegment');
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Fetch a URI Segment and add a trailing slash - helper function
-	 *
-	 * @access	private
-	 * @param	integer
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */
-	function _slash_segment($n, $where = 'trailing', $which = 'segment')
-	{	
-		if ($where == 'trailing')
-		{
-			$trailing	= '/';
-			$leading	= '';
-		}
-		elseif ($where == 'leading')
-		{
-			$leading	= '/';
-			$trailing	= '';
-		}
-		else
-		{
-			$leading	= '/';
-			$trailing	= '/';
-		}
-		return $leading.$this->$which($n).$trailing;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Segment Array
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	function segment_array()
-	{
-		return $this->router->segments;
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Routed Segment Array
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	function rsegment_array()
-	{
-		return $this->router->rsegments;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Total number of segments
-	 *
-	 * @access	public
-	 * @return	integer
-	 */
-	function total_segments()
-	{
-		return count($this->router->segments);
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Total number of routed segments
-	 *
-	 * @access	public
-	 * @return	integer
-	 */
-	function total_rsegments()
-	{
-		return count($this->router->rsegments);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Fetch the entire URI string
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	function uri_string()
-	{
-		return $this->router->uri_string;
-	}
-
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Fetch the entire Re-routed URI string
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	function ruri_string()
-	{
-		return '/'.implode('/', $this->rsegment_array()).'/';
-	}
-
-}
-// END URI Class
+router =& load_class('Router');	
+		log_message('debug', "URI Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a URI Segment
+	 *
+	 * This function returns the URI segment based on the number provided.
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @param	bool
+	 * @return	string
+	 */
+	function segment($n, $no_result = FALSE)
+	{
+		return ( ! isset($this->router->segments[$n])) ? $no_result : $this->router->segments[$n];
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a URI "routed" Segment
+	 *
+	 * This function returns the re-routed URI segment (assuming routing rules are used)
+	 * based on the number provided.  If there is no routing this function returns the
+	 * same result as $this->segment()
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @param	bool
+	 * @return	string
+	 */
+	function rsegment($n, $no_result = FALSE)
+	{
+		return ( ! isset($this->router->rsegments[$n])) ? $no_result : $this->router->rsegments[$n];
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate a key value pair from the URI string
+	 *
+	 * This function generates and associative array of URI data starting
+	 * at the supplied segment. For example, if this is your URI:
+	 *
+	 *	www.your-site.com/user/search/name/joe/location/UK/gender/male
+	 *
+	 * You can use this function to generate an array with this prototype:
+	 *
+	 * array (
+	 *			name => joe
+	 *			location => UK
+	 *			gender => male
+	 *		 )
+	 *
+	 * @access	public
+	 * @param	integer	the starting segment number
+	 * @param	array	an array of default values
+	 * @return	array
+	 */
+	function uri_to_assoc($n = 3, $default = array())
+	{
+	 	return $this->_uri_to_assoc($n, $default, 'segment');
+	}
+	/**
+	 * Identical to above only it uses the re-routed segment array
+	 *
+	 */
+	function ruri_to_assoc($n = 3, $default = array())
+	{
+	 	return $this->_uri_to_assoc($n, $default, 'rsegment');
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate a key value pair from the URI string or Re-routed URI string
+	 *
+	 * @access	private
+	 * @param	integer	the starting segment number
+	 * @param	array	an array of default values
+	 * @param	string	which array we should use
+	 * @return	array
+	 */
+	function _uri_to_assoc($n = 3, $default = array(), $which = 'segment')
+	{
+		if ($which == 'segment')
+		{
+			$total_segments = 'total_segments';
+			$segment_array = 'segment_array';
+		}
+		else
+		{
+			$total_segments = 'total_rsegments';
+			$segment_array = 'rsegment_array';
+		}
+		
+		if ( ! is_numeric($n))
+		{
+			return $default;
+		}
+	
+		if (isset($this->keyval[$n]))
+		{
+			return $this->keyval[$n];
+		}
+	
+		if ($this->$total_segments() < $n)
+		{
+			if (count($default) == 0)
+			{
+				return array();
+			}
+			
+			$retval = array();
+			foreach ($default as $val)
+			{
+				$retval[$val] = FALSE;
+			}		
+			return $retval;
+		}
+
+		$segments = array_slice($this->$segment_array(), ($n - 1));
+
+		$i = 0;
+		$lastval = '';
+		$retval  = array();
+		foreach ($segments as $seg)
+		{
+			if ($i % 2)
+			{
+				$retval[$lastval] = $seg;
+			}
+			else
+			{
+				$retval[$seg] = FALSE;
+				$lastval = $seg;
+			}
+		
+			$i++;
+		}
+
+		if (count($default) > 0)
+		{
+			foreach ($default as $val)
+			{
+				if ( ! array_key_exists($val, $retval))
+				{
+					$retval[$val] = FALSE;
+				}
+			}
+		}
+
+		// Cache the array for reuse
+		$this->keyval[$n] = $retval;
+		return $retval;
+	}
+
+	/**
+	 * Generate a URI string from an associative array
+	 *
+	 *
+	 * @access	public
+	 * @param	array	an associative array of key/values
+	 * @return	array
+	 */	function assoc_to_uri($array)
+	{	
+		$temp = array();
+		foreach ((array)$array as $key => $val)
+		{
+			$temp[] = $key;
+			$temp[] = $val;
+		}
+		
+		return implode('/', $temp);
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a URI Segment and add a trailing slash
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @param	string
+	 * @return	string
+	 */
+	function slash_segment($n, $where = 'trailing')
+	{
+		return $this->_slash_segment($n, $where, 'segment');
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a URI Segment and add a trailing slash
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @param	string
+	 * @return	string
+	 */
+	function slash_rsegment($n, $where = 'trailing')
+	{
+		return $this->_slash_segment($n, $where, 'rsegment');
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch a URI Segment and add a trailing slash - helper function
+	 *
+	 * @access	private
+	 * @param	integer
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */
+	function _slash_segment($n, $where = 'trailing', $which = 'segment')
+	{	
+		if ($where == 'trailing')
+		{
+			$trailing	= '/';
+			$leading	= '';
+		}
+		elseif ($where == 'leading')
+		{
+			$leading	= '/';
+			$trailing	= '';
+		}
+		else
+		{
+			$leading	= '/';
+			$trailing	= '/';
+		}
+		return $leading.$this->$which($n).$trailing;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Segment Array
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	function segment_array()
+	{
+		return $this->router->segments;
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Routed Segment Array
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	function rsegment_array()
+	{
+		return $this->router->rsegments;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Total number of segments
+	 *
+	 * @access	public
+	 * @return	integer
+	 */
+	function total_segments()
+	{
+		return count($this->router->segments);
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Total number of routed segments
+	 *
+	 * @access	public
+	 * @return	integer
+	 */
+	function total_rsegments()
+	{
+		return count($this->router->rsegments);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch the entire URI string
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function uri_string()
+	{
+		return $this->router->uri_string;
+	}
+
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Fetch the entire Re-routed URI string
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function ruri_string()
+	{
+		return '/'.implode('/', $this->rsegment_array()).'/';
+	}
+
+}
+// END URI Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
index f68f69e7..74ed1275 100644
--- a/system/libraries/Unit_test.php
+++ b/system/libraries/Unit_test.php
@@ -1,331 +1,331 @@
-active == FALSE)
-			return FALSE;
-			
-		if (in_array($expected, array('is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null'), TRUE))
-		{
-			$expected = str_replace('is_float', 'is_double', $expected);
-			$result = ($expected($test)) ? TRUE : FALSE;	
-			$extype = str_replace(array('true', 'false'), 'bool', str_replace('is_', '', $expected));
-		}
-		else
-		{
-			if ($this->strict == TRUE)
-				$result = ($test === $expected) ? TRUE : FALSE;	
-			else
-				$result = ($test == $expected) ? TRUE : FALSE;	
-			
-			$extype = gettype($expected);
-		}
-				
-		$back = $this->_backtrace();
-	
-		$report[] = array (
-							'test_name'			=> $test_name,
-							'test_datatype'		=> gettype($test),
-							'res_datatype'		=> $extype,
-							'result'			=> ($result === TRUE) ? 'passed' : 'failed',
-							'file'				=> $back['file'],
-							'line'				=> $back['line']
-						);
-
-		$this->results[] = $report;		
-				
-		return($this->report($this->result($report)));
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Generate a report
-	 *
-	 * Displays a table with the test data
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	function report($result = array())
-	{	
-		if (count($result) == 0)
-		{
-			$result = $this->result();
-		}
-		
-		$this->_parse_template();
-	
-		$r = '';
-		foreach ($result as $res)
-		{
-			$table = '';
-		
-			foreach ($res as $key => $val)
-			{
-				$temp = $this->_template_rows;			
-				$temp = str_replace('{item}', $key, $temp);
-				$temp = str_replace('{result}', $val, $temp);
-				$table .= $temp;
-			}
-			
-			$r .= str_replace('{rows}', $table, $this->_template);
-		}
-	
-		return $r;	
-	}	
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Use strict comparison
-	 *
-	 * Causes the evaluation to use === rather then ==
-	 *
-	 * @access	public
-	 * @param	bool
-	 * @return	null
-	 */
-	function use_strict($state = TRUE)
-	{
-		$this->strict = ($state == FALSE) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Make Unit testing active
-	 *
-	 * Enables/disables unit testing
-	 *
-	 * @access	public
-	 * @param	bool
-	 * @return	null
-	 */
-	function active($state = TRUE)
-	{
-		$this->active = ($state == FALSE) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Result Array
-	 *
-	 * Returns the raw result data
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	function result($results = array())
-	{	
-		$CI =& get_instance();
-		$CI->load->language('unit_test');
-		
-		if (count($results) == 0)
-		{
-			$results = $this->results;
-		}
-		
-		$retval = array();
-		foreach ($results as $result)
-		{
-			$temp = array();
-			foreach ($result as $key => $val)
-			{
-				if (is_array($val))
-				{
-					foreach ($val as $k => $v)
-					{
-						if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$v))))
-						{
-							$v = $line;
-						}				
-						$temp[$CI->lang->line('ut_'.$k)] = $v;					
-					}
-				}
-				else
-				{
-					if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$val))))
-					{
-						$val = $line;
-					}				
-					$temp[$CI->lang->line('ut_'.$key)] = $val;
-				}
-			}
-			
-			$retval[] = $temp;
-		}
-	
-		return $retval;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set the template
-	 *
-	 * This lets us set the template to be used to display results
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_template($template)
-	{
-		$this->_template = $template;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Generate a backtrace
-	 *
-	 * This lets us show file names and line numbers
-	 *
-	 * @access	private
-	 * @return	array
-	 */
-	function _backtrace()
-	{
-		if (function_exists('debug_backtrace'))
-		{
-			$back = debug_backtrace();
-			
-			$file = ( ! isset($back['1']['file'])) ? '' : $back['1']['file'];
-			$line = ( ! isset($back['1']['line'])) ? '' : $back['1']['line'];
-						
-			return array('file' => $file, 'line' => $line);
-		}
-		return array('file' => 'Unknown', 'line' => 'Unknown');
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Get Default Template
-	 *
-	 * @access	private
-	 * @return	string
-	 */
-	function _default_template()
-	{	
-		$this->_template = '	
-		
                
-				
-		{rows}
-		
                ';
-		
-		$this->_template_rows = '
-		
-		{item}
-		{result}
-		
-		';	
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Parse Template
-	 *
-	 * Harvests the data within the template {pseudo-variables}
-	 *
-	 * @access	private
-	 * @return	void
-	 */
- 	function _parse_template()
- 	{
- 		if ( ! is_null($this->_template_rows))
- 		{
- 			return;
- 		}
- 		
- 		if (is_null($this->_template))
- 		{
- 			$this->_default_template();
- 			return;
- 		}
- 		
-		if ( ! preg_match("/\{rows\}(.*?)\{\/rows\}/si", $this->_template, $match))
-		{
- 			$this->_default_template();
- 			return;
-		}
-
-		$this->_template_rows = $match['1'];
-		$this->_template = str_replace($match['0'], '{rows}', $this->_template); 	
- 	}
- 	
-}
-// END Unit_test Class
-
-/**
- * Helper functions to test boolean true/false
- *
- *
- * @access	private
- * @return	bool
- */
-function is_true($test)
-{
-	return (is_bool($test) AND $test === TRUE) ? TRUE : FALSE;
-}
-function is_false($test)
-{
-	return (is_bool($test) AND $test === FALSE) ? TRUE : FALSE;
-}
-
+active == FALSE)
+			return FALSE;
+			
+		if (in_array($expected, array('is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null'), TRUE))
+		{
+			$expected = str_replace('is_float', 'is_double', $expected);
+			$result = ($expected($test)) ? TRUE : FALSE;	
+			$extype = str_replace(array('true', 'false'), 'bool', str_replace('is_', '', $expected));
+		}
+		else
+		{
+			if ($this->strict == TRUE)
+				$result = ($test === $expected) ? TRUE : FALSE;	
+			else
+				$result = ($test == $expected) ? TRUE : FALSE;	
+			
+			$extype = gettype($expected);
+		}
+				
+		$back = $this->_backtrace();
+	
+		$report[] = array (
+							'test_name'			=> $test_name,
+							'test_datatype'		=> gettype($test),
+							'res_datatype'		=> $extype,
+							'result'			=> ($result === TRUE) ? 'passed' : 'failed',
+							'file'				=> $back['file'],
+							'line'				=> $back['line']
+						);
+
+		$this->results[] = $report;		
+				
+		return($this->report($this->result($report)));
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate a report
+	 *
+	 * Displays a table with the test data
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function report($result = array())
+	{	
+		if (count($result) == 0)
+		{
+			$result = $this->result();
+		}
+		
+		$this->_parse_template();
+	
+		$r = '';
+		foreach ($result as $res)
+		{
+			$table = '';
+		
+			foreach ($res as $key => $val)
+			{
+				$temp = $this->_template_rows;			
+				$temp = str_replace('{item}', $key, $temp);
+				$temp = str_replace('{result}', $val, $temp);
+				$table .= $temp;
+			}
+			
+			$r .= str_replace('{rows}', $table, $this->_template);
+		}
+	
+		return $r;	
+	}	
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Use strict comparison
+	 *
+	 * Causes the evaluation to use === rather then ==
+	 *
+	 * @access	public
+	 * @param	bool
+	 * @return	null
+	 */
+	function use_strict($state = TRUE)
+	{
+		$this->strict = ($state == FALSE) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Make Unit testing active
+	 *
+	 * Enables/disables unit testing
+	 *
+	 * @access	public
+	 * @param	bool
+	 * @return	null
+	 */
+	function active($state = TRUE)
+	{
+		$this->active = ($state == FALSE) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Result Array
+	 *
+	 * Returns the raw result data
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	function result($results = array())
+	{	
+		$CI =& get_instance();
+		$CI->load->language('unit_test');
+		
+		if (count($results) == 0)
+		{
+			$results = $this->results;
+		}
+		
+		$retval = array();
+		foreach ($results as $result)
+		{
+			$temp = array();
+			foreach ($result as $key => $val)
+			{
+				if (is_array($val))
+				{
+					foreach ($val as $k => $v)
+					{
+						if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$v))))
+						{
+							$v = $line;
+						}				
+						$temp[$CI->lang->line('ut_'.$k)] = $v;					
+					}
+				}
+				else
+				{
+					if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$val))))
+					{
+						$val = $line;
+					}				
+					$temp[$CI->lang->line('ut_'.$key)] = $val;
+				}
+			}
+			
+			$retval[] = $temp;
+		}
+	
+		return $retval;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set the template
+	 *
+	 * This lets us set the template to be used to display results
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_template($template)
+	{
+		$this->_template = $template;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Generate a backtrace
+	 *
+	 * This lets us show file names and line numbers
+	 *
+	 * @access	private
+	 * @return	array
+	 */
+	function _backtrace()
+	{
+		if (function_exists('debug_backtrace'))
+		{
+			$back = debug_backtrace();
+			
+			$file = ( ! isset($back['1']['file'])) ? '' : $back['1']['file'];
+			$line = ( ! isset($back['1']['line'])) ? '' : $back['1']['line'];
+						
+			return array('file' => $file, 'line' => $line);
+		}
+		return array('file' => 'Unknown', 'line' => 'Unknown');
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Get Default Template
+	 *
+	 * @access	private
+	 * @return	string
+	 */
+	function _default_template()
+	{	
+		$this->_template = '	
+		
                
+				
+		{rows}
+		
                ';
+		
+		$this->_template_rows = '
+		
+		{item}
+		{result}
+		
+		';	
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Parse Template
+	 *
+	 * Harvests the data within the template {pseudo-variables}
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+ 	function _parse_template()
+ 	{
+ 		if ( ! is_null($this->_template_rows))
+ 		{
+ 			return;
+ 		}
+ 		
+ 		if (is_null($this->_template))
+ 		{
+ 			$this->_default_template();
+ 			return;
+ 		}
+ 		
+		if ( ! preg_match("/\{rows\}(.*?)\{\/rows\}/si", $this->_template, $match))
+		{
+ 			$this->_default_template();
+ 			return;
+		}
+
+		$this->_template_rows = $match['1'];
+		$this->_template = str_replace($match['0'], '{rows}', $this->_template); 	
+ 	}
+ 	
+}
+// END Unit_test Class
+
+/**
+ * Helper functions to test boolean true/false
+ *
+ *
+ * @access	private
+ * @return	bool
+ */
+function is_true($test)
+{
+	return (is_bool($test) AND $test === TRUE) ? TRUE : FALSE;
+}
+function is_false($test)
+{
+	return (is_bool($test) AND $test === FALSE) ? TRUE : FALSE;
+}
+
 ?>
\ No newline at end of file
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index ff0fb1cb..564e2993 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1,809 +1,809 @@
- 0)
-		{
-			$this->initialize($props);
-		}
-		
-		log_message('debug', "Upload Class Initialized");
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Initialize preferences
-	 *
-	 * @access	public
-	 * @param	array
-	 * @return	void
-	 */	
-	function initialize($config = array())
-	{
-		$defaults = array(
-							'max_size'			=> 0,
-							'max_width'			=> 0,
-							'max_height'		=> 0,
-							'allowed_types'		=> "",
-							'file_temp'			=> "",
-							'file_name'			=> "",
-							'orig_name'			=> "",
-							'file_type'			=> "",
-							'file_size'			=> "",
-							'file_ext'			=> "",
-							'upload_path'		=> "",
-							'overwrite'			=> FALSE,
-							'encrypt_name'		=> FALSE,
-							'is_image'			=> FALSE,
-							'image_width'		=> '',
-							'image_height'		=> '',
-							'image_type'		=> '',
-							'image_size_str'	=> '',
-							'error_msg'			=> array(),
-							'mimes'				=> array(),
-							'remove_spaces'		=> TRUE,
-							'xss_clean'			=> FALSE,
-							'temp_prefix'		=> "temp_file_"
-						);	
-	
-	
-		foreach ($defaults as $key => $val)
-		{
-			if (isset($config[$key]))
-			{
-				$method = 'set_'.$key;
-				if (method_exists($this, $method))
-				{
-					$this->$method($config[$key]);
-				}
-				else
-				{
-					$this->$key = $config[$key];
-				}			
-			}
-			else
-			{
-				$this->$key = $val;
-			}
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Perform the file upload
-	 *
-	 * @access	public
-	 * @return	bool
-	 */	
-	function do_upload($field = 'userfile')
-	{
-		// Is $_FILES[$field] set? If not, no reason to continue.
-		if ( ! isset($_FILES[$field]))
-		{
-			$this->set_error('upload_userfile_not_set');
-			return FALSE;
-		}
-		
-		// Is the upload path valid?
-		if ( ! $this->validate_upload_path())
-		{
-			return FALSE;
-		}
-						
-		// Was the file able to be uploaded? If not, determine the reason why.
-		if ( ! is_uploaded_file($_FILES[$field]['tmp_name']))
-		{
-			$error = ( ! isset($_FILES[$field]['error'])) ? 4 : $_FILES[$field]['error'];
-
-			switch($error)
-			{
-				case 1  :   $this->set_error('upload_file_exceeds_limit');
-					break;
-				case 3  :   $this->set_error('upload_file_partial');
-					break;
-				case 4  :   $this->set_error('upload_no_file_selected');
-					break;
-				default :   $this->set_error('upload_no_file_selected');
-					break;
-			}
-
-			return FALSE;
-		}
-
-		// Set the uploaded data as class variables
-		$this->file_temp = $_FILES[$field]['tmp_name'];		
-		$this->file_name = $_FILES[$field]['name'];
-		$this->file_size = $_FILES[$field]['size'];		
-		$this->file_type = preg_replace("/^(.+?);.*$/", "\\1", $_FILES[$field]['type']);
-		$this->file_type = strtolower($this->file_type);
-		$this->file_ext	 = $this->get_extension($_FILES[$field]['name']);
-		
-		// Convert the file size to kilobytes
-		if ($this->file_size > 0)
-		{
-			$this->file_size = round($this->file_size/1024, 2);
-		}
-
-		// Is the file type allowed to be uploaded?
-		if ( ! $this->is_allowed_filetype())
-		{
-			$this->set_error('upload_invalid_filetype');
-			return FALSE;
-		}
-
-		// Is the file size within the allowed maximum?
-		if ( ! $this->is_allowed_filesize())
-		{
-			$this->set_error('upload_invalid_filesize');
-			return FALSE;
-		}
-
-		// Are the image dimensions within the allowed size?
-		// Note: This can fail if the server has an open_basdir restriction.
-		if ( ! $this->is_allowed_dimensions())
-		{
-			$this->set_error('upload_invalid_dimensions');
-			return FALSE;
-		}
-
-		// Sanitize the file name for security
-		$this->file_name = $this->clean_file_name($this->file_name);
-
-		// Remove white spaces in the name
-		if ($this->remove_spaces == TRUE)
-		{
-			$this->file_name = preg_replace("/\s+/", "_", $this->file_name);
-		}
-
-		/*
-		 * Validate the file name
-		 * This function appends an number onto the end of
-		 * the file if one with the same name already exists.
-		 * If it returns false there was a problem.
-		 */
-		$this->orig_name = $this->file_name;
-
-		if ($this->overwrite == FALSE)
-		{
-			$this->file_name = $this->set_filename($this->upload_path, $this->file_name);
-			
-			if ($this->file_name === FALSE)
-			{
-				return FALSE;
-			}
-		}
-
-		/*
-		 * Move the file to the final destination
-		 * To deal with different server configurations
-		 * we'll attempt to use copy() first.  If that fails
-		 * we'll use move_uploaded_file().  One of the two should
-		 * reliably work in most environments
-		 */
-		if ( ! @copy($this->file_temp, $this->upload_path.$this->file_name))
-		{
-			if ( ! @move_uploaded_file($this->file_temp, $this->upload_path.$this->file_name))
-			{
-				 $this->set_error('upload_destination_error');
-				 return FALSE;
-			}
-		}
-		
-		/*
-		 * Run the file through the XSS hacking filter
-		 * This helps prevent malicious code from being
-		 * embedded within a file.  Scripts can easily
-		 * be disguised as images or other file types.
-		 */
-		if ($this->xss_clean == TRUE)
-		{
-			$this->do_xss_clean();
-		}
-
-		/*
-		 * Set the finalized image dimensions
-		 * This sets the image width/height (assuming the
-		 * file was an image).  We use this information
-		 * in the "data" function.
-		 */
-		$this->set_image_properties($this->upload_path.$this->file_name);
-
-		return TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Finalized Data Array
-	 *	
-	 * Returns an associative array containing all of the information
-	 * related to the upload, allowing the developer easy access in one array.
-	 *
-	 * @access	public
-	 * @return	array
-	 */	
-	function data()
-	{
-		return array (
-						'file_name'			=> $this->file_name,
-						'file_type'			=> $this->file_type,
-						'file_path'			=> $this->upload_path,
-						'full_path'			=> $this->upload_path.$this->file_name,
-						'raw_name'			=> str_replace($this->file_ext, '', $this->file_name),
-						'orig_name'			=> $this->orig_name,
-						'file_ext'			=> $this->file_ext,
-						'file_size'			=> $this->file_size,
-						'is_image'			=> $this->is_image(),
-						'image_width'		=> $this->image_width,
-						'image_height'		=> $this->image_height,
-						'image_type'		=> $this->image_type,
-						'image_size_str'	=> $this->image_size_str,
-					);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Upload Path
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_upload_path($path)
-	{
-		$this->upload_path = $path;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set the file name
-	 *
-	 * This function takes a filename/path as input and looks for the
-	 * existence of a file with the same name. If found, it will append a
-	 * number to the end of the filename to avoid overwriting a pre-existing file.
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */	
-	function set_filename($path, $filename)
-	{
-		if ($this->encrypt_name == TRUE)
-		{		
-			mt_srand();
-			$filename = md5(uniqid(mt_rand())).$this->file_ext; 			
-		}
-	
-		if ( ! file_exists($path.$filename))
-		{
-			return $filename;
-		}
-	
-		$filename = str_replace($this->file_ext, '', $filename);
-		
-		$new_filename = '';
-		for ($i = 1; $i < 100; $i++)
-		{			
-			if ( ! file_exists($path.$filename.$i.$this->file_ext))
-			{
-				$new_filename = $filename.$i.$this->file_ext;
-				break;
-			}
-		}
-
-		if ($new_filename == '')
-		{
-			$this->set_error('upload_bad_filename');
-			return FALSE;
-		}
-		else
-		{
-			return $new_filename;
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Maximum File Size
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @return	void
-	 */	
-	function set_max_filesize($n)
-	{
-		$this->max_size = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Maximum Image Width
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @return	void
-	 */	
-	function set_max_width($n)
-	{
-		$this->max_width = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Maximum Image Height
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @return	void
-	 */	
-	function set_max_height($n)
-	{
-		$this->max_height = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Allowed File Types
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_allowed_types($types)
-	{
-		$this->allowed_types = explode('|', $types);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Image Properties
-	 *
-	 * Uses GD to determine the width/height/type of image
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_image_properties($path = '')
-	{
-		if ( ! $this->is_image())
-		{
-			return;
-		}
-
-		if (function_exists('getimagesize'))
-		{
-			if (FALSE !== ($D = @getimagesize($path)))
-			{	
-				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
-
-				$this->image_width		= $D['0'];
-				$this->image_height		= $D['1'];
-				$this->image_type		= ( ! isset($types[$D['2']])) ? 'unknown' : $types[$D['2']];
-				$this->image_size_str	= $D['3'];  // string containing height and width
-			}
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set XSS Clean
-	 *
-	 * Enables the XSS flag so that the file that was uploaded
-	 * will be run through the XSS filter.
-	 *
-	 * @access	public
-	 * @param	bool
-	 * @return	void
-	 */
-	function set_xss_clean($flag = FALSE)
-	{
-		$this->xss_clean = ($flag == TRUE) ? TRUE : FALSE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Validate the image
-	 *
-	 * @access	public
-	 * @return	bool
-	 */	
-	function is_image()
-	{
-		$img_mimes = array(
-							'image/gif',
-							'image/jpg',
-							'image/jpe',
-							'image/jpeg',
-							'image/pjpeg',
-							'image/png',
-							'image/x-png'
-						   );
-
-
-		return (in_array($this->file_type, $img_mimes, TRUE)) ? TRUE : FALSE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Verify that the filetype is allowed
-	 *
-	 * @access	public
-	 * @return	bool
-	 */	
-	function is_allowed_filetype()
-	{
-		if (count($this->allowed_types) == 0)
-		{
-			$this->set_error('upload_no_file_types');
-			return FALSE;
-		}
-			 	
-		foreach ($this->allowed_types as $val)
-		{
-			$mime = $this->mimes_types(strtolower($val));
-		
-			if (is_array($mime))
-			{
-				if (in_array($this->file_type, $mime, TRUE))
-				{
-					return TRUE;
-				}
-			}
-			else
-			{
-				if ($mime == $this->file_type)
-				{
-					return TRUE;
-				}	
-			}		
-		}
-		
-		return FALSE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Verify that the file is within the allowed size
-	 *
-	 * @access	public
-	 * @return	bool
-	 */	
-	function is_allowed_filesize()
-	{
-		if ($this->max_size != 0  AND  $this->file_size > $this->max_size)
-		{
-			return FALSE;
-		}
-		else
-		{
-			return TRUE;
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Verify that the image is within the allowed width/height
-	 *
-	 * @access	public
-	 * @return	bool
-	 */	
-	function is_allowed_dimensions()
-	{
-		if ( ! $this->is_image())
-		{
-			return TRUE;
-		}
-
-		if (function_exists('getimagesize'))
-		{
-			$D = @getimagesize($this->file_temp);
-
-			if ($this->max_width > 0 AND $D['0'] > $this->max_width)
-			{
-				return FALSE;
-			}
-
-			if ($this->max_height > 0 AND $D['1'] > $this->max_height)
-			{
-				return FALSE;
-			}
-
-			return TRUE;
-		}
-
-		return TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Validate Upload Path
-	 *
-	 * Verifies that it is a valid upload path with proper permissions.
-	 *
-	 *
-	 * @access	public
-	 * @return	bool
-	 */	
-	function validate_upload_path()
-	{
-		if ($this->upload_path == '')
-		{
-			$this->set_error('upload_no_filepath');
-			return FALSE;
-		}
-		
-		if (function_exists('realpath') AND @realpath($this->upload_path) !== FALSE)
-		{
-			$this->upload_path = str_replace("\\", "/", realpath($this->upload_path));
-		}
-
-		if ( ! @is_dir($this->upload_path))
-		{
-			$this->set_error('upload_no_filepath');
-			return FALSE;
-		}
-
-		if ( ! is_writable($this->upload_path))
-		{
-			$this->set_error('upload_not_writable');
-			return FALSE;
-		}
-
-		$this->upload_path = preg_replace("/(.+?)\/*$/", "\\1/",  $this->upload_path);
-		return TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Extract the file extension
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function get_extension($filename)
-	{
-		$x = explode('.', $filename);
-		return '.'.end($x);
-	}	
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Clean the file name for security
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */		
-	function clean_file_name($filename)
-	{
-		$bad = array(
-						"",
-						"'",
-						"<",
-						">",
-						'"',
-						'&',
-						'$',
-						'=',
-						';',
-						'?',
-						'/',
-						"%20",
-						"%22",
-						"%3c",		// <
-						"%253c", 	// <
-						"%3e", 		// >
-						"%0e", 		// >
-						"%28", 		// (
-						"%29", 		// )
-						"%2528", 	// (
-						"%26", 		// &
-						"%24", 		// $
-						"%3f", 		// ?
-						"%3b", 		// ;
-						"%3d"		// =
-					);
-					
-		foreach ($bad as $val)
-		{
-			$filename = str_replace($val, '', $filename);
-		}
-
-		return $filename;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Runs the file through the XSS clean function
-	 *
-	 * This prevents people from embedding malicious code in their files.
-	 * I'm not sure that it won't negatively affect certain files in unexpected ways,
-	 * but so far I haven't found that it causes trouble.
-	 *
-	 * @access	public
-	 * @return	void
-	 */	
-	function do_xss_clean()
-	{		
-		$file = $this->upload_path.$this->file_name;
-		
-		if (filesize($file) == 0)
-		{
-			return FALSE;
-		}
-	
-		if ( ! $fp = @fopen($file, 'rb'))
-		{
-			return FALSE;
-		}
-			
-		flock($fp, LOCK_EX);
-
-		$data = fread($fp, filesize($file));
-		
-		$CI =& get_instance();	
-		$data = $CI->input->xss_clean($data);
-
-		fwrite($fp, $data);
-		flock($fp, LOCK_UN);
-		fclose($fp);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set an error message
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_error($msg)
-	{
-		$CI =& get_instance();	
-		$CI->lang->load('upload');
-		
-		if (is_array($msg))
-		{
-			foreach ($msg as $val)
-			{
-				$msg = ($CI->lang->line($val) == FALSE) ? $val : $CI->lang->line($val);				
-				$this->error_msg[] = $msg;
-				log_message('error', $msg);
-			}		
-		}
-		else
-		{
-			$msg = ($CI->lang->line($msg) == FALSE) ? $msg : $CI->lang->line($msg);
-			$this->error_msg[] = $msg;
-			log_message('error', $msg);
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Display the error message
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */	
-	function display_errors($open = '
                ', $close = '
                ')
-	{
-		$str = '';
-		foreach ($this->error_msg as $val)
-		{
-			$str .= $open.$val.$close;
-		}
-	
-		return $str;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * List of Mime Types
-	 *
-	 * This is a list of mime types.  We use it to validate
-	 * the "allowed types" set by the developer
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function mimes_types($mime)
-	{
-		if (count($this->mimes) == 0)
-		{
-			if (@include(APPPATH.'config/mimes'.EXT))
-			{
-				$this->mimes = $mimes;
-				unset($mimes);
-			}
-		}
-	
-		return ( ! isset($this->mimes[$mime])) ? FALSE : $this->mimes[$mime];
-	}
-
-}
-// END Upload Class
+ 0)
+		{
+			$this->initialize($props);
+		}
+		
+		log_message('debug', "Upload Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Initialize preferences
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	void
+	 */	
+	function initialize($config = array())
+	{
+		$defaults = array(
+							'max_size'			=> 0,
+							'max_width'			=> 0,
+							'max_height'		=> 0,
+							'allowed_types'		=> "",
+							'file_temp'			=> "",
+							'file_name'			=> "",
+							'orig_name'			=> "",
+							'file_type'			=> "",
+							'file_size'			=> "",
+							'file_ext'			=> "",
+							'upload_path'		=> "",
+							'overwrite'			=> FALSE,
+							'encrypt_name'		=> FALSE,
+							'is_image'			=> FALSE,
+							'image_width'		=> '',
+							'image_height'		=> '',
+							'image_type'		=> '',
+							'image_size_str'	=> '',
+							'error_msg'			=> array(),
+							'mimes'				=> array(),
+							'remove_spaces'		=> TRUE,
+							'xss_clean'			=> FALSE,
+							'temp_prefix'		=> "temp_file_"
+						);	
+	
+	
+		foreach ($defaults as $key => $val)
+		{
+			if (isset($config[$key]))
+			{
+				$method = 'set_'.$key;
+				if (method_exists($this, $method))
+				{
+					$this->$method($config[$key]);
+				}
+				else
+				{
+					$this->$key = $config[$key];
+				}			
+			}
+			else
+			{
+				$this->$key = $val;
+			}
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Perform the file upload
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function do_upload($field = 'userfile')
+	{
+		// Is $_FILES[$field] set? If not, no reason to continue.
+		if ( ! isset($_FILES[$field]))
+		{
+			$this->set_error('upload_userfile_not_set');
+			return FALSE;
+		}
+		
+		// Is the upload path valid?
+		if ( ! $this->validate_upload_path())
+		{
+			return FALSE;
+		}
+						
+		// Was the file able to be uploaded? If not, determine the reason why.
+		if ( ! is_uploaded_file($_FILES[$field]['tmp_name']))
+		{
+			$error = ( ! isset($_FILES[$field]['error'])) ? 4 : $_FILES[$field]['error'];
+
+			switch($error)
+			{
+				case 1  :   $this->set_error('upload_file_exceeds_limit');
+					break;
+				case 3  :   $this->set_error('upload_file_partial');
+					break;
+				case 4  :   $this->set_error('upload_no_file_selected');
+					break;
+				default :   $this->set_error('upload_no_file_selected');
+					break;
+			}
+
+			return FALSE;
+		}
+
+		// Set the uploaded data as class variables
+		$this->file_temp = $_FILES[$field]['tmp_name'];		
+		$this->file_name = $_FILES[$field]['name'];
+		$this->file_size = $_FILES[$field]['size'];		
+		$this->file_type = preg_replace("/^(.+?);.*$/", "\\1", $_FILES[$field]['type']);
+		$this->file_type = strtolower($this->file_type);
+		$this->file_ext	 = $this->get_extension($_FILES[$field]['name']);
+		
+		// Convert the file size to kilobytes
+		if ($this->file_size > 0)
+		{
+			$this->file_size = round($this->file_size/1024, 2);
+		}
+
+		// Is the file type allowed to be uploaded?
+		if ( ! $this->is_allowed_filetype())
+		{
+			$this->set_error('upload_invalid_filetype');
+			return FALSE;
+		}
+
+		// Is the file size within the allowed maximum?
+		if ( ! $this->is_allowed_filesize())
+		{
+			$this->set_error('upload_invalid_filesize');
+			return FALSE;
+		}
+
+		// Are the image dimensions within the allowed size?
+		// Note: This can fail if the server has an open_basdir restriction.
+		if ( ! $this->is_allowed_dimensions())
+		{
+			$this->set_error('upload_invalid_dimensions');
+			return FALSE;
+		}
+
+		// Sanitize the file name for security
+		$this->file_name = $this->clean_file_name($this->file_name);
+
+		// Remove white spaces in the name
+		if ($this->remove_spaces == TRUE)
+		{
+			$this->file_name = preg_replace("/\s+/", "_", $this->file_name);
+		}
+
+		/*
+		 * Validate the file name
+		 * This function appends an number onto the end of
+		 * the file if one with the same name already exists.
+		 * If it returns false there was a problem.
+		 */
+		$this->orig_name = $this->file_name;
+
+		if ($this->overwrite == FALSE)
+		{
+			$this->file_name = $this->set_filename($this->upload_path, $this->file_name);
+			
+			if ($this->file_name === FALSE)
+			{
+				return FALSE;
+			}
+		}
+
+		/*
+		 * Move the file to the final destination
+		 * To deal with different server configurations
+		 * we'll attempt to use copy() first.  If that fails
+		 * we'll use move_uploaded_file().  One of the two should
+		 * reliably work in most environments
+		 */
+		if ( ! @copy($this->file_temp, $this->upload_path.$this->file_name))
+		{
+			if ( ! @move_uploaded_file($this->file_temp, $this->upload_path.$this->file_name))
+			{
+				 $this->set_error('upload_destination_error');
+				 return FALSE;
+			}
+		}
+		
+		/*
+		 * Run the file through the XSS hacking filter
+		 * This helps prevent malicious code from being
+		 * embedded within a file.  Scripts can easily
+		 * be disguised as images or other file types.
+		 */
+		if ($this->xss_clean == TRUE)
+		{
+			$this->do_xss_clean();
+		}
+
+		/*
+		 * Set the finalized image dimensions
+		 * This sets the image width/height (assuming the
+		 * file was an image).  We use this information
+		 * in the "data" function.
+		 */
+		$this->set_image_properties($this->upload_path.$this->file_name);
+
+		return TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Finalized Data Array
+	 *	
+	 * Returns an associative array containing all of the information
+	 * related to the upload, allowing the developer easy access in one array.
+	 *
+	 * @access	public
+	 * @return	array
+	 */	
+	function data()
+	{
+		return array (
+						'file_name'			=> $this->file_name,
+						'file_type'			=> $this->file_type,
+						'file_path'			=> $this->upload_path,
+						'full_path'			=> $this->upload_path.$this->file_name,
+						'raw_name'			=> str_replace($this->file_ext, '', $this->file_name),
+						'orig_name'			=> $this->orig_name,
+						'file_ext'			=> $this->file_ext,
+						'file_size'			=> $this->file_size,
+						'is_image'			=> $this->is_image(),
+						'image_width'		=> $this->image_width,
+						'image_height'		=> $this->image_height,
+						'image_type'		=> $this->image_type,
+						'image_size_str'	=> $this->image_size_str,
+					);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Upload Path
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_upload_path($path)
+	{
+		$this->upload_path = $path;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set the file name
+	 *
+	 * This function takes a filename/path as input and looks for the
+	 * existence of a file with the same name. If found, it will append a
+	 * number to the end of the filename to avoid overwriting a pre-existing file.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function set_filename($path, $filename)
+	{
+		if ($this->encrypt_name == TRUE)
+		{		
+			mt_srand();
+			$filename = md5(uniqid(mt_rand())).$this->file_ext; 			
+		}
+	
+		if ( ! file_exists($path.$filename))
+		{
+			return $filename;
+		}
+	
+		$filename = str_replace($this->file_ext, '', $filename);
+		
+		$new_filename = '';
+		for ($i = 1; $i < 100; $i++)
+		{			
+			if ( ! file_exists($path.$filename.$i.$this->file_ext))
+			{
+				$new_filename = $filename.$i.$this->file_ext;
+				break;
+			}
+		}
+
+		if ($new_filename == '')
+		{
+			$this->set_error('upload_bad_filename');
+			return FALSE;
+		}
+		else
+		{
+			return $new_filename;
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Maximum File Size
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @return	void
+	 */	
+	function set_max_filesize($n)
+	{
+		$this->max_size = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Maximum Image Width
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @return	void
+	 */	
+	function set_max_width($n)
+	{
+		$this->max_width = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Maximum Image Height
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @return	void
+	 */	
+	function set_max_height($n)
+	{
+		$this->max_height = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Allowed File Types
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_allowed_types($types)
+	{
+		$this->allowed_types = explode('|', $types);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Image Properties
+	 *
+	 * Uses GD to determine the width/height/type of image
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_image_properties($path = '')
+	{
+		if ( ! $this->is_image())
+		{
+			return;
+		}
+
+		if (function_exists('getimagesize'))
+		{
+			if (FALSE !== ($D = @getimagesize($path)))
+			{	
+				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
+
+				$this->image_width		= $D['0'];
+				$this->image_height		= $D['1'];
+				$this->image_type		= ( ! isset($types[$D['2']])) ? 'unknown' : $types[$D['2']];
+				$this->image_size_str	= $D['3'];  // string containing height and width
+			}
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set XSS Clean
+	 *
+	 * Enables the XSS flag so that the file that was uploaded
+	 * will be run through the XSS filter.
+	 *
+	 * @access	public
+	 * @param	bool
+	 * @return	void
+	 */
+	function set_xss_clean($flag = FALSE)
+	{
+		$this->xss_clean = ($flag == TRUE) ? TRUE : FALSE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Validate the image
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function is_image()
+	{
+		$img_mimes = array(
+							'image/gif',
+							'image/jpg',
+							'image/jpe',
+							'image/jpeg',
+							'image/pjpeg',
+							'image/png',
+							'image/x-png'
+						   );
+
+
+		return (in_array($this->file_type, $img_mimes, TRUE)) ? TRUE : FALSE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Verify that the filetype is allowed
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function is_allowed_filetype()
+	{
+		if (count($this->allowed_types) == 0)
+		{
+			$this->set_error('upload_no_file_types');
+			return FALSE;
+		}
+			 	
+		foreach ($this->allowed_types as $val)
+		{
+			$mime = $this->mimes_types(strtolower($val));
+		
+			if (is_array($mime))
+			{
+				if (in_array($this->file_type, $mime, TRUE))
+				{
+					return TRUE;
+				}
+			}
+			else
+			{
+				if ($mime == $this->file_type)
+				{
+					return TRUE;
+				}	
+			}		
+		}
+		
+		return FALSE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Verify that the file is within the allowed size
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function is_allowed_filesize()
+	{
+		if ($this->max_size != 0  AND  $this->file_size > $this->max_size)
+		{
+			return FALSE;
+		}
+		else
+		{
+			return TRUE;
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Verify that the image is within the allowed width/height
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function is_allowed_dimensions()
+	{
+		if ( ! $this->is_image())
+		{
+			return TRUE;
+		}
+
+		if (function_exists('getimagesize'))
+		{
+			$D = @getimagesize($this->file_temp);
+
+			if ($this->max_width > 0 AND $D['0'] > $this->max_width)
+			{
+				return FALSE;
+			}
+
+			if ($this->max_height > 0 AND $D['1'] > $this->max_height)
+			{
+				return FALSE;
+			}
+
+			return TRUE;
+		}
+
+		return TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Validate Upload Path
+	 *
+	 * Verifies that it is a valid upload path with proper permissions.
+	 *
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function validate_upload_path()
+	{
+		if ($this->upload_path == '')
+		{
+			$this->set_error('upload_no_filepath');
+			return FALSE;
+		}
+		
+		if (function_exists('realpath') AND @realpath($this->upload_path) !== FALSE)
+		{
+			$this->upload_path = str_replace("\\", "/", realpath($this->upload_path));
+		}
+
+		if ( ! @is_dir($this->upload_path))
+		{
+			$this->set_error('upload_no_filepath');
+			return FALSE;
+		}
+
+		if ( ! is_writable($this->upload_path))
+		{
+			$this->set_error('upload_not_writable');
+			return FALSE;
+		}
+
+		$this->upload_path = preg_replace("/(.+?)\/*$/", "\\1/",  $this->upload_path);
+		return TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Extract the file extension
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function get_extension($filename)
+	{
+		$x = explode('.', $filename);
+		return '.'.end($x);
+	}	
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Clean the file name for security
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */		
+	function clean_file_name($filename)
+	{
+		$bad = array(
+						"",
+						"'",
+						"<",
+						">",
+						'"',
+						'&',
+						'$',
+						'=',
+						';',
+						'?',
+						'/',
+						"%20",
+						"%22",
+						"%3c",		// <
+						"%253c", 	// <
+						"%3e", 		// >
+						"%0e", 		// >
+						"%28", 		// (
+						"%29", 		// )
+						"%2528", 	// (
+						"%26", 		// &
+						"%24", 		// $
+						"%3f", 		// ?
+						"%3b", 		// ;
+						"%3d"		// =
+					);
+					
+		foreach ($bad as $val)
+		{
+			$filename = str_replace($val, '', $filename);
+		}
+
+		return $filename;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Runs the file through the XSS clean function
+	 *
+	 * This prevents people from embedding malicious code in their files.
+	 * I'm not sure that it won't negatively affect certain files in unexpected ways,
+	 * but so far I haven't found that it causes trouble.
+	 *
+	 * @access	public
+	 * @return	void
+	 */	
+	function do_xss_clean()
+	{		
+		$file = $this->upload_path.$this->file_name;
+		
+		if (filesize($file) == 0)
+		{
+			return FALSE;
+		}
+	
+		if ( ! $fp = @fopen($file, 'rb'))
+		{
+			return FALSE;
+		}
+			
+		flock($fp, LOCK_EX);
+
+		$data = fread($fp, filesize($file));
+		
+		$CI =& get_instance();	
+		$data = $CI->input->xss_clean($data);
+
+		fwrite($fp, $data);
+		flock($fp, LOCK_UN);
+		fclose($fp);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set an error message
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_error($msg)
+	{
+		$CI =& get_instance();	
+		$CI->lang->load('upload');
+		
+		if (is_array($msg))
+		{
+			foreach ($msg as $val)
+			{
+				$msg = ($CI->lang->line($val) == FALSE) ? $val : $CI->lang->line($val);				
+				$this->error_msg[] = $msg;
+				log_message('error', $msg);
+			}		
+		}
+		else
+		{
+			$msg = ($CI->lang->line($msg) == FALSE) ? $msg : $CI->lang->line($msg);
+			$this->error_msg[] = $msg;
+			log_message('error', $msg);
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Display the error message
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function display_errors($open = '
                ', $close = '
                ')
+	{
+		$str = '';
+		foreach ($this->error_msg as $val)
+		{
+			$str .= $open.$val.$close;
+		}
+	
+		return $str;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * List of Mime Types
+	 *
+	 * This is a list of mime types.  We use it to validate
+	 * the "allowed types" set by the developer
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function mimes_types($mime)
+	{
+		if (count($this->mimes) == 0)
+		{
+			if (@include(APPPATH.'config/mimes'.EXT))
+			{
+				$this->mimes = $mimes;
+				unset($mimes);
+			}
+		}
+	
+		return ( ! isset($this->mimes[$mime])) ? FALSE : $this->mimes[$mime];
+	}
+
+}
+// END Upload Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index afd012e3..b93bd340 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -1,12 +1,12 @@
 ';
-	var $_error_suffix		= '
                ';
-
-	
-
-	/**
-	 * Constructor
-	 *
-	 */	
-	function CI_Validation()
-	{	
-		$this->CI =& get_instance();
-		log_message('debug', "Validation Class Initialized");
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Fields
-	 *
-	 * This function takes an array of field names as input
-	 * and generates class variables with the same name, which will
-	 * either be blank or contain the $_POST value corresponding to it
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	void
-	 */
-	function set_fields($data = '', $field = '')
-	{	
-		if ($data == '')
-		{
-			if (count($this->_fields) == 0)
-			{
-				return FALSE;
-			}
-		}
-		else
-		{
-			if ( ! is_array($data))
-			{
-				$data = array($data => $field);
-			}
-			
-			if (count($data) > 0)
-			{
-				$this->_fields = $data;
-			}
-		}		
-			
-		foreach($this->_fields as $key => $val)
-		{		
-			$this->$key = ( ! isset($_POST[$key]) OR is_array($_POST[$key])) ? '' : $this->prep_for_form($_POST[$key]);
-			
-			$error = $key.'_error';
-			if ( ! isset($this->$error))
-			{
-				$this->$error = '';
-			}
-		}		
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Rules
-	 *
-	 * This function takes an array of field names and validation
-	 * rules as input ad simply stores is for use later.
-	 *
-	 * @access	public
-	 * @param	mixed
-	 * @param	string
-	 * @return	void
-	 */
-	function set_rules($data, $rules = '')
-	{
-		if ( ! is_array($data))
-		{
-			if ($rules == '')
-				return;
-				
-			$data[$data] = $rules;
-		}
-	
-		foreach ($data as $key => $val)
-		{
-			$this->_rules[$key] = $val;
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Error Message
-	 *
-	 * Lets users set their own error messages on the fly.  Note:  The key
-	 * name has to match the  function name that it corresponds to.
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */
-	function set_message($lang, $val = '')
-	{
-		if ( ! is_array($lang))
-		{
-			$lang = array($lang => $val);
-		}
-	
-		$this->_error_messages = array_merge($this->_error_messages, $lang);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set The Error Delimiter
-	 *
-	 * Permits a prefix/suffix to be added to each error message
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	void
-	 */	
-	function set_error_delimiters($prefix = '
                ', $suffix = '
                ')
-	{
-		$this->_error_prefix = $prefix;
-		$this->_error_suffix = $suffix;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Run the Validator
-	 *
-	 * This function does all the work.
-	 *
-	 * @access	public
-	 * @return	bool
-	 */		
-	function run()
-	{
-		// Do we even have any data to process?  Mm?
-		if (count($_POST) == 0 OR count($this->_rules) == 0)
-		{
-			return FALSE;
-		}
-	
-		// Load the language file containing error messages
-		$this->CI->lang->load('validation');
-							
-		// Cycle through the rules and test for errors
-		foreach ($this->_rules as $field => $rules)
-		{
-			//Explode out the rules!
-			$ex = explode('|', $rules);
-
-			// Is the field required?  If not, if the field is blank  we'll move on to the next text
-			if ( ! in_array('required', $ex, TRUE) AND strpos($rules, 'callback_') === FALSE)
-			{
-				if ( ! isset($_POST[$field]) OR $_POST[$field] == '')
-				{
-					continue;
-				}
-			}
-			
-			/*
-			 * Are we dealing with an "isset" rule?
-			 *
-			 * Before going further, we'll see if one of the rules
-			 * is to check whether the item is set (typically this
-			 * applies only to checkboxes).  If so, we'll
-			 * test for it here since there's not reason to go
-			 * further
-			 */
-			if ( ! isset($_POST[$field]))
-			{			
-				if (in_array('isset', $ex, TRUE) OR in_array('required', $ex))
-				{
-					if ( ! isset($this->_error_messages['isset']))
-					{
-						if (FALSE === ($line = $this->CI->lang->line('isset')))
-						{
-							$line = 'The field was not set';
-						}							
-					}
-					else
-					{
-						$line = $this->_error_messages['isset'];
-					}
-					
-					$field = ( ! isset($this->_fields[$field])) ? $field : $this->_fields[$field];
-					$this->_error_array[] = sprintf($line, $field);	
-				}
-						
-				continue;
-			}
-	
-			/*
-			 * Set the current field
-			 *
-			 * The various prepping functions need to know the
-			 * current field name so they can do this:
-			 *
-			 * $_POST[$this->_current_field] == 'bla bla';
-			 */
-			$this->_current_field = $field;
-
-			// Cycle through the rules!
-			foreach ($ex As $rule)
-			{
-				// Is the rule a callback?			
-				$callback = FALSE;
-				if (substr($rule, 0, 9) == 'callback_')
-				{
-					$rule = substr($rule, 9);
-					$callback = TRUE;
-				}
-				
-				// Strip the parameter (if exists) from the rule
-				// Rules can contain a parameter: max_length[5]
-				$param = FALSE;
-				if (preg_match("/(.*?)\[(.*?)\]/", $rule, $match))
-				{
-					$rule	= $match[1];
-					$param	= $match[2];
-				}
-				
-				// Call the function that corresponds to the rule
-				if ($callback === TRUE)
-				{
-					if ( ! method_exists($this->CI, $rule))
-					{ 		
-						continue;
-					}
-					
-					$result = $this->CI->$rule($_POST[$field], $param);	
-					
-					// If the field isn't required and we just processed a callback we'll move on...
-					if ( ! in_array('required', $ex, TRUE) AND $result !== FALSE)
-					{
-						continue 2;
-					}
-					
-				}
-				else
-				{				
-					if ( ! method_exists($this, $rule))
-					{
-						/*
-						 * Run the native PHP function if called for
-						 *
-						 * If our own wrapper function doesn't exist we see
-						 * if a native PHP function does. Users can use
-						 * any native PHP function call that has one param.
-						 */
-						if (function_exists($rule))
-						{
-							$_POST[$field] = $rule($_POST[$field]);
-							$this->$field = $_POST[$field];
-						}
-											
-						continue;
-					}
-					
-					$result = $this->$rule($_POST[$field], $param);
-				}
-								
-				// Did the rule test negatively?  If so, grab the error.
-				if ($result === FALSE)
-				{
-					if ( ! isset($this->_error_messages[$rule]))
-					{
-						if (FALSE === ($line = $this->CI->lang->line($rule)))
-						{
-							$line = 'Unable to access an error message corresponding to your field name.';
-						}						
-					}
-					else
-					{
-						$line = $this->_error_messages[$rule];;
-					}				
-
-					// Build the error message
-					$mfield = ( ! isset($this->_fields[$field])) ? $field : $this->_fields[$field];
-					$mparam = ( ! isset($this->_fields[$param])) ? $param : $this->_fields[$param];
-					$message = sprintf($line, $mfield, $mparam);
-					
-					// Set the error variable.  Example: $this->username_error
-					$error = $field.'_error';
-					$this->$error = $this->_error_prefix.$message.$this->_error_suffix;
-
-					// Add the error to the error array
-					$this->_error_array[] = $message;				
-					continue 2;
-				}				
-			}
-			
-		}
-		
-		$total_errors = count($this->_error_array);
-
-		/*
-		 * Recompile the class variables
-		 *
-		 * If any prepping functions were called the $_POST data
-		 * might now be different then the corresponding class
-		 * variables so we'll set them anew.
-		 */	
-		if ($total_errors > 0)
-		{
-			$this->_safe_form_data = TRUE;
-		}
-		
-		$this->set_fields();
-
-		// Did we end up with any errors?
-		if ($total_errors == 0)
-		{
-			return TRUE;
-		}
-		
-		// Generate the error string
-		foreach ($this->_error_array as $val)
-		{
-			$this->error_string .= $this->_error_prefix.$val.$this->_error_suffix."\n";
-		}
-
-		return FALSE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Required
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */
-	function required($str)
-	{
-		if ( ! is_array($str))
-		{
-			return (trim($str) == '') ? FALSE : TRUE;
-		}
-		else
-		{
-			return ( ! empty($str));
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Match one field to another
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */
-	function matches($str, $field)
-	{
-		if ( ! isset($_POST[$field]))
-		{
-			return FALSE;
-		}
-		
-		return ($str !== $_POST[$field]) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Minimum Length
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */	
-	function min_length($str, $val)
-	{
-		if ( ! is_numeric($val))
-		{
-			return FALSE;
-		}
-	
-		return (strlen($str) < $val) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Max Length
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */	
-	function max_length($str, $val)
-	{
-		if ( ! is_numeric($val))
-		{
-			return FALSE;
-		}
-	
-		return (strlen($str) > $val) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Exact Length
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */	
-	function exact_length($str, $val)
-	{
-		if ( ! is_numeric($val))
-		{
-			return FALSE;
-		}
-	
-		return (strlen($str) != $val) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Valid Email
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */	
-	function valid_email($str)
-	{
-		return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $str)) ? FALSE : TRUE;
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Validate IP Address
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */
-	function valid_ip($ip)
-	{
-		return ( ! preg_match( "/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $ip)) ? FALSE : TRUE;
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Alpha
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */		
-	function alpha($str)
-	{
-		return ( ! preg_match("/^([-a-z])+$/i", $str)) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Alpha-numeric
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */	
-	function alpha_numeric($str)
-	{
-		return ( ! preg_match("/^([-a-z0-9])+$/i", $str)) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Alpha-numeric with underscores and dashes
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */	
-	function alpha_dash($str)
-	{
-		return ( ! preg_match("/^([-a-z0-9_-])+$/i", $str)) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Numeric
-	 *
-	 * @access	public
-	 * @param	int
-	 * @return	bool
-	 */	
-	function numeric($str)
-	{
-		return ( ! ereg("^[0-9\.]+$", $str)) ? FALSE : TRUE;
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Is Numeric
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	bool
-	 */	
-	function is_numeric($str)
-	{
-		return ( ! is_numeric($str)) ? FALSE : TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Select
-	 *
-	 * Enables pull-down lists to be set to the value the user
-	 * selected in the event of an error
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */	
-	function set_select($field = '', $value = '')
-	{
-		if ($field == '' OR $value == '' OR  ! isset($_POST[$field]))
-		{
-			return '';
-		}
-			
-		if ($_POST[$field] == $value)
-		{
-			return ' selected="selected"';
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Radio
-	 *
-	 * Enables radio buttons to be set to the value the user
-	 * selected in the event of an error
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */	
-	function set_radio($field = '', $value = '')
-	{
-		if ($field == '' OR $value == '' OR  ! isset($_POST[$field]))
-		{
-			return '';
-		}
-			
-		if ($_POST[$field] == $value)
-		{
-			return ' checked="checked"';
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Set Checkbox
-	 *
-	 * Enables checkboxes to be set to the value the user
-	 * selected in the event of an error
-	 *
-	 * @access	public
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */	
-	function set_checkbox($field = '', $value = '')
-	{
-		if ($field == '' OR $value == '' OR  ! isset($_POST[$field]))
-		{
-			return '';
-		}
-			
-		if ($_POST[$field] == $value)
-		{
-			return ' checked="checked"';
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Prep data for form
-	 *
-	 * This function allows HTML to be safely shown in a form.
-	 * Special characters are converted.
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */
-	function prep_for_form($str = '')
-	{
-		if ($this->_safe_form_data == FALSE OR $str == '')
-		{
-			return $str;
-		}
-
-		return str_replace(array("'", '"', '<', '>'), array("'", """, '<', '>'), stripslashes($str));
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Prep URL
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function prep_url($str = '')
-	{
-		if ($str == 'http://' OR $str == '')
-		{
-			$_POST[$this->_current_field] = '';
-			return;
-		}
-		
-		if (substr($str, 0, 7) != 'http://' && substr($str, 0, 8) != 'https://')
-		{
-			$str = 'http://'.$str;
-		}
-		
-		$_POST[$this->_current_field] = $str;
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Strip Image Tags
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function strip_image_tags($str)
-	{
-		$_POST[$this->_current_field] = $this->input->strip_image_tags($str);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * XSS Clean
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function xss_clean($str)
-	{
-		$_POST[$this->_current_field] = $this->CI->input->xss_clean($str);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Convert PHP tags to entities
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function encode_php_tags($str)
-	{
-		$_POST[$this->_current_field] = str_replace(array(''),  array('<?php', '<?PHP', '<?', '?>'), $str);
-	}
-
-}
-// END Validation Class
+';
+	var $_error_suffix		= '
                ';
+
+	
+
+	/**
+	 * Constructor
+	 *
+	 */	
+	function CI_Validation()
+	{	
+		$this->CI =& get_instance();
+		log_message('debug', "Validation Class Initialized");
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Fields
+	 *
+	 * This function takes an array of field names as input
+	 * and generates class variables with the same name, which will
+	 * either be blank or contain the $_POST value corresponding to it
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	void
+	 */
+	function set_fields($data = '', $field = '')
+	{	
+		if ($data == '')
+		{
+			if (count($this->_fields) == 0)
+			{
+				return FALSE;
+			}
+		}
+		else
+		{
+			if ( ! is_array($data))
+			{
+				$data = array($data => $field);
+			}
+			
+			if (count($data) > 0)
+			{
+				$this->_fields = $data;
+			}
+		}		
+			
+		foreach($this->_fields as $key => $val)
+		{		
+			$this->$key = ( ! isset($_POST[$key]) OR is_array($_POST[$key])) ? '' : $this->prep_for_form($_POST[$key]);
+			
+			$error = $key.'_error';
+			if ( ! isset($this->$error))
+			{
+				$this->$error = '';
+			}
+		}		
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Rules
+	 *
+	 * This function takes an array of field names and validation
+	 * rules as input ad simply stores is for use later.
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @param	string
+	 * @return	void
+	 */
+	function set_rules($data, $rules = '')
+	{
+		if ( ! is_array($data))
+		{
+			if ($rules == '')
+				return;
+				
+			$data[$data] = $rules;
+		}
+	
+		foreach ($data as $key => $val)
+		{
+			$this->_rules[$key] = $val;
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Error Message
+	 *
+	 * Lets users set their own error messages on the fly.  Note:  The key
+	 * name has to match the  function name that it corresponds to.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */
+	function set_message($lang, $val = '')
+	{
+		if ( ! is_array($lang))
+		{
+			$lang = array($lang => $val);
+		}
+	
+		$this->_error_messages = array_merge($this->_error_messages, $lang);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set The Error Delimiter
+	 *
+	 * Permits a prefix/suffix to be added to each error message
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	void
+	 */	
+	function set_error_delimiters($prefix = '
                ', $suffix = '
                ')
+	{
+		$this->_error_prefix = $prefix;
+		$this->_error_suffix = $suffix;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Run the Validator
+	 *
+	 * This function does all the work.
+	 *
+	 * @access	public
+	 * @return	bool
+	 */		
+	function run()
+	{
+		// Do we even have any data to process?  Mm?
+		if (count($_POST) == 0 OR count($this->_rules) == 0)
+		{
+			return FALSE;
+		}
+	
+		// Load the language file containing error messages
+		$this->CI->lang->load('validation');
+							
+		// Cycle through the rules and test for errors
+		foreach ($this->_rules as $field => $rules)
+		{
+			//Explode out the rules!
+			$ex = explode('|', $rules);
+
+			// Is the field required?  If not, if the field is blank  we'll move on to the next text
+			if ( ! in_array('required', $ex, TRUE) AND strpos($rules, 'callback_') === FALSE)
+			{
+				if ( ! isset($_POST[$field]) OR $_POST[$field] == '')
+				{
+					continue;
+				}
+			}
+			
+			/*
+			 * Are we dealing with an "isset" rule?
+			 *
+			 * Before going further, we'll see if one of the rules
+			 * is to check whether the item is set (typically this
+			 * applies only to checkboxes).  If so, we'll
+			 * test for it here since there's not reason to go
+			 * further
+			 */
+			if ( ! isset($_POST[$field]))
+			{			
+				if (in_array('isset', $ex, TRUE) OR in_array('required', $ex))
+				{
+					if ( ! isset($this->_error_messages['isset']))
+					{
+						if (FALSE === ($line = $this->CI->lang->line('isset')))
+						{
+							$line = 'The field was not set';
+						}							
+					}
+					else
+					{
+						$line = $this->_error_messages['isset'];
+					}
+					
+					$field = ( ! isset($this->_fields[$field])) ? $field : $this->_fields[$field];
+					$this->_error_array[] = sprintf($line, $field);	
+				}
+						
+				continue;
+			}
+	
+			/*
+			 * Set the current field
+			 *
+			 * The various prepping functions need to know the
+			 * current field name so they can do this:
+			 *
+			 * $_POST[$this->_current_field] == 'bla bla';
+			 */
+			$this->_current_field = $field;
+
+			// Cycle through the rules!
+			foreach ($ex As $rule)
+			{
+				// Is the rule a callback?			
+				$callback = FALSE;
+				if (substr($rule, 0, 9) == 'callback_')
+				{
+					$rule = substr($rule, 9);
+					$callback = TRUE;
+				}
+				
+				// Strip the parameter (if exists) from the rule
+				// Rules can contain a parameter: max_length[5]
+				$param = FALSE;
+				if (preg_match("/(.*?)\[(.*?)\]/", $rule, $match))
+				{
+					$rule	= $match[1];
+					$param	= $match[2];
+				}
+				
+				// Call the function that corresponds to the rule
+				if ($callback === TRUE)
+				{
+					if ( ! method_exists($this->CI, $rule))
+					{ 		
+						continue;
+					}
+					
+					$result = $this->CI->$rule($_POST[$field], $param);	
+					
+					// If the field isn't required and we just processed a callback we'll move on...
+					if ( ! in_array('required', $ex, TRUE) AND $result !== FALSE)
+					{
+						continue 2;
+					}
+					
+				}
+				else
+				{				
+					if ( ! method_exists($this, $rule))
+					{
+						/*
+						 * Run the native PHP function if called for
+						 *
+						 * If our own wrapper function doesn't exist we see
+						 * if a native PHP function does. Users can use
+						 * any native PHP function call that has one param.
+						 */
+						if (function_exists($rule))
+						{
+							$_POST[$field] = $rule($_POST[$field]);
+							$this->$field = $_POST[$field];
+						}
+											
+						continue;
+					}
+					
+					$result = $this->$rule($_POST[$field], $param);
+				}
+								
+				// Did the rule test negatively?  If so, grab the error.
+				if ($result === FALSE)
+				{
+					if ( ! isset($this->_error_messages[$rule]))
+					{
+						if (FALSE === ($line = $this->CI->lang->line($rule)))
+						{
+							$line = 'Unable to access an error message corresponding to your field name.';
+						}						
+					}
+					else
+					{
+						$line = $this->_error_messages[$rule];;
+					}				
+
+					// Build the error message
+					$mfield = ( ! isset($this->_fields[$field])) ? $field : $this->_fields[$field];
+					$mparam = ( ! isset($this->_fields[$param])) ? $param : $this->_fields[$param];
+					$message = sprintf($line, $mfield, $mparam);
+					
+					// Set the error variable.  Example: $this->username_error
+					$error = $field.'_error';
+					$this->$error = $this->_error_prefix.$message.$this->_error_suffix;
+
+					// Add the error to the error array
+					$this->_error_array[] = $message;				
+					continue 2;
+				}				
+			}
+			
+		}
+		
+		$total_errors = count($this->_error_array);
+
+		/*
+		 * Recompile the class variables
+		 *
+		 * If any prepping functions were called the $_POST data
+		 * might now be different then the corresponding class
+		 * variables so we'll set them anew.
+		 */	
+		if ($total_errors > 0)
+		{
+			$this->_safe_form_data = TRUE;
+		}
+		
+		$this->set_fields();
+
+		// Did we end up with any errors?
+		if ($total_errors == 0)
+		{
+			return TRUE;
+		}
+		
+		// Generate the error string
+		foreach ($this->_error_array as $val)
+		{
+			$this->error_string .= $this->_error_prefix.$val.$this->_error_suffix."\n";
+		}
+
+		return FALSE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Required
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */
+	function required($str)
+	{
+		if ( ! is_array($str))
+		{
+			return (trim($str) == '') ? FALSE : TRUE;
+		}
+		else
+		{
+			return ( ! empty($str));
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Match one field to another
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */
+	function matches($str, $field)
+	{
+		if ( ! isset($_POST[$field]))
+		{
+			return FALSE;
+		}
+		
+		return ($str !== $_POST[$field]) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Minimum Length
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function min_length($str, $val)
+	{
+		if ( ! is_numeric($val))
+		{
+			return FALSE;
+		}
+	
+		return (strlen($str) < $val) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Max Length
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function max_length($str, $val)
+	{
+		if ( ! is_numeric($val))
+		{
+			return FALSE;
+		}
+	
+		return (strlen($str) > $val) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Exact Length
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function exact_length($str, $val)
+	{
+		if ( ! is_numeric($val))
+		{
+			return FALSE;
+		}
+	
+		return (strlen($str) != $val) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Valid Email
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function valid_email($str)
+	{
+		return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $str)) ? FALSE : TRUE;
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Validate IP Address
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function valid_ip($ip)
+	{
+		return ( ! preg_match( "/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $ip)) ? FALSE : TRUE;
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Alpha
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */		
+	function alpha($str)
+	{
+		return ( ! preg_match("/^([-a-z])+$/i", $str)) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Alpha-numeric
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function alpha_numeric($str)
+	{
+		return ( ! preg_match("/^([-a-z0-9])+$/i", $str)) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Alpha-numeric with underscores and dashes
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function alpha_dash($str)
+	{
+		return ( ! preg_match("/^([-a-z0-9_-])+$/i", $str)) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Numeric
+	 *
+	 * @access	public
+	 * @param	int
+	 * @return	bool
+	 */	
+	function numeric($str)
+	{
+		return ( ! ereg("^[0-9\.]+$", $str)) ? FALSE : TRUE;
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Is Numeric
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function is_numeric($str)
+	{
+		return ( ! is_numeric($str)) ? FALSE : TRUE;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Select
+	 *
+	 * Enables pull-down lists to be set to the value the user
+	 * selected in the event of an error
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function set_select($field = '', $value = '')
+	{
+		if ($field == '' OR $value == '' OR  ! isset($_POST[$field]))
+		{
+			return '';
+		}
+			
+		if ($_POST[$field] == $value)
+		{
+			return ' selected="selected"';
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Radio
+	 *
+	 * Enables radio buttons to be set to the value the user
+	 * selected in the event of an error
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function set_radio($field = '', $value = '')
+	{
+		if ($field == '' OR $value == '' OR  ! isset($_POST[$field]))
+		{
+			return '';
+		}
+			
+		if ($_POST[$field] == $value)
+		{
+			return ' checked="checked"';
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Set Checkbox
+	 *
+	 * Enables checkboxes to be set to the value the user
+	 * selected in the event of an error
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */	
+	function set_checkbox($field = '', $value = '')
+	{
+		if ($field == '' OR $value == '' OR  ! isset($_POST[$field]))
+		{
+			return '';
+		}
+			
+		if ($_POST[$field] == $value)
+		{
+			return ' checked="checked"';
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Prep data for form
+	 *
+	 * This function allows HTML to be safely shown in a form.
+	 * Special characters are converted.
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function prep_for_form($str = '')
+	{
+		if ($this->_safe_form_data == FALSE OR $str == '')
+		{
+			return $str;
+		}
+
+		return str_replace(array("'", '"', '<', '>'), array("'", """, '<', '>'), stripslashes($str));
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Prep URL
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function prep_url($str = '')
+	{
+		if ($str == 'http://' OR $str == '')
+		{
+			$_POST[$this->_current_field] = '';
+			return;
+		}
+		
+		if (substr($str, 0, 7) != 'http://' && substr($str, 0, 8) != 'https://')
+		{
+			$str = 'http://'.$str;
+		}
+		
+		$_POST[$this->_current_field] = $str;
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Strip Image Tags
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function strip_image_tags($str)
+	{
+		$_POST[$this->_current_field] = $this->input->strip_image_tags($str);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * XSS Clean
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function xss_clean($str)
+	{
+		$_POST[$this->_current_field] = $this->CI->input->xss_clean($str);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Convert PHP tags to entities
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function encode_php_tags($str)
+	{
+		$_POST[$this->_current_field] = str_replace(array(''),  array('<?php', '<?PHP', '<?', '?>'), $str);
+	}
+
+}
+// END Validation Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index 2d9a4c11..49747e48 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -1,1412 +1,1412 @@
-xmlrpcName 		= $this->xmlrpcName;
-		$this->xmlrpc_backslash = chr(92).chr(92);
-		
-		// Types for info sent back and forth
-		$this->xmlrpcTypes = array(
-			$this->xmlrpcI4	   => '1',
-			$this->xmlrpcInt	  => '1',
-			$this->xmlrpcBoolean  => '1',
-			$this->xmlrpcString   => '1',
-			$this->xmlrpcDouble   => '1',
-			$this->xmlrpcDateTime => '1',
-			$this->xmlrpcBase64   => '1',
-			$this->xmlrpcArray	=> '2',
-			$this->xmlrpcStruct   => '3'
-			);
-			
-		// Array of Valid Parents for Various XML-RPC elements
-		$this->valid_parents = array('BOOLEAN'			=> array('VALUE'),
-									 'I4'				=> array('VALUE'),
-									 'INT'				=> array('VALUE'),
-									 'STRING'			=> array('VALUE'),
-									 'DOUBLE'			=> array('VALUE'),
-									 'DATETIME.ISO8601'	=> array('VALUE'),
-									 'BASE64'			=> array('VALUE'),
-									 'ARRAY'			=> array('VALUE'),
-									 'STRUCT'			=> array('VALUE'),
-									 'PARAM'			=> array('PARAMS'),
-									 'METHODNAME'		=> array('METHODCALL'),
-									 'PARAMS'			=> array('METHODCALL', 'METHODRESPONSE'),
-									 'MEMBER'			=> array('STRUCT'),
-									 'NAME'				=> array('MEMBER'),
-									 'DATA'				=> array('ARRAY'),
-									 'FAULT'			=> array('METHODRESPONSE'),
-									 'VALUE'			=> array('MEMBER', 'DATA', 'PARAM', 'FAULT')
-									 );
-			
-			
-		// XML-RPC Responses
-		$this->xmlrpcerr['unknown_method'] = '1';
-		$this->xmlrpcstr['unknown_method'] = 'This is not a known method for this XML-RPC Server';
-		$this->xmlrpcerr['invalid_return'] = '2';
-		$this->xmlrpcstr['invalid_return'] = 'The XML data receieved was either invalid or not in the correct form for XML-RPC.  Turn on debugging to examine the XML data further.';
-		$this->xmlrpcerr['incorrect_params'] = '3';
-		$this->xmlrpcstr['incorrect_params'] = 'Incorrect parameters were passed to method';
-		$this->xmlrpcerr['introspect_unknown'] = '4';
-		$this->xmlrpcstr['introspect_unknown'] = "Cannot inspect signature for request: method unknown";
-		$this->xmlrpcerr['http_error'] = '5';
-		$this->xmlrpcstr['http_error'] = "Did not receive a '200 OK' response from remote server.";
-		$this->xmlrpcerr['no_data'] = '6';
-		$this->xmlrpcstr['no_data'] ='No data received from server.';
-		
-		$this->initialize($config);
-		
-		log_message('debug', "XML-RPC Class Initialized");
-	}
-	
-	
-	//-------------------------------------
-	//  Initialize Prefs
-	//-------------------------------------
-
-	function initialize($config = array())
-	{
-		if (sizeof($config) > 0)
-		{
-			foreach ($config as $key => $val)
-			{
-				if (isset($this->$key))
-				{
-					$this->$key = $val;			
-				}
-			}
-		}
-	}
-	// END
-	
-	//-------------------------------------
-	//  Take URL and parse it
-	//-------------------------------------
-
-	function server($url, $port=80)
-	{
-		if (substr($url, 0, 4) != "http")
-		{
-			$url = "http://".$url;
-		}
-		
-		$parts = parse_url($url);
-		
-		$path = (!isset($parts['path'])) ? '/' : $parts['path'];
-		
-		if (isset($parts['query']) && $parts['query'] != '')
-		{
-			$path .= '?'.$parts['query'];
-		}	
-		
-		$this->client = new XML_RPC_Client($path, $parts['host'], $port);
-	}
-	// END
-	
-	//-------------------------------------
-	//  Set Timeout
-	//-------------------------------------
-
-	function timeout($seconds=5)
-	{
-		if ( ! is_null($this->client) && is_int($seconds))
-		{
-			$this->client->timeout = $seconds;
-		}
-	}
-	// END
-	
-	//-------------------------------------
-	//  Set Methods
-	//-------------------------------------
-
-	function method($function)
-	{
-		$this->method = $function;
-	}
-	// END
-	
-	//-------------------------------------
-	//  Take Array of Data and Create Objects
-	//-------------------------------------
-
-	function request($incoming)
-	{
-		if ( ! is_array($incoming))
-		{
-			// Send Error
-		}
-		
-		foreach($incoming as $key => $value)
-		{
-			$this->data[$key] = $this->values_parsing($value);
-		}
-	}
-	// END
-	
-	
-	//-------------------------------------
-	//  Set Debug
-	//-------------------------------------
-
-	function set_debug($flag = TRUE)
-	{
-		$this->debug = ($flag == TRUE) ? TRUE : FALSE;
-	}
-	
-	//-------------------------------------
-	//  Values Parsing
-	//-------------------------------------
-
-	function values_parsing($value, $return = FALSE)
-	{
-		if (is_array($value) && isset($value['0']))
-		{
-			if ( ! isset($value['1']) OR ! isset($this->xmlrpcTypes[strtolower($value['1'])]))
-			{
-				$temp = new XML_RPC_Values($value['0'], 'string');
-			}
-			elseif(is_array($value['0']) && ($value['1'] == 'struct' OR $value['1'] == 'array'))
-			{
-				while (list($k) = each($value['0']))
-				{
-					$value['0'][$k] = $this->values_parsing($value['0'][$k], TRUE);
-				}
-				
-				$temp = new XML_RPC_Values($value['0'], $value['1']);
-			}
-			else
-			{
-				$temp = new XML_RPC_Values($value['0'], $value['1']);
-			}
-		}
-		else
-		{
-			$temp = new XML_RPC_Values($value, 'string');
-		}
-
-		return $temp;
-	}
-	// END
-
-
-	//-------------------------------------
-	//  Sends XML-RPC Request
-	//-------------------------------------
-
-	function send_request()
-	{
-		$this->message = new XML_RPC_Message($this->method,$this->data);
-		$this->message->debug = $this->debug;
-	
-		if ( ! $this->result = $this->client->send($this->message))
-		{
-			$this->error = $this->result->errstr;
-			return FALSE;
-		}
-		elseif( ! is_object($this->result->val))
-		{
-			$this->error = $this->result->errstr;
-			return FALSE;
-		}
-		
-		$this->response = $this->result->decode();
-		
-		return TRUE;
-	}
-	// END
-	
-	//-------------------------------------
-	//  Returns Error
-	//-------------------------------------
-
-	function display_error()
-	{
-		return $this->error;
-	}
-	// END
-	
-	//-------------------------------------
-	//  Returns Remote Server Response
-	//-------------------------------------
-
-	function display_response()
-	{
-		return $this->response;
-	}
-	// END
-	
-	//-------------------------------------
-	//  Sends an Error Message for Server Request
-	//-------------------------------------
-	
-	function send_error_message($number, $message)
-	{
-		return new XML_RPC_Response('0',$number, $message);
-	}
-	// END
-	
-	
-	//-------------------------------------
-	//  Send Response for Server Request
-	//-------------------------------------
-	
-	function send_response($response)
-	{
-		// $response should be array of values, which will be parsed
-		// based on their data and type into a valid group of XML-RPC values
-		
-		$response = $this->values_parsing($response);
-	
-		return new XML_RPC_Response($response);
-	}
-	// END
-	
-} // END XML_RPC Class
-
-	
-	
-/**
- * XML-RPC Client class
- *
- * @category	XML-RPC
- * @author		Paul Burdick
- * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
- */
-class XML_RPC_Client extends CI_Xmlrpc
-{
-	var $path			= '';
-	var $server			= '';
-	var $port			= 80;
-	var $errno			= '';
-	var $errstring		= '';
-	var $timeout		= 5;
-	var $no_multicall	= false;
-
-	function XML_RPC_Client($path, $server, $port=80)
-	{
-		parent::CI_Xmlrpc();
-		
-		$this->port = $port;
-		$this->server = $server;
-		$this->path = $path;
-	}
-	
-	function send($msg)
-	{
-		if (is_array($msg))
-		{
-			// Multi-call disabled
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['multicall_recursion'],$this->xmlrpcstr['multicall_recursion']);
-			return $r;
-		}
-
-		return $this->sendPayload($msg);
-	}
-
-	function sendPayload($msg)
-	{	
-		$fp = @fsockopen($this->server, $this->port,$this->errno, $this->errstr, $this->timeout);
-		
-		if (! is_resource($fp))
-		{
-			error_log($this->xmlrpcstr['http_error']);
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'],$this->xmlrpcstr['http_error']);
-			return $r;
-		}
-		
-		if(empty($msg->payload))
-		{
-			// $msg = XML_RPC_Messages
-			$msg->createPayload();
-		}
-		
-		$r = "\r\n";
-		$op  = "POST {$this->path} HTTP/1.0$r";
-		$op .= "Host: {$this->server}$r";
-		$op .= "Content-Type: text/xml$r";
-		$op .= "User-Agent: {$this->xmlrpcName}$r";
-		$op .= "Content-Length: ".strlen($msg->payload). "$r$r";
-		$op .= $msg->payload;
-		
-
-		if (!fputs($fp, $op, strlen($op)))
-		{
-			error_log($this->xmlrpcstr['http_error']);
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error']);
-			return $r;
-		}
-		$resp = $msg->parseResponse($fp);
-		fclose($fp);
-		return $resp;
-	}
-
-} // end class XML_RPC_Client
-
-
-/**
- * XML-RPC Response class
- *
- * @category	XML-RPC
- * @author		Paul Burdick
- * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
- */
-class XML_RPC_Response
-{
-	var $val = 0;
-	var $errno = 0;
-	var $errstr = '';
-	var $headers = array();
-
-	function XML_RPC_Response($val, $code = 0, $fstr = '')
-	{	
-		if ($code != 0)
-		{
-			// error
-			$this->errno = $code;
-			$this->errstr = htmlentities($fstr);
-		}
-		else if (!is_object($val))
-		{
-			// programmer error, not an object
-			error_log("Invalid type '" . gettype($val) . "' (value: $val) passed to XML_RPC_Response.  Defaulting to empty value.");
-			$this->val = new XML_RPC_Values();
-		}
-		else
-		{
-			$this->val = $val;
-		}
-	}
-
-	function faultCode()
-	{
-		return $this->errno;
-	}
-
-	function faultString()
-	{
-		return $this->errstr;
-	}
-
-	function value()
-	{
-		return $this->val;
-	}
-	
-	function prepare_response()
-	{
-		$result = "\n";
-		if ($this->errno)
-		{
-			$result .= '
-	
-		
-			
-				faultCode
-				' . $this->errno . '
-			
-			
-				faultString
-				' . $this->errstr . '
-			
-		
-	
-';
-		}
-		else
-		{
-			$result .= "\n\n" .
-					$this->val->serialize_class() .
-					"\n";
-		}
-		$result .= "\n";
-		return $result;
-	}
-	
-	function decode($array=FALSE)
-	{
-		$CI =& get_instance();	
-
-		if ($array !== FALSE && is_array($array))
-		{
-			while (list($key) = each($array))
-			{
-				if (is_array($array[$key]))
-				{
-					$array[$key] = $this->decode($array[$key]);
-				}
-				else
-				{
-					$array[$key] = $CI->input->xss_clean($array[$key]);
-				}
-			}
-			
-			$result = $array;
-		}
-		else
-		{
-			$result = $this->xmlrpc_decoder($this->val);
-			
-			if (is_array($result))
-			{
-				$result = $this->decode($result);
-			}
-			else
-			{
-				$result = $CI->input->xss_clean($result);
-			}
-		}
-		
-		return $result;
-	}
-
-	
-	
-	//-------------------------------------
-	//  XML-RPC Object to PHP Types
-	//-------------------------------------
-
-	function xmlrpc_decoder($xmlrpc_val)
-	{
-		$kind = $xmlrpc_val->kindOf();
-
-		if($kind == 'scalar')
-		{
-			return $xmlrpc_val->scalarval();
-		}
-		elseif($kind == 'array')
-		{
-			reset($xmlrpc_val->me);
-			list($a,$b) = each($xmlrpc_val->me);
-			$size = sizeof($b);
-			
-			$arr = array();
-
-			for($i = 0; $i < $size; $i++)
-			{
-				$arr[] = $this->xmlrpc_decoder($xmlrpc_val->me['array'][$i]);
-			}
-			return $arr;
-		}
-		elseif($kind == 'struct')
-		{
-			reset($xmlrpc_val->me['struct']);
-			$arr = array();
-
-			while(list($key,$value) = each($xmlrpc_val->me['struct']))
-			{
-				$arr[$key] = $this->xmlrpc_decoder($value);
-			}
-			return $arr;
-		}
-	}
-	
-	
-	//-------------------------------------
-	//  ISO-8601 time to server or UTC time
-	//-------------------------------------
-
-	function iso8601_decode($time, $utc=0)
-	{
-		// return a timet in the localtime, or UTC
-		$t = 0;
-		if (ereg("([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})", $time, $regs))
-		{
-			if ($utc == 1)
-				$t = gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
-			else
-				$t = mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
-		}
-		return $t;
-	}
-	
-} // End Response Class
-
-
-
-/**
- * XML-RPC Message class
- *
- * @category	XML-RPC
- * @author		Paul Burdick
- * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
- */
-class XML_RPC_Message extends CI_Xmlrpc
-{
-	var $payload;
-	var $method_name;
-	var $params			= array();
-	var $xh 			= array();
-
-	function XML_RPC_Message($method, $pars=0)
-	{
-		parent::CI_Xmlrpc();
-		
-		$this->method_name = $method;
-		if (is_array($pars) && sizeof($pars) > 0)
-		{
-			for($i=0; $iparams[] = $pars[$i];
-			}
-		}
-	}
-	
-	//-------------------------------------
-	//  Create Payload to Send
-	//-------------------------------------
-	
-	function createPayload()
-	{
-		$this->payload = "\r\n\r\n";
-		$this->payload .= '' . $this->method_name . "\r\n";
-		$this->payload .= "\r\n";
-		
-		for($i=0; $iparams); $i++)
-		{
-			// $p = XML_RPC_Values
-			$p = $this->params[$i];
-			$this->payload .= "\r\n".$p->serialize_class()."\r\n";
-		}
-		
-		$this->payload .= "\r\n\r\n";
-	}
-	
-	//-------------------------------------
-	//  Parse External XML-RPC Server's Response
-	//-------------------------------------
-	
-	function parseResponse($fp)
-	{
-		$data = '';
-		
-		while($datum = fread($fp, 4096))
-		{
-			$data .= $datum;
-		}
-		
-		//-------------------------------------
-		//  DISPLAY HTTP CONTENT for DEBUGGING
-		//-------------------------------------
-		
-		if ($this->debug === TRUE)
-		{
-			echo "
                ";
-			echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
-			echo "
                ";
-		}
-		
-		//-------------------------------------
-		//  Check for data
-		//-------------------------------------
-
-		if($data == "")
-		{
-			error_log($this->xmlrpcstr['no_data']);
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['no_data'], $this->xmlrpcstr['no_data']);
-			return $r;
-		}
-		
-		
-		//-------------------------------------
-		//  Check for HTTP 200 Response
-		//-------------------------------------
-		
-		if(ereg("^HTTP",$data) && !ereg("^HTTP/[0-9\.]+ 200 ", $data))
-		{
-			$errstr= substr($data, 0, strpos($data, "\n")-1);
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error']. ' (' . $errstr . ')');
-			return $r;
-		}
-		
-		//-------------------------------------
-		//  Create and Set Up XML Parser
-		//-------------------------------------
-	
-		$parser = xml_parser_create($this->xmlrpc_defencoding);
-
-		$this->xh[$parser]				 = array();
-		$this->xh[$parser]['isf']		 = 0;
-		$this->xh[$parser]['ac']		 = '';
-		$this->xh[$parser]['headers'] 	 = array();
-		$this->xh[$parser]['stack']		 = array();
-		$this->xh[$parser]['valuestack'] = array();
-		$this->xh[$parser]['isf_reason'] = 0;
-
-		xml_set_object($parser, $this);
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
-		xml_set_element_handler($parser, 'open_tag', 'closing_tag');
-		xml_set_character_data_handler($parser, 'character_data');
-		//xml_set_default_handler($parser, 'default_handler');
-
-
-		//-------------------------------------
-		//  GET HEADERS
-		//-------------------------------------
-		
-		$lines = explode("\r\n", $data);
-		while (($line = array_shift($lines)))
-		{
-			if (strlen($line) < 1)
-			{
-				break;
-			}
-			$this->xh[$parser]['headers'][] = $line;
-		}
-		$data = implode("\r\n", $lines);
-		
-		
-		//-------------------------------------
-		//  PARSE XML DATA
-		//-------------------------------------  	
-
-		if (!xml_parse($parser, $data, sizeof($data)))
-		{
-			$errstr = sprintf('XML error: %s at line %d',
-					xml_error_string(xml_get_error_code($parser)),
-					xml_get_current_line_number($parser));
-			//error_log($errstr);
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'], $this->xmlrpcstr['invalid_return']);
-			xml_parser_free($parser);
-			return $r;
-		}
-		xml_parser_free($parser);
-		
-		// ---------------------------------------
-		//  Got Ourselves Some Badness, It Seems
-		// ---------------------------------------
-		
-		if ($this->xh[$parser]['isf'] > 1)
-		{
-			if ($this->debug === TRUE)
-			{
-				echo "---Invalid Return---\n";
-				echo $this->xh[$parser]['isf_reason'];
-				echo "---Invalid Return---\n\n";
-			}
-				
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
-			return $r;
-		}
-		elseif ( ! is_object($this->xh[$parser]['value']))
-		{
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
-			return $r;
-		}
-		
-		//-------------------------------------
-		//  DISPLAY XML CONTENT for DEBUGGING
-		//-------------------------------------  	
-		
-		if ($this->debug === TRUE)
-		{
-			echo "
                ";
-			
-			if (count($this->xh[$parser]['headers'] > 0))
-			{
-				echo "---HEADERS---\n";
-				foreach ($this->xh[$parser]['headers'] as $header)
-				{
-					echo "$header\n";
-				}
-				echo "---END HEADERS---\n\n";
-			}
-			
-			echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
-			
-			echo "---PARSED---\n" ;
-			var_dump($this->xh[$parser]['value']);
-			echo "\n---END PARSED---
                ";
-		}
-		
-		//-------------------------------------
-		//  SEND RESPONSE
-		//-------------------------------------
-		
-		$v = $this->xh[$parser]['value'];
-			
-		if ($this->xh[$parser]['isf'])
-		{
-			$errno_v = $v->me['struct']['faultCode'];
-			$errstr_v = $v->me['struct']['faultString'];
-			$errno = $errno_v->scalarval();
-
-			if ($errno == 0)
-			{
-				// FAULT returned, errno needs to reflect that
-				$errno = -1;
-			}
-
-			$r = new XML_RPC_Response($v, $errno, $errstr_v->scalarval());
-		}
-		else
-		{
-			$r = new XML_RPC_Response($v);
-		}
-
-		$r->headers = $this->xh[$parser]['headers'];
-		return $r;
-	}
-	
-	// ------------------------------------
-	//  Begin Return Message Parsing section
-	// ------------------------------------
-	
-	// quick explanation of components:
-	//   ac - used to accumulate values
-	//   isf - used to indicate a fault
-	//   lv - used to indicate "looking for a value": implements
-	//		the logic to allow values with no types to be strings
-	//   params - used to store parameters in method calls
-	//   method - used to store method name
-	//	 stack - array with parent tree of the xml element,
-	//			 used to validate the nesting of elements
-
-	//-------------------------------------
-	//  Start Element Handler
-	//-------------------------------------
-
-	function open_tag($the_parser, $name, $attrs)
-	{
-		// If invalid nesting, then return
-		if ($this->xh[$the_parser]['isf'] > 1) return;
-		
-		// Evaluate and check for correct nesting of XML elements
-		
-		if (count($this->xh[$the_parser]['stack']) == 0)
-		{
-			if ($name != 'METHODRESPONSE' && $name != 'METHODCALL')
-			{
-				$this->xh[$the_parser]['isf'] = 2;
-				$this->xh[$the_parser]['isf_reason'] = 'Top level XML-RPC element is missing';
-				return;
-			}
-		}
-		else
-		{
-			// not top level element: see if parent is OK
-			if (!in_array($this->xh[$the_parser]['stack'][0], $this->valid_parents[$name], TRUE))
-			{
-				$this->xh[$the_parser]['isf'] = 2;
-				$this->xh[$the_parser]['isf_reason'] = "XML-RPC element $name cannot be child of ".$this->xh[$the_parser]['stack'][0];
-				return;
-			}
-		}
-		
-		switch($name)
-		{
-			case 'STRUCT':
-			case 'ARRAY':
-				// Creates array for child elements
-				
-				$cur_val = array('value' => array(),
-								 'type'	 => $name);
-								
-				array_unshift($this->xh[$the_parser]['valuestack'], $cur_val);
-			break;
-			case 'METHODNAME':
-			case 'NAME':
-				$this->xh[$the_parser]['ac'] = '';
-			break;
-			case 'FAULT':
-				$this->xh[$the_parser]['isf'] = 1;
-			break;
-			case 'PARAM':
-				$this->xh[$the_parser]['value'] = null;
-			break;
-			case 'VALUE':
-				$this->xh[$the_parser]['vt'] = 'value';
-				$this->xh[$the_parser]['ac'] = '';
-				$this->xh[$the_parser]['lv'] = 1;
-			break;
-			case 'I4':
-			case 'INT':
-			case 'STRING':
-			case 'BOOLEAN':
-			case 'DOUBLE':
-			case 'DATETIME.ISO8601':
-			case 'BASE64':
-				if ($this->xh[$the_parser]['vt'] != 'value')
-				{
-					//two data elements inside a value: an error occurred!
-					$this->xh[$the_parser]['isf'] = 2;
-					$this->xh[$the_parser]['isf_reason'] = "'Twas a $name element following a ".$this->xh[$the_parser]['vt']." element inside a single value";
-					return;
-				}
-				
-				$this->xh[$the_parser]['ac'] = '';
-			break;
-			case 'MEMBER':
-				// Set name of  to nothing to prevent errors later if no  is found
-				$this->xh[$the_parser]['valuestack'][0]['name'] = '';
-				
-				// Set NULL value to check to see if value passed for this param/member
-				$this->xh[$the_parser]['value'] = null;
-			break;
-			case 'DATA':
-			case 'METHODCALL':
-			case 'METHODRESPONSE':
-			case 'PARAMS':
-				// valid elements that add little to processing
-			break;
-			default:
-				/// An Invalid Element is Found, so we have trouble
-				$this->xh[$the_parser]['isf'] = 2;
-				$this->xh[$the_parser]['isf_reason'] = "Invalid XML-RPC element found: $name";
-			break;
-		}
-		
-		// Add current element name to stack, to allow validation of nesting
-		array_unshift($this->xh[$the_parser]['stack'], $name);
-
-		if ($name != 'VALUE') $this->xh[$the_parser]['lv'] = 0;
-	}
-	// END
-
-
-	//-------------------------------------
-	//  End Element Handler
-	//-------------------------------------
-
-	function closing_tag($the_parser, $name)
-	{
-		if ($this->xh[$the_parser]['isf'] > 1) return;
-		
-		// Remove current element from stack and set variable
-		// NOTE: If the XML validates, then we do not have to worry about
-		// the opening and closing of elements.  Nesting is checked on the opening
-		// tag so we be safe there as well.
-		
-		$curr_elem = array_shift($this->xh[$the_parser]['stack']);
-	
-		switch($name)
-		{
-			case 'STRUCT':
-			case 'ARRAY':
-				$cur_val = array_shift($this->xh[$the_parser]['valuestack']);
-				$this->xh[$the_parser]['value'] = ( ! isset($cur_val['values'])) ? array() : $cur_val['values'];
-				$this->xh[$the_parser]['vt']	= strtolower($name);
-			break;
-			case 'NAME':
-				$this->xh[$the_parser]['valuestack'][0]['name'] = $this->xh[$the_parser]['ac'];
-			break;
-			case 'BOOLEAN':
-			case 'I4':
-			case 'INT':
-			case 'STRING':
-			case 'DOUBLE':
-			case 'DATETIME.ISO8601':
-			case 'BASE64':
-				$this->xh[$the_parser]['vt'] = strtolower($name);
-				
-				if ($name == 'STRING')
-				{
-					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
-				}
-				elseif ($name=='DATETIME.ISO8601')
-				{
-					$this->xh[$the_parser]['vt']	= $this->xmlrpcDateTime;
-					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
-				}
-				elseif ($name=='BASE64')
-				{
-					$this->xh[$the_parser]['value'] = base64_decode($this->xh[$the_parser]['ac']);
-				}
-				elseif ($name=='BOOLEAN')
-				{
-					// Translated BOOLEAN values to TRUE AND FALSE
-					if ($this->xh[$the_parser]['ac'] == '1')
-					{
-						$this->xh[$the_parser]['value'] = TRUE;
-					}
-					else
-					{
-						$this->xh[$the_parser]['value'] = FALSE;
-					}
-				}
-				elseif ($name=='DOUBLE')
-				{
-					// we have a DOUBLE
-					// we must check that only 0123456789-. are characters here
-					if (!ereg("^[+-]?[eE0123456789 \\t\\.]+$", $this->xh[$the_parser]['ac']))
-					{
-						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
-					}
-					else
-					{
-						$this->xh[$the_parser]['value'] = (double)$this->xh[$the_parser]['ac'];
-					}
-				}
-				else
-				{
-					// we have an I4/INT
-					// we must check that only 0123456789- are characters here
-					if (!ereg("^[+-]?[0123456789 \\t]+$", $this->xh[$the_parser]['ac']))
-					{
-						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
-					}
-					else
-					{
-						$this->xh[$the_parser]['value'] = (int)$this->xh[$the_parser]['ac'];
-					}
-				}
-				$this->xh[$the_parser]['ac'] = '';
-				$this->xh[$the_parser]['lv'] = 3; // indicate we've found a value
-			break;
-			case 'VALUE':
-				// This if() detects if no scalar was inside 
-				if ($this->xh[$the_parser]['vt']=='value')
-				{
-					$this->xh[$the_parser]['value']	= $this->xh[$the_parser]['ac'];
-					$this->xh[$the_parser]['vt']	= $this->xmlrpcString;
-				}
-				
-				// build the XML-RPC value out of the data received, and substitute it
-				$temp = new XML_RPC_Values($this->xh[$the_parser]['value'], $this->xh[$the_parser]['vt']);
-				
-				if (count($this->xh[$the_parser]['valuestack']) && $this->xh[$the_parser]['valuestack'][0]['type'] == 'ARRAY')
-				{
-					// Array
-					$this->xh[$the_parser]['valuestack'][0]['values'][] = $temp;
-				}
-				else
-				{
-					// Struct
-					$this->xh[$the_parser]['value'] = $temp;
-				}
-			break;
-			case 'MEMBER':
-				$this->xh[$the_parser]['ac']='';
-				
-				// If value add to array in the stack for the last element built
-				if ($this->xh[$the_parser]['value'])
-				{
-					$this->xh[$the_parser]['valuestack'][0]['values'][$this->xh[$the_parser]['valuestack'][0]['name']] = $this->xh[$the_parser]['value'];
-				}
-			break;
-			case 'DATA':
-				$this->xh[$the_parser]['ac']='';
-			break;
-			case 'PARAM':
-				if ($this->xh[$the_parser]['value'])
-				{
-					$this->xh[$the_parser]['params'][] = $this->xh[$the_parser]['value'];
-				}
-			break;
-			case 'METHODNAME':
-				$this->xh[$the_parser]['method'] = ereg_replace("^[\n\r\t ]+", '', $this->xh[$the_parser]['ac']);
-			break;
-			case 'PARAMS':
-			case 'FAULT':
-			case 'METHODCALL':
-			case 'METHORESPONSE':
-				// We're all good kids with nuthin' to do
-			break;
-			default:
-				// End of an Invalid Element.  Taken care of during the opening tag though
-			break;
-		}
-	}
-
-	//-------------------------------------
-	//  Parses Character Data
-	//-------------------------------------
-
-	function character_data($the_parser, $data)
-	{
-		if ($this->xh[$the_parser]['isf'] > 1) return; // XML Fault found already
-		
-		// If a value has not been found
-		if ($this->xh[$the_parser]['lv'] != 3)
-		{
-			if ($this->xh[$the_parser]['lv'] == 1)
-			{
-				$this->xh[$the_parser]['lv'] = 2; // Found a value
-			}
-				
-			if( ! @isset($this->xh[$the_parser]['ac']))
-			{
-				$this->xh[$the_parser]['ac'] = '';
-			}
-				
-			$this->xh[$the_parser]['ac'] .= $data;
-		}
-	}
-	
-	
-	function addParam($par) { $this->params[]=$par; }
-	
-	function output_parameters($array=FALSE)
-	{
-		$CI =& get_instance();	
-
-		if ($array !== FALSE && is_array($array))
-		{
-			while (list($key) = each($array))
-			{
-				if (is_array($array[$key]))
-				{
-					$array[$key] = $this->output_parameters($array[$key]);
-				}
-				else
-				{
-					$array[$key] = $CI->input->xss_clean($array[$key]);
-				}
-			}
-			
-			$parameters = $array;
-		}
-		else
-		{
-			$parameters = array();
-		
-			for ($i = 0; $i < sizeof($this->params); $i++)
-			{
-				$a_param = $this->decode_message($this->params[$i]);
-				
-				if (is_array($a_param))
-				{
-					$parameters[] = $this->output_parameters($a_param);
-				}
-				else
-				{
-					$parameters[] = $CI->input->xss_clean($a_param);
-				}
-			}	
-		}
-		
-		return $parameters;
-	}
-	
-	
-	function decode_message($param)
-	{
-		$kind = $param->kindOf();
-
-		if($kind == 'scalar')
-		{
-			return $param->scalarval();
-		}
-		elseif($kind == 'array')
-		{
-			reset($param->me);
-			list($a,$b) = each($param->me);
-			
-			$arr = array();
-
-			for($i = 0; $i < sizeof($b); $i++)
-			{
-				$arr[] = $this->decode_message($param->me['array'][$i]);
-			}
-			
-			return $arr;
-		}
-		elseif($kind == 'struct')
-		{
-			reset($param->me['struct']);
-			
-			$arr = array();
-
-			while(list($key,$value) = each($param->me['struct']))
-			{
-				$arr[$key] = $this->decode_message($value);
-			}
-			
-			return $arr;
-		}
-	}
-	
-} // End XML_RPC_Messages class
-
-
-
-/**
- * XML-RPC Values class
- *
- * @category	XML-RPC
- * @author		Paul Burdick
- * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
- */
-class XML_RPC_Values extends CI_Xmlrpc
-{
-	var $me 	= array();
-	var $mytype	= 0;
-
-	function XML_RPC_Values($val=-1, $type='')
-	{	
-		parent::CI_Xmlrpc();
-		
-		if ($val != -1 || $type != '')
-		{
-			$type = $type == '' ? 'string' : $type;
-			
-			if ($this->xmlrpcTypes[$type] == 1)
-			{
-				$this->addScalar($val,$type);
-			}
-			elseif ($this->xmlrpcTypes[$type] == 2)
-			{
-				$this->addArray($val);
-			}
-			elseif ($this->xmlrpcTypes[$type] == 3)
-			{
-				$this->addStruct($val);
-			}
-		}
-	}
-
-	function addScalar($val, $type='string')
-	{
-		$typeof = $this->xmlrpcTypes[$type];
-		
-		if ($this->mytype==1)
-		{
-			echo 'XML_RPC_Values: scalar can have only one value
                ';
-			return 0;
-		}
-		
-		if ($typeof != 1)
-		{
-			echo 'XML_RPC_Values: not a scalar type (${typeof})
                ';
-			return 0;
-		}
-
-		if ($type == $this->xmlrpcBoolean)
-		{
-			if (strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))
-			{
-				$val = 1;
-			}
-			else
-			{
-				$val=0;
-			}
-		}
-
-		if ($this->mytype == 2)
-		{
-			// adding to an array here
-			$ar = $this->me['array'];
-			$ar[] = new XML_RPC_Values($val, $type);
-			$this->me['array'] = $ar;
-		}
-		else
-		{
-			// a scalar, so set the value and remember we're scalar
-			$this->me[$type] = $val;
-			$this->mytype = $typeof;
-		}
-		return 1;
-	}
-
-	function addArray($vals)
-	{
-		if ($this->mytype != 0)
-		{
-			echo 'XML_RPC_Values: already initialized as a [' . $this->kindOf() . ']
                ';
-			return 0;
-		}
-
-		$this->mytype = $this->xmlrpcTypes['array'];
-		$this->me['array'] = $vals;
-		return 1;
-	}
-
-	function addStruct($vals)
-	{
-		if ($this->mytype != 0)
-		{
-			echo 'XML_RPC_Values: already initialized as a [' . $this->kindOf() . ']
                ';
-			return 0;
-		}
-		$this->mytype = $this->xmlrpcTypes['struct'];
-		$this->me['struct'] = $vals;
-		return 1;
-	}
-
-	function kindOf()
-	{
-		switch($this->mytype)
-		{
-			case 3:
-				return 'struct';
-				break;
-			case 2:
-				return 'array';
-				break;
-			case 1:
-				return 'scalar';
-				break;
-			default:
-				return 'undef';
-		}
-	}
-
-	function serializedata($typ, $val)
-	{
-		$rs = '';
-		
-		switch($this->xmlrpcTypes[$typ])
-		{
-			case 3:
-				// struct
-				$rs .= "\n";
-				reset($val);
-				while(list($key2, $val2) = each($val))
-				{
-					$rs .= "\n{$key2}\n";
-					$rs .= $this->serializeval($val2);
-					$rs .= "\n";
-				}
-				$rs .= '';
-			break;
-			case 2:
-				// array
-				$rs .= "\n\n";
-				for($i=0; $i < sizeof($val); $i++)
-				{
-					$rs .= $this->serializeval($val[$i]);
-				}
-				$rs.="\n\n";
-				break;
-			case 1:
-				// others
-				switch ($typ)
-				{
-					case $this->xmlrpcBase64:
-						$rs .= "<{$typ}>" . base64_encode($val) . "\n";
-					break;
-					case $this->xmlrpcBoolean:
-						$rs .= "<{$typ}>" . ($val ? '1' : '0') . "\n";
-					break;
-					case $this->xmlrpcString:
-						$rs .= "<{$typ}>" . htmlspecialchars($val). "\n";
-					break;
-					default:
-						$rs .= "<{$typ}>{$val}\n";
-					break;
-				}
-			default:
-			break;
-		}
-		return $rs;
-	}
-
-	function serialize_class()
-	{
-		return $this->serializeval($this);
-	}
-
-	function serializeval($o)
-	{
-		
-		$ar = $o->me;
-		reset($ar);
-		
-		list($typ, $val) = each($ar);
-		$rs = "\n".$this->serializedata($typ, $val)."\n";
-		return $rs;
-	}
-	
-	function scalarval()
-	{
-		reset($this->me);
-		list($a,$b) = each($this->me);
-		return $b;
-	}
-
-
-	//-------------------------------------
-	// Encode time in ISO-8601 form.
-	//-------------------------------------
-	
-	// Useful for sending time in XML-RPC
-
-	function iso8601_encode($time, $utc=0)
-	{	
-		if ($utc == 1)
-		{
-			$t = strftime("%Y%m%dT%H:%M:%S", $time);
-		}
-		else
-		{
-			if (function_exists('gmstrftime'))
-				$t = gmstrftime("%Y%m%dT%H:%M:%S", $time);
-			else
-				$t = strftime("%Y%m%dT%H:%M:%S", $time - date('Z'));
-		}
-		return $t;
-	}
-	
-}
-// END XML_RPC_Values Class
+xmlrpcName 		= $this->xmlrpcName;
+		$this->xmlrpc_backslash = chr(92).chr(92);
+		
+		// Types for info sent back and forth
+		$this->xmlrpcTypes = array(
+			$this->xmlrpcI4	   => '1',
+			$this->xmlrpcInt	  => '1',
+			$this->xmlrpcBoolean  => '1',
+			$this->xmlrpcString   => '1',
+			$this->xmlrpcDouble   => '1',
+			$this->xmlrpcDateTime => '1',
+			$this->xmlrpcBase64   => '1',
+			$this->xmlrpcArray	=> '2',
+			$this->xmlrpcStruct   => '3'
+			);
+			
+		// Array of Valid Parents for Various XML-RPC elements
+		$this->valid_parents = array('BOOLEAN'			=> array('VALUE'),
+									 'I4'				=> array('VALUE'),
+									 'INT'				=> array('VALUE'),
+									 'STRING'			=> array('VALUE'),
+									 'DOUBLE'			=> array('VALUE'),
+									 'DATETIME.ISO8601'	=> array('VALUE'),
+									 'BASE64'			=> array('VALUE'),
+									 'ARRAY'			=> array('VALUE'),
+									 'STRUCT'			=> array('VALUE'),
+									 'PARAM'			=> array('PARAMS'),
+									 'METHODNAME'		=> array('METHODCALL'),
+									 'PARAMS'			=> array('METHODCALL', 'METHODRESPONSE'),
+									 'MEMBER'			=> array('STRUCT'),
+									 'NAME'				=> array('MEMBER'),
+									 'DATA'				=> array('ARRAY'),
+									 'FAULT'			=> array('METHODRESPONSE'),
+									 'VALUE'			=> array('MEMBER', 'DATA', 'PARAM', 'FAULT')
+									 );
+			
+			
+		// XML-RPC Responses
+		$this->xmlrpcerr['unknown_method'] = '1';
+		$this->xmlrpcstr['unknown_method'] = 'This is not a known method for this XML-RPC Server';
+		$this->xmlrpcerr['invalid_return'] = '2';
+		$this->xmlrpcstr['invalid_return'] = 'The XML data receieved was either invalid or not in the correct form for XML-RPC.  Turn on debugging to examine the XML data further.';
+		$this->xmlrpcerr['incorrect_params'] = '3';
+		$this->xmlrpcstr['incorrect_params'] = 'Incorrect parameters were passed to method';
+		$this->xmlrpcerr['introspect_unknown'] = '4';
+		$this->xmlrpcstr['introspect_unknown'] = "Cannot inspect signature for request: method unknown";
+		$this->xmlrpcerr['http_error'] = '5';
+		$this->xmlrpcstr['http_error'] = "Did not receive a '200 OK' response from remote server.";
+		$this->xmlrpcerr['no_data'] = '6';
+		$this->xmlrpcstr['no_data'] ='No data received from server.';
+		
+		$this->initialize($config);
+		
+		log_message('debug', "XML-RPC Class Initialized");
+	}
+	
+	
+	//-------------------------------------
+	//  Initialize Prefs
+	//-------------------------------------
+
+	function initialize($config = array())
+	{
+		if (sizeof($config) > 0)
+		{
+			foreach ($config as $key => $val)
+			{
+				if (isset($this->$key))
+				{
+					$this->$key = $val;			
+				}
+			}
+		}
+	}
+	// END
+	
+	//-------------------------------------
+	//  Take URL and parse it
+	//-------------------------------------
+
+	function server($url, $port=80)
+	{
+		if (substr($url, 0, 4) != "http")
+		{
+			$url = "http://".$url;
+		}
+		
+		$parts = parse_url($url);
+		
+		$path = (!isset($parts['path'])) ? '/' : $parts['path'];
+		
+		if (isset($parts['query']) && $parts['query'] != '')
+		{
+			$path .= '?'.$parts['query'];
+		}	
+		
+		$this->client = new XML_RPC_Client($path, $parts['host'], $port);
+	}
+	// END
+	
+	//-------------------------------------
+	//  Set Timeout
+	//-------------------------------------
+
+	function timeout($seconds=5)
+	{
+		if ( ! is_null($this->client) && is_int($seconds))
+		{
+			$this->client->timeout = $seconds;
+		}
+	}
+	// END
+	
+	//-------------------------------------
+	//  Set Methods
+	//-------------------------------------
+
+	function method($function)
+	{
+		$this->method = $function;
+	}
+	// END
+	
+	//-------------------------------------
+	//  Take Array of Data and Create Objects
+	//-------------------------------------
+
+	function request($incoming)
+	{
+		if ( ! is_array($incoming))
+		{
+			// Send Error
+		}
+		
+		foreach($incoming as $key => $value)
+		{
+			$this->data[$key] = $this->values_parsing($value);
+		}
+	}
+	// END
+	
+	
+	//-------------------------------------
+	//  Set Debug
+	//-------------------------------------
+
+	function set_debug($flag = TRUE)
+	{
+		$this->debug = ($flag == TRUE) ? TRUE : FALSE;
+	}
+	
+	//-------------------------------------
+	//  Values Parsing
+	//-------------------------------------
+
+	function values_parsing($value, $return = FALSE)
+	{
+		if (is_array($value) && isset($value['0']))
+		{
+			if ( ! isset($value['1']) OR ! isset($this->xmlrpcTypes[strtolower($value['1'])]))
+			{
+				$temp = new XML_RPC_Values($value['0'], 'string');
+			}
+			elseif(is_array($value['0']) && ($value['1'] == 'struct' OR $value['1'] == 'array'))
+			{
+				while (list($k) = each($value['0']))
+				{
+					$value['0'][$k] = $this->values_parsing($value['0'][$k], TRUE);
+				}
+				
+				$temp = new XML_RPC_Values($value['0'], $value['1']);
+			}
+			else
+			{
+				$temp = new XML_RPC_Values($value['0'], $value['1']);
+			}
+		}
+		else
+		{
+			$temp = new XML_RPC_Values($value, 'string');
+		}
+
+		return $temp;
+	}
+	// END
+
+
+	//-------------------------------------
+	//  Sends XML-RPC Request
+	//-------------------------------------
+
+	function send_request()
+	{
+		$this->message = new XML_RPC_Message($this->method,$this->data);
+		$this->message->debug = $this->debug;
+	
+		if ( ! $this->result = $this->client->send($this->message))
+		{
+			$this->error = $this->result->errstr;
+			return FALSE;
+		}
+		elseif( ! is_object($this->result->val))
+		{
+			$this->error = $this->result->errstr;
+			return FALSE;
+		}
+		
+		$this->response = $this->result->decode();
+		
+		return TRUE;
+	}
+	// END
+	
+	//-------------------------------------
+	//  Returns Error
+	//-------------------------------------
+
+	function display_error()
+	{
+		return $this->error;
+	}
+	// END
+	
+	//-------------------------------------
+	//  Returns Remote Server Response
+	//-------------------------------------
+
+	function display_response()
+	{
+		return $this->response;
+	}
+	// END
+	
+	//-------------------------------------
+	//  Sends an Error Message for Server Request
+	//-------------------------------------
+	
+	function send_error_message($number, $message)
+	{
+		return new XML_RPC_Response('0',$number, $message);
+	}
+	// END
+	
+	
+	//-------------------------------------
+	//  Send Response for Server Request
+	//-------------------------------------
+	
+	function send_response($response)
+	{
+		// $response should be array of values, which will be parsed
+		// based on their data and type into a valid group of XML-RPC values
+		
+		$response = $this->values_parsing($response);
+	
+		return new XML_RPC_Response($response);
+	}
+	// END
+	
+} // END XML_RPC Class
+
+	
+	
+/**
+ * XML-RPC Client class
+ *
+ * @category	XML-RPC
+ * @author		Paul Burdick
+ * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ */
+class XML_RPC_Client extends CI_Xmlrpc
+{
+	var $path			= '';
+	var $server			= '';
+	var $port			= 80;
+	var $errno			= '';
+	var $errstring		= '';
+	var $timeout		= 5;
+	var $no_multicall	= false;
+
+	function XML_RPC_Client($path, $server, $port=80)
+	{
+		parent::CI_Xmlrpc();
+		
+		$this->port = $port;
+		$this->server = $server;
+		$this->path = $path;
+	}
+	
+	function send($msg)
+	{
+		if (is_array($msg))
+		{
+			// Multi-call disabled
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['multicall_recursion'],$this->xmlrpcstr['multicall_recursion']);
+			return $r;
+		}
+
+		return $this->sendPayload($msg);
+	}
+
+	function sendPayload($msg)
+	{	
+		$fp = @fsockopen($this->server, $this->port,$this->errno, $this->errstr, $this->timeout);
+		
+		if (! is_resource($fp))
+		{
+			error_log($this->xmlrpcstr['http_error']);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'],$this->xmlrpcstr['http_error']);
+			return $r;
+		}
+		
+		if(empty($msg->payload))
+		{
+			// $msg = XML_RPC_Messages
+			$msg->createPayload();
+		}
+		
+		$r = "\r\n";
+		$op  = "POST {$this->path} HTTP/1.0$r";
+		$op .= "Host: {$this->server}$r";
+		$op .= "Content-Type: text/xml$r";
+		$op .= "User-Agent: {$this->xmlrpcName}$r";
+		$op .= "Content-Length: ".strlen($msg->payload). "$r$r";
+		$op .= $msg->payload;
+		
+
+		if (!fputs($fp, $op, strlen($op)))
+		{
+			error_log($this->xmlrpcstr['http_error']);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error']);
+			return $r;
+		}
+		$resp = $msg->parseResponse($fp);
+		fclose($fp);
+		return $resp;
+	}
+
+} // end class XML_RPC_Client
+
+
+/**
+ * XML-RPC Response class
+ *
+ * @category	XML-RPC
+ * @author		Paul Burdick
+ * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ */
+class XML_RPC_Response
+{
+	var $val = 0;
+	var $errno = 0;
+	var $errstr = '';
+	var $headers = array();
+
+	function XML_RPC_Response($val, $code = 0, $fstr = '')
+	{	
+		if ($code != 0)
+		{
+			// error
+			$this->errno = $code;
+			$this->errstr = htmlentities($fstr);
+		}
+		else if (!is_object($val))
+		{
+			// programmer error, not an object
+			error_log("Invalid type '" . gettype($val) . "' (value: $val) passed to XML_RPC_Response.  Defaulting to empty value.");
+			$this->val = new XML_RPC_Values();
+		}
+		else
+		{
+			$this->val = $val;
+		}
+	}
+
+	function faultCode()
+	{
+		return $this->errno;
+	}
+
+	function faultString()
+	{
+		return $this->errstr;
+	}
+
+	function value()
+	{
+		return $this->val;
+	}
+	
+	function prepare_response()
+	{
+		$result = "\n";
+		if ($this->errno)
+		{
+			$result .= '
+	
+		
+			
+				faultCode
+				' . $this->errno . '
+			
+			
+				faultString
+				' . $this->errstr . '
+			
+		
+	
+';
+		}
+		else
+		{
+			$result .= "\n\n" .
+					$this->val->serialize_class() .
+					"\n";
+		}
+		$result .= "\n";
+		return $result;
+	}
+	
+	function decode($array=FALSE)
+	{
+		$CI =& get_instance();	
+
+		if ($array !== FALSE && is_array($array))
+		{
+			while (list($key) = each($array))
+			{
+				if (is_array($array[$key]))
+				{
+					$array[$key] = $this->decode($array[$key]);
+				}
+				else
+				{
+					$array[$key] = $CI->input->xss_clean($array[$key]);
+				}
+			}
+			
+			$result = $array;
+		}
+		else
+		{
+			$result = $this->xmlrpc_decoder($this->val);
+			
+			if (is_array($result))
+			{
+				$result = $this->decode($result);
+			}
+			else
+			{
+				$result = $CI->input->xss_clean($result);
+			}
+		}
+		
+		return $result;
+	}
+
+	
+	
+	//-------------------------------------
+	//  XML-RPC Object to PHP Types
+	//-------------------------------------
+
+	function xmlrpc_decoder($xmlrpc_val)
+	{
+		$kind = $xmlrpc_val->kindOf();
+
+		if($kind == 'scalar')
+		{
+			return $xmlrpc_val->scalarval();
+		}
+		elseif($kind == 'array')
+		{
+			reset($xmlrpc_val->me);
+			list($a,$b) = each($xmlrpc_val->me);
+			$size = sizeof($b);
+			
+			$arr = array();
+
+			for($i = 0; $i < $size; $i++)
+			{
+				$arr[] = $this->xmlrpc_decoder($xmlrpc_val->me['array'][$i]);
+			}
+			return $arr;
+		}
+		elseif($kind == 'struct')
+		{
+			reset($xmlrpc_val->me['struct']);
+			$arr = array();
+
+			while(list($key,$value) = each($xmlrpc_val->me['struct']))
+			{
+				$arr[$key] = $this->xmlrpc_decoder($value);
+			}
+			return $arr;
+		}
+	}
+	
+	
+	//-------------------------------------
+	//  ISO-8601 time to server or UTC time
+	//-------------------------------------
+
+	function iso8601_decode($time, $utc=0)
+	{
+		// return a timet in the localtime, or UTC
+		$t = 0;
+		if (ereg("([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})", $time, $regs))
+		{
+			if ($utc == 1)
+				$t = gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+			else
+				$t = mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+		}
+		return $t;
+	}
+	
+} // End Response Class
+
+
+
+/**
+ * XML-RPC Message class
+ *
+ * @category	XML-RPC
+ * @author		Paul Burdick
+ * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ */
+class XML_RPC_Message extends CI_Xmlrpc
+{
+	var $payload;
+	var $method_name;
+	var $params			= array();
+	var $xh 			= array();
+
+	function XML_RPC_Message($method, $pars=0)
+	{
+		parent::CI_Xmlrpc();
+		
+		$this->method_name = $method;
+		if (is_array($pars) && sizeof($pars) > 0)
+		{
+			for($i=0; $iparams[] = $pars[$i];
+			}
+		}
+	}
+	
+	//-------------------------------------
+	//  Create Payload to Send
+	//-------------------------------------
+	
+	function createPayload()
+	{
+		$this->payload = "\r\n\r\n";
+		$this->payload .= '' . $this->method_name . "\r\n";
+		$this->payload .= "\r\n";
+		
+		for($i=0; $iparams); $i++)
+		{
+			// $p = XML_RPC_Values
+			$p = $this->params[$i];
+			$this->payload .= "\r\n".$p->serialize_class()."\r\n";
+		}
+		
+		$this->payload .= "\r\n\r\n";
+	}
+	
+	//-------------------------------------
+	//  Parse External XML-RPC Server's Response
+	//-------------------------------------
+	
+	function parseResponse($fp)
+	{
+		$data = '';
+		
+		while($datum = fread($fp, 4096))
+		{
+			$data .= $datum;
+		}
+		
+		//-------------------------------------
+		//  DISPLAY HTTP CONTENT for DEBUGGING
+		//-------------------------------------
+		
+		if ($this->debug === TRUE)
+		{
+			echo "
                ";
+			echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
+			echo "
                ";
+		}
+		
+		//-------------------------------------
+		//  Check for data
+		//-------------------------------------
+
+		if($data == "")
+		{
+			error_log($this->xmlrpcstr['no_data']);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['no_data'], $this->xmlrpcstr['no_data']);
+			return $r;
+		}
+		
+		
+		//-------------------------------------
+		//  Check for HTTP 200 Response
+		//-------------------------------------
+		
+		if(ereg("^HTTP",$data) && !ereg("^HTTP/[0-9\.]+ 200 ", $data))
+		{
+			$errstr= substr($data, 0, strpos($data, "\n")-1);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error']. ' (' . $errstr . ')');
+			return $r;
+		}
+		
+		//-------------------------------------
+		//  Create and Set Up XML Parser
+		//-------------------------------------
+	
+		$parser = xml_parser_create($this->xmlrpc_defencoding);
+
+		$this->xh[$parser]				 = array();
+		$this->xh[$parser]['isf']		 = 0;
+		$this->xh[$parser]['ac']		 = '';
+		$this->xh[$parser]['headers'] 	 = array();
+		$this->xh[$parser]['stack']		 = array();
+		$this->xh[$parser]['valuestack'] = array();
+		$this->xh[$parser]['isf_reason'] = 0;
+
+		xml_set_object($parser, $this);
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
+		xml_set_element_handler($parser, 'open_tag', 'closing_tag');
+		xml_set_character_data_handler($parser, 'character_data');
+		//xml_set_default_handler($parser, 'default_handler');
+
+
+		//-------------------------------------
+		//  GET HEADERS
+		//-------------------------------------
+		
+		$lines = explode("\r\n", $data);
+		while (($line = array_shift($lines)))
+		{
+			if (strlen($line) < 1)
+			{
+				break;
+			}
+			$this->xh[$parser]['headers'][] = $line;
+		}
+		$data = implode("\r\n", $lines);
+		
+		
+		//-------------------------------------
+		//  PARSE XML DATA
+		//-------------------------------------  	
+
+		if (!xml_parse($parser, $data, sizeof($data)))
+		{
+			$errstr = sprintf('XML error: %s at line %d',
+					xml_error_string(xml_get_error_code($parser)),
+					xml_get_current_line_number($parser));
+			//error_log($errstr);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'], $this->xmlrpcstr['invalid_return']);
+			xml_parser_free($parser);
+			return $r;
+		}
+		xml_parser_free($parser);
+		
+		// ---------------------------------------
+		//  Got Ourselves Some Badness, It Seems
+		// ---------------------------------------
+		
+		if ($this->xh[$parser]['isf'] > 1)
+		{
+			if ($this->debug === TRUE)
+			{
+				echo "---Invalid Return---\n";
+				echo $this->xh[$parser]['isf_reason'];
+				echo "---Invalid Return---\n\n";
+			}
+				
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
+			return $r;
+		}
+		elseif ( ! is_object($this->xh[$parser]['value']))
+		{
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
+			return $r;
+		}
+		
+		//-------------------------------------
+		//  DISPLAY XML CONTENT for DEBUGGING
+		//-------------------------------------  	
+		
+		if ($this->debug === TRUE)
+		{
+			echo "
                ";
+			
+			if (count($this->xh[$parser]['headers'] > 0))
+			{
+				echo "---HEADERS---\n";
+				foreach ($this->xh[$parser]['headers'] as $header)
+				{
+					echo "$header\n";
+				}
+				echo "---END HEADERS---\n\n";
+			}
+			
+			echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
+			
+			echo "---PARSED---\n" ;
+			var_dump($this->xh[$parser]['value']);
+			echo "\n---END PARSED---
                ";
+		}
+		
+		//-------------------------------------
+		//  SEND RESPONSE
+		//-------------------------------------
+		
+		$v = $this->xh[$parser]['value'];
+			
+		if ($this->xh[$parser]['isf'])
+		{
+			$errno_v = $v->me['struct']['faultCode'];
+			$errstr_v = $v->me['struct']['faultString'];
+			$errno = $errno_v->scalarval();
+
+			if ($errno == 0)
+			{
+				// FAULT returned, errno needs to reflect that
+				$errno = -1;
+			}
+
+			$r = new XML_RPC_Response($v, $errno, $errstr_v->scalarval());
+		}
+		else
+		{
+			$r = new XML_RPC_Response($v);
+		}
+
+		$r->headers = $this->xh[$parser]['headers'];
+		return $r;
+	}
+	
+	// ------------------------------------
+	//  Begin Return Message Parsing section
+	// ------------------------------------
+	
+	// quick explanation of components:
+	//   ac - used to accumulate values
+	//   isf - used to indicate a fault
+	//   lv - used to indicate "looking for a value": implements
+	//		the logic to allow values with no types to be strings
+	//   params - used to store parameters in method calls
+	//   method - used to store method name
+	//	 stack - array with parent tree of the xml element,
+	//			 used to validate the nesting of elements
+
+	//-------------------------------------
+	//  Start Element Handler
+	//-------------------------------------
+
+	function open_tag($the_parser, $name, $attrs)
+	{
+		// If invalid nesting, then return
+		if ($this->xh[$the_parser]['isf'] > 1) return;
+		
+		// Evaluate and check for correct nesting of XML elements
+		
+		if (count($this->xh[$the_parser]['stack']) == 0)
+		{
+			if ($name != 'METHODRESPONSE' && $name != 'METHODCALL')
+			{
+				$this->xh[$the_parser]['isf'] = 2;
+				$this->xh[$the_parser]['isf_reason'] = 'Top level XML-RPC element is missing';
+				return;
+			}
+		}
+		else
+		{
+			// not top level element: see if parent is OK
+			if (!in_array($this->xh[$the_parser]['stack'][0], $this->valid_parents[$name], TRUE))
+			{
+				$this->xh[$the_parser]['isf'] = 2;
+				$this->xh[$the_parser]['isf_reason'] = "XML-RPC element $name cannot be child of ".$this->xh[$the_parser]['stack'][0];
+				return;
+			}
+		}
+		
+		switch($name)
+		{
+			case 'STRUCT':
+			case 'ARRAY':
+				// Creates array for child elements
+				
+				$cur_val = array('value' => array(),
+								 'type'	 => $name);
+								
+				array_unshift($this->xh[$the_parser]['valuestack'], $cur_val);
+			break;
+			case 'METHODNAME':
+			case 'NAME':
+				$this->xh[$the_parser]['ac'] = '';
+			break;
+			case 'FAULT':
+				$this->xh[$the_parser]['isf'] = 1;
+			break;
+			case 'PARAM':
+				$this->xh[$the_parser]['value'] = null;
+			break;
+			case 'VALUE':
+				$this->xh[$the_parser]['vt'] = 'value';
+				$this->xh[$the_parser]['ac'] = '';
+				$this->xh[$the_parser]['lv'] = 1;
+			break;
+			case 'I4':
+			case 'INT':
+			case 'STRING':
+			case 'BOOLEAN':
+			case 'DOUBLE':
+			case 'DATETIME.ISO8601':
+			case 'BASE64':
+				if ($this->xh[$the_parser]['vt'] != 'value')
+				{
+					//two data elements inside a value: an error occurred!
+					$this->xh[$the_parser]['isf'] = 2;
+					$this->xh[$the_parser]['isf_reason'] = "'Twas a $name element following a ".$this->xh[$the_parser]['vt']." element inside a single value";
+					return;
+				}
+				
+				$this->xh[$the_parser]['ac'] = '';
+			break;
+			case 'MEMBER':
+				// Set name of  to nothing to prevent errors later if no  is found
+				$this->xh[$the_parser]['valuestack'][0]['name'] = '';
+				
+				// Set NULL value to check to see if value passed for this param/member
+				$this->xh[$the_parser]['value'] = null;
+			break;
+			case 'DATA':
+			case 'METHODCALL':
+			case 'METHODRESPONSE':
+			case 'PARAMS':
+				// valid elements that add little to processing
+			break;
+			default:
+				/// An Invalid Element is Found, so we have trouble
+				$this->xh[$the_parser]['isf'] = 2;
+				$this->xh[$the_parser]['isf_reason'] = "Invalid XML-RPC element found: $name";
+			break;
+		}
+		
+		// Add current element name to stack, to allow validation of nesting
+		array_unshift($this->xh[$the_parser]['stack'], $name);
+
+		if ($name != 'VALUE') $this->xh[$the_parser]['lv'] = 0;
+	}
+	// END
+
+
+	//-------------------------------------
+	//  End Element Handler
+	//-------------------------------------
+
+	function closing_tag($the_parser, $name)
+	{
+		if ($this->xh[$the_parser]['isf'] > 1) return;
+		
+		// Remove current element from stack and set variable
+		// NOTE: If the XML validates, then we do not have to worry about
+		// the opening and closing of elements.  Nesting is checked on the opening
+		// tag so we be safe there as well.
+		
+		$curr_elem = array_shift($this->xh[$the_parser]['stack']);
+	
+		switch($name)
+		{
+			case 'STRUCT':
+			case 'ARRAY':
+				$cur_val = array_shift($this->xh[$the_parser]['valuestack']);
+				$this->xh[$the_parser]['value'] = ( ! isset($cur_val['values'])) ? array() : $cur_val['values'];
+				$this->xh[$the_parser]['vt']	= strtolower($name);
+			break;
+			case 'NAME':
+				$this->xh[$the_parser]['valuestack'][0]['name'] = $this->xh[$the_parser]['ac'];
+			break;
+			case 'BOOLEAN':
+			case 'I4':
+			case 'INT':
+			case 'STRING':
+			case 'DOUBLE':
+			case 'DATETIME.ISO8601':
+			case 'BASE64':
+				$this->xh[$the_parser]['vt'] = strtolower($name);
+				
+				if ($name == 'STRING')
+				{
+					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
+				}
+				elseif ($name=='DATETIME.ISO8601')
+				{
+					$this->xh[$the_parser]['vt']	= $this->xmlrpcDateTime;
+					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
+				}
+				elseif ($name=='BASE64')
+				{
+					$this->xh[$the_parser]['value'] = base64_decode($this->xh[$the_parser]['ac']);
+				}
+				elseif ($name=='BOOLEAN')
+				{
+					// Translated BOOLEAN values to TRUE AND FALSE
+					if ($this->xh[$the_parser]['ac'] == '1')
+					{
+						$this->xh[$the_parser]['value'] = TRUE;
+					}
+					else
+					{
+						$this->xh[$the_parser]['value'] = FALSE;
+					}
+				}
+				elseif ($name=='DOUBLE')
+				{
+					// we have a DOUBLE
+					// we must check that only 0123456789-. are characters here
+					if (!ereg("^[+-]?[eE0123456789 \\t\\.]+$", $this->xh[$the_parser]['ac']))
+					{
+						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
+					}
+					else
+					{
+						$this->xh[$the_parser]['value'] = (double)$this->xh[$the_parser]['ac'];
+					}
+				}
+				else
+				{
+					// we have an I4/INT
+					// we must check that only 0123456789- are characters here
+					if (!ereg("^[+-]?[0123456789 \\t]+$", $this->xh[$the_parser]['ac']))
+					{
+						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
+					}
+					else
+					{
+						$this->xh[$the_parser]['value'] = (int)$this->xh[$the_parser]['ac'];
+					}
+				}
+				$this->xh[$the_parser]['ac'] = '';
+				$this->xh[$the_parser]['lv'] = 3; // indicate we've found a value
+			break;
+			case 'VALUE':
+				// This if() detects if no scalar was inside 
+				if ($this->xh[$the_parser]['vt']=='value')
+				{
+					$this->xh[$the_parser]['value']	= $this->xh[$the_parser]['ac'];
+					$this->xh[$the_parser]['vt']	= $this->xmlrpcString;
+				}
+				
+				// build the XML-RPC value out of the data received, and substitute it
+				$temp = new XML_RPC_Values($this->xh[$the_parser]['value'], $this->xh[$the_parser]['vt']);
+				
+				if (count($this->xh[$the_parser]['valuestack']) && $this->xh[$the_parser]['valuestack'][0]['type'] == 'ARRAY')
+				{
+					// Array
+					$this->xh[$the_parser]['valuestack'][0]['values'][] = $temp;
+				}
+				else
+				{
+					// Struct
+					$this->xh[$the_parser]['value'] = $temp;
+				}
+			break;
+			case 'MEMBER':
+				$this->xh[$the_parser]['ac']='';
+				
+				// If value add to array in the stack for the last element built
+				if ($this->xh[$the_parser]['value'])
+				{
+					$this->xh[$the_parser]['valuestack'][0]['values'][$this->xh[$the_parser]['valuestack'][0]['name']] = $this->xh[$the_parser]['value'];
+				}
+			break;
+			case 'DATA':
+				$this->xh[$the_parser]['ac']='';
+			break;
+			case 'PARAM':
+				if ($this->xh[$the_parser]['value'])
+				{
+					$this->xh[$the_parser]['params'][] = $this->xh[$the_parser]['value'];
+				}
+			break;
+			case 'METHODNAME':
+				$this->xh[$the_parser]['method'] = ereg_replace("^[\n\r\t ]+", '', $this->xh[$the_parser]['ac']);
+			break;
+			case 'PARAMS':
+			case 'FAULT':
+			case 'METHODCALL':
+			case 'METHORESPONSE':
+				// We're all good kids with nuthin' to do
+			break;
+			default:
+				// End of an Invalid Element.  Taken care of during the opening tag though
+			break;
+		}
+	}
+
+	//-------------------------------------
+	//  Parses Character Data
+	//-------------------------------------
+
+	function character_data($the_parser, $data)
+	{
+		if ($this->xh[$the_parser]['isf'] > 1) return; // XML Fault found already
+		
+		// If a value has not been found
+		if ($this->xh[$the_parser]['lv'] != 3)
+		{
+			if ($this->xh[$the_parser]['lv'] == 1)
+			{
+				$this->xh[$the_parser]['lv'] = 2; // Found a value
+			}
+				
+			if( ! @isset($this->xh[$the_parser]['ac']))
+			{
+				$this->xh[$the_parser]['ac'] = '';
+			}
+				
+			$this->xh[$the_parser]['ac'] .= $data;
+		}
+	}
+	
+	
+	function addParam($par) { $this->params[]=$par; }
+	
+	function output_parameters($array=FALSE)
+	{
+		$CI =& get_instance();	
+
+		if ($array !== FALSE && is_array($array))
+		{
+			while (list($key) = each($array))
+			{
+				if (is_array($array[$key]))
+				{
+					$array[$key] = $this->output_parameters($array[$key]);
+				}
+				else
+				{
+					$array[$key] = $CI->input->xss_clean($array[$key]);
+				}
+			}
+			
+			$parameters = $array;
+		}
+		else
+		{
+			$parameters = array();
+		
+			for ($i = 0; $i < sizeof($this->params); $i++)
+			{
+				$a_param = $this->decode_message($this->params[$i]);
+				
+				if (is_array($a_param))
+				{
+					$parameters[] = $this->output_parameters($a_param);
+				}
+				else
+				{
+					$parameters[] = $CI->input->xss_clean($a_param);
+				}
+			}	
+		}
+		
+		return $parameters;
+	}
+	
+	
+	function decode_message($param)
+	{
+		$kind = $param->kindOf();
+
+		if($kind == 'scalar')
+		{
+			return $param->scalarval();
+		}
+		elseif($kind == 'array')
+		{
+			reset($param->me);
+			list($a,$b) = each($param->me);
+			
+			$arr = array();
+
+			for($i = 0; $i < sizeof($b); $i++)
+			{
+				$arr[] = $this->decode_message($param->me['array'][$i]);
+			}
+			
+			return $arr;
+		}
+		elseif($kind == 'struct')
+		{
+			reset($param->me['struct']);
+			
+			$arr = array();
+
+			while(list($key,$value) = each($param->me['struct']))
+			{
+				$arr[$key] = $this->decode_message($value);
+			}
+			
+			return $arr;
+		}
+	}
+	
+} // End XML_RPC_Messages class
+
+
+
+/**
+ * XML-RPC Values class
+ *
+ * @category	XML-RPC
+ * @author		Paul Burdick
+ * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ */
+class XML_RPC_Values extends CI_Xmlrpc
+{
+	var $me 	= array();
+	var $mytype	= 0;
+
+	function XML_RPC_Values($val=-1, $type='')
+	{	
+		parent::CI_Xmlrpc();
+		
+		if ($val != -1 || $type != '')
+		{
+			$type = $type == '' ? 'string' : $type;
+			
+			if ($this->xmlrpcTypes[$type] == 1)
+			{
+				$this->addScalar($val,$type);
+			}
+			elseif ($this->xmlrpcTypes[$type] == 2)
+			{
+				$this->addArray($val);
+			}
+			elseif ($this->xmlrpcTypes[$type] == 3)
+			{
+				$this->addStruct($val);
+			}
+		}
+	}
+
+	function addScalar($val, $type='string')
+	{
+		$typeof = $this->xmlrpcTypes[$type];
+		
+		if ($this->mytype==1)
+		{
+			echo 'XML_RPC_Values: scalar can have only one value
                ';
+			return 0;
+		}
+		
+		if ($typeof != 1)
+		{
+			echo 'XML_RPC_Values: not a scalar type (${typeof})
                ';
+			return 0;
+		}
+
+		if ($type == $this->xmlrpcBoolean)
+		{
+			if (strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))
+			{
+				$val = 1;
+			}
+			else
+			{
+				$val=0;
+			}
+		}
+
+		if ($this->mytype == 2)
+		{
+			// adding to an array here
+			$ar = $this->me['array'];
+			$ar[] = new XML_RPC_Values($val, $type);
+			$this->me['array'] = $ar;
+		}
+		else
+		{
+			// a scalar, so set the value and remember we're scalar
+			$this->me[$type] = $val;
+			$this->mytype = $typeof;
+		}
+		return 1;
+	}
+
+	function addArray($vals)
+	{
+		if ($this->mytype != 0)
+		{
+			echo 'XML_RPC_Values: already initialized as a [' . $this->kindOf() . ']
                ';
+			return 0;
+		}
+
+		$this->mytype = $this->xmlrpcTypes['array'];
+		$this->me['array'] = $vals;
+		return 1;
+	}
+
+	function addStruct($vals)
+	{
+		if ($this->mytype != 0)
+		{
+			echo 'XML_RPC_Values: already initialized as a [' . $this->kindOf() . ']
                ';
+			return 0;
+		}
+		$this->mytype = $this->xmlrpcTypes['struct'];
+		$this->me['struct'] = $vals;
+		return 1;
+	}
+
+	function kindOf()
+	{
+		switch($this->mytype)
+		{
+			case 3:
+				return 'struct';
+				break;
+			case 2:
+				return 'array';
+				break;
+			case 1:
+				return 'scalar';
+				break;
+			default:
+				return 'undef';
+		}
+	}
+
+	function serializedata($typ, $val)
+	{
+		$rs = '';
+		
+		switch($this->xmlrpcTypes[$typ])
+		{
+			case 3:
+				// struct
+				$rs .= "\n";
+				reset($val);
+				while(list($key2, $val2) = each($val))
+				{
+					$rs .= "\n{$key2}\n";
+					$rs .= $this->serializeval($val2);
+					$rs .= "\n";
+				}
+				$rs .= '';
+			break;
+			case 2:
+				// array
+				$rs .= "\n\n";
+				for($i=0; $i < sizeof($val); $i++)
+				{
+					$rs .= $this->serializeval($val[$i]);
+				}
+				$rs.="\n\n";
+				break;
+			case 1:
+				// others
+				switch ($typ)
+				{
+					case $this->xmlrpcBase64:
+						$rs .= "<{$typ}>" . base64_encode($val) . "\n";
+					break;
+					case $this->xmlrpcBoolean:
+						$rs .= "<{$typ}>" . ($val ? '1' : '0') . "\n";
+					break;
+					case $this->xmlrpcString:
+						$rs .= "<{$typ}>" . htmlspecialchars($val). "\n";
+					break;
+					default:
+						$rs .= "<{$typ}>{$val}\n";
+					break;
+				}
+			default:
+			break;
+		}
+		return $rs;
+	}
+
+	function serialize_class()
+	{
+		return $this->serializeval($this);
+	}
+
+	function serializeval($o)
+	{
+		
+		$ar = $o->me;
+		reset($ar);
+		
+		list($typ, $val) = each($ar);
+		$rs = "\n".$this->serializedata($typ, $val)."\n";
+		return $rs;
+	}
+	
+	function scalarval()
+	{
+		reset($this->me);
+		list($a,$b) = each($this->me);
+		return $b;
+	}
+
+
+	//-------------------------------------
+	// Encode time in ISO-8601 form.
+	//-------------------------------------
+	
+	// Useful for sending time in XML-RPC
+
+	function iso8601_encode($time, $utc=0)
+	{	
+		if ($utc == 1)
+		{
+			$t = strftime("%Y%m%dT%H:%M:%S", $time);
+		}
+		else
+		{
+			if (function_exists('gmstrftime'))
+				$t = gmstrftime("%Y%m%dT%H:%M:%S", $time);
+			else
+				$t = strftime("%Y%m%dT%H:%M:%S", $time - date('Z'));
+		}
+		return $t;
+	}
+	
+}
+// END XML_RPC_Values Class
 ?>
\ No newline at end of file
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
index bdb058e8..fe55e36d 100644
--- a/system/libraries/Xmlrpcs.php
+++ b/system/libraries/Xmlrpcs.php
@@ -1,503 +1,503 @@
-set_system_methods();
-	
-		if (isset($config['functions']) && is_array($config['functions']))
-		{
-			$this->methods = $config['functions'];
-		}
-		
-		log_message('debug', "XML-RPC Server Class Initialized");
-	}
-	
-	//-------------------------------------
-	//  Initialize Prefs and Serve
-	//-------------------------------------
-	
-	function initialize($config=array())
-	{	
-		if (isset($config['functions']) && is_array($config['functions']))
-		{
-			$this->methods = $config['functions'];
-		}
-		
-		if (isset($config['debug']))
-		{
-			$this->debug = $config['debug'];
-		}
-	}
-	
-	//-------------------------------------
-	//  Setting of System Methods
-	//-------------------------------------
-	
-	function set_system_methods ()
-	{
-		$system_methods = array(
-		'system.listMethods' => array(
-			'function' => 'this.listMethods',
-			'signature' => array(array($this->xmlrpcArray, $this->xmlrpcString), array($this->xmlrpcArray)),
-			'docstring' => 'Returns an array of available methods on this server'),
-		'system.methodHelp' => array(
-			'function' => 'this.methodHelp',
-			'signature' => array(array($this->xmlrpcString, $this->xmlrpcString)),
-			'docstring' => 'Returns a documentation string for the specified method'),
-		'system.methodSignature' => array(
-			'function' => 'this.methodSignature',
-			'signature' => array(array($this->xmlrpcArray, $this->xmlrpcString)),
-			'docstring' => 'Returns an array describing the return type and required parameters of a method'),
-		'system.multicall' => array(
-			'function' => 'this.multicall',
-			'signature' => array(array($this->xmlrpcArray, $this->xmlrpcArray)),
-			'docstring' => 'Combine multiple RPC calls in one request. See http://www.xmlrpc.com/discuss/msgReader$1208 for details')
-		);
-	}
-
-
-	//-------------------------------------
-	//  Main Server Function
-	//-------------------------------------
-	
-	function serve()
-	{
-		$r = $this->parseRequest();
-		$payload  = 'xmlrpc_defencoding.'"?'.'>'."\n";
-		$payload .= $this->debug_msg;
-		$payload .= $r->prepare_response();
-		
-		header("Content-Type: text/xml");
-		header("Content-Length: ".strlen($payload));
-		echo $payload;
-	}
-
-	//-------------------------------------
-	//  Add Method to Class
-	//-------------------------------------
-	
-	function add_to_map($methodname,$function,$sig,$doc)
-	{
-		$this->methods[$methodname] = array(
-			'function'  => $function,
-			'signature' => $sig,
-			'docstring' => $doc
-		);
-	}
-
-
-	//-------------------------------------
-	//  Parse Server Request
-	//-------------------------------------
-	
-	function parseRequest($data='')
-	{
-		global $HTTP_RAW_POST_DATA;
-		
-		//-------------------------------------
-		//  Get Data
-		//-------------------------------------
-
-		if ($data == '')
-		{
-			$data = $HTTP_RAW_POST_DATA;
-		}
-
-
-		//-------------------------------------
-		//  Set up XML Parser
-		//-------------------------------------
-		
-		$parser = xml_parser_create($this->xmlrpc_defencoding);
-		$parser_object = new XML_RPC_Message("filler");
-		
-		$parser_object->xh[$parser]					= array();
-		$parser_object->xh[$parser]['isf']			= 0;
-		$parser_object->xh[$parser]['isf_reason']	= '';
-		$parser_object->xh[$parser]['params']		= array();
-		$parser_object->xh[$parser]['stack']		= array();
-		$parser_object->xh[$parser]['valuestack']	= array();
-		$parser_object->xh[$parser]['method']		= '';
-
-		xml_set_object($parser, $parser_object);
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
-		xml_set_element_handler($parser, 'open_tag', 'closing_tag');
-		xml_set_character_data_handler($parser, 'character_data');
-		//xml_set_default_handler($parser, 'default_handler');
-		
-		
-		//-------------------------------------
-		//  PARSE + PROCESS XML DATA
-		//-------------------------------------  	
-		
-		if ( ! xml_parse($parser, $data, 1))
-		{
-			// return XML error as a faultCode
-			$r = new XML_RPC_Response(0,
-			$this->xmlrpcerrxml + xml_get_error_code($parser),
-			sprintf('XML error: %s at line %d',
-				xml_error_string(xml_get_error_code($parser)),
-				xml_get_current_line_number($parser)));
-			xml_parser_free($parser);
-		}
-		elseif($parser_object->xh[$parser]['isf'])
-		{
-			return new XML_RPC_Response(0,
-										$this->xmlrpcerr['invalid_return'],
-										$this->xmlrpcstr['invalid_retrun']);
-		}
-		else
-		{
-			xml_parser_free($parser);
-			
-			$m = new XML_RPC_Message($parser_object->xh[$parser]['method']);
-			$plist='';
-			
-			for($i=0; $i < sizeof($parser_object->xh[$parser]['params']); $i++)
-			{
-				$plist .= "$i - " .  print_r(get_object_vars($parser_object->xh[$parser]['params'][$i]), TRUE). ";\n";
-				
-				$m->addParam($parser_object->xh[$parser]['params'][$i]);
-			}
-			
-			if ($this->debug === TRUE)
-			{
-				echo "
                ";
-				echo "---PLIST---\n" . $plist . "\n---PLIST END---\n\n";
-				echo "
                ";
-			}
-			
-			$r = $this->_execute($m);
-		}
-		
-		//-------------------------------------
-		//  SET DEBUGGING MESSAGE
-		//-------------------------------------  	
-		
-		if ($this->debug === TRUE)
-		{
-			$this->debug_msg = "\n";
-		}
-		
-		return $r;
-	}
-
-	//-------------------------------------
-	//  Executes the Method
-	//-------------------------------------
-	
-	function _execute($m)
-	{
-		$methName = $m->method_name;
-		
-		// Check to see if it is a system call
-		// If so, load the system_methods
-		$sysCall = ereg("^system\.", $methName);
-		$methods = $sysCall ? $this->system_methods : $this->methods;
-		
-		//-------------------------------------
-		//  Check for Function
-		//-------------------------------------
-		
-		if (!isset($methods[$methName]['function']))
-		{
-			return new XML_RPC_Response(0,
-				$this->xmlrpcerr['unknown_method'],
-				$this->xmlrpcstr['unknown_method']);
-		}
-		else
-		{
-			// See if we are calling function in an object
-			
-			$method_parts = explode(".",$methods[$methName]['function']);
-			$objectCall = (isset($method_parts['1']) && $method_parts['1'] != "") ? true : false;
-			
-			if ($objectCall && !is_callable(array($method_parts['0'],$method_parts['1'])))
-			{
-				return new XML_RPC_Response(0,
-				$this->xmlrpcerr['unknown_method'],
-				$this->xmlrpcstr['unknown_method']);
-			}
-			elseif (!$objectCall && !is_callable($methods[$methName]['function']))
-			{
-				return new XML_RPC_Response(0,
-					$this->xmlrpcerr['unknown_method'],
-					$this->xmlrpcstr['unknown_method']);
-			}		
-		}
-
-		//-------------------------------------
-		//  Checking Methods Signature
-		//-------------------------------------
-		
-		if (isset($methods[$methName]['signature']))
-		{
-			$sig = $methods[$methName]['signature'];
-			for($i=0; $iparams)+1)
-				{
-					for($n=0; $n < sizeof($m->params); $n++)
-					{
-						$p = $m->params[$n];
-						$pt = ($p->kindOf() == 'scalar') ? $p->scalartyp() : $p->kindOf();
-						
-						if ($pt != $current_sig[$n+1])
-						{
-							$pno = $n+1;
-							$wanted = $current_sig[$n+1];
-							
-							return new XML_RPC_Response(0,
-								$this->xmlrpcerr['incorrect_params'],
-								$this->xmlrpcstr['incorrect_params'] .
-								": Wanted {$wanted}, got {$pt} at param {$pno})");
-						}
-					}
-				}
-			}
-		}
-
-		//-------------------------------------
-		//  Calls the Function
-		//-------------------------------------
-
-		if ($objectCall)
-		{
-			if ($method_parts['1'] == "this")
-			{
-				return call_user_func(array($this, $method_parts['0']), $m);
-			}
-			else
-			{
-				$CI =& get_instance();
-				return $CI->$method_parts['1']($m);
-				//$class = new $method_parts['0'];
-				//return $class->$method_parts['1']($m);
-				//return call_user_func(array(&$method_parts['0'],$method_parts['1']), $m);
-			}
-		}
-		else
-		{
-			return call_user_func($methods[$methName]['function'], $m);
-		}
-	}
-	
-	
-	//-------------------------------------
-	//  Server Function:  List Methods
-	//-------------------------------------
-	
-	function listMethods($m)
-	{
-		$v = new XML_RPC_Values();
-		$output = array();
-		foreach($this->$methods as $key => $value)
-		{
-			$output[] = new XML_RPC_Values($key, 'string');
-		}
-		
-		foreach($this->system_methods as $key => $value)
-		{
-			$output[]= new XML_RPC_Values($key, 'string');
-		}
-
-		$v->addArray($output);
-		return new XML_RPC_Response($v);
-	}
-	
-	//-------------------------------------
-	//  Server Function:  Return Signature for Method
-	//-------------------------------------
-		
-	function methodSignature($m)
-	{
-		$methName = $m->getParam(0);
-		$method_name = $methName->scalarval();
-		
-		$methods = ereg("^system\.", $method_name) ? $this->system_methods : $this->methods;
-		
-		if (isset($methods[$method_name]))
-		{
-			if ($methods[$method_name]['signature'])
-			{
-				$sigs = array();
-				$signature = $methods[$method_name]['signature'];
-				
-				for($i=0; $i < sizeof($signature); $i++)
-				{
-					$cursig = array();
-					$inSig = $signature[$i];
-					for($j=0; $jxmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
-		}
-		return $r;
-	}
-	
-	//-------------------------------------
-	//  Server Function:  Doc String for Method
-	//-------------------------------------
-	
-	function methodHelp($m)
-	{
-		$methName = $m->getParam(0);
-		$method_name = $methName->scalarval();
-		
-		$methods = ereg("^system\.", $method_name) ? $this->system_methods : $this->methods;
-	
-		if (isset($methods[$methName]))
-		{
-			$docstring = isset($methods[$method_name]['docstring']) ? $methods[$method_name]['docstring'] : '';
-			$r = new XML_RPC_Response(new XML_RPC_Values($docstring, 'string'));
-		}
-		else
-		{
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
-		}
-		return $r;
-	}
-
-	//-------------------------------------
-	//  Server Function:  Multi-call
-	//-------------------------------------
-
-	function multicall($m)
-	{
-		$calls = $m->getParam(0);
-		list($a,$b)=each($calls->me);
-		$result = array();
-
-		for ($i = 0; $i < sizeof($b); $i++)
-		{
-			$call = $calls->me['array'][$i];
-			$result[$i] = $this->do_multicall($call);
-		}
-
-		return new XML_RPC_Response(new XML_RPC_Values($result, 'array'));
-	}
-	
-	
-	//-------------------------------------
-	//  Multi-call Function:  Error Handling
-	//-------------------------------------
-
-	function multicall_error($err)
-	{
-		$str  = is_string($err) ? $this->xmlrpcstr["multicall_${err}"] : $err->faultString();
-		$code = is_string($err) ? $this->xmlrpcerr["multicall_${err}"] : $err->faultCode();
-		
-		$struct['faultCode'] = new XML_RPC_Values($code, 'int');
-		$struct['faultString'] = new XML_RPC_Values($str, 'string');
-	
-		return new XML_RPC_Values($struct, 'struct');
-	}
-	
-	
-	//-------------------------------------
-	//  Multi-call Function:  Processes method
-	//-------------------------------------
-	
-	function do_multicall($call)
-	{
-		if ($call->kindOf() != 'struct')
-			return $this->multicall_error('notstruct');
-		elseif (!$methName = $call->me['struct']['methodName'])
-			return $this->multicall_error('nomethod');
-		
-		list($scalar_type,$scalar_value)=each($methName->me);
-		$scalar_type = $scalar_type == $this->xmlrpcI4 ? $this->xmlrpcInt : $scalar_type;
-			
-		if ($methName->kindOf() != 'scalar' || $scalar_type != 'string')
-			return $this->multicall_error('notstring');
-		elseif ($scalar_value == 'system.multicall')
-			return $this->multicall_error('recursion');
-		elseif (!$params = $call->me['struct']['params'])
-			return $this->multicall_error('noparams');
-		elseif ($params->kindOf() != 'array')
-			return $this->multicall_error('notarray');
-			
-		list($a,$b)=each($params->me);
-		$numParams = sizeof($b);
-
-		$msg = new XML_RPC_Message($scalar_value);
-		for ($i = 0; $i < $numParams; $i++)
-		{
-			$msg->params[] = $params->me['array'][$i];
-		}
-
-		$result = $this->_execute($msg);
-
-		if ($result->faultCode() != 0)
-		{
-			return $this->multicall_error($result);
-		}
-
-		return new XML_RPC_Values(array($result->value()), 'array');
-	}	
-	
-}
-// END XML_RPC_Server class
-
+set_system_methods();
+	
+		if (isset($config['functions']) && is_array($config['functions']))
+		{
+			$this->methods = $config['functions'];
+		}
+		
+		log_message('debug', "XML-RPC Server Class Initialized");
+	}
+	
+	//-------------------------------------
+	//  Initialize Prefs and Serve
+	//-------------------------------------
+	
+	function initialize($config=array())
+	{	
+		if (isset($config['functions']) && is_array($config['functions']))
+		{
+			$this->methods = $config['functions'];
+		}
+		
+		if (isset($config['debug']))
+		{
+			$this->debug = $config['debug'];
+		}
+	}
+	
+	//-------------------------------------
+	//  Setting of System Methods
+	//-------------------------------------
+	
+	function set_system_methods ()
+	{
+		$system_methods = array(
+		'system.listMethods' => array(
+			'function' => 'this.listMethods',
+			'signature' => array(array($this->xmlrpcArray, $this->xmlrpcString), array($this->xmlrpcArray)),
+			'docstring' => 'Returns an array of available methods on this server'),
+		'system.methodHelp' => array(
+			'function' => 'this.methodHelp',
+			'signature' => array(array($this->xmlrpcString, $this->xmlrpcString)),
+			'docstring' => 'Returns a documentation string for the specified method'),
+		'system.methodSignature' => array(
+			'function' => 'this.methodSignature',
+			'signature' => array(array($this->xmlrpcArray, $this->xmlrpcString)),
+			'docstring' => 'Returns an array describing the return type and required parameters of a method'),
+		'system.multicall' => array(
+			'function' => 'this.multicall',
+			'signature' => array(array($this->xmlrpcArray, $this->xmlrpcArray)),
+			'docstring' => 'Combine multiple RPC calls in one request. See http://www.xmlrpc.com/discuss/msgReader$1208 for details')
+		);
+	}
+
+
+	//-------------------------------------
+	//  Main Server Function
+	//-------------------------------------
+	
+	function serve()
+	{
+		$r = $this->parseRequest();
+		$payload  = 'xmlrpc_defencoding.'"?'.'>'."\n";
+		$payload .= $this->debug_msg;
+		$payload .= $r->prepare_response();
+		
+		header("Content-Type: text/xml");
+		header("Content-Length: ".strlen($payload));
+		echo $payload;
+	}
+
+	//-------------------------------------
+	//  Add Method to Class
+	//-------------------------------------
+	
+	function add_to_map($methodname,$function,$sig,$doc)
+	{
+		$this->methods[$methodname] = array(
+			'function'  => $function,
+			'signature' => $sig,
+			'docstring' => $doc
+		);
+	}
+
+
+	//-------------------------------------
+	//  Parse Server Request
+	//-------------------------------------
+	
+	function parseRequest($data='')
+	{
+		global $HTTP_RAW_POST_DATA;
+		
+		//-------------------------------------
+		//  Get Data
+		//-------------------------------------
+
+		if ($data == '')
+		{
+			$data = $HTTP_RAW_POST_DATA;
+		}
+
+
+		//-------------------------------------
+		//  Set up XML Parser
+		//-------------------------------------
+		
+		$parser = xml_parser_create($this->xmlrpc_defencoding);
+		$parser_object = new XML_RPC_Message("filler");
+		
+		$parser_object->xh[$parser]					= array();
+		$parser_object->xh[$parser]['isf']			= 0;
+		$parser_object->xh[$parser]['isf_reason']	= '';
+		$parser_object->xh[$parser]['params']		= array();
+		$parser_object->xh[$parser]['stack']		= array();
+		$parser_object->xh[$parser]['valuestack']	= array();
+		$parser_object->xh[$parser]['method']		= '';
+
+		xml_set_object($parser, $parser_object);
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
+		xml_set_element_handler($parser, 'open_tag', 'closing_tag');
+		xml_set_character_data_handler($parser, 'character_data');
+		//xml_set_default_handler($parser, 'default_handler');
+		
+		
+		//-------------------------------------
+		//  PARSE + PROCESS XML DATA
+		//-------------------------------------  	
+		
+		if ( ! xml_parse($parser, $data, 1))
+		{
+			// return XML error as a faultCode
+			$r = new XML_RPC_Response(0,
+			$this->xmlrpcerrxml + xml_get_error_code($parser),
+			sprintf('XML error: %s at line %d',
+				xml_error_string(xml_get_error_code($parser)),
+				xml_get_current_line_number($parser)));
+			xml_parser_free($parser);
+		}
+		elseif($parser_object->xh[$parser]['isf'])
+		{
+			return new XML_RPC_Response(0,
+										$this->xmlrpcerr['invalid_return'],
+										$this->xmlrpcstr['invalid_retrun']);
+		}
+		else
+		{
+			xml_parser_free($parser);
+			
+			$m = new XML_RPC_Message($parser_object->xh[$parser]['method']);
+			$plist='';
+			
+			for($i=0; $i < sizeof($parser_object->xh[$parser]['params']); $i++)
+			{
+				$plist .= "$i - " .  print_r(get_object_vars($parser_object->xh[$parser]['params'][$i]), TRUE). ";\n";
+				
+				$m->addParam($parser_object->xh[$parser]['params'][$i]);
+			}
+			
+			if ($this->debug === TRUE)
+			{
+				echo "
                ";
+				echo "---PLIST---\n" . $plist . "\n---PLIST END---\n\n";
+				echo "
                ";
+			}
+			
+			$r = $this->_execute($m);
+		}
+		
+		//-------------------------------------
+		//  SET DEBUGGING MESSAGE
+		//-------------------------------------  	
+		
+		if ($this->debug === TRUE)
+		{
+			$this->debug_msg = "\n";
+		}
+		
+		return $r;
+	}
+
+	//-------------------------------------
+	//  Executes the Method
+	//-------------------------------------
+	
+	function _execute($m)
+	{
+		$methName = $m->method_name;
+		
+		// Check to see if it is a system call
+		// If so, load the system_methods
+		$sysCall = ereg("^system\.", $methName);
+		$methods = $sysCall ? $this->system_methods : $this->methods;
+		
+		//-------------------------------------
+		//  Check for Function
+		//-------------------------------------
+		
+		if (!isset($methods[$methName]['function']))
+		{
+			return new XML_RPC_Response(0,
+				$this->xmlrpcerr['unknown_method'],
+				$this->xmlrpcstr['unknown_method']);
+		}
+		else
+		{
+			// See if we are calling function in an object
+			
+			$method_parts = explode(".",$methods[$methName]['function']);
+			$objectCall = (isset($method_parts['1']) && $method_parts['1'] != "") ? true : false;
+			
+			if ($objectCall && !is_callable(array($method_parts['0'],$method_parts['1'])))
+			{
+				return new XML_RPC_Response(0,
+				$this->xmlrpcerr['unknown_method'],
+				$this->xmlrpcstr['unknown_method']);
+			}
+			elseif (!$objectCall && !is_callable($methods[$methName]['function']))
+			{
+				return new XML_RPC_Response(0,
+					$this->xmlrpcerr['unknown_method'],
+					$this->xmlrpcstr['unknown_method']);
+			}		
+		}
+
+		//-------------------------------------
+		//  Checking Methods Signature
+		//-------------------------------------
+		
+		if (isset($methods[$methName]['signature']))
+		{
+			$sig = $methods[$methName]['signature'];
+			for($i=0; $iparams)+1)
+				{
+					for($n=0; $n < sizeof($m->params); $n++)
+					{
+						$p = $m->params[$n];
+						$pt = ($p->kindOf() == 'scalar') ? $p->scalartyp() : $p->kindOf();
+						
+						if ($pt != $current_sig[$n+1])
+						{
+							$pno = $n+1;
+							$wanted = $current_sig[$n+1];
+							
+							return new XML_RPC_Response(0,
+								$this->xmlrpcerr['incorrect_params'],
+								$this->xmlrpcstr['incorrect_params'] .
+								": Wanted {$wanted}, got {$pt} at param {$pno})");
+						}
+					}
+				}
+			}
+		}
+
+		//-------------------------------------
+		//  Calls the Function
+		//-------------------------------------
+
+		if ($objectCall)
+		{
+			if ($method_parts['1'] == "this")
+			{
+				return call_user_func(array($this, $method_parts['0']), $m);
+			}
+			else
+			{
+				$CI =& get_instance();
+				return $CI->$method_parts['1']($m);
+				//$class = new $method_parts['0'];
+				//return $class->$method_parts['1']($m);
+				//return call_user_func(array(&$method_parts['0'],$method_parts['1']), $m);
+			}
+		}
+		else
+		{
+			return call_user_func($methods[$methName]['function'], $m);
+		}
+	}
+	
+	
+	//-------------------------------------
+	//  Server Function:  List Methods
+	//-------------------------------------
+	
+	function listMethods($m)
+	{
+		$v = new XML_RPC_Values();
+		$output = array();
+		foreach($this->$methods as $key => $value)
+		{
+			$output[] = new XML_RPC_Values($key, 'string');
+		}
+		
+		foreach($this->system_methods as $key => $value)
+		{
+			$output[]= new XML_RPC_Values($key, 'string');
+		}
+
+		$v->addArray($output);
+		return new XML_RPC_Response($v);
+	}
+	
+	//-------------------------------------
+	//  Server Function:  Return Signature for Method
+	//-------------------------------------
+		
+	function methodSignature($m)
+	{
+		$methName = $m->getParam(0);
+		$method_name = $methName->scalarval();
+		
+		$methods = ereg("^system\.", $method_name) ? $this->system_methods : $this->methods;
+		
+		if (isset($methods[$method_name]))
+		{
+			if ($methods[$method_name]['signature'])
+			{
+				$sigs = array();
+				$signature = $methods[$method_name]['signature'];
+				
+				for($i=0; $i < sizeof($signature); $i++)
+				{
+					$cursig = array();
+					$inSig = $signature[$i];
+					for($j=0; $jxmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
+		}
+		return $r;
+	}
+	
+	//-------------------------------------
+	//  Server Function:  Doc String for Method
+	//-------------------------------------
+	
+	function methodHelp($m)
+	{
+		$methName = $m->getParam(0);
+		$method_name = $methName->scalarval();
+		
+		$methods = ereg("^system\.", $method_name) ? $this->system_methods : $this->methods;
+	
+		if (isset($methods[$methName]))
+		{
+			$docstring = isset($methods[$method_name]['docstring']) ? $methods[$method_name]['docstring'] : '';
+			$r = new XML_RPC_Response(new XML_RPC_Values($docstring, 'string'));
+		}
+		else
+		{
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
+		}
+		return $r;
+	}
+
+	//-------------------------------------
+	//  Server Function:  Multi-call
+	//-------------------------------------
+
+	function multicall($m)
+	{
+		$calls = $m->getParam(0);
+		list($a,$b)=each($calls->me);
+		$result = array();
+
+		for ($i = 0; $i < sizeof($b); $i++)
+		{
+			$call = $calls->me['array'][$i];
+			$result[$i] = $this->do_multicall($call);
+		}
+
+		return new XML_RPC_Response(new XML_RPC_Values($result, 'array'));
+	}
+	
+	
+	//-------------------------------------
+	//  Multi-call Function:  Error Handling
+	//-------------------------------------
+
+	function multicall_error($err)
+	{
+		$str  = is_string($err) ? $this->xmlrpcstr["multicall_${err}"] : $err->faultString();
+		$code = is_string($err) ? $this->xmlrpcerr["multicall_${err}"] : $err->faultCode();
+		
+		$struct['faultCode'] = new XML_RPC_Values($code, 'int');
+		$struct['faultString'] = new XML_RPC_Values($str, 'string');
+	
+		return new XML_RPC_Values($struct, 'struct');
+	}
+	
+	
+	//-------------------------------------
+	//  Multi-call Function:  Processes method
+	//-------------------------------------
+	
+	function do_multicall($call)
+	{
+		if ($call->kindOf() != 'struct')
+			return $this->multicall_error('notstruct');
+		elseif (!$methName = $call->me['struct']['methodName'])
+			return $this->multicall_error('nomethod');
+		
+		list($scalar_type,$scalar_value)=each($methName->me);
+		$scalar_type = $scalar_type == $this->xmlrpcI4 ? $this->xmlrpcInt : $scalar_type;
+			
+		if ($methName->kindOf() != 'scalar' || $scalar_type != 'string')
+			return $this->multicall_error('notstring');
+		elseif ($scalar_value == 'system.multicall')
+			return $this->multicall_error('recursion');
+		elseif (!$params = $call->me['struct']['params'])
+			return $this->multicall_error('noparams');
+		elseif ($params->kindOf() != 'array')
+			return $this->multicall_error('notarray');
+			
+		list($a,$b)=each($params->me);
+		$numParams = sizeof($b);
+
+		$msg = new XML_RPC_Message($scalar_value);
+		for ($i = 0; $i < $numParams; $i++)
+		{
+			$msg->params[] = $params->me['array'][$i];
+		}
+
+		$result = $this->_execute($msg);
+
+		if ($result->faultCode() != 0)
+		{
+			return $this->multicall_error($result);
+		}
+
+		return new XML_RPC_Values(array($result->value()), 'array');
+	}	
+	
+}
+// END XML_RPC_Server class
+
 ?>
\ No newline at end of file
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 1ff175fe..377c3874 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -1,380 +1,380 @@
-_add_dir($dir);
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Add Directory
-	 *
-	 * @access	private
-	 * @param	string	the directory name
-	 * @return	void
-	 */
-	function _add_dir($dir)
-	{
-		$dir = str_replace("\\", "/", $dir);
-		
-		$this->zipdata[] = "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-							.pack('V', 0)
-							.pack('V', 0)
-							.pack('V', 0)
-							.pack('v', strlen($dir))
-							.pack('v', 0)
-							.$dir
-							.pack('V', 0)
-							.pack('V', 0)
-							.pack('V', 0);
-		
-		$newoffset = strlen(implode('', $this->zipdata));
-		
-		$record = "\x50\x4b\x01\x02\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-					.pack('V',0)
-					.pack('V',0)
-					.pack('V',0)
-					.pack('v', strlen($dir))
-					.pack('v', 0)
-					.pack('v', 0)
-					.pack('v', 0)
-					.pack('v', 0)
-					.pack('V', 16)
-					.pack('V', $this->offset)
-					.$dir;
-		
-		$this->offset = $newoffset;
-		$this->directory[] = $record;
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Add Data to Zip
-	 *
-	 * Lets you add files to the archive. If the path is included
-	 * in the filename it will be placed within a directory.  Make
-	 * sure you use add_dir() first to create the folder.
-	 *
-	 * @access	public
-	 * @param	mixed
-	 * @param	string
-	 * @return	void
-	 */	
-	function add_data($filepath, $data = NULL)
-	{
-		if (is_array($filepath))
-		{
-			foreach ($filepath as $path => $data)
-			{
-				$this->_add_data($path, $data);
-			}
-		}
-		else
-		{
-			$this->_add_data($filepath, $data);
-		}
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Add Data to Zip
-	 *
-	 * @access	private
-	 * @param	string	the file name/path
-	 * @param	string	the data to be encoded
-	 * @return	void
-	 */	
-	function _add_data($filepath, $data)
-	{	
-		$filepath = str_replace("\\", "/", $filepath);
-			
-		$oldlen	= strlen($data);
-		$crc32	= crc32($data);
-		
-		$gzdata = gzcompress($data);
-		$gzdata = substr(substr($gzdata, 0, strlen($gzdata) - 4), 2); 	
-		$newlen = strlen($gzdata);
-	
-		$this->zipdata[] = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00\x00\x00\x00\x00"
-							.pack('V', $crc32)
-							.pack('V', $newlen)
-							.pack('V', $oldlen)
-							.pack('v', strlen($filepath))
-							.pack('v', 0)
-							.$filepath
-							.$gzdata
-							.pack('V', $crc32)
-							.pack('V', $newlen)
-							.pack('V', $oldlen);
-			
-		$newoffset = strlen(implode("", $this->zipdata));
-		
-		$record = "\x50\x4b\x01\x02\x00\x00\x14\x00\x00\x00\x08\x00\x00\x00\x00\x00"
-					.pack('V', $crc32)
-					.pack('V', $newlen)
-					.pack('V', $oldlen)
-					.pack('v', strlen($filepath))
-					.pack('v', 0)
-					.pack('v', 0)
-					.pack('v', 0)
-					.pack('v', 0)
-					.pack('V', 32)
-					.pack('V', $this->offset);
-		
-		$this->offset = $newoffset;
-		$this->directory[] = $record.$filepath;
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Read the contents of a file and add it to the zip
-	 *
-	 * @access	public
-	 * @return	bool
-	 */	
-	function read_file($path, $preserve_filepath = FALSE)
-	{
-		if ( ! file_exists($path))
-		{
-			return FALSE;
-		}
-	
-		if (FALSE !== ($data = file_get_contents($path)))
-		{
-			$name = str_replace("\\", "/", $path);
-			
-			if ($preserve_filepath === FALSE)
-			{
-				$name = preg_replace("|.*/(.+)|", "\\1", $name);
-			}
-			
-			$this->add_data($name, $data);
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	// ------------------------------------------------------------------------
-	
-	/**
-	 * Read a directory and add it to the zip.
-	 *
-	 * This function recursively reads a folder and everything it contains (including
-	 * sub-folders) and creates a zip based on it.  Whatever directory structure
-	 * is in the original file path will be recreated in the zip file.
-	 *
-	 * @access	public
-	 * @param	string	path to source
-	 * @return	bool
-	 */	
-	function read_dir($path)
-	{	
-		if ($fp = @opendir($path))
-		{
-			while (FALSE !== ($file = readdir($fp)))
-			{
-				if (@is_dir($path.$file) && substr($file, 0, 1) != '.')
-				{					
-					$this->read_dir($path.$file."/");
-				}
-				elseif (substr($file, 0, 1) != ".")
-				{
-					if (FALSE !== ($data = file_get_contents($path.$file)))
-					{						
-						$this->add_data(str_replace("\\", "/", $path).$file, $data);
-					}
-				}
-			}
-			return TRUE;
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get the Zip file
-	 *
-	 * @access	public
-	 * @return	binary string
-	 */	
-	function get_zip()
-	{
-		// We cache the zip data so multiple calls
-		// do not require recompiling
-		if ($this->zipfile != '')
-		{
-			return $this->zipfile;
-		}
-	
-		// Is there any data to return?
-		if (count($this->zipdata) == 0)
-		{
-			return FALSE;
-		}
-	
-		$data	= implode('', $this->zipdata);
-		$dir	= implode('', $this->directory);
-				
-		$this->zipfile = $data.$dir."\x50\x4b\x05\x06\x00\x00\x00\x00"
-						.pack('v', sizeof($this->directory))
-						.pack('v', sizeof($this->directory))
-						.pack('V', strlen($dir))
-						.pack('V', strlen($data))
-						."\x00\x00";
-		
-		return $this->zipfile;
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Write File to the specified directory
-	 *
-	 * Lets you write a file
-	 *
-	 * @access	public
-	 * @param	string	the file name
-	 * @param	string	the data to be encoded
-	 * @return	bool
-	 */	
-	function archive($filepath)
-	{
-		if ( ! ($fp = @fopen($filepath, "wb")))
-		{
-			return FALSE;
-		}
-		
-		flock($fp, LOCK_EX);	
-		fwrite($fp, $this->get_zip());
-		flock($fp, LOCK_UN);
-		fclose($fp);
-
-		return TRUE;	
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Download
-	 *
-	 * @access	public
-	 * @param	string	the file name
-	 * @param	string	the data to be encoded
-	 * @return	bool
-	 */		
-	function download($filename = 'backup.zip')
-	{
-		if ( ! preg_match("|.+?\.zip$|", $filename))
-		{
-			$filename .= '.zip';
-		}
-	
-		if (strstr($_SERVER['HTTP_USER_AGENT'], "MSIE"))
-		{
-			header('Content-Type: application/x-zip');
-			header('Content-Disposition: inline; filename="'.$filename.'"');
-			header('Expires: 0');
-			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-			header("Content-Transfer-Encoding: binary");
-			header('Pragma: public');
-			header("Content-Length: ".strlen($this->get_zip()));
-		}
-		else
-		{
-			header('Content-Type: application/x-zip');
-			header('Content-Disposition: attachment; filename="'.$filename.'"');
-			header("Content-Transfer-Encoding: binary");
-			header('Expires: 0');
-			header('Pragma: no-cache');
-			header("Content-Length: ".strlen($this->get_zip()));
-		}
-	
-		echo $this->get_zip();
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Initialize Data
-	 *
-	 * Lets you clear current zip data.  Useful if you need to create
-	 * multiple zips with different data.
-	 *
-	 * @access	public
-	 * @return	void
-	 */		
-	function clear_data()
-	{
-		$this->zipfile		= '';
-		$this->zipdata 		= array();
-		$this->directory	= array();
-		$this->offset		= array();
-	}
-	
-}
+_add_dir($dir);
+		}
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Add Directory
+	 *
+	 * @access	private
+	 * @param	string	the directory name
+	 * @return	void
+	 */
+	function _add_dir($dir)
+	{
+		$dir = str_replace("\\", "/", $dir);
+		
+		$this->zipdata[] = "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+							.pack('V', 0)
+							.pack('V', 0)
+							.pack('V', 0)
+							.pack('v', strlen($dir))
+							.pack('v', 0)
+							.$dir
+							.pack('V', 0)
+							.pack('V', 0)
+							.pack('V', 0);
+		
+		$newoffset = strlen(implode('', $this->zipdata));
+		
+		$record = "\x50\x4b\x01\x02\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+					.pack('V',0)
+					.pack('V',0)
+					.pack('V',0)
+					.pack('v', strlen($dir))
+					.pack('v', 0)
+					.pack('v', 0)
+					.pack('v', 0)
+					.pack('v', 0)
+					.pack('V', 16)
+					.pack('V', $this->offset)
+					.$dir;
+		
+		$this->offset = $newoffset;
+		$this->directory[] = $record;
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Add Data to Zip
+	 *
+	 * Lets you add files to the archive. If the path is included
+	 * in the filename it will be placed within a directory.  Make
+	 * sure you use add_dir() first to create the folder.
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @param	string
+	 * @return	void
+	 */	
+	function add_data($filepath, $data = NULL)
+	{
+		if (is_array($filepath))
+		{
+			foreach ($filepath as $path => $data)
+			{
+				$this->_add_data($path, $data);
+			}
+		}
+		else
+		{
+			$this->_add_data($filepath, $data);
+		}
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Add Data to Zip
+	 *
+	 * @access	private
+	 * @param	string	the file name/path
+	 * @param	string	the data to be encoded
+	 * @return	void
+	 */	
+	function _add_data($filepath, $data)
+	{	
+		$filepath = str_replace("\\", "/", $filepath);
+			
+		$oldlen	= strlen($data);
+		$crc32	= crc32($data);
+		
+		$gzdata = gzcompress($data);
+		$gzdata = substr(substr($gzdata, 0, strlen($gzdata) - 4), 2); 	
+		$newlen = strlen($gzdata);
+	
+		$this->zipdata[] = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00\x00\x00\x00\x00"
+							.pack('V', $crc32)
+							.pack('V', $newlen)
+							.pack('V', $oldlen)
+							.pack('v', strlen($filepath))
+							.pack('v', 0)
+							.$filepath
+							.$gzdata
+							.pack('V', $crc32)
+							.pack('V', $newlen)
+							.pack('V', $oldlen);
+			
+		$newoffset = strlen(implode("", $this->zipdata));
+		
+		$record = "\x50\x4b\x01\x02\x00\x00\x14\x00\x00\x00\x08\x00\x00\x00\x00\x00"
+					.pack('V', $crc32)
+					.pack('V', $newlen)
+					.pack('V', $oldlen)
+					.pack('v', strlen($filepath))
+					.pack('v', 0)
+					.pack('v', 0)
+					.pack('v', 0)
+					.pack('v', 0)
+					.pack('V', 32)
+					.pack('V', $this->offset);
+		
+		$this->offset = $newoffset;
+		$this->directory[] = $record.$filepath;
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Read the contents of a file and add it to the zip
+	 *
+	 * @access	public
+	 * @return	bool
+	 */	
+	function read_file($path, $preserve_filepath = FALSE)
+	{
+		if ( ! file_exists($path))
+		{
+			return FALSE;
+		}
+	
+		if (FALSE !== ($data = file_get_contents($path)))
+		{
+			$name = str_replace("\\", "/", $path);
+			
+			if ($preserve_filepath === FALSE)
+			{
+				$name = preg_replace("|.*/(.+)|", "\\1", $name);
+			}
+			
+			$this->add_data($name, $data);
+			return TRUE;
+		}
+		return FALSE;
+	}
+
+	// ------------------------------------------------------------------------
+	
+	/**
+	 * Read a directory and add it to the zip.
+	 *
+	 * This function recursively reads a folder and everything it contains (including
+	 * sub-folders) and creates a zip based on it.  Whatever directory structure
+	 * is in the original file path will be recreated in the zip file.
+	 *
+	 * @access	public
+	 * @param	string	path to source
+	 * @return	bool
+	 */	
+	function read_dir($path)
+	{	
+		if ($fp = @opendir($path))
+		{
+			while (FALSE !== ($file = readdir($fp)))
+			{
+				if (@is_dir($path.$file) && substr($file, 0, 1) != '.')
+				{					
+					$this->read_dir($path.$file."/");
+				}
+				elseif (substr($file, 0, 1) != ".")
+				{
+					if (FALSE !== ($data = file_get_contents($path.$file)))
+					{						
+						$this->add_data(str_replace("\\", "/", $path).$file, $data);
+					}
+				}
+			}
+			return TRUE;
+		}
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get the Zip file
+	 *
+	 * @access	public
+	 * @return	binary string
+	 */	
+	function get_zip()
+	{
+		// We cache the zip data so multiple calls
+		// do not require recompiling
+		if ($this->zipfile != '')
+		{
+			return $this->zipfile;
+		}
+	
+		// Is there any data to return?
+		if (count($this->zipdata) == 0)
+		{
+			return FALSE;
+		}
+	
+		$data	= implode('', $this->zipdata);
+		$dir	= implode('', $this->directory);
+				
+		$this->zipfile = $data.$dir."\x50\x4b\x05\x06\x00\x00\x00\x00"
+						.pack('v', sizeof($this->directory))
+						.pack('v', sizeof($this->directory))
+						.pack('V', strlen($dir))
+						.pack('V', strlen($data))
+						."\x00\x00";
+		
+		return $this->zipfile;
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Write File to the specified directory
+	 *
+	 * Lets you write a file
+	 *
+	 * @access	public
+	 * @param	string	the file name
+	 * @param	string	the data to be encoded
+	 * @return	bool
+	 */	
+	function archive($filepath)
+	{
+		if ( ! ($fp = @fopen($filepath, "wb")))
+		{
+			return FALSE;
+		}
+		
+		flock($fp, LOCK_EX);	
+		fwrite($fp, $this->get_zip());
+		flock($fp, LOCK_UN);
+		fclose($fp);
+
+		return TRUE;	
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Download
+	 *
+	 * @access	public
+	 * @param	string	the file name
+	 * @param	string	the data to be encoded
+	 * @return	bool
+	 */		
+	function download($filename = 'backup.zip')
+	{
+		if ( ! preg_match("|.+?\.zip$|", $filename))
+		{
+			$filename .= '.zip';
+		}
+	
+		if (strstr($_SERVER['HTTP_USER_AGENT'], "MSIE"))
+		{
+			header('Content-Type: application/x-zip');
+			header('Content-Disposition: inline; filename="'.$filename.'"');
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+			header("Content-Transfer-Encoding: binary");
+			header('Pragma: public');
+			header("Content-Length: ".strlen($this->get_zip()));
+		}
+		else
+		{
+			header('Content-Type: application/x-zip');
+			header('Content-Disposition: attachment; filename="'.$filename.'"');
+			header("Content-Transfer-Encoding: binary");
+			header('Expires: 0');
+			header('Pragma: no-cache');
+			header("Content-Length: ".strlen($this->get_zip()));
+		}
+	
+		echo $this->get_zip();
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Initialize Data
+	 *
+	 * Lets you clear current zip data.  Useful if you need to create
+	 * multiple zips with different data.
+	 *
+	 * @access	public
+	 * @return	void
+	 */		
+	function clear_data()
+	{
+		$this->zipfile		= '';
+		$this->zipdata 		= array();
+		$this->directory	= array();
+		$this->offset		= array();
+	}
+	
+}
 ?>
\ No newline at end of file
diff --git a/system/plugins/captcha_pi.php b/system/plugins/captcha_pi.php
index b3c22f09..e16a214b 100644
--- a/system/plugins/captcha_pi.php
+++ b/system/plugins/captcha_pi.php
@@ -1,346 +1,346 @@
-load->plugin('captcha');
-
-Once loaded you can generate a captcha like this:
-	
-	$vals = array(
-					'word'		 => 'Random word',
-					'img_path'	 => './captcha/',
-					'img_url'	 => 'http://www.your-site.com/captcha/',
-					'font_path'	 => './system/texb.ttf',
-					'img_width'	 => '150',
-					'img_height' => 30,
-					'expiration' => 7200
-				);
-	
-	$cap = create_captcha($vals);
-	echo $cap['image'];
-	
-
-NOTES:
-	
-	The captcha function requires the GD image library.
-	
-	Only the img_path and img_url are required.
-	
-	If a "word" is not supplied, the function will generate a random
-	ASCII string.  You might put together your own word library that
-	you can draw randomly from.
-	
-	If you do not specify a path to a TRUE TYPE font, the native ugly GD
-	font will be used.
-	
-	The "captcha" folder must be writable (666, or 777)
-	
-	The "expiration" (in seconds) signifies how long an image will
-	remain in the captcha folder before it will be deleted.  The default
-	is two hours.
-
-RETURNED DATA
-
-The create_captcha() function returns an associative array with this data:
-
-  [array]
-  (
-	'image' => IMAGE TAG
-	'time'	=> TIMESTAMP (in microtime)
-	'word'	=> CAPTCHA WORD
-  )
-
-The "image" is the actual image tag:
-
-
-The "time" is the micro timestamp used as the image name without the file
-extension.  It will be a number like this:  1139612155.3422
-
-The "word" is the word that appears in the captcha image, which if not
-supplied to the function, will be a random string.
-
-
-ADDING A DATABASE
-
-In order for the captcha function to prevent someone from posting, you will need
-to add the information returned from create_captcha() function to your database.
-Then, when the data from the form is submitted by the user you will need to verify
-that the data exists in the database and has not expired.
-
-Here is a table prototype:
-
-	CREATE TABLE captcha (
-	 captcha_id bigint(13) unsigned NOT NULL auto_increment,
-	 captcha_time int(10) unsigned NOT NULL,
-	 ip_address varchar(16) default '0' NOT NULL,
-	 word varchar(20) NOT NULL,
-	 PRIMARY KEY (captcha_id),
-	 KEY (word)
-	)
-
-
-Here is an example of usage with a DB.
-
-On the page where the captcha will be shown you'll have something like this:
-
-	$this->load->plugin('captcha');
-	$vals = array(
-					'img_path'	 => './captcha/',
-					'img_url'	 => 'http://www.your-site.com/captcha/'
-				);
-	
-	$cap = create_captcha($vals);
-
-	$data = array(
-					'captcha_id'	=> '',
-					'captcha_time'	=> $cap['time'],
-					'ip_address'	=> $this->input->ip_address(),
-					'word'			=> $cap['word']
-				);
-
-	$query = $this->db->insert_string('captcha', $data);
-	$this->db->query($query);
-		
-	echo 'Submit the word you see below:';
-	echo $cap['image'];
-	echo '';
-
-
-Then, on the page that accepts the submission you'll have something like this:
-
-	// First, delete old captchas
-	$expiration = time()-7200; // Two hour limit
-	$DB->query("DELETE FROM captcha WHERE captcha_time < ".$expiration);		
-
-	// Then see if a captcha exists:
-	$sql = "SELECT COUNT(*) AS count FROM captcha WHERE word = ? AND ip_address = ? AND date > ?";
-	$binds = array($_POST['captcha'], $this->input->ip_address(), $expiration);
-	$query = $this->db->query($sql, $binds);
-	$row = $query->row();
-
-	if ($row->count == 0)
-	{
-		echo "You must submit the word that appears in the image";
-	}
-
-*/
-
-
-	
-/**
-|==========================================================
-| Create Captcha
-|==========================================================
-|
-*/
-function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '')
-{		
-	$defaults = array('word' => '', 'img_path' => '', 'img_url' => '', 'img_width' => '150', 'img_height' => '30', 'font_path' => '', 'expiration' => 7200);		
-	
-	foreach ($defaults as $key => $val)
-	{
-		if ( ! is_array($data))
-		{
-			if ( ! isset($$key) OR $$key == '')
-			{
-				$$key = $val;
-			}
-		}
-		else
-		{			
-			$$key = ( ! isset($data[$key])) ? $val : $data[$key];
-		}
-	}
-	
-	if ($img_path == '' OR $img_url == '')
-	{
-		return FALSE;
-	}
-
-	if ( ! @is_dir($img_path))
-	{
-		return FALSE;
-	}
-	
-	if ( ! is_writable($img_path))
-	{
-		return FALSE;
-	}
-			
-	if ( ! extension_loaded('gd'))
-	{
-		return FALSE;
-	}		
-	
-	// -----------------------------------
-	// Remove old images	
-	// -----------------------------------
-			
-	list($usec, $sec) = explode(" ", microtime());
-	$now = ((float)$usec + (float)$sec);
-			
-	$current_dir = @opendir($img_path);
-	
-	while($filename = @readdir($current_dir))
-	{
-		if ($filename != "." and $filename != ".." and $filename != "index.html")
-		{
-			$name = str_replace(".jpg", "", $filename);
-		
-			if (($name + $expiration) < $now)
-			{
-				@unlink($img_path.$filename);
-			}
-		}
-	}
-	
-	@closedir($current_dir);
-
-	// -----------------------------------
-	// Do we have a "word" yet?
-	// -----------------------------------
-	
-   if ($word == '')
-   {
-		$pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
-		$str = '';
-		for ($i = 0; $i < 8; $i++)
-		{
-			$str .= substr($pool, mt_rand(0, strlen($pool) -1), 1);
-		}
-		
-		$word = $str;
-   }
-	
-	// -----------------------------------
-	// Determine angle and position	
-	// -----------------------------------
-	
-	$length	= strlen($word);
-	$angle	= ($length >= 6) ? rand(-($length-6), ($length-6)) : 0;
-	$x_axis	= rand(6, (360/$length)-16);			
-	$y_axis = ($angle >= 0 ) ? rand($img_height, $img_width) : rand(6, $img_height);
-	
-	// -----------------------------------
-	// Create image
-	// -----------------------------------
-			
-	$im = ImageCreate($img_width, $img_height);
-			
-	// -----------------------------------
-	//  Assign colors
-	// -----------------------------------
-	
-	$bg_color		= ImageColorAllocate($im, 255, 255, 255);
-	$border_color	= ImageColorAllocate($im, 153, 102, 102);
-	$text_color		= ImageColorAllocate($im, 204, 153, 153);
-	$grid_color		= imagecolorallocate($im, 255, 182, 182);
-	$shadow_color	= imagecolorallocate($im, 255, 240, 240);
-
-	// -----------------------------------
-	//  Create the rectangle
-	// -----------------------------------
-	
-	ImageFilledRectangle($im, 0, 0, $img_width, $img_height, $bg_color);
-	
-	// -----------------------------------
-	//  Create the spiral pattern
-	// -----------------------------------
-	
-	$theta		= 1;
-	$thetac		= 7;
-	$radius		= 16;
-	$circles	= 20;
-	$points		= 32;
-
-	for ($i = 0; $i < ($circles * $points) - 1; $i++)
-	{
-		$theta = $theta + $thetac;
-		$rad = $radius * ($i / $points );
-		$x = ($rad * cos($theta)) + $x_axis;
-		$y = ($rad * sin($theta)) + $y_axis;
-		$theta = $theta + $thetac;
-		$rad1 = $radius * (($i + 1) / $points);
-		$x1 = ($rad1 * cos($theta)) + $x_axis;
-		$y1 = ($rad1 * sin($theta )) + $y_axis;
-		imageline($im, $x, $y, $x1, $y1, $grid_color);
-		$theta = $theta - $thetac;
-	}
-
-	// -----------------------------------
-	//  Write the text
-	// -----------------------------------
-	
-	$use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE;
-		
-	if ($use_font == FALSE)
-	{
-		$font_size = 5;
-		$x = rand(0, $img_width/($length/3));
-		$y = 0;
-	}
-	else
-	{
-		$font_size	= 16;
-		$x = rand(0, $img_width/($length/1.5));
-		$y = $font_size+2;
-	}
-
-	for ($i = 0; $i < strlen($word); $i++)
-	{
-		if ($use_font == FALSE)
-		{
-			$y = rand(0 , $img_height/2);
-			imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color);
-			$x += ($font_size*2);
-		}
-		else
-		{		
-			$y = rand($img_height/2, $img_height-3);
-			imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1));
-			$x += $font_size;
-		}
-	}
-	
-
-	// -----------------------------------
-	//  Create the border
-	// -----------------------------------
-
-	imagerectangle($im, 0, 0, $img_width-1, $img_height-1, $border_color);		
-
-	// -----------------------------------
-	//  Generate the image
-	// -----------------------------------
-	
-	$img_name = $now.'.jpg';
-
-	ImageJPEG($im, $img_path.$img_name);
-	
-	$img = "\"";
-	
-	ImageDestroy($im);
-		
-	return array('word' => $word, 'time' => $now, 'image' => $img);
-}
-
+load->plugin('captcha');
+
+Once loaded you can generate a captcha like this:
+	
+	$vals = array(
+					'word'		 => 'Random word',
+					'img_path'	 => './captcha/',
+					'img_url'	 => 'http://www.your-site.com/captcha/',
+					'font_path'	 => './system/texb.ttf',
+					'img_width'	 => '150',
+					'img_height' => 30,
+					'expiration' => 7200
+				);
+	
+	$cap = create_captcha($vals);
+	echo $cap['image'];
+	
+
+NOTES:
+	
+	The captcha function requires the GD image library.
+	
+	Only the img_path and img_url are required.
+	
+	If a "word" is not supplied, the function will generate a random
+	ASCII string.  You might put together your own word library that
+	you can draw randomly from.
+	
+	If you do not specify a path to a TRUE TYPE font, the native ugly GD
+	font will be used.
+	
+	The "captcha" folder must be writable (666, or 777)
+	
+	The "expiration" (in seconds) signifies how long an image will
+	remain in the captcha folder before it will be deleted.  The default
+	is two hours.
+
+RETURNED DATA
+
+The create_captcha() function returns an associative array with this data:
+
+  [array]
+  (
+	'image' => IMAGE TAG
+	'time'	=> TIMESTAMP (in microtime)
+	'word'	=> CAPTCHA WORD
+  )
+
+The "image" is the actual image tag:
+
+
+The "time" is the micro timestamp used as the image name without the file
+extension.  It will be a number like this:  1139612155.3422
+
+The "word" is the word that appears in the captcha image, which if not
+supplied to the function, will be a random string.
+
+
+ADDING A DATABASE
+
+In order for the captcha function to prevent someone from posting, you will need
+to add the information returned from create_captcha() function to your database.
+Then, when the data from the form is submitted by the user you will need to verify
+that the data exists in the database and has not expired.
+
+Here is a table prototype:
+
+	CREATE TABLE captcha (
+	 captcha_id bigint(13) unsigned NOT NULL auto_increment,
+	 captcha_time int(10) unsigned NOT NULL,
+	 ip_address varchar(16) default '0' NOT NULL,
+	 word varchar(20) NOT NULL,
+	 PRIMARY KEY (captcha_id),
+	 KEY (word)
+	)
+
+
+Here is an example of usage with a DB.
+
+On the page where the captcha will be shown you'll have something like this:
+
+	$this->load->plugin('captcha');
+	$vals = array(
+					'img_path'	 => './captcha/',
+					'img_url'	 => 'http://www.your-site.com/captcha/'
+				);
+	
+	$cap = create_captcha($vals);
+
+	$data = array(
+					'captcha_id'	=> '',
+					'captcha_time'	=> $cap['time'],
+					'ip_address'	=> $this->input->ip_address(),
+					'word'			=> $cap['word']
+				);
+
+	$query = $this->db->insert_string('captcha', $data);
+	$this->db->query($query);
+		
+	echo 'Submit the word you see below:';
+	echo $cap['image'];
+	echo '';
+
+
+Then, on the page that accepts the submission you'll have something like this:
+
+	// First, delete old captchas
+	$expiration = time()-7200; // Two hour limit
+	$DB->query("DELETE FROM captcha WHERE captcha_time < ".$expiration);		
+
+	// Then see if a captcha exists:
+	$sql = "SELECT COUNT(*) AS count FROM captcha WHERE word = ? AND ip_address = ? AND date > ?";
+	$binds = array($_POST['captcha'], $this->input->ip_address(), $expiration);
+	$query = $this->db->query($sql, $binds);
+	$row = $query->row();
+
+	if ($row->count == 0)
+	{
+		echo "You must submit the word that appears in the image";
+	}
+
+*/
+
+
+	
+/**
+|==========================================================
+| Create Captcha
+|==========================================================
+|
+*/
+function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '')
+{		
+	$defaults = array('word' => '', 'img_path' => '', 'img_url' => '', 'img_width' => '150', 'img_height' => '30', 'font_path' => '', 'expiration' => 7200);		
+	
+	foreach ($defaults as $key => $val)
+	{
+		if ( ! is_array($data))
+		{
+			if ( ! isset($$key) OR $$key == '')
+			{
+				$$key = $val;
+			}
+		}
+		else
+		{			
+			$$key = ( ! isset($data[$key])) ? $val : $data[$key];
+		}
+	}
+	
+	if ($img_path == '' OR $img_url == '')
+	{
+		return FALSE;
+	}
+
+	if ( ! @is_dir($img_path))
+	{
+		return FALSE;
+	}
+	
+	if ( ! is_writable($img_path))
+	{
+		return FALSE;
+	}
+			
+	if ( ! extension_loaded('gd'))
+	{
+		return FALSE;
+	}		
+	
+	// -----------------------------------
+	// Remove old images	
+	// -----------------------------------
+			
+	list($usec, $sec) = explode(" ", microtime());
+	$now = ((float)$usec + (float)$sec);
+			
+	$current_dir = @opendir($img_path);
+	
+	while($filename = @readdir($current_dir))
+	{
+		if ($filename != "." and $filename != ".." and $filename != "index.html")
+		{
+			$name = str_replace(".jpg", "", $filename);
+		
+			if (($name + $expiration) < $now)
+			{
+				@unlink($img_path.$filename);
+			}
+		}
+	}
+	
+	@closedir($current_dir);
+
+	// -----------------------------------
+	// Do we have a "word" yet?
+	// -----------------------------------
+	
+   if ($word == '')
+   {
+		$pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+		$str = '';
+		for ($i = 0; $i < 8; $i++)
+		{
+			$str .= substr($pool, mt_rand(0, strlen($pool) -1), 1);
+		}
+		
+		$word = $str;
+   }
+	
+	// -----------------------------------
+	// Determine angle and position	
+	// -----------------------------------
+	
+	$length	= strlen($word);
+	$angle	= ($length >= 6) ? rand(-($length-6), ($length-6)) : 0;
+	$x_axis	= rand(6, (360/$length)-16);			
+	$y_axis = ($angle >= 0 ) ? rand($img_height, $img_width) : rand(6, $img_height);
+	
+	// -----------------------------------
+	// Create image
+	// -----------------------------------
+			
+	$im = ImageCreate($img_width, $img_height);
+			
+	// -----------------------------------
+	//  Assign colors
+	// -----------------------------------
+	
+	$bg_color		= ImageColorAllocate($im, 255, 255, 255);
+	$border_color	= ImageColorAllocate($im, 153, 102, 102);
+	$text_color		= ImageColorAllocate($im, 204, 153, 153);
+	$grid_color		= imagecolorallocate($im, 255, 182, 182);
+	$shadow_color	= imagecolorallocate($im, 255, 240, 240);
+
+	// -----------------------------------
+	//  Create the rectangle
+	// -----------------------------------
+	
+	ImageFilledRectangle($im, 0, 0, $img_width, $img_height, $bg_color);
+	
+	// -----------------------------------
+	//  Create the spiral pattern
+	// -----------------------------------
+	
+	$theta		= 1;
+	$thetac		= 7;
+	$radius		= 16;
+	$circles	= 20;
+	$points		= 32;
+
+	for ($i = 0; $i < ($circles * $points) - 1; $i++)
+	{
+		$theta = $theta + $thetac;
+		$rad = $radius * ($i / $points );
+		$x = ($rad * cos($theta)) + $x_axis;
+		$y = ($rad * sin($theta)) + $y_axis;
+		$theta = $theta + $thetac;
+		$rad1 = $radius * (($i + 1) / $points);
+		$x1 = ($rad1 * cos($theta)) + $x_axis;
+		$y1 = ($rad1 * sin($theta )) + $y_axis;
+		imageline($im, $x, $y, $x1, $y1, $grid_color);
+		$theta = $theta - $thetac;
+	}
+
+	// -----------------------------------
+	//  Write the text
+	// -----------------------------------
+	
+	$use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE;
+		
+	if ($use_font == FALSE)
+	{
+		$font_size = 5;
+		$x = rand(0, $img_width/($length/3));
+		$y = 0;
+	}
+	else
+	{
+		$font_size	= 16;
+		$x = rand(0, $img_width/($length/1.5));
+		$y = $font_size+2;
+	}
+
+	for ($i = 0; $i < strlen($word); $i++)
+	{
+		if ($use_font == FALSE)
+		{
+			$y = rand(0 , $img_height/2);
+			imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color);
+			$x += ($font_size*2);
+		}
+		else
+		{		
+			$y = rand($img_height/2, $img_height-3);
+			imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1));
+			$x += $font_size;
+		}
+	}
+	
+
+	// -----------------------------------
+	//  Create the border
+	// -----------------------------------
+
+	imagerectangle($im, 0, 0, $img_width-1, $img_height-1, $border_color);		
+
+	// -----------------------------------
+	//  Generate the image
+	// -----------------------------------
+	
+	$img_name = $now.'.jpg';
+
+	ImageJPEG($im, $img_path.$img_name);
+	
+	$img = "\"";
+	
+	ImageDestroy($im);
+		
+	return array('word' => $word, 'time' => $now, 'image' => $img);
+}
+
 ?>
\ No newline at end of file
diff --git a/system/plugins/js_calendar_pi.php b/system/plugins/js_calendar_pi.php
index 987bd49e..a461e34a 100644
--- a/system/plugins/js_calendar_pi.php
+++ b/system/plugins/js_calendar_pi.php
@@ -1,604 +1,604 @@
-load->plugin('js_calendar');
-
-Once loaded you'll add the calendar script to the  of your page like this:
-
-
-
-The above function will be passed the name of your form.
-
-Then to show the actual calendar you'll do this:
-
-
-
                
-
-
                Today
                
-
                
-
-
-Note:  The first parameter is the name of the field containing your date, the second parameter contains the "now" time,
-and the third tells the calendar whether to highlight the current day or not.
-
-Lastly, you'll need some CSS for your calendar:
-
-.calendar {
-	border: 1px #6975A3 solid;
-	background-color: transparent;
-}
-.calheading {
-	background-color: #7C8BC0;
-	color: #fff;
-	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
-	font-size: 11px;
-	font-weight: bold;
-	text-align: center;
-}
-.calnavleft {
-	background-color: #7C8BC0;
-	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	color: #fff;
-	padding: 4px;
-	cursor: pointer;
-}
-.calnavright {
-	background-color: #7C8BC0;
-	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	color: #fff;
-	text-align:  right;
-	padding: 4px;
-	cursor: pointer;
-}
-.caldayheading {
-	background-color: #000;
-	color: #fff;
-	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
-	font-size: 10px;
-	text-align: center;
-	padding: 6px 2px 6px 2px;
-}
-.caldaycells{
-	color: #000;
-	background-color: #D1D7E6;
-	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
-	font-size: 11px;
-	text-align: center;
-	padding: 4px;
-	border: 1px #E0E5F1 solid;
-	cursor: pointer;
-}
-.caldaycellhover{
-	color: #fff;
-	background-color: #B3BCD4;
-	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
-	font-size: 11px;
-	text-align: center;
-	padding: 4px;
-	border: 1px #B3BCD4 solid;
-	cursor: pointer;
-}
-.caldayselected{
-	background-color: #737FAC;
-	color:	#fff;
-	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
-	font-size: 11px;
-	font-weight: bold;
-	text-align: center;
-	border: 1px #566188 solid;
-	padding: 3px;
-	cursor: pointer;
-}
-.calblanktop {
-	background-color: #fff;
-	padding: 4px;
-}
-.calblankbot {
-	background-color: #fff;
-	padding: 4px;
-}
-
-
-*/
-
-function js_calendar_script($form_name = 'entryform')
-{		
-
-ob_start();
-?>
-
-
-		var '.$field_id.' = new calendar("'.$field_id.'", '.$time.', '.(($highlight == TRUE) ? 'true' : 'false').');
-		document.write('.$field_id.'.write());
-	';	
-}	
-
+load->plugin('js_calendar');
+
+Once loaded you'll add the calendar script to the  of your page like this:
+
+
+
+The above function will be passed the name of your form.
+
+Then to show the actual calendar you'll do this:
+
+
+
                
+
+
                Today
                
+
                
+
+
+Note:  The first parameter is the name of the field containing your date, the second parameter contains the "now" time,
+and the third tells the calendar whether to highlight the current day or not.
+
+Lastly, you'll need some CSS for your calendar:
+
+.calendar {
+	border: 1px #6975A3 solid;
+	background-color: transparent;
+}
+.calheading {
+	background-color: #7C8BC0;
+	color: #fff;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+	text-align: center;
+}
+.calnavleft {
+	background-color: #7C8BC0;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	color: #fff;
+	padding: 4px;
+	cursor: pointer;
+}
+.calnavright {
+	background-color: #7C8BC0;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	color: #fff;
+	text-align:  right;
+	padding: 4px;
+	cursor: pointer;
+}
+.caldayheading {
+	background-color: #000;
+	color: #fff;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 10px;
+	text-align: center;
+	padding: 6px 2px 6px 2px;
+}
+.caldaycells{
+	color: #000;
+	background-color: #D1D7E6;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 11px;
+	text-align: center;
+	padding: 4px;
+	border: 1px #E0E5F1 solid;
+	cursor: pointer;
+}
+.caldaycellhover{
+	color: #fff;
+	background-color: #B3BCD4;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 11px;
+	text-align: center;
+	padding: 4px;
+	border: 1px #B3BCD4 solid;
+	cursor: pointer;
+}
+.caldayselected{
+	background-color: #737FAC;
+	color:	#fff;
+	font-family: Lucida Grande, Verdana, Geneva, Sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+	text-align: center;
+	border: 1px #566188 solid;
+	padding: 3px;
+	cursor: pointer;
+}
+.calblanktop {
+	background-color: #fff;
+	padding: 4px;
+}
+.calblankbot {
+	background-color: #fff;
+	padding: 4px;
+}
+
+
+*/
+
+function js_calendar_script($form_name = 'entryform')
+{		
+
+ob_start();
+?>
+
+
+		var '.$field_id.' = new calendar("'.$field_id.'", '.$time.', '.(($highlight == TRUE) ? 'true' : 'false').');
+		document.write('.$field_id.'.write());
+	';	
+}	
+
 ?>
\ No newline at end of file
diff --git a/system/scaffolding/Scaffolding.php b/system/scaffolding/Scaffolding.php
index d42b5686..fe2744e7 100644
--- a/system/scaffolding/Scaffolding.php
+++ b/system/scaffolding/Scaffolding.php
@@ -1,289 +1,289 @@
-CI =& get_instance();
-		
-		$this->CI->load->database("", FALSE, TRUE);			
-		$this->CI->load->library('pagination');
-		
-		// Turn off caching
-		$this->CI->db->cache_off();
-				
-		/**
-		 * Set the current table name
-		 * This is done when initializing scaffolding:
-		 * $this->load->scaffolding('table_name')
-		 *
-		 */
-		$this->current_table = $db_table;
-		
-		/**
-		 * Set the path to the "view" files
-		 * We'll manually override the "view" path so that
-		 * the load->view function knows where to look.
-		 */
-		
-		$this->CI->load->_ci_view_path = BASEPATH.'scaffolding/views/';
-
-		// Set the base URL
-		$this->base_url = $this->CI->config->site_url().'/'.$this->CI->uri->segment(1).$this->CI->uri->slash_segment(2, 'both');
-		$this->base_uri = $this->CI->uri->segment(1).$this->CI->uri->slash_segment(2, 'leading');
-
-		// Set a few globals
-		$data = array(
-						'image_url'	=> $this->CI->config->system_url().'scaffolding/images/',
-						'base_uri'  => $this->base_uri,
-						'base_url'	=> $this->base_url,
-						'title'		=> $this->current_table
-					);
-		
-		$this->CI->load->vars($data);
-		
-		// Load the language file and create variables
-		$this->lang = $this->CI->load->language('scaffolding', '', TRUE);		
-		$this->CI->load->vars($this->lang);
-				
-		//  Load the helper files we plan to use
-		$this->CI->load->helper(array('url', 'form'));
-		
-				
-		log_message('debug', 'Scaffolding Class Initialized');
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * "Add" Page
-	 *
-	 * Shows a form representing the currently selected DB
-	 * so that data can be inserted
-	 *
-	 * @access	public
-	 * @return	string	the HTML "add" page
-	 */
-	function add()
-	{	
-		$data = array(
-						'title'	=>  ( ! isset($this->lang['scaff_add'])) ? 'Add Data' : $this->lang['scaff_add'],
-						'fields' => $this->CI->db->field_data($this->current_table),
-						'action' => $this->base_uri.'/insert'
-					);
-	
-		$this->CI->load->view('add', $data);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Insert the data
-	 *
-	 * @access	public
-	 * @return	void	redirects to the view page
-	 */
-	function insert()
-	{		
-		if ($this->CI->db->insert($this->current_table, $_POST) === FALSE)
-		{
-			$this->add();
-		}
-		else
-		{
-			redirect($this->base_uri.'/view/');
-		}
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * "View" Page
-	 *
-	 * Shows a table containing the data in the currently
-	 * selected DB
-	 *
-	 * @access	public
-	 * @return	string	the HTML "view" page
-	 */
-	function view()
-	{
-		// Fetch the total number of DB rows
-		$total_rows = $this->CI->db->count_all($this->current_table);
-		
-		if ($total_rows < 1)
-		{
-			return $this->CI->load->view('no_data');
-		}
-		
-		// Set the query limit/offset
-		$per_page = 20;
-		$offset = $this->CI->uri->segment(4, 0);
-		
-		// Run the query
-		$query = $this->CI->db->get($this->current_table, $per_page, $offset);
-
-		// Now let's get the field names				
-		$fields = $this->CI->db->list_fields($this->current_table);
-		
-		// We assume that the column in the first position is the primary field.
-		$primary = current($fields);
-
-		// Pagination!
-		$this->CI->pagination->initialize(
-							array(
-									'base_url'		 => $this->base_url.'/view',
-									'total_rows'	 => $total_rows,
-									'per_page'		 => $per_page,
-									'uri_segment'	 => 4,
-									'full_tag_open'	 => '
                ',
-									'full_tag_close' => '
                '
-									)
-								);	
-
-		$data = array(
-						'title'	=>  ( ! isset($this->lang['scaff_view'])) ? 'View Data' : $this->lang['scaff_view'],
-						'query'		=> $query,
-						'fields'	=> $fields,
-						'primary'	=> $primary,
-						'paginate'	=> $this->CI->pagination->create_links()
-					);
-						
-		$this->CI->load->view('view', $data);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * "Edit" Page
-	 *
-	 * Shows a form representing the currently selected DB
-	 * so that data can be edited
-	 *
-	 * @access	public
-	 * @return	string	the HTML "edit" page
-	 */
-	function edit()
-	{
-		if (FALSE === ($id = $this->CI->uri->segment(4)))
-		{
-			return $this->view();
-		}
-
-		// Fetch the primary field name
-		$primary = $this->CI->db->primary($this->current_table);				
-
-		// Run the query
-		$query = $this->CI->db->getwhere($this->current_table, array($primary => $id));
-
-		$data = array(
-						'title'	=>  ( ! isset($this->lang['scaff_edit'])) ? 'Edit Data' : $this->lang['scaff_edit'],
-						'fields'	=> $query->field_data(),
-						'query'		=> $query->row(),
-						'action'	=> $this->base_uri.'/update/'.$this->CI->uri->segment(4)
-					);
-	
-		$this->CI->load->view('edit', $data);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Update
-	 *
-	 * @access	public
-	 * @return	void	redirects to the view page
-	 */
-	function update()
-	{	
-		// Fetch the primary key
-		$primary = $this->CI->db->primary($this->current_table);				
-
-		// Now do the query
-		$this->CI->db->update($this->current_table, $_POST, array($primary => $this->CI->uri->segment(4)));
-		
-		redirect($this->base_uri.'/view/');
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Delete Confirmation
-	 *
-	 * @access	public
-	 * @return	string	the HTML "delete confirm" page
-	 */
-	function delete()
-	{
-		if ( ! isset($this->lang['scaff_del_confirm']))
-		{
-			$message = 'Are you sure you want to delete the following row: '.$this->CI->uri->segment(4);
-		}
-		else
-		{
-			$message = $this->lang['scaff_del_confirm'].' '.$this->CI->uri->segment(4);
-		}
-		
-		$data = array(
-						'title'		=> ( ! isset($this->lang['scaff_delete'])) ? 'Delete Data' : $this->lang['scaff_delete'],
-						'message'	=> $message,
-						'no'		=> anchor(array($this->base_uri, 'view'), ( ! isset($this->lang['scaff_no'])) ? 'No' : $this->lang['scaff_no']),
-						'yes'		=> anchor(array($this->base_uri, 'do_delete', $this->CI->uri->segment(4)), ( ! isset($this->lang['scaff_yes'])) ? 'Yes' : $this->lang['scaff_yes'])
-					);
-	
-		$this->CI->load->view('delete', $data);
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Delete
-	 *
-	 * @access	public
-	 * @return	void	redirects to the view page
-	 */
-	function do_delete()
-	{		
-		// Fetch the primary key
-		$primary = $this->CI->db->primary($this->current_table);				
-
-		// Now do the query
-		$this->CI->db->where($primary, $this->CI->uri->segment(4));
-		$this->CI->db->delete($this->current_table);
-
-		header("Refresh:0;url=".site_url(array($this->base_uri, 'view')));
-		exit;
-	}
-
-}
+CI =& get_instance();
+		
+		$this->CI->load->database("", FALSE, TRUE);			
+		$this->CI->load->library('pagination');
+		
+		// Turn off caching
+		$this->CI->db->cache_off();
+				
+		/**
+		 * Set the current table name
+		 * This is done when initializing scaffolding:
+		 * $this->load->scaffolding('table_name')
+		 *
+		 */
+		$this->current_table = $db_table;
+		
+		/**
+		 * Set the path to the "view" files
+		 * We'll manually override the "view" path so that
+		 * the load->view function knows where to look.
+		 */
+		
+		$this->CI->load->_ci_view_path = BASEPATH.'scaffolding/views/';
+
+		// Set the base URL
+		$this->base_url = $this->CI->config->site_url().'/'.$this->CI->uri->segment(1).$this->CI->uri->slash_segment(2, 'both');
+		$this->base_uri = $this->CI->uri->segment(1).$this->CI->uri->slash_segment(2, 'leading');
+
+		// Set a few globals
+		$data = array(
+						'image_url'	=> $this->CI->config->system_url().'scaffolding/images/',
+						'base_uri'  => $this->base_uri,
+						'base_url'	=> $this->base_url,
+						'title'		=> $this->current_table
+					);
+		
+		$this->CI->load->vars($data);
+		
+		// Load the language file and create variables
+		$this->lang = $this->CI->load->language('scaffolding', '', TRUE);		
+		$this->CI->load->vars($this->lang);
+				
+		//  Load the helper files we plan to use
+		$this->CI->load->helper(array('url', 'form'));
+		
+				
+		log_message('debug', 'Scaffolding Class Initialized');
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * "Add" Page
+	 *
+	 * Shows a form representing the currently selected DB
+	 * so that data can be inserted
+	 *
+	 * @access	public
+	 * @return	string	the HTML "add" page
+	 */
+	function add()
+	{	
+		$data = array(
+						'title'	=>  ( ! isset($this->lang['scaff_add'])) ? 'Add Data' : $this->lang['scaff_add'],
+						'fields' => $this->CI->db->field_data($this->current_table),
+						'action' => $this->base_uri.'/insert'
+					);
+	
+		$this->CI->load->view('add', $data);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Insert the data
+	 *
+	 * @access	public
+	 * @return	void	redirects to the view page
+	 */
+	function insert()
+	{		
+		if ($this->CI->db->insert($this->current_table, $_POST) === FALSE)
+		{
+			$this->add();
+		}
+		else
+		{
+			redirect($this->base_uri.'/view/');
+		}
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * "View" Page
+	 *
+	 * Shows a table containing the data in the currently
+	 * selected DB
+	 *
+	 * @access	public
+	 * @return	string	the HTML "view" page
+	 */
+	function view()
+	{
+		// Fetch the total number of DB rows
+		$total_rows = $this->CI->db->count_all($this->current_table);
+		
+		if ($total_rows < 1)
+		{
+			return $this->CI->load->view('no_data');
+		}
+		
+		// Set the query limit/offset
+		$per_page = 20;
+		$offset = $this->CI->uri->segment(4, 0);
+		
+		// Run the query
+		$query = $this->CI->db->get($this->current_table, $per_page, $offset);
+
+		// Now let's get the field names				
+		$fields = $this->CI->db->list_fields($this->current_table);
+		
+		// We assume that the column in the first position is the primary field.
+		$primary = current($fields);
+
+		// Pagination!
+		$this->CI->pagination->initialize(
+							array(
+									'base_url'		 => $this->base_url.'/view',
+									'total_rows'	 => $total_rows,
+									'per_page'		 => $per_page,
+									'uri_segment'	 => 4,
+									'full_tag_open'	 => '
                ',
+									'full_tag_close' => '
                '
+									)
+								);	
+
+		$data = array(
+						'title'	=>  ( ! isset($this->lang['scaff_view'])) ? 'View Data' : $this->lang['scaff_view'],
+						'query'		=> $query,
+						'fields'	=> $fields,
+						'primary'	=> $primary,
+						'paginate'	=> $this->CI->pagination->create_links()
+					);
+						
+		$this->CI->load->view('view', $data);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * "Edit" Page
+	 *
+	 * Shows a form representing the currently selected DB
+	 * so that data can be edited
+	 *
+	 * @access	public
+	 * @return	string	the HTML "edit" page
+	 */
+	function edit()
+	{
+		if (FALSE === ($id = $this->CI->uri->segment(4)))
+		{
+			return $this->view();
+		}
+
+		// Fetch the primary field name
+		$primary = $this->CI->db->primary($this->current_table);				
+
+		// Run the query
+		$query = $this->CI->db->getwhere($this->current_table, array($primary => $id));
+
+		$data = array(
+						'title'	=>  ( ! isset($this->lang['scaff_edit'])) ? 'Edit Data' : $this->lang['scaff_edit'],
+						'fields'	=> $query->field_data(),
+						'query'		=> $query->row(),
+						'action'	=> $this->base_uri.'/update/'.$this->CI->uri->segment(4)
+					);
+	
+		$this->CI->load->view('edit', $data);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Update
+	 *
+	 * @access	public
+	 * @return	void	redirects to the view page
+	 */
+	function update()
+	{	
+		// Fetch the primary key
+		$primary = $this->CI->db->primary($this->current_table);				
+
+		// Now do the query
+		$this->CI->db->update($this->current_table, $_POST, array($primary => $this->CI->uri->segment(4)));
+		
+		redirect($this->base_uri.'/view/');
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Delete Confirmation
+	 *
+	 * @access	public
+	 * @return	string	the HTML "delete confirm" page
+	 */
+	function delete()
+	{
+		if ( ! isset($this->lang['scaff_del_confirm']))
+		{
+			$message = 'Are you sure you want to delete the following row: '.$this->CI->uri->segment(4);
+		}
+		else
+		{
+			$message = $this->lang['scaff_del_confirm'].' '.$this->CI->uri->segment(4);
+		}
+		
+		$data = array(
+						'title'		=> ( ! isset($this->lang['scaff_delete'])) ? 'Delete Data' : $this->lang['scaff_delete'],
+						'message'	=> $message,
+						'no'		=> anchor(array($this->base_uri, 'view'), ( ! isset($this->lang['scaff_no'])) ? 'No' : $this->lang['scaff_no']),
+						'yes'		=> anchor(array($this->base_uri, 'do_delete', $this->CI->uri->segment(4)), ( ! isset($this->lang['scaff_yes'])) ? 'Yes' : $this->lang['scaff_yes'])
+					);
+	
+		$this->CI->load->view('delete', $data);
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Delete
+	 *
+	 * @access	public
+	 * @return	void	redirects to the view page
+	 */
+	function do_delete()
+	{		
+		// Fetch the primary key
+		$primary = $this->CI->db->primary($this->current_table);				
+
+		// Now do the query
+		$this->CI->db->where($primary, $this->CI->uri->segment(4));
+		$this->CI->db->delete($this->current_table);
+
+		header("Refresh:0;url=".site_url(array($this->base_uri, 'view')));
+		exit;
+	}
+
+}
 ?>
\ No newline at end of file
diff --git a/system/scaffolding/views/footer.php b/system/scaffolding/views/footer.php
index 36b29d1c..60b0a53e 100644
--- a/system/scaffolding/views/footer.php
+++ b/system/scaffolding/views/footer.php
@@ -1,10 +1,10 @@
-
-
                - - - - + +
                + + + + \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 318dae7e..df667b95 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -2,7 +2,7 @@ -Code Igniter User Guide +CodeIgniter User Guide @@ -22,7 +22,7 @@ - + @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.2

                CodeIgniter User Guide Version 1.5.3
                @@ -45,7 +45,7 @@ @@ -63,10 +63,17 @@

                Change Log

                Version 1.5.3

                -

                Release Date:

                +

                Release Date: April 15, 2007

                  +
                • Added Array to string into the profiler
                  • +
                • Added CodeIgniter references updated to CodeIgniter
                  • +
                • Added EllisLab references updated to EllisLab
                  • +
                • Fixed a bug in the repeater function of string helper.
                  • +
                • Fixed a bug in ODBC driver
                  • +
                • Fixed a bug in result_array() that was returning an empty array when no result is produced.
                  • +
                • Fixed a bug in the redirect function of the url helper.
                  • +
                • Fixed an undefined variable in Loader
                • Fixed a version but in the Postgre driver
                  • -
                • Array to string now supported in profiler
                • Fixed a bug in the textarea function of the form helper for use with strings
                • Fixed doc typos.
                @@ -322,7 +329,7 @@

                Version 1.3

              • Added "alternator" function in the string helpers.

              • Removed slashing from the input class. After much debate we decided to kill this feature.
              • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
                • -
              • Added better class and function name-spacing to avoid collisions with user developed classes. All Code Igniter classes are now prefixed with CI_ and +
              • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
              • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
              • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
                • @@ -345,7 +352,7 @@

                Version 1.2

                • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
                  • -
                • Added a global function named get_instance() allowing the main Code Igniter object to be accessible throughout your own classes.
                  • +
                • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
                • Added new File Helper: delete_files()
                • Added new URL Helpers: base_url(), index_page()
                • Added the ability to create your own core libraries and store them in your local application directory.
                  • @@ -368,7 +375,7 @@

                  Version Beta 1.1

                  • Added a Calendaring class.
                    • -
                  • Added support for running multiple applications that share a common Code Igniter backend.
                    • +
                  • Added support for running multiple applications that share a common CodeIgniter backend.
                  • Moved the "uri protocol" variable from the index.php file into the config.php file
                  • Fixed a problem that was preventing certain function calls from working within constructors.
                  • Fixed a problem that was preventing the $this->load->library function from working in constructors.
                    • @@ -403,7 +410,7 @@

                    Version Beta 1.0

                    Next Topic:  Credits

                    -

                    Code Igniter  ·  Copyright © 2006  ·  Ellislab, Inc.

                    +

                    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

                    diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 915df1c3..fa3e2665 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -2,7 +2,7 @@ -Code Igniter User Guide +CodeIgniter User Guide @@ -22,7 +22,7 @@ - + @@ -33,7 +33,7 @@
                - +

                Code Igniter User Guide Version 1.5.2

                CodeIgniter User Guide Version 1.5.3
                @@ -45,7 +45,7 @@ - +
                diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 64323105..a7601e85 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -50,7 +50,7 @@ Database Library  ›  Database Utility Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index ef846f36..2b088919 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -49,7 +49,7 @@ User Guide Home  ›  Alternate PHP Syntax -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index f4961618..f6ae7ffa 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -49,7 +49,7 @@ User Guide Home  ›  Creating Ancillary Classes -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 7ac2253e..f3d474f2 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -49,7 +49,7 @@ User Guide Home  ›  Auto-loading Resources -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 0cec441e..8756f7c1 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -49,7 +49,7 @@ User Guide Home  ›  Page Caching -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index f80325ea..c61660d3 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -49,7 +49,7 @@ User Guide Home  ›  Controllers -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 84aa5502..2b476e58 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -49,7 +49,7 @@ User Guide Home  ›  Creating Core System Classes -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 64300929..020f7bed 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -49,7 +49,7 @@ User Guide Home  ›  Creating Libraries -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index e1bd8c37..9ac1618d 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -49,7 +49,7 @@ User Guide Home  ›  Credits -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index e19af059..65000811 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -49,7 +49,7 @@ User Guide Home  ›  Error Handling -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 7f51e305..0aba208a 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -49,7 +49,7 @@ User Guide Home  ›  Helper Functions -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index b0e15f12..c864c1ed 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -49,7 +49,7 @@ User Guide Home  ›  Hooks - Extending the Framework Core -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/index.html b/user_guide/general/index.html index a5334685..bf9b4ddc 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -49,7 +49,7 @@ User Guide Home  ›  Getting Started -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index aaa4d694..38c9987b 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -49,7 +49,7 @@ User Guide Home  ›  Using CodeIgniter Libraries -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 28e00f06..103127fb 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -49,7 +49,7 @@ User Guide Home  ›  Managing your Applications -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/models.html b/user_guide/general/models.html index cf663428..c1832cca 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -49,7 +49,7 @@ User Guide Home  ›  Models -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index b811abdc..ef299aa1 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -49,7 +49,7 @@ User Guide Home  ›  Plugins -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 4e306648..71950133 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -49,7 +49,7 @@ User Guide Home  ›  Profiling Your Application -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 2a01dd04..963f6b05 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -49,7 +49,7 @@ User Guide Home  ›  Quick Reference Chart -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 689aad55..e92b5196 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -49,7 +49,7 @@ User Guide Home  ›  Server Requirements -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index fe4efa3a..c4af428a 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -49,7 +49,7 @@ User Guide Home  ›  URI Routing -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index aee72f7c..4f23d3fe 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -49,7 +49,7 @@ User Guide Home  ›  Scaffolding -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 5dd00ec1..fdba2dfc 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -49,7 +49,7 @@ User Guide Home  ›  Security -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 4d29b730..4df37eeb 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -49,7 +49,7 @@ User Guide Home  ›  URLS -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/general/views.html b/user_guide/general/views.html index f97a003c..8adfc673 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -49,7 +49,7 @@ User Guide Home  ›  Views -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index e226e2cf..893dcaf9 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  Array Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 64d572a2..bee6f3e0 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  Cookie Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index f55cdeda..b9c48aa5 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  Directory Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 8ba1b3a8..d0be8f6f 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -50,7 +50,7 @@ User Guide Home  ›  Directory Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 570a209a..3a0e2526 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -50,7 +50,7 @@ User Guide Home  ›  Download Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index b1df4a48..bebcc90b 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  File Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 0fde06db..d1eef8d8 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  Form Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 0dd4b134..2b419605 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  Directory Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index b02cf4df..ba067df9 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -49,7 +49,7 @@ User Guide Home  ›  Helper Functions -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index ab9f062d..8c7a26d4 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  Inflector Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 79b44698..2e603afe 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  Security Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 50b459b9..d690749e 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  Smiley Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 5989a43d..c5be715a 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  String Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index de393dbe..e20a07cc 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  Text Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index c6e68d53..5bcd2e3f 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  Typography Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index fbfc8414..7d54867e 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  URL Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 17d18565..35dd8868 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -49,7 +49,7 @@ User Guide Home  ›  XML Helper -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/index.html b/user_guide/index.html index a3ad5b55..15ecf1ea 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -46,7 +46,7 @@ CodeIgniter Home  ›  CodeIgniter User Guide -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index a3c5525d..58eefac0 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -49,7 +49,7 @@ User Guide Home  ›  Downloading CodeIgniter -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 9abc283e..edfa8b53 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -49,7 +49,7 @@ User Guide Home  ›  Installation Instructions -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 6f73f755..9813ef2a 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -49,7 +49,7 @@ User Guide Home  ›  Installation Instructions -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 6d39ebb9..a3f554c4 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from Beta 1.1 to Final 1.2 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index 1a89df03..f08c8a11 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from 1.2 to 1.3 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 6ae18228..812f5e41 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from 1.3 to 1.3.1 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 6d29e1a4..3ae6a83a 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from 1.3.1 to 1.3.2 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 3fe58a70..3c0cea6d 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from 1.3.2 to 1.3.3 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 5b215bd6..0a515898 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from 1.3.3 to 1.4.0 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 40ba9246..0324508a 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from 1.3.3 to 1.4.0 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 65bf1e53..13948655 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from 1.4.1 to 1.5.0 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 5820ce1b..853e5ce3 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from 1.5.0 to 1.5.2 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index bc8fd576..2e999579 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from 1.5.0 to 1.5.2 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 9b45a990..793cd2e7 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from Beta 1.0 to Beta 1.1 -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index a55922e8..2efa1151 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -49,7 +49,7 @@ User Guide Home  ›  Upgrading from a Previous Version -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index fb0930c6..d92f0730 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -49,7 +49,7 @@ User Guide Home  ›  Benchmarking Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index ce48acc5..c9779081 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -49,7 +49,7 @@ User Guide Home  ›  Calendaring Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 79f064c2..350831e0 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -49,7 +49,7 @@ User Guide Home  ›  Config Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index af243db8..190dadbd 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -49,7 +49,7 @@ User Guide Home  ›  Email Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 7c6f909b..e3a9762b 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -49,7 +49,7 @@ User Guide Home  ›  Encryption Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 80ec869a..21fd2a6b 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -49,7 +49,7 @@ User Guide Home  ›  File Uploading Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 5c092857..9db0021a 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -49,7 +49,7 @@ User Guide Home  ›  FTP Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 98fcc944..04bd46f8 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -49,7 +49,7 @@ User Guide Home  ›  Image Manipulation Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 0e056b27..f810029a 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -49,7 +49,7 @@ User Guide Home  ›  Input and Security Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 75f0ba28..71dc0b97 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -49,7 +49,7 @@ User Guide Home  ›  Language Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 9e13d394..98bfd1b0 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -49,7 +49,7 @@ User Guide Home  ›  Loader Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index e4e30032..40858751 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -49,7 +49,7 @@ User Guide Home  ›  Output Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index fd300dbe..fafeb6cf 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -49,7 +49,7 @@ User Guide Home  ›  Pagination Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 0bc05886..24bb89ff 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -49,7 +49,7 @@ User Guide Home  ›  Template Parser Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 688f1aac..5a3c4ae2 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -49,7 +49,7 @@ User Guide Home  ›  Session Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 791cc21c..28fc76d2 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -49,7 +49,7 @@ User Guide Home  ›  HTML Table Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 99baa3e2..c54417c8 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -49,7 +49,7 @@ User Guide Home  ›  Trackback Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 02f8c063..bdd64d04 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -49,7 +49,7 @@ User Guide Home  ›  Unit Testing Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 53357d4c..ec777057 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -49,7 +49,7 @@ User Guide Home  ›  URI Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 75ec06b3..e9f6b715 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -49,7 +49,7 @@ User Guide Home  ›  User Agent Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index d5ad263a..8ba45ba4 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -49,7 +49,7 @@ User Guide Home  ›  Form Validation -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 541e8965..5d9b9ee6 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -49,7 +49,7 @@ User Guide Home  ›  XML-RPC and XML-RPC Server Classes -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index af4baa0b..e1692234 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -49,7 +49,7 @@ User Guide Home  ›  Zip Encoding Class -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/license.html b/user_guide/license.html index fb00e200..f938c2cf 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -50,7 +50,7 @@ User Guide Home  ›  License Agreement -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index affcd661..d10d038a 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -49,7 +49,7 @@ User Guide Home  ›  Appflow -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 47362e00..aadfe558 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -49,7 +49,7 @@ User Guide Home  ›  What is CodeIgniter? -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index d63821c0..7033681f 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -49,7 +49,7 @@ User Guide Home  ›  Features -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index b531515f..fba6f61a 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -49,7 +49,7 @@ User Guide Home  ›  Goals -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index edd22930..133503fa 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -49,7 +49,7 @@ User Guide Home  ›  Introduction -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index f1ca19a5..baac03da 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -49,7 +49,7 @@ User Guide Home  ›  MVC -
                Search User Guide   
                +
                Search User Guide   
                diff --git a/user_guide/toc.html b/user_guide/toc.html index e16a3692..12c16183 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -50,7 +50,7 @@ User Guide Home  ›  Table of Contents -
                Search User Guide   
                +
                Search User Guide   
                From 3c5e373a2c95ba06b8d5b9820f53a72bea2f5681 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Sun, 24 Jun 2007 20:27:42 +0000 Subject: [PATCH 0606/2544] Fixed the do_xss_clean() method so that if file_get_contents returns FALSE, then we return FALSE... Previously, if it did NOT return FALSE we returned FALSE and that is simply idiotic. --- system/libraries/Upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index dc3fd4a1..9d2bae2a 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -709,7 +709,7 @@ function do_xss_clean() return FALSE; } - if (($data = @file_get_contents($file)) !== FALSE) + if (($data = @file_get_contents($file)) === FALSE) { return FALSE; } From 2f35c4b91526d2d813601401a3e6563255f2b639 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Sun, 24 Jun 2007 20:29:09 +0000 Subject: [PATCH 0607/2544] Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs --- system/libraries/Upload.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 9d2bae2a..fa1cf1e7 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -477,17 +477,28 @@ function set_xss_clean($flag = FALSE) */ function is_image() { + // IE will sometimes return odd mime-types during upload, so here we just standardize all + // jpegs or pngs to the same file type. + + $png_mimes = array('image/x-png'); + $jpeg_mimes = array('image/jpg', 'image/jpe', 'image/jpeg', 'image/pjpeg'); + + if (in_array($this->file_type, $png_mimes)) + { + $this->file_type = 'image/png'; + } + + if (in_array($this->file_type, $jpeg_mimes)) + { + $this->file_type = 'image/jpeg'; + } + $img_mimes = array( 'image/gif', - 'image/jpg', - 'image/jpe', 'image/jpeg', - 'image/pjpeg', 'image/png', - 'image/x-png' ); - return (in_array($this->file_type, $img_mimes, TRUE)) ? TRUE : FALSE; } From 85d9f0c9960188aa9916c499466c32279178be41 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Sun, 24 Jun 2007 20:30:12 +0000 Subject: [PATCH 0608/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a44c22be..0cbdab06 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -74,6 +74,7 @@

                Version 1.5.4

              • Fixed a typo in the Calendar library
              • Fixed a typo in rpcs.php library
              • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
                • +
              • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
              • Added array to string into the profiler
              • Added some additional mime types in application/config/mimes.php
              • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
                • From 033ef02392d70dbc873deacc50ee76a800d0d228 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Tue, 26 Jun 2007 21:52:52 +0000 Subject: [PATCH 0609/2544] *Updated the XSS Filtering to take into account the IE expression() ability --- system/libraries/Input.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 1ff72877..dc4e605b 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -528,9 +528,12 @@ function xss_clean($str, $charset = 'ISO-8859-1') */ $bad = array( 'document.cookie' => '[removed]', + '.parentNode' => '[removed]', + '.innerHTML' => '[removed]', 'document.write' => '[removed]', 'window.location' => '[removed]', "javascript\s*:" => '[removed]', + "expression\s*\(" => '[removed]', // CSS and IE "Redirect\s+302" => '[removed]', '' => '-->' @@ -626,7 +629,7 @@ function xss_clean($str, $charset = 'ISO-8859-1') * Becomes: eval('some code') * */ - $str = preg_replace('#(alert|cmd|passthru|eval|exec|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str); + $str = preg_replace('#(alert|cmd|passthru|eval|exec|expression|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str); /* * Final clean up @@ -637,9 +640,12 @@ function xss_clean($str, $charset = 'ISO-8859-1') */ $bad = array( 'document.cookie' => '[removed]', + '.parentNode' => '[removed]', + '.innerHTML' => '[removed]', 'document.write' => '[removed]', 'window.location' => '[removed]', "javascript\s*:" => '[removed]', + "expression\s*\(" => '[removed]', // CSS and IE "Redirect\s+302" => '[removed]', '' => '-->' From ca2cf80a98c76afb586659ebd2859d1438748745 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Tue, 26 Jun 2007 21:53:26 +0000 Subject: [PATCH 0610/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 0cbdab06..b9cd5939 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -74,6 +74,7 @@

                Version 1.5.4

              • Fixed a typo in the Calendar library
              • Fixed a typo in rpcs.php library
              • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
                • +
              • Updated the XSS Filtering to take into account the IE expression() ability
              • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
              • Added array to string into the profiler
              • Added some additional mime types in application/config/mimes.php
                • From b614d392ccafd1decadbdc11afd7c0dcc4baec34 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Tue, 26 Jun 2007 21:58:56 +0000 Subject: [PATCH 0611/2544] --- system/libraries/Input.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index dc4e605b..51d4ed28 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -572,7 +572,7 @@ function xss_clean($str, $charset = 'ISO-8859-1') * These words are compacted back to their correct state. * */ - $words = array('javascript', 'vbscript', 'script', 'applet', 'alert', 'document', 'write', 'cookie', 'window'); + $words = array('javascript', 'expression', 'vbscript', 'script', 'applet', 'alert', 'document', 'write', 'cookie', 'window'); foreach ($words as $word) { $temp = ''; From 391eb03004deee85b9b0e978982950723b9742b5 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Wed, 27 Jun 2007 22:58:24 +0000 Subject: [PATCH 0612/2544] Improved XSS clean to not allowing this: xss_clean("ss ipt a='>'>alert/**/('!');//*/>"); --- system/libraries/Input.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 51d4ed28..f9d23ae7 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -588,10 +588,18 @@ function xss_clean($str, $charset = 'ISO-8859-1') /* * Remove disallowed Javascript in links or img tags - */ - $str = preg_replace_callback("##si", array($this, '_js_link_removal'), $str); - $str = preg_replace_callback("##si", array($this, '_js_img_removal'), $str); - $str = preg_replace("#<(script|xss).*?\>#si", "", $str); + */ + do + { + $original = $str; + + $str = preg_replace_callback("##si", array($this, '_js_link_removal'), $str); + $str = preg_replace_callback("##si", array($this, '_js_img_removal'), $str); + $str = preg_replace("##si", "", $str); + } + while($original != $str); + + unset($original); /* * Remove JavaScript Event Handlers From 8816aaab7ac21d4e3ccd1eedd86462bc94aff2c1 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Wed, 27 Jun 2007 23:07:36 +0000 Subject: [PATCH 0613/2544] --- system/libraries/Input.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index f9d23ae7..9a73ab9b 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -68,21 +68,30 @@ function CI_Input() */ function _sanitize_globals() { + // Would kind of be "wrong" to unset any of these GLOBALS. + $protected = array('_SERVER', '_GET', '_POST', '_FILES', '_REQUEST', '_SESSION', '_ENV', 'GLOBALS', 'HTTP_RAW_POST_DATA'); + // Unset globals for securiy. // This is effectively the same as register_globals = off foreach (array($_GET, $_POST, $_COOKIE) as $global) { if ( ! is_array($global)) { - global $global; - $$global = NULL; + if ( ! in_array($global, $protected)) + { + global $global; + $$global = NULL; + } } else { foreach ($global as $key => $val) { - global $$key; - $$key = NULL; + if ( ! in_array($key, $protected)) + { + global $$key; + $$key = NULL; + } } } } From 3541313e896794514b7d44a5f0aab1e47b340ef7 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Wed, 27 Jun 2007 23:25:19 +0000 Subject: [PATCH 0614/2544] *Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security. --- system/libraries/Router.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/system/libraries/Router.php b/system/libraries/Router.php index 6c3062c0..e2a14800 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -49,6 +49,7 @@ class CI_Router { function CI_Router() { $this->config =& load_class('Config'); + $this->input =& load_class('Input'); $this->_set_route_mapping(); log_message('debug', "Router Class Initialized"); } @@ -482,7 +483,7 @@ function _parse_routes() */ function set_class($class) { - $this->class = $class; + $this->class = $this->input->filename_security($class); } // -------------------------------------------------------------------- @@ -509,7 +510,7 @@ function fetch_class() */ function set_method($method) { - $this->method = $method; + $this->method = $this->input->filename_security($method); } // -------------------------------------------------------------------- @@ -541,7 +542,7 @@ function fetch_method() */ function set_directory($dir) { - $this->directory = $dir.'/'; + $this->directory = $this->input->filename_security($dir).'/'; } // -------------------------------------------------------------------- From 763064b8661f92953497d6ca094d687e9078903f Mon Sep 17 00:00:00 2001 From: paulburdick Date: Wed, 27 Jun 2007 23:25:55 +0000 Subject: [PATCH 0615/2544] *Added filename_security() method to Input library *Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security. --- system/libraries/Input.php | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 9a73ab9b..337eeff3 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -444,6 +444,56 @@ function user_agent() // -------------------------------------------------------------------- + /** + * Filename Security + * + * @access public + * @param string + * @return string + */ + function filename_security($str) + { + $bad = array( + "../", + "./", + "", + "<", + ">", + "'", + '"', + '&', + '$', + '#', + '{', + '}', + '[', + ']', + '=', + ';', + '?', + '/', + "%20", + "%22", + "%3c", // < + "%253c", // < + "%3e", // > + "%0e", // > + "%28", // ( + "%29", // ) + "%2528", // ( + "%26", // & + "%24", // $ + "%3f", // ? + "%3b", // ; + "%3d" // = + ); + + return stripslashes(str_replace($bad, '', $str)); + } + + // -------------------------------------------------------------------- + /** * XSS Clean * From fed96b698011d3d464a4caf9d75b6b1e71d175d1 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Wed, 27 Jun 2007 23:26:35 +0000 Subject: [PATCH 0616/2544] --- user_guide/changelog.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b9cd5939..32afd51a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,6 +66,9 @@

                Version 1.5.4

                Release Date: -- Still under development

                • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
                  • +
                • Added array to string into the profiler
                  • +
                • Added some additional mime types in application/config/mimes.php
                  • +
                • Added filename_security() method to Input library
                • Fixed MSSQL insert_id().
                • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
                • Fixed a bug that was allowing multiple load attempts on extended classes.
                  • @@ -74,16 +77,16 @@

                  Version 1.5.4

                • Fixed a typo in the Calendar library
                • Fixed a typo in rpcs.php library
                • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
                  • -
                • Updated the XSS Filtering to take into account the IE expression() ability
                  • -
                • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
                  • -
                • Added array to string into the profiler
                  • -
                • Added some additional mime types in application/config/mimes.php
                  • -
                • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
                • Fixed a bug in router that was ignoring the scaffolding route for optimization
                • Fixed an IP validation bug.
                  • +
                • Fixed various doc typos.
                  • +
                • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
                  • +
                • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
                  • +
                • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
                  • +
                • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
                  • +
                • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
                • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
                • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.
                  • -
                • Fixed various doc typos.
                From 8b1c3874d61d2c05f6368c9cad82aa533ad42b03 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Wed, 27 Jun 2007 23:30:41 +0000 Subject: [PATCH 0617/2544] Modified the include so that there is a bit of filename security --- system/codeigniter/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 987478f9..8b067ff7 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -132,7 +132,7 @@ // Load the local application controller // Note: The Router class automatically validates the controller path. If this include fails it // means that the default controller in the Routes.php file is not resolving to something valid. -if ( ! include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) +if ( ! include(APPPATH.'controllers/'.$IN->filename_security($RTR->fetch_directory()).$IN->filename_security($RTR->fetch_class()).EXT)) { show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); } From 01f0888f7d574b92104f8aedf77ab5426d753fd3 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Wed, 27 Jun 2007 23:47:39 +0000 Subject: [PATCH 0618/2544] --- system/codeigniter/CodeIgniter.php | 2 +- system/libraries/Input.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 8b067ff7..987478f9 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -132,7 +132,7 @@ // Load the local application controller // Note: The Router class automatically validates the controller path. If this include fails it // means that the default controller in the Routes.php file is not resolving to something valid. -if ( ! include(APPPATH.'controllers/'.$IN->filename_security($RTR->fetch_directory()).$IN->filename_security($RTR->fetch_class()).EXT)) +if ( ! include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) { show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); } diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 337eeff3..33f28868 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -472,7 +472,6 @@ function filename_security($str) '=', ';', '?', - '/', "%20", "%22", "%3c", // < From 691010e72ec7fb4a05740332a10b5f046a82c666 Mon Sep 17 00:00:00 2001 From: paulburdick Date: Thu, 28 Jun 2007 00:02:30 +0000 Subject: [PATCH 0619/2544] Instead of doing file name security for Enable Query Strings, I am using the already existin _filter_uri() --- system/libraries/Router.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/system/libraries/Router.php b/system/libraries/Router.php index e2a14800..6af6ad38 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -49,7 +49,6 @@ class CI_Router { function CI_Router() { $this->config =& load_class('Config'); - $this->input =& load_class('Input'); $this->_set_route_mapping(); log_message('debug', "Router Class Initialized"); } @@ -71,11 +70,11 @@ function _set_route_mapping() // If so, we're done since segment based URIs are not used with query strings. if ($this->config->item('enable_query_strings') === TRUE AND isset($_GET[$this->config->item('controller_trigger')])) { - $this->set_class($_GET[$this->config->item('controller_trigger')]); + $this->set_class(trim($this->_filter_uri($_GET[$this->config->item('controller_trigger')]))); if (isset($_GET[$this->config->item('function_trigger')])) { - $this->set_method($_GET[$this->config->item('function_trigger')]); + $this->set_method(trim($this->_filter_uri($_GET[$this->config->item('function_trigger')]))); } return; @@ -483,7 +482,7 @@ function _parse_routes() */ function set_class($class) { - $this->class = $this->input->filename_security($class); + $this->class = $class; } // -------------------------------------------------------------------- @@ -510,7 +509,7 @@ function fetch_class() */ function set_method($method) { - $this->method = $this->input->filename_security($method); + $this->method = $method; } // -------------------------------------------------------------------- @@ -542,7 +541,7 @@ function fetch_method() */ function set_directory($dir) { - $this->directory = $this->input->filename_security($dir).'/'; + $this->directory = $dir.'/'; } // -------------------------------------------------------------------- From c644128fdd49a47d791240e0e38b54cd22412bc5 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 4 Jul 2007 23:54:32 +0000 Subject: [PATCH 0620/2544] fixed validation errors... about a zillion of em. --- user_guide/changelog.html | 7 +- user_guide/database/active_record.html | 6 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 4 +- user_guide/database/connecting.html | 8 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 8 +- user_guide/database/results.html | 8 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 6 +- user_guide/database/utilities.html | 4 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 8 +- user_guide/general/controllers.html | 15 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 6 +- user_guide/general/credits.html | 3 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 4 +- user_guide/general/index.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 5 +- user_guide/general/models.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 5 +- user_guide/general/requirements.html | 3 +- user_guide/general/routing.html | 4 +- user_guide/general/scaffolding.html | 4 +- user_guide/general/security.html | 2 +- user_guide/general/urls.html | 6 +- user_guide/general/views.html | 62 ++++----- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 4 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/file_helper.html | 4 +- user_guide/helpers/form_helper.html | 14 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/index.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 24 ++-- user_guide/helpers/string_helper.html | 4 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 3 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 3 +- user_guide/installation/upgrade_120.html | 3 +- user_guide/installation/upgrade_130.html | 3 +- user_guide/installation/upgrade_131.html | 3 +- user_guide/installation/upgrade_132.html | 3 +- user_guide/installation/upgrade_133.html | 5 +- user_guide/installation/upgrade_140.html | 3 +- user_guide/installation/upgrade_141.html | 3 +- user_guide/installation/upgrade_150.html | 5 +- user_guide/installation/upgrade_152.html | 5 +- user_guide/installation/upgrade_153.html | 5 +- user_guide/installation/upgrade_b11.html | 3 +- user_guide/installation/upgrading.html | 3 +- user_guide/libraries/benchmark.html | 4 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 10 +- user_guide/libraries/email.html | 6 +- user_guide/libraries/encryption.html | 6 +- user_guide/libraries/file_uploading.html | 57 ++++---- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 6 +- user_guide/libraries/input.html | 6 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 4 +- user_guide/libraries/output.html | 8 +- user_guide/libraries/pagination.html | 4 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 4 +- user_guide/libraries/trackback.html | 4 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 13 +- user_guide/libraries/user_agent.html | 11 +- user_guide/libraries/validation.html | 138 ++++++++++--------- user_guide/libraries/xmlrpc.html | 10 +- user_guide/libraries/zip.html | 4 +- user_guide/license.html | 3 +- user_guide/overview/appflow.html | 3 +- user_guide/overview/at_a_glance.html | 3 +- user_guide/overview/features.html | 3 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 103 files changed, 318 insertions(+), 351 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 32afd51a..c19c3cd6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -242,7 +242,7 @@

                Version 1.4.0

              • Added support for changing the port number in the Postgre driver.
              • Moved the list of "allowed URI characters" out of the Router class and into the config file.
              • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
                • -
              • Updated the Upload class to allow the upload field name to be set when calling do_upload().
                • +
              • Updated the Upload class to allow the upload field name to be set when calling do_upload().
              • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
              • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
              • Updated the form_open() helper to allow the GET method to be used.
                • @@ -288,7 +288,7 @@

                Version 1.3.3

                  -
                • Models do not connect automatically to the database as of this version. More info here. +
                • Models do not connect automatically to the database as of this version. More info here.
                • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
                • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
                • Fixed a bug in the active record "having" function.
                  • @@ -436,8 +436,7 @@

                  Version Beta 1.0

                  Top of Page   ·   User Guide Home   ·   Next Topic:  Credits -

                  - +

                  CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

                diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 5d58f6bd..573c6740 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -369,7 +369,7 @@

                $this->db->orderby();

                $this->db->limit();

                -

                Lets you limit the number of rows you would like returned by the query: +

                Lets you limit the number of rows you would like returned by the query:

                $this->db->limit(10);
                @@ -565,7 +565,7 @@

                $this->db->delete();

                // WHERE id = $id

                The first parameter is the table name, the second is the where clause. You can also use the where() or orwhere() functions instead of passing -the data to the second parameter of the function: +the data to the second parameter of the function:

                $this->db->where('id', $id);
                @@ -603,7 +603,7 @@

                Method Chaining

                Top of Page   ·   User Guide Home   ·   Next Topic:  Transactions -

                +

                CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

                diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index da1e08ed..2e4d16e4 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -217,7 +217,7 @@

                $this->db->cache_delete_all()

                Top of Page   ·   User Guide Home   ·   Next Topic:  Database Utilities Class -

                +

                CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

                diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 1e80ea54..b439d446 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -115,7 +115,7 @@

                $this->db->call_function();

                Top of Page   ·   User Guide Home   ·   Next Topic:  Query Caching -

                +

                CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

                diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index b33f2b70..774790c6 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -66,7 +66,7 @@

                Database Configuration

                CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.). -The config file is located at: +The config file is located at:

                application/config/database.php

                @@ -137,7 +137,7 @@

                Explanation of Values:

                Top of Page   ·   User Guide Home   ·   Next Topic:  Connecting to your Database -

                +

                CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

                diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index aebca25b..e44c145e 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -111,9 +111,9 @@

                Manually Connecting


                $this->load->database($config);                 -

                For information on each of these values please see the configuration page. +

                For information on each of these values please see the configuration page.

                -

                Or you can submit your database values as a Data Source Name. DSNs must have this prototype: +

                Or you can submit your database values as a Data Source Name. DSNs must have this prototype:

                $dsn = 'dbdriver://username:password@hostname/database';

                @@ -122,8 +122,6 @@

                Manually Connecting

                Note that if you use a DSN you will not be able to specify some of the default values like you can if you use a connection array.

                - -

                Connecting to Multiple Databases

                If you need to connect to more than one database simultaneously you can do so as follows:

                @@ -164,7 +162,7 @@

                Connecting to Multiple Databases

                Top of Page   ·   User Guide Home   ·   Next Topic:  Queries -

                +

                CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

              diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 7a8ec92d..0d8faf3c 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -214,7 +214,7 @@

              Active Record Insert

              Top of Page   ·   User Guide Home   ·   Next Topic:  Database Configuration -

              +

              CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 8d9d7b5d..c01caae9 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -165,7 +165,7 @@

        $this->db->field_data()

        Top of Page   ·   User Guide Home   ·   Next Topic:  Custom Function Calls -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 4742569d..e6d0e461 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -148,7 +148,7 @@

        $this->db->update_string();

        Top of Page   ·   User Guide Home   ·   Next Topic:  Active Record Pattern -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 2a57ebc1..c2523329 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -95,7 +95,7 @@

        The Database Class

        Top of Page   ·   User Guide Home   ·   Next Topic:  Quick Start: Usage Examples -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index e55a5328..013d64f3 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -95,15 +95,13 @@

        Escaping Queries

      • $this->db->escape() This function determines the data type so that it can escape only string data. It also automatically adds single quotes around the data so you don't have to: -$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")"; +$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";
      • $this->db->escape_str() This function escapes the data passed to it, regardless of type. Most of the time you'll use the above function rather then this one. Use the function like this: -$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')"; - -
        • +$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')"; @@ -134,7 +132,7 @@

        Query Bindings

        Top of Page   ·   User Guide Home   ·   Next Topic:  Query Results -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 5b25015b..f6c1be12 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -134,7 +134,7 @@

        row()

        }         -

        If you want a specific row returned you can submit the row number as a digit in the first parameter: +

        If you want a specific row returned you can submit the row number as a digit in the first parameter:

        $row = $query->row(5); @@ -157,7 +157,7 @@

        row_array()

         -

        If you want a specific row returned you can submit the row number as a digit in the first parameter: +

        If you want a specific row returned you can submit the row number as a digit in the first parameter:

        $row = $query->row_array(5); @@ -181,7 +181,7 @@

        row_array()

        -
        +

        Result Helper Functions

        @@ -235,7 +235,7 @@

        $query->free_result()

        Top of Page   ·   User Guide Home   ·   Next Topic:  Query Helper Functions -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 6792e356..13b96681 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -110,7 +110,7 @@

        $this->db->table_exists();

        Top of Page   ·   User Guide Home   ·   Next Topic:   Field Metadata -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index ecc5164d..75aa4e88 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -122,7 +122,7 @@

        Managing Errors

        Enabling Transactions

        Transactions are enabled automatically the moment you use $this->db->trans_start(). If you would like to disable transactions you -can do so using $this->db->trans_off(): +can do so using $this->db->trans_off():

        $this->db->trans_off()

        @@ -138,7 +138,7 @@

        Enabling Transactions

        Test Mode

        You can optionally put the transaction system into "test mode", which will cause your queries to be rolled back -- even if the queries produce a valid result. -To use test mode simply set the first parameter in the $this->db->trans_start() function to TRUE: +To use test mode simply set the first parameter in the $this->db->trans_start() function to TRUE:

        $this->db->trans_start(TRUE); // Query will be rolled back
        @@ -190,7 +190,7 @@

        Running Transactions Manually

        Top of Page   ·   User Guide Home   ·   Next Topic:  Table Metadata -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index a7601e85..7de0ea3e 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -205,7 +205,7 @@

        $this->dbutil->csv_from_result($db_result)

        The second and third parameters allows you to -set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example: +set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example:

        $delimiter = ",";
        @@ -330,7 +330,7 @@

        Description of Backup Preferences

        Top of Page   ·   User Guide Home   ·   Next Topic:   Email Class -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 2b088919..7498587c 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -144,7 +144,7 @@

        Alternative Control Structures

        Top of Page   ·   User Guide Home   ·   Next Topic:  Security -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index f6ae7ffa..58f2b06a 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -114,7 +114,7 @@

        get_instance()

        Top of Page   ·   User Guide Home   ·   Next Topic:  Auto-loading Resources -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index f3d474f2..39a0ce65 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -97,7 +97,7 @@

        Auto-loading Resources

        Top of Page   ·   User Guide Home   ·   Next Topic:  Scaffolding -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 8756f7c1..a881f2d4 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -63,11 +63,11 @@

        Web Page Caching

        -

        CodeIgniter lets you cache your pages in order to achieve maximum performance. +

        CodeIgniter lets you cache your pages in order to achieve maximum performance.

        -Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the +

        Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the server resources, memory, and processing cycles utilized, which affect your page load speeds. -By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages. +By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.

        How Does Caching Work?

        @@ -111,7 +111,7 @@

        Deleting Caches

        Top of Page   ·   User Guide Home   ·   Next Topic:  Profiling Your Application -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index c61660d3..5d83edcd 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -121,7 +121,7 @@

        Let's try it:  Hello World!

        If you did it right, you should see Hello World!.

        -

        Note: Class names must start with an uppercase letter. In other words, this is valid: +

        Note: Class names must start with an uppercase letter. In other words, this is valid:

        <?php
        class Blog extends Controller {
        @@ -182,7 +182,7 @@

        Passing URI Segments to your Functions

        If your URI contains more then two segments they will be passed to your function as parameters.

        -

        For example, lets say you have a URI like this: +

        For example, lets say you have a URI like this:

        www.your-site.com/index.php/products/shoes/sandals/123 @@ -258,7 +258,7 @@

        Processing Output

        CodeIgniter has an output class that takes care of sending your final rendered data to the web browser automatically. More information on this can be found in the Views and Output class pages. In some cases, however, you might want to post-process the finalized data in some way and send it to the browser yourself. CodeIgniter permits you to -add a function named _output() to your controller that will receive the finalized output data. +add a function named _output() to your controller that will receive the finalized output data.

        Important:  If your controller contains a function named _output(), it will always be called by the output class instead of echoing the finalized data directly. The first parameter of the function will contain the finalized output.

        @@ -317,12 +317,10 @@

        Organizing Your Controllers into Sub-folders

        application/config/routes.php file

        -

        CodeIgniter also permits you to remap your URIs using its URI Routing feature. +

        CodeIgniter also permits you to remap your URIs using its URI Routing feature.

        - - -

        Class Constructors

        +

        Class Constructors

        If you intend to use a constructor in any of your Controllers, you MUST place the following line of code in it:

        @@ -426,8 +424,7 @@

        That's it!

        Top of Page   ·   User Guide Home   ·   Next Topic:  Views -

        - +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 2b476e58..fa467cb2 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -166,7 +166,7 @@

        Setting Your Own Prefix

        Top of Page   ·   User Guide Home   ·   Next Topic:  Hooks - Extending the Core -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 020f7bed..b3eaf3d7 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -68,7 +68,7 @@

        Creating Libraries

        and the global framework resources.

        As an added bonus, CodeIgniter permits your libraries to extend native classes if you simply need to add some functionality -to an existing library. Or you can even replace native libraries just by placing identically named versions in your application/libraries folder. +to an existing library. Or you can even replace native libraries just by placing identically named versions in your application/libraries folder.

        In summary:

        @@ -266,7 +266,7 @@

        Loading Your Sub-class

        $this->load->library('email');

        Once loaded you will use the class variable as you normally would for the class you are extending. In the case of -the email class all calls will use: +the email class all calls will use:

        $this->email->some_function(); @@ -293,7 +293,7 @@

        Setting Your Own Prefix

        Top of Page   ·   User Guide Home   ·   Next Topic:  Creating Core System Classes -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 9ac1618d..97aef01b 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -87,8 +87,7 @@

        Credits

        Top of Page   ·   User Guide Home   ·   Next Topic:  Downloading CodeIgniter -

        - +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 65000811..d78dd494 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -134,7 +134,7 @@

        log_message('level', 'message')

        Top of Page   ·   User Guide Home   ·   Next Topic:  Page Caching -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 0aba208a..a91c8c21 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -138,7 +138,7 @@

        Now What?

        Top of Page   ·   User Guide Home   ·   Next Topic:  Plugins -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index c864c1ed..0776e32c 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -104,7 +104,7 @@

        Defining a Hook

        Multiple Calls to the Same Hook

        -

        If want to use the same hook point with more then one script, simply make your array declaration multi-dimensional, like this: +

        If want to use the same hook point with more then one script, simply make your array declaration multi-dimensional, like this:

        $hook['pre_controller'][] = array(
        @@ -185,7 +185,7 @@

        Hook Points

        Top of Page   ·   User Guide Home   ·   Next Topic:  Auto-loading Resources -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/index.html b/user_guide/general/index.html index bf9b4ddc..2d5148b3 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -91,7 +91,7 @@

        Getting Started With CodeIgniter

        Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter URLs -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 38c9987b..4efd5eef 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -91,7 +91,7 @@

        Creating Your Own Libraries

        Top of Page   ·   User Guide Home   ·   Next Topic:  Creating Libraries -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 103127fb..836f0c86 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -89,7 +89,7 @@

        Running Multiple Applications with one CodeIgniter Installation

        own sub-folder.

        For example, let's say you want to create two applications, "foo" and "bar". You will structure your -application folder like this: +application folder like this:

        system/application/foo/
        system/application/foo/config/
        @@ -130,8 +130,7 @@

        Running Multiple Applications with one CodeIgniter Installation

        Top of Page   ·   User Guide Home   ·   Next Topic:  Alternative PHP Syntax -

        - +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/models.html b/user_guide/general/models.html index c1832cca..6758ceb8 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -251,7 +251,7 @@

        Connecting to your Database

        Top of Page   ·   User Guide Home   ·   Next Topic:  Helpers -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index ef299aa1..2fde9272 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -124,7 +124,7 @@

        Using a Plugin

        Top of Page   ·   User Guide Home   ·   Next Topic:  Using Libraries -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 71950133..a73f0098 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -111,7 +111,7 @@

        Setting Benchmark Points

        Top of Page   ·   User Guide Home   ·   Next Topic:  Managing Applications -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 963f6b05..9680cbd5 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -62,7 +62,7 @@

        Quick Reference Chart

        -

        For a PDF version of this chart, click here. +

        For a PDF version of this chart, click here.

        @@ -74,8 +74,7 @@

        Quick Reference Chart

        Top of Page   ·   User Guide Home -

        - +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index e92b5196..1aa0d78a 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -79,8 +79,7 @@

        Server Requirements

        Top of Page   ·   User Guide Home   ·   Next Topic:  License Agreement -

        - +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index c4af428a..2cd0d2f4 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -86,7 +86,7 @@

        URI Routing

        Setting your own routing rules

        Routing rules are defined in your application/config/routes.php file. In it you'll see an array called $route that -permits you to specify your own routing criteria. Routes can either be specified using wildcards or Regular Expressions +permits you to specify your own routing criteria. Routes can either be specified using wildcards or Regular Expressions

        Wildcards

        @@ -172,7 +172,7 @@

        Reserved Routes

        Top of Page   ·   User Guide Home   ·   Next Topic:  Error Handling -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index 4f23d3fe..125732e8 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -116,7 +116,7 @@

        Enabling Scaffolding

        Where table_name is the name of the table (table, not database) you wish to work with.

        -

        Once you've initialized scaffolding, you will access it with this URL prototype: +

        Once you've initialized scaffolding, you will access it with this URL prototype:

        www.your-site.com/index.php/class/secret_word/ @@ -145,7 +145,7 @@

        A Final Note:

        Top of Page   ·   User Guide Home   ·   Next Topic:  URI Routing -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/security.html b/user_guide/general/security.html index fdba2dfc..24bfe1c4 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -151,7 +151,7 @@

        Best Practices

        Top of Page   ·   User Guide Home   ·   Next Topic:  Benchmarking Class -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 4df37eeb..21031aff 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -90,7 +90,7 @@

        URI Segments

        Removing the index.php file

        -

        By default, the index.php file will be included in your URLs: +

        By default, the index.php file will be included in your URLs:

        www.your-site.com/index.php/news/article/my_article @@ -108,7 +108,7 @@

        Removing the index.php file

        Adding a URL Suffix

        In your config/config.php file you can specify a suffix that will be added to all URLs generated -by CodeIgniter. For example, if a URL is this: +by CodeIgniter. For example, if a URL is this:

        www.your-site.com/index.php/products/view/shoes @@ -151,7 +151,7 @@

        Enabling Query Strings

        Top of Page   ·   User Guide Home   ·   Next Topic:  Controllers -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 8adfc673..737146db 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -77,14 +77,14 @@

        Creating a View

        Using your text editor, create a file called blogview.php, and put this in it:

        Then save the file in your application/views/ folder.

        @@ -169,14 +169,14 @@

        Adding Dynamic Data to the View

        Then load the page at the URL you've been using and you should see the variables replaced.

        @@ -214,26 +214,26 @@

        Creating Loops

        @@ -249,7 +249,7 @@

        My Todo List

        Top of Page   ·   User Guide Home   ·   Next Topic:  Models -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 893dcaf9..7057c336 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -117,7 +117,7 @@

        random_element()

        Top of Page   ·   User Guide Home   ·   Next Topic:  Cookie Helper -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index bee6f3e0..a81a498d 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -149,7 +149,7 @@

        delete_cookie()

        Top of Page   ·   User Guide Home   ·   Next Topic:  Date Helper -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index b9c48aa5..00f00ad7 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -172,7 +172,7 @@

        unix_to_human()

        This can be useful if you need to display a date in a form field for submission.

        The time can be formatted with or without seconds, and it can be set to European or US format. If only -the timestamp is submitted it will return the time without seconds formatted for the U.S. Examples: +the timestamp is submitted it will return the time without seconds formatted for the U.S. Examples:

        $now = time();

        @@ -363,7 +363,7 @@

        Timezone Reference

        Top of Page   ·   User Guide Home   ·   Next Topic:  Directory Helper -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index d0be8f6f..8f1027a8 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -137,7 +137,7 @@

        directory_map('source directory')

        Top of Page   ·   User Guide Home   ·   Next Topic:  Download Helper -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 3a0e2526..bd5b7483 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -110,7 +110,7 @@

        force_download('filename', 'data')

        Top of Page   ·   User Guide Home   ·   Next Topic:  File Helper -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index bebcc90b..3139569a 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -103,7 +103,7 @@

        write_file('path', $data)

             echo 'File written!';
        }         -

        You can optionally set the write mode via the third parameter: +

        You can optionally set the write mode via the third parameter:

        write_file('./path/to/file.php', $data, 'r+'); @@ -146,7 +146,7 @@

        get_filenames('path/to/directory/')

        Top of Page   ·   User Guide Home   ·   Next Topic:  Form Helper -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index d1eef8d8..572f2a20 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -155,7 +155,7 @@

        form_hidden()

        form_input()

        Lets you generate a standard text input field. You can minimally pass the field name and value in the first -and second parameter: +and second parameter:

        echo form_input('username', 'johndoe'); @@ -176,7 +176,7 @@

        form_input()

        <input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />

        If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the -third parameter: +third parameter:

        $js = 'onClick="some_function()"';

        @@ -203,7 +203,7 @@

        form_dropdown()

        Lets you create a standard drop-down field. The first parameter will contain the name of the field, the second parameter will contain an associative array of options, and the third parameter will contain the -value you wish to be selected. Example: +value you wish to be selected. Example:

        $options = array(
                          'small'  => 'Small Shirt',
        @@ -225,7 +225,7 @@

        form_dropdown()

        If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the -fourth parameter: +fourth parameter:

        $js = 'onChange="some_function()"';

        @@ -234,7 +234,7 @@

        form_dropdown()

        form_checkbox()

        -

        Lets you generate a checkbox field. Simple example: +

        Lets you generate a checkbox field. Simple example:

        echo form_checkbox('newsletter', 'accept', TRUE);
        @@ -261,7 +261,7 @@

        form_checkbox()

        <input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />

        As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the -fourth parameter: +fourth parameter:

        $js = 'onClick="some_function()"';

        @@ -335,7 +335,7 @@

        form_prep()

        Top of Page   ·   User Guide Home   ·   Next Topic:  HTML Helper -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 2b419605..620cb104 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -227,7 +227,7 @@

        br()

        Top of Page   ·   User Guide Home   ·   Next Topic:   Inflector Helper -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index ba067df9..1c8935d2 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -123,7 +123,7 @@

        Now What?

        diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 8c7a26d4..2a4ee559 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -145,7 +145,7 @@

        humanize()

        Top of Page   ·   User Guide Home   ·   Next Topic:  Security Helper -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

        diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 2e603afe..7ba8a83c 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -123,7 +123,7 @@

        encode_php_tags()

        Top of Page   ·   User Guide Home   ·   Next Topic:  Smiley Helper -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index d690749e..1603e165 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -132,25 +132,25 @@

      The Controller

      @@ -200,7 +200,7 @@

      parse_smileys()

      Top of Page   ·   User Guide Home   ·   Next Topic:  String Helper -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index c5be715a..0858b78e 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -95,7 +95,7 @@

      random_string()

      alternator()

      -

      Allows two or more items to be alternated between, when cycling through a loop. Example: +

      Allows two or more items to be alternated between, when cycling through a loop. Example:

      for ($i = 0; $i < 10; $i++)
      {
      @@ -136,7 +136,7 @@

      repeater()

      Top of Page   ·   User Guide Home   ·   Next Topic:  Text Helper -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index e20a07cc..260fad4a 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -189,7 +189,7 @@

      word_wrap()

      Top of Page   ·   User Guide Home   ·   Next Topic:  Typography Helper -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 5bcd2e3f..48cae2d3 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -121,7 +121,7 @@

      nl2br_except_pre()

      Top of Page   ·   User Guide Home   ·   Next Topic:  URL Helper -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 7d54867e..f2dc765b 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -263,7 +263,7 @@

      redirect()

      Top of Page   ·   User Guide Home   ·   Next Topic:  XML Helper -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 35dd8868..5fdd631f 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -102,7 +102,7 @@

      xml_convert('string')

         ·   Top of Page   ·   User Guide Home -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/index.html b/user_guide/index.html index 15ecf1ea..6c61d126 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -97,7 +97,7 @@

      Who is CodeIgniter For?

      diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 58eefac0..83037a94 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -93,8 +93,7 @@

      Subversion Server

      Top of Page   ·   User Guide Home   ·   Next Topic:  Installation Instructions -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index edfa8b53..ba4579b9 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -93,7 +93,7 @@

      Installation Instructions

      Top of Page   ·   User Guide Home   ·   Next Topic:  Upgrading from a Previous Version -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 9813ef2a..cde190b7 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -87,8 +87,7 @@

      Troubleshooting

      Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter at a Glance -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index a3f554c4..04871698 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -89,8 +89,7 @@

      Upgrading From Beta 1.0 to Final 1.2

      Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter at a Glance -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index f08c8a11..db59e714 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -200,8 +200,7 @@

      Step 6: Update your user guide

      Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter at a Glance -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 812f5e41..d8dbcef6 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -99,8 +99,7 @@

      Step 2: Update your user guide

      Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter at a Glance -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 3ae6a83a..1e9aa0a0 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -97,8 +97,7 @@

      Step 2: Update your user guide

      Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter at a Glance -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 3c0cea6d..654b6415 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -91,7 +91,7 @@

      Step 2: Update your Models

      As of version 1.3.3, CodeIgniter does not connect automatically to your database when a model is loaded. This allows you greater flexibility in determining which databases you would like used with your models. If your application is not connecting to your database prior to a model being loaded you will have to update your code. There are several options for connecting, -as described here. +as described here.

      Step 3: Update your user guide

      @@ -109,8 +109,7 @@

      Step 3: Update your user guide

      Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter at a Glance -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 0a515898..ea8f5a03 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -142,8 +142,7 @@

      Step 3: Update your user guide

      Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter at a Glance -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 0324508a..614f7278 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -146,8 +146,7 @@

      Step 4: Update your user guide

      Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter at a Glance -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 13948655..fcfdf4c6 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -71,7 +71,7 @@

      Upgrading from 1.4.1 to 1.5.0

      Step 1: Update your CodeIgniter files

      -

      Replace these files and directories in your "system" folder with the new versions: +

      Replace these files and directories in your "system" folder with the new versions:

      diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 853e5ce3..b65aebe3 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -71,7 +71,7 @@

      Upgrading from 1.5.0 to 1.5.2

      Step 1: Update your CodeIgniter files

      -

      Replace these files and directories in your "system" folder with the new versions: +

      Replace these files and directories in your "system" folder with the new versions:

      diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 2e999579..1e6d1483 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -68,7 +68,7 @@

      Upgrading from 1.5.2 to 1.5.3

      Step 1: Update your CodeIgniter files

      -

      Replace these files and directories in your "system" folder with the new versions: +

      Replace these files and directories in your "system" folder with the new versions:

      diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 793cd2e7..9d2a0c62 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -141,8 +141,7 @@

      Step 5: Edit your config file

      Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter at a Glance -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 2efa1151..ffe9bf89 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -90,8 +90,7 @@

      Upgrading From a Previous Version

      Top of Page   ·   User Guide Home   ·   Next Topic:  Troubleshooting -

      - +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index d92f0730..3568f772 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -88,7 +88,7 @@

      Table of Contents

      Using the Benchmark Class

      -

      The Benchmark class can be used within your controllers, views, or your Models. The process for usage is this: +

      The Benchmark class can be used within your controllers, views, or your Models. The process for usage is this:

      1. Mark a start point
        2. @@ -194,7 +194,7 @@

        Displaying Memory Consumption

        Top of Page   ·   User Guide Home   ·   Next Topic:  Calendaring Class -

        +

        CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index c9779081..01b90fbd 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -246,7 +246,7 @@

      Creating a Calendar Template

      Top of Page   ·   User Guide Home   ·   Next Topic:  Config Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 350831e0..5ab85cc1 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -99,7 +99,7 @@

      Loading a Config File

      If you need to load multiple config files normally they will be merged into one master config array. Name collisions can occur, however, if you have identically named array indexes in different config files. To avoid collisions you can set the second parameter to TRUE -and each config file will be stored in an array index corresponding to the name of the config file. Example: +and each config file will be stored in an array index corresponding to the name of the config file. Example:

      // Stored in an array with this prototype: $this->config['blog_settings'] = $config
      @@ -111,10 +111,8 @@

      Loading a Config File

      $this->config->load('blog_settings', FALSE, TRUE); - - -
    • Auto-loading
      • +
    • Auto-loading

      If you find that you need a particular config file globally, you can have it loaded automatically by the system. To do this, open the autoload.php file, located at application/config/autoload.php, and add your config file as @@ -136,7 +134,7 @@

      Fetching Config Items

      The function returns FALSE (boolean) if the item you are trying to fetch does not exist.

      If you are using the second parameter of the $this->config->load function in order to assign your config items to a specific index -you can retrieve it by specifying the index name in the second parameter of the $this->config->item() function. Example: +you can retrieve it by specifying the index name in the second parameter of the $this->config->item() function. Example:

      // Loads a config file named blog_settings.php and assigns it to an index named "blog_settings"
      @@ -180,7 +178,7 @@

      $this->config->system_url();

      Top of Page   ·   User Guide Home   ·   Next Topic:  Database Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      • diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 190dadbd..cd163c63 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -271,7 +271,7 @@

      Overriding Word Wrapping

      If you have word wrapping enabled (recommended to comply with RFC 822) and you have a very long link in your email it can get wrapped too, causing it to become un-clickable by the person receiving it. CodeIgniter lets you manually override -word wrapping within part of your message like this: +word wrapping within part of your message like this:

      The text of your email that
      gets wrapped normally.
      @@ -281,7 +281,7 @@

      Overriding Word Wrapping

      More text that will be
      wrapped normally.       -

      Place the item you do not want word-wrapped between: {unwrap} {/unwrap} +

      Place the item you do not want word-wrapped between: {unwrap} {/unwrap}

      @@ -295,7 +295,7 @@

      Overriding Word Wrapping

      Top of Page   ·   User Guide Home   ·   Next Topic:  Encryption Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index e3a9762b..c197dc5d 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -140,7 +140,7 @@

      $this->encrypt->decode()

      $this->encrypt->set_cipher();

      -

      Permits you to set an Mcrypt cipher. By default it uses MCRYPT_RIJNDAEL_256. Example: +

      Permits you to set an Mcrypt cipher. By default it uses MCRYPT_RIJNDAEL_256. Example:

      $this->encrypt->set_cipher(MCRYPT_BLOWFISH);

      Please visit php.net for a list of available ciphers.

      @@ -150,7 +150,7 @@

      $this->encrypt->set_cipher();

      $this->encrypt->set_mode();

      -

      Permits you to set an Mcrypt mode. By default it uses MCRYPT_MODE_ECB. Example: +

      Permits you to set an Mcrypt mode. By default it uses MCRYPT_MODE_ECB. Example:

      $this->encrypt->set_mode(MCRYPT_MODE_CFB);

      Please visit php.net for a list of available modes.

      @@ -179,7 +179,7 @@

      $this->encrypt->sha1();

      Top of Page   ·   User Guide Home   ·   Next Topic:  File Uploading Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 21fd2a6b..d9a993a7 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -89,26 +89,27 @@

      Creating the Upload Form

      folder:

      - +</body> +</html>

      You'll notice we are using a form helper to create the opening form tag. File uploads require a multipart form, so the helper creates the proper syntax for you. You'll also notice we have an $error variable. This is so we can show error messages in the event @@ -120,24 +121,24 @@

      The Success Page

      Using a text editor, create a form called upload_success.php. In it, place this code and save it to your applications/views/ folder:

      - +</body> +</html>

      The Controller

      @@ -428,7 +429,7 @@

      Explanation

      Top of Page   ·   User Guide Home   ·   Next Topic:  FTP Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 9db0021a..c9d1888a 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -300,7 +300,7 @@

      $this->ftp->close();

      Top of Page   ·   User Guide Home   ·   Next Topic:  HTML Table Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 04bd46f8..d3fbe27a 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -288,14 +288,14 @@

      Preferences

      X - + x_axis None None Sets the X coordinate in pixels for image cropping. For example, a setting of 30 will crop an image 30 pixels from the left. C - + y_axis None None @@ -661,7 +661,7 @@

      Overlay Preferences

      Top of Page   ·   User Guide Home   ·   Next Topic:  Input Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index f810029a..b6747135 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -108,7 +108,7 @@

      $this->input->xss_clean()

      $data = $this->input->xss_clean($data);

      If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your -application/config/config.php file and setting this: +application/config/config.php file and setting this:

      $config['global_xss_filtering'] = TRUE; @@ -122,7 +122,7 @@

      Using POST, COOKIE, or SERVER Data

      CodeIgniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided functions rather then fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first. -In other words, normally you might do something like this: +In other words, normally you might do something like this:

      if ( ! isset($_POST['something']))
      @@ -211,7 +211,7 @@

      $this->input->user_agent()

      Top of Page   ·   User Guide Home   ·   Next Topic:  Loader Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 71dc0b97..6a74cc96 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -132,7 +132,7 @@

      Fetching a Line of Text

      Top of Page   ·   User Guide Home   ·   Next Topic:  Output Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 98bfd1b0..4b4ec4ce 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -85,7 +85,7 @@

      $this->load->library('class_name')

      Each library is described in detail in its own page, so please read the information regarding each one you would like to use.

      -

      Parameters can be passed to the library via an array in the second parameter. +

      Parameters can be passed to the library via an array in the second parameter.

      $this->load->view('file_name', $data, true/false)

      @@ -164,7 +164,7 @@

      $this->load->config('file_name')

      Top of Page   ·   User Guide Home   ·   Next Topic:  Language Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 40858751..10d59026 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -75,7 +75,7 @@

      Output Class

      $this->output->set_output();

      -

      Permits you to manually set the final output string. Usage example:

      +

      Permits you to manually set the final output string. Usage example:

      $this->output->set_output($data); @@ -85,7 +85,7 @@

      $this->output->set_output();

      $this->output->get_output();

      -

      Permits you to manually retrieve any output that has been sent for storage in the output class. Usage example:

      +

      Permits you to manually retrieve any output that has been sent for storage in the output class. Usage example:

      $string = $this->output->get_output();

      Note that data will only be retrievable from this function if it has been previously sent to the output class by one of the @@ -94,7 +94,7 @@

      $this->output->get_output();

      $this->output->set_header();

      -

      Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:

      +

      Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:

      $this->output->set_header("HTTP/1.0 200 OK");
      @@ -131,7 +131,7 @@

      $this->output->enable_profiler();

      Top of Page   ·   User Guide Home   ·   Next Topic:  Pagination Class -

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index fafeb6cf..edb112d3 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -99,7 +99,7 @@

      Notes:

    • per_page The number of items you intend to show per page. In the above example, you would be showing 20 items per page.
    -

    The create_links() function returns an empty string when there is no pagination to show. +

    The create_links() function returns an empty string when there is no pagination to show.

    Setting preferences in a config file

    @@ -210,7 +210,7 @@

    $config['num_tag_close'] = '</div>';

    Top of Page   ·   User Guide Home   ·   Next Topic:  Session Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 24bb89ff..e7b7add1 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -207,7 +207,7 @@

    Variable Pairs

    Top of Page   ·   User Guide Home   ·   Next Topic:  Unit Testing Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 5a3c4ae2..30e26263 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -286,7 +286,7 @@

    Session Preferences

    Top of Page   ·   User Guide Home   ·   Next Topic:  Trackback Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 28fc76d2..330a3da2 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -119,7 +119,7 @@

    Examples

    echo $this->table->generate();     -

    Here is the same example, except instead of individual parameters, arrays are used: +

    Here is the same example, except instead of individual parameters, arrays are used:

    $this->load->library('table');
    @@ -289,7 +289,7 @@

    $this->table->clear()

    Top of Page   ·   User Guide Home   ·   Next Topic:  Image Manipulation Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index c54417c8..3dfb2037 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -78,7 +78,7 @@

    Initializing the Class

    Sending Trackbacks

    -

    A Trackback can be sent from any of your controller functions using code similar to this example: +

    A Trackback can be sent from any of your controller functions using code similar to this example:

    $this->load->library('trackback');

    @@ -243,7 +243,7 @@

    Notes:

    Top of Page   ·   User Guide Home   ·   Next Topic:  Template Parser Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index bdd64d04..568bf6c6 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -202,7 +202,7 @@

    Creating a Template

    Top of Page   ·   User Guide Home   ·   Next Topic:  URI Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index ec777057..7efca6dd 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -105,7 +105,7 @@

    $this->uri->segment(n)

    $this->uri->rsegment(n)

    This function is identical to the previous one, except that it lets you retrieve a specific segment from your -re-routed URI in the event you are using CodeIgniter's URI Routing feature. +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->slash_segment(n)

    @@ -129,7 +129,7 @@

    $this->uri->slash_segment(n)

    $this->uri->slash_rsegment(n)

    This function is identical to the previous one, except that it lets you add slashes a specific segment from your -re-routed URI in the event you are using CodeIgniter's URI Routing feature. +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    @@ -173,8 +173,7 @@

    $this->uri->uri_to_assoc(n)

    $this->uri->ruri_to_assoc(n)

    This function is identical to the previous one, except that it creates an associative array using the -re-routed URI in the event you are using CodeIgniter's URI Routing feature. - +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->assoc_to_uri()

    @@ -203,7 +202,7 @@

    $this->uri->uri_string()

    $this->uri->ruri_string(n)

    This function is identical to the previous one, except that it returns the -re-routed URI in the event you are using CodeIgniter's URI Routing feature. +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    @@ -215,7 +214,7 @@

    $this->uri->total_segments()

    $this->uri->total_rsegments(n)

    This function is identical to the previous one, except that it returns the total number of segments in your -re-routed URI in the event you are using CodeIgniter's URI Routing feature. +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    @@ -250,7 +249,7 @@

    $this->uri->rsegment_array(n)

    Top of Page   ·   User Guide Home   ·   Next Topic:  User Agent Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index e9f6b715..5bb87a76 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -81,7 +81,7 @@

    User Agent Definitions

    Example

    When the User Agent class is initialized it will attempt to determine whether the user agent browsing your site is -a web browser, a mobile device, or a robot. It will also gather the platform information if it is available. +a web browser, a mobile device, or a robot. It will also gather the platform information if it is available.

    @@ -110,9 +110,6 @@

    Example

     - - -

    Function Reference

    @@ -170,7 +167,7 @@

    $this->agent->accept_lang()

    if ($this->agent->accept_lang('en'))
    {
        echo 'You accept English!';
    -} +}

    Note: This function is not typically very reliable since some browsers do not provide language info, and even among those that do, it is not always accurate.

    @@ -183,7 +180,7 @@

    $this->agent->accept_charset()

    if ($this->agent->accept_charset('utf-8'))
    {
        echo 'You browser supports UTF-8!';
    -} +}

    Note: This function is not typically very reliable since some browsers do not provide character-set info, and even among those that do, it is not always accurate.

    @@ -201,7 +198,7 @@

    $this->agent->accept_charset()

    Top of Page   ·   User Guide Home   ·   Next Topic:  Validation Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 8ba45ba4..cd239ea4 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -77,7 +77,7 @@

    Form Validation

  • Check for required data.
  • Verify that the data is of the correct type, and meets the correct criteria. (For example, if a username is submitted it must be validated to contain only permitted characters. It must be of a minimum length, -and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.) +and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.)
  • Sanitize the data for security.
  • Pre-format the data if needed (Does the data need to be trimmed? HTML encoded? Etc.)
  • Prep the data for insertion in the database.
    • @@ -109,34 +109,35 @@

    The Form

    folder:

    - +</body> +</html> +

    The Success Page

    @@ -146,18 +147,20 @@

    The Success Page

    folder:

    - +</body> +</html> +

    The Controller

    @@ -166,7 +169,7 @@

    The Controller

    folder:

    - +</body> +</html> +

    Now reload your page and submit the form so that it triggers an error. Your form fields should be populated @@ -491,22 +496,22 @@

    Showing Errors Individually

    If you prefer to show an error message next to each form field, rather than as a list, you can change your form so that it looks like this:

    - +<h5>Email Address</h5> +<?=$this->validation->email_error; ?> +<input type="text" name="email" value="<?=$this->validation->email;?>" size="50" /></textarea>

    If there are no errors, nothing will be shown. If there is an error, the message will appear, wrapped in the delimiters you have set (<p> tags by default).

    @@ -589,16 +594,13 @@

    Rule Reference

    Returns FALSE if the form element does not contain a valid email address.   - + valid_ip No Returns FALSE if the supplied IP is not valid.   - - -

    Note: These rules can also be called as discreet functions. For example:

    @@ -714,7 +716,7 @@

    set_radio()

    Top of Page   ·   User Guide Home   ·   Next Topic:  XML-RPC Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 5d9b9ee6..ba70e11a 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -88,11 +88,11 @@

    Initializing the Class

    Like most other classes in CodeIgniter, the XML-RPC and XML-RPCS classes are initialized in your controller using the $this->load->library function:

    -

    To load the XML-RPC class you will use: +

    To load the XML-RPC class you will use:

    $this->load->library('xmlrpc');

    Once loaded, the xml-rpc library object will be available using: $this->xmlrpc

    -

    To load the XML-RPC Server class you will use: +

    To load the XML-RPC Server class you will use:

    $this->load->library('xmlrpc');
    $this->load->library('xmlrpcs'); @@ -193,7 +193,7 @@

    Creating an XML-RPC Server

    $this->xmlrpcs->serve();

    The above example contains an array specifying two method requests that the Server allows. -The allowed methods are on the left side of the array. When either of those are received, they will be mapped to the class and method on the right. +The allowed methods are on the left side of the array. When either of those are received, they will be mapped to the class and method on the right.

    In other words, if an XML-RPC Client sends a request for the new_post method, your server will load the My_blog class and call the new_entry function. @@ -223,7 +223,7 @@

    Processing Server Requests

    The $request variable is an object compiled by the Server, which contains the data sent by the XML-RPC Client. Using this object you will have access to the request parameters enabling you to process the request. When -you are done you will send a Response back to the Client.

    +you are done you will send a Response back to the Client.

    Below is a real-world example, using the Blogger API. One of the methods in the Blogger API is getUserInfo(). Using this method, an XML-RPC Client can send the Server a username and password, in return the Server sends @@ -486,7 +486,7 @@

    Data Types

    Top of Page   ·   User Guide Home   ·   Next Topic:  Zip Encoding Class -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index e1692234..f92443b5 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -165,7 +165,7 @@

    $this->zip->read_file()

    If you would like the Zip archive to maintain the directory structure the file is in, pass TRUE (boolean) in the -second parameter. Example: +second parameter. Example:

    @@ -275,7 +275,7 @@

    $this->zip->clear_data()

    Top of Page   ·   User Guide Home   ·   Next Topic:  Array Helper -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/license.html b/user_guide/license.html index f938c2cf..d89cce5e 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -104,8 +104,7 @@

    Limitations of Liability

    Top of Page   ·   User Guide Home   ·   Next Topic:  Change Log -

    - +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index d10d038a..ac0f0673 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -92,8 +92,7 @@

    Application Flow Chart

    Top of Page   ·   User Guide Home   ·   Next Topic:  Model-View-Controller -

    - +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index aadfe558..2082b025 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -169,8 +169,7 @@

    CodeIgniter has a Friendly Community of Users

    Top of Page   ·   User Guide Home   ·   Next Topic:  CodeIgniter Features -

    - +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 7033681f..93c9e2f9 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -117,8 +117,7 @@

    CodeIgniter Features

    Top of Page   ·   User Guide Home   ·   Next Topic:  Application Flow Chart -

    - +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index fba6f61a..a596cab5 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -95,7 +95,7 @@

    Design and Architectural Goals

    Top of Page   ·   User Guide Home   ·   Next Topic:  Getting Started -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 133503fa..87316a63 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -81,7 +81,7 @@

    CodeIgniter Overview

    diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index baac03da..fe8d8639 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -97,7 +97,7 @@

    Model-View-Controller

    Top of Page   ·   User Guide Home   ·   Next Topic:  Architectural Goals -

    +

    CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/toc.html b/user_guide/toc.html index 12c16183..88ccaafa 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -193,7 +193,7 @@

    Additional Resources

    From e8256b638a10197b3b4e673a4066db8dedef1581 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 8 Jul 2007 17:05:09 +0000 Subject: [PATCH 0621/2544] typo fix --- user_guide/libraries/image_lib.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index d3fbe27a..7c950f36 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -451,7 +451,7 @@

    Watermarking an Image

    $config['wm_type'] = 'text';
    $config['wm_font_path'] = './system/fonts/texb.ttf';
    $config['wm_font_size'] = '16';
    -$config['wm_text_color'] = 'ffffff';
    +$config['wm_font_color'] = 'ffffff';
    $config['wm_vrt_alignment'] = 'bottom';
    $config['wm_hor_alignment'] = 'center';
    $config['wm_padding'] = '20';
    From 8c51560f3bd5b8dbf291825fc8fe2e2b33936bfa Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 8 Jul 2007 17:06:02 +0000 Subject: [PATCH 0622/2544] --- user_guide/changelog.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index c19c3cd6..c8ad1a9b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -80,6 +80,7 @@

    Version 1.5.4

  • Fixed a bug in router that was ignoring the scaffolding route for optimization
  • Fixed an IP validation bug.
  • Fixed various doc typos.
    • +
  • Docs now validate to XHTML 1 transitional
  • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
  • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
  • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • @@ -87,8 +88,6 @@

    Version 1.5.4

  • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
  • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
  • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.
    • - -

    Version 1.5.3

    Release Date: April 15, 2007

    From c39a41f4615378b9b7b112a1b6cd37f358533493 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 11 Jul 2007 17:26:21 +0000 Subject: [PATCH 0623/2544] fixed log message typo --- system/libraries/User_agent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index b93bd340..ea5db4d7 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -71,7 +71,7 @@ function CI_User_agent() } } - log_message('debug', "Table Class Initialized"); + log_message('debug', "User Agent Class Initialized"); } // -------------------------------------------------------------------- From f5a519822db2201b98f822ad4f8659bad2ce9bcd Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 11 Jul 2007 19:35:09 +0000 Subject: [PATCH 0624/2544] inflector helper changes to account for words ending in "s" --- system/helpers/inflector_helper.php | 78 ++++++++++++++---------- user_guide/changelog.html | 3 +- user_guide/helpers/inflector_helper.html | 5 +- 3 files changed, 52 insertions(+), 34 deletions(-) diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php index fbe851f3..28ecf520 100644 --- a/system/helpers/inflector_helper.php +++ b/system/helpers/inflector_helper.php @@ -39,26 +39,31 @@ */ function singular($str) { - $str = strtolower(trim($str)); - $end = substr($str, -3); - - if ($end == 'ies') - { - $str = substr($str, 0, strlen($str)-3).'y'; - } - else - { - $end = substr($str, -1); - - if ($end == 's') - { - $str = substr($str, 0, strlen($str)-1); - } - } - - return $str; + $str = strtolower(trim($str)); + $end = substr($str, -3); + + if ($end == 'ies') + { + $str = substr($str, 0, strlen($str)-3).'y'; + } + elseif ($end == 'ses') + { + $str = substr($str, 0, strlen($str)-2); + } + else + { + $end = substr($str, -1); + + if ($end == 's') + { + $str = substr($str, 0, strlen($str)-1); + } + } + + return $str; } + // -------------------------------------------------------------------- /** @@ -68,25 +73,34 @@ function singular($str) * * @access public * @param string + * @param bool * @return str */ -function plural($str) +function plural($str, $force = FALSE) { - $str = strtolower(trim($str)); - $end = substr($str, -1); - - if ($end == 'y') - { - $str = substr($str, 0, strlen($str)-1).'ies'; - } - elseif ($end != 's') - { - $str .= 's'; - } - - return $str; + $str = strtolower(trim($str)); + $end = substr($str, -1); + + if ($end == 'y') + { + $str = substr($str, 0, strlen($str)-1).'ies'; + } + elseif ($end == 's') + { + if ($force == TRUE) + { + $str .= 'es'; + } + } + else + { + $str .= 's'; + } + + return $str; } + // -------------------------------------------------------------------- /** diff --git a/user_guide/changelog.html b/user_guide/changelog.html index c8ad1a9b..5435864d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,6 +69,7 @@

    Version 1.5.4

  • Added array to string into the profiler
  • Added some additional mime types in application/config/mimes.php
  • Added filename_security() method to Input library
    • +
  • Added some additional arguements to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize()
  • Fixed MSSQL insert_id().
  • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
  • Fixed a bug that was allowing multiple load attempts on extended classes.
    • @@ -80,7 +81,7 @@

    Version 1.5.4

  • Fixed a bug in router that was ignoring the scaffolding route for optimization
  • Fixed an IP validation bug.
  • Fixed various doc typos.
    • -
  • Docs now validate to XHTML 1 transitional
    • +
  • Docs now validate to XHTML 1 transitional
  • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
  • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
  • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 2a4ee559..91de2e20 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -94,8 +94,11 @@

    plural()

     -

    camelize()

    +

    To force a word to end with "es" use a second "true" argument.

    + $word = "pass";
    +echo plural($word); // Returns "passes"     +

    camelize()

    Changes a string of words separated by spaces or underscores to camel case. Example:

    From 4b7d19d373236d84a493b3b99eccf2f1f71f735b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 11 Jul 2007 19:44:50 +0000 Subject: [PATCH 0625/2544] typo Output vs output --- user_guide/general/controllers.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 5d83edcd..157ce403 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -272,10 +272,10 @@

    Processing Output

    }

    Please note that your _output() function will receive the data in its finalized state. Benchmark and memory usage data will be rendered, -cache files written (if you have caching enabled), and headers will be sent (if you use that feature) +cache files written (if you have caching enabled), and headers will be sent (if you use that feature) before it is handed off to the _output() function. If you are using this feature the page execution timer and memory usage stats might not be perfectly accurate since they will not take into acccount any further processing you do. For an alternate way to control output before any of the final processing is done, please see -the available methods in the Output Class.

    +the available methods in the Output Class.

    Private Functions

    From 9687c493de92eb71a91ed89723abd4ede977bb3d Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 11 Jul 2007 21:43:23 +0000 Subject: [PATCH 0626/2544] bugfix for profiler output: POST keys were not being displayed properly, and queries needed htmlspecialchars() --- system/libraries/Profiler.php | 4 ++-- user_guide/changelog.html | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index ffd664a8..6b1d5ea7 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -123,7 +123,7 @@ function _compile_queries() foreach ($this->CI->db->queries as $val) { $output .= '
    '; - $output .= $val; + $output .= htmlspecialchars($val, ENT_QUOTES); $output .= "
    \n"; } } @@ -166,7 +166,7 @@ function _compile_post() } // $output .= "$_POST[".$key."]  ".htmlspecialchars(stripslashes($val))."\n"; - $output .= "".$_POST[$key]." "; + $output .= "$_POST[".$key."]   "; if (is_array($val)) { $output .= "
    " . htmlspecialchars(stripslashes(print_r($val, true))) . "
    "; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5435864d..eb57d487 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,7 +69,7 @@

    Version 1.5.4

  • Added array to string into the profiler
  • Added some additional mime types in application/config/mimes.php
  • Added filename_security() method to Input library
    • -
  • Added some additional arguements to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize()
    • +
  • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize()
  • Fixed MSSQL insert_id().
  • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
  • Fixed a bug that was allowing multiple load attempts on extended classes.
    • @@ -80,6 +80,8 @@

    Version 1.5.4

  • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
  • Fixed a bug in router that was ignoring the scaffolding route for optimization
  • Fixed an IP validation bug.
    • +
  • Fixed a bug in display of POST keys in the Profiler output
    • +
  • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
  • Fixed various doc typos.
  • Docs now validate to XHTML 1 transitional
  • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • From 1f2fd2d5db0ff9e91388cec079a9ff58392ab654 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 11 Jul 2007 21:59:12 +0000 Subject: [PATCH 0627/2544] adding type casting of $title argument in URL helper functions to a string. A numeric 0 sent to these functions would evaluate if ($title == '') as TRUE, and type casting seems the more appropriate fix than simply using $title === '', since we're expecting and treating $title as a string. --- system/helpers/url_helper.php | 8 ++++++++ user_guide/changelog.html | 1 + 2 files changed, 9 insertions(+) diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index c05bc208..01cd3458 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -90,6 +90,8 @@ function index_page() */ function anchor($uri = '', $title = '', $attributes = '') { + $title = (string) $title; + if ( ! is_array($uri)) { $site_url = ( ! preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri; @@ -132,6 +134,8 @@ function anchor($uri = '', $title = '', $attributes = '') */ function anchor_popup($uri = '', $title = '', $attributes = FALSE) { + $title = (string) $title; + $site_url = ( ! preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri; if ($title == '') @@ -170,6 +174,8 @@ function anchor_popup($uri = '', $title = '', $attributes = FALSE) */ function mailto($email, $title = '', $attributes = '') { + $title = (string) $title; + if ($title == "") { $title = $email; @@ -195,6 +201,8 @@ function mailto($email, $title = '', $attributes = '') */ function safe_mailto($email, $title = '', $attributes = '') { + $title = (string) $title; + if ($title == "") { $title = $email; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index eb57d487..67baae43 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -89,6 +89,7 @@

    Version 1.5.4

  • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
  • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
  • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • +
  • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
  • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
  • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.
    • From eea2bdaaffcbee1a9efb56e60ae5712e30873f87 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 11 Jul 2007 22:09:45 +0000 Subject: [PATCH 0628/2544] fixed the plural() and singular() function comments --- system/helpers/inflector_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php index 28ecf520..49143913 100644 --- a/system/helpers/inflector_helper.php +++ b/system/helpers/inflector_helper.php @@ -31,7 +31,7 @@ /** * Singular * - * Takes a singular word and makes it plural + * Takes a plural word and makes it singular * * @access public * @param string @@ -69,7 +69,7 @@ function singular($str) /** * Plural * - * Takes a plural word and makes it singular + * Takes a singular word and makes it plural * * @access public * @param string From c80593c537117b11e2f75287fc9a18e0d0d2bf5a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 11 Jul 2007 23:40:14 +0000 Subject: [PATCH 0629/2544] type cast $key => $val pair in $options array as strings for friendlier handling of setting options as 'selected' --- system/helpers/form_helper.php | 3 +++ user_guide/changelog.html | 1 + 2 files changed, 4 insertions(+) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 531ab66c..263dc0f1 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -229,6 +229,9 @@ function form_dropdown($name = '', $options = array(), $selected = '', $extra = foreach ($options as $key => $val) { + $key = (string) $key; + $val = (string) $val; + $sel = ($selected != $key) ? '' : ' selected="selected"'; $form .= '\n"; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 67baae43..fbcbc544 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -90,6 +90,7 @@

    Version 1.5.4

  • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
  • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
  • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • +
  • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
  • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
  • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.
    • From 55c880f6c22fb31b48108b9dacce598f2ee3dbbf Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 11 Jul 2007 23:50:33 +0000 Subject: [PATCH 0630/2544] typo --- user_guide/libraries/xmlrpc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index ba70e11a..8e7100e2 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -99,7 +99,7 @@

    Initializing the Class

    Once loaded, the xml-rpcs library object will be available using: $this->xmlrpcs

    -

    Note:  When using the XML-RPC Sever class you must load BOTH the XML-RPC class and the XML-RPC Server class.

    +

    Note:  When using the XML-RPC Server class you must load BOTH the XML-RPC class and the XML-RPC Server class.

    From f99f00a5b12f827525f1d280e572515809dc904d Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 12 Jul 2007 00:06:01 +0000 Subject: [PATCH 0631/2544] added a missing option --- user_guide/libraries/image_lib.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 7c950f36..5dd7a3bf 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -233,7 +233,7 @@

    Preferences

    None None Sets the width you would like the image set to. -R +R, C @@ -241,7 +241,7 @@

    Preferences

    None None Sets the height you would like the image set to. -R +R, C From 2d2437edf10edf2669dd85e5943bd4061216eef0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 12 Jul 2007 11:32:37 +0000 Subject: [PATCH 0632/2544] fixed quoted-printable in HTML emails, and added htmlspecialchars() to email debugging output --- system/libraries/Email.php | 104 +++++++++++++++++++++++++++++++++++-- user_guide/changelog.html | 2 + 2 files changed, 102 insertions(+), 4 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 7b7dc091..c7aeb33c 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -45,6 +45,11 @@ class CI_Email { var $validate = FALSE; // true/false. Enables email validation var $priority = "3"; // Default priority (1 - 5) var $newline = "\n"; // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822) + + var $crlf = "\n"; // The RFC 2045 compliant CRLF for quoted-printable is "\r\n". Apparently some servers, + // even on the receiving end think they need to muck with CRLFs, so using "\n", while + // distasteful, is the only thing that seems to work for all environments. + var $bcc_batch_mode = FALSE; // true/false Turns on/off Bcc batch feature var $bcc_batch_size = 200; // If bcc_batch_mode = true, sets max number of Bccs in each batch var $_subject = ""; @@ -924,7 +929,7 @@ function _build_message() break; case 'html' : - + $hdr .= "Content-Type: multipart/alternative; boundary=\"" . $this->_alt_boundary . "\"" . $this->newline; $hdr .= $this->_get_mime_message() . $this->newline . $this->newline; $hdr .= "--" . $this->_alt_boundary . $this->newline; @@ -934,7 +939,9 @@ function _build_message() $hdr .= $this->_get_alt_message() . $this->newline . $this->newline . "--" . $this->_alt_boundary . $this->newline; $hdr .= "Content-Type: text/html; charset=" . $this->charset . $this->newline; - $hdr .= "Content-Transfer-Encoding: quoted/printable"; + $hdr .= "Content-Transfer-Encoding: quoted-printable"; + + $this->_body = $this->_prep_quoted_printable($this->_body); if ($this->_get_protocol() == 'mail') { @@ -985,7 +992,9 @@ function _build_message() $hdr .= $this->_get_alt_message() . $this->newline . $this->newline . "--" . $this->_alt_boundary . $this->newline; $hdr .= "Content-Type: text/html; charset=" . $this->charset . $this->newline; - $hdr .= "Content-Transfer-Encoding: quoted/printable"; + $hdr .= "Content-Transfer-Encoding: quoted-printable"; + + $this->_body = $this->_prep_quoted_printable($this->_body); if ($this->_get_protocol() == 'mail') { @@ -1050,7 +1059,94 @@ function _build_message() } // -------------------------------------------------------------------- + + /** + * Prep Quoted Printable + * + * Prepares string for Quoted-Printable Content-Transfer-Encoding + * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt + * + * @access public + * @param string + * @param integer + * @return string + */ + function _prep_quoted_printable($str, $charlim = '') + { + // Set the character limit + // Don't allow over 76, as that will make servers and MUAs barf + // all over quoted-printable data + if ($charlim == '' OR $charlim > '76') + { + $charlim = '76'; + } + + // Reduce multiple spaces + $str = preg_replace("| +|", " ", $str); + + // Standardize newlines + $str = preg_replace("/\r\n|\r/", "\n", $str); + + // We are intentionally wrapping so mail servers will encode characters + // properly and MUAs will behave, so {unwrap} must go! + $str = str_replace(array('{unwrap}', '{/unwrap}'), '', $str); + + // Break into an array of lines + $lines = preg_split("/\n/", $str); + $escape = '='; + $output = ''; + + foreach ($lines as $line) + { + $length = strlen($line); + $temp = ''; + + // Loop through each character in the line to add soft-wrap + // characters at the end of a line " =\r\n" and add the newly + // processed line(s) to the output (see comment on $crlf class property) + for ($i = 0; $i < $length; $i++) + { + // Grab the next character + $char = substr($line, $i, 1); + $ascii = ord($char); + + // Convert spaces and tabs but only if it's the end of the line + if ($i == ($length - 1)) + { + $char = ($ascii == '32' OR $ascii == '9') ? $escape.sprintf('%02s', dechex($char)) : $char; + } + + // encode = signs + if ($ascii == '61') + { + $char = $escape.strtoupper(sprintf('%02s', dechex($ascii))); // =3D + } + + // If we're at the character limit, add the line to the output, + // reset our temp variable, and keep on chuggin' + if ((strlen($temp) + strlen($char)) >= $charlim) + { + $output .= $temp.$escape.$this->crlf; + $temp = ''; + } + + // Add the character to our temporary line + $temp .= $char; + } + + // Add our completed line to the output + $output .= $temp.$this->crlf; + } + + // get rid of extra CRLF tacked onto the end + $output = substr($output, 0, strlen($this->crlf) * -1); + + return $output; + } + + // -------------------------------------------------------------------- + /** * Send Email * @@ -1583,7 +1679,7 @@ function print_debugger() } } - $msg .= "
    ".$this->_header_str."\n".$this->_subject."\n".$this->_finalbody.'
    '; + $msg .= "
    ".$this->_header_str."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'
    '; return $msg; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index fbcbc544..d8ffd8b1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -82,6 +82,8 @@

    Version 1.5.4

  • Fixed an IP validation bug.
  • Fixed a bug in display of POST keys in the Profiler output
  • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • +
  • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • +
  • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
  • Fixed various doc typos.
  • Docs now validate to XHTML 1 transitional
  • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • From c9e2b10f08a3c718e52e287e2dd14b880e4e3057 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 12 Jul 2007 12:14:45 +0000 Subject: [PATCH 0633/2544] added language files to autoload --- system/application/config/autoload.php | 15 +++++++++++++++ system/libraries/Language.php | 5 ----- system/libraries/Loader.php | 25 ++++++++++++++++++------- user_guide/changelog.html | 15 ++++++++------- user_guide/general/autoloader.html | 1 + user_guide/libraries/language.html | 9 +++------ 6 files changed, 45 insertions(+), 25 deletions(-) diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php index 26e71f74..85b65aa7 100644 --- a/system/application/config/autoload.php +++ b/system/application/config/autoload.php @@ -80,6 +80,21 @@ $autoload['config'] = array(); +/* +| ------------------------------------------------------------------- +| Auto-load Language files +| ------------------------------------------------------------------- +| Prototype: +| +| $autoload['language'] = array('lang1', 'lang2'); +| +| NOTE: Do not include the "_lang" part of your file. For example +| "codeigniter_lang.php" would be referenced as array('codeigniter'); +| +*/ + +$autoload['language'] = array(''); + /* | ------------------------------------------------------------------- | Auto-load Core Libraries diff --git a/system/libraries/Language.php b/system/libraries/Language.php index 26775ec7..94923a3e 100644 --- a/system/libraries/Language.php +++ b/system/libraries/Language.php @@ -89,11 +89,6 @@ function load($langfile = '', $idiom = '', $return = FALSE) return; } - if ($return == TRUE) - { - return $lang; - } - $this->is_loaded[] = $langfile; $this->language = array_merge($this->language, $lang); unset($lang); diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index abe3a1c3..7fa46c3a 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -481,13 +481,24 @@ function script($scripts = array()) * Loads a language file * * @access public + * @param array * @param string + * @param bool * @return void */ - function language($file = '', $lang = '', $return = FALSE) + function language($file = array(), $lang = '') { $CI =& get_instance(); - return $CI->lang->load($file, $lang, $return); + + if ( ! is_array($file)) + { + $file = array($file); + } + + foreach ($file as $langfile) + { + $CI->lang->load($langfile, $lang); + } } // -------------------------------------------------------------------- @@ -813,7 +824,7 @@ function _ci_autoloader() return FALSE; } - // Load any custome config file + // Load any custom config file if (count($autoload['config']) > 0) { $CI =& get_instance(); @@ -823,15 +834,15 @@ function _ci_autoloader() } } - // Load plugins, helpers, and scripts - foreach (array('helper', 'plugin', 'script') as $type) - { + // Autoload plugins, helpers, scripts and languages + foreach (array('helper', 'plugin', 'script', 'language') as $type) + { if (isset($autoload[$type]) AND count($autoload[$type]) > 0) { $this->$type($autoload[$type]); } } - + // A little tweak to remain backward compatible // The $autoload['core'] item was deprecated if ( ! isset($autoload['libraries'])) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d8ffd8b1..0456be34 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -65,11 +65,12 @@

    Change Log

    Version 1.5.4

    Release Date: -- Still under development

      -
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
      • -
    • Added array to string into the profiler
      • -
    • Added some additional mime types in application/config/mimes.php
      • -
    • Added filename_security() method to Input library
      • -
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize()
      • +
    • Added custom Language files to the autoload options.
      • +
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
      • +
    • Added array to string into the profiler.
      • +
    • Added some additional mime types in application/config/mimes.php.
      • +
    • Added filename_security() method to Input library.
      • +
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
      • @@ -80,7 +81,7 @@

      Version 1.5.4

    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
      • -
    • Fixed a bug in display of POST keys in the Profiler output
      • +
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
      • @@ -91,7 +92,7 @@

      Version 1.5.4

    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
      • -
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
      • +
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.
      • diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 39a0ce65..5ee58dac 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -73,6 +73,7 @@

      Auto-loading Resources

    • Helper files found in the "helpers" folder
    • Plugins found in the "plugins" folder
    • Custom config files found in the "config" folder
      • +
    • Language files found in the "system/language" folder

    To autoload resources, open the application/config/autoload.php file and add the item you want diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 6a74cc96..7cc74b61 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -115,12 +115,9 @@

    Fetching a Line of Text

    Where language_key is the array key corresponding to the line you wish to show.

    Note: This function simply returns the line. It does not echo it for you.

    - - - - - - +

    Auto-loading Languages

    +

    If you find that you need a particular language globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. This is done by opening the application/config/autoload.php file and adding the language(s) to the autoload array.

    +

     

    From 7dcd7a3aa4b145fc8a040c16e7c4de9ea35fd5cf Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 12 Jul 2007 12:36:50 +0000 Subject: [PATCH 0634/2544] csv_from_result() move robust against data with "," in it. --- system/database/DB_utility.php | 54 ++++++++++++++++++++++------------ user_guide/changelog.html | 1 + 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index d48425d7..8ce19b17 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -236,35 +236,51 @@ function drop_table($table_name) * @param string The newline character - \n by default * @return string */ - function csv_from_result($query, $delim = "\t", $newline = "\n") + function csv_from_result($query, $delim = ',', $newline = '', $enclosure = '"') { - if ( ! is_object($query) OR ! method_exists($query, 'field_names')) - { - show_error('You must submit a valid result object'); - } + if (!is_a($query, 'CI_DB_result')) { + show_error('CI_DB_utility::csv_from_result - You must submit a valid result object'); + } + + if ($delim === '') { + show_error('CI_DB_utility::csv_from_result - Empty delimiters are not permitted'); + } + + if ($newline === '') { + $newline = (stripos(getenv('HTTP_USER_AGENT'), 'win') !== false) ? "\r\n" : "\n"; + } + if ((strpos($enclosure, $newline) !== false) or (($enclosure !== '') and (strpos($newline, $enclosure) !== false))) { + show_error('CI_DB_utility::csv_from_result - Field enclosure must not be contained within delimiter (or vice versa)'); + } + $out = ''; // First generate the headings from the table column names - foreach ($query->list_fields() as $name) - { - $out .= $name.$delim; + foreach ($query->list_fields() as $name) { + // there's no point enclosing strings that do not require it + if (strpos($name, $delim) !== false) { + $out .= $enclosure . $name . $enclosure . $delim; + } else { + $out .= $name . $delim; + } } - $out = rtrim($out); - $out .= $newline; - + $out = rtrim($out, $delim) . $newline; + // Next blast through the result array and build out the rows - foreach ($query->result_array() as $row) - { - foreach ($row as $item) - { - $out .= $item.$delim; + foreach ($query->result_array() as $row) { + foreach ($row as $item) { + // there's no point enclosing strings that do not require it + if (strpos($item, $delim) !== false) { + $out .= $enclosure . $item . $enclosure . $delim; + } else { + $out .= $item . $delim; + } } - $out = rtrim($out); - $out .= $newline; + $out = rtrim($out, $delim) . $newline; } - + return $out; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 0456be34..e598e7c6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,6 +71,7 @@

    Version 1.5.4

  • Added some additional mime types in application/config/mimes.php.
  • Added filename_security() method to Input library.
  • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • +
  • Fiixed a bug in csv_from_result() function that resulted in inproper output.
  • Fixed MSSQL insert_id().
  • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
  • Fixed a bug that was allowing multiple load attempts on extended classes.
    • From 0851530669824b8d5375dc24d5579b9cc5d746ef Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 12 Jul 2007 12:49:54 +0000 Subject: [PATCH 0635/2544] added reduce_double_slashes() and trim_slashes() to docs --- user_guide/helpers/string_helper.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 0858b78e..df7e02ff 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -121,10 +121,15 @@

    repeater()

    echo repeater($string, 30);

    The above would generate 30 newlines.

    - - - - +

    reduce_double_slashes()

    +

    onverts double slashes in a string to a single slash, except those found in http://. Example:

    +$string = "http://www.some-site.com//index.php";
    +echo reduce_double_slashes($string); // results in "http://www.some-site.com/index.php"     +

    trim_slashes()

    +

    Removes any leading/traling slashes from a string. Example:
    +
    + $string = "/this/that/theother/";
    +echo trim_slashes($string); // results in this/that/theother

    From 178b0a68edd3bcd66ae8ba81a149848f0c196a87 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 12 Jul 2007 12:51:48 +0000 Subject: [PATCH 0636/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index e598e7c6..04328f69 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -87,6 +87,7 @@

    Version 1.5.4

  • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
  • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
  • Fixed various doc typos.
    • +
  • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
  • Docs now validate to XHTML 1 transitional
  • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
  • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • From 48bb32aece18e9dce381602e242609adfc71b0d0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 12 Jul 2007 13:10:42 +0000 Subject: [PATCH 0637/2544] further xss_clean() enhancements --- system/libraries/Input.php | 97 ++++++++++++++++++++++++++------------ 1 file changed, 67 insertions(+), 30 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 33f28868..fcca722b 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -538,15 +538,15 @@ function xss_clean($str, $charset = 'ISO-8859-1') * the conversion of entities to ASCII later. * */ - $str = preg_replace('#(&\#*\w+)[\x00-\x20]+;#u',"\\1;",$str); + $str = preg_replace('#(&\#?[0-9a-z]+)[\x00-\x20]*;?#i', "\\1;", $str); /* - * Validate UTF16 two byte encoding (x00) + * Validate UTF16 two byte encoding (x00) * * Just as above, adds a semicolon if missing. * */ - $str = preg_replace('#(&\#x*)([0-9A-F]+);*#iu',"\\1\\2;",$str); + $str = preg_replace('#(&\#x?)([0-9A-F]+);?#i',"\\1\\2;",$str); /* * URL Decode @@ -580,37 +580,50 @@ function xss_clean($str, $charset = 'ISO-8859-1') $str); } } - + + /* + * Convert all tabs to spaces + * + * This prevents strings like this: ja vascript + * NOTE: we deal with spaces between characters later. + * NOTE: preg_replace was found to be amazingly slow here on large blocks of data, + * so we use str_replace. + * + */ + + $str = str_replace("\t", " ", $str); + /* * Not Allowed Under Any Conditions */ $bad = array( 'document.cookie' => '[removed]', + 'document.write' => '[removed]', '.parentNode' => '[removed]', '.innerHTML' => '[removed]', - 'document.write' => '[removed]', 'window.location' => '[removed]', + '-moz-binding' => '[removed]', + '' => '-->', + ' '<![CDATA[' + ); + + foreach ($bad as $key => $val) + { + $str = str_replace($key, $val, $str); + } + + $bad = array( "javascript\s*:" => '[removed]', "expression\s*\(" => '[removed]', // CSS and IE - "Redirect\s+302" => '[removed]', - '' => '-->' + "Redirect\s+302" => '[removed]' ); - + foreach ($bad as $key => $val) { $str = preg_replace("#".$key."#i", $val, $str); } - /* - * Convert all tabs to spaces - * - * This prevents strings like this: ja vascript - * Note: we deal with spaces between characters later. - * - */ - $str = preg_replace("#\t+#", " ", $str); - /* * Makes PHP tags safe * @@ -621,7 +634,7 @@ function xss_clean($str, $charset = 'ISO-8859-1') * But it doesn't seem to pose a problem. * */ - $str = str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); + $str = str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); /* * Compact any exploded words @@ -650,10 +663,24 @@ function xss_clean($str, $charset = 'ISO-8859-1') do { $original = $str; - - $str = preg_replace_callback("##si", array($this, '_js_link_removal'), $str); - $str = preg_replace_callback("##si", array($this, '_js_img_removal'), $str); - $str = preg_replace("##si", "", $str); + + if ((version_compare(PHP_VERSION, '5.0', '>=') === TRUE && stripos($str, '') !== FALSE) OR + preg_match("/<\/a>/i", $str)) + { + $str = preg_replace_callback("##si", array($this, '_js_link_removal'), $str); + } + + if ((version_compare(PHP_VERSION, '5.0', '>=') === TRUE && stripos($str, '#si", array($this, '_js_img_removal'), $str); + } + + if ((version_compare(PHP_VERSION, '5.0', '>=') === TRUE && (stripos($str, 'script') !== FALSE OR stripos($str, 'xss') !== FALSE)) OR + preg_match("/(script|xss)/i", $str)) + { + $str = preg_replace("##si", "", $str); + } } while($original != $str); @@ -706,20 +733,30 @@ function xss_clean($str, $charset = 'ISO-8859-1') */ $bad = array( 'document.cookie' => '[removed]', + 'document.write' => '[removed]', '.parentNode' => '[removed]', '.innerHTML' => '[removed]', - 'document.write' => '[removed]', 'window.location' => '[removed]', + '-moz-binding' => '[removed]', + '' => '-->', + ' '<![CDATA[' + ); + + foreach ($bad as $key => $val) + { + $str = str_replace($key, $val, $str); + } + + $bad = array( "javascript\s*:" => '[removed]', "expression\s*\(" => '[removed]', // CSS and IE - "Redirect\s+302" => '[removed]', - '' => '-->' + "Redirect\s+302" => '[removed]' ); - + foreach ($bad as $key => $val) { - $str = preg_replace("#".$key."#i", $val, $str); + $str = preg_replace("#".$key."#i", $val, $str); } @@ -764,7 +801,7 @@ function _js_img_removal($match) } // -------------------------------------------------------------------- - + /** * HTML Entities Decode * From e5808cf64d1177127cc9f26e6f681b412a192339 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 12 Jul 2007 13:36:56 +0000 Subject: [PATCH 0638/2544] removed $return argument from load() --- system/libraries/Language.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/libraries/Language.php b/system/libraries/Language.php index 94923a3e..bcf84cf6 100644 --- a/system/libraries/Language.php +++ b/system/libraries/Language.php @@ -49,7 +49,7 @@ function CI_Language() * @param string the language (english, etc.) * @return void */ - function load($langfile = '', $idiom = '', $return = FALSE) + function load($langfile = '', $idiom = '') { $langfile = str_replace(EXT, '', str_replace('_lang.', '', $langfile)).'_lang'.EXT; @@ -82,7 +82,6 @@ function load($langfile = '', $idiom = '', $return = FALSE) } } - if ( ! isset($lang)) { log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile); From 3f2fc0d5a9aa13209dd4ec1175a4ee2bc4172408 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 12 Jul 2007 13:38:18 +0000 Subject: [PATCH 0639/2544] removed empty string element from default $autoload['language'] array --- system/application/config/autoload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php index 85b65aa7..90ff6fed 100644 --- a/system/application/config/autoload.php +++ b/system/application/config/autoload.php @@ -93,7 +93,7 @@ | */ -$autoload['language'] = array(''); +$autoload['language'] = array(); /* | ------------------------------------------------------------------- From aa8dc3c191318f261bc43a99e01540231b15e11b Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 12 Jul 2007 13:45:36 +0000 Subject: [PATCH 0640/2544] spelling corrections --- user_guide/helpers/string_helper.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index df7e02ff..9c3adf9a 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -122,11 +122,11 @@

    repeater()

    The above would generate 30 newlines.

    reduce_double_slashes()

    -

    onverts double slashes in a string to a single slash, except those found in http://. Example:

    +

    Converts double slashes in a string to a single slash, except those found in http://. Example:

    $string = "http://www.some-site.com//index.php";
    echo reduce_double_slashes($string); // results in "http://www.some-site.com/index.php"

    trim_slashes()

    -

    Removes any leading/traling slashes from a string. Example:
    +

    Removes any leading/trailing slashes from a string. Example:

    $string = "/this/that/theother/";
    echo trim_slashes($string); // results in this/that/theother

    From 4cf29dd28c1b2d54f9b76d77b6a75afbb8b27854 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 12 Jul 2007 13:47:28 +0000 Subject: [PATCH 0641/2544] added link to autoloader docs --- user_guide/libraries/language.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 7cc74b61..af56a018 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -116,7 +116,7 @@

    Fetching a Line of Text

    Note: This function simply returns the line. It does not echo it for you.

    Auto-loading Languages

    -

    If you find that you need a particular language globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. This is done by opening the application/config/autoload.php file and adding the language(s) to the autoload array.

    +

    If you find that you need a particular language globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. This is done by opening the application/config/autoload.php file and adding the language(s) to the autoload array.

     

    From f9a4e9e04589df8dcf808519c95703f16c318384 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 12 Jul 2007 13:56:21 +0000 Subject: [PATCH 0642/2544] fixed undefined function in insert_id() of PostgreSQL driver --- system/database/drivers/postgre/postgre_driver.php | 2 +- user_guide/changelog.html | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index bfb212cf..79890512 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -230,7 +230,7 @@ function affected_rows() */ function insert_id() { - $v = version($this->conn_id); + $v = $this->_version(); $v = $v['server']; $table = func_num_args() > 0 ? func_get_arg(0) : null; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 04328f69..1d0f3b6b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -83,13 +83,14 @@

    Version 1.5.4

  • Fixed a bug in router that was ignoring the scaffolding route for optimization
  • Fixed an IP validation bug.
  • Fixed a bug in display of POST keys in the Profiler output
    • -
  • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • +
  • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
  • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
  • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • +
  • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • +
  • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
  • Fixed various doc typos.
  • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
  • Docs now validate to XHTML 1 transitional
    • -
  • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
  • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
  • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
  • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • From 476b87150809861e6963eb26be083086f8ea0464 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 12 Jul 2007 18:22:05 +0000 Subject: [PATCH 0643/2544] csv_from_result buggy. revert to old function until rewrite --- system/database/DB_utility.php | 924 ++++++++++++++++----------------- user_guide/changelog.html | 1 - 2 files changed, 454 insertions(+), 471 deletions(-) diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index 8ce19b17..9533ec60 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -1,471 +1,455 @@ -db - $CI =& get_instance(); - $this->db =& $CI->db; - - log_message('debug', "Database Utility Class Initialized"); - } - - // -------------------------------------------------------------------- - - /** - * Create database - * - * @access public - * @param string the database name - * @return bool - */ - function create_database($db_name) - { - $sql = $this->_create_database($db_name); - - if (is_bool($sql)) - { - return $sql; - } - - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access public - * @param string the database name - * @return bool - */ - function drop_database($db_name) - { - $sql = $this->_drop_database($db_name); - - if (is_bool($sql)) - { - return $sql; - } - - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * List databases - * - * @access public - * @return bool - */ - function list_databases() - { - // Is there a cached result? - if (isset($this->data_cache['db_names'])) - { - return $this->data_cache['db_names']; - } - - $query = $this->db->query($this->_list_databases()); - $dbs = array(); - if ($query->num_rows() > 0) - { - foreach ($query->result_array() as $row) - { - $dbs[] = current($row); - } - } - - $this->data_cache['db_names'] = $dbs; - return $this->data_cache['db_names']; - } - - // -------------------------------------------------------------------- - - /** - * Optimize Table - * - * @access public - * @param string the table name - * @return bool - */ - function optimize_table($table_name) - { - $sql = $this->_optimize_table($table_name); - - if (is_bool($sql)) - { - return $sql; - } - - $query = $this->db->query($sql); - $res = $query->result_array(); - - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - return current($res); - } - - // -------------------------------------------------------------------- - - /** - * Optimize Database - * - * @access public - * @return array - */ - function optimize_database() - { - $result = array(); - foreach ($this->db->list_tables() as $table_name) - { - $sql = $this->_optimize_table($table_name); - - if (is_bool($sql)) - { - return $sql; - } - - $query = $this->db->query($sql); - - // Build the result array... - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - $res = $query->result_array(); - $res = current($res); - $key = str_replace($this->db->database.'.', '', current($res)); - $keys = array_keys($res); - unset($res[$keys[0]]); - - $result[$key] = $res; - } - - return $result; - } - - // -------------------------------------------------------------------- - - /** - * Optimize Table - * - * @access public - * @param string the table name - * @return bool - */ - - function repair_table($table_name) - { - $sql = $this->_repair_table($table_name); - - if (is_bool($sql)) - { - return $sql; - } - - $query = $this->db->query($sql); - - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - $res = $query->result_array(); - return current($res); - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * @access public - * @param string the table name - * @return bool - */ - function drop_table($table_name) - { - $sql = $this->_drop_table($table_name); - - if (is_bool($sql)) - { - return $sql; - } - - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Generate CSV from a query result object - * - * @access public - * @param object The query result object - * @param string The delimiter - tab by default - * @param string The newline character - \n by default - * @return string - */ - function csv_from_result($query, $delim = ',', $newline = '', $enclosure = '"') - { - if (!is_a($query, 'CI_DB_result')) { - show_error('CI_DB_utility::csv_from_result - You must submit a valid result object'); - } - - if ($delim === '') { - show_error('CI_DB_utility::csv_from_result - Empty delimiters are not permitted'); - } - - if ($newline === '') { - $newline = (stripos(getenv('HTTP_USER_AGENT'), 'win') !== false) ? "\r\n" : "\n"; - } - - if ((strpos($enclosure, $newline) !== false) or (($enclosure !== '') and (strpos($newline, $enclosure) !== false))) { - show_error('CI_DB_utility::csv_from_result - Field enclosure must not be contained within delimiter (or vice versa)'); - } - - $out = ''; - - // First generate the headings from the table column names - foreach ($query->list_fields() as $name) { - // there's no point enclosing strings that do not require it - if (strpos($name, $delim) !== false) { - $out .= $enclosure . $name . $enclosure . $delim; - } else { - $out .= $name . $delim; - } - } - - $out = rtrim($out, $delim) . $newline; - - // Next blast through the result array and build out the rows - foreach ($query->result_array() as $row) { - foreach ($row as $item) { - // there's no point enclosing strings that do not require it - if (strpos($item, $delim) !== false) { - $out .= $enclosure . $item . $enclosure . $delim; - } else { - $out .= $item . $delim; - } - } - $out = rtrim($out, $delim) . $newline; - } - - return $out; - } - - // -------------------------------------------------------------------- - - /** - * Generate XML data from a query result object - * - * @access public - * @param object The query result object - * @param array Any preferences - * @return string - */ - function xml_from_result($query, $params = array()) - { - if ( ! is_object($query) OR ! method_exists($query, 'field_names')) - { - show_error('You must submit a valid result object'); - } - - // Set our default values - foreach (array('root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t") as $key => $val) - { - if ( ! isset($params[$key])) - { - $params[$key] = $val; - } - } - - // Create variables for convenience - extract($params); - - // Load the xml helper - $CI =& get_instance(); - $CI->load->helper('xml'); - - // Generate the result - $xml = "<{$root}>".$newline; - foreach ($query->result_array() as $row) - { - $xml .= $tab."<{$element}>".$newline; - - foreach ($row as $key => $val) - { - $xml .= $tab.$tab."<{$key}>".xml_convert($val)."".$newline; - } - $xml .= $tab."".$newline; - } - $xml .= "".$newline; - - return $xml; - } - - // -------------------------------------------------------------------- - - /** - * Database Backup - * - * @access public - * @return void - */ - function backup($params = array()) - { - // If the parameters have not been submitted as an - // array then we know that it is simply the table - // name, which is a valid short cut. - if (is_string($params)) - { - $params = array('tables' => $params); - } - - // ------------------------------------------------------ - - // Set up our default preferences - $prefs = array( - 'tables' => array(), - 'ignore' => array(), - 'filename' => '', - 'format' => 'gzip', // gzip, zip, txt - 'add_drop' => TRUE, - 'add_insert' => TRUE, - 'newline' => "\n" - ); - - // Did the user submit any preferences? If so set them.... - if (count($params) > 0) - { - foreach ($prefs as $key => $val) - { - if (isset($params[$key])) - { - $prefs[$key] = $params[$key]; - } - } - } - - // ------------------------------------------------------ - - // Are we backing up a complete database or individual tables? - // If no table names were submitted we'll fetch the entire table list - if (count($prefs['tables']) == 0) - { - $prefs['tables'] = $this->db->list_tables(); - } - - // ------------------------------------------------------ - - // Validate the format - if ( ! in_array($prefs['format'], array('gzip', 'zip', 'txt'), TRUE)) - { - $prefs['format'] = 'txt'; - } - - // ------------------------------------------------------ - - // Is the encoder supported? If not, we'll either issue an - // error or use plain text depending on the debug settings - if (($prefs['format'] == 'gzip' AND ! @function_exists('gzencode')) - OR ($prefs['format'] == 'zip' AND ! @function_exists('gzcompress'))) - { - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_compression'); - } - - $prefs['format'] = 'txt'; - } - - // ------------------------------------------------------ - - // Set the filename if not provided - Only needed with Zip files - if ($prefs['filename'] == '' AND $prefs['format'] == 'zip') - { - $prefs['filename'] = (count($prefs['tables']) == 1) ? $prefs['tables'] : $this->db->database; - $prefs['filename'] .= '_'.date('Y-m-d_H-i', time()); - } - - // ------------------------------------------------------ - - // Was a Gzip file requested? - if ($prefs['format'] == 'gzip') - { - return gzencode($this->_backup($prefs)); - } - - // ------------------------------------------------------ - - // Was a text file requested? - if ($prefs['format'] == 'txt') - { - return $this->_backup($prefs); - } - - // ------------------------------------------------------ - - // Was a Zip file requested? - if ($prefs['format'] == 'zip') - { - // If they included the .zip file extension we'll remove it - if (preg_match("|.+?\.zip$|", $prefs['filename'])) - { - $prefs['filename'] = str_replace('.zip', '', $prefs['filename']); - } - - // Tack on the ".sql" file extension if needed - if ( ! preg_match("|.+?\.sql$|", $prefs['filename'])) - { - $prefs['filename'] .= '.sql'; - } - - // Load the Zip class and output it - - $CI =& get_instance(); - $CI->load->library('zip'); - $CI->zip->add_data($prefs['filename'], $this->_backup($prefs)); - return $CI->zip->get_zip(); - } - - } - - - - - - -} - +db + $CI =& get_instance(); + $this->db =& $CI->db; + + log_message('debug', "Database Utility Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * Create database + * + * @access public + * @param string the database name + * @return bool + */ + function create_database($db_name) + { + $sql = $this->_create_database($db_name); + + if (is_bool($sql)) + { + return $sql; + } + + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access public + * @param string the database name + * @return bool + */ + function drop_database($db_name) + { + $sql = $this->_drop_database($db_name); + + if (is_bool($sql)) + { + return $sql; + } + + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * List databases + * + * @access public + * @return bool + */ + function list_databases() + { + // Is there a cached result? + if (isset($this->data_cache['db_names'])) + { + return $this->data_cache['db_names']; + } + + $query = $this->db->query($this->_list_databases()); + $dbs = array(); + if ($query->num_rows() > 0) + { + foreach ($query->result_array() as $row) + { + $dbs[] = current($row); + } + } + + $this->data_cache['db_names'] = $dbs; + return $this->data_cache['db_names']; + } + + // -------------------------------------------------------------------- + + /** + * Optimize Table + * + * @access public + * @param string the table name + * @return bool + */ + function optimize_table($table_name) + { + $sql = $this->_optimize_table($table_name); + + if (is_bool($sql)) + { + return $sql; + } + + $query = $this->db->query($sql); + $res = $query->result_array(); + + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + return current($res); + } + + // -------------------------------------------------------------------- + + /** + * Optimize Database + * + * @access public + * @return array + */ + function optimize_database() + { + $result = array(); + foreach ($this->db->list_tables() as $table_name) + { + $sql = $this->_optimize_table($table_name); + + if (is_bool($sql)) + { + return $sql; + } + + $query = $this->db->query($sql); + + // Build the result array... + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + $res = $query->result_array(); + $res = current($res); + $key = str_replace($this->db->database.'.', '', current($res)); + $keys = array_keys($res); + unset($res[$keys[0]]); + + $result[$key] = $res; + } + + return $result; + } + + // -------------------------------------------------------------------- + + /** + * Optimize Table + * + * @access public + * @param string the table name + * @return bool + */ + + function repair_table($table_name) + { + $sql = $this->_repair_table($table_name); + + if (is_bool($sql)) + { + return $sql; + } + + $query = $this->db->query($sql); + + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + $res = $query->result_array(); + return current($res); + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * @access public + * @param string the table name + * @return bool + */ + function drop_table($table_name) + { + $sql = $this->_drop_table($table_name); + + if (is_bool($sql)) + { + return $sql; + } + + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Generate CSV from a query result object + * + * @access public + * @param object The query result object + * @param string The delimiter - tab by default + * @param string The newline character - \n by default + * @return string + */ + function csv_from_result($query, $delim = "\t", $newline = "\n") + { + if ( ! is_object($query) OR ! method_exists($query, 'field_names')) + { + show_error('You must submit a valid result object'); + } + + $out = ''; + + // First generate the headings from the table column names + foreach ($query->list_fields() as $name) + { + $out .= $name.$delim; + } + + $out = rtrim($out); + $out .= $newline; + + // Next blast through the result array and build out the rows + foreach ($query->result_array() as $row) + { + foreach ($row as $item) + { + $out .= $item.$delim; + } + $out = rtrim($out); + $out .= $newline; + } + + return $out; + } + + // -------------------------------------------------------------------- + + /** + * Generate XML data from a query result object + * + * @access public + * @param object The query result object + * @param array Any preferences + * @return string + */ + function xml_from_result($query, $params = array()) + { + if ( ! is_object($query) OR ! method_exists($query, 'field_names')) + { + show_error('You must submit a valid result object'); + } + + // Set our default values + foreach (array('root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t") as $key => $val) + { + if ( ! isset($params[$key])) + { + $params[$key] = $val; + } + } + + // Create variables for convenience + extract($params); + + // Load the xml helper + $CI =& get_instance(); + $CI->load->helper('xml'); + + // Generate the result + $xml = "<{$root}>".$newline; + foreach ($query->result_array() as $row) + { + $xml .= $tab."<{$element}>".$newline; + + foreach ($row as $key => $val) + { + $xml .= $tab.$tab."<{$key}>".xml_convert($val)."".$newline; + } + $xml .= $tab."".$newline; + } + $xml .= "".$newline; + + return $xml; + } + + // -------------------------------------------------------------------- + + /** + * Database Backup + * + * @access public + * @return void + */ + function backup($params = array()) + { + // If the parameters have not been submitted as an + // array then we know that it is simply the table + // name, which is a valid short cut. + if (is_string($params)) + { + $params = array('tables' => $params); + } + + // ------------------------------------------------------ + + // Set up our default preferences + $prefs = array( + 'tables' => array(), + 'ignore' => array(), + 'filename' => '', + 'format' => 'gzip', // gzip, zip, txt + 'add_drop' => TRUE, + 'add_insert' => TRUE, + 'newline' => "\n" + ); + + // Did the user submit any preferences? If so set them.... + if (count($params) > 0) + { + foreach ($prefs as $key => $val) + { + if (isset($params[$key])) + { + $prefs[$key] = $params[$key]; + } + } + } + + // ------------------------------------------------------ + + // Are we backing up a complete database or individual tables? + // If no table names were submitted we'll fetch the entire table list + if (count($prefs['tables']) == 0) + { + $prefs['tables'] = $this->db->list_tables(); + } + + // ------------------------------------------------------ + + // Validate the format + if ( ! in_array($prefs['format'], array('gzip', 'zip', 'txt'), TRUE)) + { + $prefs['format'] = 'txt'; + } + + // ------------------------------------------------------ + + // Is the encoder supported? If not, we'll either issue an + // error or use plain text depending on the debug settings + if (($prefs['format'] == 'gzip' AND ! @function_exists('gzencode')) + OR ($prefs['format'] == 'zip' AND ! @function_exists('gzcompress'))) + { + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_compression'); + } + + $prefs['format'] = 'txt'; + } + + // ------------------------------------------------------ + + // Set the filename if not provided - Only needed with Zip files + if ($prefs['filename'] == '' AND $prefs['format'] == 'zip') + { + $prefs['filename'] = (count($prefs['tables']) == 1) ? $prefs['tables'] : $this->db->database; + $prefs['filename'] .= '_'.date('Y-m-d_H-i', time()); + } + + // ------------------------------------------------------ + + // Was a Gzip file requested? + if ($prefs['format'] == 'gzip') + { + return gzencode($this->_backup($prefs)); + } + + // ------------------------------------------------------ + + // Was a text file requested? + if ($prefs['format'] == 'txt') + { + return $this->_backup($prefs); + } + + // ------------------------------------------------------ + + // Was a Zip file requested? + if ($prefs['format'] == 'zip') + { + // If they included the .zip file extension we'll remove it + if (preg_match("|.+?\.zip$|", $prefs['filename'])) + { + $prefs['filename'] = str_replace('.zip', '', $prefs['filename']); + } + + // Tack on the ".sql" file extension if needed + if ( ! preg_match("|.+?\.sql$|", $prefs['filename'])) + { + $prefs['filename'] .= '.sql'; + } + + // Load the Zip class and output it + + $CI =& get_instance(); + $CI->load->library('zip'); + $CI->zip->add_data($prefs['filename'], $this->_backup($prefs)); + return $CI->zip->get_zip(); + } + + } + + + + + + +} + ?> \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 1d0f3b6b..468f42c0 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,7 +71,6 @@

    Version 1.5.4

  • Added some additional mime types in application/config/mimes.php.
  • Added filename_security() method to Input library.
  • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • -
  • Fiixed a bug in csv_from_result() function that resulted in inproper output.
  • Fixed MSSQL insert_id().
  • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
  • Fixed a bug that was allowing multiple load attempts on extended classes.
    • From 33d1056c454eeb5e4484ff4454f78da9dc2a3ec5 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 12 Jul 2007 18:44:13 +0000 Subject: [PATCH 0644/2544] sacked duplicate and incorrect version of _version()! --- system/database/drivers/mssql/mssql_driver.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index aef8da92..e4a2960e 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -69,19 +69,6 @@ function db_select() // -------------------------------------------------------------------- - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT version() AS ver"; - } - - // -------------------------------------------------------------------- - /** * Execute the query * From 303c9cb958a52ef2d13e985da397cb49590113b0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 12 Jul 2007 19:12:37 +0000 Subject: [PATCH 0645/2544] added attribute and html entity decode callbacks to xss_clean() --- system/libraries/Input.php | 80 ++++++++++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 11 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index fcca722b..ba94d854 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -519,7 +519,7 @@ function filename_security($str) * @param string * @return string */ - function xss_clean($str, $charset = 'ISO-8859-1') + function xss_clean($str) { /* * Remove Null Characters @@ -564,23 +564,46 @@ function xss_clean($str, $charset = 'ISO-8859-1') $str = str_replace('9u3iovBnRThju941s89rKozm', "%20", $str); /* - * Convert character entities to ASCII + * Convert character entities to ASCII * * This permits our tests below to work reliably. * We only convert entities that are within tags since * these are the ones that will pose security problems. * */ - if (preg_match_all("/<(.+?)>/si", $str, $matches)) - { - for ($i = 0; $i < count($matches['0']); $i++) + + $str = preg_replace_callback("/[a-z]+=([\'\"]).*?\\1/si", array($this, '_attribute_conversion'), $str); + + $str = preg_replace_callback("/<([\w]+)[^>]*>/si", array($this, '_html_entity_decode_callback'), $str); + + /* + + Old Code that when modified to use preg_replace()'s above became more efficient memory-wise + + if (preg_match_all("/[a-z]+=([\'\"]).*?\\1/si", $str, $matches)) + { + for ($i = 0; $i < count($matches[0]); $i++) + { + if (stristr($matches[0][$i], '>')) + { + $str = str_replace( $matches['0'][$i], + str_replace('>', '<', $matches[0][$i]), + $str); + } + } + } + + if (preg_match_all("/<([\w]+)[^>]*>/si", $str, $matches)) + { + for ($i = 0; $i < count($matches[0]); $i++) { - $str = str_replace($matches['1'][$i], - $this->_html_entity_decode($matches['1'][$i], $charset), + $str = str_replace($matches[0][$i], + $this->_html_entity_decode($matches[0][$i], $charset), $str); } } - + */ + /* * Convert all tabs to spaces * @@ -801,7 +824,42 @@ function _js_img_removal($match) } // -------------------------------------------------------------------- - + + /** + * Attribute Conversion + * + * Used as a callback for XSS Clean + * + * @access public + * @param array + * @return string + */ + function _attribute_conversion($match) + { + return str_replace('>', '<', $match[0]); + } + + // -------------------------------------------------------------------- + + /** + * HTML Entity Decode Callback + * + * Used as a callback for XSS Clean + * + * @access public + * @param array + * @return string + */ + function _html_entity_decode_callback($match) + { + $CI =& get_instance(); + $charset = $CI->config->item('charset'); + + return $this->_html_entity_decode($match[0], strtoupper($charset)); + } + + // -------------------------------------------------------------------- + /** * HTML Entities Decode * @@ -826,10 +884,10 @@ function _js_img_removal($match) character set, and the PHP developers said they were not back porting the fix to versions other than PHP 5.x. */ - function _html_entity_decode($str, $charset='ISO-8859-1') + function _html_entity_decode($str, $charset='UTF-8') { if (stristr($str, '&') === FALSE) return $str; - + // The reason we are not using html_entity_decode() by itself is because // while it is not technically correct to leave out the semicolon // at the end of an entity most browsers will still interpret the entity From b940ebc2d8f7b830c877777a14259da4927ce3fe Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 12 Jul 2007 19:15:09 +0000 Subject: [PATCH 0646/2544] added $config['charset'] --- system/application/config/config.php | 10 ++++++++++ user_guide/changelog.html | 1 + 2 files changed, 11 insertions(+) diff --git a/system/application/config/config.php b/system/application/config/config.php index 941d9c30..f0ba241f 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -68,6 +68,16 @@ */ $config['language'] = "english"; +/* +|-------------------------------------------------------------------------- +| Default Character Set +|-------------------------------------------------------------------------- +| +| This determines which character set is used by default in various methods +| that require a character set to be provided. +| +*/ +$config['charset'] = "UTF-8"; /* |-------------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 468f42c0..8113f378 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,6 +71,7 @@

    Version 1.5.4

  • Added some additional mime types in application/config/mimes.php.
  • Added filename_security() method to Input library.
  • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • +
  • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
  • Fixed MSSQL insert_id().
  • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
  • Fixed a bug that was allowing multiple load attempts on extended classes.
    • From 60ca9b7c03d576eb8b83759ca04eaf21e25e1d9c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 12 Jul 2007 19:53:27 +0000 Subject: [PATCH 0647/2544] moved version number up in docs and CI_VERSION --- system/codeigniter/CodeIgniter.php | 2 +- user_guide/changelog.html | 4 ++-- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/index.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/index.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_153.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 104 files changed, 105 insertions(+), 105 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 987478f9..1cd66a18 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -28,7 +28,7 @@ */ // CI Version -define('CI_VERSION', '1.5.3'); +define('CI_VERSION', '1.5.4'); /* * ------------------------------------------------------ diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8113f378..bea7e5dc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -33,7 +33,7 @@
    - +

    CodeIgniter User Guide Version 1.5.3

    CodeIgniter User Guide Version 1.5.4
    @@ -63,7 +63,7 @@

    Change Log

    Version 1.5.4

    -

    Release Date: -- Still under development

    +

    Release Date: -- July 12

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
      • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 573c6740..59a80050 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 2e4d16e4..fa67a52f 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index b439d446..1e891d1e 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 774790c6..c97e93fd 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index e44c145e..0586c5d3 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 0d8faf3c..31893e4e 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index c01caae9..3b4978db 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index e6d0e461..e9bc4a2e 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/index.html b/user_guide/database/index.html index c2523329..39bd6055 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 013d64f3..6c94f4c7 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/results.html b/user_guide/database/results.html index f6c1be12..fedbc112 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 13b96681..e848372d 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 75aa4e88..cf41f95b 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 7de0ea3e..801dc2db 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 7498587c..579ae4cc 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 58f2b06a..e13f0216 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 5ee58dac..4c910a86 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index a881f2d4..c8e5f589 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 157ce403..9e2ec0ab 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index fa467cb2..20641cf8 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index b3eaf3d7..b2c66321 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 97aef01b..87f058ac 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index d78dd494..9e78bfdd 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index a91c8c21..50bd34c6 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 0776e32c..daf99e87 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/index.html b/user_guide/general/index.html index 2d5148b3..525db5bd 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 4efd5eef..5f59e730 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 836f0c86..80567a1b 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 6758ceb8..901862ab 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 2fde9272..51b5192f 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index a73f0098..5e874f4d 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 9680cbd5..a1e2b513 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 1aa0d78a..a7181997 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 2cd0d2f4..0ae2e4ce 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index 125732e8..c9325b91 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 24bfe1c4..942fb73f 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 21031aff..4bacfa4d 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 737146db..03fc7a45 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 7057c336..adf532e9 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index a81a498d..0f5411a7 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 00f00ad7..7850fafb 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 8f1027a8..3f89fd39 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index bd5b7483..e19ad1a2 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 3139569a..f3654ed6 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 572f2a20..599d86c2 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 620cb104..e7affb0e 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index 1c8935d2..5814e62e 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 91de2e20..0888299c 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 7ba8a83c..08264919 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 1603e165..528c91c2 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 9c3adf9a..1fb5514c 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 260fad4a..190352d2 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 48cae2d3..388e4cea 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index f2dc765b..7606c7a9 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 5fdd631f..78fa2bcd 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/index.html b/user_guide/index.html index 6c61d126..ab1f85f6 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 83037a94..4c55adeb 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index ba4579b9..4d543333 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index cde190b7..d7858aff 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 04871698..e0f7e07b 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index db59e714..906154ae 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index d8dbcef6..de9d3427 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 1e9aa0a0..e07b06f6 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 654b6415..86074f05 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index ea8f5a03..eead224b 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 614f7278..d8b95a0b 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index fcfdf4c6..7d469274 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index b65aebe3..9aa58326 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 1e6d1483..0bc3a00e 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 9d2a0c62..4ba53c34 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index ffe9bf89..b8008d0f 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 3568f772..6365c1cf 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 01b90fbd..275d7509 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 5ab85cc1..e0ba05f0 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index cd163c63..9583de2f 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index c197dc5d..0504ac8c 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index d9a993a7..2c0e4ec6 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index c9d1888a..5520b512 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 5dd7a3bf..4a0e5d07 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index b6747135..480cb6b5 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index af56a018..99b5078b 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 4b4ec4ce..28f9564a 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 10d59026..634ae85f 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index edb112d3..e7ca83e9 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index e7b7add1..7715fe38 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 30e26263..8349bd45 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 330a3da2..e6b6b994 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 3dfb2037..799c5668 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 568bf6c6..3ead5663 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 7efca6dd..bc831a21 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 5bb87a76..8c770885 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index cd239ea4..f5ef9cef 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 8e7100e2..5d54ecae 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index f92443b5..8b7e6aa8 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/license.html b/user_guide/license.html index d89cce5e..0b777dda 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index ac0f0673..b2327f95 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 2082b025..04763629 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 93c9e2f9..8ee7895d 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index a596cab5..8b564640 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 87316a63..03b6ed0c 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index fe8d8639..fe960f6e 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -33,7 +33,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      diff --git a/user_guide/toc.html b/user_guide/toc.html index 88ccaafa..b3b1b27d 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -34,7 +34,7 @@
      - +

      CodeIgniter User Guide Version 1.5.3

      CodeIgniter User Guide Version 1.5.4
      From 593712b25007d78c87a76221ffa186b72dd52095 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 12 Jul 2007 20:01:19 +0000 Subject: [PATCH 0648/2544] added a comment re: autoloading languages --- system/application/config/autoload.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php index 90ff6fed..8bb4181b 100644 --- a/system/application/config/autoload.php +++ b/system/application/config/autoload.php @@ -22,6 +22,7 @@ | 2. Helper files | 3. Plugins | 4. Custom config files +| 5. Language files | */ From 5ec4c15b47756f9291dcb67913bf0776b95e6f2e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 12 Jul 2007 20:14:36 +0000 Subject: [PATCH 0649/2544] added update instructions --- user_guide/installation/upgrade_154.html | 121 +++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 user_guide/installation/upgrade_154.html diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html new file mode 100644 index 00000000..5028ad61 --- /dev/null +++ b/user_guide/installation/upgrade_154.html @@ -0,0 +1,121 @@ + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + +

      CodeIgniter User Guide Version 1.5.4

      +
      + + + + + + + + + +
      + + +
      + + + +
      + +

      Upgrading from 1.5.3 to 1.5.4

      + +

      Before performing an update you should take your site offline by replacing the index.php file with a static one.

      + + + +

      Step 1: Update your CodeIgniter files

      + +

      Replace these files and directories in your "system" folder with the new versions:

      + +
        + +
      • system/application/config/mimes.php
        • +
      • system/codeigniter
        • +
      • system/database
        • +
      • system/helpers
        • +
      • system/libraries
        • +
      • system/plugins
        • +
      + +

      Note: If you have any custom developed files in these folders please make copies of them first.

      + +

      Step 2: Add charset to your config.php

      +

      Add the following to system/application/config/config.php

      +/*
      + |--------------------------------------------------------------------------
      + | Default Character Set
      + |--------------------------------------------------------------------------
      + |
      + | This determines which character set is used by default in various methods
      + | that require a character set to be provided.
      + |
      + */
      + $config['charset'] = "UTF-8";       + +

      Step 3: Autoloading language files

      +

      If you want to autoload any language files, add this line to system/application/config/autoload.php

      +$autoload['language'] = array(); + +

      Step 4: Update your user guide

      +

      Please also replace your local copy of the user guide with the new version.

      + +
      + + + + + + + \ No newline at end of file From 3a31d6ca5bd2cfd4fc86b3d2fefe43f20f39a315 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 12 Jul 2007 22:39:15 +0000 Subject: [PATCH 0650/2544] --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index bea7e5dc..b34c4a80 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -63,7 +63,7 @@

      Change Log

      Version 1.5.4

      -

      Release Date: -- July 12

      +

      Release Date: July 12, 2007

      • Added custom Language files to the autoload options.
      • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
        • From 90fc544b30d3d9ecb3e8106af20cd79ced924d61 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 12 Jul 2007 22:57:44 +0000 Subject: [PATCH 0651/2544] --- user_guide/installation/upgrading.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index b8008d0f..182953cc 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -65,6 +65,7 @@

        Upgrading From a Previous Version

        Please read the upgrade notes corresponding to the version you are upgrading from.

          +
        • Upgrading from 1.5.3 to 1.5.4
        • Upgrading from 1.5.2 to 1.5.3
        • Upgrading from 1.5.0 or 1.5.1 to 1.5.2
        • Upgrading from 1.4.1 to 1.5.0
          • From 01864da61dce14397571a0e80774824f346c19fd Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 12 Jul 2007 22:58:12 +0000 Subject: [PATCH 0652/2544] --- user_guide/installation/downloads.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 4c55adeb..983bf982 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -63,7 +63,8 @@

          Downloading CodeIgniter

            -
          • CodeIgniter V 1.5.3 (Current version)
            • +
          • CodeIgniter V 1.5.4 (Current version)
            • +
          • CodeIgniter V 1.5.3
          • CodeIgniter V 1.5.2
          • CodeIgniter V 1.5.1
          • CodeIgniter V 1.4.1
            • From 6afaff2233a39736ff79a24dc3ce9d0972e11e52 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 12 Jul 2007 23:07:48 +0000 Subject: [PATCH 0653/2544] --- user_guide/libraries/zip.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 8b7e6aa8..f3ce2006 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -184,7 +184,7 @@

            $this->zip->read_dir()

            Permits you to compress a folder (and its contents) that already exists somewhere on your server. Supply a file path to the directory and the zip class will recursively read it and recreate it as a Zip archive. All files contained within the -supplied path will be encodes, as will any sub-folders contained within it. Example:

            +supplied path will be encoded, as will any sub-folders contained within it. Example:

            $path = '/path/to/your/directory/';

            From 9a6e40fc2b34a03d9727012e7ec69a5f12242e6f Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 14 Jul 2007 13:46:59 +0000 Subject: [PATCH 0654/2544] corrected version numbers --- user_guide/installation/upgrade_141.html | 3 +-- user_guide/installation/upgrade_153.html | 3 +-- user_guide/installation/upgrade_154.html | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index d8b95a0b..29103e4a 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -47,8 +47,7 @@ CodeIgniter Home  ›  User Guide Home  ›  -Upgrading from 1.3.3 to 1.4.0 - +Upgrading from 1.4.0 to 1.4.1
            Search User Guide   
            diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 0bc3a00e..5bc3fd29 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -46,8 +46,7 @@ CodeIgniter Home  ›  -User Guide Home  ›  -Upgrading from 1.5.0 to 1.5.2 +User Guide Home  › Upgrading from 1.5.2 to 1.5.3
            Search User Guide   
            diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 5028ad61..3d8d1ba0 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -47,7 +47,7 @@ CodeIgniter Home  ›  User Guide Home  ›  -Upgrading from 1.5.0 to 1.5.2 +Upgrading from 1.5.3 to 1.5.4
            Search User Guide   
            From 060052de1f91b9b1fc533d0957eb18dab9057bfe Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 14 Jul 2007 14:26:13 +0000 Subject: [PATCH 0655/2544] Fixed a bug in database driver where num_rows property wasn't getting updated --- system/database/DB_driver.php | 3 ++- user_guide/changelog.html | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 8f238fc5..381b70f4 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -325,7 +325,8 @@ function query($sql, $binds = FALSE, $return_object = TRUE) $RES = new $driver(); $RES->conn_id = $this->conn_id; $RES->result_id = $this->result_id; - + $RES->num_rows = $RES->num_rows(); + if ($this->dbdriver == 'oci8') { $RES->stmt_id = $this->stmt_id; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b34c4a80..3e9db57c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -62,11 +62,17 @@

            Change Log

            +

            Version 1.5.5

            +

            Release Date: -- still in development

            +
              +
            • Fixed a bug in database driver where num_rows property wasn't getting updated
              • +

            Version 1.5.4

            Release Date: July 12, 2007

            +
            • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
            • Added array to string into the profiler.
            • Added some additional mime types in application/config/mimes.php.
            • Added filename_security() method to Input library.
              • From 88c6bba4e6f5184a8a7349728b8250b8030d0706 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 15 Jul 2007 15:06:08 +0000 Subject: [PATCH 0656/2544] changed ImageColorAllocate to imagecolorallocate --- system/plugins/captcha_pi.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/plugins/captcha_pi.php b/system/plugins/captcha_pi.php index e16a214b..7d1694f2 100644 --- a/system/plugins/captcha_pi.php +++ b/system/plugins/captcha_pi.php @@ -250,9 +250,9 @@ function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = // Assign colors // ----------------------------------- - $bg_color = ImageColorAllocate($im, 255, 255, 255); - $border_color = ImageColorAllocate($im, 153, 102, 102); - $text_color = ImageColorAllocate($im, 204, 153, 153); + $bg_color = imagecolorallocate ($im, 255, 255, 255); + $border_color = imagecolorallocate ($im, 153, 102, 102); + $text_color = imagecolorallocate ($im, 204, 153, 153); $grid_color = imagecolorallocate($im, 255, 182, 182); $shadow_color = imagecolorallocate($im, 255, 240, 240); From ce5055fd782dcc79c2aff2e0bfa016f41909506e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 15 Jul 2007 15:08:22 +0000 Subject: [PATCH 0657/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3e9db57c..6f21a27b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,6 +66,7 @@

              Version 1.5.5

              Release Date: -- still in development

              • Fixed a bug in database driver where num_rows property wasn't getting updated
                • +
              • Fixed a bug in captcha calling an invalid PHP function

              Version 1.5.4

              Release Date: July 12, 2007

              From 669f999dcd1002c941066c83f89d856bcf057f2b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 15 Jul 2007 15:21:36 +0000 Subject: [PATCH 0658/2544] Fixed a typo ("cal_mayl") in English calendar language file --- system/language/english/calendar_lang.php | 97 ++++++++++++----------- user_guide/changelog.html | 3 +- 2 files changed, 51 insertions(+), 49 deletions(-) diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php index 02475e1f..f044606b 100644 --- a/system/language/english/calendar_lang.php +++ b/system/language/english/calendar_lang.php @@ -1,49 +1,50 @@ - \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 6f21a27b..915ce262 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,7 +66,8 @@

              Version 1.5.5

              Release Date: -- still in development

              • Fixed a bug in database driver where num_rows property wasn't getting updated
                • -
              • Fixed a bug in captcha calling an invalid PHP function
                • +
              • Fixed a bug in captcha calling an invalid PHP function
                • +
              • Fixed a typo ("cal_mayl") in English calendar language file

              Version 1.5.4

              Release Date: July 12, 2007

              From 5f41eddda985b85763c0b275a411b2503ca51496 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 15 Jul 2007 17:45:36 +0000 Subject: [PATCH 0659/2544] revert calendar change... I'm an idiot --- system/language/english/calendar_lang.php | 3 +-- user_guide/changelog.html | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php index f044606b..9ee4a5e6 100644 --- a/system/language/english/calendar_lang.php +++ b/system/language/english/calendar_lang.php @@ -37,8 +37,7 @@ $lang['cal_february'] = "February"; $lang['cal_march'] = "March"; $lang['cal_april'] = "April"; -$lang['cal_mayl'] = "May"; // typo, left in for backwards compatibility -$lang['cal_may'] = "May"; // fix typo +$lang['cal_mayl'] = "May"; $lang['cal_june'] = "June"; $lang['cal_july'] = "July"; $lang['cal_august'] = "August"; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 915ce262..0206bc50 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -67,7 +67,6 @@

              Version 1.5.5

              • Fixed a bug in database driver where num_rows property wasn't getting updated
              • Fixed a bug in captcha calling an invalid PHP function
                • -
              • Fixed a typo ("cal_mayl") in English calendar language file

              Version 1.5.4

              Release Date: July 12, 2007

              From 79ecefd0ec2cc7e2bcf35fad4f80e22d9ac70e16 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 15 Jul 2007 22:49:07 +0000 Subject: [PATCH 0660/2544] fix for scaffolding --- system/libraries/Language.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/system/libraries/Language.php b/system/libraries/Language.php index bcf84cf6..26775ec7 100644 --- a/system/libraries/Language.php +++ b/system/libraries/Language.php @@ -49,7 +49,7 @@ function CI_Language() * @param string the language (english, etc.) * @return void */ - function load($langfile = '', $idiom = '') + function load($langfile = '', $idiom = '', $return = FALSE) { $langfile = str_replace(EXT, '', str_replace('_lang.', '', $langfile)).'_lang'.EXT; @@ -82,12 +82,18 @@ function load($langfile = '', $idiom = '') } } + if ( ! isset($lang)) { log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile); return; } + if ($return == TRUE) + { + return $lang; + } + $this->is_loaded[] = $langfile; $this->language = array_merge($this->language, $lang); unset($lang); From 873c722774f8cc43c737b5ee0befd8e6a0796bc8 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 15 Jul 2007 23:03:05 +0000 Subject: [PATCH 0661/2544] further scaffolding language fixes --- system/libraries/Loader.php | 13 +++++++++++++ system/scaffolding/Scaffolding.php | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 7fa46c3a..ee99696a 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -500,6 +500,19 @@ function language($file = array(), $lang = '') $CI->lang->load($langfile, $lang); } } + + /** + * Loads a language file + * + * @access public + * @param string + * @return void + */ + function scaffold_language($file = '', $lang = '', $return = FALSE) + { + $CI =& get_instance(); + return $CI->lang->load($file, $lang, $return); + } // -------------------------------------------------------------------- diff --git a/system/scaffolding/Scaffolding.php b/system/scaffolding/Scaffolding.php index fe2744e7..6f4babd9 100644 --- a/system/scaffolding/Scaffolding.php +++ b/system/scaffolding/Scaffolding.php @@ -73,7 +73,7 @@ function Scaffolding($db_table) $this->CI->load->vars($data); // Load the language file and create variables - $this->lang = $this->CI->load->language('scaffolding', '', TRUE); + $this->lang = $this->CI->load->scaffold_language('scaffolding', '', TRUE); $this->CI->load->vars($this->lang); // Load the helper files we plan to use From 5808a11cedc9bc825450dc3d652e0a4a45b02b4f Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 15 Jul 2007 23:19:08 +0000 Subject: [PATCH 0662/2544] comment clean up --- system/libraries/Loader.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index ee99696a..2e762e9f 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -483,7 +483,6 @@ function script($scripts = array()) * @access public * @param array * @param string - * @param bool * @return void */ function language($file = array(), $lang = '') @@ -502,11 +501,11 @@ function language($file = array(), $lang = '') } /** - * Loads a language file + * Loads language files for scaffolding * * @access public * @param string - * @return void + * @return arra */ function scaffold_language($file = '', $lang = '', $return = FALSE) { From 329c17081025c11432dac0c9be6296c1c3808817 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 16 Jul 2007 00:02:28 +0000 Subject: [PATCH 0663/2544] --- user_guide/changelog.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 0206bc50..c3bc9aed 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -72,8 +72,7 @@

              Version 1.5.4

              Release Date: July 12, 2007

              -
              • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
                • +
              • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
              • Added array to string into the profiler.
              • Added some additional mime types in application/config/mimes.php.
              • Added filename_security() method to Input library.
                • From 9e91094b9eaa9155781b6c87f69aa8d1efb7fe7d Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 16 Jul 2007 00:02:38 +0000 Subject: [PATCH 0664/2544] --- user_guide/changelog.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index c3bc9aed..1864c798 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -68,6 +68,11 @@

                Version 1.5.5

              • Fixed a bug in database driver where num_rows property wasn't getting updated
              • Fixed a bug in captcha calling an invalid PHP function
              + + + + +

              Version 1.5.4

              Release Date: July 12, 2007

                From 6159d1dd0945490d1425ae3269dc3172680a3c91 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 16 Jul 2007 13:04:46 +0000 Subject: [PATCH 0665/2544] Switched from CI super object to $CFG to fetch charset --- system/libraries/Input.php | 4 ++-- user_guide/changelog.html | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index ba94d854..b41dcfb2 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -852,8 +852,8 @@ function _attribute_conversion($match) */ function _html_entity_decode_callback($match) { - $CI =& get_instance(); - $charset = $CI->config->item('charset'); + global $CFG; + $charset = $CFG->item('charset'); return $this->_html_entity_decode($match[0], strtoupper($charset)); } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 1864c798..568448fc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -67,6 +67,7 @@

                Version 1.5.5

                • Fixed a bug in database driver where num_rows property wasn't getting updated
                • Fixed a bug in captcha calling an invalid PHP function
                  • +
                • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
                From 409904637cd661be6ceccb59af1046468da09802 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 17 Jul 2007 21:40:44 +0000 Subject: [PATCH 0666/2544] --- system/database/DB_driver.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 381b70f4..ee965b74 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -44,6 +44,7 @@ class CI_DB_driver { var $benchmark = 0; var $query_count = 0; var $bind_marker = '?'; + var $save_queries = TRUE; var $queries = array(); var $data_cache = array(); var $trans_enabled = TRUE; @@ -264,7 +265,10 @@ function query($sql, $binds = FALSE, $return_object = TRUE) } // Save the query for debugging - $this->queries[] = $sql; + if ($this->save_queries == TRUE) + { + $this->queries[] = $sql; + } // Start the Query Timer $time_start = list($sm, $ss) = explode(' ', microtime()); From ce542a298ebfc8088024cfc32bbf971286c59cd2 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 17 Jul 2007 21:42:05 +0000 Subject: [PATCH 0667/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 568448fc..729b3572 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -65,6 +65,7 @@

                Change Log

                Version 1.5.5

                Release Date: -- still in development

                  +
                • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
                • Fixed a bug in database driver where num_rows property wasn't getting updated
                • Fixed a bug in captcha calling an invalid PHP function
                • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
                  • From 7aa1809e775bddfa08e17d8424a3532fcf06d6ae Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 19 Jul 2007 00:13:13 +0000 Subject: [PATCH 0668/2544] --- system/helpers/cookie_helper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php index 9dc5df9b..4fb30bd5 100644 --- a/system/helpers/cookie_helper.php +++ b/system/helpers/cookie_helper.php @@ -60,15 +60,15 @@ function set_cookie($name = '', $value = '', $expire = '', $domain = '', $path = if ($prefix == '' AND $CI->config->item('cookie_prefix') != '') { - $CI->config->item('cookie_prefix'); + $prefix = $CI->config->item('cookie_prefix'); } if ($domain == '' AND $CI->config->item('cookie_domain') != '') { - $CI->config->item('cookie_domain'); + $domain = $CI->config->item('cookie_domain'); } - if ($prefix == '/' AND $CI->config->item('cookie_path') != '/') + if ($path == '/' AND $CI->config->item('cookie_path') != '/') { - $CI->config->item('cookie_path'); + $path = $CI->config->item('cookie_path'); } if ( ! is_numeric($expire)) From eb528b2272442245e657f92adfeb3979665a903b Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 19 Jul 2007 00:14:22 +0000 Subject: [PATCH 0669/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 729b3572..2ede587c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,6 +69,7 @@

                  Version 1.5.5

                • Fixed a bug in database driver where num_rows property wasn't getting updated
                • Fixed a bug in captcha calling an invalid PHP function
                • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
                  • +
                • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
                From c2c256143d99a0e6695cb2f16d968e27ef9e9036 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 19 Jul 2007 23:12:49 +0000 Subject: [PATCH 0670/2544] example fix --- user_guide/libraries/validation.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index f5ef9cef..3532282d 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -496,7 +496,7 @@

                Showing Errors Individually

                If you prefer to show an error message next to each form field, rather than as a list, you can change your form so that it looks like this:

                -<textarea class="textarea" style="width:100%" cols="50" rows="20"> +

                If there are no errors, nothing will be shown. If there is an error, the message will appear, wrapped in the delimiters you have set (<p> tags by default).

                From 30b40153739419d50c64e2dce338166a5c58ab58 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 20 Jul 2007 00:01:13 +0000 Subject: [PATCH 0671/2544] --- system/codeigniter/CodeIgniter.php | 4 +- system/libraries/Output.php | 4 +- system/libraries/Router.php | 247 +++-------------------------- system/libraries/URI.php | 244 ++++++++++++++++++++++++++-- system/libraries/Xmlrpc.php | 1 - 5 files changed, 264 insertions(+), 236 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 1cd66a18..160d86c8 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -77,6 +77,7 @@ */ $CFG =& load_class('Config'); +$URI =& load_class('URI'); $RTR =& load_class('Router'); $OUT =& load_class('Output'); @@ -101,7 +102,6 @@ */ $IN =& load_class('Input'); -$URI =& load_class('URI'); $LANG =& load_class('Language'); /* @@ -213,7 +213,7 @@ // Call the requested method. // Any URI segments present (besides the class/function) will be passed to the method for convenience - call_user_func_array(array(&$CI, $method), array_slice($RTR->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3))); + call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3))); } } diff --git a/system/libraries/Output.php b/system/libraries/Output.php index 756d4b4c..53003f18 100644 --- a/system/libraries/Output.php +++ b/system/libraries/Output.php @@ -301,7 +301,7 @@ function _write_cache($output) function _display_cache(&$CFG, &$RTR) { $CFG =& load_class('Config'); - $RTR =& load_class('Router'); + $URI =& load_class('URI'); $cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path'); @@ -313,7 +313,7 @@ function _display_cache(&$CFG, &$RTR) // Build the file path. The file name is an MD5 hash of the full URI $uri = $CFG->item('base_url'). $CFG->item('index_page'). - $RTR->uri_string; + $URI->uri_string; $filepath = $cache_path.md5($uri); diff --git a/system/libraries/Router.php b/system/libraries/Router.php index 6af6ad38..6fca4522 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -28,10 +28,7 @@ */ class CI_Router { - var $config; - var $uri_string = ''; - var $segments = array(); - var $rsegments = array(); + var $config; var $routes = array(); var $error_routes = array(); var $class = ''; @@ -49,7 +46,8 @@ class CI_Router { function CI_Router() { $this->config =& load_class('Config'); - $this->_set_route_mapping(); + $this->uri =& load_class('URI'); + $this->_set_routing(); log_message('debug', "Router Class Initialized"); } @@ -64,17 +62,17 @@ function CI_Router() * @access private * @return void */ - function _set_route_mapping() + function _set_routing() { // Are query strings enabled in the config file? // If so, we're done since segment based URIs are not used with query strings. if ($this->config->item('enable_query_strings') === TRUE AND isset($_GET[$this->config->item('controller_trigger')])) { - $this->set_class(trim($this->_filter_uri($_GET[$this->config->item('controller_trigger')]))); + $this->set_class(trim($this->uri->_filter_uri($_GET[$this->config->item('controller_trigger')]))); if (isset($_GET[$this->config->item('function_trigger')])) { - $this->set_method(trim($this->_filter_uri($_GET[$this->config->item('function_trigger')]))); + $this->set_method(trim($this->uri->_filter_uri($_GET[$this->config->item('function_trigger')]))); } return; @@ -90,16 +88,10 @@ function _set_route_mapping() $this->default_controller = ( ! isset($this->routes['default_controller']) OR $this->routes['default_controller'] == '') ? FALSE : strtolower($this->routes['default_controller']); // Fetch the complete URI string - $this->uri_string = $this->_get_uri_string(); - - // If the URI contains only a slash we'll kill it - if ($this->uri_string == '/') - { - $this->uri_string = ''; - } + $this->uri->_fetch_uri_string(); // Is there a URI string? If not, the default controller specified in the "routes" file will be shown. - if ($this->uri_string == '') + if ($this->uri->uri_string == '') { if ($this->default_controller === FALSE) { @@ -114,47 +106,35 @@ function _set_route_mapping() } unset($this->routes['default_controller']); - // Do we need to remove the suffix specified in the config file? - if ($this->config->item('url_suffix') != "") - { - $this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string); - } + // Do we need to remove the URL suffix? + $this->uri->_remove_url_suffix(); - // Explode the URI Segments. The individual segments will - // be stored in the $this->segments array. - foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) - { - // Filter segments for security - $val = trim($this->_filter_uri($val)); - - if ($val != '') - $this->segments[] = $val; - } + // Compile the segments into an array + $this->uri->_explode_segments(); // Parse any custom routing that may exist $this->_parse_routes(); // Re-index the segment array so that it starts with 1 rather than 0 - $this->_reindex_segments(); + $this->uri->_reindex_segments(); } // -------------------------------------------------------------------- /** - * Compile Segments + * Set the Route * * This function takes an array of URI segments as - * input, and puts it into the $this->segments array. - * It also sets the current class/method + * input, and sets the current class/method * * @access private * @param array * @param bool * @return void */ - function _compile_segments($segments = array()) + function _set_request($segments = array()) { - $segments = $this->_validate_segments($segments); + $segments = $this->_validate_request($segments); if (count($segments) == 0) { @@ -180,8 +160,8 @@ function _compile_segments($segments = array()) // Update our "routed" segment array to contain the segments. // Note: If there is no custom routing, this array will be - // identical to $this->segments - $this->rsegments = $segments; + // identical to $this->uri->segments + $this->uri->rsegments = $segments; } // -------------------------------------------------------------------- @@ -194,7 +174,7 @@ function _compile_segments($segments = array()) * @param array * @return array */ - function _validate_segments($segments) + function _validate_request($segments) { // Does the requested controller exist in the root folder? if (file_exists(APPPATH.'controllers/'.$segments[0].EXT)) @@ -237,182 +217,7 @@ function _validate_segments($segments) // Can't find the requested controller... show_404(); } - - // -------------------------------------------------------------------- - /** - * Re-index Segments - * - * This function re-indexes the $this->segment array so that it - * starts at 1 rather then 0. Doing so makes it simpler to - * use functions like $this->uri->segment(n) since there is - * a 1:1 relationship between the segment array and the actual segments. - * - * @access private - * @return void - */ - function _reindex_segments() - { - // Is the routed segment array different then the main segment array? - $diff = (count(array_diff($this->rsegments, $this->segments)) == 0) ? FALSE : TRUE; - - $i = 1; - foreach ($this->segments as $val) - { - $this->segments[$i++] = $val; - } - unset($this->segments[0]); - if ($diff == FALSE) - { - $this->rsegments = $this->segments; - } - else - { - $i = 1; - foreach ($this->rsegments as $val) - { - $this->rsegments[$i++] = $val; - } - unset($this->rsegments[0]); - } - } - - // -------------------------------------------------------------------- - - /** - * Get the URI String - * - * @access private - * @return string - */ - function _get_uri_string() - { - if (strtoupper($this->config->item('uri_protocol')) == 'AUTO') - { - // If the URL has a question mark then it's simplest to just - // build the URI string from the zero index of the $_GET array. - // This avoids having to deal with $_SERVER variables, which - // can be unreliable in some environments - if (is_array($_GET) AND count($_GET) == 1) - { - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - $keys = array_keys($_GET); - return current($keys); - } - - // Is there a PATH_INFO variable? - // Note: some servers seem to have trouble with getenv() so we'll test it two ways - $path = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO'); - if ($path != '' AND $path != "/".SELF) - { - return $path; - } - - // No PATH_INFO?... What about QUERY_STRING? - $path = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING'); - if ($path != '') - { - return $path; - } - - // No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists? - $path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO'); - if ($path != '' AND $path != "/".SELF) - { - return $path; - } - - // We've exhausted all our options... - return ''; - } - else - { - $uri = strtoupper($this->config->item('uri_protocol')); - - if ($uri == 'REQUEST_URI') - { - return $this->_parse_request_uri(); - } - - return (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri); - } - } - - // -------------------------------------------------------------------- - - /** - * Parse the REQUEST_URI - * - * Due to the way REQUEST_URI works it usually contains path info - * that makes it unusable as URI data. We'll trim off the unnecessary - * data, hopefully arriving at a valid URI that we can use. - * - * @access private - * @return string - */ - function _parse_request_uri() - { - if ( ! isset($_SERVER['REQUEST_URI']) OR $_SERVER['REQUEST_URI'] == '') - { - return ''; - } - - $request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI'])); - - if ($request_uri == '' OR $request_uri == SELF) - { - return ''; - } - - $fc_path = FCPATH; - if (strpos($request_uri, '?') !== FALSE) - { - $fc_path .= '?'; - } - - $parsed_uri = explode("/", $request_uri); - - $i = 0; - foreach(explode("/", $fc_path) as $segment) - { - if (isset($parsed_uri[$i]) AND $segment == $parsed_uri[$i]) - { - $i++; - } - } - - $parsed_uri = implode("/", array_slice($parsed_uri, $i)); - - if ($parsed_uri != '') - { - $parsed_uri = '/'.$parsed_uri; - } - - return $parsed_uri; - } - - // -------------------------------------------------------------------- - - /** - * Filter segments for malicious characters - * - * @access private - * @param string - * @return string - */ - function _filter_uri($str) - { - if ($this->config->item('permitted_uri_chars') != '') - { - if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str)) - { - exit('The URI you submitted has disallowed characters.'); - } - } - return $str; - } - // -------------------------------------------------------------------- /** @@ -431,18 +236,18 @@ function _parse_routes() // There is a default scaffolding trigger, so we'll look just for 1 if (count($this->routes) == 1) { - $this->_compile_segments($this->segments); + $this->_set_request($this->uri->segments); return; } // Turn the segment array into a URI string - $uri = implode('/', $this->segments); - $num = count($this->segments); + $uri = implode('/', $this->uri->segments); + $num = count($this->uri->segments); // Is there a literal match? If so we're done if (isset($this->routes[$uri])) { - $this->_compile_segments(explode('/', $this->routes[$uri])); + $this->_set_request(explode('/', $this->routes[$uri])); return; } @@ -461,14 +266,14 @@ function _parse_routes() $val = preg_replace('#^'.$key.'$#', $val, $uri); } - $this->_compile_segments(explode('/', $val)); + $this->_set_request(explode('/', $val)); return; } } // If we got this far it means we didn't encounter a // matching route so we'll set the site default route - $this->_compile_segments($this->segments); + $this->_set_request($this->uri->segments); } // -------------------------------------------------------------------- diff --git a/system/libraries/URI.php b/system/libraries/URI.php index 5cedd8e0..2777e2f1 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -28,8 +28,10 @@ */ class CI_URI { - var $router; var $keyval = array(); + var $uri_string; + var $segments = array(); + var $rsegments = array(); /** * Constructor @@ -42,10 +44,229 @@ class CI_URI { */ function CI_URI() { - $this->router =& load_class('Router'); + $this->config =& load_class('Config'); log_message('debug', "URI Class Initialized"); } + + // -------------------------------------------------------------------- + + /** + * Get the URI String + * + * @access private + * @return string + */ + function _fetch_uri_string() + { + if (strtoupper($this->config->item('uri_protocol')) == 'AUTO') + { + // If the URL has a question mark then it's simplest to just + // build the URI string from the zero index of the $_GET array. + // This avoids having to deal with $_SERVER variables, which + // can be unreliable in some environments + if (is_array($_GET) AND count($_GET) == 1) + { + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + $keys = array_keys($_GET); + $this->uri_string = current($keys); + } + + // Is there a PATH_INFO variable? + // Note: some servers seem to have trouble with getenv() so we'll test it two ways + $path = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO'); + if ($path != '' AND $path != "/".SELF) + { + $this->uri_string = $path; + } + + // No PATH_INFO?... What about QUERY_STRING? + $path = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING'); + if ($path != '') + { + $this->uri_string = $path; + } + + // No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists? + $path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO'); + if ($path != '' AND $path != "/".SELF) + { + $this->uri_string = $path; + } + + // We've exhausted all our options... + $this->uri_string = ''; + } + else + { + $uri = strtoupper($this->config->item('uri_protocol')); + + if ($uri == 'REQUEST_URI') + { + $this->uri_string = $this->_parse_request_uri(); + } + + $this->uri_string = (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri); + } + + // If the URI contains only a slash we'll kill it + if ($this->uri_string == '/') + { + $this->uri_string = ''; + } + } + + // -------------------------------------------------------------------- + + /** + * Parse the REQUEST_URI + * + * Due to the way REQUEST_URI works it usually contains path info + * that makes it unusable as URI data. We'll trim off the unnecessary + * data, hopefully arriving at a valid URI that we can use. + * + * @access private + * @return string + */ + function _parse_request_uri() + { + if ( ! isset($_SERVER['REQUEST_URI']) OR $_SERVER['REQUEST_URI'] == '') + { + return ''; + } + + $request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI'])); + + if ($request_uri == '' OR $request_uri == SELF) + { + return ''; + } + + $fc_path = FCPATH; + if (strpos($request_uri, '?') !== FALSE) + { + $fc_path .= '?'; + } + + $parsed_uri = explode("/", $request_uri); + + $i = 0; + foreach(explode("/", $fc_path) as $segment) + { + if (isset($parsed_uri[$i]) AND $segment == $parsed_uri[$i]) + { + $i++; + } + } + + $parsed_uri = implode("/", array_slice($parsed_uri, $i)); + + if ($parsed_uri != '') + { + $parsed_uri = '/'.$parsed_uri; + } + + return $parsed_uri; + } + + // -------------------------------------------------------------------- + + /** + * Filter segments for malicious characters + * + * @access private + * @param string + * @return string + */ + function _filter_uri($str) + { + if ($this->config->item('permitted_uri_chars') != '') + { + if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str)) + { + exit('The URI you submitted has disallowed characters.'); + } + } + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Remove the suffix from the URL if needed + * + * @access private + * @return void + */ + function _remove_url_suffix() + { + if ($this->config->item('url_suffix') != "") + { + $this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string); + } + } + + // -------------------------------------------------------------------- + + /** + * Explode the URI Segments. The individual segments will + * be stored in the $this->segments array. + * + * @access private + * @return void + */ + function _explode_segments() + { + foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) + { + // Filter segments for security + $val = trim($this->_filter_uri($val)); + + if ($val != '') + $this->segments[] = $val; + } + } + + // -------------------------------------------------------------------- + /** + * Re-index Segments + * + * This function re-indexes the $this->segment array so that it + * starts at 1 rather then 0. Doing so makes it simpler to + * use functions like $this->uri->segment(n) since there is + * a 1:1 relationship between the segment array and the actual segments. + * + * @access private + * @return void + */ + function _reindex_segments() + { + // Is the routed segment array different then the main segment array? + $diff = (count(array_diff($this->rsegments, $this->segments)) == 0) ? FALSE : TRUE; + + $i = 1; + foreach ($this->segments as $val) + { + $this->segments[$i++] = $val; + } + unset($this->segments[0]); + + if ($diff == FALSE) + { + $this->rsegments = $this->segments; + } + else + { + $i = 1; + foreach ($this->rsegments as $val) + { + $this->rsegments[$i++] = $val; + } + unset($this->rsegments[0]); + } + } + // -------------------------------------------------------------------- /** @@ -60,7 +281,7 @@ function CI_URI() */ function segment($n, $no_result = FALSE) { - return ( ! isset($this->router->segments[$n])) ? $no_result : $this->router->segments[$n]; + return ( ! isset($this->segments[$n])) ? $no_result : $this->segments[$n]; } // -------------------------------------------------------------------- @@ -79,7 +300,7 @@ function segment($n, $no_result = FALSE) */ function rsegment($n, $no_result = FALSE) { - return ( ! isset($this->router->rsegments[$n])) ? $no_result : $this->router->rsegments[$n]; + return ( ! isset($this->rsegments[$n])) ? $no_result : $this->rsegments[$n]; } // -------------------------------------------------------------------- @@ -203,6 +424,8 @@ function _uri_to_assoc($n = 3, $default = array(), $which = 'segment') return $retval; } + // -------------------------------------------------------------------- + /** * Generate a URI string from an associative array * @@ -210,7 +433,8 @@ function _uri_to_assoc($n = 3, $default = array(), $which = 'segment') * @access public * @param array an associative array of key/values * @return array - */ function assoc_to_uri($array) + */ + function assoc_to_uri($array) { $temp = array(); foreach ((array)$array as $key => $val) @@ -293,7 +517,7 @@ function _slash_segment($n, $where = 'trailing', $which = 'segment') */ function segment_array() { - return $this->router->segments; + return $this->segments; } // -------------------------------------------------------------------- @@ -306,7 +530,7 @@ function segment_array() */ function rsegment_array() { - return $this->router->rsegments; + return $this->rsegments; } // -------------------------------------------------------------------- @@ -319,7 +543,7 @@ function rsegment_array() */ function total_segments() { - return count($this->router->segments); + return count($this->segments); } // -------------------------------------------------------------------- @@ -332,7 +556,7 @@ function total_segments() */ function total_rsegments() { - return count($this->router->rsegments); + return count($this->rsegments); } // -------------------------------------------------------------------- @@ -345,7 +569,7 @@ function total_rsegments() */ function uri_string() { - return $this->router->uri_string; + return $this->uri_string; } diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index 49747e48..fc6208e9 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -70,7 +70,6 @@ class CI_Xmlrpc { function CI_Xmlrpc ($config = array()) { - $this->xmlrpcName = $this->xmlrpcName; $this->xmlrpc_backslash = chr(92).chr(92); From 55ccb39f9e73779750d1f5b07ad9527469e0805c Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 20 Jul 2007 00:01:54 +0000 Subject: [PATCH 0672/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 2ede587c..4d313106 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,6 +66,7 @@

                Version 1.5.5

                Release Date: -- still in development

                • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
                  • +
                • Reorganized the URI and Routes classes for better clarity.
                • Fixed a bug in database driver where num_rows property wasn't getting updated
                • Fixed a bug in captcha calling an invalid PHP function
                • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
                  • From 6a47c119215219813f6c53b854f104d9fa16f62c Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 21 Jul 2007 17:42:35 +0000 Subject: [PATCH 0673/2544] --- system/codeigniter/CodeIgniter.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 160d86c8..b5f21a1b 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -132,11 +132,13 @@ // Load the local application controller // Note: The Router class automatically validates the controller path. If this include fails it // means that the default controller in the Routes.php file is not resolving to something valid. -if ( ! include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) +if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) { show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); } +include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT); + // Set a mark point for benchmarking $BM->mark('loading_time_base_classes_end'); From de2623c7a748e2e40ce4f6d64161915ed5141c4e Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 21 Jul 2007 18:28:24 +0000 Subject: [PATCH 0674/2544] --- system/libraries/URI.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/system/libraries/URI.php b/system/libraries/URI.php index 2777e2f1..254a8a6e 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -58,7 +58,7 @@ function CI_URI() * @return string */ function _fetch_uri_string() - { + { if (strtoupper($this->config->item('uri_protocol')) == 'AUTO') { // If the URL has a question mark then it's simplest to just @@ -71,6 +71,7 @@ function _fetch_uri_string() // of PHP we can not pass function call directly into it $keys = array_keys($_GET); $this->uri_string = current($keys); + return; } // Is there a PATH_INFO variable? @@ -79,6 +80,7 @@ function _fetch_uri_string() if ($path != '' AND $path != "/".SELF) { $this->uri_string = $path; + return; } // No PATH_INFO?... What about QUERY_STRING? @@ -86,6 +88,7 @@ function _fetch_uri_string() if ($path != '') { $this->uri_string = $path; + return; } // No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists? @@ -93,6 +96,7 @@ function _fetch_uri_string() if ($path != '' AND $path != "/".SELF) { $this->uri_string = $path; + return; } // We've exhausted all our options... @@ -105,6 +109,7 @@ function _fetch_uri_string() if ($uri == 'REQUEST_URI') { $this->uri_string = $this->_parse_request_uri(); + return; } $this->uri_string = (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri); @@ -116,7 +121,7 @@ function _fetch_uri_string() $this->uri_string = ''; } } - + // -------------------------------------------------------------------- /** From 183fe844a99da30c4bc2b4b8d881f6b94310dbc5 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 22 Jul 2007 02:09:13 +0000 Subject: [PATCH 0675/2544] --- system/libraries/Router.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Router.php b/system/libraries/Router.php index 6fca4522..501a8ee8 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -252,7 +252,7 @@ function _parse_routes() } // Loop through the route array looking for wild-cards - foreach (array_slice($this->routes, 1) as $key => $val) + foreach ($this->routes as $key => $val) { // Convert wild-cards to RegEx $key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key)); From e0a4cc035b39622a035d5de2c4ea69655d3aaae6 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 22 Jul 2007 18:14:32 +0000 Subject: [PATCH 0676/2544] --- system/codeigniter/CodeIgniter.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index b5f21a1b..16fe97ac 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -181,8 +181,10 @@ // Mark a start point so we can benchmark the controller $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); -// Instantiate the Controller -$CI = new $class(); +// Instantiate the Controller and pass any global data that might exist +$global_data = ( ! isset($global_data)) ? NULL : $global_data; + +$CI = new $class($global_data); // Is this a scaffolding request? if ($RTR->scaffolding_request === TRUE) From 268c26c5bc2e218ae4aa3a91cf292e179dab04ed Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 22 Jul 2007 18:14:41 +0000 Subject: [PATCH 0677/2544] --- index.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/index.php b/index.php index b7fdfff1..9a4d5336 100644 --- a/index.php +++ b/index.php @@ -44,6 +44,19 @@ $application_folder = "application"; +/* +|--------------------------------------------------------------- +| Dynamic Global Data Assignment +|--------------------------------------------------------------- +| +| If you need any data passed by default to your controllers you +| can use this variable. When a controller class is instantiated +| this data will be passed to the constructor. +| +*/ + $global_data = NULL; + + /* |=============================================================== | END OF USER CONFIGURABLE SETTINGS From 27842ada690fab499ec9502d3ebcf03a9d12c313 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 22 Jul 2007 18:21:04 +0000 Subject: [PATCH 0678/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4d313106..4220c6e0 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,6 +66,7 @@

                  Version 1.5.5

                  Release Date: -- still in development

                  • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
                    • +
                  • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
                  • Reorganized the URI and Routes classes for better clarity.
                  • Fixed a bug in database driver where num_rows property wasn't getting updated
                  • Fixed a bug in captcha calling an invalid PHP function
                    • From 03717d28b76c0ff3ab30da9d93ebe1a9b8b1be37 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 22 Jul 2007 18:22:22 +0000 Subject: [PATCH 0679/2544] --- index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 9a4d5336..7b47d081 100644 --- a/index.php +++ b/index.php @@ -46,15 +46,15 @@ /* |--------------------------------------------------------------- -| Dynamic Global Data Assignment +| Default Controller Data Assignment |--------------------------------------------------------------- | | If you need any data passed by default to your controllers you | can use this variable. When a controller class is instantiated -| this data will be passed to the constructor. +| this data will be passed to the controller constructor. | */ - $global_data = NULL; + $assign_to_controller = NULL; /* From f66c71b114653f3a2a418950b258a45428871410 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 22 Jul 2007 18:22:56 +0000 Subject: [PATCH 0680/2544] --- system/codeigniter/CodeIgniter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 16fe97ac..54f37c92 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -182,9 +182,9 @@ $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); // Instantiate the Controller and pass any global data that might exist -$global_data = ( ! isset($global_data)) ? NULL : $global_data; +$assign_to_controller = ( ! isset($assign_to_controller)) ? NULL : $assign_to_controller; -$CI = new $class($global_data); +$CI = new $class($assign_to_controller); // Is this a scaffolding request? if ($RTR->scaffolding_request === TRUE) From d8de26ea04a83d5d138e8771c69ae790b4cc6a78 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 22 Jul 2007 18:24:25 +0000 Subject: [PATCH 0681/2544] --- system/codeigniter/CodeIgniter.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 54f37c92..00032fa0 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -186,6 +186,8 @@ $CI = new $class($assign_to_controller); +unset($assign_to_controller); + // Is this a scaffolding request? if ($RTR->scaffolding_request === TRUE) { From 5fbffd780bb24c0fb925ffb26a9036f008d9b664 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 25 Jul 2007 18:47:11 +0000 Subject: [PATCH 0682/2544] --- system/libraries/URI.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/libraries/URI.php b/system/libraries/URI.php index 254a8a6e..e3cf9c55 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -69,8 +69,9 @@ function _fetch_uri_string() { // Note: Due to a bug in current() that affects some versions // of PHP we can not pass function call directly into it - $keys = array_keys($_GET); - $this->uri_string = current($keys); + $key = array_keys($_GET); + $index = current($key); + $this->uri_string = $_GET[$index]; return; } From c2ce7dfa7e16b2eac7e6c0e6ddaef9cb5e2a6952 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 30 Jul 2007 12:13:26 +0000 Subject: [PATCH 0683/2544] changed so day and month names are derived from calendar lang file instead of being hard-coded. --- system/plugins/js_calendar_pi.php | 37 +++++++++++++++++++++++++------ user_guide/changelog.html | 1 + 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/system/plugins/js_calendar_pi.php b/system/plugins/js_calendar_pi.php index a461e34a..686dcdf7 100644 --- a/system/plugins/js_calendar_pi.php +++ b/system/plugins/js_calendar_pi.php @@ -30,10 +30,10 @@ Then to show the actual calendar you'll do this: - +
                    -

                    Today

                    +

                    Today

                    @@ -126,15 +126,37 @@ function js_calendar_script($form_name = 'entryform') { - +$CI =& get_instance(); +$CI->load->language('calendar'); ob_start(); ?>
      + +
      + + + + + +

      CodeIgniter User Guide Version 1.5.4

      +
      + + + + + + + + + +
      + + +
      + + + +
      + +

      Upgrading from 1.5.4 to 1.5.5

      + +

      Before performing an update you should take your site offline by replacing the index.php file with a static one.

      + + + +

      Step 1: Update your CodeIgniter files

      + +

      Replace these files and directories in your "system" folder with the new versions:

      + +
        + +
      • system/codeigniter
        • +
      • system/database
        • +
      • system/helpers
        • +
      • system/libraries
        • +
      • system/plugins
        • +
      + +

      Note: If you have any custom developed files in these folders please make copies of them first.

      + +

      Step 2: Add time_to_update to your config.php

      +

      Add the following to system/application/config/config.php with the other

      +$config['sess_time_to_update'] = 300; +

      Step 3: Update your user guide

      +

      Please also replace your local copy of the user guide with the new version.

      + +
      + + + + + + + \ No newline at end of file From 34bc8f82221d7b2ea331728a1527658c36e39c89 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 10 Aug 2007 03:26:42 +0000 Subject: [PATCH 0693/2544] typo --- system/libraries/Session.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 57106ea2..819c3f5e 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -36,7 +36,7 @@ class CI_Session { var $userdata = array(); var $gc_probability = 5; var $flashdata_key = 'flash'; - var $time_to_update = 300; // 5 mintues, not accessible from config settings + var $time_to_update = 300; /** * Session Constructor From 91948fb49e1c6d28e5c06f4e8f8ec8906aa7bb50 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 10 Aug 2007 03:33:40 +0000 Subject: [PATCH 0694/2544] typos again --- user_guide/changelog.html | 2 +- user_guide/libraries/sessions.html | 598 +++++++++++++++-------------- 2 files changed, 303 insertions(+), 297 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 0433e71e..730bfa34 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -65,7 +65,7 @@

      Change Log

      Version 1.5.5

      Release Date: -- still in development

        -
      • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class
        • +
      • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class
      • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
      • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
      • Reorganized the URI and Routes classes for better clarity.
        • diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 0a50b433..a6ade694 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -1,297 +1,303 @@ - - - - -CodeIgniter User Guide : Session Class - - - - - - - - - - - - - - - - - - - - - - -
        - - - - - -

        CodeIgniter User Guide Version 1.5.4

        -
        - - - - - - - - - -
        - - -
        - - - -
        - - -

        Session Class

        - -

        The Session class permits you maintain a user's "state" and track their activity while they browse your site. -The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie. -It can also store the session data in a database table for added security, as this permits the session ID in the -user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to -use the database option you'll need to create the session table as indicated below. -

        - -

        Note: The Session class does not utilize native PHP sessions. It -generates its own session data, offering more flexibility for developers.

        - -

        Initializing a Session

        - -

        Sessions will typically run globally with each page load, so the session class must either be -initialized in your -controller constructors, or it can be -auto-loaded by the system. -For the most part the session class will run unattended in the background, so simply initializing the class -will cause it to read, create, and update sessions.

        - - -

        To initialize the Session class manually in your controller constructor, use the $this->load->library function:

        - -$this->load->library('session'); -

        Once loaded, the Sessions library object will be available using: $this->session

        - - -

        How do Sessions work?

        - -

        When a page is loaded, the session class will check to see if valid session data exists in the user's session cookie. -If sessions data does not exist (or if it has expired) a new session will be created and saved in the cookie. -If a session does exist, its information will be updated and the cookie will be updated.

        - -

        It's important for you to understand that once initialized, the Session class runs automatically. There is nothing -you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or -even add your own data to a user's session, but the process of reading, writing, and updating a session is automatic.

        - - -

        What is Session Data?

        - -

        A session, as far as CodeIgniter is concerned, is simply an array containing the following information:

        - -
          -
        • The user's unique Session ID (this is a statistically random string with very strong entropy, hashed with MD5 for portability)
          • -
        • The user's IP Address
          • -
        • The user's User Agent data (the first 50 characters of the browser data string)
          • -
        • The "last activity" and "last visit" time stamps.
          • -
        - -

        The above data is stored in a cookie as a serialized array with this prototype:

        - -[array]
        -(
        -     'session_id'    => random hash,
        -     'ip_address'    => 'string - user IP address',
        -     'user_agent'    => 'string - user agent data',
        -     'last_activity' => timestamp,
        -     'last_visit'    => timestamp
        -)         - -

        If you have the encryption option enabled, the serialized array will be encrypted before being stored in the cookie, -making the data highly secure and impervious to being read or altered by someone. More info regarding encryption -can be found here, although the Session class will take care of initializing -and encrypting the data automatically.

        - -

        Note: Session cookies are only updated every five minutes to reduce processor load. If you repeatedly reload a page -you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time -the cookie was written.

        - -

        Retrieving Session Data

        - -

        Any piece of information from the session array is available using the following function:

        - -$this->session->userdata('item'); - -

        Where item is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you -will do this:

        - -$session_id = $this->session->userdata('session_id'); - -

        Note: The function returns FALSE (boolean) if the item you are trying to access does not exist.

        - - -

        Adding Custom Session Data

        - -

        A useful aspect of the session array is that you can add your own data to it and it will be stored in the user's cookie. -Why would you want to do this? Here's one example:

        - -

        Let's say a particular user logs into your site. Once authenticated, -you could add their username and email address to the session cookie, making that data globally available to you without -having to run a database query when you need it.

        - -

        To add your data to the session array involves passing an array containing your new data to this function:

        - -$this->session->set_userdata($array); - -

        Where $array is an associative array containing your new data. Here's an example:

        - - -

        $newdata = array(
        -                    'username'  => 'johndoe',
        -                    'email'     => 'johndoe@example.com',
        -                    'logged_in' => TRUE
        -                );
        -
        - $this->session->set_userdata($newdata);

        -

        If you want to add userdata one value at a time, set_userdata() also supports this syntax.

        -

        $this->session->set_userdata('some_name', 'some_value');

        -

        Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The -encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

        - -

        Saving Session Data to a Database

        - -

        While the session data array stored in the user's cookie contains a Session ID, -unless you store session data in a database there is no way to validate it. For some applications that require little or no -security, session ID validation may not be needed, but if your application requires security, validation is mandatory.

        - -

        When session data is available in a database, every time a valid session is found in the user's cookie, a database -query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never -be updated, they can only be generated when a new session is created.

        - -

        In order to store sessions, you must first create a database table for this purpose. Here is the basic -prototype (for MySQL) required by the session class:

        - - - -

        Note: By default the table is called ci_sessions, but you can name it anything you want -as long as you update the application/config/config.php file so that it contains the name you have chosen. -Once you have created your database table you can enable the database option in your config.php file as follows:

        - -$config['sess_use_database'] = TRUE; - -

        Once enabled, the Session class will store session data in the DB.

        - -

        Make sure you've specified the table name in your config file as well:

        - -$config['sess_table_name'] = 'ci_sessions"; - -

        Note: The Session class has built-in garbage collection which clears out expired sessions so you -do not need to write your own routine to do it.

        - - -

        Removing Session Data

        -

        To remove a single item from the session

        -

        $this->session->unset_userdata('item');

        -

        Destroying a Session

        -

        To clear the current session:

        -$this->session->sess_destroy(); -

        Session Preferences

        -

        You'll find the following Session related preferences in your application/config/config.php file:

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        PreferenceDefaultOptionsDescription
        sess_cookie_nameci_sessionNoneThe name you world the session cookie saved as.
        sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). -If you would like a non-expiring session set the value to zero: 0
        sess_encrypt_cookieFALSETRUE/FALSE (boolean)Whether to encrypt the session data.
        sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database. You must create the table before enabling this option.
        sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.
        sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data. Note that some ISPs dynamically -changes the IP, so if you want a non-expiring session you will likely set this to FALSE.
        sess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.
        - - -
        - - - - - - + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + + +
        + + + + + +

        CodeIgniter User Guide Version 1.5.3

        +
        + + + + + + + + + +
        + + +
        + + + +
        + + +

        Session Class

        + +

        The Session class permits you maintain a user's "state" and track their activity while they browse your site. +The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie. +It can also store the session data in a database table for added security, as this permits the session ID in the +user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to +use the database option you'll need to create the session table as indicated below. +

        + +

        Note: The Session class does not utilize native PHP sessions. It +generates its own session data, offering more flexibility for developers.

        + +

        Initializing a Session

        + +

        Sessions will typically run globally with each page load, so the session class must either be +initialized in your +controller constructors, or it can be +auto-loaded by the system. +For the most part the session class will run unattended in the background, so simply initializing the class +will cause it to read, create, and update sessions.

        + + +

        To initialize the Session class manually in your controller constructor, use the $this->load->library function:

        + +$this->load->library('session'); +

        Once loaded, the Sessions library object will be available using: $this->session

        + + +

        How do Sessions work?

        + +

        When a page is loaded, the session class will check to see if valid session data exists in the user's session cookie. +If sessions data does not exist (or if it has expired) a new session will be created and saved in the cookie. +If a session does exist, its information will be updated and the cookie will be updated. With each update, the session_id will be regenerated.

        + +

        It's important for you to understand that once initialized, the Session class runs automatically. There is nothing +you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or +even add your own data to a user's session, but the process of reading, writing, and updating a session is automatic.

        + + +

        What is Session Data?

        + +

        A session, as far as CodeIgniter is concerned, is simply an array containing the following information:

        + +
          +
        • The user's unique Session ID (this is a statistically random string with very strong entropy, hashed with MD5 for portability, and regenerated (by default) every five minutes)
          • +
        • The user's IP Address
          • +
        • The user's User Agent data (the first 50 characters of the browser data string)
          • +
        • The "last activity" and "last visit" time stamps.
          • +
        + +

        The above data is stored in a cookie as a serialized array with this prototype:

        + +[array]
        +(
        +     'session_id'    => random hash,
        +     'ip_address'    => 'string - user IP address',
        +     'user_agent'    => 'string - user agent data',
        +     'last_activity' => timestamp,
        +     'last_visit'    => timestamp
        +)         + +

        If you have the encryption option enabled, the serialized array will be encrypted before being stored in the cookie, +making the data highly secure and impervious to being read or altered by someone. More info regarding encryption +can be found here, although the Session class will take care of initializing +and encrypting the data automatically.

        + +

        Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page +you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time +the cookie was written. This time is configurable my changing the $config['time_to_update'] line in your system/config/config.php file.

        + +

        Retrieving Session Data

        + +

        Any piece of information from the session array is available using the following function:

        + +$this->session->userdata('item'); + +

        Where item is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you +will do this:

        + +$session_id = $this->session->userdata('session_id'); + +

        Note: The function returns FALSE (boolean) if the item you are trying to access does not exist.

        + + +

        Adding Custom Session Data

        + +

        A useful aspect of the session array is that you can add your own data to it and it will be stored in the user's cookie. +Why would you want to do this? Here's one example:

        + +

        Let's say a particular user logs into your site. Once authenticated, +you could add their username and email address to the session cookie, making that data globally available to you without +having to run a database query when you need it.

        + +

        To add your data to the session array involves passing an array containing your new data to this function:

        + +$this->session->set_userdata($array); + +

        Where $array is an associative array containing your new data. Here's an example:

        + + +

        $newdata = array(
        +                    'username'  => 'johndoe',
        +                    'email'     => 'johndoe@some-site.com',
        +                    'logged_in' => TRUE
        +                );
        +
        + $this->session->set_userdata($newdata);

        +

        If you want to add userdata one value at a time, set_userdata() also supports this syntax.

        +

        $this->session->set_userdata('some_name', 'some_value');

        +

        Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The +encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

        + +

        Flashdata

        +

        CodeIgniter supports "flashdata", or session data that will only ba available for the next server request, and are then automatically cleared. These can be very useful, and are typically used for informational or status messages (for example: "record 2 deleted").

        +

        Note: Flash variables are prefaced with "flash_" so avoid this prefix in your own session names.

        +

        To add flashdata:

        +

        $this->session->set_flashdata('item', 'value');

        +

        You can also pass an array to set_flashdata(), in the same manner as set_userdata().

        +

        To read a flashdata variable:

        +

        $this->session->flashdata('item');

        +

        If you find that you need to preserve a flashdata variable through an additional request, you can do so using the keep_flashdata() function.

        +

        $this->session->keep_flashdata('item');

        +

        Saving Session Data to a Database

        +

        While the session data array stored in the user's cookie contains a Session ID, +unless you store session data in a database there is no way to validate it. For some applications that require little or no +security, session ID validation may not be needed, but if your application requires security, validation is mandatory.

        + +

        When session data is available in a database, every time a valid session is found in the user's cookie, a database +query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never +be updated, they can only be generated when a new session is created.

        + +

        In order to store sessions, you must first create a database table for this purpose. Here is the basic +prototype (for MySQL) required by the session class:

        + + + +

        Note: By default the table is called ci_sessions, but you can name it anything you want +as long as you update the application/config/config.php file so that it contains the name you have chosen. +Once you have created your database table you can enable the database option in your config.php file as follows:

        + +$config['sess_use_database'] = TRUE; + +

        Once enabled, the Session class will store session data in the DB.

        + +

        Make sure you've specified the table name in your config file as well:

        + +$config['sess_table_name'] = 'ci_sessions"; + +

        Note: The Session class has built-in garbage collection which clears out expired sessions so you +do not need to write your own routine to do it.

        + + +

        Destroying a Session

        +

        To clear the current session:

        +$this->session->sess_destroy(); +

        Session Preferences

        +

        You'll find the following Session related preferences in your application/config/config.php file:

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        PreferenceDefaultOptionsDescription
        sess_cookie_nameci_sessionNoneThe name you world the session cookie saved as.
        sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). +If you would like a non-expiring session set the value to zero: 0
        sess_encrypt_cookieFALSETRUE/FALSE (boolean)Whether to encrypt the session data.
        sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database. You must create the table before enabling this option.
        sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.
        sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data. Note that some ISPs dynamically +changes the IP, so if you want a non-expiring session you will likely set this to FALSE.
        sess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.
        + + +
        + + + + + + \ No newline at end of file From 9278249cd356411dc949dd5a6dacc5b07fd4be81 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 10 Aug 2007 11:26:01 +0000 Subject: [PATCH 0695/2544] Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only. --- system/database/DB_active_rec.php | 2 +- user_guide/changelog.html | 1 + user_guide/database/active_record.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index d79a068e..82d5b63b 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -405,7 +405,7 @@ function orderby($orderby, $direction = '') { if (trim($direction) != '') { - $direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC', 'RAND()'), TRUE)) ? ' '.$direction : ' ASC'; + $direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC'), TRUE)) ? ' '.$direction : ' ASC'; } $this->ar_orderby[] = $orderby.$direction; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 730bfa34..d03fab5c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -70,6 +70,7 @@

        Version 1.5.5

      • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
      • Reorganized the URI and Routes classes for better clarity.
      • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it
        • +
      • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
      • Added titles to all user manual pages
      • Fixed a bug in database driver where num_rows property wasn't getting updated
      • Fixed a bug in captcha calling an invalid PHP function
        • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 37629ae1..504f1831 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -354,7 +354,7 @@

        $this->db->having();

        $this->db->orderby();

        Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. -The second parameter lets you set the direction of the result. Options are asc or desc or RAND()

        +The second parameter lets you set the direction of the result. Options are asc or desc

        $this->db->orderby("title", "desc");

        // Produces: ORDER BY title DESC From 89bf50f992b97772acb4028bbd7c9faf81899148 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 14 Aug 2007 02:39:04 +0000 Subject: [PATCH 0696/2544] fixed an extraneous ; --- system/libraries/Validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php index 6b6ec0c6..10773b21 100644 --- a/system/libraries/Validation.php +++ b/system/libraries/Validation.php @@ -317,7 +317,7 @@ function run() } else { - $line = $this->_error_messages[$rule];; + $line = $this->_error_messages[$rule]; } // Build the error message From fc40afda438195ec3d6f2a4c61477f7c09ec5e1a Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 14 Aug 2007 11:41:16 +0000 Subject: [PATCH 0697/2544] Documented the timezones() function in the Date Helper --- user_guide/changelog.html | 3 ++- user_guide/helpers/date_helper.html | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d03fab5c..e11bdc7d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,7 +71,8 @@

        Version 1.5.5

      • Reorganized the URI and Routes classes for better clarity.
      • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it
      • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
        • -
      • Added titles to all user manual pages
        • +
      • Added titles to all user manual pages
        • +
      • Documented the timezones() function in the Date Helper
      • Fixed a bug in database driver where num_rows property wasn't getting updated
      • Fixed a bug in captcha calling an invalid PHP function
      • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
        • diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index d703801a..2353ff84 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -223,11 +223,11 @@

        days_in_month()

        echo days_in_month(06, 2005);

        If the second parameter is empty, the current year will be used.

        - - - +

        timezones()

        +

        Takes a timezone reference (for a list of valid timezones, see the "Timezone Reference" below) and returns the number of hours offset from UTC.

        +

        echo timezones('UM5');

        +

        This function is useful when used with timezone_menu().

        timezone_menu()

        -

        Generates a pull-down menu of timezones, like this one:

        From 309d63fa5c011c5cf0fbe0c78ab5f294aaae6752 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 17 Aug 2007 11:49:29 +0000 Subject: [PATCH 0698/2544] Documented unset_userdata in the Session class. --- user_guide/changelog.html | 19 +- user_guide/libraries/sessions.html | 611 +++++++++++++++-------------- 2 files changed, 319 insertions(+), 311 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index e11bdc7d..e96e18ee 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -65,20 +65,21 @@

        Change Log

        Version 1.5.5

        Release Date: -- still in development

          -
        • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class
          • +
        • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
        • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
        • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
        • Reorganized the URI and Routes classes for better clarity.
          • -
        • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it
          • +
        • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
        • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
          • -
        • Added titles to all user manual pages
          • -
        • Documented the timezones() function in the Date Helper
          • -
        • Fixed a bug in database driver where num_rows property wasn't getting updated
          • -
        • Fixed a bug in captcha calling an invalid PHP function
          • -
        • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
          • +
        • Added titles to all user manual pages.
          • +
        • Documented the timezones() function in the Date Helper.
          • +
        • Documented unset_userdata in the Session class.
          • +
        • Fixed a bug in database driver where num_rows property wasn't getting updated.
          • +
        • Fixed a bug in captcha calling an invalid PHP function.
          • +
        • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
        • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
          • -
        • Fixed an example of comma-separated emails in the email library documentation
          • -
        • Fixed a typo in the DocBlock comment for unset_userdata() in Session
          • +
        • Fixed an example of comma-separated emails in the email library documentation.
          • +
        • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
        diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index a6ade694..22d46e66 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -1,303 +1,310 @@ - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - - -
        - - - - - -

        CodeIgniter User Guide Version 1.5.3

        -
        - - - - - - - - - -
        - - -
        - - - -
        - - -

        Session Class

        - -

        The Session class permits you maintain a user's "state" and track their activity while they browse your site. -The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie. -It can also store the session data in a database table for added security, as this permits the session ID in the -user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to -use the database option you'll need to create the session table as indicated below. -

        - -

        Note: The Session class does not utilize native PHP sessions. It -generates its own session data, offering more flexibility for developers.

        - -

        Initializing a Session

        - -

        Sessions will typically run globally with each page load, so the session class must either be -initialized in your -controller constructors, or it can be -auto-loaded by the system. -For the most part the session class will run unattended in the background, so simply initializing the class -will cause it to read, create, and update sessions.

        - - -

        To initialize the Session class manually in your controller constructor, use the $this->load->library function:

        - -$this->load->library('session'); -

        Once loaded, the Sessions library object will be available using: $this->session

        - - -

        How do Sessions work?

        - -

        When a page is loaded, the session class will check to see if valid session data exists in the user's session cookie. -If sessions data does not exist (or if it has expired) a new session will be created and saved in the cookie. -If a session does exist, its information will be updated and the cookie will be updated. With each update, the session_id will be regenerated.

        - -

        It's important for you to understand that once initialized, the Session class runs automatically. There is nothing -you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or -even add your own data to a user's session, but the process of reading, writing, and updating a session is automatic.

        - - -

        What is Session Data?

        - -

        A session, as far as CodeIgniter is concerned, is simply an array containing the following information:

        - -
          -
        • The user's unique Session ID (this is a statistically random string with very strong entropy, hashed with MD5 for portability, and regenerated (by default) every five minutes)
          • -
        • The user's IP Address
          • -
        • The user's User Agent data (the first 50 characters of the browser data string)
          • -
        • The "last activity" and "last visit" time stamps.
          • -
        - -

        The above data is stored in a cookie as a serialized array with this prototype:

        - -[array]
        -(
        -     'session_id'    => random hash,
        -     'ip_address'    => 'string - user IP address',
        -     'user_agent'    => 'string - user agent data',
        -     'last_activity' => timestamp,
        -     'last_visit'    => timestamp
        -)         - -

        If you have the encryption option enabled, the serialized array will be encrypted before being stored in the cookie, -making the data highly secure and impervious to being read or altered by someone. More info regarding encryption -can be found here, although the Session class will take care of initializing -and encrypting the data automatically.

        - -

        Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page -you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time -the cookie was written. This time is configurable my changing the $config['time_to_update'] line in your system/config/config.php file.

        - -

        Retrieving Session Data

        - -

        Any piece of information from the session array is available using the following function:

        - -$this->session->userdata('item'); - -

        Where item is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you -will do this:

        - -$session_id = $this->session->userdata('session_id'); - -

        Note: The function returns FALSE (boolean) if the item you are trying to access does not exist.

        - - -

        Adding Custom Session Data

        - -

        A useful aspect of the session array is that you can add your own data to it and it will be stored in the user's cookie. -Why would you want to do this? Here's one example:

        - -

        Let's say a particular user logs into your site. Once authenticated, -you could add their username and email address to the session cookie, making that data globally available to you without -having to run a database query when you need it.

        - -

        To add your data to the session array involves passing an array containing your new data to this function:

        - -$this->session->set_userdata($array); - -

        Where $array is an associative array containing your new data. Here's an example:

        - - -

        $newdata = array(
        -                    'username'  => 'johndoe',
        -                    'email'     => 'johndoe@some-site.com',
        -                    'logged_in' => TRUE
        -                );
        -
        - $this->session->set_userdata($newdata);

        -

        If you want to add userdata one value at a time, set_userdata() also supports this syntax.

        -

        $this->session->set_userdata('some_name', 'some_value');

        -

        Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The -encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

        - -

        Flashdata

        -

        CodeIgniter supports "flashdata", or session data that will only ba available for the next server request, and are then automatically cleared. These can be very useful, and are typically used for informational or status messages (for example: "record 2 deleted").

        -

        Note: Flash variables are prefaced with "flash_" so avoid this prefix in your own session names.

        -

        To add flashdata:

        -

        $this->session->set_flashdata('item', 'value');

        -

        You can also pass an array to set_flashdata(), in the same manner as set_userdata().

        -

        To read a flashdata variable:

        -

        $this->session->flashdata('item');

        -

        If you find that you need to preserve a flashdata variable through an additional request, you can do so using the keep_flashdata() function.

        -

        $this->session->keep_flashdata('item');

        -

        Saving Session Data to a Database

        -

        While the session data array stored in the user's cookie contains a Session ID, -unless you store session data in a database there is no way to validate it. For some applications that require little or no -security, session ID validation may not be needed, but if your application requires security, validation is mandatory.

        - -

        When session data is available in a database, every time a valid session is found in the user's cookie, a database -query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never -be updated, they can only be generated when a new session is created.

        - -

        In order to store sessions, you must first create a database table for this purpose. Here is the basic -prototype (for MySQL) required by the session class:

        - - - -

        Note: By default the table is called ci_sessions, but you can name it anything you want -as long as you update the application/config/config.php file so that it contains the name you have chosen. -Once you have created your database table you can enable the database option in your config.php file as follows:

        - -$config['sess_use_database'] = TRUE; - -

        Once enabled, the Session class will store session data in the DB.

        - -

        Make sure you've specified the table name in your config file as well:

        - -$config['sess_table_name'] = 'ci_sessions"; - -

        Note: The Session class has built-in garbage collection which clears out expired sessions so you -do not need to write your own routine to do it.

        - - -

        Destroying a Session

        -

        To clear the current session:

        -$this->session->sess_destroy(); -

        Session Preferences

        -

        You'll find the following Session related preferences in your application/config/config.php file:

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        PreferenceDefaultOptionsDescription
        sess_cookie_nameci_sessionNoneThe name you world the session cookie saved as.
        sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). -If you would like a non-expiring session set the value to zero: 0
        sess_encrypt_cookieFALSETRUE/FALSE (boolean)Whether to encrypt the session data.
        sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database. You must create the table before enabling this option.
        sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.
        sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data. Note that some ISPs dynamically -changes the IP, so if you want a non-expiring session you will likely set this to FALSE.
        sess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.
        - - -
        - - - - - - + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + + +
        + + + + + +

        CodeIgniter User Guide Version 1.5.3

        +
        + + + + + + + + + +
        + + +
        + + + +
        + + +

        Session Class

        + +

        The Session class permits you maintain a user's "state" and track their activity while they browse your site. +The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie. +It can also store the session data in a database table for added security, as this permits the session ID in the +user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to +use the database option you'll need to create the session table as indicated below. +

        + +

        Note: The Session class does not utilize native PHP sessions. It +generates its own session data, offering more flexibility for developers.

        + +

        Initializing a Session

        + +

        Sessions will typically run globally with each page load, so the session class must either be +initialized in your +controller constructors, or it can be +auto-loaded by the system. +For the most part the session class will run unattended in the background, so simply initializing the class +will cause it to read, create, and update sessions.

        + + +

        To initialize the Session class manually in your controller constructor, use the $this->load->library function:

        + +$this->load->library('session'); +

        Once loaded, the Sessions library object will be available using: $this->session

        + + +

        How do Sessions work?

        + +

        When a page is loaded, the session class will check to see if valid session data exists in the user's session cookie. +If sessions data does not exist (or if it has expired) a new session will be created and saved in the cookie. +If a session does exist, its information will be updated and the cookie will be updated. With each update, the session_id will be regenerated.

        + +

        It's important for you to understand that once initialized, the Session class runs automatically. There is nothing +you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or +even add your own data to a user's session, but the process of reading, writing, and updating a session is automatic.

        + + +

        What is Session Data?

        + +

        A session, as far as CodeIgniter is concerned, is simply an array containing the following information:

        + +
          +
        • The user's unique Session ID (this is a statistically random string with very strong entropy, hashed with MD5 for portability, and regenerated (by default) every five minutes)
          • +
        • The user's IP Address
          • +
        • The user's User Agent data (the first 50 characters of the browser data string)
          • +
        • The "last activity" and "last visit" time stamps.
          • +
        + +

        The above data is stored in a cookie as a serialized array with this prototype:

        + +[array]
        +(
        +     'session_id'    => random hash,
        +     'ip_address'    => 'string - user IP address',
        +     'user_agent'    => 'string - user agent data',
        +     'last_activity' => timestamp,
        +     'last_visit'    => timestamp
        +)         + +

        If you have the encryption option enabled, the serialized array will be encrypted before being stored in the cookie, +making the data highly secure and impervious to being read or altered by someone. More info regarding encryption +can be found here, although the Session class will take care of initializing +and encrypting the data automatically.

        + +

        Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page +you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time +the cookie was written. This time is configurable my changing the $config['time_to_update'] line in your system/config/config.php file.

        + +

        Retrieving Session Data

        + +

        Any piece of information from the session array is available using the following function:

        + +$this->session->userdata('item'); + +

        Where item is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you +will do this:

        + +$session_id = $this->session->userdata('session_id'); + +

        Note: The function returns FALSE (boolean) if the item you are trying to access does not exist.

        + + +

        Adding Custom Session Data

        + +

        A useful aspect of the session array is that you can add your own data to it and it will be stored in the user's cookie. +Why would you want to do this? Here's one example:

        + +

        Let's say a particular user logs into your site. Once authenticated, +you could add their username and email address to the session cookie, making that data globally available to you without +having to run a database query when you need it.

        + +

        To add your data to the session array involves passing an array containing your new data to this function:

        + +$this->session->set_userdata($array); + +

        Where $array is an associative array containing your new data. Here's an example:

        + + +

        $newdata = array(
        +                    'username'  => 'johndoe',
        +                    'email'     => 'johndoe@some-site.com',
        +                    'logged_in' => TRUE
        +                );
        +
        + $this->session->set_userdata($newdata);

        +

        If you want to add userdata one value at a time, set_userdata() also supports this syntax.

        +

        $this->session->set_userdata('some_name', 'some_value');

        +

        Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The +encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

        + +

        Removing Session Data

        +

        Just as set_userdata() can be used to add information into a session, unset_userdata() can be used to remove it, by passing the session key. For example, if you wanted to remove 'some_name' from your session information:

        +

        $this->session->unset_userdata('some_name');

        +

        This function can also be passed an array of items to unset.

        +

        $array_items = array('username', 'email');
        +
        +$this->session->set_userdata($array_items);

        +

        Flashdata

        +

        CodeIgniter supports "flashdata", or session data that will only ba available for the next server request, and are then automatically cleared. These can be very useful, and are typically used for informational or status messages (for example: "record 2 deleted").

        +

        Note: Flash variables are prefaced with "flash_" so avoid this prefix in your own session names.

        +

        To add flashdata:

        +

        $this->session->set_flashdata('item', 'value');

        +

        You can also pass an array to set_flashdata(), in the same manner as set_userdata().

        +

        To read a flashdata variable:

        +

        $this->session->flashdata('item');

        +

        If you find that you need to preserve a flashdata variable through an additional request, you can do so using the keep_flashdata() function.

        +

        $this->session->keep_flashdata('item');

        +

        Saving Session Data to a Database

        +

        While the session data array stored in the user's cookie contains a Session ID, +unless you store session data in a database there is no way to validate it. For some applications that require little or no +security, session ID validation may not be needed, but if your application requires security, validation is mandatory.

        + +

        When session data is available in a database, every time a valid session is found in the user's cookie, a database +query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never +be updated, they can only be generated when a new session is created.

        + +

        In order to store sessions, you must first create a database table for this purpose. Here is the basic +prototype (for MySQL) required by the session class:

        + + + +

        Note: By default the table is called ci_sessions, but you can name it anything you want +as long as you update the application/config/config.php file so that it contains the name you have chosen. +Once you have created your database table you can enable the database option in your config.php file as follows:

        + +$config['sess_use_database'] = TRUE; + +

        Once enabled, the Session class will store session data in the DB.

        + +

        Make sure you've specified the table name in your config file as well:

        + +$config['sess_table_name'] = 'ci_sessions"; + +

        Note: The Session class has built-in garbage collection which clears out expired sessions so you +do not need to write your own routine to do it.

        + + +

        Destroying a Session

        +

        To clear the current session:

        +$this->session->sess_destroy(); +

        Session Preferences

        +

        You'll find the following Session related preferences in your application/config/config.php file:

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        PreferenceDefaultOptionsDescription
        sess_cookie_nameci_sessionNoneThe name you world the session cookie saved as.
        sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). +If you would like a non-expiring session set the value to zero: 0
        sess_encrypt_cookieFALSETRUE/FALSE (boolean)Whether to encrypt the session data.
        sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database. You must create the table before enabling this option.
        sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.
        sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data. Note that some ISPs dynamically +changes the IP, so if you want a non-expiring session you will likely set this to FALSE.
        sess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.
        + + +
        + + + + + + \ No newline at end of file From 08e6b0cca401fdcdafddf652c9d3727428e62772 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 23 Aug 2007 01:04:53 +0000 Subject: [PATCH 0699/2544] Fixed an example in the Calendar library for Showing Next/Previous Month Links. --- user_guide/changelog.html | 1 + user_guide/libraries/calendar.html | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index e96e18ee..6273afea 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -79,6 +79,7 @@

        Version 1.5.5

      • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
      • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
      • Fixed an example of comma-separated emails in the email library documentation.
        • +
      • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
      • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
      diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 2880887c..4731d507 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -171,14 +171,14 @@

      Showing Next/Previous Month Links

      code similar to this example:

      -$this->load->library('calendar');
      -
      -$prefs = array (
      +$prefs = array (
                     'show_next_prev'  => TRUE,
                     'next_prev_url'   => 'http://www.your-site.com/index.php/calendar/show/'
                   );

      -echo $this->calendar->generate($this->uri->segment(3), $this->uri->segment(4), $prefs);       +$this->load->library('calendar', $prefs);
      +
      +echo $this->calendar->generate($this->uri->segment(3), $this->uri->segment(4));

      You'll notice a few things about the above example:

      From 2189f2a5974c5fc9fe6016d7340c0205a570b9c9 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 23 Aug 2007 18:35:14 +0000 Subject: [PATCH 0700/2544] Fixed a typo in the database language file. --- system/language/english/db_lang.php | 46 ++++++++++++++--------------- user_guide/changelog.html | 1 + 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/system/language/english/db_lang.php b/system/language/english/db_lang.php index a17bb71f..57897263 100644 --- a/system/language/english/db_lang.php +++ b/system/language/english/db_lang.php @@ -1,24 +1,24 @@ - \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 6273afea..e8f783ea 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -80,6 +80,7 @@

      Version 1.5.5

    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
      • +
    • Fixed a typo in the database language file.
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    From 4f95353d295455ee740aec7ee1b5060195bff987 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 10 Sep 2007 16:37:12 +0000 Subject: [PATCH 0701/2544] fixed docs for unset_userdata() --- user_guide/libraries/sessions.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 22d46e66..94eb3ca8 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -176,10 +176,10 @@

    Adding Custom Session Data

    Removing Session Data

    Just as set_userdata() can be used to add information into a session, unset_userdata() can be used to remove it, by passing the session key. For example, if you wanted to remove 'some_name' from your session information:

    $this->session->unset_userdata('some_name');

    -

    This function can also be passed an array of items to unset.

    -

    $array_items = array('username', 'email');
    +

    This function can also be passed an associative array of items to unset.

    +

    $array_items = array('username' => '', 'email' => '');

    -$this->session->set_userdata($array_items);

    +$this->session->unset_userdata($array_items);

    Flashdata

    CodeIgniter supports "flashdata", or session data that will only ba available for the next server request, and are then automatically cleared. These can be very useful, and are typically used for informational or status messages (for example: "record 2 deleted").

    Note: Flash variables are prefaced with "flash_" so avoid this prefix in your own session names.

    From 2005ffe2fb3cff05fd5e8cd7e73a4c7053328574 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 15 Sep 2007 20:11:54 +0000 Subject: [PATCH 0702/2544] changed Creating Loops - -

    In your application/views/ folder, create a file called smiley_view.php and place this code in it:

    - - - - - -

    When you have created the above controller and view, load it by visiting http://www.your=site.com/index.php/smileys/

    - -

    Function Reference

    - - -

    get_clickable_smileys()

    - -

    Returns an array containing your smiley images wrapped in a cliackable link. You must supply the URL to your smiley folder -via the first parameter:

    - -$image_array = get_clickable_smileys("http://www.your-site.com/images/smileys/"); - - -

    js_insert_smiley()

    - -

    Generates the JavaScript that allows the images to be clicked and inserted into a form field. -The first parameter must contain the name of your form, the second parameter must contain the name of the -form field. This function is designed to be placed into the <head> area of your web page.

    - -<?php echo js_insert_smiley('blog', 'comments'); ?> - - -

    parse_smileys()

    - -

    Takes a string of text as input and replaces any contained plain text smileys into the image -equivalent. The first parameter must contain your string, the second must contain the the URL to your smiley folder:

    - - - -$str = 'Here are some simileys: :-) ;-)'; - -$str = parse_smileys($str, "http://www.your-site.com/images/smileys/"); - -echo $str; - -
    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : Smiley Helper

    CodeIgniter User Guide Version 1.5.4

    Smiley Helper

    The Smiley Helper file contains functions that let you manage smileys (emoticons).

    Loading this Helper

    This helper is loaded using the following code:

    $this->load->helper('smiley');

    Overview

    The Smiley helper has a renderer that takes plain text simileys, like :-) and turns them into a image representation, like smile!

    It also lets you display a set of smiley images that when clicked will be inserted into a form field. For example, if you have a blog that allows user commenting you can show the smileys next to the comment form. Your users can click a desired smiley and with the help of some JavaScript it will be placed into the form field.

    Clickable Smileys Tutorial

    Here is an example demonstrating how you might create a set of clickable smileys next to a form field. This example requires that you first download and install the smiley images, then create a controller and the View as described.

    Important: Before you begin, please download the smiley images and put them in a publicly accessible place on your server. This helper also assumes you have the smiley replacement array located at application/config/smileys.php

    The Controller

    In your application/controllers/ folder, create a file called smileys.php and place the code below in it.

    Important: Change the URL in the get_clickable_smileys() function below so that it points to your smiley folder.

    You'll notice that in addition to the smiley helper we are using the Table Class.

    In your application/views/ folder, create a file called smiley_view.php and place this code in it:

    When you have created the above controller and view, load it by visiting http://www.your=site.com/index.php/smileys/

    Function Reference

    get_clickable_smileys()

    Returns an array containing your smiley images wrapped in a cliackable link. You must supply the URL to your smiley folder via the first parameter:

    $image_array = get_clickable_smileys("http://www.your-site.com/images/smileys/");

    js_insert_smiley()

    Generates the JavaScript that allows the images to be clicked and inserted into a form field. The first parameter must contain the name of your form, the second parameter must contain the name of the form field. This function is designed to be placed into the <head> area of your web page.

    <?php echo js_insert_smiley('blog', 'comments'); ?>

    parse_smileys()

    Takes a string of text as input and replaces any contained plain text smileys into the image equivalent. The first parameter must contain your string, the second must contain the the URL to your smiley folder:

    $str = 'Here are some simileys: :-) ;-)'; $str = parse_smileys($str, "http://www.your-site.com/images/smileys/"); echo $str;
    \ No newline at end of file diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 77cabe43..cd2f9e30 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -1,488 +1 @@ - - - - -CodeIgniter User Guide : XML-RPC and XML-RPC Server Classes - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    XML-RPC and XML-RPC Server Classes

    - - -

    CodeIgniter's XML-RPC classes permit you to send requests to another server, or set up -your own XML-RPC server to receive requests.

    - - -

    What is XML-RPC?

    - -

    Quite simply it is a way for two computers to communicate over the internet using XML. -One computer, which we will call the client, sends an XML-RPC request to -another computer, which we will call the server. Once the server receives and processes the request it -will send back a response to the client.

    - -

    For example, using the MetaWeblog API, an XML-RPC Client (usually a desktop publishing tool) will -send a request to an XML-RPC Server running on your site. This request might be a new weblog entry -being sent for publication, or it could be a request for an existing entry for editing. - -When the XML-RPC Server receives this request it will examine it to determine which class/method should be called to process the request. -Once processed, the server will then send back a response message.

    - -

    For detailed specifications, you can visit the XML-RPC site.

    - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the XML-RPC and XML-RPCS classes are initialized in your controller using the $this->load->library function:

    - -

    To load the XML-RPC class you will use:

    -$this->load->library('xmlrpc'); -

    Once loaded, the xml-rpc library object will be available using: $this->xmlrpc

    - -

    To load the XML-RPC Server class you will use:

    - -$this->load->library('xmlrpc');
    -$this->load->library('xmlrpcs'); -     -

    Once loaded, the xml-rpcs library object will be available using: $this->xmlrpcs

    - -

    Note:  When using the XML-RPC Server class you must load BOTH the XML-RPC class and the XML-RPC Server class.

    - - - -

    Sending XML-RPC Requests

    - -

    To send a request to an XML-RPC server you must specify the following information:

    - -
      -
    • The URL of the server
      • -
    • The method on the server you wish to call
      • -
    • The request data (explained below).
      • -
    - -

    Here is a basic example that sends a simple Weblogs.com ping to the Ping-o-Matic

    - - -$this->load->library('xmlrpc');
    -
    -$this->xmlrpc->server('http://rpc.pingomatic.com/', 80);
    -$this->xmlrpc->method('weblogUpdates.ping');
    - -
    -$request = array('My Photoblog', 'http://www.my-site.com/photoblog/');
    -$this->xmlrpc->request($request);
    -
    -if ( ! $this->xmlrpc->send_request())
    -{
    -    echo $xmlrpc->display_error();
    -} -     - -

    Explanation

    - -

    The above code initializes the XML-RPC class, sets the server URL and method to be called (weblogUpdates.ping). The -request (in this case, the title and URL of your site) is placed into an array for transportation, and -compiled using the request() function. -Lastly, the full request is sent. If the send_request() method returns false we will display the error message -sent back from the XML-RPC Server.

    - -

    Anatomy of a Request

    - -

    An XML-RPC request is simply the data you are sending to the XML-RPC server. Each piece of data in a request -is referred to as a request parameter. The above example has two parameters: -The URL and title of your site. When the XML-RPC server receives your request, it will look for parameters it requires.

    - -

    Request parameters must be placed into an array for transportation, and each parameter can be one -of seven data types (strings, numbers, dates, etc.). If your parameters are something other than strings -you will have to include the data type in the request array.

    - -

    Here is an example of a simple array with three parameters:

    - -$request = array('John', 'Doe', 'www.some-site.com');
    -$this->xmlrpc->request($request);     - -

    If you use data types other than strings, or if you have several different data types, you will place -each parameter into its own array, with the data type in the second position:

    - - -$request = array (
    -                   array('John', 'string'),
    -                   array('Doe', 'string'),
    -                   array(FALSE, 'boolean'),
    -                   array(12345, 'int')
    -                 ); -
    -$this->xmlrpc->request($request);     - -The Data Types section below has a full list of data types.

    - - - -

    Creating an XML-RPC Server

    - -

    An XML-RPC Server acts as a traffic cop of sorts, waiting for incoming requests and redirecting them to the -appropriate functions for processing.

    - -

    To create your own XML-RPC server involves initializing the XML-RPC Server class in your controller where you expect the incoming -request to appear, then setting up an array with mapping instructions so that incoming requests can be sent to the appropriate -class and method for processing.

    - -

    Here is an example to illustrate:

    - - -$this->load->library('xmlrpc');
    -$this->load->library('xmlrpcs');
    -
    -$config['functions']['new_post']  = array('function' => 'My_blog.new_entry');
    -$config['functions']['update_post'] = array('function' => 'My_blog.update_entry');
    -
    -$this->xmlrpcs->initialize($config);
    -$this->xmlrpcs->serve();     - -

    The above example contains an array specifying two method requests that the Server allows. -The allowed methods are on the left side of the array. When either of those are received, they will be mapped to the class and method on the right.

    - -

    In other words, if an XML-RPC Client sends a request for the new_post method, your -server will load the My_blog class and call the new_entry function. -If the request is for the update_post method, your -server will load the My_blog class and call the update_entry function.

    - -

    The function names in the above example are arbitrary. You'll decide what they should be called on your server, -or if you are using standardized APIs, like the Blogger or MetaWeblog API, you'll use their function names.

    - - -

    Processing Server Requests

    - -

    When the XML-RPC Server receives a request and loads the class/method for processing, it will pass -an object to that method containing the data sent by the client.

    - -

    Using the above example, if the new_post method is requested, the server will expect a class -to exist with this prototype:

    - -class My_blog extends Controller {
    -
    -    function new_post($request)
    -    {
    -
    -    }
    -} -     - -

    The $request variable is an object compiled by the Server, which contains the data sent by the XML-RPC Client. -Using this object you will have access to the request parameters enabling you to process the request. When -you are done you will send a Response back to the Client.

    - -

    Below is a real-world example, using the Blogger API. One of the methods in the Blogger API is getUserInfo(). -Using this method, an XML-RPC Client can send the Server a username and password, in return the Server sends -back information about that particular user (nickname, user ID, email address, etc.). Here is how the processing -function might look:

    - - -class My_blog extends Controller {
    -
    -    function getUserInfo($request)
    -    {
    - -        $username = 'smitty';
    -        $password = 'secretsmittypass';

    - -        $this->load->library('xmlrpc');
    -    
    -        $parameters = $request->output_parameters();
    -    
    -        if ($parameters['1'] != $username AND $parameters['2'] != $password)
    -        {
    -            return $this->xmlrpc->send_error_message('100', 'Invalid Access');
    -        }
    -    
    -        $response = array(array('nickname'  => array('Smitty','string'),
    -                                'userid'    => array('99','string'),
    -                                'url'       => array('http://yoursite.com','string'),
    -                                'email'     => array('jsmith@yoursite.com','string'),
    -                                'lastname'  => array('Smith','string'),
    -                                'firstname' => array('John','string')
    -                                ),
    -                         'struct');
    -
    -        return $this->xmlrpc->send_response($response);
    -    }
    -} -     - -

    Notes:

    -

    The output_parameters() function retrieves an indexed array corresponding to the request parameters sent by the client. -In the above example, the output parameters will be the username and password.

    - -

    If the username and password sent by the client were not valid, and error message is returned using send_error_message().

    - -

    If the operation was successful, the client will be sent back a response array containing the user's info.

    - - -

    Formatting a Response

    - -

    Similar to Requests, Responses must be formatted as an array. However, unlike requests, a response is an array -that contains a single item. This item can be an array with several additional arrays, but there -can be only one primary array index. In other words, the basic prototype is this:

    - -$response = array('Response data', 'array'); - -

    Responses, however, usually contain multiple pieces of information. In order to accomplish this we must put the response into its own -array so that the primary array continues to contain a single piece of data. Here's an example showing how this might be accomplished:

    - - -$response = array (
    -                   array(
    -                         'first_name' => array('John', 'string'),
    -                         'last_name' => array('Doe', 'string'),
    -                         'member_id' => array(123435, 'int'),
    -                         'todo_list' => array(array('clean house', 'call mom', 'water plants'), 'array'),
    -                        ),
    -                 'struct'
    -                 ); -     - -

    Notice that the above array is formatted as a struct. This is the most common data type for responses.

    - -

    As with Requests, a response can be on of the seven data types listed in the Data Types section.

    - - -

    Sending an Error Response

    - -

    If you need to send the client an error response you will use the following:

    - -return $this->xmlrpc->send_error_message('123', 'Requested data not available'); - -

    The first parameter is the error number while the second parameter is the error message.

    - - - - - - -

    Creating Your Own Client and Server

    - -

    To help you understand everything we've covered thus far, let's create a couple controllers that act as -XML-RPC Client and Server. You'll use the Client to send a request to the Server and receive a response.

    - -

    The Client

    - -

    Using a text editor, create a controller called xmlrpc_client.php. -In it, place this code and save it to your applications/controllers/ folder:

    - - - -

    Note: In the above code we are using a "url helper". You can find more information in the Helpers Functions page.

    - -

    The Server

    - -

    Using a text editor, create a controller called xmlrpc_server.php. -In it, place this code and save it to your applications/controllers/ folder:

    - - - -

    Try it!

    - -

    Now visit the your site using a URL similar to this:

    -www.your-site.com/index.php/xmlrpc_client/ - -

    You should now see the message you sent to the server, and its response back to you.

    - -

    The client you created sends a message ("How's is going?") to the server, along with a reqest for the "Greetings" method. -The Server receives the request and maps it to the "process" function, where a response is sent back.

    - - - -

     

    -

    XML-RPC Function Reference

    - -

    $this->xmlrpc->server()

    -

    Sets the URL and port number of the server to which a request is to be sent:

    -$this->xmlrpc->server('http://www.sometimes.com/pings.php', 80); - -

    $this->xmlrpc->timeout()

    -

    Set a time out period (in seconds) after which the request will be canceled:

    -$this->xmlrpc->timeout(6); - -

    $this->xmlrpc->method()

    -

    Sets the method that will be requested from the XML-RPC server:

    -$this->xmlrpc->method('method'); - -

    Where method is the name of the method.

    - -

    $this->xmlrpc->request()

    -

    Takes an array of data and builds request to be sent to XML-RPC server:

    -$request = array(array('My Photoblog', 'string'), 'http://www.yoursite.com/photoblog/');
    -$this->xmlrpc->request($request);     - -

    $this->xmlrpc->send_request()

    -

    The request sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

    - -

    $this->xmlrpc->set_debug(TRUE);

    -

    Enables debugging, which will display a variety of information and error data helpful during development.

    - - -

    $this->xmlrpc->display_error()

    -

    Returns an error message as a string if your request failed for some reason.

    -echo $this->xmlrpc->display_error(); - -

    $this->xmlrpc->display_response()

    -

    Returns the response from the remote server once request is received. The response will typically be an associative array.

    -$this->xmlrpc->display_response(); - -

    $this->xmlrpc->send_error_message()

    -

    This function lets you send an error message from your server to the client. First parameter is the error number while the second parameter -is the error message.

    -return $this->xmlrpc->send_error_message('123', 'Requested data not available'); - -

    $this->xmlrpc->send_response()

    -

    Lets you send the response from your server to the client. An array of valid data values must be sent with this method.

    -$response = array(
    -                 array(
    -                        'flerror' => array(FALSE, 'boolean'),
    -                        'message' => "Thanks for the ping!")
    -                     )
    -                 'struct');
    -return $this->xmlrpc->send_response($response);     - - - -

    Data Types

    - -

    According to the XML-RPC spec there are seven types -of values that you can send via XML-RPC:

    - -
      -
    • int or i4
      • -
    • boolean
      • -
    • string
      • -
    • double
      • -
    • dateTime.iso8601
      • -
    • base64
      • -
    • struct (contains array of values)
      • -
    • array (contains array of values)
      • -
    - - -
    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : XML-RPC and XML-RPC Server Classes

    CodeIgniter User Guide Version 1.5.4

    XML-RPC and XML-RPC Server Classes

    CodeIgniter's XML-RPC classes permit you to send requests to another server, or set up your own XML-RPC server to receive requests.

    What is XML-RPC?

    Quite simply it is a way for two computers to communicate over the internet using XML. One computer, which we will call the client, sends an XML-RPC request to another computer, which we will call the server. Once the server receives and processes the request it will send back a response to the client.

    For example, using the MetaWeblog API, an XML-RPC Client (usually a desktop publishing tool) will send a request to an XML-RPC Server running on your site. This request might be a new weblog entry being sent for publication, or it could be a request for an existing entry for editing. When the XML-RPC Server receives this request it will examine it to determine which class/method should be called to process the request. Once processed, the server will then send back a response message.

    For detailed specifications, you can visit the XML-RPC site.

    Initializing the Class

    Like most other classes in CodeIgniter, the XML-RPC and XML-RPCS classes are initialized in your controller using the $this->load->library function:

    To load the XML-RPC class you will use:

    $this->load->library('xmlrpc');

    Once loaded, the xml-rpc library object will be available using: $this->xmlrpc

    To load the XML-RPC Server class you will use:

    $this->load->library('xmlrpc');
    $this->load->library('xmlrpcs');

    Once loaded, the xml-rpcs library object will be available using: $this->xmlrpcs

    Note:  When using the XML-RPC Server class you must load BOTH the XML-RPC class and the XML-RPC Server class.

    Sending XML-RPC Requests

    To send a request to an XML-RPC server you must specify the following information:

    • The URL of the server
    • The method on the server you wish to call
    • The request data (explained below).

    Here is a basic example that sends a simple Weblogs.com ping to the Ping-o-Matic

    $this->load->library('xmlrpc');

    $this->xmlrpc->server('http://rpc.pingomatic.com/', 80);
    $this->xmlrpc->method('weblogUpdates.ping');

    $request = array('My Photoblog', 'http://www.my-site.com/photoblog/');
    $this->xmlrpc->request($request);

    if ( ! $this->xmlrpc->send_request())
    {
        echo $this->xmlrpc->display_error();
    }

    Explanation

    The above code initializes the XML-RPC class, sets the server URL and method to be called (weblogUpdates.ping). The request (in this case, the title and URL of your site) is placed into an array for transportation, and compiled using the request() function. Lastly, the full request is sent. If the send_request() method returns false we will display the error message sent back from the XML-RPC Server.

    Anatomy of a Request

    An XML-RPC request is simply the data you are sending to the XML-RPC server. Each piece of data in a request is referred to as a request parameter. The above example has two parameters: The URL and title of your site. When the XML-RPC server receives your request, it will look for parameters it requires.

    Request parameters must be placed into an array for transportation, and each parameter can be one of seven data types (strings, numbers, dates, etc.). If your parameters are something other than strings you will have to include the data type in the request array.

    Here is an example of a simple array with three parameters:

    $request = array('John', 'Doe', 'www.some-site.com');
    $this->xmlrpc->request($request);

    If you use data types other than strings, or if you have several different data types, you will place each parameter into its own array, with the data type in the second position:

    $request = array (
                       array('John', 'string'),
                       array('Doe', 'string'),
                       array(FALSE, 'boolean'),
                       array(12345, 'int')
                     );
    $this->xmlrpc->request($request);     The Data Types section below has a full list of data types.

    Creating an XML-RPC Server

    An XML-RPC Server acts as a traffic cop of sorts, waiting for incoming requests and redirecting them to the appropriate functions for processing.

    To create your own XML-RPC server involves initializing the XML-RPC Server class in your controller where you expect the incoming request to appear, then setting up an array with mapping instructions so that incoming requests can be sent to the appropriate class and method for processing.

    Here is an example to illustrate:

    $this->load->library('xmlrpc');
    $this->load->library('xmlrpcs');

    $config['functions']['new_post']  = array('function' => 'My_blog.new_entry');
    $config['functions']['update_post'] = array('function' => 'My_blog.update_entry');

    $this->xmlrpcs->initialize($config);
    $this->xmlrpcs->serve();

    The above example contains an array specifying two method requests that the Server allows. The allowed methods are on the left side of the array. When either of those are received, they will be mapped to the class and method on the right.

    In other words, if an XML-RPC Client sends a request for the new_post method, your server will load the My_blog class and call the new_entry function. If the request is for the update_post method, your server will load the My_blog class and call the update_entry function.

    The function names in the above example are arbitrary. You'll decide what they should be called on your server, or if you are using standardized APIs, like the Blogger or MetaWeblog API, you'll use their function names.

    Processing Server Requests

    When the XML-RPC Server receives a request and loads the class/method for processing, it will pass an object to that method containing the data sent by the client.

    Using the above example, if the new_post method is requested, the server will expect a class to exist with this prototype:

    class My_blog extends Controller {

        function new_post($request)
        {

        }
    }

    The $request variable is an object compiled by the Server, which contains the data sent by the XML-RPC Client. Using this object you will have access to the request parameters enabling you to process the request. When you are done you will send a Response back to the Client.

    Below is a real-world example, using the Blogger API. One of the methods in the Blogger API is getUserInfo(). Using this method, an XML-RPC Client can send the Server a username and password, in return the Server sends back information about that particular user (nickname, user ID, email address, etc.). Here is how the processing function might look:

    class My_blog extends Controller {

        function getUserInfo($request)
        {
            $username = 'smitty';
            $password = 'secretsmittypass';

            $this->load->library('xmlrpc');
        
            $parameters = $request->output_parameters();
        
            if ($parameters['1'] != $username AND $parameters['2'] != $password)
            {
                return $this->xmlrpc->send_error_message('100', 'Invalid Access');
            }
        
            $response = array(array('nickname'  => array('Smitty','string'),
                                    'userid'    => array('99','string'),
                                    'url'       => array('http://yoursite.com','string'),
                                    'email'     => array('jsmith@yoursite.com','string'),
                                    'lastname'  => array('Smith','string'),
                                    'firstname' => array('John','string')
                                    ),
                             'struct');

            return $this->xmlrpc->send_response($response);
        }
    }

    Notes:

    The output_parameters() function retrieves an indexed array corresponding to the request parameters sent by the client. In the above example, the output parameters will be the username and password.

    If the username and password sent by the client were not valid, and error message is returned using send_error_message().

    If the operation was successful, the client will be sent back a response array containing the user's info.

    Formatting a Response

    Similar to Requests, Responses must be formatted as an array. However, unlike requests, a response is an array that contains a single item. This item can be an array with several additional arrays, but there can be only one primary array index. In other words, the basic prototype is this:

    $response = array('Response data', 'array');

    Responses, however, usually contain multiple pieces of information. In order to accomplish this we must put the response into its own array so that the primary array continues to contain a single piece of data. Here's an example showing how this might be accomplished:

    $response = array (
                       array(
                             'first_name' => array('John', 'string'),
                             'last_name' => array('Doe', 'string'),
                             'member_id' => array(123435, 'int'),
                             'todo_list' => array(array('clean house', 'call mom', 'water plants'), 'array'),
                            ),
                     'struct'
                     );

    Notice that the above array is formatted as a struct. This is the most common data type for responses.

    As with Requests, a response can be on of the seven data types listed in the Data Types section.

    Sending an Error Response

    If you need to send the client an error response you will use the following:

    return $this->xmlrpc->send_error_message('123', 'Requested data not available');

    The first parameter is the error number while the second parameter is the error message.

    Creating Your Own Client and Server

    To help you understand everything we've covered thus far, let's create a couple controllers that act as XML-RPC Client and Server. You'll use the Client to send a request to the Server and receive a response.

    The Client

    Using a text editor, create a controller called xmlrpc_client.php. In it, place this code and save it to your applications/controllers/ folder:

    Note: In the above code we are using a "url helper". You can find more information in the Helpers Functions page.

    The Server

    Using a text editor, create a controller called xmlrpc_server.php. In it, place this code and save it to your applications/controllers/ folder:

    Try it!

    Now visit the your site using a URL similar to this:

    www.your-site.com/index.php/xmlrpc_client/

    You should now see the message you sent to the server, and its response back to you.

    The client you created sends a message ("How's is going?") to the server, along with a reqest for the "Greetings" method. The Server receives the request and maps it to the "process" function, where a response is sent back.

     

    XML-RPC Function Reference

    $this->xmlrpc->server()

    Sets the URL and port number of the server to which a request is to be sent:

    $this->xmlrpc->server('http://www.sometimes.com/pings.php', 80);

    $this->xmlrpc->timeout()

    Set a time out period (in seconds) after which the request will be canceled:

    $this->xmlrpc->timeout(6);

    $this->xmlrpc->method()

    Sets the method that will be requested from the XML-RPC server:

    $this->xmlrpc->method('method');

    Where method is the name of the method.

    $this->xmlrpc->request()

    Takes an array of data and builds request to be sent to XML-RPC server:

    $request = array(array('My Photoblog', 'string'), 'http://www.yoursite.com/photoblog/');
    $this->xmlrpc->request($request);

    $this->xmlrpc->send_request()

    The request sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

    $this->xmlrpc->set_debug(TRUE);

    Enables debugging, which will display a variety of information and error data helpful during development.

    $this->xmlrpc->display_error()

    Returns an error message as a string if your request failed for some reason.

    echo $this->xmlrpc->display_error();

    $this->xmlrpc->display_response()

    Returns the response from the remote server once request is received. The response will typically be an associative array.

    $this->xmlrpc->display_response();

    $this->xmlrpc->send_error_message()

    This function lets you send an error message from your server to the client. First parameter is the error number while the second parameter is the error message.

    return $this->xmlrpc->send_error_message('123', 'Requested data not available');

    $this->xmlrpc->send_response()

    Lets you send the response from your server to the client. An array of valid data values must be sent with this method.

    $response = array(
                     array(
                            'flerror' => array(FALSE, 'boolean'),
                            'message' => "Thanks for the ping!")
                         )
                     'struct');
    return $this->xmlrpc->send_response($response);

    Data Types

    According to the XML-RPC spec there are seven types of values that you can send via XML-RPC:

    • int or i4
    • boolean
    • string
    • double
    • dateTime.iso8601
    • base64
    • struct (contains array of values)
    • array (contains array of values)
    \ No newline at end of file From d34c95b0554e8d43f3d3c96cc84a754e8f1e2372 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 6 Dec 2007 13:54:54 +0000 Subject: [PATCH 0732/2544] added strip_quotes(), quotes_to_entities(), reduce_multiples() to string helper --- system/helpers/string_helper.php | 155 +------------------------------ user_guide/changelog.html | 2 +- 2 files changed, 2 insertions(+), 155 deletions(-) diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index 8ef71595..879ae2f8 100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php @@ -1,154 +1 @@ - 0) ? str_repeat($data, $num) : ''); -} - - -?> \ No newline at end of file + $val) { $str[$key] = strip_slashes($val); } } else { $str = stripslashes($str); } return $str; } // ------------------------------------------------------------------------ /** * Strip Quotes * * Removes single and double quotes from a string * * @access public * @param string * @return string */ function strip_quotes($str) { return str_replace(array('"', "'"), '', $str); } // ------------------------------------------------------------------------ /** * Quotes to Entities * * Converts single and double quotes to entities * * @access public * @param string * @return string */ function quotes_to_entities($str) { return str_replace(array("\'","\""), array("'","""), $str); } // ------------------------------------------------------------------------ /** * Reduce Double Slashes * * Converts double slashes in a string to a single slash, * except those found in http:// * * http://www.some-site.com//index.php * * becomes: * * http://www.some-site.com/index.php * * @access public * @param string * @return string */ function reduce_double_slashes($str) { return preg_replace("#([^:])//+#", "\\1/", $str); } // ------------------------------------------------------------------------ /** * Reduce Multiples * * Reduces multiple instances of a particular character. Example: * * Fred, Bill,, Joe, Jimmy * * becomes: * * Fred, Bill, Joe, Jimmy * * @access public * @param string * @param string the character you wish to reduce * @param bool TRUE/FALSE - whether to trim the character from the beginning/end * @return string */ function reduce_multiples($str, $character = ',', $trim = FALSE) { $str = preg_replace("#".$character."+#", $character, $str); if ($trim == TRUE) { $str = trim($str, $character); } return $str; } // ------------------------------------------------------------------------ /** * Create a Random String * * Useful for generating passwords or hashes. * * @access public * @param string type of random string. Options: alunum, numeric, nozero, unique * @param integer number of characters * @return string */ function random_string($type = 'alnum', $len = 8) { switch($type) { case 'alnum' : case 'numeric' : case 'nozero' : switch ($type) { case 'alnum' : $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; break; case 'numeric' : $pool = '0123456789'; break; case 'nozero' : $pool = '123456789'; break; } $str = ''; for ($i=0; $i < $len; $i++) { $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); } return $str; break; case 'unique' : return md5(uniqid(mt_rand())); break; } } // ------------------------------------------------------------------------ /** * Alternator * * Allows strings to be alternated. See docs... * * @access public * @param string (as many parameters as needed) * @return string */ function alternator() { static $i; if (func_num_args() == 0) { $i = 0; return ''; } $args = func_get_args(); return $args[($i++ % count($args))]; } // ------------------------------------------------------------------------ /** * Repeater function * * @access public * @param string * @param integer number of repeats * @return string */ function repeater($data, $num = 1) { return (($num > 0) ? str_repeat($data, $num) : ''); } ?> \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4014822b..760238e3 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1 +1 @@ - CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed a missing ?> in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file + CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file From 3755fc67fe28ae88061a13e5b78bb91fe836fcb1 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 9 Dec 2007 18:22:51 +0000 Subject: [PATCH 0733/2544] fix up of regular expression in reduce multiples --- system/helpers/string_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index 879ae2f8..1ca25e33 100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php @@ -1 +1 @@ - $val) { $str[$key] = strip_slashes($val); } } else { $str = stripslashes($str); } return $str; } // ------------------------------------------------------------------------ /** * Strip Quotes * * Removes single and double quotes from a string * * @access public * @param string * @return string */ function strip_quotes($str) { return str_replace(array('"', "'"), '', $str); } // ------------------------------------------------------------------------ /** * Quotes to Entities * * Converts single and double quotes to entities * * @access public * @param string * @return string */ function quotes_to_entities($str) { return str_replace(array("\'","\""), array("'","""), $str); } // ------------------------------------------------------------------------ /** * Reduce Double Slashes * * Converts double slashes in a string to a single slash, * except those found in http:// * * http://www.some-site.com//index.php * * becomes: * * http://www.some-site.com/index.php * * @access public * @param string * @return string */ function reduce_double_slashes($str) { return preg_replace("#([^:])//+#", "\\1/", $str); } // ------------------------------------------------------------------------ /** * Reduce Multiples * * Reduces multiple instances of a particular character. Example: * * Fred, Bill,, Joe, Jimmy * * becomes: * * Fred, Bill, Joe, Jimmy * * @access public * @param string * @param string the character you wish to reduce * @param bool TRUE/FALSE - whether to trim the character from the beginning/end * @return string */ function reduce_multiples($str, $character = ',', $trim = FALSE) { $str = preg_replace("#".$character."+#", $character, $str); if ($trim == TRUE) { $str = trim($str, $character); } return $str; } // ------------------------------------------------------------------------ /** * Create a Random String * * Useful for generating passwords or hashes. * * @access public * @param string type of random string. Options: alunum, numeric, nozero, unique * @param integer number of characters * @return string */ function random_string($type = 'alnum', $len = 8) { switch($type) { case 'alnum' : case 'numeric' : case 'nozero' : switch ($type) { case 'alnum' : $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; break; case 'numeric' : $pool = '0123456789'; break; case 'nozero' : $pool = '123456789'; break; } $str = ''; for ($i=0; $i < $len; $i++) { $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); } return $str; break; case 'unique' : return md5(uniqid(mt_rand())); break; } } // ------------------------------------------------------------------------ /** * Alternator * * Allows strings to be alternated. See docs... * * @access public * @param string (as many parameters as needed) * @return string */ function alternator() { static $i; if (func_num_args() == 0) { $i = 0; return ''; } $args = func_get_args(); return $args[($i++ % count($args))]; } // ------------------------------------------------------------------------ /** * Repeater function * * @access public * @param string * @param integer number of repeats * @return string */ function repeater($data, $num = 1) { return (($num > 0) ? str_repeat($data, $num) : ''); } ?> \ No newline at end of file + $val) { $str[$key] = strip_slashes($val); } } else { $str = stripslashes($str); } return $str; } // ------------------------------------------------------------------------ /** * Strip Quotes * * Removes single and double quotes from a string * * @access public * @param string * @return string */ function strip_quotes($str) { return str_replace(array('"', "'"), '', $str); } // ------------------------------------------------------------------------ /** * Quotes to Entities * * Converts single and double quotes to entities * * @access public * @param string * @return string */ function quotes_to_entities($str) { return str_replace(array("\'","\""), array("'","""), $str); } // ------------------------------------------------------------------------ /** * Reduce Double Slashes * * Converts double slashes in a string to a single slash, * except those found in http:// * * http://www.some-site.com//index.php * * becomes: * * http://www.some-site.com/index.php * * @access public * @param string * @return string */ function reduce_double_slashes($str) { return preg_replace("#([^:])//+#", "\\1/", $str); } // ------------------------------------------------------------------------ /** * Reduce Multiples * * Reduces multiple instances of a particular character. Example: * * Fred, Bill,, Joe, Jimmy * * becomes: * * Fred, Bill, Joe, Jimmy * * @access public * @param string * @param string the character you wish to reduce * @param bool TRUE/FALSE - whether to trim the character from the beginning/end * @return string */ function reduce_multiples($str, $character = ',', $trim = FALSE) { $preg_chars = preg_quote($character, '#') . preg_quote($character, '#'); $str = preg_replace("#$preg_chars+#", $character, $str); if ($trim == TRUE) { $str = trim($str, $character); } return $str; } // ------------------------------------------------------------------------ /** * Create a Random String * * Useful for generating passwords or hashes. * * @access public * @param string type of random string. Options: alunum, numeric, nozero, unique * @param integer number of characters * @return string */ function random_string($type = 'alnum', $len = 8) { switch($type) { case 'alnum' : case 'numeric' : case 'nozero' : switch ($type) { case 'alnum' : $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; break; case 'numeric' : $pool = '0123456789'; break; case 'nozero' : $pool = '123456789'; break; } $str = ''; for ($i=0; $i < $len; $i++) { $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); } return $str; break; case 'unique' : return md5(uniqid(mt_rand())); break; } } // ------------------------------------------------------------------------ /** * Alternator * * Allows strings to be alternated. See docs... * * @access public * @param string (as many parameters as needed) * @return string */ function alternator() { static $i; if (func_num_args() == 0) { $i = 0; return ''; } $args = func_get_args(); return $args[($i++ % count($args))]; } // ------------------------------------------------------------------------ /** * Repeater function * * @access public * @param string * @param integer number of repeats * @return string */ function repeater($data, $num = 1) { return (($num > 0) ? str_repeat($data, $num) : ''); } ?> \ No newline at end of file From 375d9bac3453e309900b475cb4a1efb836f97440 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 9 Dec 2007 18:25:55 +0000 Subject: [PATCH 0734/2544] quotes to entities now takes escaped and non-escaped quotes --- system/helpers/string_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index 1ca25e33..470bce2e 100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php @@ -1 +1 @@ - $val) { $str[$key] = strip_slashes($val); } } else { $str = stripslashes($str); } return $str; } // ------------------------------------------------------------------------ /** * Strip Quotes * * Removes single and double quotes from a string * * @access public * @param string * @return string */ function strip_quotes($str) { return str_replace(array('"', "'"), '', $str); } // ------------------------------------------------------------------------ /** * Quotes to Entities * * Converts single and double quotes to entities * * @access public * @param string * @return string */ function quotes_to_entities($str) { return str_replace(array("\'","\""), array("'","""), $str); } // ------------------------------------------------------------------------ /** * Reduce Double Slashes * * Converts double slashes in a string to a single slash, * except those found in http:// * * http://www.some-site.com//index.php * * becomes: * * http://www.some-site.com/index.php * * @access public * @param string * @return string */ function reduce_double_slashes($str) { return preg_replace("#([^:])//+#", "\\1/", $str); } // ------------------------------------------------------------------------ /** * Reduce Multiples * * Reduces multiple instances of a particular character. Example: * * Fred, Bill,, Joe, Jimmy * * becomes: * * Fred, Bill, Joe, Jimmy * * @access public * @param string * @param string the character you wish to reduce * @param bool TRUE/FALSE - whether to trim the character from the beginning/end * @return string */ function reduce_multiples($str, $character = ',', $trim = FALSE) { $preg_chars = preg_quote($character, '#') . preg_quote($character, '#'); $str = preg_replace("#$preg_chars+#", $character, $str); if ($trim == TRUE) { $str = trim($str, $character); } return $str; } // ------------------------------------------------------------------------ /** * Create a Random String * * Useful for generating passwords or hashes. * * @access public * @param string type of random string. Options: alunum, numeric, nozero, unique * @param integer number of characters * @return string */ function random_string($type = 'alnum', $len = 8) { switch($type) { case 'alnum' : case 'numeric' : case 'nozero' : switch ($type) { case 'alnum' : $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; break; case 'numeric' : $pool = '0123456789'; break; case 'nozero' : $pool = '123456789'; break; } $str = ''; for ($i=0; $i < $len; $i++) { $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); } return $str; break; case 'unique' : return md5(uniqid(mt_rand())); break; } } // ------------------------------------------------------------------------ /** * Alternator * * Allows strings to be alternated. See docs... * * @access public * @param string (as many parameters as needed) * @return string */ function alternator() { static $i; if (func_num_args() == 0) { $i = 0; return ''; } $args = func_get_args(); return $args[($i++ % count($args))]; } // ------------------------------------------------------------------------ /** * Repeater function * * @access public * @param string * @param integer number of repeats * @return string */ function repeater($data, $num = 1) { return (($num > 0) ? str_repeat($data, $num) : ''); } ?> \ No newline at end of file + $val) { $str[$key] = strip_slashes($val); } } else { $str = stripslashes($str); } return $str; } // ------------------------------------------------------------------------ /** * Strip Quotes * * Removes single and double quotes from a string * * @access public * @param string * @return string */ function strip_quotes($str) { return str_replace(array('"', "'"), '', $str); } // ------------------------------------------------------------------------ /** * Quotes to Entities * * Converts single and double quotes to entities * * @access public * @param string * @return string */ function quotes_to_entities($str) { return str_replace(array("\'","\"","'",'"'), array("'",""","'","""), $str); } // ------------------------------------------------------------------------ /** * Reduce Double Slashes * * Converts double slashes in a string to a single slash, * except those found in http:// * * http://www.some-site.com//index.php * * becomes: * * http://www.some-site.com/index.php * * @access public * @param string * @return string */ function reduce_double_slashes($str) { return preg_replace("#([^:])//+#", "\\1/", $str); } // ------------------------------------------------------------------------ /** * Reduce Multiples * * Reduces multiple instances of a particular character. Example: * * Fred, Bill,, Joe, Jimmy * * becomes: * * Fred, Bill, Joe, Jimmy * * @access public * @param string * @param string the character you wish to reduce * @param bool TRUE/FALSE - whether to trim the character from the beginning/end * @return string */ function reduce_multiples($str, $character = ',', $trim = FALSE) { $preg_chars = preg_quote($character, '#') . preg_quote($character, '#'); $str = preg_replace("#$preg_chars+#", $character, $str); if ($trim == TRUE) { $str = trim($str, $character); } return $str; } // ------------------------------------------------------------------------ /** * Create a Random String * * Useful for generating passwords or hashes. * * @access public * @param string type of random string. Options: alunum, numeric, nozero, unique * @param integer number of characters * @return string */ function random_string($type = 'alnum', $len = 8) { switch($type) { case 'alnum' : case 'numeric' : case 'nozero' : switch ($type) { case 'alnum' : $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; break; case 'numeric' : $pool = '0123456789'; break; case 'nozero' : $pool = '123456789'; break; } $str = ''; for ($i=0; $i < $len; $i++) { $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); } return $str; break; case 'unique' : return md5(uniqid(mt_rand())); break; } } // ------------------------------------------------------------------------ /** * Alternator * * Allows strings to be alternated. See docs... * * @access public * @param string (as many parameters as needed) * @return string */ function alternator() { static $i; if (func_num_args() == 0) { $i = 0; return ''; } $args = func_get_args(); return $args[($i++ % count($args))]; } // ------------------------------------------------------------------------ /** * Repeater function * * @access public * @param string * @param integer number of repeats * @return string */ function repeater($data, $num = 1) { return (($num > 0) ? str_repeat($data, $num) : ''); } ?> \ No newline at end of file From c112453356bb3c49c9adaecb3fda1ccd04a92be6 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 9 Dec 2007 19:26:17 +0000 Subject: [PATCH 0735/2544] documented strip_quotes(), quotes_to_entities(), reduce_multiples() --- user_guide/helpers/string_helper.html | 145 +------------------------- 1 file changed, 1 insertion(+), 144 deletions(-) diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 37902177..554afc82 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -1,144 +1 @@ - - - - -CodeIgniter User Guide : String Helper - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    String Helper

    - -

    The String Helper file contains functions that assist in working with strings.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('string'); - -

    The following functions are available:

    - -

    random_string()

    - -

    Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes.

    - -

    The first parameter specifies the type of string, the second parameter specifies the length. The following choices are available:

    - - -
      -
    • alnum:  Alpha-numeric string with lower and uppercase characters.
      • -
    • numeric:  Numeric string.
      • -
    • nozero:  Numeric string with no zeros.
      • -
    • unique:  Encrypted with MD5 and uniqid(). Note: The length parameter is not available for this type. -Returns a fixed length 33 character string.
      • -
    - -

    Usage example:

    - -echo random_string('alnum', 16); - - -

    alternator()

    - -

    Allows two or more items to be alternated between, when cycling through a loop. Example:

    - -for ($i = 0; $i < 10; $i++)
    -{
    -    echo alternator('string one', 'string two');
    -}
    -     - -

    You can add as many parameters as you want, and with each iteration of your loop the next item will be returned.

    - -for ($i = 0; $i < 10; $i++)
    -{
    -    echo alternator('one', 'two', 'three', 'four', 'five');
    -}
    -     - -

    Note: To use multiple separate calls to this function simply call the function with no arguments to re-initialize.

    - - - -

    repeater()

    -

    Generates repeating copies of the data you submit. Example:

    -$string = "\n";
    -echo repeater($string, 30);     - -

    The above would generate 30 newlines.

    -

    reduce_double_slashes()

    -

    Converts double slashes in a string to a single slash, except those found in http://. Example:

    -$string = "http://www.example.com//index.php";
    -echo reduce_double_slashes($string); // results in "http://www.example.com/index.php"     -

    trim_slashes()

    -

    Removes any leading/trailing slashes from a string. Example:
    -
    - $string = "/this/that/theother/";
    -echo trim_slashes($string); // results in this/that/theother

    -
    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : String Helper

    CodeIgniter User Guide Version 1.5.4

    String Helper

    The String Helper file contains functions that assist in working with strings.

    Loading this Helper

    This helper is loaded using the following code:

    $this->load->helper('string');

    The following functions are available:

    random_string()

    Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes.

    The first parameter specifies the type of string, the second parameter specifies the length. The following choices are available:

    • alnum:  Alpha-numeric string with lower and uppercase characters.
    • numeric:  Numeric string.
    • nozero:  Numeric string with no zeros.
    • unique:  Encrypted with MD5 and uniqid(). Note: The length parameter is not available for this type. Returns a fixed length 33 character string.

    Usage example:

    echo random_string('alnum', 16);

    alternator()

    Allows two or more items to be alternated between, when cycling through a loop. Example:

    for ($i = 0; $i < 10; $i++)
    {
        echo alternator('string one', 'string two');
    }

    You can add as many parameters as you want, and with each iteration of your loop the next item will be returned.

    for ($i = 0; $i < 10; $i++)
    {
        echo alternator('one', 'two', 'three', 'four', 'five');
    }

    Note: To use multiple separate calls to this function simply call the function with no arguments to re-initialize.

    repeater()

    Generates repeating copies of the data you submit. Example:

    $string = "\n";
    echo repeater($string, 30);

    The above would generate 30 newlines.

    reduce_double_slashes()

    Converts double slashes in a string to a single slash, except those found in http://. Example:

    $string = "http://www.example.com//index.php";
    echo reduce_double_slashes($string); // results in "http://www.example.com/index.php"

    trim_slashes()

    Removes any leading/trailing slashes from a string. Example:

    $string = "/this/that/theother/";
    echo trim_slashes($string); // results in this/that/theother

    reduce_multiples()

    Reduces multiple instances of a particular character occuring directly after each other. Example:

    $string="Fred, Bill,, Joe, Jimmy";
    $string=reduce_multiples($string,","); //results in "Fred, Bill, Joe, Jimmy"

    The function accepts the following parameters: reduce_multiples(string: text to search in, string: character to reduce, boolean: whether to remove the character from the front and end of the string) The first parameter contrains the string in which you want to reduce the multiplies. The second parameter contains the character you want to have reduced. The third parameter is False by default. If it it's to true it will remove occurences of the character at the beginning and the end of the string. Example: $string=",Fred, Bill,, Joe, Jimmy,";
    $string=reduce_multiples($string,",",true); //results in "Fred, Bill, Joe, Jimmy"

    quotes_to_entities()

    Converts single and double quotes in a string to the corresponding HTML entities. Example:

    $string="Joe's \"dinner\"";
    $string=quotes_to_entities($string); //results in "Joe&#39;s &quot;dinner&quot;"

    strip_quotes()

    Removes single and double quotes from a string. Example:

    $string="Joe's \"dinner\"";
    $string=strip_quotes($string); //results in "Joes dinner"
    \ No newline at end of file From 0a581e06e39daafeb0e161f67f2598432a6a8168 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 9 Dec 2007 19:36:03 +0000 Subject: [PATCH 0736/2544] added a space after the -f flag for server compatibility --- system/libraries/Email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 9c512117..c0593df0 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1 +1 @@ - 0) { $this->initialize($config); } log_message('debug', "Email Class Initialized"); } // -------------------------------------------------------------------- /** * Initialize preferences * * @access public * @param array * @return void */ function initialize($config = array()) { $this->clear(); foreach ($config as $key => $val) { if (isset($this->$key)) { $method = 'set_'.$key; if (method_exists($this, $method)) { $this->$method($val); } else { $this->$key = $val; } } } $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE; $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE; } // -------------------------------------------------------------------- /** * Initialize the Email Data * * @access public * @return void */ function clear($clear_attachments = FALSE) { $this->_subject = ""; $this->_body = ""; $this->_finalbody = ""; $this->_header_str = ""; $this->_replyto_flag = FALSE; $this->_recipients = array(); $this->_headers = array(); $this->_debug_msg = array(); $this->_set_header('User-Agent', $this->useragent); $this->_set_header('Date', $this->_set_date()); if ($clear_attachments !== FALSE) { $this->_attach_name = array(); $this->_attach_type = array(); $this->_attach_disp = array(); } } // -------------------------------------------------------------------- /** * Set FROM * * @access public * @param string * @param string * @return void */ function from($from, $name = '') { if (preg_match( '/\<(.*)\>/', $from, $match)) $from = $match['1']; if ($this->validate) $this->validate_email($this->_str_to_array($from)); if ($name != '' && substr($name, 0, 1) != '"') { $name = '"'.$name.'"'; } $this->_set_header('From', $name.' <'.$from.'>'); $this->_set_header('Return-Path', '<'.$from.'>'); } // -------------------------------------------------------------------- /** * Set Reply-to * * @access public * @param string * @param string * @return void */ function reply_to($replyto, $name = '') { if (preg_match( '/\<(.*)\>/', $replyto, $match)) $replyto = $match['1']; if ($this->validate) $this->validate_email($this->_str_to_array($replyto)); if ($name == '') { $name = $replyto; } if (substr($name, 0, 1) != '"') { $name = '"'.$name.'"'; } $this->_set_header('Reply-To', $name.' <'.$replyto.'>'); $this->_replyto_flag = TRUE; } // -------------------------------------------------------------------- /** * Set Recipients * * @access public * @param string * @return void */ function to($to) { $to = $this->_str_to_array($to); $to = $this->clean_email($to); if ($this->validate) $this->validate_email($to); if ($this->_get_protocol() != 'mail') $this->_set_header('To', implode(", ", $to)); switch ($this->_get_protocol()) { case 'smtp' : $this->_recipients = $to; break; case 'sendmail' : $this->_recipients = implode(", ", $to); break; case 'mail' : $this->_recipients = implode(", ", $to); break; } } // -------------------------------------------------------------------- /** * Set CC * * @access public * @param string * @return void */ function cc($cc) { $cc = $this->_str_to_array($cc); $cc = $this->clean_email($cc); if ($this->validate) $this->validate_email($cc); $this->_set_header('Cc', implode(", ", $cc)); if ($this->_get_protocol() == "smtp") $this->_cc_array = $cc; } // -------------------------------------------------------------------- /** * Set BCC * * @access public * @param string * @param string * @return void */ function bcc($bcc, $limit = '') { if ($limit != '' && is_numeric($limit)) { $this->bcc_batch_mode = true; $this->bcc_batch_size = $limit; } $bcc = $this->_str_to_array($bcc); $bcc = $this->clean_email($bcc); if ($this->validate) $this->validate_email($bcc); if (($this->_get_protocol() == "smtp") OR ($this->bcc_batch_mode && count($bcc) > $this->bcc_batch_size)) $this->_bcc_array = $bcc; else $this->_set_header('Bcc', implode(", ", $bcc)); } // -------------------------------------------------------------------- /** * Set Email Subject * * @access public * @param string * @return void */ function subject($subject) { $subject = preg_replace("/(\r\n)|(\r)|(\n)/", "", $subject); $subject = preg_replace("/(\t)/", " ", $subject); $this->_set_header('Subject', trim($subject)); } // -------------------------------------------------------------------- /** * Set Body * * @access public * @param string * @return void */ function message($body) { $this->_body = stripslashes(rtrim(str_replace("\r", "", $body))); } // -------------------------------------------------------------------- /** * Assign file attachments * * @access public * @param string * @return string */ function attach($filename, $disposition = 'attachment') { $this->_attach_name[] = $filename; $this->_attach_type[] = $this->_mime_types(next(explode('.', basename($filename)))); $this->_attach_disp[] = $disposition; // Can also be 'inline' Not sure if it matters } // -------------------------------------------------------------------- /** * Add a Header Item * * @access public * @param string * @param string * @return void */ function _set_header($header, $value) { $this->_headers[$header] = $value; } // -------------------------------------------------------------------- /** * Convert a String to an Array * * @access public * @param string * @return array */ function _str_to_array($email) { if ( ! is_array($email)) { if (ereg(',$', $email)) $email = substr($email, 0, -1); if (ereg('^,', $email)) $email = substr($email, 1); if (ereg(',', $email)) { $x = explode(',', $email); $email = array(); for ($i = 0; $i < count($x); $i ++) $email[] = trim($x[$i]); } else { $email = trim($email); settype($email, "array"); } } return $email; } // -------------------------------------------------------------------- /** * Set Multipart Value * * @access public * @param string * @return void */ function set_alt_message($str = '') { $this->alt_message = ($str == '') ? '' : $str; } // -------------------------------------------------------------------- /** * Set Mailtype * * @access public * @param string * @return void */ function set_mailtype($type = 'text') { $this->mailtype = ($type == 'html') ? 'html' : 'text'; } // -------------------------------------------------------------------- /** * Set Wordwrap * * @access public * @param string * @return void */ function set_wordwrap($wordwrap = TRUE) { $this->wordwrap = ($wordwrap === FALSE) ? FALSE : TRUE; } // -------------------------------------------------------------------- /** * Set Protocol * * @access public * @param string * @return void */ function set_protocol($protocol = 'mail') { $this->protocol = ( ! in_array($protocol, $this->_protocols, TRUE)) ? 'mail' : strtolower($protocol); } // -------------------------------------------------------------------- /** * Set Priority * * @access public * @param integer * @return void */ function set_priority($n = 3) { if ( ! is_numeric($n)) { $this->priority = 3; return; } if ($n < 1 OR $n > 5) { $this->priority = 3; return; } $this->priority = $n; } // -------------------------------------------------------------------- /** * Set Newline Character * * @access public * @param string * @return void */ function set_newline($newline = "\n") { if ($newline != "\n" AND $newline != "\r\n" AND $newline != "\r") { $this->newline = "\n"; return; } $this->newline = $newline; } // -------------------------------------------------------------------- /** * Set Message Boundary * * @access private * @return void */ function _set_boundaries() { $this->_alt_boundary = "B_ALT_".uniqid(''); // multipart/alternative $this->_atc_boundary = "B_ATC_".uniqid(''); // attachment boundary } // -------------------------------------------------------------------- /** * Get the Message ID * * @access private * @return string */ function _get_message_id() { $from = $this->_headers['Return-Path']; $from = str_replace(">", "", $from); $from = str_replace("<", "", $from); return "<".uniqid('').strstr($from, '@').">"; } // -------------------------------------------------------------------- /** * Get Mail Protocol * * @access private * @param bool * @return string */ function _get_protocol($return = true) { $this->protocol = strtolower($this->protocol); $this->protocol = ( ! in_array($this->protocol, $this->_protocols, TRUE)) ? 'mail' : $this->protocol; if ($return == true) return $this->protocol; } // -------------------------------------------------------------------- /** * Get Mail Encoding * * @access private * @param bool * @return string */ function _get_encoding($return = true) { $this->_encoding = ( ! in_array($this->_encoding, $this->_bit_depths)) ? '7bit' : $this->_encoding; if ( ! in_array($this->charset, $this->_base_charsets, TRUE)) $this->_encoding = "8bit"; if ($return == true) return $this->_encoding; } // -------------------------------------------------------------------- /** * Get content type (text/html/attachment) * * @access private * @return string */ function _get_content_type() { if ($this->mailtype == 'html' && count($this->_attach_name) == 0) return 'html'; elseif ($this->mailtype == 'html' && count($this->_attach_name) > 0) return 'html-attach'; elseif ($this->mailtype == 'text' && count($this->_attach_name) > 0) return 'plain-attach'; else return 'plain'; } // -------------------------------------------------------------------- /** * Set RFC 822 Date * * @access public * @return string */ function _set_date() { $timezone = date("Z"); $operator = (substr($timezone, 0, 1) == '-') ? '-' : '+'; $timezone = abs($timezone); $timezone = floor($timezone/3600) * 100 + ($timezone % 3600 ) / 60; return sprintf("%s %s%04d", date("D, j M Y H:i:s"), $operator, $timezone); } // -------------------------------------------------------------------- /** * Mime message * * @access private * @return string */ function _get_mime_message() { return "This is a multi-part message in MIME format.".$this->newline."Your email application may not support this format."; } // -------------------------------------------------------------------- /** * Validate Email Address * * @access public * @param string * @return bool */ function validate_email($email) { if ( ! is_array($email)) { $this->_set_error_message('email_must_be_array'); return FALSE; } foreach ($email as $val) { if ( ! $this->valid_email($val)) { $this->_set_error_message('email_invalid_address', $val); return FALSE; } } } // -------------------------------------------------------------------- /** * Email Validation * * @access public * @param string * @return bool */ function valid_email($address) { if ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $address)) return FALSE; else return TRUE; } // -------------------------------------------------------------------- /** * Clean Extended Email Address: Joe Smith * * @access public * @param string * @return string */ function clean_email($email) { if ( ! is_array($email)) { if (preg_match('/\<(.*)\>/', $email, $match)) return $match['1']; else return $email; } $clean_email = array(); for ($i=0; $i < count($email); $i++) { if (preg_match( '/\<(.*)\>/', $email[$i], $match)) $clean_email[] = $match['1']; else $clean_email[] = $email[$i]; } return $clean_email; } // -------------------------------------------------------------------- /** * Build alternative plain text message * * This function provides the raw message for use * in plain-text headers of HTML-formatted emails. * If the user hasn't specified his own alternative message * it creates one by stripping the HTML * * @access private * @return string */ function _get_alt_message() { if ($this->alt_message != "") { return $this->word_wrap($this->alt_message, '76'); } if (eregi( '\', $this->_body, $match)) { $body = $match['1']; $body = substr($body, strpos($body, ">") + 1); } else { $body = $this->_body; } $body = trim(strip_tags($body)); $body = preg_replace( '# - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - - -

    Database Configuration

    - -

    CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.). -The config file is located at:

    - -

    application/config/database.php

    - -

    The config settings are stored in a multi-dimensional array with this prototype:

    - -$db['default']['hostname'] = "localhost";
    -$db['default']['username'] = "root";
    -$db['default']['password'] = "";
    -$db['default']['database'] = "database_name";
    -$db['default']['dbdriver'] = "mysql";
    -$db['default']['dbprefix'] = "";
    -$db['default']['pconnect'] = TRUE;
    -$db['default']['db_debug'] = FALSE;
    -$db['default']['active_r'] = TRUE;     - -

    The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store -multiple sets of connection values. If, for example, you run multiple environments (development, production, test, etc.) -under a single installation, you can set up a connection group for each, then switch between groups as needed. -For example, to set up a "test" environment you would do this:

    - -$db['test']['hostname'] = "localhost";
    -$db['test']['username'] = "root";
    -$db['test']['password'] = "";
    -$db['test']['database'] = "database_name";
    -$db['test']['dbdriver'] = "mysql";
    -$db['test']['dbprefix'] = "";
    -$db['test']['pconnect'] = TRUE;
    -$db['test']['db_debug'] = FALSE;
    -$db['test']['active_r'] = TRUE;     - - -

    Then, to globally tell the system to use that group you would set this variable located in the config file:

    - -$active_group = "test"; - -

    Note: The name "test" is arbitrary. It can be anything you want. By default we've used the word "default" -for the primary connection, but it too can be renamed to something more relevant to your project.

    - -

    Explanation of Values:

    - -
      -
    • hostname - The hostname of your database server. Often this is "localhost".
      • -
    • 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, postgre, obdc, etc. Must be specified in lower case.
      • -
    • dbprefix - An optional table prefix which will added to the table name when running Active Record queries. This permits multiple CodeIgniter installations to share one database.
      • -
    • pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
      • -
    • db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
      • -
    • active_r - TRUE/FALSE (boolean) - Whether to load the Active Record Class. If you are not using the active record class you can have it omitted when the database classes are initialized in order to utilize less resources.
      • -
    • port - The database port number. Currently only used with the Postgre driver.
      • -
    - -

    Note: Depending on what database platform you are using (MySQL, Postgre, etc.) -not all values will be needed. For example, when using SQLite you will not need to supply a username or password, and -the database name will be the path to your database file. The information above assumes you are using MySQL.

    - - - -
    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : Database Configuration

    CodeIgniter User Guide Version 1.5.4

    Database Configuration

    CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.). The config file is located at:

    application/config/database.php

    The config settings are stored in a multi-dimensional array with this prototype:

    $db['default']['hostname'] = "localhost";
    $db['default']['username'] = "root";
    $db['default']['password'] = "";
    $db['default']['database'] = "database_name";
    $db['default']['dbdriver'] = "mysql";
    $db['default']['dbprefix'] = "";
    $db['default']['pconnect'] = TRUE;
    $db['default']['db_debug'] = FALSE;
    $db['default']['active_r'] = TRUE;

    The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store multiple sets of connection values. If, for example, you run multiple environments (development, production, test, etc.) under a single installation, you can set up a connection group for each, then switch between groups as needed. For example, to set up a "test" environment you would do this:

    $db['test']['hostname'] = "localhost";
    $db['test']['username'] = "root";
    $db['test']['password'] = "";
    $db['test']['database'] = "database_name";
    $db['test']['dbdriver'] = "mysql";
    $db['test']['dbprefix'] = "";
    $db['test']['pconnect'] = TRUE;
    $db['test']['db_debug'] = FALSE;
    $db['test']['active_r'] = TRUE;

    Then, to globally tell the system to use that group you would set this variable located in the config file:

    $active_group = "test";

    Note: The name "test" is arbitrary. It can be anything you want. By default we've used the word "default" for the primary connection, but it too can be renamed to something more relevant to your project.

    Explanation of Values:

    • hostname - The hostname of your database server. Often this is "localhost".
    • 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, postgre, obdc, etc. Must be specified in lower case.
    • dbprefix - An optional table prefix which will added to the table name when running Active Record queries. This permits multiple CodeIgniter installations to share one database.
    • pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
    • db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
    • active_r - TRUE/FALSE (boolean) - Whether to load the Active Record Class. If you are not using the active record class you can have it omitted when the database classes are initialized in order to utilize less resources.

      Note: that some CodeIgniter classes such as Sessions require Active Records be enabled to access certain functionality.

    • port - The database port number. Currently only used with the Postgre driver.

    Note: Depending on what database platform you are using (MySQL, Postgre, etc.) not all values will be needed. For example, when using SQLite you will not need to supply a username or password, and the database name will be the path to your database file. The information above assumes you are using MySQL.

    \ No newline at end of file diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index c9a38a96..6da925f9 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -1,115 +1 @@ - - - - -CodeIgniter User Guide : Web Page Caching - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Web Page Caching

    - -

    CodeIgniter lets you cache your pages in order to achieve maximum performance.

    - -

    Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the -server resources, memory, and processing cycles utilized, which affect your page load speeds. -By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.

    - - -

    How Does Caching Work?

    - -

    Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed. -When a page is loaded for the first time, the cache file will be written to your system/cache folder. On subsequent page loads the cache file will be retrieved -and sent to the requesting user's browser. If it has expired, it will be deleted and refreshed before being sent to the browser.

    - -

    Note: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled.

    - -

    Enabling Caching

    - -

    To enable caching, put the following tag in any of your controller functions:

    - -$this->output->cache(n); - -

    Where n is the number of minutes you wish the page to remain cached between refreshes.

    - -

    The above tag can go anywhere within a function. It is not affected by the order that it appears, so place it wherever it seems -most logical to you. Once the tag is in place, your pages will begin being cached.

    - -

    Warning: Because of the way CodeIgniter stores content for output, caching will only work if you are generating display for your controller with a view.

    -

    Note: Before the cache files can be written you must set the file permissions on your -system/cache folder such that it is writable (666 is usually appropriate).

    - -

    Deleting Caches

    - -

    If you no longer wish to cache a file you can remove the caching tag and it will no longer be refreshed when it expires. Note: -Removing the tag will not delete the cache immediately. It will have to expire normally. If you need to remove it earlier you -will need to manually delete it from your cache folder.

    - - - -
    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : Web Page Caching

    CodeIgniter User Guide Version 1.5.4

    Web Page Caching

    CodeIgniter lets you cache your pages in order to achieve maximum performance.

    Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the server resources, memory, and processing cycles utilized, which affect your page load speeds. By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.

    How Does Caching Work?

    Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed. When a page is loaded for the first time, the cache file will be written to your system/cache folder. On subsequent page loads the cache file will be retrieved and sent to the requesting user's browser. If it has expired, it will be deleted and refreshed before being sent to the browser.

    Note: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled.

    Enabling Caching

    To enable caching, put the following tag in any of your controller functions:

    $this->output->cache(n);

    Where n is the number of minutes you wish the page to remain cached between refreshes.

    The above tag can go anywhere within a function. It is not affected by the order that it appears, so place it wherever it seems most logical to you. Once the tag is in place, your pages will begin being cached.

    Warning: Because of the way CodeIgniter stores content for output, caching will only work if you are generating display for your controller with a view.

    Note: Before the cache files can be written you must set the file permissions on your system/cache folder such that it is writable (666 is usually appropriate, some servers require 777).

    Deleting Caches

    If you no longer wish to cache a file you can remove the caching tag and it will no longer be refreshed when it expires. Note: Removing the tag will not delete the cache immediately. It will have to expire normally. If you need to remove it earlier you will need to manually delete it from your cache folder.

    \ No newline at end of file diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 0205d97e..4b71480b 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -1,252 +1 @@ - - - - -CodeIgniter User Guide : URI Class - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    URI Class

    - -

    The URI Class provides functions that help you retrieve information from your URI strings. If you use URI routing, you can -also retrieve information about the re-routed segments.

    - -

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    - -

    $this->uri->segment(n)

    - -

    Permits you to retrieve a specific segment. Where n is the segment number you wish to retrieve. -Segments are numbered from left to right. For example, if your full URL is this:

    - -http://www.your-site.com/index.php/news/local/metro/crime_is_up - -

    The segment numbers would be this:

    - -
      -
    1. news
      2. -
    2. local
      3. -
    3. metro
      4. -
    4. crime_is_up
      5. -
    - -

    By default the function returns FALSE (boolean) if the segment does not exist. There is an optional second parameter that -permits you to set your own default value if the segment is missing. -For example, this would tell the function to return the number zero in the event of failure:

    - -$product_id = $this->uri->segment(3, 0); - -

    It helps avoid having to write code like this:

    - -if ($this->uri->segment(3) === FALSE)
    -{
    -    $product_id = 0;
    -}
    -else
    -{
    -    $product_id = $this->uri->segment(3);
    -}
    -     - -

    $this->uri->rsegment(n)

    - -

    This function is identical to the previous one, except that it lets you retrieve a specific segment from your -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - -

    $this->uri->slash_segment(n)

    - -

    This function is almost identical to $this->uri->segment(), except it adds a trailing and/or leading slash based on the second -parameter. If the parameter is not used, a trailing slash added. Examples:

    - -$this->uri->slash_segment(3);
    -$this->uri->slash_segment(3, 'leading');
    -$this->uri->slash_segment(3, 'both');     - -

    Returns:

    - -
      -
    1. segment/
      2. -
    2. /segment
      3. -
    3. /segment/
      4. -
    - - -

    $this->uri->slash_rsegment(n)

    - -

    This function is identical to the previous one, except that it lets you add slashes a specific segment from your -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - - -

    $this->uri->uri_to_assoc(n)

    - -

    This function lets you turn URI segments into and associative array of key/value pairs. Consider this URI:

    - -index.php/user/search/name/joe/location/UK/gender/male - -

    Using this function you can turn the URI into an associative array with this prototype:

    - -[array]
    -(
    -    'name' => 'joe'
    -    'location' => 'UK'
    -    'gender' => 'male'
    -)     - -

    The first parameter of the function lets you set an offset. By default it is set to 3 since your -URI will normally contain a controller/function in the first and second segments. Example:

    - - -$array = $this->uri->uri_to_assoc(3);
    -
    -echo $array['name']; -     - - -

    The second parameter lets you set default key names, so that the array returned by the function will always contain expected indexes, even if missing from the URI. Example:

    - - -$default = array('name', 'gender', 'location', 'type', 'sort');
    -
    -$array = $this->uri->uri_to_assoc(3, $default);     - -

    If the URI does not contain a value in your default, an array index will be set to that name, with a value of FALSE.

    - -

    Lastly, if a corresponding value is not found for a given key (if there is an odd number of URI segments) the value will be set to FALSE (boolean).

    - - -

    $this->uri->ruri_to_assoc(n)

    - -

    This function is identical to the previous one, except that it creates an associative array using the -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - -

    $this->uri->assoc_to_uri()

    - -

    Takes an associative array as input and generates a URI string from it. The array keys will be included in the string. Example:

    - -$array = array('product' => 'shoes', 'size' => 'large', 'color' => 'red');
    -
    -$str = $this->uri->assoc_to_uri($array);
    -
    -// Produces: product/shoes/size/large/color/red -     - - -

    $this->uri->uri_string()

    - -

    Returns a string with the complete URI. For example, if this is your full URL:

    - -http://www.your-site.com/index.php/news/local/345 - -

    The function would return this:

    - -news/local/345 - - -

    $this->uri->ruri_string(n)

    - -

    This function is identical to the previous one, except that it returns the -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - - -

    $this->uri->total_segments()

    - -

    Returns the total number of segments.

    - - -

    $this->uri->total_rsegments(n)

    - -

    This function is identical to the previous one, except that it returns the total number of segments in your -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - - -

    $this->uri->segment_array()

    - -

    Returns an array containing the URI segments. For example:

    - - -$segs = $this->uri->segment_array();
    -
    -foreach ($segs as $segment)
    -{
    -    echo $segment;
    -    echo '<br />';
    -}     - -

    $this->uri->rsegment_array(n)

    - -

    This function is identical to the previous one, except that it returns the array of segments in your -re-routed URI in the event you are using CodeIgniter's URI Routing feature. - - - -

    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : URI Class

    CodeIgniter User Guide Version 1.5.4

    URI Class

    The URI Class provides functions that help you retrieve information from your URI strings. If you use URI routing, you can also retrieve information about the re-routed segments.

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    $this->uri->segment(n)

    Permits you to retrieve a specific segment. Where n is the segment number you wish to retrieve. Segments are numbered from left to right. For example, if your full URL is this:

    http://www.your-site.com/index.php/news/local/metro/crime_is_up

    The segment numbers would be this:

    1. news
    2. local
    3. metro
    4. crime_is_up

    By default the function returns FALSE (boolean) if the segment does not exist. There is an optional second parameter that permits you to set your own default value if the segment is missing. For example, this would tell the function to return the number zero in the event of failure:

    $product_id = $this->uri->segment(3, 0);

    It helps avoid having to write code like this:

    if ($this->uri->segment(3) === FALSE)
    {
        $product_id = 0;
    }
    else
    {
        $product_id = $this->uri->segment(3);
    }

    $this->uri->rsegment(n)

    This function is identical to the previous one, except that it lets you retrieve a specific segment from your re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->slash_segment(n)

    This function is almost identical to $this->uri->segment(), except it adds a trailing and/or leading slash based on the second parameter. If the parameter is not used, a trailing slash added. Examples:

    $this->uri->slash_segment(3);
    $this->uri->slash_segment(3, 'leading');
    $this->uri->slash_segment(3, 'both');

    Returns:

    1. segment/
    2. /segment
    3. /segment/

    $this->uri->slash_rsegment(n)

    This function is identical to the previous one, except that it lets you add slashes a specific segment from your re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->uri_to_assoc(n)

    This function lets you turn URI segments into and associative array of key/value pairs. Consider this URI:

    index.php/user/search/name/joe/location/UK/gender/male

    Using this function you can turn the URI into an associative array with this prototype:

    [array]
    (
        'name' => 'joe'
        'location' => 'UK'
        'gender' => 'male'
    )

    The first parameter of the function lets you set an offset. By default it is set to 3 since your URI will normally contain a controller/function in the first and second segments. Example:

    $array = $this->uri->uri_to_assoc(3);

    echo $array['name'];

    The second parameter lets you set default key names, so that the array returned by the function will always contain expected indexes, even if missing from the URI. Example:

    $default = array('name', 'gender', 'location', 'type', 'sort');

    $array = $this->uri->uri_to_assoc(3, $default);

    If the URI does not contain a value in your default, an array index will be set to that name, with a value of FALSE.

    Lastly, if a corresponding value is not found for a given key (if there is an odd number of URI segments) the value will be set to FALSE (boolean).

    $this->uri->ruri_to_assoc(n)

    This function is identical to the previous one, except that it creates an associative array using the re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->assoc_to_uri()

    Takes an associative array as input and generates a URI string from it. The array keys will be included in the string. Example:

    $array = array('product' => 'shoes', 'size' => 'large', 'color' => 'red');

    $str = $this->uri->assoc_to_uri($array);

    // Produces: product/shoes/size/large/color/red

    $this->uri->uri_string()

    Returns a string with the complete URI. For example, if this is your full URL:

    http://www.your-site.com/index.php/news/local/345

    The function would return this:

    /news/local/345

    $this->uri->ruri_string(n)

    This function is identical to the previous one, except that it returns the re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->total_segments()

    Returns the total number of segments.

    $this->uri->total_rsegments(n)

    This function is identical to the previous one, except that it returns the total number of segments in your re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->segment_array()

    Returns an array containing the URI segments. For example:

    $segs = $this->uri->segment_array();

    foreach ($segs as $segment)
    {
        echo $segment;
        echo '<br />';
    }

    $this->uri->rsegment_array(n)

    This function is identical to the previous one, except that it returns the array of segments in your re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    \ No newline at end of file diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 0294cef4..8614daed 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -1,172 +1 @@ - - - - -CodeIgniter User Guide : CodeIgniter at a Glance - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    CodeIgniter at a Glance

    - - -

    CodeIgniter is an Application Framework

    - -

    CodeIgniter is a toolkit for people who build web application using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code -from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and -logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by -minimizing the amount of code needed for a given task.

    - -

    CodeIgniter is Free

    -

    CodeIgniter is licensed under an Apache/BSD-style open source license so you can use it however you please. -For more information please read the license agreement.

    - - -

    CodeIgniter Runs on PHP 4

    -

    CodeIgniter is written to be compatible with PHP 4. Although we would have loved to take advantage of the better object handling -in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance), -at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our -potential audience. Major OS vendors like RedHat have yet to support PHP 5, and they are unlikely to do so until 2007, so -we felt that it did not serve the best interests of the PHP community to write CodeIgniter in PHP 5.

    - -

    Note: CodeIgniter will run on PHP 5. It simply does not take advantage of any native features that are only available in that version.

    - -

    CodeIgniter is Light Weight

    -

    Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. -Additional libraries are loaded dynamically upon request, based on your needs for a given process, so the base system -is very lean and quite fast. -

    - -

    CodeIgniter is Fast

    -

    Really fast. We challenge you to find a framework that has better performance then CodeIgniter.

    - - -

    CodeIgniter Uses M-V-C

    -

    CodeIgniter uses the Model-View-Controller approach, which allows great separation between logic and presentation. -This is particularly good for projects in which designers are working with your template files, as the code these file contain will be minimized. We describe MVC in more detail on its own page.

    - -

    CodeIgniter Generates Clean URLs

    -

    The URLs generated by CodeIgniter are clean and search-engine friendly. Rather than using the standard "query string" -approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a segment-based approach:

    - -www.your-site.com/news/article/345 - -

    Note: By default the index.php file is included in the URL but it can be removed using a simple .htaccess file.

    - -

    CodeIgniter Packs a Punch

    -

    CodeIgniter comes with full-range of libraries that enable the most commonly needed web development tasks, -like accessing a database, sending email, validating form data, maintaining sessions, manipulating images, working with XML-RPC data and -much more.

    - -

    CodeIgniter is Extensible

    -

    The system can be easily extended through the use of plugins and helper libraries, or through class extensions or system hooks.

    - - -

    CodeIgniter Does Not Require a Template Engine

    -

    Although CodeIgniter does come with a simple template parser that can be optionally used, it does not force you to use one. - -Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template -engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:

    - -<ul>
    -
    -<?php foreach ($addressbook as $name):?>
    -
    -<li><?=$name?></li>
    -
    -<?php endforeach; ?>
    -
    -</ul>     - -

    Contrast this with the pseudo-code used by a template engine:

    - -<ul>
    -
    -{foreach from=$addressbook item="name"}
    -
    -<li>{$name}</li>
    -
    -{/foreach}
    -
    -</ul>     - -

    Yes, the template engine example is a bit cleaner, but it comes at the price of performance, as the pseudo-code must be converted -back into PHP to run. Since one of our goals is maximum performance, we opted to not require the use of a template engine.

    - - -

    CodeIgniter is Thoroughly Documented

    -

    Programmers love to code and hate to write documentation. We're no different, of course, but -since documentation is as important as the code itself, -we are committed to doing it. Our source code is extremely clean and well commented as well.

    - - -

    CodeIgniter has a Friendly Community of Users

    - -

    Our growing community of users can be seen actively participating in our Community Forums.

    - - -
    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : CodeIgniter at a Glance

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter at a Glance

    CodeIgniter is an Application Framework

    CodeIgniter is a toolkit for people who build web application using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by minimizing the amount of code needed for a given task.

    CodeIgniter is Free

    CodeIgniter is licensed under an Apache/BSD-style open source license so you can use it however you please. For more information please read the license agreement.

    CodeIgniter Runs on PHP 4

    CodeIgniter is written to be compatible with PHP 4. Although we would have loved to take advantage of the better object handling in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance), at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our potential audience. Major OS vendors like RedHat have yet to support PHP 5, and they are unlikely to do so until 2007, so we felt that it did not serve the best interests of the PHP community to write CodeIgniter in PHP 5.

    Note: CodeIgniter will run on PHP 5. It simply does not take advantage of any native features that are only available in that version.

    CodeIgniter is Light Weight

    Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. Additional libraries are loaded dynamically upon request, based on your needs for a given process, so the base system is very lean and quite fast.

    CodeIgniter is Fast

    Really fast. We challenge you to find a framework that has better performance than CodeIgniter.

    CodeIgniter Uses M-V-C

    CodeIgniter uses the Model-View-Controller approach, which allows great separation between logic and presentation. This is particularly good for projects in which designers are working with your template files, as the code these file contain will be minimized. We describe MVC in more detail on its own page.

    CodeIgniter Generates Clean URLs

    The URLs generated by CodeIgniter are clean and search-engine friendly. Rather than using the standard "query string" approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a segment-based approach:

    www.your-site.com/news/article/345

    Note: By default the index.php file is included in the URL but it can be removed using a simple .htaccess file.

    CodeIgniter Packs a Punch

    CodeIgniter comes with full-range of libraries that enable the most commonly needed web development tasks, like accessing a database, sending email, validating form data, maintaining sessions, manipulating images, working with XML-RPC data and much more.

    CodeIgniter is Extensible

    The system can be easily extended through the use of plugins and helper libraries, or through class extensions or system hooks.

    CodeIgniter Does Not Require a Template Engine

    Although CodeIgniter does come with a simple template parser that can be optionally used, it does not force you to use one. Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:

    <ul>

    <?php foreach ($addressbook as $name):?>

    <li><?=$name?></li>

    <?php endforeach; ?>

    </ul>

    Contrast this with the pseudo-code used by a template engine:

    <ul>

    {foreach from=$addressbook item="name"}

    <li>{$name}</li>

    {/foreach}

    </ul>

    Yes, the template engine example is a bit cleaner, but it comes at the price of performance, as the pseudo-code must be converted back into PHP to run. Since one of our goals is maximum performance, we opted to not require the use of a template engine.

    CodeIgniter is Thoroughly Documented

    Programmers love to code and hate to write documentation. We're no different, of course, but since documentation is as important as the code itself, we are committed to doing it. Our source code is extremely clean and well commented as well.

    CodeIgniter has a Friendly Community of Users

    Our growing community of users can be seen actively participating in our Community Forums.

    \ No newline at end of file From a19b94246799a1b81a478a6de84f02c73eb993bd Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 10 Dec 2007 02:22:07 +0000 Subject: [PATCH 0738/2544] modified an example that may cause confusion. --- user_guide/general/caching.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 6da925f9..959994f0 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -1 +1 @@ - CodeIgniter User Guide : Web Page Caching

    CodeIgniter User Guide Version 1.5.4

    Web Page Caching

    CodeIgniter lets you cache your pages in order to achieve maximum performance.

    Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the server resources, memory, and processing cycles utilized, which affect your page load speeds. By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.

    How Does Caching Work?

    Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed. When a page is loaded for the first time, the cache file will be written to your system/cache folder. On subsequent page loads the cache file will be retrieved and sent to the requesting user's browser. If it has expired, it will be deleted and refreshed before being sent to the browser.

    Note: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled.

    Enabling Caching

    To enable caching, put the following tag in any of your controller functions:

    $this->output->cache(n);

    Where n is the number of minutes you wish the page to remain cached between refreshes.

    The above tag can go anywhere within a function. It is not affected by the order that it appears, so place it wherever it seems most logical to you. Once the tag is in place, your pages will begin being cached.

    Warning: Because of the way CodeIgniter stores content for output, caching will only work if you are generating display for your controller with a view.

    Note: Before the cache files can be written you must set the file permissions on your system/cache folder such that it is writable (666 is usually appropriate, some servers require 777).

    Deleting Caches

    If you no longer wish to cache a file you can remove the caching tag and it will no longer be refreshed when it expires. Note: Removing the tag will not delete the cache immediately. It will have to expire normally. If you need to remove it earlier you will need to manually delete it from your cache folder.

    \ No newline at end of file + CodeIgniter User Guide : Web Page Caching

    CodeIgniter User Guide Version 1.5.4

    Web Page Caching

    CodeIgniter lets you cache your pages in order to achieve maximum performance.

    Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the server resources, memory, and processing cycles utilized, which affect your page load speeds. By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.

    How Does Caching Work?

    Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed. When a page is loaded for the first time, the cache file will be written to your system/cache folder. On subsequent page loads the cache file will be retrieved and sent to the requesting user's browser. If it has expired, it will be deleted and refreshed before being sent to the browser.

    Note: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled.

    Enabling Caching

    To enable caching, put the following tag in any of your controller functions:

    $this->output->cache(n);

    Where n is the number of minutes you wish the page to remain cached between refreshes.

    The above tag can go anywhere within a function. It is not affected by the order that it appears, so place it wherever it seems most logical to you. Once the tag is in place, your pages will begin being cached.

    Warning: Because of the way CodeIgniter stores content for output, caching will only work if you are generating display for your controller with a view.

    Note: Before the cache files can be written you must set the file permissions on your system/cache folder such that it is writable.

    Deleting Caches

    If you no longer wish to cache a file you can remove the caching tag and it will no longer be refreshed when it expires. Note: Removing the tag will not delete the cache immediately. It will have to expire normally. If you need to remove it earlier you will need to manually delete it from your cache folder.

    \ No newline at end of file From b0de4067eca0ebb744bd5b1236cfae8a58c26abf Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 10 Dec 2007 13:25:16 +0000 Subject: [PATCH 0739/2544] typo fix in example --- user_guide/database/active_record.html | 613 +------------------------ 1 file changed, 1 insertion(+), 612 deletions(-) diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 80af07ca..ee7b245d 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -1,612 +1 @@ - - - - -CodeIgniter User Guide : Active Record - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - - -

    Active Record Class

    - - -

    CodeIgniter uses a modified version of the Active Record Database Pattern. -This pattern allows information to be retrieved, inserted, and updated in your database with minimal scripting. -In some cases only one or two lines of code are necessary to perform a database action. -CodeIgniter does not require that each database table be its own class file. It instead provides a more simplified interface.

    - -

    Beyond simplicity, a major benefit to using the Active Record features is that it allows you to create database independent applications, since the query syntax -is generated by each database adapter. It also allows for safer queries, since the values are escaped automatically by the system.

    - -

    Note: If you intend to write your own queries you can disable this class in your database config file, allowing the core database library and adapter to utilize fewer resources.

    - -
    - - - - - - -  -

    Selecting Data

    - -

    The following functions allow you to build SQL SELECT statements.

    - -

    Note: If you are using PHP 5 you can use method chaining for more compact syntax. This is described at the end of the page.

    - - -

    $this->db->get();

    - -

    Runs the selection query and returns the result. Can be used by itself to retrieve all records from a table:

    - -$query = $this->db->get('mytable');
    -
    -// Produces: SELECT * FROM mytable     - -

    The second and third parameters enable you do set a limit and offset clause:

    - -$query = $this->db->get('mytable', 10, 20);
    -
    -// Produces: SELECT * FROM mytable LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)     - - - -

    You'll notice that the above function is assigned to a variable named $query, which can be used to show the results:

    - -$query = $this->db->get('mytable');
    -
    -foreach ($query->result() as $row)
    -{
    -    echo $row->title;
    -}     - -

    Please visit the result functions page for a full discussion regarding result generation.

    - - -

    $this->db->getwhere();

    - -

    Identical to the above function except that it permits you to add a "where" clause in the second parameter, -instead of using the db->where() function:

    - -$query = $this->db->getwhere('mytable', array('id' => $id), $limit, $offset); - -

    Please read the about the where function below for more information.

    - - -

    $this->db->select();

    - -

    Permits you to write the SELECT portion of your query:

    - - -$this->db->select('title, content, date');
    -
    -$query = $this->db->get('mytable');
    -
    -// Produces: SELECT title, content, date FROM mytable     - -

    Note: If you are selecting all (*) from a table you do not need to use this function. When omitted, CodeIgniter assumes you wish to SELECT *

    - - -

    $this->db->from();

    - -

    Permits you to write the FROM portion of your query:

    - - -$this->db->select('title, content, date');
    -$this->db->from('mytable');
    -
    -$query = $this->db->get();
    -
    -// Produces: SELECT title, content, date FROM mytable     - -

    Note: As shown earlier, the FROM portion of your query can be specified in the $this->db->get() function, so use whichever method -you prefer.

    - -

    $this->db->join();

    - -

    Permits you to write the JOIN portion of your query:

    - - -$this->db->select('*');
    -$this->db->from('blogs');
    -$this->db->join('comments', 'comments.id = blogs.id');
    -
    -$query = $this->db->get();
    -
    -// Produces:
    -// SELECT * FROM blogs
    -// JOIN comments ON comments.id = blogs.id
    -     - -

    Multiple function calls can be made if you need several joins in one query.

    - -

    If you need something other than a natural JOIN you can specify it via the third parameter of the function. -Options are: left, right, outer, inner, left outer, and right outer.

    - - -$this->db->join('comments', 'comments.id = blogs.id', 'left');
    -
    -// Produces: LEFT JOIN comments ON comments.id = blogs.id     - - - - - -

    $this->db->where();

    -

    This function enables you to set WHERE clauses using one of four methods:

    - -

    Note: All values passed to this function are escaped automatically, producing safer queries.

    - -
      -
    1. Simple key/value method: - - $this->db->where('name', $name); -

      // Produces: WHERE name = 'Joe' -       - -

      Notice that the equal sign is added for you.

      - -

      If you use multiple function calls they will be chained together with AND between them:

      - - $this->db->where('name', $name);
      - $this->db->where('title', $title);
      - $this->db->where('status', $status); -

      // WHERE = 'Joe' AND title = 'boss' AND status = 'active' -       - - -
      2. - -
    2. Custom key/value method: - -

      You can include an operator in the first parameter in order to control the comparison:

      - - $this->db->where('name !=', $name);
      - $this->db->where('id <', $id); -

      // Produces: WHERE name != 'Joe' AND id < 45 -       - - - -
      3. -
    3. Associative array method: - - - - $array = array('name' => $name, 'title' => $title, 'status' => $status);

      - - $this->db->where($array); -

      // Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active' -       - -

      You can include your own operators using this method as well:

      - - - $array = array('name !=' => $name, 'id <' => $id, 'date >' => $date);

      - - $this->db->where($array);       - -
      4. -
    4. Custom string: - -

      You can write your own clauses manually:

      - - - $where = "name='Joe' AND status='boss' OR status='active'";

      - $this->db->where($where);       - -
      5. -
    - - -

    $this->db->orwhere();

    -

    This function is identical to the one above, except that multiple instances are joined by OR:

    - - -$this->db->where('name !=', $name);
    -$this->db->orwhere('id >', $id); -

    // Produces: WHERE name != 'Joe' OR id > 50 -     - - - - -

    $this->db->like();

    -

    This function enables you to generate LIKE clauses, useful for doing searches.

    - -

    Note: All values passed to this function are escaped automatically.

    - - -
      -
    1. Simple key/value method: - - $this->db->like('title', $match); -

      // Produces: WHERE title LIKE '%match%' -       - -

      If you use multiple function calls they will be chained together with AND between them:

      - - $this->db->like('title', $match);
      - $this->db->like('body', $match); -

      // WHERE title LIKE '%match%' AND body LIKE '%match%' -       - -
      2. - -
    2. Associative array method: - - - $array = array('title' => $match, 'page1' => $match, 'page2' => $match);

      - - $this->db->like($array); -

      // WHERE title LIKE '%match%' AND page1 LIKE '%match%' AND page2 LIKE '%match%' -       - -
      3. -
    - - -

    $this->db->orlike();

    -

    This function is identical to the one above, except that multiple instances are joined by OR:

    - - -$this->db->like('title', $match);
    -$this->db->orlike('body', $match); -

    // WHERE title LIKE '%match%' OR body LIKE '%match%' -     - - - - -

    $this->db->groupby();

    - -

    Permits you to write the GROUP BY portion of your query:

    - -$this->db->groupby("title"); -

    // Produces: GROUP BY title -     - -

    You can also pass an array of multiple values as well:

    - -$this->db->groupby(array("title", "date"); -

    // Produces: GROUP BY title, date -     - - -

    $this->db->having();

    - -

    Permits you to write the HAVING portion of your query:

    - -$this->db->having('user_id = 45'); -

    // Produces: HAVING 'user_id = 45' -     - -

    You can also pass an array of multiple values as well:

    - - -$this->db->having(array('title =' => 'My Title', 'id <' => $id)); -

    // Produces: HAVING title = 'My Title', 'id < 45' -     - - - -

    $this->db->orderby();

    -

    Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. -The second parameter lets you set the direction of the result. Options are asc or desc

    - -$this->db->orderby("title", "desc"); -

    // Produces: ORDER BY title DESC -     - -

    You can also pass your own string in the first parameter:

    - -$this->db->orderby('title desc, name asc'); -

    // Produces: ORDER BY title DESC, name ASC -     - -

    Or multiple function calls can be made if you need multiple fields.

    - -$this->db->orderby("title", "desc");
    -$this->db->orderby("name", "asc"); -

    // Produces: ORDER BY title DESC, name ASC -     - - -

    $this->db->limit();

    -

    Lets you limit the number of rows you would like returned by the query:

    - - -$this->db->limit(10);
    -
    -// Produces: LIMIT 10     - - -

    The second parameter lets you set a result offset.

    - - -$this->db->limit(10, 20);
    -
    -// Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)     - - -

    $this->db->count_all();

    - -

    Permits you to determine the number of rows in a particular table. Submit the table name in the first parameter. Example:

    - -echo $this->db->count_all('my_table');
    -
    -// Produces an integer, like 25     - - - - -  -

    Inserting Data

    - -

    $this->db->insert();

    -

    Generates an insert string based on the data you supply, and runs the query. You can either pass an -array or an object to the function. Here is an example using an array:

    - - -$data = array(
    -               'title' => 'My title' ,
    -               'name' => 'My Name' ,
    -               'date' => 'My date'
    -            );
    -
    -$this->db->insert('mytable', $data); -

    -// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')     - -

    The first parameter will contain the table name, the second is an associative array of values.

    - -

    Here is an example using an object:

    - - -/*
    -    class Myclass {
    -        var $title = 'My Title';
    -        var $content = 'My Content';
    -        var $date = 'My Date';
    -    }
    -*/
    -
    -$object = new Myclass;
    -
    -$this->db->insert('mytable', $object); -

    -// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')     - -

    The first parameter will contain the table name, the second is an associative array of values.

    - -

    Note: All values are escaped automatically producing safer queries.

    - - - - -

    $this->db->set();

    -

    This function enables you to set values for inserts or updates.

    - -

    It can be used instead of passing a data array directly to the insert or update functions:

    - -$this->db->set('name', $name); -
    -$this->db->insert('mytable'); -

    -// Produces: INSERT INTO mytable (name) VALUES ('{$name}')     - -

    If you use multiple function called they will be assembled properly based on whether you are doing an insert or an update:

    - -$this->db->set('name', $name);
    -$this->db->set('title', $title);
    -$this->db->set('status', $status);
    -$this->db->insert('mytable'); -     - -

    You can also pass an associative array to this function:

    - - -$array = array('name' => $name, 'title' => $title, 'status' => $status);

    - -$this->db->set($array);
    -$this->db->insert('mytable'); -     - -

    Or an object:

    - - - -/*
    -    class Myclass {
    -        var $title = 'My Title';
    -        var $content = 'My Content';
    -        var $date = 'My Date';
    -    }
    -*/
    -
    -$object = new Myclass;
    -
    -$this->db->set($object);
    -$this->db->insert('mytable'); -     - - - -  -

    Updating Data

    - -

    $this->db->update();

    -

    Generates an update string and runs the query based on the data you supply. You can pass an -array or an object to the function. Here is an example using -an array:

    - - -$data = array(
    -               'title' => $title,
    -               'name' => $name,
    -               'date' => $date
    -            );
    -
    -$this->db->where('id', $id);
    -$this->db->update('mytable', $data); -

    -// Produces:
    -// UPDATE mytable
    -// SET title = '{$title}', name = '{$name}', date = '{$date}'
    -// WHERE id = $id     - -

    Or you can supply an object:

    - - -/*
    -    class Myclass {
    -        var $title = 'My Title';
    -        var $content = 'My Content';
    -        var $date = 'My Date';
    -    }
    -*/
    -
    -$object = new Myclass;
    -
    -$this->db->where('id', $id);
    -$this->db->update('mytable', $object); -
    -
    -// Produces:
    -// UPDATE mytable
    -// SET title = '{$title}', name = '{$name}', date = '{$date}'
    -// WHERE id = $id     - - - -

    Note: All values are escaped automatically producing safer queries.

    - -

    You'll notice the use of the $this->db->where() function, enabling you to set the WHERE clause. -You can optionally pass this information directly into the update function as a string:

    - -$this->db->update('mytable', $data, "id = 4"); - -

    Or as an array:

    - -$this->db->update('mytable', $data, array('id' => $id)); - -

    You may also use the $this->db->set() function described above when performing updates.

    - - -  -

    Deleting Data

    - - - -

    $this->db->delete();

    -

    Generates a delete SQL string and runs the query.

    - - -$this->db->delete('mytable', array('id' => $id)); -

    -// Produces:
    -// DELETE FROM mytable
    -// WHERE id = $id     - -

    The first parameter is the table name, the second is the where clause. You can also use the where() or orwhere() functions instead of passing -the data to the second parameter of the function:

    - - -$this->db->where('id', $id);
    -$this->db->delete('mytable'); -

    -// Produces:
    -// DELETE FROM mytable
    -// WHERE id = $id     - -

    Note: All values are escaped automatically producing safer queries.

    - - -  -

    Method Chaining

    - -

    Method chaining allows you to simplify your syntax by connecting multiple functions. Consider this example:

    - - -$this->db->select('title')->from('mytable')->where('id', $id)->limit(10, 20);
    -
    -$query = $this->db->get();     - -

    Note: Method chaining only works with PHP 5.

    - - - -
    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : Active Record

    CodeIgniter User Guide Version 1.5.4

    Active Record Class

    CodeIgniter uses a modified version of the Active Record Database Pattern. This pattern allows information to be retrieved, inserted, and updated in your database with minimal scripting. In some cases only one or two lines of code are necessary to perform a database action. CodeIgniter does not require that each database table be its own class file. It instead provides a more simplified interface.

    Beyond simplicity, a major benefit to using the Active Record features is that it allows you to create database independent applications, since the query syntax is generated by each database adapter. It also allows for safer queries, since the values are escaped automatically by the system.

    Note: If you intend to write your own queries you can disable this class in your database config file, allowing the core database library and adapter to utilize fewer resources.


     

    Selecting Data

    The following functions allow you to build SQL SELECT statements.

    Note: If you are using PHP 5 you can use method chaining for more compact syntax. This is described at the end of the page.

    $this->db->get();

    Runs the selection query and returns the result. Can be used by itself to retrieve all records from a table:

    $query = $this->db->get('mytable');

    // Produces: SELECT * FROM mytable

    The second and third parameters enable you do set a limit and offset clause:

    $query = $this->db->get('mytable', 10, 20);

    // Produces: SELECT * FROM mytable LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)

    You'll notice that the above function is assigned to a variable named $query, which can be used to show the results:

    $query = $this->db->get('mytable');

    foreach ($query->result() as $row)
    {
        echo $row->title;
    }

    Please visit the result functions page for a full discussion regarding result generation.

    $this->db->getwhere();

    Identical to the above function except that it permits you to add a "where" clause in the second parameter, instead of using the db->where() function:

    $query = $this->db->getwhere('mytable', array('id' => $id), $limit, $offset);

    Please read the about the where function below for more information.

    $this->db->select();

    Permits you to write the SELECT portion of your query:

    $this->db->select('title, content, date');

    $query = $this->db->get('mytable');

    // Produces: SELECT title, content, date FROM mytable

    Note: If you are selecting all (*) from a table you do not need to use this function. When omitted, CodeIgniter assumes you wish to SELECT *

    $this->db->from();

    Permits you to write the FROM portion of your query:

    $this->db->select('title, content, date');
    $this->db->from('mytable');

    $query = $this->db->get();

    // Produces: SELECT title, content, date FROM mytable

    Note: As shown earlier, the FROM portion of your query can be specified in the $this->db->get() function, so use whichever method you prefer.

    $this->db->join();

    Permits you to write the JOIN portion of your query:

    $this->db->select('*');
    $this->db->from('blogs');
    $this->db->join('comments', 'comments.id = blogs.id');

    $query = $this->db->get();

    // Produces:
    // SELECT * FROM blogs
    // JOIN comments ON comments.id = blogs.id

    Multiple function calls can be made if you need several joins in one query.

    If you need something other than a natural JOIN you can specify it via the third parameter of the function. Options are: left, right, outer, inner, left outer, and right outer.

    $this->db->join('comments', 'comments.id = blogs.id', 'left');

    // Produces: LEFT JOIN comments ON comments.id = blogs.id

    $this->db->where();

    This function enables you to set WHERE clauses using one of four methods:

    Note: All values passed to this function are escaped automatically, producing safer queries.

    1. Simple key/value method: $this->db->where('name', $name);

      // Produces: WHERE name = 'Joe'

      Notice that the equal sign is added for you.

      If you use multiple function calls they will be chained together with AND between them:

      $this->db->where('name', $name);
      $this->db->where('title', $title);
      $this->db->where('status', $status);

      // WHERE = 'Joe' AND title = 'boss' AND status = 'active'
    2. Custom key/value method:

      You can include an operator in the first parameter in order to control the comparison:

      $this->db->where('name !=', $name);
      $this->db->where('id <', $id);

      // Produces: WHERE name != 'Joe' AND id < 45
    3. Associative array method: $array = array('name' => $name, 'title' => $title, 'status' => $status);

      $this->db->where($array);

      // Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'

      You can include your own operators using this method as well:

      $array = array('name !=' => $name, 'id <' => $id, 'date >' => $date);

      $this->db->where($array);
    4. Custom string:

      You can write your own clauses manually:

      $where = "name='Joe' AND status='boss' OR status='active'";

      $this->db->where($where);

    $this->db->orwhere();

    This function is identical to the one above, except that multiple instances are joined by OR:

    $this->db->where('name !=', $name);
    $this->db->orwhere('id >', $id);

    // Produces: WHERE name != 'Joe' OR id > 50

    $this->db->like();

    This function enables you to generate LIKE clauses, useful for doing searches.

    Note: All values passed to this function are escaped automatically.

    1. Simple key/value method: $this->db->like('title', $match);

      // Produces: WHERE title LIKE '%match%'

      If you use multiple function calls they will be chained together with AND between them:

      $this->db->like('title', $match);
      $this->db->like('body', $match);

      // WHERE title LIKE '%match%' AND body LIKE '%match%'
    2. Associative array method: $array = array('title' => $match, 'page1' => $match, 'page2' => $match);

      $this->db->like($array);

      // WHERE title LIKE '%match%' AND page1 LIKE '%match%' AND page2 LIKE '%match%'

    $this->db->orlike();

    This function is identical to the one above, except that multiple instances are joined by OR:

    $this->db->like('title', $match);
    $this->db->orlike('body', $match);

    // WHERE title LIKE '%match%' OR body LIKE '%match%'

    $this->db->groupby();

    Permits you to write the GROUP BY portion of your query:

    $this->db->groupby("title");

    // Produces: GROUP BY title

    You can also pass an array of multiple values as well:

    $this->db->groupby(array("title", "date"));

    // Produces: GROUP BY title, date

    $this->db->having();

    Permits you to write the HAVING portion of your query:

    $this->db->having('user_id = 45');

    // Produces: HAVING 'user_id = 45'

    You can also pass an array of multiple values as well:

    $this->db->having(array('title =' => 'My Title', 'id <' => $id));

    // Produces: HAVING title = 'My Title', 'id < 45'

    $this->db->orderby();

    Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. The second parameter lets you set the direction of the result. Options are asc or desc

    $this->db->orderby("title", "desc");

    // Produces: ORDER BY title DESC

    You can also pass your own string in the first parameter:

    $this->db->orderby('title desc, name asc');

    // Produces: ORDER BY title DESC, name ASC

    Or multiple function calls can be made if you need multiple fields.

    $this->db->orderby("title", "desc");
    $this->db->orderby("name", "asc");

    // Produces: ORDER BY title DESC, name ASC

    $this->db->limit();

    Lets you limit the number of rows you would like returned by the query:

    $this->db->limit(10);

    // Produces: LIMIT 10

    The second parameter lets you set a result offset.

    $this->db->limit(10, 20);

    // Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)

    $this->db->count_all();

    Permits you to determine the number of rows in a particular table. Submit the table name in the first parameter. Example:

    echo $this->db->count_all('my_table');

    // Produces an integer, like 25      

    Inserting Data

    $this->db->insert();

    Generates an insert string based on the data you supply, and runs the query. You can either pass an array or an object to the function. Here is an example using an array:

    $data = array(
                   'title' => 'My title' ,
                   'name' => 'My Name' ,
                   'date' => 'My date'
                );

    $this->db->insert('mytable', $data);

    // Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')

    The first parameter will contain the table name, the second is an associative array of values.

    Here is an example using an object:

    /*
        class Myclass {
            var $title = 'My Title';
            var $content = 'My Content';
            var $date = 'My Date';
        }
    */

    $object = new Myclass;

    $this->db->insert('mytable', $object);

    // Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')

    The first parameter will contain the table name, the second is an associative array of values.

    Note: All values are escaped automatically producing safer queries.

    $this->db->set();

    This function enables you to set values for inserts or updates.

    It can be used instead of passing a data array directly to the insert or update functions:

    $this->db->set('name', $name);
    $this->db->insert('mytable');

    // Produces: INSERT INTO mytable (name) VALUES ('{$name}')

    If you use multiple function called they will be assembled properly based on whether you are doing an insert or an update:

    $this->db->set('name', $name);
    $this->db->set('title', $title);
    $this->db->set('status', $status);
    $this->db->insert('mytable');

    You can also pass an associative array to this function:

    $array = array('name' => $name, 'title' => $title, 'status' => $status);

    $this->db->set($array);
    $this->db->insert('mytable');

    Or an object:

    /*
        class Myclass {
            var $title = 'My Title';
            var $content = 'My Content';
            var $date = 'My Date';
        }
    */

    $object = new Myclass;

    $this->db->set($object);
    $this->db->insert('mytable');      

    Updating Data

    $this->db->update();

    Generates an update string and runs the query based on the data you supply. You can pass an array or an object to the function. Here is an example using an array:

    $data = array(
                   'title' => $title,
                   'name' => $name,
                   'date' => $date
                );

    $this->db->where('id', $id);
    $this->db->update('mytable', $data);

    // Produces:
    // UPDATE mytable
    // SET title = '{$title}', name = '{$name}', date = '{$date}'
    // WHERE id = $id

    Or you can supply an object:

    /*
        class Myclass {
            var $title = 'My Title';
            var $content = 'My Content';
            var $date = 'My Date';
        }
    */

    $object = new Myclass;

    $this->db->where('id', $id);
    $this->db->update('mytable', $object);

    // Produces:
    // UPDATE mytable
    // SET title = '{$title}', name = '{$name}', date = '{$date}'
    // WHERE id = $id

    Note: All values are escaped automatically producing safer queries.

    You'll notice the use of the $this->db->where() function, enabling you to set the WHERE clause. You can optionally pass this information directly into the update function as a string:

    $this->db->update('mytable', $data, "id = 4");

    Or as an array:

    $this->db->update('mytable', $data, array('id' => $id));

    You may also use the $this->db->set() function described above when performing updates.

     

    Deleting Data

    $this->db->delete();

    Generates a delete SQL string and runs the query.

    $this->db->delete('mytable', array('id' => $id));

    // Produces:
    // DELETE FROM mytable
    // WHERE id = $id

    The first parameter is the table name, the second is the where clause. You can also use the where() or orwhere() functions instead of passing the data to the second parameter of the function:

    $this->db->where('id', $id);
    $this->db->delete('mytable');

    // Produces:
    // DELETE FROM mytable
    // WHERE id = $id

    Note: All values are escaped automatically producing safer queries.

     

    Method Chaining

    Method chaining allows you to simplify your syntax by connecting multiple functions. Consider this example:

    $this->db->select('title')->from('mytable')->where('id', $id)->limit(10, 20);

    $query = $this->db->get();

    Note: Method chaining only works with PHP 5.

    \ No newline at end of file From fc2f834bf9b134994ef1214e06153f74f8772630 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 11 Dec 2007 13:44:20 +0000 Subject: [PATCH 0740/2544] Fixed a bug in highlight_pharse() that caused an error with slashes. --- system/helpers/text_helper.php | 2 +- user_guide/changelog.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index fb50ba9d..b75cd8f7 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -1 +1 @@ -= $n) { return trim($out).$end_char; } } } // ------------------------------------------------------------------------ /** * High ASCII to Entities * * Converts High ascii text and MS Word special characters to character entities * * @access public * @param string * @return string */ function ascii_to_entities($str) { $count = 1; $out = ''; $temp = array(); for ($i = 0, $s = strlen($str); $i < $s; $i++) { $ordinal = ord($str[$i]); if ($ordinal < 128) { $out .= $str[$i]; } else { if (count($temp) == 0) { $count = ($ordinal < 224) ? 2 : 3; } $temp[] = $ordinal; if (count($temp) == $count) { $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64); $out .= '&#'.$number.';'; $count = 1; $temp = array(); } } } return $out; } // ------------------------------------------------------------------------ /** * Entities to ASCII * * Converts character entities back to ASCII * * @access public * @param string * @param bool * @return string */ function entities_to_ascii($str, $all = TRUE) { if (preg_match_all('/\&#(\d+)\;/', $str, $matches)) { for ($i = 0, $s = count($matches['0']); $i < $s; $i++) { $digits = $matches['1'][$i]; $out = ''; if ($digits < 128) { $out .= chr($digits); } elseif ($digits < 2048) { $out .= chr(192 + (($digits - ($digits % 64)) / 64)); $out .= chr(128 + ($digits % 64)); } else { $out .= chr(224 + (($digits - ($digits % 4096)) / 4096)); $out .= chr(128 + ((($digits % 4096) - ($digits % 64)) / 64)); $out .= chr(128 + ($digits % 64)); } $str = str_replace($matches['0'][$i], $out, $str); } } if ($all) { $str = str_replace(array("&", "<", ">", """, "'", "-"), array("&","<",">","\"", "'", "-"), $str); } return $str; } // ------------------------------------------------------------------------ /** * Word Censoring Function * * Supply a string and an array of disallowed words and any * matched words will be converted to #### or to the replacement * word you've submitted. * * @access public * @param string the text string * @param string the array of censoered words * @param string the optional replacement value * @return string */ function word_censor($str, $censored, $replacement = '') { if ( ! is_array($censored)) { return $str; } $str = ' '.$str.' '; foreach ($censored as $badword) { if ($replacement != '') { $str = preg_replace("/\b(".str_replace('\*', '\w*?', preg_quote($badword)).")\b/i", $replacement, $str); } else { $str = preg_replace("/\b(".str_replace('\*', '\w*?', preg_quote($badword)).")\b/ie", "str_repeat('#', strlen('\\1'))", $str); } } return trim($str); } // ------------------------------------------------------------------------ /** * Code Highlighter * * Colorizes code strings * * @access public * @param string the text string * @return string */ function highlight_code($str) { // The highlight string function encodes and highlights // brackets so we need them to start raw $str = str_replace(array('<', '>'), array('<', '>'), $str); // Replace any existing PHP tags to temporary markers so they don't accidentally // break the string out of PHP, and thus, thwart the highlighting. $str = str_replace(array('<?php', '?>', '\\'), array('phptagopen', 'phptagclose', 'backslashtmp'), $str); // The highlight_string function requires that the text be surrounded // by PHP tags. Since we don't know if A) the submitted text has PHP tags, // or B) whether the PHP tags enclose the entire string, we will add our // own PHP tags around the string along with some markers to make replacement easier later $str = ''; // All the magic happens here, baby! $str = highlight_string($str, TRUE); // Prior to PHP 5, the highlight function used icky font tags // so we'll replace them with span tags. if (abs(phpversion()) < 5) { $str = str_replace(array(''), array(''), $str); $str = preg_replace('#color="(.*?)"#', 'style="color: \\1"', $str); } // Remove our artificially added PHP $str = preg_replace("#\.+?//tempstart\
    \#is", "\n", $str); $str = preg_replace("#\.+?//tempstart\
    #is", "\n", $str); $str = preg_replace("#//tempend.+#is", "    \n", $str); // Replace our markers back to PHP tags. $str = str_replace(array('phptagopen', 'phptagclose', 'backslashtmp'), array('<?php', '?>', '\\'), $str); //', $tag_close = '    ') { if ($str == '') { return ''; } if ($phrase != '') { return preg_replace('/('.preg_quote($phrase).')/i', $tag_open."\\1".$tag_close, $str); } return $str; } // ------------------------------------------------------------------------ /** * Word Wrap * * Wraps text at the specified character. Maintains the integrity of words. * Anything placed between {unwrap}{/unwrap} will not be word wrapped, nor * will URLs. * * @access public * @param string the text string * @param integer the number of characters to wrap at * @return string */ function word_wrap($str, $charlim = '76') { // Se the character limit if ( ! is_numeric($charlim)) $charlim = 76; // Reduce multiple spaces $str = preg_replace("| +|", " ", $str); // Standardize newlines $str = preg_replace("/\r\n|\r/", "\n", $str); // If the current word is surrounded by {unwrap} tags we'll // strip the entire chunk and replace it with a marker. $unwrap = array(); if (preg_match_all("|(\{unwrap\}.+?\{/unwrap\})|s", $str, $matches)) { for ($i = 0; $i < count($matches['0']); $i++) { $unwrap[] = $matches['1'][$i]; $str = str_replace($matches['1'][$i], "{{unwrapped".$i."}}", $str); } } // Use PHP's native function to do the initial wordwrap. // We set the cut flag to FALSE so that any individual words that are // too long get left alone. In the next step we'll deal with them. $str = wordwrap($str, $charlim, "\n", FALSE); // Split the string into individual lines of text and cycle through them $output = ""; foreach (explode("\n", $str) as $line) { // Is the line within the allowed character count? // If so we'll join it to the output and continue if (strlen($line) <= $charlim) { $output .= $line."\n"; continue; } $temp = ''; while((strlen($line)) > $charlim) { // If the over-length word is a URL we won't wrap it if (preg_match("!\[url.+\]|://|wwww.!", $line)) { break; } // Trim the word down $temp .= substr($line, 0, $charlim-1); $line = substr($line, $charlim-1); } // If $temp contains data it means we had to split up an over-length // word into smaller chunks so we'll add it back to our current line if ($temp != '') { $output .= $temp . "\n" . $line; } else { $output .= $line; } $output .= "\n"; } // Put our markers back if (count($unwrap) > 0) { foreach ($unwrap as $key => $val) { $output = str_replace("{{unwrapped".$key."}}", $val, $output); } } // Remove the unwrap tags $output = str_replace(array('{unwrap}', '{/unwrap}'), '', $output); return $output; } ?> \ No newline at end of file += $n) { return trim($out).$end_char; } } } // ------------------------------------------------------------------------ /** * High ASCII to Entities * * Converts High ascii text and MS Word special characters to character entities * * @access public * @param string * @return string */ function ascii_to_entities($str) { $count = 1; $out = ''; $temp = array(); for ($i = 0, $s = strlen($str); $i < $s; $i++) { $ordinal = ord($str[$i]); if ($ordinal < 128) { $out .= $str[$i]; } else { if (count($temp) == 0) { $count = ($ordinal < 224) ? 2 : 3; } $temp[] = $ordinal; if (count($temp) == $count) { $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64); $out .= '&#'.$number.';'; $count = 1; $temp = array(); } } } return $out; } // ------------------------------------------------------------------------ /** * Entities to ASCII * * Converts character entities back to ASCII * * @access public * @param string * @param bool * @return string */ function entities_to_ascii($str, $all = TRUE) { if (preg_match_all('/\&#(\d+)\;/', $str, $matches)) { for ($i = 0, $s = count($matches['0']); $i < $s; $i++) { $digits = $matches['1'][$i]; $out = ''; if ($digits < 128) { $out .= chr($digits); } elseif ($digits < 2048) { $out .= chr(192 + (($digits - ($digits % 64)) / 64)); $out .= chr(128 + ($digits % 64)); } else { $out .= chr(224 + (($digits - ($digits % 4096)) / 4096)); $out .= chr(128 + ((($digits % 4096) - ($digits % 64)) / 64)); $out .= chr(128 + ($digits % 64)); } $str = str_replace($matches['0'][$i], $out, $str); } } if ($all) { $str = str_replace(array("&", "<", ">", """, "'", "-"), array("&","<",">","\"", "'", "-"), $str); } return $str; } // ------------------------------------------------------------------------ /** * Word Censoring Function * * Supply a string and an array of disallowed words and any * matched words will be converted to #### or to the replacement * word you've submitted. * * @access public * @param string the text string * @param string the array of censoered words * @param string the optional replacement value * @return string */ function word_censor($str, $censored, $replacement = '') { if ( ! is_array($censored)) { return $str; } $str = ' '.$str.' '; foreach ($censored as $badword) { if ($replacement != '') { $str = preg_replace("/\b(".str_replace('\*', '\w*?', preg_quote($badword)).")\b/i", $replacement, $str); } else { $str = preg_replace("/\b(".str_replace('\*', '\w*?', preg_quote($badword)).")\b/ie", "str_repeat('#', strlen('\\1'))", $str); } } return trim($str); } // ------------------------------------------------------------------------ /** * Code Highlighter * * Colorizes code strings * * @access public * @param string the text string * @return string */ function highlight_code($str) { // The highlight string function encodes and highlights // brackets so we need them to start raw $str = str_replace(array('<', '>'), array('<', '>'), $str); // Replace any existing PHP tags to temporary markers so they don't accidentally // break the string out of PHP, and thus, thwart the highlighting. $str = str_replace(array('<?php', '?>', '\\'), array('phptagopen', 'phptagclose', 'backslashtmp'), $str); // The highlight_string function requires that the text be surrounded // by PHP tags. Since we don't know if A) the submitted text has PHP tags, // or B) whether the PHP tags enclose the entire string, we will add our // own PHP tags around the string along with some markers to make replacement easier later $str = ''; // All the magic happens here, baby! $str = highlight_string($str, TRUE); // Prior to PHP 5, the highlight function used icky font tags // so we'll replace them with span tags. if (abs(phpversion()) < 5) { $str = str_replace(array(''), array(''), $str); $str = preg_replace('#color="(.*?)"#', 'style="color: \\1"', $str); } // Remove our artificially added PHP $str = preg_replace("#\.+?//tempstart\
    \#is", "\n", $str); $str = preg_replace("#\.+?//tempstart\
    #is", "\n", $str); $str = preg_replace("#//tempend.+#is", "    \n", $str); // Replace our markers back to PHP tags. $str = str_replace(array('phptagopen', 'phptagclose', 'backslashtmp'), array('<?php', '?>', '\\'), $str); //', $tag_close = '    ') { if ($str == '') { return ''; } if ($phrase != '') { return preg_replace('/('.preg_quote($phrase, '/').')/i', $tag_open."\\1".$tag_close, $str); } return $str; } // ------------------------------------------------------------------------ /** * Word Wrap * * Wraps text at the specified character. Maintains the integrity of words. * Anything placed between {unwrap}{/unwrap} will not be word wrapped, nor * will URLs. * * @access public * @param string the text string * @param integer the number of characters to wrap at * @return string */ function word_wrap($str, $charlim = '76') { // Se the character limit if ( ! is_numeric($charlim)) $charlim = 76; // Reduce multiple spaces $str = preg_replace("| +|", " ", $str); // Standardize newlines $str = preg_replace("/\r\n|\r/", "\n", $str); // If the current word is surrounded by {unwrap} tags we'll // strip the entire chunk and replace it with a marker. $unwrap = array(); if (preg_match_all("|(\{unwrap\}.+?\{/unwrap\})|s", $str, $matches)) { for ($i = 0; $i < count($matches['0']); $i++) { $unwrap[] = $matches['1'][$i]; $str = str_replace($matches['1'][$i], "{{unwrapped".$i."}}", $str); } } // Use PHP's native function to do the initial wordwrap. // We set the cut flag to FALSE so that any individual words that are // too long get left alone. In the next step we'll deal with them. $str = wordwrap($str, $charlim, "\n", FALSE); // Split the string into individual lines of text and cycle through them $output = ""; foreach (explode("\n", $str) as $line) { // Is the line within the allowed character count? // If so we'll join it to the output and continue if (strlen($line) <= $charlim) { $output .= $line."\n"; continue; } $temp = ''; while((strlen($line)) > $charlim) { // If the over-length word is a URL we won't wrap it if (preg_match("!\[url.+\]|://|wwww.!", $line)) { break; } // Trim the word down $temp .= substr($line, 0, $charlim-1); $line = substr($line, $charlim-1); } // If $temp contains data it means we had to split up an over-length // word into smaller chunks so we'll add it back to our current line if ($temp != '') { $output .= $temp . "\n" . $line; } else { $output .= $line; } $output .= "\n"; } // Put our markers back if (count($unwrap) > 0) { foreach ($unwrap as $key => $val) { $output = str_replace("{{unwrapped".$key."}}", $val, $output); } } // Remove the unwrap tags $output = str_replace(array('{unwrap}', '{/unwrap}'), '', $output); return $output; } ?> \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 760238e3..6fcdbaad 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1 +1 @@ - CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file + CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file From 49c676be3a786f2699392a9061b228fdf76078ca Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 11 Dec 2007 16:53:36 +0000 Subject: [PATCH 0741/2544] optimized reduce_multiples and strengthened type checking --- system/helpers/string_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index 470bce2e..765e1648 100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php @@ -1 +1 @@ - $val) { $str[$key] = strip_slashes($val); } } else { $str = stripslashes($str); } return $str; } // ------------------------------------------------------------------------ /** * Strip Quotes * * Removes single and double quotes from a string * * @access public * @param string * @return string */ function strip_quotes($str) { return str_replace(array('"', "'"), '', $str); } // ------------------------------------------------------------------------ /** * Quotes to Entities * * Converts single and double quotes to entities * * @access public * @param string * @return string */ function quotes_to_entities($str) { return str_replace(array("\'","\"","'",'"'), array("'",""","'","""), $str); } // ------------------------------------------------------------------------ /** * Reduce Double Slashes * * Converts double slashes in a string to a single slash, * except those found in http:// * * http://www.some-site.com//index.php * * becomes: * * http://www.some-site.com/index.php * * @access public * @param string * @return string */ function reduce_double_slashes($str) { return preg_replace("#([^:])//+#", "\\1/", $str); } // ------------------------------------------------------------------------ /** * Reduce Multiples * * Reduces multiple instances of a particular character. Example: * * Fred, Bill,, Joe, Jimmy * * becomes: * * Fred, Bill, Joe, Jimmy * * @access public * @param string * @param string the character you wish to reduce * @param bool TRUE/FALSE - whether to trim the character from the beginning/end * @return string */ function reduce_multiples($str, $character = ',', $trim = FALSE) { $preg_chars = preg_quote($character, '#') . preg_quote($character, '#'); $str = preg_replace("#$preg_chars+#", $character, $str); if ($trim == TRUE) { $str = trim($str, $character); } return $str; } // ------------------------------------------------------------------------ /** * Create a Random String * * Useful for generating passwords or hashes. * * @access public * @param string type of random string. Options: alunum, numeric, nozero, unique * @param integer number of characters * @return string */ function random_string($type = 'alnum', $len = 8) { switch($type) { case 'alnum' : case 'numeric' : case 'nozero' : switch ($type) { case 'alnum' : $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; break; case 'numeric' : $pool = '0123456789'; break; case 'nozero' : $pool = '123456789'; break; } $str = ''; for ($i=0; $i < $len; $i++) { $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); } return $str; break; case 'unique' : return md5(uniqid(mt_rand())); break; } } // ------------------------------------------------------------------------ /** * Alternator * * Allows strings to be alternated. See docs... * * @access public * @param string (as many parameters as needed) * @return string */ function alternator() { static $i; if (func_num_args() == 0) { $i = 0; return ''; } $args = func_get_args(); return $args[($i++ % count($args))]; } // ------------------------------------------------------------------------ /** * Repeater function * * @access public * @param string * @param integer number of repeats * @return string */ function repeater($data, $num = 1) { return (($num > 0) ? str_repeat($data, $num) : ''); } ?> \ No newline at end of file + $val) { $str[$key] = strip_slashes($val); } } else { $str = stripslashes($str); } return $str; } // ------------------------------------------------------------------------ /** * Strip Quotes * * Removes single and double quotes from a string * * @access public * @param string * @return string */ function strip_quotes($str) { return str_replace(array('"', "'"), '', $str); } // ------------------------------------------------------------------------ /** * Quotes to Entities * * Converts single and double quotes to entities * * @access public * @param string * @return string */ function quotes_to_entities($str) { return str_replace(array("\'","\"","'",'"'), array("'",""","'","""), $str); } // ------------------------------------------------------------------------ /** * Reduce Double Slashes * * Converts double slashes in a string to a single slash, * except those found in http:// * * http://www.some-site.com//index.php * * becomes: * * http://www.some-site.com/index.php * * @access public * @param string * @return string */ function reduce_double_slashes($str) { return preg_replace("#([^:])//+#", "\\1/", $str); } // ------------------------------------------------------------------------ /** * Reduce Multiples * * Reduces multiple instances of a particular character. Example: * * Fred, Bill,, Joe, Jimmy * * becomes: * * Fred, Bill, Joe, Jimmy * * @access public * @param string * @param string the character you wish to reduce * @param bool TRUE/FALSE - whether to trim the character from the beginning/end * @return string */ function reduce_multiples($str, $character = ',', $trim = FALSE) { $str = preg_replace('#'.preg_quote($character, '#').'{2,}#', $character, $str); if ($trim === TRUE) { $str = trim($str, $character); } return $str; } // ------------------------------------------------------------------------ /** * Create a Random String * * Useful for generating passwords or hashes. * * @access public * @param string type of random string. Options: alunum, numeric, nozero, unique * @param integer number of characters * @return string */ function random_string($type = 'alnum', $len = 8) { switch($type) { case 'alnum' : case 'numeric' : case 'nozero' : switch ($type) { case 'alnum' : $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; break; case 'numeric' : $pool = '0123456789'; break; case 'nozero' : $pool = '123456789'; break; } $str = ''; for ($i=0; $i < $len; $i++) { $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); } return $str; break; case 'unique' : return md5(uniqid(mt_rand())); break; } } // ------------------------------------------------------------------------ /** * Alternator * * Allows strings to be alternated. See docs... * * @access public * @param string (as many parameters as needed) * @return string */ function alternator() { static $i; if (func_num_args() == 0) { $i = 0; return ''; } $args = func_get_args(); return $args[($i++ % count($args))]; } // ------------------------------------------------------------------------ /** * Repeater function * * @access public * @param string * @param integer number of repeats * @return string */ function repeater($data, $num = 1) { return (($num > 0) ? str_repeat($data, $num) : ''); } ?> \ No newline at end of file From 98d3b54265132dccb3f1c3e05ed4dae1cc7645b9 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 14 Dec 2007 13:13:21 +0000 Subject: [PATCH 0742/2544] Fixed a typo in the table library docs. --- user_guide/changelog.html | 2 +- user_guide/libraries/table.html | 293 +------------------------------- 2 files changed, 2 insertions(+), 293 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 6fcdbaad..babb020c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1 +1 @@ - CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file + CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Fixed a typo in the table library docs.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 4ce948e6..0e627d12 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -1,292 +1 @@ - - - - -CodeIgniter User Guide : HTML Table Class - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    HTML Table Class

    - -

    The Table Class provides functions that enable you to auto-generate HTML tables from arrays or database result sets.

    - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the Table class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('table'); -

    Once loaded, the Table library object will be available using: $this->table

    - - -

    Examples

    - -

    Here is an example showing how you can create a table from a multi-dimensional array. -Note that the first array index will become the table heading (or you can set your own headings using the -set_heading() function described in the function reference below).

    - - -$this->load->library('table');
    -
    -$data = array(
    -             array('Name', 'Color', 'Size'),
    -             array('Fred', 'Blue', 'Small'),
    -             array('Mary', 'Red', 'Large'),
    -             array('John', 'Green', 'Medium')
    -             );
    -
    -echo $this->table->generate($data); -     - -

    Here is an example of a table created from a database query result. The table class will automatically generate the -headings based on the table names (or you can set your own headings using the set_heading() function described -in the function reference below).

    - - -$this->load->library('table');
    -
    -$query = $this->db->query("SELECT * FROM my_table");
    -
    -echo $this->table->generate($query); -     - - -

    Here is an example showing how you might create a table using discreet parameters:

    - - -$this->load->library('table');
    -
    -$this->table->set_heading('Name', 'Color', 'Size');
    -
    -$this->table->add_row('Fred', 'Blue', 'Small');
    -$this->table->add_row('Mary', 'Red', 'Large');
    -$this->table->add_row('John', 'Green', 'Medium');
    -
    -echo $this->table->generate(); -     - -

    Here is the same example, except instead of individual parameters, arrays are used:

    - - -$this->load->library('table');
    -
    -$this->table->set_heading(array('Name', 'Color', 'Size'));
    -
    -$this->table->add_row(array('Fred', 'Blue', 'Small'));
    -$this->table->add_row(array('Mary', 'Red', 'Large'));
    -$this->table->add_row(array('John', 'Green', 'Medium'));
    -
    -echo $this->table->generate(); -     - - -

    Changing the Look of Your Table

    - -

    The Table Class permits you to set a table template with which you can specify the design of your layout. Here is the template -prototype:

    - - -$tmpl = array (
    -                    'table_open'          => '<table border="0" cellpadding="4" cellspacing="0">',
    -
    -                    'heading_row_start'   => '<tr>',
    -                    'heading_row_end'     => '</tr>',
    -                    'heading_cell_start'  => '<th>',
    -                    'heading_cell_end'    => '</th>',
    -
    -                    'row_start'           => '<tr>',
    -                    'row_end'             => '</tr>',
    -                    'cell_start'          => '<td>',
    -                    'cell_end'            => '</td>',
    -
    -                    'row_alt_start'       => '<tr>',
    -                    'row_alt_end'         => '</tr>',
    -                    'cell_alt_start'      => '<td>',
    -                    'cell_alt_end'        => '</td>',
    -
    -                    'table_close'         => '</table>'
    -              );
    - -
    -$this->table->set_template($tmpl); -     - -

    Note:  You'll notice there are two sets of "row" blocks in the template. These permit you to create alternating row colors or design elements that alternate with each -iteration of the row data.

    - -

    You are NOT required to submit a complete template. If you only need to change parts of the layout you can simply submit those elements. -In this example, only the table opening tag is being changed:

    - - -$tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );
    - -
    -$this->table->set_template($tmpl); -     - -
    -

    Function Reference

    - -

    $this->table->generate()

    -

    Returns a string containing the generated table. Accepts an optional parameter which can be an array or a database result object.

    - -

    $this->table->set_caption()

    - -

    Permits you to add a caption to the table.

    - -$this->table->set_caption('Colors'); - -

    $this->table->set_heading()

    - -

    Permits you to set the table heading. You can submit an array or discreet params:

    - -$this->table->set_heading('Name', 'Color', 'Size'); -$this->table->set_heading(array('Name', 'Color', 'Size')); - -

    $this->table->add_row()

    - -

    Permits you to add a row to your table. You can submit an array or discreet params:

    - -$this->table->add_row('Blue', 'Red', 'Green'); -$this->table->add_row(array('Blue', 'Red', 'Green')); - - -

    $this->table->make_columns()

    - -

    This function takes a one-dimensional array as input and creates -a multi-dimensional array with a depth equal to the number of -columns desired. This allows a single array with many elements to be -displayed in a table that has a fixed column count. Consider this example:

    - - -$list = array('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve');
    -
    -$new_list = $this->table->make_columns($list, 3);
    -
    -$this->table->generate($new_list)
    -
    -// Generates a table with this prototype
    -
    -<table border="0" cellpadding="4" cellspacing="0">
    -<tr>
    -<td>one</td><td>two</td><td>three</td>
    -</tr><tr>
    -<td>four</td><td>five</td><td>six</td>
    -</tr><tr>
    -<td>seven</td><td>eight</td><td>nine</td>
    -</tr><tr>
    -<td>ten</td><td>eleven</td><td>twelve</td></tr>
    -</table>     - - - -

    $this->table->set_template()

    - -

    Permits you to set your template. You can submit a full or partial template.

    - - -$tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );
    - -
    -$this->table->set_template($tmpl); -     - - -

    $this->table->set_empty()

    - -

    Let's you set a default value for use in any table cells that are empty. You might, for example, set a non-breaking space:

    - - -$this->table->set_empty("&nbsp;"); - - -

    $this->table->clear()

    - -

    Lets you clear the table heading and row data. If you need to show multiple tables with different data you should -to call this function after each table has been generated to empty the previous table information. Example:

    - - -$this->load->library('table');
    -
    -$this->table->set_heading('Name', 'Color', 'Size');
    -$this->table->add_row('Fred', 'Blue', 'Small');
    -$this->table->add_row('Mary', 'Red', 'Large');
    -$this->table->add_row('John', 'Green', 'Medium');
    -
    -echo $this->table->generate();
    -
    -$this->table->clear();
    -
    -$this->table->set_heading('Name', 'Day', 'Delivery');
    -$this->table->add_row('Fred', 'Wednesday', 'Express');
    -$this->table->add_row('Mary', 'Monday', 'Air');
    -$this->table->add_row('John', 'Saturday', 'Overnight');
    -
    -echo $this->table->generate(); -     - -
    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : HTML Table Class

    CodeIgniter User Guide Version 1.5.4

    HTML Table Class

    The Table Class provides functions that enable you to auto-generate HTML tables from arrays or database result sets.

    Initializing the Class

    Like most other classes in CodeIgniter, the Table class is initialized in your controller using the $this->load->library function:

    $this->load->library('table');

    Once loaded, the Table library object will be available using: $this->table

    Examples

    Here is an example showing how you can create a table from a multi-dimensional array. Note that the first array index will become the table heading (or you can set your own headings using the set_heading() function described in the function reference below).

    $this->load->library('table');

    $data = array(
                 array('Name', 'Color', 'Size'),
                 array('Fred', 'Blue', 'Small'),
                 array('Mary', 'Red', 'Large'),
                 array('John', 'Green', 'Medium')
                 );

    echo $this->table->generate($data);

    Here is an example of a table created from a database query result. The table class will automatically generate the headings based on the table names (or you can set your own headings using the set_heading() function described in the function reference below).

    $this->load->library('table');

    $query = $this->db->query("SELECT * FROM my_table");

    echo $this->table->generate($query);

    Here is an example showing how you might create a table using discreet parameters:

    $this->load->library('table');

    $this->table->set_heading('Name', 'Color', 'Size');

    $this->table->add_row('Fred', 'Blue', 'Small');
    $this->table->add_row('Mary', 'Red', 'Large');
    $this->table->add_row('John', 'Green', 'Medium');

    echo $this->table->generate();

    Here is the same example, except instead of individual parameters, arrays are used:

    $this->load->library('table');

    $this->table->set_heading(array('Name', 'Color', 'Size'));

    $this->table->add_row(array('Fred', 'Blue', 'Small'));
    $this->table->add_row(array('Mary', 'Red', 'Large'));
    $this->table->add_row(array('John', 'Green', 'Medium'));

    echo $this->table->generate();

    Changing the Look of Your Table

    The Table Class permits you to set a table template with which you can specify the design of your layout. Here is the template prototype:

    $tmpl = array (
                        'table_open'          => '<table border="0" cellpadding="4" cellspacing="0">',

                        'heading_row_start'   => '<tr>',
                        'heading_row_end'     => '</tr>',
                        'heading_cell_start'  => '<th>',
                        'heading_cell_end'    => '</th>',

                        'row_start'           => '<tr>',
                        'row_end'             => '</tr>',
                        'cell_start'          => '<td>',
                        'cell_end'            => '</td>',

                        'row_alt_start'       => '<tr>',
                        'row_alt_end'         => '</tr>',
                        'cell_alt_start'      => '<td>',
                        'cell_alt_end'        => '</td>',

                        'table_close'         => '</table>'
                  );

    $this->table->set_template($tmpl);

    Note:  You'll notice there are two sets of "row" blocks in the template. These permit you to create alternating row colors or design elements that alternate with each iteration of the row data.

    You are NOT required to submit a complete template. If you only need to change parts of the layout you can simply submit those elements. In this example, only the table opening tag is being changed:

    $tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );

    $this->table->set_template($tmpl);

    Function Reference

    $this->table->generate()

    Returns a string containing the generated table. Accepts an optional parameter which can be an array or a database result object.

    $this->table->set_caption()

    Permits you to add a caption to the table.

    $this->table->set_caption('Colors');

    $this->table->set_heading()

    Permits you to set the table heading. You can submit an array or discreet params:

    $this->table->set_heading('Name', 'Color', 'Size'); $this->table->set_heading(array('Name', 'Color', 'Size'));

    $this->table->add_row()

    Permits you to add a row to your table. You can submit an array or discreet params:

    $this->table->add_row('Blue', 'Red', 'Green'); $this->table->add_row(array('Blue', 'Red', 'Green'));

    $this->table->make_columns()

    This function takes a one-dimensional array as input and creates a multi-dimensional array with a depth equal to the number of columns desired. This allows a single array with many elements to be displayed in a table that has a fixed column count. Consider this example:

    $list = array('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve');

    $new_list = $this->table->make_columns($list, 3);

    $this->table->generate($new_list);

    // Generates a table with this prototype

    <table border="0" cellpadding="4" cellspacing="0">
    <tr>
    <td>one</td><td>two</td><td>three</td>
    </tr><tr>
    <td>four</td><td>five</td><td>six</td>
    </tr><tr>
    <td>seven</td><td>eight</td><td>nine</td>
    </tr><tr>
    <td>ten</td><td>eleven</td><td>twelve</td></tr>
    </table>

    $this->table->set_template()

    Permits you to set your template. You can submit a full or partial template.

    $tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );

    $this->table->set_template($tmpl);

    $this->table->set_empty()

    Let's you set a default value for use in any table cells that are empty. You might, for example, set a non-breaking space:

    $this->table->set_empty("&nbsp;");

    $this->table->clear()

    Lets you clear the table heading and row data. If you need to show multiple tables with different data you should to call this function after each table has been generated to empty the previous table information. Example:

    $this->load->library('table');

    $this->table->set_heading('Name', 'Color', 'Size');
    $this->table->add_row('Fred', 'Blue', 'Small');
    $this->table->add_row('Mary', 'Red', 'Large');
    $this->table->add_row('John', 'Green', 'Medium');

    echo $this->table->generate();

    $this->table->clear();

    $this->table->set_heading('Name', 'Day', 'Delivery');
    $this->table->add_row('Fred', 'Wednesday', 'Express');
    $this->table->add_row('Mary', 'Monday', 'Air');
    $this->table->add_row('John', 'Saturday', 'Overnight');

    echo $this->table->generate();
    \ No newline at end of file From 5a33293b5c830be12f4c29bb3605d6112222e31a Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 14 Dec 2007 22:57:22 +0000 Subject: [PATCH 0743/2544] Fixed an example of accept_charset() in the User Agent Library. --- user_guide/changelog.html | 2 +- user_guide/libraries/user_agent.html | 202 +-------------------------- 2 files changed, 2 insertions(+), 202 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index babb020c..6d94d4ac 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1 +1 @@ - CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Fixed a typo in the table library docs.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file + CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed an example of accept_charset() in the User Agent Library.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Fixed a typo in the table library docs.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 6b54fcdb..7dc747ef 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -1,201 +1 @@ - - - - -CodeIgniter User Guide : User Agent Class - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    User Agent Class

    - -

    The User Agent Class provides functions that help identify information about the browser, mobile device, or robot visiting your site. -In addition you can get referrer information as well as language and supported character-set information.

    - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the User Agent class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('user_agent'); -

    Once loaded, the object will be available using: $this->agent

    - -

    User Agent Definitions

    - -

    The user agent name definitions are located in a config file located at: application/config/user_agents.php. You may add items to the -various user agent arrays if needed.

    - -

    Example

    - -

    When the User Agent class is initialized it will attempt to determine whether the user agent browsing your site is -a web browser, a mobile device, or a robot. It will also gather the platform information if it is available.

    - - - -$this->load->library('user_agent');
    -
    -if ($this->agent->is_browser())
    -{
    -    $agent = $this->agent->browser().' '.$this->agent->version();
    -}
    -elseif ($this->agent->is_robot())
    -{
    -    $agent = $this->agent->robot();
    -}
    -elseif ($this->agent->is_mobile())
    -{
    -    $agent = $this->agent->mobile();
    -}
    -else
    -{
    -    $agent = 'Unidentified User Agent';
    -}
    -
    -echo $agent;
    -
    -echo $this->agent->platform(); // Platform info (Windows, Linux, Mac, etc.) -     - - -

    Function Reference

    - - -

    $this->agent->is_browser()

    -

    Returns TRUE/FALSE (boolean) if the user agent is a known web browser.

    - -

    $this->agent->is_mobile()

    -

    Returns TRUE/FALSE (boolean) if the user agent is a known mobile device.

    - -

    $this->agent->is_robot()

    -

    Returns TRUE/FALSE (boolean) if the user agent is a known robot.

    - -

    Note:  The user agent library only contains the most common robot -definitions. It is not a complete list of bots. There are hundreds of them so searching for each one would not be -very efficient. If you find that some bots that commonly visit your site are missing from the list you can add them to your -application/config/user_agents.php file.

    - -

    $this->agent->is_referral()

    -

    Returns TRUE/FALSE (boolean) if the user agent was referred from another site.

    - - -

    $this->agent->browser()

    -

    Returns a string containing the name of the web browser viewing your site.

    - -

    $this->agent->version()

    -

    Returns a string containing the version number of the web browser viewing your site.

    - -

    $this->agent->mobile()

    -

    Returns a string containing the name of the mobile device viewing your site.

    - -

    $this->agent->robot()

    -

    Returns a string containing the name of the robot viewing your site.

    - -

    $this->agent->platform()

    -

    Returns a string containing the platform viewing your site (Linux, Windows, OS X, etc.).

    - -

    $this->agent->referrer()

    -

    The referrer, if the user agent was referred from another site. Typically you'll test for this as follows:

    - - if ($this->agent->is_referral())
    -{
    -    echo $this->agent->referrer();
    -}     - - -

    $this->agent->agent_string()

    -

    Returns a string containing the full user agent string. Typically it will be something like this:

    - -Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.0.4) Gecko/20060613 Camino/1.0.2 - - -

    $this->agent->accept_lang()

    -

    Lets you determine if the user agent accepts a particular language. Example:

    - -if ($this->agent->accept_lang('en'))
    -{
    -    echo 'You accept English!';
    -}     - -

    Note: This function is not typically very reliable -since some browsers do not provide language info, and even among those that do, it is not always accurate.

    - - - -

    $this->agent->accept_charset()

    -

    Lets you determine if the user agent accepts a particular language. Example:

    - -if ($this->agent->accept_charset('utf-8'))
    -{
    -    echo 'You browser supports UTF-8!';
    -}     - -

    Note: This function is not typically very reliable -since some browsers do not provide character-set info, and even among those that do, it is not always accurate.

    - - - -
    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : User Agent Class

    CodeIgniter User Guide Version 1.5.4

    User Agent Class

    The User Agent Class provides functions that help identify information about the browser, mobile device, or robot visiting your site. In addition you can get referrer information as well as language and supported character-set information.

    Initializing the Class

    Like most other classes in CodeIgniter, the User Agent class is initialized in your controller using the $this->load->library function:

    $this->load->library('user_agent');

    Once loaded, the object will be available using: $this->agent

    User Agent Definitions

    The user agent name definitions are located in a config file located at: application/config/user_agents.php. You may add items to the various user agent arrays if needed.

    Example

    When the User Agent class is initialized it will attempt to determine whether the user agent browsing your site is a web browser, a mobile device, or a robot. It will also gather the platform information if it is available.

    $this->load->library('user_agent');

    if ($this->agent->is_browser())
    {
        $agent = $this->agent->browser().' '.$this->agent->version();
    }
    elseif ($this->agent->is_robot())
    {
        $agent = $this->agent->robot();
    }
    elseif ($this->agent->is_mobile())
    {
        $agent = $this->agent->mobile();
    }
    else
    {
        $agent = 'Unidentified User Agent';
    }

    echo $agent;

    echo $this->agent->platform(); // Platform info (Windows, Linux, Mac, etc.)

    Function Reference

    $this->agent->is_browser()

    Returns TRUE/FALSE (boolean) if the user agent is a known web browser.

    $this->agent->is_mobile()

    Returns TRUE/FALSE (boolean) if the user agent is a known mobile device.

    $this->agent->is_robot()

    Returns TRUE/FALSE (boolean) if the user agent is a known robot.

    Note:  The user agent library only contains the most common robot definitions. It is not a complete list of bots. There are hundreds of them so searching for each one would not be very efficient. If you find that some bots that commonly visit your site are missing from the list you can add them to your application/config/user_agents.php file.

    $this->agent->is_referral()

    Returns TRUE/FALSE (boolean) if the user agent was referred from another site.

    $this->agent->browser()

    Returns a string containing the name of the web browser viewing your site.

    $this->agent->version()

    Returns a string containing the version number of the web browser viewing your site.

    $this->agent->mobile()

    Returns a string containing the name of the mobile device viewing your site.

    $this->agent->robot()

    Returns a string containing the name of the robot viewing your site.

    $this->agent->platform()

    Returns a string containing the platform viewing your site (Linux, Windows, OS X, etc.).

    $this->agent->referrer()

    The referrer, if the user agent was referred from another site. Typically you'll test for this as follows:

    if ($this->agent->is_referral())
    {
        echo $this->agent->referrer();
    }

    $this->agent->agent_string()

    Returns a string containing the full user agent string. Typically it will be something like this:

    Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.0.4) Gecko/20060613 Camino/1.0.2

    $this->agent->accept_lang()

    Lets you determine if the user agent accepts a particular language. Example:

    if ($this->agent->accept_lang('en'))
    {
        echo 'You accept English!';
    }

    Note: This function is not typically very reliable since some browsers do not provide language info, and even among those that do, it is not always accurate.

    $this->agent->accept_charset()

    Lets you determine if the user agent accepts a particular character set. Example:

    if ($this->agent->accept_charset('utf-8'))
    {
        echo 'You browser supports UTF-8!';
    }

    Note: This function is not typically very reliable since some browsers do not provide character-set info, and even among those that do, it is not always accurate.

    \ No newline at end of file From f9997d9531ee28ce180cbf96470d02826321b769 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 17 Dec 2007 13:31:25 +0000 Subject: [PATCH 0744/2544] "direcotries" to "directories" --- system/language/english/ftp_lang.php | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php index d6a1a40c..a891ae5f 100644 --- a/system/language/english/ftp_lang.php +++ b/system/language/english/ftp_lang.php @@ -1,15 +1 @@ - \ No newline at end of file + \ No newline at end of file From c3d8e6a78ea47e9133ed426fef4b0e4650e64d3d Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 17 Dec 2007 13:50:46 +0000 Subject: [PATCH 0745/2544] Added form_reset() function to form helper. --- system/helpers/form_helper.php | 421 +--------------------------- user_guide/changelog.html | 2 +- user_guide/helpers/form_helper.html | 339 +--------------------- 3 files changed, 3 insertions(+), 759 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 17022a3b..a23d4c6d 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -1,420 +1 @@ -config->site_url($action).'"'; - - if ( ! isset($attributes['method'])) - { - $form .= ' method="post"'; - } - - if (is_array($attributes) AND count($attributes) > 0) - { - foreach ($attributes as $key => $val) - { - $form .= ' '.$key.'="'.$val.'"'; - } - } - - $form .= '>'; - - if (is_array($hidden) AND count($hidden > 0)) - { - $form .= form_hidden($hidden); - } - - return $form; -} - -// ------------------------------------------------------------------------ - -/** - * Form Declaration - Multipart type - * - * Creates the opening portion of the form, but with "multipart/form-data". - * - * @access public - * @param string the URI segments of the form destination - * @param array a key/value pair of attributes - * @param array a key/value pair hidden data - * @return string - */ -function form_open_multipart($action, $attributes = array(), $hidden = array()) -{ - $attributes['enctype'] = 'multipart/form-data'; - return form_open($action, $attributes, $hidden); -} - -// ------------------------------------------------------------------------ - -/** - * Hidden Input Field - * - * Generates hidden fields. You can pass a simple key/value string or an associative - * array with multiple values. - * - * @access public - * @param mixed - * @param string - * @return string - */ -function form_hidden($name, $value = '') -{ - if ( ! is_array($name)) - { - return ''; - } - - $form = ''; - foreach ($name as $name => $value) - { - $form .= ''; - } - - return $form; -} - -// ------------------------------------------------------------------------ - -/** - * Text Input Field - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -function form_input($data = '', $value = '', $extra = '') -{ - $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value, 'maxlength' => '500', 'size' => '50'); - - return "\n"; -} - -// ------------------------------------------------------------------------ - -/** - * Password Field - * - * Identical to the input function but adds the "password" type - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -function form_password($data = '', $value = '', $extra = '') -{ - if ( ! is_array($data)) - { - $data = array('name' => $data); - } - - $data['type'] = 'password'; - return form_input($data, $value, $extra); -} - -// ------------------------------------------------------------------------ - -/** - * Upload Field - * - * Identical to the input function but adds the "file" type - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -function form_upload($data = '', $value = '', $extra = '') -{ - if ( ! is_array($data)) - { - $data = array('name' => $data); - } - - $data['type'] = 'file'; - return form_input($data, $value, $extra); -} - -// ------------------------------------------------------------------------ - -/** - * Textarea field - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -function form_textarea($data = '', $value = '', $extra = '') -{ - $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); - - if ( ! is_array($data) OR ! isset($data['value'])) - { - $val = $value; - } - else - { - $val = $data['value']; - unset($data['value']); // textareas don't use the value attribute - } - - return "\n"; -} - -// ------------------------------------------------------------------------ - -/** - * Drop-down Menu - * - * @access public - * @param string - * @param array - * @param string - * @param string - * @return string - */ -function form_dropdown($name = '', $options = array(), $selected = '', $extra = '') -{ - if ($extra != '') $extra = ' '.$extra; - - $form = ''; - - return $form; -} - -// ------------------------------------------------------------------------ - -/** - * Checkbox Field - * - * @access public - * @param mixed - * @param string - * @param bool - * @param string - * @return string - */ -function form_checkbox($data = '', $value = '', $checked = TRUE, $extra = '') -{ - $defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - - if (is_array($data) AND array_key_exists('checked', $data)) - { - $checked = $data['checked']; - - if ($checked == FALSE) - { - unset($data['checked']); - } - else - { - $data['checked'] = 'checked'; - } - } - - if ($checked == TRUE) - $defaults['checked'] = 'checked'; - else - unset($defaults['checked']); - - return "\n"; -} - -// ------------------------------------------------------------------------ - -/** - * Radio Button - * - * @access public - * @param mixed - * @param string - * @param bool - * @param string - * @return string - */ -function form_radio($data = '', $value = '', $checked = TRUE, $extra = '') -{ - if ( ! is_array($data)) - { - $data = array('name' => $data); - } - - $data['type'] = 'radio'; - return form_checkbox($data, $value, $checked, $extra); -} - -// ------------------------------------------------------------------------ - -/** - * Submit Button - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -function form_submit($data = '', $value = '', $extra = '') -{ - $defaults = array('type' => 'submit', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - - return "\n"; -} - -// ------------------------------------------------------------------------ - -/** - * Form Close Tag - * - * @access public - * @param string - * @return string - */ -function form_close($extra = '') -{ - return "\n".$extra; -} - -// ------------------------------------------------------------------------ - -/** - * Form Prep - * - * Formats text so that it can be safely placed in a form field in the event it has HTML tags. - * - * @access public - * @param string - * @return string - */ -function form_prep($str = '') -{ - if ($str === '') - { - return ''; - } - - $temp = '__TEMP_AMPERSANDS__'; - - // Replace entities to temporary markers so that - // htmlspecialchars won't mess them up - $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); - $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); - - $str = htmlspecialchars($str); - - // In case htmlspecialchars misses these. - $str = str_replace(array("'", '"'), array("'", """), $str); - - // Decode the temp markers back to entities - $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); - $str = preg_replace("/$temp(\w+);/","&\\1;",$str); - - return $str; -} - -// ------------------------------------------------------------------------ - -/** - * Parse the form attributes - * - * Helper function used by some of the form helpers - * - * @access private - * @param array - * @param array - * @return string - */ -function parse_form_attributes($attributes, $default) -{ - if (is_array($attributes)) - { - foreach ($default as $key => $val) - { - if (isset($attributes[$key])) - { - $default[$key] = $attributes[$key]; - unset($attributes[$key]); - } - } - - if (count($attributes) > 0) - { - $default = array_merge($default, $attributes); - } - } - - $att = ''; - foreach ($default as $key => $val) - { - if ($key == 'value') - { - $val = form_prep($val); - } - - $att .= $key . '="' . $val . '" '; - } - - return $att; -} - -?> \ No newline at end of file +config->site_url($action).'"'; if ( ! isset($attributes['method'])) { $form .= ' method="post"'; } if (is_array($attributes) AND count($attributes) > 0) { foreach ($attributes as $key => $val) { $form .= ' '.$key.'="'.$val.'"'; } } $form .= '>'; if (is_array($hidden) AND count($hidden > 0)) { $form .= form_hidden($hidden); } return $form; } // ------------------------------------------------------------------------ /** * Form Declaration - Multipart type * * Creates the opening portion of the form, but with "multipart/form-data". * * @access public * @param string the URI segments of the form destination * @param array a key/value pair of attributes * @param array a key/value pair hidden data * @return string */ function form_open_multipart($action, $attributes = array(), $hidden = array()) { $attributes['enctype'] = 'multipart/form-data'; return form_open($action, $attributes, $hidden); } // ------------------------------------------------------------------------ /** * Hidden Input Field * * Generates hidden fields. You can pass a simple key/value string or an associative * array with multiple values. * * @access public * @param mixed * @param string * @return string */ function form_hidden($name, $value = '') { if ( ! is_array($name)) { return ''; } $form = ''; foreach ($name as $name => $value) { $form .= ''; } return $form; } // ------------------------------------------------------------------------ /** * Text Input Field * * @access public * @param mixed * @param string * @param string * @return string */ function form_input($data = '', $value = '', $extra = '') { $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value, 'maxlength' => '500', 'size' => '50'); return "\n"; } // ------------------------------------------------------------------------ /** * Password Field * * Identical to the input function but adds the "password" type * * @access public * @param mixed * @param string * @param string * @return string */ function form_password($data = '', $value = '', $extra = '') { if ( ! is_array($data)) { $data = array('name' => $data); } $data['type'] = 'password'; return form_input($data, $value, $extra); } // ------------------------------------------------------------------------ /** * Upload Field * * Identical to the input function but adds the "file" type * * @access public * @param mixed * @param string * @param string * @return string */ function form_upload($data = '', $value = '', $extra = '') { if ( ! is_array($data)) { $data = array('name' => $data); } $data['type'] = 'file'; return form_input($data, $value, $extra); } // ------------------------------------------------------------------------ /** * Textarea field * * @access public * @param mixed * @param string * @param string * @return string */ function form_textarea($data = '', $value = '', $extra = '') { $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); if ( ! is_array($data) OR ! isset($data['value'])) { $val = $value; } else { $val = $data['value']; unset($data['value']); // textareas don't use the value attribute } return "\n"; } // ------------------------------------------------------------------------ /** * Drop-down Menu * * @access public * @param string * @param array * @param string * @param string * @return string */ function form_dropdown($name = '', $options = array(), $selected = '', $extra = '') { if ($extra != '') $extra = ' '.$extra; $form = ''; return $form; } // ------------------------------------------------------------------------ /** * Checkbox Field * * @access public * @param mixed * @param string * @param bool * @param string * @return string */ function form_checkbox($data = '', $value = '', $checked = TRUE, $extra = '') { $defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); if (is_array($data) AND array_key_exists('checked', $data)) { $checked = $data['checked']; if ($checked == FALSE) { unset($data['checked']); } else { $data['checked'] = 'checked'; } } if ($checked == TRUE) $defaults['checked'] = 'checked'; else unset($defaults['checked']); return "\n"; } // ------------------------------------------------------------------------ /** * Radio Button * * @access public * @param mixed * @param string * @param bool * @param string * @return string */ function form_radio($data = '', $value = '', $checked = TRUE, $extra = '') { if ( ! is_array($data)) { $data = array('name' => $data); } $data['type'] = 'radio'; return form_checkbox($data, $value, $checked, $extra); } // ------------------------------------------------------------------------ /** * Submit Button * * @access public * @param mixed * @param string * @param string * @return string */ function form_submit($data = '', $value = '', $extra = '') { $defaults = array('type' => 'submit', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); return "\n"; } // ------------------------------------------------------------------------ /** * Reset Button * * @access public * @param mixed * @param string * @param string * @return string */ function form_reset($data = '', $value = '', $extra = '') { $defaults = array('type' => 'reset', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); return "\n"; } // ------------------------------------------------------------------------ /** * Form Close Tag * * @access public * @param string * @return string */ function form_close($extra = '') { return "\n".$extra; } // ------------------------------------------------------------------------ /** * Form Prep * * Formats text so that it can be safely placed in a form field in the event it has HTML tags. * * @access public * @param string * @return string */ function form_prep($str = '') { if ($str === '') { return ''; } $temp = '__TEMP_AMPERSANDS__'; // Replace entities to temporary markers so that // htmlspecialchars won't mess them up $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); $str = htmlspecialchars($str); // In case htmlspecialchars misses these. $str = str_replace(array("'", '"'), array("'", """), $str); // Decode the temp markers back to entities $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); $str = preg_replace("/$temp(\w+);/","&\\1;",$str); return $str; } // ------------------------------------------------------------------------ /** * Parse the form attributes * * Helper function used by some of the form helpers * * @access private * @param array * @param array * @return string */ function parse_form_attributes($attributes, $default) { if (is_array($attributes)) { foreach ($default as $key => $val) { if (isset($attributes[$key])) { $default[$key] = $attributes[$key]; unset($attributes[$key]); } } if (count($attributes) > 0) { $default = array_merge($default, $attributes); } } $att = ''; foreach ($default as $key => $val) { if ($key == 'value') { $val = form_prep($val); } $att .= $key . '="' . $val . '" '; } return $att; } ?> \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 6d94d4ac..3301a9d8 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1 +1 @@ - CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed an example of accept_charset() in the User Agent Library.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Fixed a typo in the table library docs.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file + CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Added form_reset() function to form helper.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed an example of accept_charset() in the User Agent Library.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Fixed a typo in the table library docs.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 3ffad7c6..3cf6f3a6 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -1,338 +1 @@ - - - - -CodeIgniter User Guide : Form Helper - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Form Helper

    - -

    The Form Helper file contains functions that assist in working with forms.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('form'); - -

    The following functions are available:

    - - - -

    form_open()

    - -

    Creates an opening form tag with a base URL built from your config preferences. It will optionally let you -add form attributes and hidden input fields.

    - -

    The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable -in the event your URLs ever change.

    - -

    Here's a simple example:

    - -echo form_open('email/send'); - -

    The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

    - -<form method="post" action="http:/www.your-site.com/index.php/email/send" /> - -

    Adding Attributes

    - -

    Attributes can be added by passing an associative array to the second parameter, like this:

    - - -$attributes = array('class' => 'email', 'id' => 'myform');
    -
    -echo form_open('email/send', $attributes);     - -

    The above example would create a form similar to this:

    - -<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" /> - -

    Adding Hidden Input Fields

    - -

    Hidden fields can be added by passing an associative array to the third parameter, like this:

    - - -$hidden = array('username' => 'Joe', 'member_id' => '234');
    -
    -echo form_open('email/send', '', $hidden);     - -

    The above example would create a form similar to this:

    - -<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />
    -<input type="hidden" name="username" value="Joe" />
    -<input type="hidden" name="member_id" value="234" />     - - -

    form_open_multipart()

    - -

    This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute, -which is necessary if you would like to use the form to upload files with.

    - -

    form_hidden()

    - -

    Lets you generate hidden input fields. You can either submit a name/value string to create one field:

    - -form_hidden('username', 'johndoe');
    -
    -// Would produce:

    -<input type="hidden" name="username" value="johnodoe" />     - -

    Or you can submit an associative array to create multiple fields:

    - -$data = array(
    -              'name'  => 'John Doe',
    -              'email' => 'john@example.com',
    -              'url'   => 'http://www.example.com'
    -            );
    -
    -echo form_hidden($data);
    -
    -// Would produce:

    -<input type="hidden" name="name" value="John Doe" />
    -<input type="hidden" name="email" value="john@example.com" />
    -<input type="hidden" name="url" value="http://www.example.com" />     - - - - -

    form_input()

    - -

    Lets you generate a standard text input field. You can minimally pass the field name and value in the first -and second parameter:

    - -echo form_input('username', 'johndoe'); - -

    Or you can pass an associative array containing any data you wish your form to contain:

    - -$data = array(
    -              'name'        => 'username',
    -              'id'          => 'username',
    -              'value'       => 'johndoe',
    -              'maxlength'   => '100',
    -              'size'        => '50',
    -              'style'       => 'width:50%',
    -            );
    -
    -echo form_input($data);
    -
    -// Would produce:

    -<input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />     - -

    If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the -third parameter:

    - -$js = 'onClick="some_function()"';
    -
    -echo form_input('username', 'johndoe', $js);     - -

    form_password()

    - -

    This function is identical in all respects to the form_input() function above -except that is sets it as a "password" type.

    - -

    form_upload()

    - -

    This function is identical in all respects to the form_input() function above -except that is sets it as a "file" type, allowing it to be used to upload files.

    - -

    form_textarea()

    - -

    This function is identical in all respects to the form_input() function above -except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above -example, you will instead specify "rows" and "cols".

    - - -

    form_dropdown()

    - -

    Lets you create a standard drop-down field. The first parameter will contain the name of the field, -the second parameter will contain an associative array of options, and the third parameter will contain the -value you wish to be selected. Example:

    - -$options = array(
    -                  'small'  => 'Small Shirt',
    -                  'med'    => 'Medium Shirt',
    -                  'large'   => 'Large Shirt',
    -                  'xlarge' => 'Extra Large Shirt',
    -                );
    -
    -echo form_dropdown('shirts', $options, 'large');
    -
    -// Would produce:

    - -<select name="shirts">
    -<option value="small">Small Shirt</option>
    -<option value="med">Medium Shirt</option>
    -<option value="large" selected>Large Shirt</option>
    -<option value="xlarge">Extra Large Shirt</option>
    -</select>     - - -

    If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the -fourth parameter:

    - -$js = 'onChange="some_function()"';
    -
    -echo form_dropdown('shirts', $options, 'large', $js);     - - -

    form_checkbox()

    - -

    Lets you generate a checkbox field. Simple example:

    - - -echo form_checkbox('newsletter', 'accept', TRUE);
    -
    -// Would produce:
    -
    -<input type="checkbox" name="newsletter" value="accept" checked="checked" />     - -

    The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

    - -

    Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

    - -$data = array(
    -              'name'        => 'newsletter',
    -              'id'          => 'newsletter',
    -              'value'       => 'accept',
    -              'checked'     => TRUE,
    -              'style'       => 'margin:10px',
    -            );
    -
    -echo form_checkbox($data);
    -
    -// Would produce:

    -<input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />     - -

    As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the -fourth parameter:

    - -$js = 'onClick="some_function()"';
    -
    - echo form_checkbox('newsletter', 'accept', TRUE, $js)     - - -

    form_radio()

    -

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    - - -

    form_submit()

    - -

    Lets you generate a standard submit button. Simple example:

    - -echo form_submit('mysubmit', 'Submit Post!');
    -
    -// Would produce:
    -
    -<input type="submit" name="mysubmit" value="Submit Post!" />     - -

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. -The third parameter lets you add extra data to your form, like JavaScript.

    - - -

    form_close()

    - -

    Produces a closing </form> tag. The only advantage to using this function is it permits you to pass data to it -which will be added below the tag. For example:

    - -$string = "</div></div>";
    -
    -echo form_close($string);
    -
    -// Would produce:
    -
    -</form>
    -</div></div>     - - - - - -

    form_prep()

    - -

    Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form. Consider this example:

    - -$string = 'Here is a string containing "quoted" text.';
    -
    -<input type="text" name="myform" value="$string" />     - -

    Since the above string contains a set of quotes it will cause the form to break. -The form_prep function converts HTML so that it can be used safely:

    - -<input type="text" name="myform" value="<?php echo form_prep($string); ?>" /> - -

    Note: If you use any of the form helper functions listed in this page the form -values will be prepped automatically, so there is no need to call this function. Use it only if you are -creating your own form elements.

    - - - - -
    - - - - - - - \ No newline at end of file + CodeIgniter User Guide : Form Helper

    CodeIgniter User Guide Version 1.5.4

    Form Helper

    The Form Helper file contains functions that assist in working with forms.

    Loading this Helper

    This helper is loaded using the following code:

    $this->load->helper('form');

    The following functions are available:

    form_open()

    Creates an opening form tag with a base URL built from your config preferences. It will optionally let you add form attributes and hidden input fields.

    The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable in the event your URLs ever change.

    Here's a simple example:

    echo form_open('email/send');

    The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

    <form method="post" action="http:/www.your-site.com/index.php/email/send" />

    Adding Attributes

    Attributes can be added by passing an associative array to the second parameter, like this:

    $attributes = array('class' => 'email', 'id' => 'myform');

    echo form_open('email/send', $attributes);

    The above example would create a form similar to this:

    <form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />

    Adding Hidden Input Fields

    Hidden fields can be added by passing an associative array to the third parameter, like this:

    $hidden = array('username' => 'Joe', 'member_id' => '234');

    echo form_open('email/send', '', $hidden);

    The above example would create a form similar to this:

    <form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />
    <input type="hidden" name="username" value="Joe" />
    <input type="hidden" name="member_id" value="234" />

    form_open_multipart()

    This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute, which is necessary if you would like to use the form to upload files with.

    form_hidden()

    Lets you generate hidden input fields. You can either submit a name/value string to create one field:

    form_hidden('username', 'johndoe');

    // Would produce:

    <input type="hidden" name="username" value="johnodoe" />

    Or you can submit an associative array to create multiple fields:

    $data = array(
                  'name'  => 'John Doe',
                  'email' => 'john@example.com',
                  'url'   => 'http://www.example.com'
                );

    echo form_hidden($data);

    // Would produce:

    <input type="hidden" name="name" value="John Doe" />
    <input type="hidden" name="email" value="john@example.com" />
    <input type="hidden" name="url" value="http://www.example.com" />

    form_input()

    Lets you generate a standard text input field. You can minimally pass the field name and value in the first and second parameter:

    echo form_input('username', 'johndoe');

    Or you can pass an associative array containing any data you wish your form to contain:

    $data = array(
                  'name'        => 'username',
                  'id'          => 'username',
                  'value'       => 'johndoe',
                  'maxlength'   => '100',
                  'size'        => '50',
                  'style'       => 'width:50%',
                );

    echo form_input($data);

    // Would produce:

    <input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />

    If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the third parameter:

    $js = 'onClick="some_function()"';

    echo form_input('username', 'johndoe', $js);

    form_password()

    This function is identical in all respects to the form_input() function above except that is sets it as a "password" type.

    form_upload()

    This function is identical in all respects to the form_input() function above except that is sets it as a "file" type, allowing it to be used to upload files.

    form_textarea()

    This function is identical in all respects to the form_input() function above except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above example, you will instead specify "rows" and "cols".

    form_dropdown()

    Lets you create a standard drop-down field. The first parameter will contain the name of the field, the second parameter will contain an associative array of options, and the third parameter will contain the value you wish to be selected. Example:

    $options = array(
                      'small'  => 'Small Shirt',
                      'med'    => 'Medium Shirt',
                      'large'   => 'Large Shirt',
                      'xlarge' => 'Extra Large Shirt',
                    );

    echo form_dropdown('shirts', $options, 'large');

    // Would produce:

    <select name="shirts">
    <option value="small">Small Shirt</option>
    <option value="med">Medium Shirt</option>
    <option value="large" selected>Large Shirt</option>
    <option value="xlarge">Extra Large Shirt</option>
    </select>

    If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the fourth parameter:

    $js = 'onChange="some_function()"';

    echo form_dropdown('shirts', $options, 'large', $js);

    form_checkbox()

    Lets you generate a checkbox field. Simple example:

    echo form_checkbox('newsletter', 'accept', TRUE);

    // Would produce:

    <input type="checkbox" name="newsletter" value="accept" checked="checked" />

    The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

    Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

    $data = array(
                  'name'        => 'newsletter',
                  'id'          => 'newsletter',
                  'value'       => 'accept',
                  'checked'     => TRUE,
                  'style'       => 'margin:10px',
                );

    echo form_checkbox($data);

    // Would produce:

    <input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />

    As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the fourth parameter:

    $js = 'onClick="some_function()"';

    echo form_checkbox('newsletter', 'accept', TRUE, $js)

    form_radio()

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    form_submit()

    Lets you generate a standard submit button. Simple example:

    echo form_submit('mysubmit', 'Submit Post!');

    // Would produce:

    <input type="submit" name="mysubmit" value="Submit Post!" />

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. The third parameter lets you add extra data to your form, like JavaScript.

    form_reset()

    Lets you generate a standard reset button. Use is identical to form_submit().

    form_close()

    Produces a closing </form> tag. The only advantage to using this function is it permits you to pass data to it which will be added below the tag. For example:

    $string = "</div></div>";

    echo form_close($string);

    // Would produce:

    </form>
    </div></div>

    form_prep()

    Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form. Consider this example:

    $string = 'Here is a string containing "quoted" text.';

    <input type="text" name="myform" value="$string" />

    Since the above string contains a set of quotes it will cause the form to break. The form_prep function converts HTML so that it can be used safely:

    <input type="text" name="myform" value="<?php echo form_prep($string); ?>" />

    Note: If you use any of the form helper functions listed in this page the form values will be prepped automatically, so there is no need to call this function. Use it only if you are creating your own form elements.

    \ No newline at end of file From bc67c231d60a3414472e4d3f0b84aa813d1afd61 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 17 Dec 2007 14:01:49 +0000 Subject: [PATCH 0746/2544] updated a few changes --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3301a9d8..71c9ed41 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1 +1 @@ - CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Added form_reset() function to form helper.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed an example of accept_charset() in the User Agent Library.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Fixed a typo in the table library docs.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file + CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Added form_reset() function to form helper.
    • Added a language entry for valid_ip validation error.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed a bug that was making validation callbacks required even when not set as such.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed an example of accept_charset() in the User Agent Library.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Fixed a typo in the table library docs.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file From 488b7ee038ceca4ed083a1fd4cc43788e20101a7 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 17 Dec 2007 14:22:31 +0000 Subject: [PATCH 0747/2544] Fixed a typo in the image language file "suppor" to "support". --- system/language/english/imglib_lang.php | 40 +- user_guide/changelog.html | 500 +++++++++++++++++++++++- 2 files changed, 519 insertions(+), 21 deletions(-) diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php index 68c5804a..1921027f 100644 --- a/system/language/english/imglib_lang.php +++ b/system/language/english/imglib_lang.php @@ -1,21 +1,21 @@ - \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 71c9ed41..9c239926 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1 +1,499 @@ - CodeIgniter User Guide : Change Log

    CodeIgniter User Guide Version 1.5.4

    Change Log

    Version 1.5.5

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • Added titles to all user manual pages.
    • Added a check for NULL fields in the MySQL database backup utility.
    • Documented the timezones() function in the Date Helper.
    • Documented unset_userdata in the Session class.
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Added form_reset() function to form helper.
    • Added a language entry for valid_ip validation error.
    • Moved the safe mode and auth checks for the Email library into the constructor.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
    • Fixed a bug in captcha calling an invalid PHP function.
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
    • Fixed a bug that was making validation callbacks required even when not set as such.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
    • Fixed an example for XML RPC.
    • Fixed an example of accept_charset() in the User Agent Library.
    • Fixed a missing "?>" in the smiley helper.
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • Fixed a typo in the table library docs.
    • Moved part of the userguide menu javascript to an external file.

    Version 1.5.4

    Release Date: July 12, 2007

    • Added custom Language files to the autoload options.
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
    • Added array to string into the profiler.
    • Added some additional mime types in application/config/mimes.php.
    • Added filename_security() method to Input library.
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
    • Fixed MSSQL insert_id().
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
    • Fixed a bug that was allowing multiple load attempts on extended classes.
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
    • Fixed a bug in the escape_str() function in the MySQL driver.
    • Fixed a typo in the Calendar library
    • Fixed a typo in rpcs.php library
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
    • Fixed an IP validation bug.
    • Fixed a bug in display of POST keys in the Profiler output
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
    • Fixed various doc typos.
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
    • Docs now validate to XHTML 1 transitional
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.

    Version 1.5.3

    Release Date: April 15, 2007

    • Added array to string into the profiler
    • Code Igniter references updated to CodeIgniter
    • pMachine references updated to EllisLab
    • Fixed a bug in the repeater function of string helper.
    • Fixed a bug in ODBC driver
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
    • Fixed a version bug in the Postgre driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.

    Version 1.5.2

    Release Date: February 13, 2007

    • Added subversion information to the downloads page.
    • Added support for captions in the Table Library
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
    • Removed unescaped variables in error messages of Input and Router classes
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
    • Fixed a bug in the form helper that gave textarea a value attribute
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
    • Fixed some doc typos.

    Version 1.5.1

    Release Date: November 23, 2006

    • Added support for submitting arrays of libraries in the $this->load->library function.
    • Added support for naming custom library files in lower or uppercase.
    • Fixed a bug related to output buffering.
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
    • Fixed a bug that was suppressing errors in controllers.
    • Fixed a problem that can cause a loop to occur when the config file is missing.
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
    • Fixed some bugs in the Oracle DB driver.
    • Fixed an incorrectly named variable in the MySQLi result driver.
    • Fixed some doc typos.

    Version 1.5.0.1

    Release Date: October 31, 2006

    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
    • Fixed a bug in the word_wrap() helper function.
    • Fixed an invalid color Hex number in the Profiler class.
    • Fixed a corrupted image in the user guide.

    Version 1.5.0

    Release Date: October 30, 2006

    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
    • Added Database Caching Class.
    • Added transaction support to the database classes.
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
    • Added Zip Encoding Library.
    • Added FTP Library.
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
    • Added support for storing models within sub-folders.
    • Added Download Helper.
    • Added simple_query() function to the database classes
    • Added standard_date() function to the Date Helper.
    • Added $query->free_result() to database class.
    • Added $query->list_fields() function to database class
    • Added $this->db->platform() function
    • Added new File Helper: get_filenames()
    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
    • Fixed a bug in the Email class related to SMTP Helo data.
    • Fixed a bug in the word wrapping helper and function in the email class.
    • Fixed a bug in the validation class.
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
    • Fixed a problem in the form_prep() function that was double encoding entities.
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
    • Fixed a pagination bug that was permitting negative values in the URL.
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • Changed _get_config() to get_config() since the function is not a private one.
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.

    Version 1.4.1

    Release Date: September 21, 2006

    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
    • Added $this->output->set_header() function, which allows you to set server headers.
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
    • Added Inflector helper.
    • Added element() function in the array helper.
    • Added RAND() to active record orderby() function.
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
    • Added output compression option to the config file.
    • Removed the is_numeric test from the db->escape() function.
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
    • Added some code to allow email attachments to be reset when sending batches of email.
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().

    Version 1.4.0

    Release Date: September 17, 2006

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
    • Added support for % character in URL.
    • Added the ability to supply full URLs using the anchor() helper function.
    • Added mode parameter to file_write() helper.
    • Added support for changing the port number in the Postgre driver.
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
    • Updated the form_open() helper to allow the GET method to be used.
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
    • Updated the Models loader function to allow multiple loads of the same model.
    • Updated the MS SQL driver so that single quotes are escaped.
    • Updated the Postgre and ODBC drivers for better compatibility.
    • Removed a strtolower() call that was changing URL segments to lower case.
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • Removed backticks from Postgre class since these are not needed.
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
    • Fixed an bug that was preventing the input class from unsetting GET variables.
    • Fixed a router bug that was making it too greedy when matching end segments.
    • Fixed a bug that was preventing multiple discreet database calls.
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
    • Fixed some missing prefixes when using the database prefix feature.
    • Fixed a typo in the Calendar class (cal_november).
    • Fixed a bug in the form_checkbox() helper.
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
    • Fixed an evaluation bug in the database initialization function.
    • Fixed a minor bug in one of the error messages in the language class.
    • Fixed a bug in the date helper timespan function.
    • Fixed an undefined variable in the DB Driver class.
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
    • Fixed a couple bugs in the Unit Testing class.
    • Fixed an incorrectly named variable in the Validation class.
    • Fixed an incorrectly named variable in the URI class.
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
    • Fixed some MS SQL bugs.
    • Fixed some doc typos.

    Version 1.3.3

    Release Date: June 1, 2006

    • Models do not connect automatically to the database as of this version. More info here.
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
    • Fixed a bug in the active record "having" function.
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
    • Fixed a bug in the hash() security helper.
    • Fixed some typos.

    Version 1.3.2

    Release Date: April 17, 2006

    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
    • Fixed a couple bugs in the Model class.
    • Fixed some documentation typos and errata.

    Version 1.3.1

    Release Date: April 11, 2006

    • Added a Unit Testing Library.
    • Added the ability to pass objects to the insert() and update() database functions. This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
    • Added getwhere function to Active Record class.
    • Added count_all function to Active Record class.
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
    • Added $this->db->last_query(), which allows you to view your last query that was run.
    • Added a new mime type to the upload class for better compatibility.
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
    • Fixed a bug in a couple of the active record functions (where and orderby).
    • Fixed a bug in the image library when realpath() returns false.
    • Fixed a bug in the Models that was preventing libraries from being used within them.
    • Fixed a bug in the "exact_length" function of the validation class.
    • Fixed some typos in the user guide

    Version 1.3

    Release Date: April 3, 2006

    • Added support for Models.
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
    • Fixed some typos in the default calendar template
    • Fixed some typos in the user guide

    Version 1.2

    Release Date: March 21, 2006

    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
    • Added new File Helper: delete_files()
    • Added new URL Helpers: base_url(), index_page()
    • Added the ability to create your own core libraries and store them in your local application directory.
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
    • Added Javascript Calendar plugin.
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
    • Updated the parser class so that it allows tag pars within other tag pairs.
    • Fixed a bug in the DB "where" function.
    • Fixed a bug that was preventing custom config files to be auto-loaded.
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
    • Fixed some bugs in the xss_clean function

    Version Beta 1.1

    Release Date: March 10, 2006

    • Added a Calendaring class.
    • Added support for running multiple applications that share a common CodeIgniter backend.
    • Moved the "uri protocol" variable from the index.php file into the config.php file
    • Fixed a problem that was preventing certain function calls from working within constructors.
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
    • Fixed a data type error in the form_radio function (form helper)
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
    • Fixed a pagination problem in the scaffolding.
    • Fixed a bug in the mysql class "where" function.
    • Fixed a regex problem in some code that trimmed duplicate slashes.
    • Fixed a bug in the br() function in the HTML helper
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
    • Removed the "style" attributes form the form helpers.
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.

    Version Beta 1.0

    Release Date: February 28, 2006

    First publicly released version.

    \ No newline at end of file + + + + +CodeIgniter User Guide : Change Log + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.5.4

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Change Log

    + +

    Version 1.5.5

    +

    Release Date: -- still in development

    +
      +
    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
      • +
    • Added the ability to auto-load Models
      • +
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
      • +
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
      • +
    • Reorganized the URI and Routes classes for better clarity.
      • +
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
      • +
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
      • +
    • Added titles to all user manual pages.
      • +
    • Added a check for NULL fields in the MySQL database backup utility.
      • +
    • Documented the timezones() function in the Date Helper.
      • +
    • Documented unset_userdata in the Session class.
      • +
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
      • +
    • Added a few additional mime type variations for CSV.
      • +
    • Added strip_quotes() function to string helper.
      • +
    • Added reduce_multiples() function to string helper.
      • +
    • Added quotes_to_entities() function to string helper.
      • +
    • Added form_reset() function to form helper.
      • +
    • Added a language entry for valid_ip validation error.
      • +
    • Moved the safe mode and auth checks for the Email library into the constructor.
      • +
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
      • +
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
      • +
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
      • +
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
      • +
    • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
      • +
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
      • +
    • Fixed a bug in captcha calling an invalid PHP function.
      • +
    • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
      • +
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
      • +
    • Fixed a bug that was making validation callbacks required even when not set as such.
      • +
    • Fixed an example of comma-separated emails in the email library documentation.
      • +
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
      • +
    • Fixed a typo in the database language file.
      • +
    • Fixed a typo in the image language file "suppor" to "support".
      • +
    • Fixed an example for XML RPC.
      • +
    • Fixed an example of accept_charset() in the User Agent Library.
      • +
    • Fixed a missing "?>" in the smiley helper.
      • +
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
      • +
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
      • +
    • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
      • +
    • Fixed a typo in the table library docs.
      • +
    • Moved part of the userguide menu javascript to an external file.
      • +
    + + + + + +

    Version 1.5.4

    +

    Release Date: July 12, 2007

    +
      +
    • Added custom Language files to the autoload options.
      • +
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
      • +
    • Added array to string into the profiler.
      • +
    • Added some additional mime types in application/config/mimes.php.
      • +
    • Added filename_security() method to Input library.
      • +
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
      • +
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
      • +
    • Fixed MSSQL insert_id().
      • +
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
      • +
    • Fixed a bug that was allowing multiple load attempts on extended classes.
      • +
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
      • +
    • Fixed a bug in the escape_str() function in the MySQL driver.
      • +
    • Fixed a typo in the Calendar library
      • +
    • Fixed a typo in rpcs.php library
      • +
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
      • +
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
      • +
    • Fixed an IP validation bug.
      • +
    • Fixed a bug in display of POST keys in the Profiler output
      • +
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
      • +
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
      • +
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
      • +
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
      • +
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
      • +
    • Fixed various doc typos.
      • +
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
      • +
    • Docs now validate to XHTML 1 transitional
      • +
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
      • +
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
      • +
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
      • +
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
      • +
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
      • +
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
      • +
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
      • +
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.
      • +
    +

    Version 1.5.3

    +

    Release Date: April 15, 2007

    +
      +
    • Added array to string into the profiler
      • +
    • Code Igniter references updated to CodeIgniter
      • +
    • pMachine references updated to EllisLab
      • +
    • Fixed a bug in the repeater function of string helper.
      • +
    • Fixed a bug in ODBC driver
      • +
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
      • +
    • Fixed a bug in the redirect function of the url helper.
      • +
    • Fixed an undefined variable in Loader
      • +
    • Fixed a version bug in the Postgre driver
      • +
    • Fixed a bug in the textarea function of the form helper for use with strings
      • +
    • Fixed doc typos.
      • +
    +

    Version 1.5.2

    +

    Release Date: February 13, 2007

    +
      +
    • Added subversion information to the downloads page.
      • +
    • Added support for captions in the Table Library
      • +
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
      • +
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
      • +
    • Removed unescaped variables in error messages of Input and Router classes
      • +
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
      • +
    • Fixed a bug in the form helper that gave textarea a value attribute
      • +
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
      • +
    • Fixed some doc typos.
      • +
    + + +

    Version 1.5.1

    +

    Release Date: November 23, 2006

    +
      +
    • Added support for submitting arrays of libraries in the $this->load->library function.
      • +
    • Added support for naming custom library files in lower or uppercase.
      • +
    • Fixed a bug related to output buffering.
      • +
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
      • +
    • Fixed a bug that was suppressing errors in controllers.
      • +
    • Fixed a problem that can cause a loop to occur when the config file is missing.
      • +
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
      • +
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
      • +
    • Fixed some bugs in the Oracle DB driver.
      • +
    • Fixed an incorrectly named variable in the MySQLi result driver.
      • +
    • Fixed some doc typos.
      • +
    +

    Version 1.5.0.1

    +

    Release Date: October 31, 2006

    +
      +
    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
      • +
    • Fixed a bug in the word_wrap() helper function.
      • +
    • Fixed an invalid color Hex number in the Profiler class.
      • +
    • Fixed a corrupted image in the user guide.
      • +
    + + + +

    Version 1.5.0

    +

    Release Date: October 30, 2006

    + +
      +
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • +
    • Added Database Caching Class.
      • +
    • Added transaction support to the database classes.
      • +
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
      • +
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
      • +
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
      • +
    • Added Zip Encoding Library.
      • +
    • Added FTP Library.
      • +
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
      • +
    • Added support for storing models within sub-folders.
      • +
    • Added Download Helper.
      • +
    • Added simple_query() function to the database classes
      • +
    • Added standard_date() function to the Date Helper.
      • +
    • Added $query->free_result() to database class.
      • +
    • Added $query->list_fields() function to database class
      • +
    • Added $this->db->platform() function
      • +
    • Added new File Helper: get_filenames()
      • +
    • Added new helper: Smiley Helper
      • +
    • Added support for <ul> and <ol> lists in the HTML Helper
      • +
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
      • +
    • Added the ability to rename or relocate the "application" folder. +
    • Added more thorough initialization in the upload class so that all class variables are reset.
      • +
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
      • +
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
      • +
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
      • +
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
      • +
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
      • +
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
      • +
    • Fixed a bug in the Email class related to SMTP Helo data.
      • +
    • Fixed a bug in the word wrapping helper and function in the email class.
      • +
    • Fixed a bug in the validation class.
      • +
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
      • +
    • Fixed a problem in the form_prep() function that was double encoding entities.
      • +
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
      • +
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
      • +
    • Fixed a pagination bug that was permitting negative values in the URL.
      • +
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
      • +
    • Changed _get_config() to get_config() since the function is not a private one.
      • +
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
      • +
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
      • +
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
      • +
    + + + + +

    Version 1.4.1

    +

    Release Date: September 21, 2006

    + +
      +
    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
      • +
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
      • +
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
      • +
    • Added $this->output->set_header() function, which allows you to set server headers.
      • +
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
      • +
    • Added Inflector helper.
      • +
    • Added element() function in the array helper.
      • +
    • Added RAND() to active record orderby() function.
      • +
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
      • +
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
      • +
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
      • +
    • Added output compression option to the config file.
      • +
    • Removed the is_numeric test from the db->escape() function.
      • +
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
      • +
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
      • +
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
      • +
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
      • +
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
      • +
    • Added some code to allow email attachments to be reset when sending batches of email.
      • +
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own +libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
      • +
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
      • +
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().
      • +
    + + + +

    Version 1.4.0

    +

    Release Date: September 17, 2006

    + +
      +
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • +
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
      • +
    • Added regular expressions support for routing rules.
      • +
    • Added the ability to remap function calls within your controllers.
      • +
    • Added the ability to replace core system classes with your own classes.
      • +
    • Added support for % character in URL.
      • +
    • Added the ability to supply full URLs using the anchor() helper function.
      • +
    • Added mode parameter to file_write() helper.
      • +
    • Added support for changing the port number in the Postgre driver.
      • +
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
      • +
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
      • +
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
      • +
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
      • +
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • +
    • Updated the form_open() helper to allow the GET method to be used.
      • +
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • +
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
      • +
    • Updated the Models loader function to allow multiple loads of the same model.
      • +
    • Updated the MS SQL driver so that single quotes are escaped.
      • +
    • Updated the Postgre and ODBC drivers for better compatibility.
      • +
    • Removed a strtolower() call that was changing URL segments to lower case.
      • +
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
      • +
    • Removed backticks from Postgre class since these are not needed.
      • +
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
      • +
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
      • +
    • Fixed an bug that was preventing the input class from unsetting GET variables.
      • +
    • Fixed a router bug that was making it too greedy when matching end segments.
      • +
    • Fixed a bug that was preventing multiple discreet database calls.
      • +
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
      • +
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
      • +
    • Fixed some missing prefixes when using the database prefix feature.
      • +
    • Fixed a typo in the Calendar class (cal_november).
      • +
    • Fixed a bug in the form_checkbox() helper.
      • +
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
      • +
    • Fixed an evaluation bug in the database initialization function.
      • +
    • Fixed a minor bug in one of the error messages in the language class.
      • +
    • Fixed a bug in the date helper timespan function.
      • +
    • Fixed an undefined variable in the DB Driver class.
      • +
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
      • +
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
      • +
    • Fixed a couple bugs in the Unit Testing class.
      • +
    • Fixed an incorrectly named variable in the Validation class.
      • +
    • Fixed an incorrectly named variable in the URI class.
      • +
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
      • +
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
      • +
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
      • +
    • Fixed some MS SQL bugs.
      • +
    • Fixed some doc typos.
      • +
    + + + +

    Version 1.3.3

    +

    Release Date: June 1, 2006

    + +
      + +
    • Models do not connect automatically to the database as of this version. More info here.
      • +
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
      • +
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
      • +
    • Fixed a bug in the active record "having" function.
      • +
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
      • +
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
      • +
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
      • +
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
      • +
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
      • +
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
      • +
    • Fixed a bug in the hash() security helper.
      • +
    • Fixed some typos.
      • +
    + + + + +

    Version 1.3.2

    +

    Release Date: April 17, 2006

    + +
      +
    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
      • +
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
      • +
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
      • +
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
      • +
    • Fixed a couple bugs in the Model class.
      • +
    • Fixed some documentation typos and errata.
      • +
    + + + +

    Version 1.3.1

    +

    Release Date: April 11, 2006

    + +
      +
    • Added a Unit Testing Library.
      • +
    • Added the ability to pass objects to the insert() and update() database functions. +This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
      • +
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
      • +
    • Added getwhere function to Active Record class.
      • +
    • Added count_all function to Active Record class.
      • +
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
      • +
    • Added $this->db->last_query(), which allows you to view your last query that was run.
      • +
    • Added a new mime type to the upload class for better compatibility.
      • +
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
      • +
    • Fixed a bug in a couple of the active record functions (where and orderby).
      • +
    • Fixed a bug in the image library when realpath() returns false.
      • +
    • Fixed a bug in the Models that was preventing libraries from being used within them.
      • +
    • Fixed a bug in the "exact_length" function of the validation class.
      • +
    • Fixed some typos in the user guide
      • +
    + + +

    Version 1.3

    +

    Release Date: April 3, 2006

    + +
      +
    • Added support for Models.
      • +
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
      • +
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
      • +
    • Added a feature to the database class that lets you run custom function calls.
      • +
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
      • +
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
      • +
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
      • +
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
      • +
    • Added a new error template for use with native PHP errors.
      • +
    • Added "alternator" function in the string helpers. +
    • Removed slashing from the input class. After much debate we decided to kill this feature.
      • +
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
      • +
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and +all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
      • +
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
      • +
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
      • +
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
      • +
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
      • +
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
      • +
    • Fixed some typos in the default calendar template
      • +
    • Fixed some typos in the user guide
      • +
    + + + + + + + + +

    Version 1.2

    +

    Release Date: March 21, 2006

    + +
      +
    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
      • +
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
      • +
    • Added new File Helper: delete_files()
      • +
    • Added new URL Helpers: base_url(), index_page()
      • +
    • Added the ability to create your own core libraries and store them in your local application directory.
      • +
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
      • +
    • Added Javascript Calendar plugin.
      • +
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
      • +
    • Updated the parser class so that it allows tag pars within other tag pairs.
      • +
    • Fixed a bug in the DB "where" function.
      • +
    • Fixed a bug that was preventing custom config files to be auto-loaded.
      • +
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
      • +
    • Fixed some bugs in the xss_clean function
      • +
    + + + + + +

    Version Beta 1.1

    +

    Release Date: March 10, 2006

    + +
      +
    • Added a Calendaring class.
      • +
    • Added support for running multiple applications that share a common CodeIgniter backend.
      • +
    • Moved the "uri protocol" variable from the index.php file into the config.php file
      • +
    • Fixed a problem that was preventing certain function calls from working within constructors.
      • +
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
      • +
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
      • +
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
      • +
    • Fixed a data type error in the form_radio function (form helper)
      • +
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
      • +
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
      • +
    • Fixed a pagination problem in the scaffolding.
      • +
    • Fixed a bug in the mysql class "where" function.
      • +
    • Fixed a regex problem in some code that trimmed duplicate slashes.
      • +
    • Fixed a bug in the br() function in the HTML helper
      • +
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
      • +
    • Removed the "style" attributes form the form helpers.
      • +
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.
      • +
    + +

    Version Beta 1.0

    +

    Release Date: February 28, 2006

    +

    First publicly released version.

    + +
    + + + + + + + \ No newline at end of file From 218e2bcfd4c9c1ebb2454efc1179d047f40f5b34 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 17 Dec 2007 21:18:14 +0000 Subject: [PATCH 0748/2544] Added a third parameter to Active Record's like() clause to control where the wildcard goes. Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like(). --- system/database/DB_active_rec.php | 97 +++- system/scaffolding/Scaffolding.php | 2 +- user_guide/changelog.html | 2 + user_guide/database/active_record.html | 619 ++++++++++++++++++++++++- 4 files changed, 704 insertions(+), 16 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 9e30a9fa..c6e6039e 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -185,10 +185,22 @@ function where($key, $value = NULL) * @param mixed * @return object */ - function orwhere($key, $value = NULL) + function or_where($key, $value = NULL) { return $this->_where($key, $value, 'OR '); } + + // -------------------------------------------------------------------- + + /** + * orwhere() is an alias of or_where() + * this function is here for backwards compatibility, as + * orwhere() has been deprecated + */ + function orwhere($key, $value = NULL) + { + return $this->or_where($key, $value); + } // -------------------------------------------------------------------- @@ -244,9 +256,9 @@ function _where($key, $value = NULL, $type = 'AND ') * @param mixed * @return object */ - function like($field, $match = '') + function like($field, $match = '', $side = 'both') { - return $this->_like($field, $match, 'AND '); + return $this->_like($field, $match, 'AND ', $side); } // -------------------------------------------------------------------- @@ -262,9 +274,21 @@ function like($field, $match = '') * @param mixed * @return object */ - function orlike($field, $match = '') + function or_like($field, $match = '', $side = 'both') { - return $this->_like($field, $match, 'OR '); + return $this->_like($field, $match, 'OR ', $side); + } + + // -------------------------------------------------------------------- + + /** + * orlike() is an alias of or_like() + * this function is here for backwards compatibility, as + * orlike() has been deprecated + */ + function orlike($field, $match = '', $side = 'both') + { + return $this->orlike($field, $match, $side); } // -------------------------------------------------------------------- @@ -280,7 +304,7 @@ function orlike($field, $match = '') * @param string * @return object */ - function _like($field, $match = '', $type = 'AND ') + function _like($field, $match = '', $type = 'AND ', $side = 'both') { if ( ! is_array($field)) { @@ -292,8 +316,19 @@ function _like($field, $match = '', $type = 'AND ') $prefix = (count($this->ar_like) == 0) ? '' : $type; $v = $this->escape_str($v); - - $this->ar_like[] = $prefix." $k LIKE '%{$v}%'"; + + if ($side == 'before') + { + $this->ar_like[] = $prefix." $k LIKE '%{$v}'"; + } + elseif ($side == 'after') + { + $this->ar_like[] = $prefix." $k LIKE '{$v}%'"; + } + else + { + $this->ar_like[] = $prefix." $k LIKE '%{$v}%'"; + } } return $this; } @@ -307,7 +342,7 @@ function _like($field, $match = '', $type = 'AND ') * @param string * @return object */ - function groupby($by) + function group_by($by) { if (is_string($by)) { @@ -323,7 +358,19 @@ function groupby($by) } return $this; } - + + // -------------------------------------------------------------------- + + /** + * groupby() is an alias of group_by() + * this function is here for backwards compatibility, as + * groupby() has been deprecated + */ + function groupby($by) + { + return $this->group_by($by); + } + // -------------------------------------------------------------------- /** @@ -401,7 +448,7 @@ function _having($key, $value = '', $type = 'AND ') * @param string direction: asc or desc * @return object */ - function orderby($orderby, $direction = '') + function order_by($orderby, $direction = '') { if (trim($direction) != '') { @@ -411,7 +458,17 @@ function orderby($orderby, $direction = '') $this->ar_orderby[] = $orderby.$direction; return $this; } - + // -------------------------------------------------------------------- + + /** + * orderby() is an alias of order_by() + * this function is here for backwards compatibility, as + * orderby() has been deprecated + */ + function orderby($orderby, $direction = '') + { + return $this->order_by($orderby, $direction); + } // -------------------------------------------------------------------- /** @@ -509,7 +566,7 @@ function get($table = '', $limit = null, $offset = null) // -------------------------------------------------------------------- /** - * GetWhere + * Get_Where * * Allows the where clause, limit and offset to be added directly * @@ -519,7 +576,7 @@ function get($table = '', $limit = null, $offset = null) * @param string the offset clause * @return object */ - function getwhere($table = '', $where = null, $limit = null, $offset = null) + function get_where($table = '', $where = null, $limit = null, $offset = null) { if ($table != '') { @@ -542,6 +599,18 @@ function getwhere($table = '', $where = null, $limit = null, $offset = null) $this->_reset_select(); return $result; } + + // -------------------------------------------------------------------- + + /** + * getwhere() is an alias of get_where() + * this function is here for backwards compatibility, as + * getwhere() has been deprecated + */ + function getwhere($table = '', $where = null, $limit = null, $offset = null) + { + return $this->get_where($table, $where, $limit, $offset); + } // -------------------------------------------------------------------- diff --git a/system/scaffolding/Scaffolding.php b/system/scaffolding/Scaffolding.php index 70c6156a..8ddb1af0 100644 --- a/system/scaffolding/Scaffolding.php +++ b/system/scaffolding/Scaffolding.php @@ -204,7 +204,7 @@ function edit() $primary = $this->CI->db->primary($this->current_table); // Run the query - $query = $this->CI->db->getwhere($this->current_table, array($primary => $id)); + $query = $this->CI->db->get_where($this->current_table, array($primary => $id)); $data = array( 'title' => ( ! isset($this->lang['scaff_edit'])) ? 'Edit Data' : $this->lang['scaff_edit'], diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9c239926..a47d3a01 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -78,6 +78,7 @@

    Version 1.5.5

  • Added quotes_to_entities() function to string helper.
  • Added form_reset() function to form helper.
  • Added a language entry for valid_ip validation error.
    • +
  • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
  • Moved the safe mode and auth checks for the Email library into the constructor.
  • Fixed a bug in highlight_pharse() that caused an error with slashes.
  • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • @@ -101,6 +102,7 @@

    Version 1.5.5

  • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
  • Fixed a typo in the table library docs.
  • Moved part of the userguide menu javascript to an external file.
    • +
  • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
    • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index ee7b245d..1c4783ab 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -1 +1,618 @@ - CodeIgniter User Guide : Active Record

    CodeIgniter User Guide Version 1.5.4

    Active Record Class

    CodeIgniter uses a modified version of the Active Record Database Pattern. This pattern allows information to be retrieved, inserted, and updated in your database with minimal scripting. In some cases only one or two lines of code are necessary to perform a database action. CodeIgniter does not require that each database table be its own class file. It instead provides a more simplified interface.

    Beyond simplicity, a major benefit to using the Active Record features is that it allows you to create database independent applications, since the query syntax is generated by each database adapter. It also allows for safer queries, since the values are escaped automatically by the system.

    Note: If you intend to write your own queries you can disable this class in your database config file, allowing the core database library and adapter to utilize fewer resources.


     

    Selecting Data

    The following functions allow you to build SQL SELECT statements.

    Note: If you are using PHP 5 you can use method chaining for more compact syntax. This is described at the end of the page.

    $this->db->get();

    Runs the selection query and returns the result. Can be used by itself to retrieve all records from a table:

    $query = $this->db->get('mytable');

    // Produces: SELECT * FROM mytable

    The second and third parameters enable you do set a limit and offset clause:

    $query = $this->db->get('mytable', 10, 20);

    // Produces: SELECT * FROM mytable LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)

    You'll notice that the above function is assigned to a variable named $query, which can be used to show the results:

    $query = $this->db->get('mytable');

    foreach ($query->result() as $row)
    {
        echo $row->title;
    }

    Please visit the result functions page for a full discussion regarding result generation.

    $this->db->getwhere();

    Identical to the above function except that it permits you to add a "where" clause in the second parameter, instead of using the db->where() function:

    $query = $this->db->getwhere('mytable', array('id' => $id), $limit, $offset);

    Please read the about the where function below for more information.

    $this->db->select();

    Permits you to write the SELECT portion of your query:

    $this->db->select('title, content, date');

    $query = $this->db->get('mytable');

    // Produces: SELECT title, content, date FROM mytable

    Note: If you are selecting all (*) from a table you do not need to use this function. When omitted, CodeIgniter assumes you wish to SELECT *

    $this->db->from();

    Permits you to write the FROM portion of your query:

    $this->db->select('title, content, date');
    $this->db->from('mytable');

    $query = $this->db->get();

    // Produces: SELECT title, content, date FROM mytable

    Note: As shown earlier, the FROM portion of your query can be specified in the $this->db->get() function, so use whichever method you prefer.

    $this->db->join();

    Permits you to write the JOIN portion of your query:

    $this->db->select('*');
    $this->db->from('blogs');
    $this->db->join('comments', 'comments.id = blogs.id');

    $query = $this->db->get();

    // Produces:
    // SELECT * FROM blogs
    // JOIN comments ON comments.id = blogs.id

    Multiple function calls can be made if you need several joins in one query.

    If you need something other than a natural JOIN you can specify it via the third parameter of the function. Options are: left, right, outer, inner, left outer, and right outer.

    $this->db->join('comments', 'comments.id = blogs.id', 'left');

    // Produces: LEFT JOIN comments ON comments.id = blogs.id

    $this->db->where();

    This function enables you to set WHERE clauses using one of four methods:

    Note: All values passed to this function are escaped automatically, producing safer queries.

    1. Simple key/value method: $this->db->where('name', $name);

      // Produces: WHERE name = 'Joe'

      Notice that the equal sign is added for you.

      If you use multiple function calls they will be chained together with AND between them:

      $this->db->where('name', $name);
      $this->db->where('title', $title);
      $this->db->where('status', $status);

      // WHERE = 'Joe' AND title = 'boss' AND status = 'active'
    2. Custom key/value method:

      You can include an operator in the first parameter in order to control the comparison:

      $this->db->where('name !=', $name);
      $this->db->where('id <', $id);

      // Produces: WHERE name != 'Joe' AND id < 45
    3. Associative array method: $array = array('name' => $name, 'title' => $title, 'status' => $status);

      $this->db->where($array);

      // Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'

      You can include your own operators using this method as well:

      $array = array('name !=' => $name, 'id <' => $id, 'date >' => $date);

      $this->db->where($array);
    4. Custom string:

      You can write your own clauses manually:

      $where = "name='Joe' AND status='boss' OR status='active'";

      $this->db->where($where);

    $this->db->orwhere();

    This function is identical to the one above, except that multiple instances are joined by OR:

    $this->db->where('name !=', $name);
    $this->db->orwhere('id >', $id);

    // Produces: WHERE name != 'Joe' OR id > 50

    $this->db->like();

    This function enables you to generate LIKE clauses, useful for doing searches.

    Note: All values passed to this function are escaped automatically.

    1. Simple key/value method: $this->db->like('title', $match);

      // Produces: WHERE title LIKE '%match%'

      If you use multiple function calls they will be chained together with AND between them:

      $this->db->like('title', $match);
      $this->db->like('body', $match);

      // WHERE title LIKE '%match%' AND body LIKE '%match%'
    2. Associative array method: $array = array('title' => $match, 'page1' => $match, 'page2' => $match);

      $this->db->like($array);

      // WHERE title LIKE '%match%' AND page1 LIKE '%match%' AND page2 LIKE '%match%'

    $this->db->orlike();

    This function is identical to the one above, except that multiple instances are joined by OR:

    $this->db->like('title', $match);
    $this->db->orlike('body', $match);

    // WHERE title LIKE '%match%' OR body LIKE '%match%'

    $this->db->groupby();

    Permits you to write the GROUP BY portion of your query:

    $this->db->groupby("title");

    // Produces: GROUP BY title

    You can also pass an array of multiple values as well:

    $this->db->groupby(array("title", "date"));

    // Produces: GROUP BY title, date

    $this->db->having();

    Permits you to write the HAVING portion of your query:

    $this->db->having('user_id = 45');

    // Produces: HAVING 'user_id = 45'

    You can also pass an array of multiple values as well:

    $this->db->having(array('title =' => 'My Title', 'id <' => $id));

    // Produces: HAVING title = 'My Title', 'id < 45'

    $this->db->orderby();

    Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. The second parameter lets you set the direction of the result. Options are asc or desc

    $this->db->orderby("title", "desc");

    // Produces: ORDER BY title DESC

    You can also pass your own string in the first parameter:

    $this->db->orderby('title desc, name asc');

    // Produces: ORDER BY title DESC, name ASC

    Or multiple function calls can be made if you need multiple fields.

    $this->db->orderby("title", "desc");
    $this->db->orderby("name", "asc");

    // Produces: ORDER BY title DESC, name ASC

    $this->db->limit();

    Lets you limit the number of rows you would like returned by the query:

    $this->db->limit(10);

    // Produces: LIMIT 10

    The second parameter lets you set a result offset.

    $this->db->limit(10, 20);

    // Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)

    $this->db->count_all();

    Permits you to determine the number of rows in a particular table. Submit the table name in the first parameter. Example:

    echo $this->db->count_all('my_table');

    // Produces an integer, like 25      

    Inserting Data

    $this->db->insert();

    Generates an insert string based on the data you supply, and runs the query. You can either pass an array or an object to the function. Here is an example using an array:

    $data = array(
                   'title' => 'My title' ,
                   'name' => 'My Name' ,
                   'date' => 'My date'
                );

    $this->db->insert('mytable', $data);

    // Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')

    The first parameter will contain the table name, the second is an associative array of values.

    Here is an example using an object:

    /*
        class Myclass {
            var $title = 'My Title';
            var $content = 'My Content';
            var $date = 'My Date';
        }
    */

    $object = new Myclass;

    $this->db->insert('mytable', $object);

    // Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')

    The first parameter will contain the table name, the second is an associative array of values.

    Note: All values are escaped automatically producing safer queries.

    $this->db->set();

    This function enables you to set values for inserts or updates.

    It can be used instead of passing a data array directly to the insert or update functions:

    $this->db->set('name', $name);
    $this->db->insert('mytable');

    // Produces: INSERT INTO mytable (name) VALUES ('{$name}')

    If you use multiple function called they will be assembled properly based on whether you are doing an insert or an update:

    $this->db->set('name', $name);
    $this->db->set('title', $title);
    $this->db->set('status', $status);
    $this->db->insert('mytable');

    You can also pass an associative array to this function:

    $array = array('name' => $name, 'title' => $title, 'status' => $status);

    $this->db->set($array);
    $this->db->insert('mytable');

    Or an object:

    /*
        class Myclass {
            var $title = 'My Title';
            var $content = 'My Content';
            var $date = 'My Date';
        }
    */

    $object = new Myclass;

    $this->db->set($object);
    $this->db->insert('mytable');      

    Updating Data

    $this->db->update();

    Generates an update string and runs the query based on the data you supply. You can pass an array or an object to the function. Here is an example using an array:

    $data = array(
                   'title' => $title,
                   'name' => $name,
                   'date' => $date
                );

    $this->db->where('id', $id);
    $this->db->update('mytable', $data);

    // Produces:
    // UPDATE mytable
    // SET title = '{$title}', name = '{$name}', date = '{$date}'
    // WHERE id = $id

    Or you can supply an object:

    /*
        class Myclass {
            var $title = 'My Title';
            var $content = 'My Content';
            var $date = 'My Date';
        }
    */

    $object = new Myclass;

    $this->db->where('id', $id);
    $this->db->update('mytable', $object);

    // Produces:
    // UPDATE mytable
    // SET title = '{$title}', name = '{$name}', date = '{$date}'
    // WHERE id = $id

    Note: All values are escaped automatically producing safer queries.

    You'll notice the use of the $this->db->where() function, enabling you to set the WHERE clause. You can optionally pass this information directly into the update function as a string:

    $this->db->update('mytable', $data, "id = 4");

    Or as an array:

    $this->db->update('mytable', $data, array('id' => $id));

    You may also use the $this->db->set() function described above when performing updates.

     

    Deleting Data

    $this->db->delete();

    Generates a delete SQL string and runs the query.

    $this->db->delete('mytable', array('id' => $id));

    // Produces:
    // DELETE FROM mytable
    // WHERE id = $id

    The first parameter is the table name, the second is the where clause. You can also use the where() or orwhere() functions instead of passing the data to the second parameter of the function:

    $this->db->where('id', $id);
    $this->db->delete('mytable');

    // Produces:
    // DELETE FROM mytable
    // WHERE id = $id

    Note: All values are escaped automatically producing safer queries.

     

    Method Chaining

    Method chaining allows you to simplify your syntax by connecting multiple functions. Consider this example:

    $this->db->select('title')->from('mytable')->where('id', $id)->limit(10, 20);

    $query = $this->db->get();

    Note: Method chaining only works with PHP 5.

    \ No newline at end of file + + + + +CodeIgniter User Guide : Active Record + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.5.4

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + + +

    Active Record Class

    + + +

    CodeIgniter uses a modified version of the Active Record Database Pattern. +This pattern allows information to be retrieved, inserted, and updated in your database with minimal scripting. +In some cases only one or two lines of code are necessary to perform a database action. +CodeIgniter does not require that each database table be its own class file. It instead provides a more simplified interface.

    + +

    Beyond simplicity, a major benefit to using the Active Record features is that it allows you to create database independent applications, since the query syntax +is generated by each database adapter. It also allows for safer queries, since the values are escaped automatically by the system.

    + +

    Note: If you intend to write your own queries you can disable this class in your database config file, allowing the core database library and adapter to utilize fewer resources.

    + +
    + + + + + + +  +

    Selecting Data

    + +

    The following functions allow you to build SQL SELECT statements.

    + +

    Note: If you are using PHP 5 you can use method chaining for more compact syntax. This is described at the end of the page.

    + + +

    $this->db->get();

    + +

    Runs the selection query and returns the result. Can be used by itself to retrieve all records from a table:

    + +$query = $this->db->get('mytable');
    +
    +// Produces: SELECT * FROM mytable     + +

    The second and third parameters enable you do set a limit and offset clause:

    + +$query = $this->db->get('mytable', 10, 20);
    +
    +// Produces: SELECT * FROM mytable LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)     + + + +

    You'll notice that the above function is assigned to a variable named $query, which can be used to show the results:

    + +$query = $this->db->get('mytable');
    +
    +foreach ($query->result() as $row)
    +{
    +    echo $row->title;
    +}     + +

    Please visit the result functions page for a full discussion regarding result generation.

    + + +

    $this->db->get_where();

    + +

    Identical to the above function except that it permits you to add a "where" clause in the second parameter, +instead of using the db->where() function:

    + +$query = $this->db->get_where('mytable', array('id' => $id), $limit, $offset); + +

    Please read the about the where function below for more information.

    +

    Note: get_where() was formerly known as getwhere(), which has been deprecated

    +

    $this->db->select();

    + +

    Permits you to write the SELECT portion of your query:

    + + +$this->db->select('title, content, date');
    +
    +$query = $this->db->get('mytable');
    +
    +// Produces: SELECT title, content, date FROM mytable     + +

    Note: If you are selecting all (*) from a table you do not need to use this function. When omitted, CodeIgniter assumes you wish to SELECT *

    + + +

    $this->db->from();

    + +

    Permits you to write the FROM portion of your query:

    + + +$this->db->select('title, content, date');
    +$this->db->from('mytable');
    +
    +$query = $this->db->get();
    +
    +// Produces: SELECT title, content, date FROM mytable     + +

    Note: As shown earlier, the FROM portion of your query can be specified in the $this->db->get() function, so use whichever method +you prefer.

    + +

    $this->db->join();

    + +

    Permits you to write the JOIN portion of your query:

    + + +$this->db->select('*');
    +$this->db->from('blogs');
    +$this->db->join('comments', 'comments.id = blogs.id');
    +
    +$query = $this->db->get();
    +
    +// Produces:
    +// SELECT * FROM blogs
    +// JOIN comments ON comments.id = blogs.id
    +     + +

    Multiple function calls can be made if you need several joins in one query.

    + +

    If you need something other than a natural JOIN you can specify it via the third parameter of the function. +Options are: left, right, outer, inner, left outer, and right outer.

    + + +$this->db->join('comments', 'comments.id = blogs.id', 'left');
    +
    +// Produces: LEFT JOIN comments ON comments.id = blogs.id     + + + + + +

    $this->db->where();

    +

    This function enables you to set WHERE clauses using one of four methods:

    + +

    Note: All values passed to this function are escaped automatically, producing safer queries.

    + +
      +
    1. Simple key/value method: + + $this->db->where('name', $name); +

      // Produces: WHERE name = 'Joe' +       + +

      Notice that the equal sign is added for you.

      + +

      If you use multiple function calls they will be chained together with AND between them:

      + + $this->db->where('name', $name);
      + $this->db->where('title', $title);
      + $this->db->where('status', $status); +

      // WHERE = 'Joe' AND title = 'boss' AND status = 'active' +       + + +
      2. + +
    2. Custom key/value method: + +

      You can include an operator in the first parameter in order to control the comparison:

      + + $this->db->where('name !=', $name);
      + $this->db->where('id <', $id); +

      // Produces: WHERE name != 'Joe' AND id < 45 +       + + + +
      3. +
    3. Associative array method: + + + + $array = array('name' => $name, 'title' => $title, 'status' => $status);

      + + $this->db->where($array); +

      // Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active' +       + +

      You can include your own operators using this method as well:

      + + + $array = array('name !=' => $name, 'id <' => $id, 'date >' => $date);

      + + $this->db->where($array);       + +
      4. +
    4. Custom string: + +

      You can write your own clauses manually:

      + + + $where = "name='Joe' AND status='boss' OR status='active'";

      + $this->db->where($where);       + +
      5. +
    + + +

    $this->db->or_where();

    +

    This function is identical to the one above, except that multiple instances are joined by OR:

    + + +$this->db->where('name !=', $name);
    +$this->db->or_where('id >', $id); +
    +
    // Produces: WHERE name != 'Joe' OR id > 50     + + + + +

    Note: or_where() was formerly known as orwhere(), which has been deprecated.

    +

    $this->db->like();

    +

    This function enables you to generate LIKE clauses, useful for doing searches.

    + +

    Note: All values passed to this function are escaped automatically.

    + + +
      +
    1. Simple key/value method: + + $this->db->like('title', 'match'); +

      // Produces: WHERE title LIKE '%match%'       + +

      If you use multiple function calls they will be chained together with AND between them:

      + + $this->db->like('title', 'match');
      + $this->db->like('body', 'match'); +

      + // WHERE title LIKE '%match%' AND body LIKE '%match%       + If you want to control where the wildcard (%) is placed, you can use an optional third argument. Your options are 'before', 'after' and 'both' (which is the default). + $this->db->like('title', 'match', 'before'); +
      + // Produces: WHERE title LIKE '%match'
      +
      + $this->db->like('title', 'match', 'after');
      +// Produces: WHERE title LIKE 'match%'
      +
      + $this->db->like('title', 'match', 'both');
      +// Produces: WHERE title LIKE '%match%'
      2. + +
    2. Associative array method: + + + $array = array('title' => $match, 'page1' => $match, 'page2' => $match);

      + + $this->db->like($array); +

      // WHERE title LIKE '%match%' AND page1 LIKE '%match%' AND page2 LIKE '%match%'
      3. +
    + + +

    $this->db->or_like();

    +

    This function is identical to the one above, except that multiple instances are joined by OR:

    + + +$this->db->like('title', $match);
    +$this->db->or_like('body', $match); +
    +
    // WHERE title LIKE '%match%' OR body LIKE '%match%'     + + + + +

    Note: or_like() was formerly known as orlike(), which has been deprecated.

    +

    $this->db->group_by();

    +

    Permits you to write the GROUP BY portion of your query:

    + +$this->db->group_by("title"); +

    // Produces: GROUP BY title +     + +

    You can also pass an array of multiple values as well:

    + +$this->db->group_by(array("title", "date")); +
    +
    // Produces: GROUP BY title, date     + + +

    Note: group_by() was formerly known as groupby(), which has been deprecated.

    +

    $this->db->having();

    +

    Permits you to write the HAVING portion of your query:

    + +$this->db->having('user_id = 45'); +

    // Produces: HAVING 'user_id = 45' +     + +

    You can also pass an array of multiple values as well:

    + + +$this->db->having(array('title =' => 'My Title', 'id <' => $id)); +

    // Produces: HAVING title = 'My Title', 'id < 45' +     + + + +

    $this->db->order_by();

    +

    Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. +The second parameter lets you set the direction of the result. Options are asc or desc

    + +$this->db->order_by("title", "desc"); +
    +
    // Produces: ORDER BY title DESC +     + +

    You can also pass your own string in the first parameter:

    + +$this->db->order_by('title desc, name asc'); +
    +
    // Produces: ORDER BY title DESC, name ASC +     + +

    Or multiple function calls can be made if you need multiple fields.

    + +

    $this->db->order_by("title", "desc");
    + $this->db->order_by("name", "asc");
    +
    + // Produces: ORDER BY title DESC, name ASC +

    +

    Note: order_by() was formerly known as orderby(), which has been deprecated.

    +

    $this->db->limit();

    +

    Lets you limit the number of rows you would like returned by the query:

    + + +$this->db->limit(10);
    +
    +// Produces: LIMIT 10     + + +

    The second parameter lets you set a result offset.

    + + +$this->db->limit(10, 20);
    +
    +// Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)     + + +

    $this->db->count_all();

    + +

    Permits you to determine the number of rows in a particular table. Submit the table name in the first parameter. Example:

    + +echo $this->db->count_all('my_table');
    +
    +// Produces an integer, like 25     + + + + +  +

    Inserting Data

    + +

    $this->db->insert();

    +

    Generates an insert string based on the data you supply, and runs the query. You can either pass an +array or an object to the function. Here is an example using an array:

    + + +$data = array(
    +               'title' => 'My title' ,
    +               'name' => 'My Name' ,
    +               'date' => 'My date'
    +            );
    +
    +$this->db->insert('mytable', $data); +

    +// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')     + +

    The first parameter will contain the table name, the second is an associative array of values.

    + +

    Here is an example using an object:

    + + +/*
    +    class Myclass {
    +        var $title = 'My Title';
    +        var $content = 'My Content';
    +        var $date = 'My Date';
    +    }
    +*/
    +
    +$object = new Myclass;
    +
    +$this->db->insert('mytable', $object); +

    +// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')     + +

    The first parameter will contain the table name, the second is an associative array of values.

    + +

    Note: All values are escaped automatically producing safer queries.

    + + + + +

    $this->db->set();

    +

    This function enables you to set values for inserts or updates.

    + +

    It can be used instead of passing a data array directly to the insert or update functions:

    + +$this->db->set('name', $name); +
    +$this->db->insert('mytable'); +

    +// Produces: INSERT INTO mytable (name) VALUES ('{$name}')     + +

    If you use multiple function called they will be assembled properly based on whether you are doing an insert or an update:

    + +$this->db->set('name', $name);
    +$this->db->set('title', $title);
    +$this->db->set('status', $status);
    +$this->db->insert('mytable'); +     + +

    You can also pass an associative array to this function:

    + + +$array = array('name' => $name, 'title' => $title, 'status' => $status);

    + +$this->db->set($array);
    +$this->db->insert('mytable'); +     + +

    Or an object:

    + + + +/*
    +    class Myclass {
    +        var $title = 'My Title';
    +        var $content = 'My Content';
    +        var $date = 'My Date';
    +    }
    +*/
    +
    +$object = new Myclass;
    +
    +$this->db->set($object);
    +$this->db->insert('mytable'); +     + + + +  +

    Updating Data

    + +

    $this->db->update();

    +

    Generates an update string and runs the query based on the data you supply. You can pass an +array or an object to the function. Here is an example using +an array:

    + + +$data = array(
    +               'title' => $title,
    +               'name' => $name,
    +               'date' => $date
    +            );
    +
    +$this->db->where('id', $id);
    +$this->db->update('mytable', $data); +

    +// Produces:
    +// UPDATE mytable
    +// SET title = '{$title}', name = '{$name}', date = '{$date}'
    +// WHERE id = $id     + +

    Or you can supply an object:

    + + +/*
    +    class Myclass {
    +        var $title = 'My Title';
    +        var $content = 'My Content';
    +        var $date = 'My Date';
    +    }
    +*/
    +
    +$object = new Myclass;
    +
    +$this->db->where('id', $id);
    +$this->db->update('mytable', $object); +
    +
    +// Produces:
    +// UPDATE mytable
    +// SET title = '{$title}', name = '{$name}', date = '{$date}'
    +// WHERE id = $id     + + + +

    Note: All values are escaped automatically producing safer queries.

    + +

    You'll notice the use of the $this->db->where() function, enabling you to set the WHERE clause. +You can optionally pass this information directly into the update function as a string:

    + +$this->db->update('mytable', $data, "id = 4"); + +

    Or as an array:

    + +$this->db->update('mytable', $data, array('id' => $id)); + +

    You may also use the $this->db->set() function described above when performing updates.

    + + +  +

    Deleting Data

    + + + +

    $this->db->delete();

    +

    Generates a delete SQL string and runs the query.

    + + +$this->db->delete('mytable', array('id' => $id)); +

    +// Produces:
    +// DELETE FROM mytable
    +// WHERE id = $id     + +

    The first parameter is the table name, the second is the where clause. You can also use the where() or or_where() functions instead of passing +the data to the second parameter of the function:

    + + +$this->db->where('id', $id);
    +$this->db->delete('mytable'); +

    +// Produces:
    +// DELETE FROM mytable
    +// WHERE id = $id     + +

    Note: All values are escaped automatically producing safer queries.

    + + +  +

    Method Chaining

    + +

    Method chaining allows you to simplify your syntax by connecting multiple functions. Consider this example:

    + + +$this->db->select('title')->from('mytable')->where('id', $id)->limit(10, 20);
    +
    +$query = $this->db->get();     + +

    Note: Method chaining only works with PHP 5.

    + + + +
    + + + + + + + \ No newline at end of file From 04036f33f6af540ce371b1ebd1878018f0816ed8 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 17 Dec 2007 21:29:53 +0000 Subject: [PATCH 0749/2544] removed a duplicate function --- system/database/DB_active_rec.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index c6e6039e..6a991a2e 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -777,18 +777,6 @@ function use_table($table) // -------------------------------------------------------------------- - /** - * ORDER BY - DEPRECATED - * - * @deprecated use $this->db->orderby() instead - */ - function order_by($orderby, $direction = '') - { - return $this->orderby($orderby, $direction); - } - - // -------------------------------------------------------------------- - /** * Tests whether the string has an SQL operator * From 694b5b8ee6a40b57c91be3c5448bc8f5540d32d8 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 18 Dec 2007 15:58:03 +0000 Subject: [PATCH 0750/2544] Added count_all_results() function to Active Record. --- system/database/DB_active_rec.php | 41 ++++++++++++++++++- .../database/drivers/mssql/mssql_driver.php | 9 +++- .../database/drivers/mysql/mysql_driver.php | 32 +++++++++++++-- .../database/drivers/mysqli/mysqli_driver.php | 35 +++++++++++++--- .../drivers/mysqli/mysqli_utility.php | 23 +++++++++-- system/database/drivers/oci8/oci8_driver.php | 9 +++- system/database/drivers/odbc/odbc_driver.php | 9 +++- .../drivers/postgre/postgre_driver.php | 17 ++++++-- .../database/drivers/sqlite/sqlite_driver.php | 9 +++- user_guide/changelog.html | 1 + user_guide/database/active_record.html | 13 +++++- 11 files changed, 176 insertions(+), 22 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 6a991a2e..cb134ea6 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -540,6 +540,7 @@ function set($key, $value = '') * and runs the query * * @access public + * @param string the table * @param string the limit clause * @param string the offset clause * @return object @@ -565,6 +566,39 @@ function get($table = '', $limit = null, $offset = null) // -------------------------------------------------------------------- + /** + * "Count All Results" query + * + * Generates a platform-specific query string that counts all records + * returned by an Active Record query. + * + * @access public + * @param string + * @return string + */ + function count_all_results($table = '') + { + if ($table != '') + { + $this->from($table); + } + + $sql = $this->_compile_select($this->count_string); + + $query = $this->query($sql); + $this->_reset_select(); + + if ($query->num_rows() == 0) + { + return '0'; + } + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + /** * Get_Where * @@ -806,12 +840,17 @@ function _has_operator($str) * @access private * @return string */ - function _compile_select() + function _compile_select($select_override = FALSE) { $sql = ( ! $this->ar_distinct) ? 'SELECT ' : 'SELECT DISTINCT '; $sql .= (count($this->ar_select) == 0) ? '*' : implode(', ', $this->ar_select); + if ($select_override !== FALSE) + { + $sql = $select_override; + } + if (count($this->ar_from) > 0) { $sql .= "\nFROM "; diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 5140dd85..051dd5bf 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -30,6 +30,13 @@ */ class CI_DB_mssql_driver extends CI_DB { + /** + * The syntax to count rows is slightly different across different + * database engines, so this string appears in each driver and is + * used for the count_all() and count_all_results() functions. + */ + var $count_string = "SELECT COUNT(*) AS numrows "; + /** * Non-persistent database connection * @@ -273,7 +280,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query("SELECT COUNT(*) AS numrows FROM ".$this->dbprefix.$table); + $query = $this->query($this->count_string . "FROM ".$this->dbprefix.$table); if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 2e1f30f2..69a238d9 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -30,6 +30,13 @@ */ class CI_DB_mysql_driver extends CI_DB { + /** + * The syntax to count rows is slightly different across different + * database engines, so this string appears in each driver and is + * used for the count_all() and count_all_results() functions. + */ + var $count_string = "SELECT COUNT(*) AS numrows "; + /** * Whether to use the MySQL "delete hack" which allows the number * of affected rows to be shown. Uses a preg_replace when enabled, @@ -222,7 +229,17 @@ function trans_rollback() */ function escape_str($str) { - if (function_exists('mysql_real_escape_string')) + if (is_array($str)) + { + foreach($str as $key => $val) + { + $str[$key] = $this->escape_str($val); + } + + return $str; + } + + if (function_exists('mysql_real_escape_string') AND is_resource($this->conn_id)) { return mysql_real_escape_string($str, $this->conn_id); } @@ -279,7 +296,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->count_string . "FROM `".$this->dbprefix.$table."`"); if ($query->num_rows() == 0) return '0'; @@ -298,9 +315,16 @@ function count_all($table = '') * @access private * @return string */ - function _list_tables() + function _list_tables($prefix_limit = FALSE) { - return "SHOW TABLES FROM `".$this->database."`"; + $sql = "SHOW TABLES FROM `".$this->database."`"; + + if ($prefix_limit !== FALSE AND $this->_stdprefix != '') + { + $sql .= " LIKE '".$this->_stdprefix."%'"; + } + + return $sql; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 4643cb2a..30a256e0 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -30,6 +30,13 @@ */ class CI_DB_mysqli_driver extends CI_DB { + /** + * The syntax to count rows is slightly different across different + * database engines, so this string appears in each driver and is + * used for the count_all() and count_all_results() functions. + */ + var $count_string = "SELECT COUNT(*) AS numrows "; + /** * Whether to use the MySQL "delete hack" which allows the number * of affected rows to be shown. Uses a preg_replace when enabled, @@ -224,8 +231,19 @@ function trans_rollback() * @return string */ function escape_str($str) - { - return mysqli_real_escape_string($this->conn_id, $str); + { + if (function_exists('mysqli_real_escape_string') AND is_resource($this->conn_id)) + { + return mysqli_real_escape_string($this->conn_id, $str); + } + elseif (function_exists('mysql_escape_string')) + { + return mysql_escape_string($str); + } + else + { + return addslashes($str); + } } // -------------------------------------------------------------------- @@ -271,7 +289,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->count_string . "FROM `".$this->dbprefix.$table."`"); if ($query->num_rows() == 0) return '0'; @@ -290,9 +308,16 @@ function count_all($table = '') * @access private * @return string */ - function _list_tables() + function _list_tables($prefix_limit = FALSE) { - return "SHOW TABLES FROM `".$this->database."`"; + $sql = "SHOW TABLES FROM `".$this->database."`"; + + if ($prefix_limit !== FALSE AND $this->_stdprefix != '') + { + $sql .= " LIKE '".$this->_stdprefix."%'"; + } + + return $sql; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php index 55ffcb73..c904e92d 100644 --- a/system/database/drivers/mysqli/mysqli_utility.php +++ b/system/database/drivers/mysqli/mysqli_utility.php @@ -219,13 +219,30 @@ function _backup($params = array()) $v = str_replace('\\\r', '\r', $v); $v = str_replace('\\\t', '\t', $v); - // Escape the data if it's not an integer type - $val_str .= ($is_int[$i] == FALSE) ? $this->db->escape($v) : $v; - $val_str .= ', '; + // Is the value NULL? + if ($v == NULL) + { + $val_str .= 'NULL'; + } + else + { + // Escape the data if it's not an integer + if ($is_int[$i] == FALSE) + { + $val_str .= $this->db->escape($v); + } + else + { + $val_str .= $v; + } + } + // Append a comma + $val_str .= ', '; $i++; } + // Remove the comma at the end of the string $val_str = preg_replace( "/, $/" , "" , $val_str); // Build the INSERT string diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 99b5ded1..0cd04cc5 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -43,6 +43,13 @@ class CI_DB_oci8_driver extends CI_DB { + /** + * The syntax to count rows is slightly different across different + * database engines, so this string appears in each driver and is + * used for the count_all() and count_all_results() functions. + */ + var $count_string = "SELECT COUNT(1) AS numrows "; + // Set "auto commit" by default var $_commit = OCI_COMMIT_ON_SUCCESS; @@ -389,7 +396,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query("SELECT COUNT(1) AS numrows FROM ".$table); + $query = $this->query($this->count_string . "FROM ".$table); if ($query == FALSE) { diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 3f42f7c3..ef26ea1c 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -30,6 +30,13 @@ */ class CI_DB_odbc_driver extends CI_DB { + /** + * The syntax to count rows is slightly different across different + * database engines, so this string appears in each driver and is + * used for the count_all() and count_all_results() functions. + */ + var $count_string = "SELECT COUNT(*) AS numrows "; + /** * Non-persistent database connection * @@ -251,7 +258,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->count_string . "FROM `".$this->dbprefix.$table."`"); if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index a8a6ca16..beaa7931 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -30,6 +30,13 @@ */ class CI_DB_postgre_driver extends CI_DB { + /** + * The syntax to count rows is slightly different across different + * database engines, so this string appears in each driver and is + * used for the count_all() and count_all_results() functions. + */ + var $count_string = "SELECT COUNT(*) AS numrows "; + /** * Non-persistent database connection * @@ -277,9 +284,11 @@ function count_all($table = '') { if ($table == '') return '0'; - - $query = $this->query('SELECT COUNT(*) AS numrows FROM "'.$this->dbprefix.$table.'"'); - + + $query = $this->query($this->count_string .'FROM "'.$this->dbprefix.$table.'"'); +// original query before count_string was used. Kept for reference +// $query = $this->query('SELECT COUNT(*) AS numrows FROM "'.$this->dbprefix.$table.'"'); + if ($query->num_rows() == 0) return '0'; @@ -315,7 +324,7 @@ function _list_tables() */ function _list_columns($table = '') { - return "SELECT column_name FROM information_schema.columns WHERE table_name ='".$this->_escape_table($table)."'"; + return "SELECT column_name FROM information_schema.columns WHERE table_name ='".$this->_escape_table($table)."'"; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index f8a573b3..5f86b8ec 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -32,6 +32,13 @@ */ class CI_DB_sqlite_driver extends CI_DB { + /** + * The syntax to count rows is slightly different across different + * database engines, so this string appears in each driver and is + * used for the count_all() and count_all_results() functions. + */ + var $count_string = "SELECT COUNT(*) AS numrows "; + /** * Non-persistent database connection * @@ -274,7 +281,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query("SELECT COUNT(*) AS numrows FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->count_string . "FROM `".$this->dbprefix.$table."`"); if ($query->num_rows() == 0) return '0'; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a47d3a01..5028032b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -77,6 +77,7 @@

    Version 1.5.5

  • Added reduce_multiples() function to string helper.
  • Added quotes_to_entities() function to string helper.
  • Added form_reset() function to form helper.
    • +
  • Added count_all_results() function to Active Record.
  • Added a language entry for valid_ip validation error.
  • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
  • Moved the safe mode and auth checks for the Email library into the constructor.
    • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 1c4783ab..d608459e 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -392,6 +392,18 @@

    $this->db->limit();

    // Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)     +

    $this->db->count_all_results();

    + +

    Permits you to determine the number of rows in a particular Active Record query. Queries will accept Active Record restrictors such as where(), or_where(), like(), or_like(), etc. Example:

    +echo $this->db->count_all_results('my_table');
    + +// Produces an integer, like 25
    +
    +$this->db->like('title', 'match');
    +$this->db->from('my_table');
    +echo $this->db->count_all_results();
    +// Produces an integer, like 17     +

    $this->db->count_all();

    Permits you to determine the number of rows in a particular table. Submit the table name in the first parameter. Example:

    @@ -401,7 +413,6 @@

    $this->db->count_all();

    // Produces an integer, like 25     -  

    Inserting Data

    From 6ddb5a17ae1a0a75ca75f846dbb7d3a98f1902a3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 18 Dec 2007 17:22:50 +0000 Subject: [PATCH 0751/2544] Added 'random' as an order_by() option in Active Record. --- system/database/DB_active_rec.php | 11 +++++++++-- system/database/drivers/mssql/mssql_driver.php | 4 ++-- system/database/drivers/mysql/mysql_driver.php | 17 +++++++++-------- .../database/drivers/mysqli/mysqli_driver.php | 7 ++++--- system/database/drivers/oci8/oci8_driver.php | 4 ++-- system/database/drivers/odbc/odbc_driver.php | 5 +++-- .../database/drivers/postgre/postgre_driver.php | 7 ++++--- .../database/drivers/sqlite/sqlite_driver.php | 5 +++-- user_guide/changelog.html | 13 +++++++------ user_guide/database/active_record.html | 3 ++- 10 files changed, 45 insertions(+), 31 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index cb134ea6..e8059ab7 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -450,7 +450,12 @@ function _having($key, $value = '', $type = 'AND ') */ function order_by($orderby, $direction = '') { - if (trim($direction) != '') + if (strtolower($direction) == 'random') + { + $orderby = ''; // Random results want or don't need a field name + $direction = $this->_random_keyword; + } + elseif (trim($direction) != '') { $direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC'), TRUE)) ? ' '.$direction : ' ASC'; } @@ -458,6 +463,7 @@ function order_by($orderby, $direction = '') $this->ar_orderby[] = $orderby.$direction; return $this; } + // -------------------------------------------------------------------- /** @@ -469,6 +475,7 @@ function orderby($orderby, $direction = '') { return $this->order_by($orderby, $direction); } + // -------------------------------------------------------------------- /** @@ -583,7 +590,7 @@ function count_all_results($table = '') $this->from($table); } - $sql = $this->_compile_select($this->count_string); + $sql = $this->_compile_select($this->_count_string); $query = $this->query($sql); $this->_reset_select(); diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 051dd5bf..89610455 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -35,7 +35,7 @@ class CI_DB_mssql_driver extends CI_DB { * database engines, so this string appears in each driver and is * used for the count_all() and count_all_results() functions. */ - var $count_string = "SELECT COUNT(*) AS numrows "; + var $_count_string = "SELECT COUNT(*) AS numrows "; /** * Non-persistent database connection @@ -280,7 +280,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->count_string . "FROM ".$this->dbprefix.$table); + $query = $this->query($this->_count_string . "FROM ".$this->dbprefix.$table); if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 69a238d9..2d91c592 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -30,19 +30,20 @@ */ class CI_DB_mysql_driver extends CI_DB { - /** - * The syntax to count rows is slightly different across different - * database engines, so this string appears in each driver and is - * used for the count_all() and count_all_results() functions. - */ - var $count_string = "SELECT COUNT(*) AS numrows "; - /** * Whether to use the MySQL "delete hack" which allows the number * of affected rows to be shown. Uses a preg_replace when enabled, * adding a bit more processing to all queries. */ var $delete_hack = TRUE; + + /** + * The syntax to count rows is slightly different across different + * database engines, so this string appears in each driver and is + * used for the count_all() and count_all_results() functions. + */ + var $_count_string = "SELECT COUNT(*) AS numrows "; + var $_random_keyword = ' RAND()'; // database specific random keyword /** * Non-persistent database connection @@ -296,7 +297,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->count_string . "FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`"); if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 30a256e0..09911709 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -35,8 +35,9 @@ class CI_DB_mysqli_driver extends CI_DB { * database engines, so this string appears in each driver and is * used for the count_all() and count_all_results() functions. */ - var $count_string = "SELECT COUNT(*) AS numrows "; - + var $_count_string = "SELECT COUNT(*) AS numrows "; + var $_random_keyword = ' RAND()'; // database specific random keyword + /** * Whether to use the MySQL "delete hack" which allows the number * of affected rows to be shown. Uses a preg_replace when enabled, @@ -289,7 +290,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->count_string . "FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`"); if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 0cd04cc5..e6bcefef 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -48,7 +48,7 @@ class CI_DB_oci8_driver extends CI_DB { * database engines, so this string appears in each driver and is * used for the count_all() and count_all_results() functions. */ - var $count_string = "SELECT COUNT(1) AS numrows "; + var $_count_string = "SELECT COUNT(1) AS numrows "; // Set "auto commit" by default var $_commit = OCI_COMMIT_ON_SUCCESS; @@ -396,7 +396,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->count_string . "FROM ".$table); + $query = $this->query($this->_count_string . "FROM ".$table); if ($query == FALSE) { diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index ef26ea1c..5e167624 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -35,7 +35,8 @@ class CI_DB_odbc_driver extends CI_DB { * database engines, so this string appears in each driver and is * used for the count_all() and count_all_results() functions. */ - var $count_string = "SELECT COUNT(*) AS numrows "; + var $_count_string = "SELECT COUNT(*) AS numrows "; + var $_random_keyword = ' RND('.time().')'; // database specific random keyword /** * Non-persistent database connection @@ -258,7 +259,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->count_string . "FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`"); if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index beaa7931..e54f9cce 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -35,7 +35,8 @@ class CI_DB_postgre_driver extends CI_DB { * database engines, so this string appears in each driver and is * used for the count_all() and count_all_results() functions. */ - var $count_string = "SELECT COUNT(*) AS numrows "; + var $_count_string = "SELECT COUNT(*) AS numrows "; + var $_random_keyword = ' RANDOM()'; // database specific random keyword /** * Non-persistent database connection @@ -285,8 +286,8 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->count_string .'FROM "'.$this->dbprefix.$table.'"'); -// original query before count_string was used. Kept for reference + $query = $this->query($this->_count_string .'FROM "'.$this->dbprefix.$table.'"'); +// original query before _count_string was used. Kept for reference // $query = $this->query('SELECT COUNT(*) AS numrows FROM "'.$this->dbprefix.$table.'"'); if ($query->num_rows() == 0) diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 5f86b8ec..aa6738c0 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -37,7 +37,8 @@ class CI_DB_sqlite_driver extends CI_DB { * database engines, so this string appears in each driver and is * used for the count_all() and count_all_results() functions. */ - var $count_string = "SELECT COUNT(*) AS numrows "; + var $_count_string = "SELECT COUNT(*) AS numrows "; + var $_random_keyword = ' Random()'; // database specific random keyword /** * Non-persistent database connection @@ -281,7 +282,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->count_string . "FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`"); if ($query->num_rows() == 0) return '0'; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5028032b..612c4db6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,10 +66,11 @@

    Version 1.5.5

  • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
  • Reorganized the URI and Routes classes for better clarity.
  • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
    • -
  • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • +
  • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
    • +
  • Added 'random' as an order_by() option in Active Record.
  • Added titles to all user manual pages.
  • Added a check for NULL fields in the MySQL database backup utility.
    • -
  • Documented the timezones() function in the Date Helper.
    • +
  • Documented the timezones() function in the Date Helper.
  • Documented unset_userdata in the Session class.
  • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
  • Added a few additional mime type variations for CSV.
    • @@ -79,16 +80,16 @@

    Version 1.5.5

  • Added form_reset() function to form helper.
  • Added count_all_results() function to Active Record.
  • Added a language entry for valid_ip validation error.
    • -
  • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
    • +
  • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
  • Moved the safe mode and auth checks for the Email library into the constructor.
  • Fixed a bug in highlight_pharse() that caused an error with slashes.
  • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
  • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • -
  • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • +
  • Fixed a bug in Validation where valid_ip() wasn't called properly.
  • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
  • Fixed a bug in database driver where num_rows property wasn't getting updated.
  • Fixed a bug in captcha calling an invalid PHP function.
    • -
  • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
    • +
  • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
  • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
  • Fixed a bug that was making validation callbacks required even when not set as such.
  • Fixed an example of comma-separated emails in the email library documentation.
    • @@ -103,7 +104,7 @@

    Version 1.5.5

  • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
  • Fixed a typo in the table library docs.
  • Moved part of the userguide menu javascript to an external file.
    • -
  • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
    • +
  • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
    • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index d608459e..739d56a1 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -353,7 +353,7 @@

    $this->db->having();

    $this->db->order_by();

    Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. -The second parameter lets you set the direction of the result. Options are asc or desc

    +The second parameter lets you set the direction of the result. Options are asc or desc, or random.

    $this->db->order_by("title", "desc");
    @@ -375,6 +375,7 @@

    $this->db->order_by();

    // Produces: ORDER BY title DESC, name ASC

    Note: order_by() was formerly known as orderby(), which has been deprecated.

    +

    Note: random ordering is not currently supported in Orcacle or MSSQL drivers.

    $this->db->limit();

    Lets you limit the number of rows you would like returned by the query:

    From 80dd702d4c46552a3d1f94c5083c83eeff333b45 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 18 Dec 2007 23:55:06 +0000 Subject: [PATCH 0752/2544] Added where_in() to Active Record. --- system/database/DB_active_rec.php | 40 ++++++++++++++++++++++++-- user_guide/changelog.html | 1 + user_guide/database/active_record.html | 26 +++++++++++++++-- 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index e8059ab7..c3279e8c 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -41,6 +41,8 @@ class CI_DB_active_record extends CI_DB_driver { var $ar_order = FALSE; var $ar_orderby = array(); var $ar_set = array(); + var $ar_wherein = array(); + /** @@ -240,9 +242,41 @@ function _where($key, $value = NULL, $type = 'AND ') } return $this; } - - - + + // -------------------------------------------------------------------- + + /** + * Where_in + * + * Generates a WHERE field IN ('item', 'item') SQL query + * + * @access public + * @param string The field to search + * @param array The values searched on + * @param string + * @return object + */ + function where_in($key = NULL, $values = NULL, $type = 'and') + { + if ($key === NULL || !is_array($values)) + { + return; + } + + $type = (strtolower($type) == 'or') ? ' OR ' : ' AND '; + + foreach ($values as $value) + { + $this->ar_wherein[] = $this->escape($value); + } + + $prefix = (count($this->ar_where) == 0) ? '' : $type; + + $this->ar_where[] = $prefix.$key. " IN (" . implode(", ", $this->ar_wherein) . ") "; + + return $this; + } + // -------------------------------------------------------------------- /** diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 612c4db6..8853969c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -68,6 +68,7 @@

    Version 1.5.5

  • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
  • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
  • Added 'random' as an order_by() option in Active Record.
    • +
  • Added where_in() to Active Record.
  • Added titles to all user manual pages.
  • Added a check for NULL fields in the MySQL database backup utility.
  • Documented the timezones() function in the Date Helper.
    • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 739d56a1..aafef33b 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -263,11 +263,31 @@

    $this->db->or_where();

    $this->db->or_where('id >', $id);

    // Produces: WHERE name != 'Joe' OR id > 50 - - -

    Note: or_where() was formerly known as orwhere(), which has been deprecated.

    + + +

    $this->db->where_in();

    +

    This function is used to write WHERE clauses that contain the IN keyword.

    + +

    + $names = array('frank', 'Todd', 'James');
    + $this->db->where_in('username', $names);
    + // Produces: AND WHERE username IN ('frank', 'Todd', 'James')

    +

    An optional third parameter can be used to specify if the WHERE statement should be separated with "OR" or "AND" in the event of multiple WHERE calls. The default is "AND".

    +

    $names = array('frank', 'Todd', 'James');
    +
    + $this->db->where('usergroup', '5')
    +$this->db->where_in('username', $names);
    +// Produces: WHERE usergroup = '5' AND WHERE username IN ('frank', 'Todd', 'James')
    +
    +$this->db->where('usergroup', '5')
    +$this->db->where_in('username', $names, 'and');
    +// Produces: WHERE usergroup = '5' AND WHERE username IN ('frank', 'Todd', 'James')
    +
    +$this->db->where('usergroup', '5')
    +$this->db->where_in('username', $names, 'or');
    +// Produces: WHERE usergroup = '5' OR WHERE username IN ('frank', 'Todd', 'James')

    $this->db->like();

    This function enables you to generate LIKE clauses, useful for doing searches.

    From 116c3937d7a9ae414f1fa59e23a624f50200f162 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 19 Dec 2007 00:02:29 +0000 Subject: [PATCH 0753/2544] --- user_guide/database/active_record.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index aafef33b..0146941b 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -274,7 +274,7 @@

    $this->db->where_in();

    $names = array('frank', 'Todd', 'James');
    $this->db->where_in('username', $names);
    // Produces: AND WHERE username IN ('frank', 'Todd', 'James')

    -

    An optional third parameter can be used to specify if the WHERE statement should be separated with "OR" or "AND" in the event of multiple WHERE calls. The default is "AND".

    +

    An optional third parameter can be used to specify if the WHERE statement should be separated with "OR" or "AND" in the event of multiple WHERE calls. The default is "AND". They are called with 'and', 'or'.

    $names = array('frank', 'Todd', 'James');

    $this->db->where('usergroup', '5')
    From c6935514fbe8ead6aed2ee711e1ce106913a9f47 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 19 Dec 2007 14:23:19 +0000 Subject: [PATCH 0754/2544] Added where_in(), where_in_or(), where_not_in(), and where_not_in_or() to Active Record. --- system/database/DB_active_rec.php | 85 +++++++++++++++++++++++++- user_guide/changelog.html | 2 +- user_guide/database/active_record.html | 41 +++++++------ 3 files changed, 107 insertions(+), 21 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index c3279e8c..47368587 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -248,21 +248,99 @@ function _where($key, $value = NULL, $type = 'AND ') /** * Where_in * - * Generates a WHERE field IN ('item', 'item') SQL query + * Generates a WHERE field IN ('item', 'item') SQL query joined with + * AND if appropriate * * @access public * @param string The field to search * @param array The values searched on + + * @return object + */ + function where_in($key = NULL, $values = NULL) + { + return $this->_where_in($key, $values); + } + + // -------------------------------------------------------------------- + + /** + * Where_in_or + * + * Generates a WHERE field IN ('item', 'item') SQL query joined with + * OR if appropriate + * + * @access public + * @param string The field to search + * @param array The values searched on + + * @return object + */ + function where_in_or($key = NULL, $values = NULL) + { + return $this->_where_in($key, $values, FALSE, 'or'); + } + + // -------------------------------------------------------------------- + + /** + * Where_not_in + * + * Generates a WHERE field NOT IN ('item', 'item') SQL query joined + * with AND if appropriate + * + * @access public + * @param string The field to search + * @param array The values searched on + + * @return object + */ + function where_not_in($key = NULL, $values = NULL) + { + return $this->_where_in($key, $values, TRUE); + } + + // -------------------------------------------------------------------- + + /** + * Where_not_in_or + * + * Generates a WHERE field NOT IN ('item', 'item') SQL query joined + * with OR if appropriate + * + * @access public + * @param string The field to search + * @param array The values searched on + + * @return object + */ + function where_not_in_or($key = NULL, $values = NULL) + { + return $this->_where_in($key, $values, FALSE, 'or'); + } + + // -------------------------------------------------------------------- + + /** + * Where_in + * + * Called by where_in, where_in_or, where_not_in, where_not_in_or + * + * @access public + * @param string The field to search + * @param array The values searched on + * @param boolean If the statement whould be IN or NOT IN * @param string * @return object */ - function where_in($key = NULL, $values = NULL, $type = 'and') + function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'and') { if ($key === NULL || !is_array($values)) { return; } + $not = ($not) ? ' NOT ' : ''; $type = (strtolower($type) == 'or') ? ' OR ' : ' AND '; foreach ($values as $value) @@ -272,7 +350,7 @@ function where_in($key = NULL, $values = NULL, $type = 'and') $prefix = (count($this->ar_where) == 0) ? '' : $type; - $this->ar_where[] = $prefix.$key. " IN (" . implode(", ", $this->ar_wherein) . ") "; + $this->ar_where[] = $prefix.$key.$not . " IN (" . implode(", ", $this->ar_wherein) . ") "; return $this; } @@ -1005,6 +1083,7 @@ function _reset_select() $this->ar_offset = FALSE; $this->ar_order = FALSE; $this->ar_orderby = array(); + $this->ar_wherein = array(); } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8853969c..55edb75d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -68,7 +68,7 @@

    Version 1.5.5

  • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
  • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
  • Added 'random' as an order_by() option in Active Record.
    • -
  • Added where_in() to Active Record.
    • +
  • Added where_in(), where_in_or(), where_not_in(), and where_not_in_or() to Active Record.
  • Added titles to all user manual pages.
  • Added a check for NULL fields in the MySQL database backup utility.
  • Documented the timezones() function in the Date Helper.
    • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 0146941b..cf8ad469 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -268,26 +268,33 @@

    $this->db->or_where();

    $this->db->where_in();

    -

    This function is used to write WHERE clauses that contain the IN keyword.

    +

    Generates a WHERE field IN ('item', 'item') SQL query joined with AND if appropriate

    +

    + $names = array('Frank', 'Todd', 'James');
    + $this->db->where_in('username', $names);
    + // Produces: AND WHERE username IN ('Frank', 'Todd', 'James')

    + +

    $this->db->where_in_or();

    +

    Generates a WHERE field IN ('item', 'item') SQL query joined with OR if appropriate

    +

    + $names = array('Frank', 'Todd', 'James');
    + $this->db->where_in_or('username', $names);
    + // Produces: OR WHERE username IN ('Frank', 'Todd', 'James')

    + +

    $this->db->where_not_in();

    +

    Generates a WHERE field NOT IN ('item', 'item') SQL query joined with AND if appropriate

    +

    + $names = array('Frank', 'Todd', 'James');
    + $this->db->where_not_in('username', $names);
    + // Produces: AND WHERE username NOT IN ('Frank', 'Todd', 'James')

    +

    $this->db->where_not_in_or();

    +

    Generates a WHERE field NOT IN ('item', 'item') SQL query joined with OR if appropriate

    - $names = array('frank', 'Todd', 'James');
    + $names = array('Frank', 'Todd', 'James');
    $this->db->where_in('username', $names);
    - // Produces: AND WHERE username IN ('frank', 'Todd', 'James')

    -

    An optional third parameter can be used to specify if the WHERE statement should be separated with "OR" or "AND" in the event of multiple WHERE calls. The default is "AND". They are called with 'and', 'or'.

    -

    $names = array('frank', 'Todd', 'James');
    -
    - $this->db->where('usergroup', '5')
    -$this->db->where_in('username', $names);
    -// Produces: WHERE usergroup = '5' AND WHERE username IN ('frank', 'Todd', 'James')
    -
    -$this->db->where('usergroup', '5')
    -$this->db->where_in('username', $names, 'and');
    -// Produces: WHERE usergroup = '5' AND WHERE username IN ('frank', 'Todd', 'James')
    -
    -$this->db->where('usergroup', '5')
    -$this->db->where_in('username', $names, 'or');
    -// Produces: WHERE usergroup = '5' OR WHERE username IN ('frank', 'Todd', 'James')

    + // Produces: OR WHERE username NOT IN ('Frank', 'Todd', 'James')

    +

    $this->db->like();

    This function enables you to generate LIKE clauses, useful for doing searches.

    From da6d240d7b8615b5ae628496c42cb216658eb6e4 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 19 Dec 2007 14:49:29 +0000 Subject: [PATCH 0755/2544] Added support for limit() into update() statements in Active Record. --- system/database/DB_active_rec.php | 10 ++++++++-- system/database/drivers/mssql/mssql_driver.php | 6 ++++-- system/database/drivers/mysql/mysql_driver.php | 6 ++++-- system/database/drivers/mysqli/mysqli_driver.php | 6 ++++-- system/database/drivers/oci8/oci8_driver.php | 8 +++++--- system/database/drivers/odbc/odbc_driver.php | 6 ++++-- system/database/drivers/postgre/postgre_driver.php | 6 ++++-- system/database/drivers/sqlite/sqlite_driver.php | 6 ++++-- user_guide/changelog.html | 1 + 9 files changed, 38 insertions(+), 17 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 47368587..4a88bd81 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -826,7 +826,7 @@ function insert($table = '', $set = NULL) * @param mixed the where clause * @return object */ - function update($table = '', $set = NULL, $where = null) + function update($table = '', $set = NULL, $where = null, $limit = NULL) { if ( ! is_null($set)) { @@ -860,8 +860,13 @@ function update($table = '', $set = NULL, $where = null) { $this->where($where); } + + if ($limit != null) + { + $this->limit($limit); + } - $sql = $this->_update($this->dbprefix.$table, $this->ar_set, $this->ar_where); + $sql = $this->_update($this->dbprefix.$table, $this->ar_set, $this->ar_where, $this->ar_limit); $this->_reset_write(); return $this->query($sql); @@ -1101,6 +1106,7 @@ function _reset_write() $this->ar_set = array(); $this->ar_from = array(); $this->ar_where = array(); + $this->ar_limit = FALSE; } } diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 89610455..613be69b 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -421,14 +421,16 @@ function _insert($table, $keys, $values) * @param array the where clause * @return string */ - function _update($table, $values, $where) + function _update($table, $values, $where, $limit = FALSE) { foreach($values as $key => $val) { $valstr[] = $key." = ".$val; } + + $limit = (!$limit) ? '' : ' LIMIT '.$limit; - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 2d91c592..aaa9cc63 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -439,14 +439,16 @@ function _insert($table, $keys, $values) * @param array the where clause * @return string */ - function _update($table, $values, $where) + function _update($table, $values, $where, $limit = FALSE) { foreach($values as $key => $val) { $valstr[] = $key." = ".$val; } + + $limit = (!$limit) ? '' : ' LIMIT '.$limit; - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 09911709..f6f106eb 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -432,14 +432,16 @@ function _insert($table, $keys, $values) * @param array the where clause * @return string */ - function _update($table, $values, $where) + function _update($table, $values, $where, $limit = FALSE) { foreach($values as $key => $val) { $valstr[] = $key." = ".$val; } + + $limit = (!$limit) ? '' : ' LIMIT '.$limit; - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index e6bcefef..1dd157cc 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -535,14 +535,16 @@ function _insert($table, $keys, $values) * @param array the where clause * @return string */ - function _update($table, $values, $where) + function _update($table, $values, $where, $limit = FALSE) { foreach($values as $key => $val) { $valstr[] = $key." = ".$val; } - - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + + $limit = (!$limit) ? '' : ' LIMIT '.$limit; + + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 5e167624..66d5f89b 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -394,14 +394,16 @@ function _insert($table, $keys, $values) * @param array the where clause * @return string */ - function _update($table, $values, $where) + function _update($table, $values, $where, $limit = FALSE) { foreach($values as $key => $val) { $valstr[] = $key." = ".$val; } + + $limit = (!$limit) ? '' : ' LIMIT '.$limit; - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index e54f9cce..076d87a5 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -423,14 +423,16 @@ function _insert($table, $keys, $values) * @param array the where clause * @return string */ - function _update($table, $values, $where) + function _update($table, $values, $where, $limit = FALSE) { foreach($values as $key => $val) { $valstr[] = $key." = ".$val; } + + $limit = (!$limit) ? '' : ' LIMIT '.$limit; - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index aa6738c0..b701d6b9 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -418,14 +418,16 @@ function _insert($table, $keys, $values) * @param array the where clause * @return string */ - function _update($table, $values, $where) + function _update($table, $values, $where, $limit = FALSE) { foreach($values as $key => $val) { $valstr[] = $key." = ".$val; } + + $limit = (!$limit) ? '' : ' LIMIT '.$limit; - return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where); + return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 55edb75d..96e5724c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,6 +69,7 @@

    Version 1.5.5

  • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
  • Added 'random' as an order_by() option in Active Record.
  • Added where_in(), where_in_or(), where_not_in(), and where_not_in_or() to Active Record.
    • +
  • Added support for limit() into update() statements in Active Record.
  • Added titles to all user manual pages.
  • Added a check for NULL fields in the MySQL database backup utility.
  • Documented the timezones() function in the Date Helper.
    • From e77d77c6b4c094483a3d85b23845436b77796d07 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 19 Dec 2007 15:01:55 +0000 Subject: [PATCH 0756/2544] Added support for limit() into update() and delete() statements in Active Record. --- system/database/DB_active_rec.php | 15 ++++++++++----- system/database/drivers/mssql/mssql_driver.php | 6 ++++-- system/database/drivers/mysql/mysql_driver.php | 6 ++++-- system/database/drivers/mysqli/mysqli_driver.php | 6 ++++-- system/database/drivers/oci8/oci8_driver.php | 6 ++++-- system/database/drivers/odbc/odbc_driver.php | 6 ++++-- .../database/drivers/postgre/postgre_driver.php | 6 ++++-- system/database/drivers/sqlite/sqlite_driver.php | 6 ++++-- user_guide/changelog.html | 2 +- 9 files changed, 39 insertions(+), 20 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 4a88bd81..cea9bddc 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -856,12 +856,12 @@ function update($table = '', $set = NULL, $where = null, $limit = NULL) $table = $this->ar_from[0]; } - if ($where != null) + if ($where != NULL) { $this->where($where); } - if ($limit != null) + if ($limit != NULL) { $this->limit($limit); } @@ -884,7 +884,7 @@ function update($table = '', $set = NULL, $where = null, $limit = NULL) * @param mixed the where clause * @return object */ - function delete($table = '', $where = '') + function delete($table = '', $where = '', $limit = NULL) { if ($table == '') { @@ -905,6 +905,11 @@ function delete($table = '', $where = '') $this->where($where); } + if ($limit != NULL) + { + $this->limit($limit); + } + if (count($this->ar_where) == 0) { if ($this->db_debug) @@ -914,7 +919,7 @@ function delete($table = '', $where = '') return FALSE; } - $sql = $this->_delete($this->dbprefix.$table, $this->ar_where); + $sql = $this->_delete($this->dbprefix.$table, $this->ar_where, $this->ar_limit); $this->_reset_write(); return $this->query($sql); @@ -1096,7 +1101,7 @@ function _reset_select() /** * Resets the active record "write" values. * - * Called by the insert() or update() functions + * Called by the insert() update() and delete() functions * * @access private * @return void diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 613be69b..044fb3ce 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -445,9 +445,11 @@ function _update($table, $values, $where, $limit = FALSE) * @param array the where clause * @return string */ - function _delete($table, $where) + function _delete($table, $where, $limit = FALSE) { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + $limit = (!$limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index aaa9cc63..cd86ebf5 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -463,9 +463,11 @@ function _update($table, $values, $where, $limit = FALSE) * @param array the where clause * @return string */ - function _delete($table, $where) + function _delete($table, $where, $limit = FALSE) { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + $limit = (!$limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index f6f106eb..ebed8139 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -456,9 +456,11 @@ function _update($table, $values, $where, $limit = FALSE) * @param array the where clause * @return string */ - function _delete($table, $where) + function _delete($table, $where, $limit = FALSE) { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + $limit = (!$limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 1dd157cc..c4ab7005 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -559,9 +559,11 @@ function _update($table, $values, $where, $limit = FALSE) * @param array the where clause * @return string */ - function _delete($table, $where) + function _delete($table, $where, $limit = FALSE) { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + $limit = (!$limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 66d5f89b..040ffed9 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -418,9 +418,11 @@ function _update($table, $values, $where, $limit = FALSE) * @param array the where clause * @return string */ - function _delete($table, $where) + function _delete($table, $where, $limit = FALSE) { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + $limit = (!$limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 076d87a5..88f08b2d 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -447,9 +447,11 @@ function _update($table, $values, $where, $limit = FALSE) * @param array the where clause * @return string */ - function _delete($table, $where) + function _delete($table, $where, $limit = FALSE) { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + $limit = (!$limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index b701d6b9..6189b1ff 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -442,9 +442,11 @@ function _update($table, $values, $where, $limit = FALSE) * @param array the where clause * @return string */ - function _delete($table, $where) + function _delete($table, $where, $limit = FALSE) { - return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where); + $limit = (!$limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where).$limit; } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 96e5724c..b122c42f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,7 +69,7 @@

    Version 1.5.5

  • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
  • Added 'random' as an order_by() option in Active Record.
  • Added where_in(), where_in_or(), where_not_in(), and where_not_in_or() to Active Record.
    • -
  • Added support for limit() into update() statements in Active Record.
    • +
  • Added support for limit() into update() and delete() statements in Active Record.
  • Added titles to all user manual pages.
  • Added a check for NULL fields in the MySQL database backup utility.
  • Documented the timezones() function in the Date Helper.
    • From e54e3d2786b76266e6b6dde481cc493ba002faae Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 19 Dec 2007 15:53:44 +0000 Subject: [PATCH 0757/2544] where_in_or became or_where_in(), where_not_in_or() became or_where_not_in() for consistency Added not_like() and or_not_like() --- system/database/DB_active_rec.php | 57 +++++++++++++++++++++----- user_guide/database/active_record.html | 18 ++++++-- 2 files changed, 61 insertions(+), 14 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index cea9bddc..0a4327b4 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -276,7 +276,7 @@ function where_in($key = NULL, $values = NULL) * @return object */ - function where_in_or($key = NULL, $values = NULL) + function or_where_in($key = NULL, $values = NULL) { return $this->_where_in($key, $values, FALSE, 'or'); } @@ -314,7 +314,7 @@ function where_not_in($key = NULL, $values = NULL) * @return object */ - function where_not_in_or($key = NULL, $values = NULL) + function or_where_not_in($key = NULL, $values = NULL) { return $this->_where_in($key, $values, FALSE, 'or'); } @@ -372,7 +372,25 @@ function like($field, $match = '', $side = 'both') { return $this->_like($field, $match, 'AND ', $side); } - + + // -------------------------------------------------------------------- + + /** + * Not Like + * + * Generates a NOT LIKE portion of the query. Separates + * multiple calls with AND + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function not_like($field, $match = '', $side = 'both') + { + return $this->_like($field, $match, 'AND ', $side, ' NOT'); + } + // -------------------------------------------------------------------- /** @@ -393,6 +411,24 @@ function or_like($field, $match = '', $side = 'both') // -------------------------------------------------------------------- + /** + * OR Not Like + * + * Generates a NOT LIKE portion of the query. Separates + * multiple calls with OR + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function or_not_like($field, $match = '', $side = 'both') + { + return $this->_like($field, $match, 'OR ', $side, 'NOT '); + } + + // -------------------------------------------------------------------- + /** * orlike() is an alias of or_like() * this function is here for backwards compatibility, as @@ -416,7 +452,7 @@ function orlike($field, $match = '', $side = 'both') * @param string * @return object */ - function _like($field, $match = '', $type = 'AND ', $side = 'both') + function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '') { if ( ! is_array($field)) { @@ -424,22 +460,23 @@ function _like($field, $match = '', $type = 'AND ', $side = 'both') } foreach ($field as $k => $v) - { + { + $prefix = (count($this->ar_like) == 0) ? '' : $type; - + $v = $this->escape_str($v); - + if ($side == 'before') { - $this->ar_like[] = $prefix." $k LIKE '%{$v}'"; + $this->ar_like[] = $prefix." $k $not LIKE '%{$v}'"; } elseif ($side == 'after') { - $this->ar_like[] = $prefix." $k LIKE '{$v}%'"; + $this->ar_like[] = $prefix." $k $not LIKE '{$v}%'"; } else { - $this->ar_like[] = $prefix." $k LIKE '%{$v}%'"; + $this->ar_like[] = $prefix." $k $not LIKE '%{$v}%'"; } } return $this; diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index cf8ad469..d938b5df 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -18,7 +18,6 @@ - @@ -274,7 +273,7 @@

    $this->db->where_in();

    $this->db->where_in('username', $names);
    // Produces: AND WHERE username IN ('Frank', 'Todd', 'James')

    -

    $this->db->where_in_or();

    +

    $this->db->or_where_in();

    Generates a WHERE field IN ('item', 'item') SQL query joined with OR if appropriate

    $names = array('Frank', 'Todd', 'James');
    @@ -288,7 +287,7 @@

    $this->db->where_not_in();

    $this->db->where_not_in('username', $names);
    // Produces: AND WHERE username NOT IN ('Frank', 'Todd', 'James')

    -

    $this->db->where_not_in_or();

    +

    $this->db->or_where_not_in();

    Generates a WHERE field NOT IN ('item', 'item') SQL query joined with OR if appropriate

    $names = array('Frank', 'Todd', 'James');
    @@ -338,7 +337,7 @@

    $this->db->or_like();

    This function is identical to the one above, except that multiple instances are joined by OR:

    -$this->db->like('title', $match);
    +$this->db->like('title', 'match');
    $this->db->or_like('body', $match);

    // WHERE title LIKE '%match%' OR body LIKE '%match%'     @@ -347,6 +346,17 @@

    $this->db->or_like();

    Note: or_like() was formerly known as orlike(), which has been deprecated.

    +

    $this->db->not_like();

    +

    This function is identical to like(), except that it generates NOT LIKE statements:

    + $this->db->not_like('title', 'match');
    +
    +// WHERE title NOT LIKE '%match%     +

    $this->db->or_not_like();

    +

    This function is identical to not_like(), except that multiple instances are joined by OR:

    + $this->db->like('title', 'match');
    +$this->db->or_not_like('body', 'match');
    +
    +// WHERE title LIKE '%match% OR body NOT LIKE 'match'

    $this->db->group_by();

    Permits you to write the GROUP BY portion of your query:

    From 15ddc9d0c1971de92c0f80bfe12f157786f97895 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 20 Dec 2007 13:54:39 +0000 Subject: [PATCH 0758/2544] Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL" Added parenthesis around table names in SQL FROM --- system/database/DB_active_rec.php | 24 ++++++++++++++++-------- user_guide/changelog.html | 1 + 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 0a4327b4..dfa0a3ef 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -226,16 +226,25 @@ function _where($key, $value = NULL, $type = 'AND ') foreach ($key as $k => $v) { + $prefix = (count($this->ar_where) == 0) ? '' : $type; + + if (is_null($key[$k])) + { + // value appears not to have been set, assign the test to IS NULL + $k .= ' IS NULL'; + } if ( ! is_null($v)) { + if ( ! $this->_has_operator($k)) { $k .= ' ='; } - + $v = ' '.$this->escape($v); + } $this->ar_where[] = $prefix.$k.$v; @@ -278,7 +287,7 @@ function where_in($key = NULL, $values = NULL) */ function or_where_in($key = NULL, $values = NULL) { - return $this->_where_in($key, $values, FALSE, 'or'); + return $this->_where_in($key, $values, FALSE, 'OR '); } // -------------------------------------------------------------------- @@ -316,7 +325,7 @@ function where_not_in($key = NULL, $values = NULL) */ function or_where_not_in($key = NULL, $values = NULL) { - return $this->_where_in($key, $values, FALSE, 'or'); + return $this->_where_in($key, $values, FALSE, 'OR '); } // -------------------------------------------------------------------- @@ -333,7 +342,7 @@ function or_where_not_in($key = NULL, $values = NULL) * @param string * @return object */ - function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'and') + function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'AND ') { if ($key === NULL || !is_array($values)) { @@ -341,7 +350,6 @@ function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'and') } $not = ($not) ? ' NOT ' : ''; - $type = (strtolower($type) == 'or') ? ' OR ' : ' AND '; foreach ($values as $value) { @@ -955,13 +963,13 @@ function delete($table = '', $where = '', $limit = NULL) } return FALSE; } - + $sql = $this->_delete($this->dbprefix.$table, $this->ar_where, $this->ar_limit); $this->_reset_write(); return $this->query($sql); } - + // -------------------------------------------------------------------- /** @@ -1020,7 +1028,7 @@ function _compile_select($select_override = FALSE) if (count($this->ar_from) > 0) { $sql .= "\nFROM "; - $sql .= implode(', ', $this->ar_from); + $sql .= '(' . implode(', ', $this->ar_from) . ')'; } if (count($this->ar_join) > 0) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b122c42f..f5f1ad28 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -84,6 +84,7 @@

    Version 1.5.5

  • Added a language entry for valid_ip validation error.
  • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
  • Moved the safe mode and auth checks for the Email library into the constructor.
    • +
  • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
  • Fixed a bug in highlight_pharse() that caused an error with slashes.
  • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
  • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • From 026585710c5ad4c5a8e5544d177b6a870f56123e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 20 Dec 2007 14:00:50 +0000 Subject: [PATCH 0759/2544] removed an unneeded setting of $config to NULL --- system/libraries/Loader.php | 986 +++++++++++++++++++++++++++++++++++- 1 file changed, 985 insertions(+), 1 deletion(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 6e4c594e..2de2bd7f 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -1 +1,985 @@ - 'unit', 'user_agent' => 'agent'); /** * Constructor * * Sets the path to the view files and gets the initial output buffering level * * @access public */ function CI_Loader() { $this->_ci_is_php5 = (floor(phpversion()) >= 5) ? TRUE : FALSE; $this->_ci_view_path = APPPATH.'views/'; $this->_ci_ob_level = ob_get_level(); log_message('debug', "Loader Class Initialized"); } // -------------------------------------------------------------------- /** * Class Loader * * This function lets users load and instantiate classes. * It is designed to be called from a user's app controllers. * * @access public * @param string the name of the class * @param mixed the optional parameters * @return void */ function library($library = '', $params = NULL) { if ($library == '') { return FALSE; } if (is_array($library)) { foreach ($library as $class) { $this->_ci_load_class($class, $params); } } else { $this->_ci_load_class($library, $params); } $this->_ci_assign_to_models(); } // -------------------------------------------------------------------- /** * Model Loader * * This function lets users load and instantiate models. * * @access public * @param string the name of the class * @param mixed any initialization parameters * @return void */ function model($model, $name = '', $db_conn = FALSE) { if (is_array($model)) { foreach($model as $babe) { $this->model($babe); } return; } if ($model == '') { return; } // Is the model in a sub-folder? If so, parse out the filename and path. if (strpos($model, '/') === FALSE) { $path = ''; } else { $x = explode('/', $model); $model = end($x); unset($x[count($x)-1]); $path = implode('/', $x).'/'; } if ($name == '') { $name = $model; } if (in_array($name, $this->_ci_models, TRUE)) { return; } $CI =& get_instance(); if (isset($CI->$name)) { show_error('The model name you are loading is the name of a resource that is already being used: '.$name); } $model = strtolower($model); if ( ! file_exists(APPPATH.'models/'.$path.$model.EXT)) { show_error('Unable to locate the model you have specified: '.$model); } if ($db_conn !== FALSE AND ! class_exists('CI_DB')) { if ($db_conn === TRUE) $db_conn = ''; $CI->load->database($db_conn, FALSE, TRUE); } if ( ! class_exists('Model')) { require_once(BASEPATH.'libraries/Model'.EXT); } require_once(APPPATH.'models/'.$path.$model.EXT); $model = ucfirst($model); $CI->$name = new $model(); $CI->$name->_assign_libraries(); $this->_ci_models[] = $name; } // -------------------------------------------------------------------- /** * Database Loader * * @access public * @param string the DB credentials * @param bool whether to return the DB object * @param bool whether to enable active record (this allows us to override the config setting) * @return object */ function database($params = '', $return = FALSE, $active_record = FALSE) { // Do we even need to load the database class? if (class_exists('CI_DB') AND $return == FALSE AND $active_record == FALSE) { return FALSE; } require_once(BASEPATH.'database/DB'.EXT); if ($return === TRUE) { return DB($params, $active_record); } // Grab the super object $CI =& get_instance(); // Initialize the db variable. Needed to prevent // reference errors with some configurations $CI->db = ''; // Load the DB class $CI->db =& DB($params, $active_record); // Assign the DB object to any existing models $this->_ci_assign_to_models(); } // -------------------------------------------------------------------- /** * Load the Utilities Class * * @access public * @return string */ function dbutil() { if ( ! class_exists('CI_DB')) { $this->database(); } $CI =& get_instance(); require_once(BASEPATH.'database/DB_utility'.EXT); require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility'.EXT); $class = 'CI_DB_'.$CI->db->dbdriver.'_utility'; $CI->dbutil = new $class(); $CI->load->_ci_assign_to_models(); } // -------------------------------------------------------------------- /** * Load View * * 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 * some cases it's advantageous to be able to return data so that * a developer can process it in some way. * * @access public * @param string * @param array * @param bool * @return void */ function view($view, $vars = array(), $return = FALSE) { return $this->_ci_load(array('view' => $view, 'vars' => $this->_ci_object_to_array($vars), 'return' => $return)); } // -------------------------------------------------------------------- /** * Load File * * This is a generic file loader * * @access public * @param string * @param bool * @return string */ function file($path, $return = FALSE) { return $this->_ci_load(array('path' => $path, 'return' => $return)); } // -------------------------------------------------------------------- /** * Set Variables * * Once variables are set they become available within * the controller class and its "view" files. * * @access public * @param array * @return void */ function vars($vars = array()) { $vars = $this->_ci_object_to_array($vars); if (is_array($vars) AND count($vars) > 0) { foreach ($vars as $key => $val) { $this->_ci_cached_vars[$key] = $val; } } } // -------------------------------------------------------------------- /** * Load Helper * * This function loads the specified helper file. * * @access public * @param mixed * @return void */ function helper($helpers = array()) { if ( ! is_array($helpers)) { $helpers = array($helpers); } foreach ($helpers as $helper) { $helper = strtolower(str_replace(EXT, '', str_replace('_helper', '', $helper)).'_helper'); if (isset($this->_ci_helpers[$helper])) { continue; } if (file_exists(APPPATH.'helpers/'.$helper.EXT)) { include_once(APPPATH.'helpers/'.$helper.EXT); } else { if (file_exists(BASEPATH.'helpers/'.$helper.EXT)) { include(BASEPATH.'helpers/'.$helper.EXT); } else { show_error('Unable to load the requested file: helpers/'.$helper.EXT); } } $this->_ci_helpers[$helper] = TRUE; } log_message('debug', 'Helpers loaded: '.implode(', ', $helpers)); } // -------------------------------------------------------------------- /** * Load Helpers * * This is simply an alias to the above function in case the * user has written the plural form of this function. * * @access public * @param array * @return void */ function helpers($helpers = array()) { $this->helper($helpers); } // -------------------------------------------------------------------- /** * Load Plugin * * This function loads the specified plugin. * * @access public * @param array * @return void */ function plugin($plugins = array()) { if ( ! is_array($plugins)) { $plugins = array($plugins); } foreach ($plugins as $plugin) { $plugin = strtolower(str_replace(EXT, '', str_replace('_plugin.', '', $plugin)).'_pi'); if (isset($this->_ci_plugins[$plugin])) { continue; } if (file_exists(APPPATH.'plugins/'.$plugin.EXT)) { include(APPPATH.'plugins/'.$plugin.EXT); } else { if (file_exists(BASEPATH.'plugins/'.$plugin.EXT)) { include(BASEPATH.'plugins/'.$plugin.EXT); } else { show_error('Unable to load the requested file: plugins/'.$plugin.EXT); } } $this->_ci_plugins[$plugin] = TRUE; } log_message('debug', 'Plugins loaded: '.implode(', ', $plugins)); } // -------------------------------------------------------------------- /** * Load Plugins * * This is simply an alias to the above function in case the * user has written the plural form of this function. * * @access public * @param array * @return void */ function plugins($plugins = array()) { $this->plugin($plugins); } // -------------------------------------------------------------------- /** * Load Script * * This function loads the specified include file from the * application/scripts/ folder. * * NOTE: This feature has been deprecated but it will remain available * for legacy users. * * @access public * @param array * @return void */ function script($scripts = array()) { if ( ! is_array($scripts)) { $scripts = array($scripts); } foreach ($scripts as $script) { $script = strtolower(str_replace(EXT, '', $script)); if (isset($this->_ci_scripts[$script])) { continue; } if ( ! file_exists(APPPATH.'scripts/'.$script.EXT)) { show_error('Unable to load the requested script: scripts/'.$script.EXT); } include(APPPATH.'scripts/'.$script.EXT); } log_message('debug', 'Scripts loaded: '.implode(', ', $scripts)); } // -------------------------------------------------------------------- /** * Loads a language file * * @access public * @param array * @param string * @return void */ function language($file = array(), $lang = '') { $CI =& get_instance(); if ( ! is_array($file)) { $file = array($file); } foreach ($file as $langfile) { $CI->lang->load($langfile, $lang); } } /** * Loads language files for scaffolding * * @access public * @param string * @return arra */ function scaffold_language($file = '', $lang = '', $return = FALSE) { $CI =& get_instance(); return $CI->lang->load($file, $lang, $return); } // -------------------------------------------------------------------- /** * Loads a config file * * @access public * @param string * @return void */ function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) { $CI =& get_instance(); $CI->config->load($file, $use_sections, $fail_gracefully); } // -------------------------------------------------------------------- /** * Scaffolding Loader * * This initializing function works a bit different than the * others. It doesn't load the class. Instead, it simply * sets a flag indicating that scaffolding is allowed to be * used. The actual scaffolding function below is * called by the front controller based on whether the * second segment of the URL matches the "secret" scaffolding * word stored in the application/config/routes.php * * @access public * @param string * @return void */ function scaffolding($table = '') { if ($table === FALSE) { show_error('You must include the name of the table you would like to access when you initialize scaffolding'); } $CI =& get_instance(); $CI->_ci_scaffolding = TRUE; $CI->_ci_scaff_table = $table; } // -------------------------------------------------------------------- /** * Loader * * This function is used to load views and files. * * @access private * @param array * @return void */ function _ci_load($data) { // Set the default data variables foreach (array('view', 'vars', 'path', 'return') as $val) { $$val = ( ! isset($data[$val])) ? FALSE : $data[$val]; } // Set the path to the requested file if ($path == '') { $ext = pathinfo($view, PATHINFO_EXTENSION); $file = ($ext == '') ? $view.EXT : $view; $path = $this->_ci_view_path.$file; } else { $x = explode('/', $path); $file = end($x); } if ( ! file_exists($path)) { show_error('Unable to load the requested file: '.$file); } // This allows anything loaded using $this->load (views, files, etc.) // to become accessible from within the Controller and Model functions. // Only needed when running PHP 5 if ($this->_ci_is_instance()) { $CI =& get_instance(); foreach (get_object_vars($CI) as $key => $var) { if ( ! isset($this->$key)) { $this->$key =& $CI->$key; } } } /* * Extract and cache variables * * You can either set variables using the dedicated $this->load_vars() * function or via the second parameter of this function. We'll merge * the two types and cache them so that views that are embedded within * other views can have access to these variables. */ if (is_array($vars)) { $this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $vars); } extract($this->_ci_cached_vars); /* * Buffer the output * * 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 * can intercept the content right before it's sent to * the browser and then stop the timer it won't be accurate. */ ob_start(); // If the PHP installation does not support short tags we'll // do a little string replacement, changing the short tags // to standard PHP echo statements. if ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE) { echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace(' $this->_ci_ob_level + 1) { ob_end_flush(); } else { // PHP 4 requires that we use a global global $OUT; $OUT->set_output(ob_get_contents()); @ob_end_clean(); } } // -------------------------------------------------------------------- /** * Load class * * This function loads the requested class. * * @access private * @param string the item that is being loaded * @param mixed any additional parameters * @return void */ function _ci_load_class($class, $params = NULL) { // Get the class name $class = str_replace(EXT, '', $class); // We'll test for both lowercase and capitalized versions of the file name foreach (array(ucfirst($class), strtolower($class)) as $class) { $subclass = APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT; // Is this a class extension request? if (file_exists($subclass)) { $baseclass = BASEPATH.'libraries/'.ucfirst($class).EXT; if ( ! file_exists($baseclass)) { log_message('error', "Unable to load the requested class: ".$class); show_error("Unable to load the requested class: ".$class); } // Safety: Was the class already loaded by a previous call? if (in_array($subclass, $this->_ci_classes)) { $is_duplicate = TRUE; log_message('debug', $class." class already loaded. Second attempt ignored."); return; } include($baseclass); include($subclass); $this->_ci_classes[] = $subclass; return $this->_ci_init_class($class, config_item('subclass_prefix'), $params); } // Lets search for the requested library file and load it. $is_duplicate = FALSE; for ($i = 1; $i < 3; $i++) { $path = ($i % 2) ? APPPATH : BASEPATH; $filepath = $path.'libraries/'.$class.EXT; // Does the file exist? No? Bummer... if ( ! file_exists($filepath)) { continue; } // Safety: Was the class already loaded by a previous call? if (in_array($filepath, $this->_ci_classes)) { $is_duplicate = TRUE; log_message('debug', $class." class already loaded. Second attempt ignored."); return; } include($filepath); $this->_ci_classes[] = $filepath; return $this->_ci_init_class($class, '', $params); } } // END FOREACH // If we got this far we were unable to find the requested class. // We do not issue errors if the load call failed due to a duplicate request if ($is_duplicate == FALSE) { log_message('error', "Unable to load the requested class: ".$class); show_error("Unable to load the requested class: ".$class); } } // -------------------------------------------------------------------- /** * Instantiates a class * * @access private * @param string * @param string * @return null */ function _ci_init_class($class, $prefix = '', $config = FALSE) { // Is there an associated config file for this class? if ($config === NULL) { $config = NULL; if (file_exists(APPPATH.'config/'.$class.EXT)) { include(APPPATH.'config/'.$class.EXT); } } if ($prefix == '') { $name = (class_exists('CI_'.$class)) ? 'CI_'.$class : $class; } else { $name = $prefix.$class; } // Set the variable name we will assign the class to $class = strtolower($class); $classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class]; // Instantiate the class $CI =& get_instance(); if ($config !== NULL) { $CI->$classvar = new $name($config); } else { $CI->$classvar = new $name; } } // -------------------------------------------------------------------- /** * Autoloader * * The config/autoload.php file contains an array that permits sub-systems, * libraries, plugins, and helpers to be loaded automatically. * * @access private * @param array * @return void */ function _ci_autoloader() { include(APPPATH.'config/autoload'.EXT); if ( ! isset($autoload)) { return FALSE; } // Load any custom config file if (count($autoload['config']) > 0) { $CI =& get_instance(); foreach ($autoload['config'] as $key => $val) { $CI->config->load($val); } } // Autoload plugins, helpers, scripts and languages foreach (array('helper', 'plugin', 'script', 'language') as $type) { if (isset($autoload[$type]) AND count($autoload[$type]) > 0) { $this->$type($autoload[$type]); } } // Autoload models if (isset($autoload['model'])) { $this->model($autoload['model']); } // A little tweak to remain backward compatible // The $autoload['core'] item was deprecated if ( ! isset($autoload['libraries'])) { $autoload['libraries'] = $autoload['core']; } // Load libraries if (isset($autoload['libraries']) AND count($autoload['libraries']) > 0) { // Load the database driver. if (in_array('database', $autoload['libraries'])) { $this->database(); $autoload['libraries'] = array_diff($autoload['libraries'], array('database')); } // Load scaffolding if (in_array('scaffolding', $autoload['libraries'])) { $this->scaffolding(); $autoload['libraries'] = array_diff($autoload['libraries'], array('scaffolding')); } // Load all other libraries foreach ($autoload['libraries'] as $item) { $this->library($item); } // Load the model class. if (in_array('model', $autoload['libraries'])) { $this->model(); $autoload['libraries'] = array_diff($autoload['libraries'], array('model')); } } } // -------------------------------------------------------------------- /** * Assign to Models * * Makes sure that anything loaded by the loader class (libraries, plugins, etc.) * will be available to models, if any exist. * * @access private * @param object * @return array */ function _ci_assign_to_models() { if (count($this->_ci_models) == 0) { return; } if ($this->_ci_is_instance()) { $CI =& get_instance(); foreach ($this->_ci_models as $model) { $CI->$model->_assign_libraries(); } } else { foreach ($this->_ci_models as $model) { $this->$model->_assign_libraries(); } } } // -------------------------------------------------------------------- /** * Object to Array * * Takes an object as input and converts the class variables to array key/vals * * @access private * @param object * @return array */ function _ci_object_to_array($object) { return (is_object($object)) ? get_object_vars($object) : $object; } // -------------------------------------------------------------------- /** * Determines whether we should use the CI instance or $this * * @access private * @return bool */ function _ci_is_instance() { if ($this->_ci_is_php5 == TRUE) { return TRUE; } global $CI; return (is_object($CI)) ? TRUE : FALSE; } } ?> \ No newline at end of file + 'unit', 'user_agent' => 'agent'); + + + /** + * Constructor + * + * Sets the path to the view files and gets the initial output buffering level + * + * @access public + */ + function CI_Loader() + { + $this->_ci_is_php5 = (floor(phpversion()) >= 5) ? TRUE : FALSE; + $this->_ci_view_path = APPPATH.'views/'; + $this->_ci_ob_level = ob_get_level(); + + log_message('debug', "Loader Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * Class Loader + * + * This function lets users load and instantiate classes. + * It is designed to be called from a user's app controllers. + * + * @access public + * @param string the name of the class + * @param mixed the optional parameters + * @return void + */ + function library($library = '', $params = NULL) + { + if ($library == '') + { + return FALSE; + } + + if (is_array($library)) + { + foreach ($library as $class) + { + $this->_ci_load_class($class, $params); + } + } + else + { + $this->_ci_load_class($library, $params); + } + + $this->_ci_assign_to_models(); + } + + // -------------------------------------------------------------------- + + /** + * Model Loader + * + * This function lets users load and instantiate models. + * + * @access public + * @param string the name of the class + * @param mixed any initialization parameters + * @return void + */ + function model($model, $name = '', $db_conn = FALSE) + { + if (is_array($model)) + { + foreach($model as $babe) + { + $this->model($babe); + } + return; + } + + if ($model == '') + { + return; + } + + // Is the model in a sub-folder? If so, parse out the filename and path. + if (strpos($model, '/') === FALSE) + { + $path = ''; + } + else + { + $x = explode('/', $model); + $model = end($x); + unset($x[count($x)-1]); + $path = implode('/', $x).'/'; + } + + if ($name == '') + { + $name = $model; + } + + if (in_array($name, $this->_ci_models, TRUE)) + { + return; + } + + $CI =& get_instance(); + if (isset($CI->$name)) + { + show_error('The model name you are loading is the name of a resource that is already being used: '.$name); + } + + $model = strtolower($model); + + if ( ! file_exists(APPPATH.'models/'.$path.$model.EXT)) + { + show_error('Unable to locate the model you have specified: '.$model); + } + + if ($db_conn !== FALSE AND ! class_exists('CI_DB')) + { + if ($db_conn === TRUE) + $db_conn = ''; + + $CI->load->database($db_conn, FALSE, TRUE); + } + + if ( ! class_exists('Model')) + { + require_once(BASEPATH.'libraries/Model'.EXT); + } + + require_once(APPPATH.'models/'.$path.$model.EXT); + + $model = ucfirst($model); + + $CI->$name = new $model(); + $CI->$name->_assign_libraries(); + + $this->_ci_models[] = $name; + } + + // -------------------------------------------------------------------- + + /** + * Database Loader + * + * @access public + * @param string the DB credentials + * @param bool whether to return the DB object + * @param bool whether to enable active record (this allows us to override the config setting) + * @return object + */ + function database($params = '', $return = FALSE, $active_record = FALSE) + { + // Do we even need to load the database class? + if (class_exists('CI_DB') AND $return == FALSE AND $active_record == FALSE) + { + return FALSE; + } + + require_once(BASEPATH.'database/DB'.EXT); + + if ($return === TRUE) + { + return DB($params, $active_record); + } + + // Grab the super object + $CI =& get_instance(); + + // Initialize the db variable. Needed to prevent + // reference errors with some configurations + $CI->db = ''; + + // Load the DB class + $CI->db =& DB($params, $active_record); + + // Assign the DB object to any existing models + $this->_ci_assign_to_models(); + } + + // -------------------------------------------------------------------- + + /** + * Load the Utilities Class + * + * @access public + * @return string + */ + function dbutil() + { + if ( ! class_exists('CI_DB')) + { + $this->database(); + } + + $CI =& get_instance(); + + require_once(BASEPATH.'database/DB_utility'.EXT); + require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility'.EXT); + $class = 'CI_DB_'.$CI->db->dbdriver.'_utility'; + + $CI->dbutil = new $class(); + $CI->load->_ci_assign_to_models(); + } + + // -------------------------------------------------------------------- + + /** + * Load View + * + * 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 + * some cases it's advantageous to be able to return data so that + * a developer can process it in some way. + * + * @access public + * @param string + * @param array + * @param bool + * @return void + */ + function view($view, $vars = array(), $return = FALSE) + { + return $this->_ci_load(array('view' => $view, 'vars' => $this->_ci_object_to_array($vars), 'return' => $return)); + } + + // -------------------------------------------------------------------- + + /** + * Load File + * + * This is a generic file loader + * + * @access public + * @param string + * @param bool + * @return string + */ + function file($path, $return = FALSE) + { + return $this->_ci_load(array('path' => $path, 'return' => $return)); + } + + // -------------------------------------------------------------------- + + /** + * Set Variables + * + * Once variables are set they become available within + * the controller class and its "view" files. + * + * @access public + * @param array + * @return void + */ + function vars($vars = array()) + { + $vars = $this->_ci_object_to_array($vars); + + if (is_array($vars) AND count($vars) > 0) + { + foreach ($vars as $key => $val) + { + $this->_ci_cached_vars[$key] = $val; + } + } + } + + // -------------------------------------------------------------------- + + /** + * Load Helper + * + * This function loads the specified helper file. + * + * @access public + * @param mixed + * @return void + */ + function helper($helpers = array()) + { + if ( ! is_array($helpers)) + { + $helpers = array($helpers); + } + + foreach ($helpers as $helper) + { + $helper = strtolower(str_replace(EXT, '', str_replace('_helper', '', $helper)).'_helper'); + + if (isset($this->_ci_helpers[$helper])) + { + continue; + } + + if (file_exists(APPPATH.'helpers/'.$helper.EXT)) + { + include_once(APPPATH.'helpers/'.$helper.EXT); + } + else + { + if (file_exists(BASEPATH.'helpers/'.$helper.EXT)) + { + include(BASEPATH.'helpers/'.$helper.EXT); + } + else + { + show_error('Unable to load the requested file: helpers/'.$helper.EXT); + } + } + + $this->_ci_helpers[$helper] = TRUE; + + } + + log_message('debug', 'Helpers loaded: '.implode(', ', $helpers)); + } + + // -------------------------------------------------------------------- + + /** + * Load Helpers + * + * This is simply an alias to the above function in case the + * user has written the plural form of this function. + * + * @access public + * @param array + * @return void + */ + function helpers($helpers = array()) + { + $this->helper($helpers); + } + + // -------------------------------------------------------------------- + + /** + * Load Plugin + * + * This function loads the specified plugin. + * + * @access public + * @param array + * @return void + */ + function plugin($plugins = array()) + { + if ( ! is_array($plugins)) + { + $plugins = array($plugins); + } + + foreach ($plugins as $plugin) + { + $plugin = strtolower(str_replace(EXT, '', str_replace('_plugin.', '', $plugin)).'_pi'); + + if (isset($this->_ci_plugins[$plugin])) + { + continue; + } + + if (file_exists(APPPATH.'plugins/'.$plugin.EXT)) + { + include(APPPATH.'plugins/'.$plugin.EXT); + } + else + { + if (file_exists(BASEPATH.'plugins/'.$plugin.EXT)) + { + include(BASEPATH.'plugins/'.$plugin.EXT); + } + else + { + show_error('Unable to load the requested file: plugins/'.$plugin.EXT); + } + } + + $this->_ci_plugins[$plugin] = TRUE; + } + + log_message('debug', 'Plugins loaded: '.implode(', ', $plugins)); + } + + // -------------------------------------------------------------------- + + /** + * Load Plugins + * + * This is simply an alias to the above function in case the + * user has written the plural form of this function. + * + * @access public + * @param array + * @return void + */ + function plugins($plugins = array()) + { + $this->plugin($plugins); + } + + // -------------------------------------------------------------------- + + /** + * Load Script + * + * This function loads the specified include file from the + * application/scripts/ folder. + * + * NOTE: This feature has been deprecated but it will remain available + * for legacy users. + * + * @access public + * @param array + * @return void + */ + function script($scripts = array()) + { + if ( ! is_array($scripts)) + { + $scripts = array($scripts); + } + + foreach ($scripts as $script) + { + $script = strtolower(str_replace(EXT, '', $script)); + + if (isset($this->_ci_scripts[$script])) + { + continue; + } + + if ( ! file_exists(APPPATH.'scripts/'.$script.EXT)) + { + show_error('Unable to load the requested script: scripts/'.$script.EXT); + } + + include(APPPATH.'scripts/'.$script.EXT); + } + + log_message('debug', 'Scripts loaded: '.implode(', ', $scripts)); + } + + // -------------------------------------------------------------------- + + /** + * Loads a language file + * + * @access public + * @param array + * @param string + * @return void + */ + function language($file = array(), $lang = '') + { + $CI =& get_instance(); + + if ( ! is_array($file)) + { + $file = array($file); + } + + foreach ($file as $langfile) + { + $CI->lang->load($langfile, $lang); + } + } + + /** + * Loads language files for scaffolding + * + * @access public + * @param string + * @return arra + */ + function scaffold_language($file = '', $lang = '', $return = FALSE) + { + $CI =& get_instance(); + return $CI->lang->load($file, $lang, $return); + } + + // -------------------------------------------------------------------- + + /** + * Loads a config file + * + * @access public + * @param string + * @return void + */ + function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) + { + $CI =& get_instance(); + $CI->config->load($file, $use_sections, $fail_gracefully); + } + + // -------------------------------------------------------------------- + + /** + * Scaffolding Loader + * + * This initializing function works a bit different than the + * others. It doesn't load the class. Instead, it simply + * sets a flag indicating that scaffolding is allowed to be + * used. The actual scaffolding function below is + * called by the front controller based on whether the + * second segment of the URL matches the "secret" scaffolding + * word stored in the application/config/routes.php + * + * @access public + * @param string + * @return void + */ + function scaffolding($table = '') + { + if ($table === FALSE) + { + show_error('You must include the name of the table you would like to access when you initialize scaffolding'); + } + + $CI =& get_instance(); + $CI->_ci_scaffolding = TRUE; + $CI->_ci_scaff_table = $table; + } + + // -------------------------------------------------------------------- + + /** + * Loader + * + * This function is used to load views and files. + * + * @access private + * @param array + * @return void + */ + function _ci_load($data) + { + // Set the default data variables + foreach (array('view', 'vars', 'path', 'return') as $val) + { + $$val = ( ! isset($data[$val])) ? FALSE : $data[$val]; + } + + // Set the path to the requested file + if ($path == '') + { + $ext = pathinfo($view, PATHINFO_EXTENSION); + $file = ($ext == '') ? $view.EXT : $view; + $path = $this->_ci_view_path.$file; + } + else + { + $x = explode('/', $path); + $file = end($x); + } + + if ( ! file_exists($path)) + { + show_error('Unable to load the requested file: '.$file); + } + + // This allows anything loaded using $this->load (views, files, etc.) + // to become accessible from within the Controller and Model functions. + // Only needed when running PHP 5 + + if ($this->_ci_is_instance()) + { + $CI =& get_instance(); + foreach (get_object_vars($CI) as $key => $var) + { + if ( ! isset($this->$key)) + { + $this->$key =& $CI->$key; + } + } + } + + /* + * Extract and cache variables + * + * You can either set variables using the dedicated $this->load_vars() + * function or via the second parameter of this function. We'll merge + * the two types and cache them so that views that are embedded within + * other views can have access to these variables. + */ + if (is_array($vars)) + { + $this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $vars); + } + extract($this->_ci_cached_vars); + + /* + * Buffer the output + * + * 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 + * can intercept the content right before it's sent to + * the browser and then stop the timer it won't be accurate. + */ + ob_start(); + + // If the PHP installation does not support short tags we'll + // do a little string replacement, changing the short tags + // to standard PHP echo statements. + + if ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE) + { + echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace(' $this->_ci_ob_level + 1) + { + ob_end_flush(); + } + else + { + // PHP 4 requires that we use a global + global $OUT; + $OUT->set_output(ob_get_contents()); + @ob_end_clean(); + } + } + + // -------------------------------------------------------------------- + + /** + * Load class + * + * This function loads the requested class. + * + * @access private + * @param string the item that is being loaded + * @param mixed any additional parameters + * @return void + */ + function _ci_load_class($class, $params = NULL) + { + // Get the class name + $class = str_replace(EXT, '', $class); + + // We'll test for both lowercase and capitalized versions of the file name + foreach (array(ucfirst($class), strtolower($class)) as $class) + { + $subclass = APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT; + + // Is this a class extension request? + if (file_exists($subclass)) + { + $baseclass = BASEPATH.'libraries/'.ucfirst($class).EXT; + + if ( ! file_exists($baseclass)) + { + log_message('error', "Unable to load the requested class: ".$class); + show_error("Unable to load the requested class: ".$class); + } + + // Safety: Was the class already loaded by a previous call? + if (in_array($subclass, $this->_ci_classes)) + { + $is_duplicate = TRUE; + log_message('debug', $class." class already loaded. Second attempt ignored."); + return; + } + + include($baseclass); + include($subclass); + $this->_ci_classes[] = $subclass; + + return $this->_ci_init_class($class, config_item('subclass_prefix'), $params); + } + + // Lets search for the requested library file and load it. + $is_duplicate = FALSE; + for ($i = 1; $i < 3; $i++) + { + $path = ($i % 2) ? APPPATH : BASEPATH; + $filepath = $path.'libraries/'.$class.EXT; + + // Does the file exist? No? Bummer... + if ( ! file_exists($filepath)) + { + continue; + } + + // Safety: Was the class already loaded by a previous call? + if (in_array($filepath, $this->_ci_classes)) + { + $is_duplicate = TRUE; + log_message('debug', $class." class already loaded. Second attempt ignored."); + return; + } + + include($filepath); + $this->_ci_classes[] = $filepath; + return $this->_ci_init_class($class, '', $params); + } + } // END FOREACH + + // If we got this far we were unable to find the requested class. + // We do not issue errors if the load call failed due to a duplicate request + if ($is_duplicate == FALSE) + { + log_message('error', "Unable to load the requested class: ".$class); + show_error("Unable to load the requested class: ".$class); + } + } + + // -------------------------------------------------------------------- + + /** + * Instantiates a class + * + * @access private + * @param string + * @param string + * @return null + */ + function _ci_init_class($class, $prefix = '', $config = FALSE) + { + // Is there an associated config file for this class? + if ($config === NULL) + { + if (file_exists(APPPATH.'config/'.$class.EXT)) + { + include(APPPATH.'config/'.$class.EXT); + } + } + + if ($prefix == '') + { + $name = (class_exists('CI_'.$class)) ? 'CI_'.$class : $class; + } + else + { + $name = $prefix.$class; + } + + // Set the variable name we will assign the class to + $class = strtolower($class); + $classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class]; + + // Instantiate the class + $CI =& get_instance(); + if ($config !== NULL) + { + $CI->$classvar = new $name($config); + } + else + { + $CI->$classvar = new $name; + } + } + + // -------------------------------------------------------------------- + + /** + * Autoloader + * + * The config/autoload.php file contains an array that permits sub-systems, + * libraries, plugins, and helpers to be loaded automatically. + * + * @access private + * @param array + * @return void + */ + function _ci_autoloader() + { + include(APPPATH.'config/autoload'.EXT); + + if ( ! isset($autoload)) + { + return FALSE; + } + + // Load any custom config file + if (count($autoload['config']) > 0) + { + $CI =& get_instance(); + foreach ($autoload['config'] as $key => $val) + { + $CI->config->load($val); + } + } + + // Autoload plugins, helpers, scripts and languages + foreach (array('helper', 'plugin', 'script', 'language') as $type) + { + if (isset($autoload[$type]) AND count($autoload[$type]) > 0) + { + $this->$type($autoload[$type]); + } + } + + // Autoload models + if (isset($autoload['model'])) + { + $this->model($autoload['model']); + } + + // A little tweak to remain backward compatible + // The $autoload['core'] item was deprecated + if ( ! isset($autoload['libraries'])) + { + $autoload['libraries'] = $autoload['core']; + } + + // Load libraries + if (isset($autoload['libraries']) AND count($autoload['libraries']) > 0) + { + // Load the database driver. + if (in_array('database', $autoload['libraries'])) + { + $this->database(); + $autoload['libraries'] = array_diff($autoload['libraries'], array('database')); + } + + // Load scaffolding + if (in_array('scaffolding', $autoload['libraries'])) + { + $this->scaffolding(); + $autoload['libraries'] = array_diff($autoload['libraries'], array('scaffolding')); + } + + // Load all other libraries + foreach ($autoload['libraries'] as $item) + { + $this->library($item); + } + + // Load the model class. + if (in_array('model', $autoload['libraries'])) + { + $this->model(); + $autoload['libraries'] = array_diff($autoload['libraries'], array('model')); + } + } + } + + // -------------------------------------------------------------------- + + /** + * Assign to Models + * + * Makes sure that anything loaded by the loader class (libraries, plugins, etc.) + * will be available to models, if any exist. + * + * @access private + * @param object + * @return array + */ + function _ci_assign_to_models() + { + if (count($this->_ci_models) == 0) + { + return; + } + + if ($this->_ci_is_instance()) + { + $CI =& get_instance(); + foreach ($this->_ci_models as $model) + { + $CI->$model->_assign_libraries(); + } + } + else + { + foreach ($this->_ci_models as $model) + { + $this->$model->_assign_libraries(); + } + } + } + + // -------------------------------------------------------------------- + + /** + * Object to Array + * + * Takes an object as input and converts the class variables to array key/vals + * + * @access private + * @param object + * @return array + */ + function _ci_object_to_array($object) + { + return (is_object($object)) ? get_object_vars($object) : $object; + } + + // -------------------------------------------------------------------- + + /** + * Determines whether we should use the CI instance or $this + * + * @access private + * @return bool + */ + function _ci_is_instance() + { + if ($this->_ci_is_php5 == TRUE) + { + return TRUE; + } + + global $CI; + return (is_object($CI)) ? TRUE : FALSE; + } + +} +?> \ No newline at end of file From aa7f769c1e6f46171f2fbc15f43428207c02abcb Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 20 Dec 2007 14:38:56 +0000 Subject: [PATCH 0760/2544] fixed typo: $field_names[] vs $Ffield_names[] --- system/database/drivers/postgre/postgre_result.php | 2 +- system/database/drivers/sqlite/sqlite_result.php | 2 +- user_guide/changelog.html | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php index 9938d406..9fd2a7e9 100644 --- a/system/database/drivers/postgre/postgre_result.php +++ b/system/database/drivers/postgre/postgre_result.php @@ -65,7 +65,7 @@ function list_fields() $field_names = array(); for ($i = 0; $i < $this->num_fields(); $i++) { - $Ffield_names[] = pg_field_name($this->result_id, $i); + $field_names[] = pg_field_name($this->result_id, $i); } return $field_names; diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php index 9a2e2b6e..caa16781 100644 --- a/system/database/drivers/sqlite/sqlite_result.php +++ b/system/database/drivers/sqlite/sqlite_result.php @@ -65,7 +65,7 @@ function list_fields() $field_names = array(); for ($i = 0; $i < $this->num_fields(); $i++) { - $Ffield_names[] = sqlite_field_name($this->result_id, $i); + $field_names[] = sqlite_field_name($this->result_id, $i); } return $field_names; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f5f1ad28..033824b5 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -86,6 +86,7 @@

    Version 1.5.5

  • Moved the safe mode and auth checks for the Email library into the constructor.
  • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
  • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • +
  • Fixed a bug: $field_names[] vs $Ffield_names[] in postgre and sqlite drivers
  • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
  • Fixed a bug in the Email library where some timezones were calculated incorrectly.
  • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • From 41f60d44e37cc52d41a49d0d640f71761a82abe7 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 20 Dec 2007 20:09:22 +0000 Subject: [PATCH 0761/2544] Added the ability to pass an array of tables to the delete() statement in Active Record. --- system/database/DB_active_rec.php | 23 +++++++++++++++++++---- user_guide/changelog.html | 1 + user_guide/database/active_record.html | 18 ++++++++++-------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index dfa0a3ef..d48d1c5b 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -925,11 +925,13 @@ function update($table = '', $set = NULL, $where = null, $limit = NULL) * Compiles a delete string and runs the query * * @access public - * @param string the table to retrieve the results from + * @param mixed the table(s) to delete from. String or array * @param mixed the where clause + * @param mixed the limit clause + * @param boolean * @return object */ - function delete($table = '', $where = '', $limit = NULL) + function delete($table = '', $where = '', $limit = NULL, $reset_data = TRUE) { if ($table == '') { @@ -945,6 +947,16 @@ function delete($table = '', $where = '', $limit = NULL) $table = $this->ar_from[0]; } + if (is_array($table)) + { + foreach($table as $single_table) + { + $this->delete($this->dbprefix.$single_table, $where, $limit, FALSE); + } + $this->_reset_write(); + return; + } + if ($where != '') { $this->where($where); @@ -963,10 +975,13 @@ function delete($table = '', $where = '', $limit = NULL) } return FALSE; } - + $sql = $this->_delete($this->dbprefix.$table, $this->ar_where, $this->ar_limit); - $this->_reset_write(); + if ($reset_data) + { + $this->_reset_write(); + } return $this->query($sql); } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 033824b5..3fbac474 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -70,6 +70,7 @@

    Version 1.5.5

  • Added 'random' as an order_by() option in Active Record.
  • Added where_in(), where_in_or(), where_not_in(), and where_not_in_or() to Active Record.
  • Added support for limit() into update() and delete() statements in Active Record.
    • +
  • Added the ability to pass an array of tables to the delete() statement in Active Record.
  • Added titles to all user manual pages.
  • Added a check for NULL fields in the MySQL database backup utility.
  • Documented the timezones() function in the Date Helper.
    • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index d938b5df..e7c823fd 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -623,14 +623,16 @@

    $this->db->delete();

    The first parameter is the table name, the second is the where clause. You can also use the where() or or_where() functions instead of passing the data to the second parameter of the function:

    - -$this->db->where('id', $id);
    -$this->db->delete('mytable'); -

    -// Produces:
    -// DELETE FROM mytable
    -// WHERE id = $id     - +

    $this->db->where('id', $id);
    + $this->db->delete('mytable');
    +
    + // Produces:
    + // DELETE FROM mytable
    + // WHERE id = $id

    +

    An array of table names can be passed into delete() if you would like to delete data from more then 1 table.

    +

    $tables = array('table1', 'table2', 'table3');
    +$this->db->where('id', '5');
    +$this->db->delete($tables);

    Note: All values are escaped automatically producing safer queries.

    From 0a64f440ea25495dd96c6a5fd00d315077029f89 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 21 Dec 2007 05:27:44 +0000 Subject: [PATCH 0762/2544] blackBerry to blackberry --- system/application/config/user_agents.php | 204 +++++++++++----------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/system/application/config/user_agents.php b/system/application/config/user_agents.php index 6fa7b4a7..08a665f9 100644 --- a/system/application/config/user_agents.php +++ b/system/application/config/user_agents.php @@ -1,103 +1,103 @@ - 'Windows Longhorn', - 'windows nt 5.2' => 'Windows 2003', - 'windows nt 5.0' => 'Windows 2000', - 'windows nt 5.1' => 'Windows XP', - 'windows nt 4.0' => 'Windows NT 4.0', - 'winnt4.0' => 'Windows NT 4.0', - 'winnt 4.0' => 'Windows NT', - 'winnt' => 'Windows NT', - 'windows 98' => 'Windows 98', - 'win98' => 'Windows 98', - 'windows 95' => 'Windows 95', - 'win95' => 'Windows 95', - 'windows' => 'Unknown Windows OS', - 'os x' => 'Mac OS X', - 'ppc mac' => 'Power PC Mac', - 'freebsd' => 'FreeBSD', - 'ppc' => 'Macintosh', - 'linux' => 'Linux', - 'debian' => 'Debian', - 'sunos' => 'Sun Solaris', - 'beos' => 'BeOS', - 'apachebench' => 'ApacheBench', - 'aix' => 'AIX', - 'irix' => 'Irix', - 'osf' => 'DEC OSF', - 'hp-ux' => 'HP-UX', - 'netbsd' => 'NetBSD', - 'bsdi' => 'BSDi', - 'openbsd' => 'OpenBSD', - 'gnu' => 'GNU/Linux', - 'unix' => 'Unknown Unix OS' - ); - - -// The order of this array should NOT be changed. Many browsers return -// multiple browser types so we want to identify the sub-type first. -$browsers = array( - 'Opera' => 'Opera', - 'MSIE' => 'Internet Explorer', - 'Internet Explorer' => 'Internet Explorer', - 'Shiira' => 'Shiira', - 'Firefox' => 'Firefox', - 'Chimera' => 'Chimera', - 'Phoenix' => 'Phoenix', - 'Firebird' => 'Firebird', - 'Camino' => 'Camino', - 'Netscape' => 'Netscape', - 'OmniWeb' => 'OmniWeb', - 'Mozilla' => 'Mozilla', - 'Safari' => 'Safari', - 'Konqueror' => 'Konqueror', - 'icab' => 'iCab', - 'Lynx' => 'Lynx', - 'Links' => 'Links', - 'hotjava' => 'HotJava', - 'amaya' => 'Amaya', - 'IBrowse' => 'IBrowse' - ); - -$mobiles = array( - 'mobileexplorer' => 'Mobile Explorer', - 'openwave' => 'Open Wave', - 'opera mini' => 'Opera Mini', - 'operamini' => 'Opera Mini', - 'elaine' => 'Palm', - 'palmsource' => 'Palm', - 'digital paths' => 'Palm', - 'avantgo' => 'Avantgo', - 'xiino' => 'Xiino', - 'palmscape' => 'Palmscape', - 'nokia' => 'Nokia', - 'ericsson' => 'Ericsson', - 'blackBerry' => 'BlackBerry', - 'motorola' => 'Motorola' - ); - -// There are hundreds of bots but these are the most common. -$robots = array( - 'googlebot' => 'Googlebot', - 'msnbot' => 'MSNBot', - 'slurp' => 'Inktomi Slurp', - 'yahoo' => 'Yahoo', - 'askjeeves' => 'AskJeeves', - 'fastcrawler' => 'FastCrawler', - 'infoseek' => 'InfoSeek Robot 1.0', - 'lycos' => 'Lycos' - ); - - + 'Windows Longhorn', + 'windows nt 5.2' => 'Windows 2003', + 'windows nt 5.0' => 'Windows 2000', + 'windows nt 5.1' => 'Windows XP', + 'windows nt 4.0' => 'Windows NT 4.0', + 'winnt4.0' => 'Windows NT 4.0', + 'winnt 4.0' => 'Windows NT', + 'winnt' => 'Windows NT', + 'windows 98' => 'Windows 98', + 'win98' => 'Windows 98', + 'windows 95' => 'Windows 95', + 'win95' => 'Windows 95', + 'windows' => 'Unknown Windows OS', + 'os x' => 'Mac OS X', + 'ppc mac' => 'Power PC Mac', + 'freebsd' => 'FreeBSD', + 'ppc' => 'Macintosh', + 'linux' => 'Linux', + 'debian' => 'Debian', + 'sunos' => 'Sun Solaris', + 'beos' => 'BeOS', + 'apachebench' => 'ApacheBench', + 'aix' => 'AIX', + 'irix' => 'Irix', + 'osf' => 'DEC OSF', + 'hp-ux' => 'HP-UX', + 'netbsd' => 'NetBSD', + 'bsdi' => 'BSDi', + 'openbsd' => 'OpenBSD', + 'gnu' => 'GNU/Linux', + 'unix' => 'Unknown Unix OS' + ); + + +// The order of this array should NOT be changed. Many browsers return +// multiple browser types so we want to identify the sub-type first. +$browsers = array( + 'Opera' => 'Opera', + 'MSIE' => 'Internet Explorer', + 'Internet Explorer' => 'Internet Explorer', + 'Shiira' => 'Shiira', + 'Firefox' => 'Firefox', + 'Chimera' => 'Chimera', + 'Phoenix' => 'Phoenix', + 'Firebird' => 'Firebird', + 'Camino' => 'Camino', + 'Netscape' => 'Netscape', + 'OmniWeb' => 'OmniWeb', + 'Mozilla' => 'Mozilla', + 'Safari' => 'Safari', + 'Konqueror' => 'Konqueror', + 'icab' => 'iCab', + 'Lynx' => 'Lynx', + 'Links' => 'Links', + 'hotjava' => 'HotJava', + 'amaya' => 'Amaya', + 'IBrowse' => 'IBrowse' + ); + +$mobiles = array( + 'mobileexplorer' => 'Mobile Explorer', + 'openwave' => 'Open Wave', + 'opera mini' => 'Opera Mini', + 'operamini' => 'Opera Mini', + 'elaine' => 'Palm', + 'palmsource' => 'Palm', + 'digital paths' => 'Palm', + 'avantgo' => 'Avantgo', + 'xiino' => 'Xiino', + 'palmscape' => 'Palmscape', + 'nokia' => 'Nokia', + 'ericsson' => 'Ericsson', + 'blackberry' => 'BlackBerry', + 'motorola' => 'Motorola' + ); + +// There are hundreds of bots but these are the most common. +$robots = array( + 'googlebot' => 'Googlebot', + 'msnbot' => 'MSNBot', + 'slurp' => 'Inktomi Slurp', + 'yahoo' => 'Yahoo', + 'askjeeves' => 'AskJeeves', + 'fastcrawler' => 'FastCrawler', + 'infoseek' => 'InfoSeek Robot 1.0', + 'lycos' => 'Lycos' + ); + + ?> \ No newline at end of file From fac8042f055048d83414d72a18fc0d70ec7d3ddf Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 21 Dec 2007 14:59:26 +0000 Subject: [PATCH 0763/2544] Added Zip Encoding Class to the table of contents of the userguide. --- user_guide/changelog.html | 3 ++- user_guide/toc.html | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3fbac474..7bdc3da2 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -108,7 +108,8 @@

    Version 1.5.5

  • Fixed a typo in the String Helper (uniquid changed to uniqid)
  • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
  • Fixed a typo in the table library docs.
    • -
  • Moved part of the userguide menu javascript to an external file.
    • +
  • Moved part of the userguide menu javascript to an external file.
    • +
  • Added Zip Encoding Class to the table of contents of the userguide.
  • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
    • diff --git a/user_guide/toc.html b/user_guide/toc.html index 125b506c..3f6b16e4 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -144,6 +144,7 @@

    Class Reference

  • User Agent Class
  • Validation Class
  • XML-RPC Class
    • +
  • Zip Encoding Class
    • From 4e387c30919569814e912f8136280fc1433a05f3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 22 Dec 2007 16:41:29 +0000 Subject: [PATCH 0764/2544] typos fixes --- user_guide/changelog.html | 4 +--- user_guide/helpers/file_helper.html | 2 +- user_guide/libraries/validation.html | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7bdc3da2..91875890 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -103,11 +103,9 @@

    Version 1.5.5

  • Fixed a typo in the image language file "suppor" to "support".
  • Fixed an example for XML RPC.
  • Fixed an example of accept_charset() in the User Agent Library.
    • -
  • Fixed a missing "?>" in the smiley helper.
  • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
  • Fixed a typo in the String Helper (uniquid changed to uniqid)
    • -
  • Fixed a typo in the DocBlock comment for unset_userdata() in Session.
    • -
  • Fixed a typo in the table library docs.
    • +
  • Fixed assorted user guide typos.
  • Moved part of the userguide menu javascript to an external file.
  • Added Zip Encoding Class to the table of contents of the userguide.
  • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
    • diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 815b7fd2..da8337cb 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -79,7 +79,7 @@

    read_file('path')

    Note: The path is relative to your main site index.php file, NOT your controller or view files. CodeIgniter uses a front controller so paths are always relative to the main site index.

    -

    If you server is running an open_basedir restriction this function +

    If your server is running an open_basedir restriction this function might not work if you are trying to access a file above the calling script.

    write_file('path', $data)

    diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index b63c3e1c..90ff0c12 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -675,7 +675,7 @@

    set_select()

    <select name="myselect">
    <option value="one" <?= $this->validation->set_select('myselect', 'one'); ?> >One</option>
    -<option value="two" <?= $this->validation->set_select('myselect', 'two'); ?> >Three</option>
    +<option value="two" <?= $this->validation->set_select('myselect', 'two'); ?> >Two</option>
    <option value="three" <?= $this->validation->set_select('myselect', 'three'); ?> >Three</option>
    </select>     From 4a969bb208c1fc955d86b0b2c73b1af2689323fe Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 22 Dec 2007 19:56:04 +0000 Subject: [PATCH 0765/2544] typo --- user_guide/libraries/image_lib.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 8dddcf0a..83dc8b3c 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -79,7 +79,7 @@

    Image Manipulation Class

    Initializing the Class

    Like most other classes in CodeIgniter, the image class is initialized in your controller -using the $this->load_library function:

    +using the $this->load->library function:

    $this->load->library('image_lib');

    Once the library is loaded it will be ready for use. The image library object you will use to call all functions is: $this->image_lib

    From 7184f342863b7056437ce441a4fed135128cd8f6 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 26 Dec 2007 14:47:10 +0000 Subject: [PATCH 0766/2544] example fix --- user_guide/general/routing.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 15ba73ce..f7f93c83 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -114,14 +114,14 @@

    Examples

    Here are a few routing examples:

    $route['journals'] = "blogs"; -

    Any URL containing the word "journals" in the first segment will be remapped to the "blogs" class.

    +

    A URL containing the word "journals" in the first segment will be remapped to the "blogs" class.

    $route['blog/joe'] = "blogs/users/34"; -

    Any URL containing the segments blog/joe will be remapped to the "blogs" class and the "users" method. The ID will be set to "34".

    +

    A URL containing the segments blog/joe will be remapped to the "blogs" class and the "users" method. The ID will be set to "34".

    $route['product/:any'] = "catalog/product_lookup"; -

    Any URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the "product_lookup" method.

    +

    A URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the "product_lookup" method.

    Important: Do not use leading/trailing slashes.

    From 5e12894eb97cc902892b7c4de79bec55772f7b83 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 28 Dec 2007 21:33:03 +0000 Subject: [PATCH 0767/2544] Added the ability to use aliases with joins in Active Record. --- system/database/DB_active_rec.php | 107 ++++++++++++++++++++++++++---- user_guide/changelog.html | 1 + 2 files changed, 95 insertions(+), 13 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index d48d1c5b..4bf3098d 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -42,7 +42,7 @@ class CI_DB_active_record extends CI_DB_driver { var $ar_orderby = array(); var $ar_set = array(); var $ar_wherein = array(); - + var $ar_aliased_tables = array(); /** @@ -103,8 +103,10 @@ function from($from) { foreach ((array)$from as $val) { + $this->_track_aliases($val); $this->ar_from[] = $this->dbprefix.$val; } + return $this; } @@ -137,11 +139,6 @@ function join($table, $cond, $type = '') } } - if ($this->dbprefix) - { - $cond = preg_replace('|([\w\.]+)([\W\s]+)(.+)|', $this->dbprefix . "$1$2" . $this->dbprefix . "$3", $cond); - } - // If a DB prefix is used we might need to add it to the column names if ($this->dbprefix) { @@ -150,8 +147,11 @@ function join($table, $cond, $type = '') // Next we add the prefixes to the condition $cond = preg_replace('|([\w\.]+)([\W\s]+)(.+)|', $this->dbprefix . "$1$2" . $this->dbprefix . "$3", $cond); - } - + + $this->_track_aliases($table); + + } + $this->ar_join[] = $type.'JOIN '.$this->dbprefix.$table.' ON '.$cond; return $this; } @@ -511,7 +511,7 @@ function group_by($by) $val = trim($val); if ($val != '') - $this->ar_groupby[] = $val; + $this->ar_groupby[] = $this->dbprefix.$val; } return $this; } @@ -713,6 +713,7 @@ function get($table = '', $limit = null, $offset = null) { if ($table != '') { + $this->_track_aliases($table); $this->from($table); } @@ -744,6 +745,7 @@ function count_all_results($table = '') { if ($table != '') { + $this->_track_aliases($table); $this->from($table); } @@ -778,6 +780,7 @@ function get_where($table = '', $where = null, $limit = null, $offset = null) { if ($table != '') { + $this->_track_aliases($table); $this->from($table); } @@ -871,7 +874,7 @@ function insert($table = '', $set = NULL) * @param mixed the where clause * @return object */ - function update($table = '', $set = NULL, $where = null, $limit = NULL) + function update($table = '', $set = NULL, $where = NULL, $limit = NULL) { if ( ! is_null($set)) { @@ -1020,6 +1023,63 @@ function _has_operator($str) // -------------------------------------------------------------------- + /** + * Track Aliases + * + * Used to track SQL statements written with aliased tables. + * + * @access private + * @param string The table to inspect + * @return string + */ + function _track_aliases($table) + { + // if a table alias is used we can recognize it by a space + if (strpos($table, " ") !== FALSE) + { + // if the alias is written with the AS keyowrd, get it out + $table = preg_replace('/AS/i', '', $table); + + $this->ar_aliased_tables[] = trim(strrchr($table, " ") . '.'); + } + + return $this->dbprefix.$table; + } + + // -------------------------------------------------------------------- + + /** + * Filter Table Aliases + * + * Intelligently removes database prefixes from aliased tables + * + * @access private + * @param array An array of compiled SQL + * @return array Cleaned up statement with aliases accounted for + */ + function _filter_table_aliases($statements) + { + $filter_tables_with_aliases = array(); + + foreach ($statements as $statement) + { + $tables_with_dbprefix = array(); + + foreach ($this->ar_aliased_tables as $k => $v) + { + $tables_with_dbprefix[$k] = '/'.$this->dbprefix.str_replace('.', '', $v).'\./'; + } + + $statement = preg_replace($tables_with_dbprefix, $this->ar_aliased_tables, $statement); + + $filter_tables_with_aliases[] = $statement; + } + + return $filter_tables_with_aliases; + } + + // -------------------------------------------------------------------- + /** * Compile the SELECT statement * @@ -1047,9 +1107,19 @@ function _compile_select($select_override = FALSE) } if (count($this->ar_join) > 0) - { + { $sql .= "\n"; - $sql .= implode("\n", $this->ar_join); + + // special consideration for table aliases + if (count($this->ar_aliased_tables) > 0 && $this->dbprefix) + { + $sql .= implode("\n", $this->_filter_table_aliases($this->ar_join)); + } + else + { + $sql .= implode("\n", $this->ar_join); + } + } if (count($this->ar_where) > 0 OR count($this->ar_like) > 0) @@ -1071,8 +1141,18 @@ function _compile_select($select_override = FALSE) if (count($this->ar_groupby) > 0) { + $sql .= "\nGROUP BY "; - $sql .= implode(', ', $this->ar_groupby); + + // special consideration for table aliases + if (count($this->ar_aliased_tables) > 0 && $this->dbprefix) + { + $sql .= implode(", ", $this->_filter_table_aliases($this->ar_groupby)); + } + else + { + $sql .= implode(', ', $this->ar_groupby); + } } if (count($this->ar_having) > 0) @@ -1154,6 +1234,7 @@ function _reset_select() $this->ar_order = FALSE; $this->ar_orderby = array(); $this->ar_wherein = array(); + $this->ar_aliased_tables = array(); } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 91875890..d8bdc799 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -82,6 +82,7 @@

    Version 1.5.5

  • Added quotes_to_entities() function to string helper.
  • Added form_reset() function to form helper.
  • Added count_all_results() function to Active Record.
    • +
  • Added the ability to use aliases with joins in Active Record.
  • Added a language entry for valid_ip validation error.
  • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
  • Moved the safe mode and auth checks for the Email library into the constructor.
    • From 9805f61a0aca60f3d01e89d1f3d66a2ce9ff3d83 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 31 Dec 2007 16:02:32 +0000 Subject: [PATCH 0768/2544] Fixed a bug in Validation where individual error messages for checkboxes wasn't supported. --- system/libraries/Validation.php | 10 ++++++++-- user_guide/changelog.html | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php index 575c5262..468f2ad4 100644 --- a/system/libraries/Validation.php +++ b/system/libraries/Validation.php @@ -228,8 +228,14 @@ function run() $line = $this->_error_messages['isset']; } - $field = ( ! isset($this->_fields[$field])) ? $field : $this->_fields[$field]; - $this->_error_array[] = sprintf($line, $field); + // Build the error message + $mfield = ( ! isset($this->_fields[$field])) ? $field : $this->_fields[$field]; + $message = sprintf($line, $mfield); + + // Set the error variable. Example: $this->username_error + $error = $field.'_error'; + $this->$error = $this->_error_prefix.$message.$this->_error_suffix; + $this->_error_array[] = $message; } continue; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d8bdc799..152dd481 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -92,6 +92,7 @@

    Version 1.5.5

  • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
  • Fixed a bug in the Email library where some timezones were calculated incorrectly.
  • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • +
  • Fixed a bug in Validation where individual error messages for checkboxes wasn't supported.
  • Fixed a bug in the Session library where user agent matching would fail on user agents ending with a space.
  • Fixed a bug in database driver where num_rows property wasn't getting updated.
  • Fixed a bug in captcha calling an invalid PHP function.
    • From 848b77685de0346da3f9fb8614e59f7d11552e61 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 31 Dec 2007 16:43:05 +0000 Subject: [PATCH 0769/2544] Fixed a bug in _object_to_array that broke some types of inserts and updates. --- system/database/DB_active_rec.php | 4 +++- user_guide/changelog.html | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 4bf3098d..b9594050 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1202,7 +1202,9 @@ function _object_to_array($object) $array = array(); foreach (get_object_vars($object) as $key => $val) { - if ( ! is_object($val) AND ! is_array($val)) + // There are some built in keys we need to ignore for this conversion + if ( ! is_object($val) && ! is_array($val) && $key != '_parent_name' && $key != '_ci_scaffolding' && $key != '_ci_scaff_table') + { $array[$key] = $val; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 152dd481..3c234654 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -99,6 +99,7 @@

    Version 1.5.5

  • Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
  • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
  • Fixed a bug that was making validation callbacks required even when not set as such.
    • +
  • Fixed a bug in _object_to_array that broke some types of inserts and updates.
  • Fixed an example of comma-separated emails in the email library documentation.
  • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
  • Fixed a typo in the database language file.
    • From a0fa90b1bbb61d47bcc9bc95d983e66dfc8732dd Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 1 Jan 2008 15:59:47 +0000 Subject: [PATCH 0770/2544] Fixed a bug in get_filenames() in the File Helper where the array wasn't cleared after each call. --- system/helpers/file_helper.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 18798fdf..d07d35f9 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -156,7 +156,7 @@ function delete_files($path, $del_dir = FALSE, $level = 0) */ function get_filenames($source_dir, $include_path = FALSE) { - static $_filedata = array(); + $_filedata = array(); if ($fp = @opendir($source_dir)) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3c234654..b28ec8c4 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -100,6 +100,7 @@

    Version 1.5.5

  • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
  • Fixed a bug that was making validation callbacks required even when not set as such.
  • Fixed a bug in _object_to_array that broke some types of inserts and updates.
    • +
  • Fixed a bug in get_filenames() in the File Helper where the array wasn't cleared after each call.
  • Fixed an example of comma-separated emails in the email library documentation.
  • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
  • Fixed a typo in the database language file.
    • From 032a5c0b61746e1dd82e400ad8ac639f92d3788c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 2 Jan 2008 21:51:31 +0000 Subject: [PATCH 0771/2544] Documented distinct() in Active Record. --- user_guide/changelog.html | 1 + user_guide/database/active_record.html | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b28ec8c4..8fa74a13 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -75,6 +75,7 @@

    Version 1.5.5

  • Added a check for NULL fields in the MySQL database backup utility.
  • Documented the timezones() function in the Date Helper.
  • Documented unset_userdata in the Session class.
    • +
  • Documented distinct() in Active Record.
  • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
  • Added a few additional mime type variations for CSV.
  • Added strip_quotes() function to string helper.
    • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index e7c823fd..d4310164 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -370,8 +370,15 @@

    $this->db->group_by();



    // Produces: GROUP BY title, date     -

    Note: group_by() was formerly known as groupby(), which has been deprecated.

    + +

    $this->db->distinct();
    +

    +

    Adds the "DISTINCT" keyword to to a query

    +

    $this->db->distinct();
    + $this->db->get('table');
    +
    + // Produces: SELECT DISTINCT * FROM table

    $this->db->having();

    Permits you to write the HAVING portion of your query:

    From f3e8a3508a4c9bfc203ce861a73e989dc4771f49 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 4 Jan 2008 14:30:38 +0000 Subject: [PATCH 0772/2544] Added form_fieldset(), form_fieldset_close(), and form_label() to form helper. --- system/helpers/form_helper.php | 524 ++++++++++++++++++++++++++++++++- 1 file changed, 523 insertions(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index a23d4c6d..e591eb74 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -1 +1,523 @@ -config->site_url($action).'"'; if ( ! isset($attributes['method'])) { $form .= ' method="post"'; } if (is_array($attributes) AND count($attributes) > 0) { foreach ($attributes as $key => $val) { $form .= ' '.$key.'="'.$val.'"'; } } $form .= '>'; if (is_array($hidden) AND count($hidden > 0)) { $form .= form_hidden($hidden); } return $form; } // ------------------------------------------------------------------------ /** * Form Declaration - Multipart type * * Creates the opening portion of the form, but with "multipart/form-data". * * @access public * @param string the URI segments of the form destination * @param array a key/value pair of attributes * @param array a key/value pair hidden data * @return string */ function form_open_multipart($action, $attributes = array(), $hidden = array()) { $attributes['enctype'] = 'multipart/form-data'; return form_open($action, $attributes, $hidden); } // ------------------------------------------------------------------------ /** * Hidden Input Field * * Generates hidden fields. You can pass a simple key/value string or an associative * array with multiple values. * * @access public * @param mixed * @param string * @return string */ function form_hidden($name, $value = '') { if ( ! is_array($name)) { return ''; } $form = ''; foreach ($name as $name => $value) { $form .= ''; } return $form; } // ------------------------------------------------------------------------ /** * Text Input Field * * @access public * @param mixed * @param string * @param string * @return string */ function form_input($data = '', $value = '', $extra = '') { $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value, 'maxlength' => '500', 'size' => '50'); return "\n"; } // ------------------------------------------------------------------------ /** * Password Field * * Identical to the input function but adds the "password" type * * @access public * @param mixed * @param string * @param string * @return string */ function form_password($data = '', $value = '', $extra = '') { if ( ! is_array($data)) { $data = array('name' => $data); } $data['type'] = 'password'; return form_input($data, $value, $extra); } // ------------------------------------------------------------------------ /** * Upload Field * * Identical to the input function but adds the "file" type * * @access public * @param mixed * @param string * @param string * @return string */ function form_upload($data = '', $value = '', $extra = '') { if ( ! is_array($data)) { $data = array('name' => $data); } $data['type'] = 'file'; return form_input($data, $value, $extra); } // ------------------------------------------------------------------------ /** * Textarea field * * @access public * @param mixed * @param string * @param string * @return string */ function form_textarea($data = '', $value = '', $extra = '') { $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); if ( ! is_array($data) OR ! isset($data['value'])) { $val = $value; } else { $val = $data['value']; unset($data['value']); // textareas don't use the value attribute } return "\n"; } // ------------------------------------------------------------------------ /** * Drop-down Menu * * @access public * @param string * @param array * @param string * @param string * @return string */ function form_dropdown($name = '', $options = array(), $selected = '', $extra = '') { if ($extra != '') $extra = ' '.$extra; $form = ''; return $form; } // ------------------------------------------------------------------------ /** * Checkbox Field * * @access public * @param mixed * @param string * @param bool * @param string * @return string */ function form_checkbox($data = '', $value = '', $checked = TRUE, $extra = '') { $defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); if (is_array($data) AND array_key_exists('checked', $data)) { $checked = $data['checked']; if ($checked == FALSE) { unset($data['checked']); } else { $data['checked'] = 'checked'; } } if ($checked == TRUE) $defaults['checked'] = 'checked'; else unset($defaults['checked']); return "\n"; } // ------------------------------------------------------------------------ /** * Radio Button * * @access public * @param mixed * @param string * @param bool * @param string * @return string */ function form_radio($data = '', $value = '', $checked = TRUE, $extra = '') { if ( ! is_array($data)) { $data = array('name' => $data); } $data['type'] = 'radio'; return form_checkbox($data, $value, $checked, $extra); } // ------------------------------------------------------------------------ /** * Submit Button * * @access public * @param mixed * @param string * @param string * @return string */ function form_submit($data = '', $value = '', $extra = '') { $defaults = array('type' => 'submit', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); return "\n"; } // ------------------------------------------------------------------------ /** * Reset Button * * @access public * @param mixed * @param string * @param string * @return string */ function form_reset($data = '', $value = '', $extra = '') { $defaults = array('type' => 'reset', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); return "\n"; } // ------------------------------------------------------------------------ /** * Form Close Tag * * @access public * @param string * @return string */ function form_close($extra = '') { return "\n".$extra; } // ------------------------------------------------------------------------ /** * Form Prep * * Formats text so that it can be safely placed in a form field in the event it has HTML tags. * * @access public * @param string * @return string */ function form_prep($str = '') { if ($str === '') { return ''; } $temp = '__TEMP_AMPERSANDS__'; // Replace entities to temporary markers so that // htmlspecialchars won't mess them up $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); $str = htmlspecialchars($str); // In case htmlspecialchars misses these. $str = str_replace(array("'", '"'), array("'", """), $str); // Decode the temp markers back to entities $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); $str = preg_replace("/$temp(\w+);/","&\\1;",$str); return $str; } // ------------------------------------------------------------------------ /** * Parse the form attributes * * Helper function used by some of the form helpers * * @access private * @param array * @param array * @return string */ function parse_form_attributes($attributes, $default) { if (is_array($attributes)) { foreach ($default as $key => $val) { if (isset($attributes[$key])) { $default[$key] = $attributes[$key]; unset($attributes[$key]); } } if (count($attributes) > 0) { $default = array_merge($default, $attributes); } } $att = ''; foreach ($default as $key => $val) { if ($key == 'value') { $val = form_prep($val); } $att .= $key . '="' . $val . '" '; } return $att; } ?> \ No newline at end of file +config->site_url($action).'"'; + + if ( ! isset($attributes['method'])) + { + $form .= ' method="post"'; + } + + if (is_array($attributes) AND count($attributes) > 0) + { + foreach ($attributes as $key => $val) + { + $form .= ' '.$key.'="'.$val.'"'; + } + } + + $form .= '>'; + + if (is_array($hidden) AND count($hidden > 0)) + { + $form .= form_hidden($hidden); + } + + return $form; +} + +// ------------------------------------------------------------------------ + +/** + * Form Declaration - Multipart type + * + * Creates the opening portion of the form, but with "multipart/form-data". + * + * @access public + * @param string the URI segments of the form destination + * @param array a key/value pair of attributes + * @param array a key/value pair hidden data + * @return string + */ +function form_open_multipart($action, $attributes = array(), $hidden = array()) +{ + $attributes['enctype'] = 'multipart/form-data'; + return form_open($action, $attributes, $hidden); +} + +// ------------------------------------------------------------------------ + +/** + * Hidden Input Field + * + * Generates hidden fields. You can pass a simple key/value string or an associative + * array with multiple values. + * + * @access public + * @param mixed + * @param string + * @return string + */ +function form_hidden($name, $value = '') +{ + if ( ! is_array($name)) + { + return ''; + } + + $form = ''; + foreach ($name as $name => $value) + { + $form .= ''; + } + + return $form; +} + +// ------------------------------------------------------------------------ + +/** + * Text Input Field + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_input($data = '', $value = '', $extra = '') +{ + $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value, 'maxlength' => '500', 'size' => '50'); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Password Field + * + * Identical to the input function but adds the "password" type + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_password($data = '', $value = '', $extra = '') +{ + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'password'; + return form_input($data, $value, $extra); +} + +// ------------------------------------------------------------------------ + +/** + * Upload Field + * + * Identical to the input function but adds the "file" type + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_upload($data = '', $value = '', $extra = '') +{ + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'file'; + return form_input($data, $value, $extra); +} + +// ------------------------------------------------------------------------ + +/** + * Textarea field + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_textarea($data = '', $value = '', $extra = '') +{ + $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); + + if ( ! is_array($data) OR ! isset($data['value'])) + { + $val = $value; + } + else + { + $val = $data['value']; + unset($data['value']); // textareas don't use the value attribute + } + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Drop-down Menu + * + * @access public + * @param string + * @param array + * @param string + * @param string + * @return string + */ +function form_dropdown($name = '', $options = array(), $selected = '', $extra = '') +{ + if ($extra != '') $extra = ' '.$extra; + + $form = ''; + + return $form; +} + +// ------------------------------------------------------------------------ + +/** + * Checkbox Field + * + * @access public + * @param mixed + * @param string + * @param bool + * @param string + * @return string + */ +function form_checkbox($data = '', $value = '', $checked = TRUE, $extra = '') +{ + $defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + if (is_array($data) AND array_key_exists('checked', $data)) + { + $checked = $data['checked']; + + if ($checked == FALSE) + { + unset($data['checked']); + } + else + { + $data['checked'] = 'checked'; + } + } + + if ($checked == TRUE) + $defaults['checked'] = 'checked'; + else + unset($defaults['checked']); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Radio Button + * + * @access public + * @param mixed + * @param string + * @param bool + * @param string + * @return string + */ +function form_radio($data = '', $value = '', $checked = TRUE, $extra = '') +{ + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'radio'; + return form_checkbox($data, $value, $checked, $extra); +} + +// ------------------------------------------------------------------------ + +/** + * Submit Button + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_submit($data = '', $value = '', $extra = '') +{ + $defaults = array('type' => 'submit', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Reset Button + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +function form_reset($data = '', $value = '', $extra = '') +{ + $defaults = array('type' => 'reset', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + return "\n"; +} + +// ------------------------------------------------------------------------ + +/** + * Form Label Tag + * + * @access public + * @param string The text to appear onscreen + * @param string The id the label applies to + * @param string Additional attributes + * @return string + */ +function form_label($label_text = '', $id = '', $attributes = array()) +{ + + $label = ' 0) + { + foreach ($attributes as $key => $val) + { + $label .= ' '.$key.'="'.$val.'"'; + } + } + + $label .= ">$label_text"; + + return $label; +} + +// ------------------------------------------------------------------------ +/** + * Fieldset Tag + * + * Used to produce
    text. To close fieldset + * use form_fieldset_close() + * + * @access public + * @param string The legend text + * @param string Additional attributes + * @return string + */ +function form_fieldset($legend_text = '', $attributes = array()) +{ + + $fieldset = " 0) + { + foreach ($attributes as $key => $val) + { + $fieldset .= ' '.$key.'="'.$val.'"'; + } + } + + $fieldset .= ">\n"; + + if ($legend_text != '') + { + $fieldset .= "$legend_text\n"; + } + + + + return $fieldset; +} + +// ------------------------------------------------------------------------ + +/** + * Fieldset Close Tag + * + * @access public + * @param string + * @return string + */ +function form_fieldset_close($extra = '') +{ + return "
    \n".$extra; +} + +// ------------------------------------------------------------------------ + +/** + * Form Close Tag + * + * @access public + * @param string + * @return string + */ +function form_close($extra = '') +{ + return "\n".$extra; +} + +// ------------------------------------------------------------------------ + +/** + * Form Prep + * + * Formats text so that it can be safely placed in a form field in the event it has HTML tags. + * + * @access public + * @param string + * @return string + */ +function form_prep($str = '') +{ + if ($str === '') + { + return ''; + } + + $temp = '__TEMP_AMPERSANDS__'; + + // Replace entities to temporary markers so that + // htmlspecialchars won't mess them up + $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); + $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); + + $str = htmlspecialchars($str); + + // In case htmlspecialchars misses these. + $str = str_replace(array("'", '"'), array("'", """), $str); + + // Decode the temp markers back to entities + $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); + $str = preg_replace("/$temp(\w+);/","&\\1;",$str); + + return $str; +} + +// ------------------------------------------------------------------------ + +/** + * Parse the form attributes + * + * Helper function used by some of the form helpers + * + * @access private + * @param array + * @param array + * @return string + */ +function parse_form_attributes($attributes, $default) +{ + if (is_array($attributes)) + { + foreach ($default as $key => $val) + { + if (isset($attributes[$key])) + { + $default[$key] = $attributes[$key]; + unset($attributes[$key]); + } + } + + if (count($attributes) > 0) + { + $default = array_merge($default, $attributes); + } + } + + $att = ''; + foreach ($default as $key => $val) + { + if ($key == 'value') + { + $val = form_prep($val); + } + + $att .= $key . '="' . $val . '" '; + } + + return $att; +} + +?> \ No newline at end of file From 402835cc53b2c3ee1b42f306aff2bcabf0bea33c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 4 Jan 2008 14:30:58 +0000 Subject: [PATCH 0773/2544] docs for form_fieldset(), form_fieldset_close(), and form_label() --- user_guide/helpers/form_helper.html | 387 +++++++++++++++++++++++++++- 1 file changed, 386 insertions(+), 1 deletion(-) diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 3cf6f3a6..82ee29a5 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -1 +1,386 @@ - CodeIgniter User Guide : Form Helper

    CodeIgniter User Guide Version 1.5.4

    Form Helper

    The Form Helper file contains functions that assist in working with forms.

    Loading this Helper

    This helper is loaded using the following code:

    $this->load->helper('form');

    The following functions are available:

    form_open()

    Creates an opening form tag with a base URL built from your config preferences. It will optionally let you add form attributes and hidden input fields.

    The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable in the event your URLs ever change.

    Here's a simple example:

    echo form_open('email/send');

    The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

    <form method="post" action="http:/www.your-site.com/index.php/email/send" />

    Adding Attributes

    Attributes can be added by passing an associative array to the second parameter, like this:

    $attributes = array('class' => 'email', 'id' => 'myform');

    echo form_open('email/send', $attributes);

    The above example would create a form similar to this:

    <form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />

    Adding Hidden Input Fields

    Hidden fields can be added by passing an associative array to the third parameter, like this:

    $hidden = array('username' => 'Joe', 'member_id' => '234');

    echo form_open('email/send', '', $hidden);

    The above example would create a form similar to this:

    <form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />
    <input type="hidden" name="username" value="Joe" />
    <input type="hidden" name="member_id" value="234" />

    form_open_multipart()

    This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute, which is necessary if you would like to use the form to upload files with.

    form_hidden()

    Lets you generate hidden input fields. You can either submit a name/value string to create one field:

    form_hidden('username', 'johndoe');

    // Would produce:

    <input type="hidden" name="username" value="johnodoe" />

    Or you can submit an associative array to create multiple fields:

    $data = array(
                  'name'  => 'John Doe',
                  'email' => 'john@example.com',
                  'url'   => 'http://www.example.com'
                );

    echo form_hidden($data);

    // Would produce:

    <input type="hidden" name="name" value="John Doe" />
    <input type="hidden" name="email" value="john@example.com" />
    <input type="hidden" name="url" value="http://www.example.com" />

    form_input()

    Lets you generate a standard text input field. You can minimally pass the field name and value in the first and second parameter:

    echo form_input('username', 'johndoe');

    Or you can pass an associative array containing any data you wish your form to contain:

    $data = array(
                  'name'        => 'username',
                  'id'          => 'username',
                  'value'       => 'johndoe',
                  'maxlength'   => '100',
                  'size'        => '50',
                  'style'       => 'width:50%',
                );

    echo form_input($data);

    // Would produce:

    <input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />

    If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the third parameter:

    $js = 'onClick="some_function()"';

    echo form_input('username', 'johndoe', $js);

    form_password()

    This function is identical in all respects to the form_input() function above except that is sets it as a "password" type.

    form_upload()

    This function is identical in all respects to the form_input() function above except that is sets it as a "file" type, allowing it to be used to upload files.

    form_textarea()

    This function is identical in all respects to the form_input() function above except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above example, you will instead specify "rows" and "cols".

    form_dropdown()

    Lets you create a standard drop-down field. The first parameter will contain the name of the field, the second parameter will contain an associative array of options, and the third parameter will contain the value you wish to be selected. Example:

    $options = array(
                      'small'  => 'Small Shirt',
                      'med'    => 'Medium Shirt',
                      'large'   => 'Large Shirt',
                      'xlarge' => 'Extra Large Shirt',
                    );

    echo form_dropdown('shirts', $options, 'large');

    // Would produce:

    <select name="shirts">
    <option value="small">Small Shirt</option>
    <option value="med">Medium Shirt</option>
    <option value="large" selected>Large Shirt</option>
    <option value="xlarge">Extra Large Shirt</option>
    </select>

    If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the fourth parameter:

    $js = 'onChange="some_function()"';

    echo form_dropdown('shirts', $options, 'large', $js);

    form_checkbox()

    Lets you generate a checkbox field. Simple example:

    echo form_checkbox('newsletter', 'accept', TRUE);

    // Would produce:

    <input type="checkbox" name="newsletter" value="accept" checked="checked" />

    The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

    Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

    $data = array(
                  'name'        => 'newsletter',
                  'id'          => 'newsletter',
                  'value'       => 'accept',
                  'checked'     => TRUE,
                  'style'       => 'margin:10px',
                );

    echo form_checkbox($data);

    // Would produce:

    <input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />

    As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the fourth parameter:

    $js = 'onClick="some_function()"';

    echo form_checkbox('newsletter', 'accept', TRUE, $js)

    form_radio()

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    form_submit()

    Lets you generate a standard submit button. Simple example:

    echo form_submit('mysubmit', 'Submit Post!');

    // Would produce:

    <input type="submit" name="mysubmit" value="Submit Post!" />

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. The third parameter lets you add extra data to your form, like JavaScript.

    form_reset()

    Lets you generate a standard reset button. Use is identical to form_submit().

    form_close()

    Produces a closing </form> tag. The only advantage to using this function is it permits you to pass data to it which will be added below the tag. For example:

    $string = "</div></div>";

    echo form_close($string);

    // Would produce:

    </form>
    </div></div>

    form_prep()

    Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form. Consider this example:

    $string = 'Here is a string containing "quoted" text.';

    <input type="text" name="myform" value="$string" />

    Since the above string contains a set of quotes it will cause the form to break. The form_prep function converts HTML so that it can be used safely:

    <input type="text" name="myform" value="<?php echo form_prep($string); ?>" />

    Note: If you use any of the form helper functions listed in this page the form values will be prepped automatically, so there is no need to call this function. Use it only if you are creating your own form elements.

    \ No newline at end of file + + + + +CodeIgniter User Guide : Form Helper + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.5.4

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Form Helper

    + +

    The Form Helper file contains functions that assist in working with forms.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('form'); + +

    The following functions are available:

    + + + +

    form_open()

    + +

    Creates an opening form tag with a base URL built from your config preferences. It will optionally let you +add form attributes and hidden input fields.

    + +

    The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable +in the event your URLs ever change.

    + +

    Here's a simple example:

    + +echo form_open('email/send'); + +

    The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

    + +<form method="post" action="http:/www.your-site.com/index.php/email/send" /> + +

    Adding Attributes

    + +

    Attributes can be added by passing an associative array to the second parameter, like this:

    + + +$attributes = array('class' => 'email', 'id' => 'myform');
    +
    +echo form_open('email/send', $attributes);     + +

    The above example would create a form similar to this:

    + +<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" /> + +

    Adding Hidden Input Fields

    + +

    Hidden fields can be added by passing an associative array to the third parameter, like this:

    + + +$hidden = array('username' => 'Joe', 'member_id' => '234');
    +
    +echo form_open('email/send', '', $hidden);     + +

    The above example would create a form similar to this:

    + +<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />
    +<input type="hidden" name="username" value="Joe" />
    +<input type="hidden" name="member_id" value="234" />     + + +

    form_open_multipart()

    + +

    This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute, +which is necessary if you would like to use the form to upload files with.

    + +

    form_hidden()

    + +

    Lets you generate hidden input fields. You can either submit a name/value string to create one field:

    + +form_hidden('username', 'johndoe');
    +
    +// Would produce:

    +<input type="hidden" name="username" value="johnodoe" />     + +

    Or you can submit an associative array to create multiple fields:

    + +$data = array(
    +              'name'  => 'John Doe',
    +              'email' => 'john@example.com',
    +              'url'   => 'http://www.example.com'
    +            );
    +
    +echo form_hidden($data);
    +
    +// Would produce:

    +<input type="hidden" name="name" value="John Doe" />
    +<input type="hidden" name="email" value="john@example.com" />
    +<input type="hidden" name="url" value="http://www.example.com" />     + + + + +

    form_input()

    + +

    Lets you generate a standard text input field. You can minimally pass the field name and value in the first +and second parameter:

    + +echo form_input('username', 'johndoe'); + +

    Or you can pass an associative array containing any data you wish your form to contain:

    + +$data = array(
    +              'name'        => 'username',
    +              'id'          => 'username',
    +              'value'       => 'johndoe',
    +              'maxlength'   => '100',
    +              'size'        => '50',
    +              'style'       => 'width:50%',
    +            );
    +
    +echo form_input($data);
    +
    +// Would produce:

    +<input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />     + +

    If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the +third parameter:

    + +$js = 'onClick="some_function()"';
    +
    +echo form_input('username', 'johndoe', $js);     + +

    form_password()

    + +

    This function is identical in all respects to the form_input() function above +except that is sets it as a "password" type.

    + +

    form_upload()

    + +

    This function is identical in all respects to the form_input() function above +except that is sets it as a "file" type, allowing it to be used to upload files.

    + +

    form_textarea()

    + +

    This function is identical in all respects to the form_input() function above +except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above +example, you will instead specify "rows" and "cols".

    + + +

    form_dropdown()

    + +

    Lets you create a standard drop-down field. The first parameter will contain the name of the field, +the second parameter will contain an associative array of options, and the third parameter will contain the +value you wish to be selected. Example:

    + +$options = array(
    +                  'small'  => 'Small Shirt',
    +                  'med'    => 'Medium Shirt',
    +                  'large'   => 'Large Shirt',
    +                  'xlarge' => 'Extra Large Shirt',
    +                );
    +
    +echo form_dropdown('shirts', $options, 'large');
    +
    +// Would produce:

    + +<select name="shirts">
    +<option value="small">Small Shirt</option>
    +<option value="med">Medium Shirt</option>
    +<option value="large" selected>Large Shirt</option>
    +<option value="xlarge">Extra Large Shirt</option>
    +</select>     + + +

    If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the +fourth parameter:

    + +$js = 'onChange="some_function()"';
    +
    +echo form_dropdown('shirts', $options, 'large', $js);     + + +

    form_fieldset()

    + +

    Lets you generate fieldset/legend fields.

    +echo form_fieldset('Address Information');
    +echo "<p>fieldset content here</p>\n";
    +echo form_fieldset_close(); +
    +
    +// Produces
    +<fieldset id="address_info"> +
    +<legend>Address Information</legend> +
    +<p>form content here</p> +
    +</fieldset>     +

    Similar to other functions, you can submit an associative array in the second parameter if you prefer to set additional attributes.

    +

    $attributes = array('class' => 'address_info');
    + echo form_fieldset('Address Information', $attributes);
    +echo "<p>fieldset content here</p>\n";
    +echo form_fieldset_close();
    +
    +// Produces
    +<fieldset id="address_info" class="address_info">
    +<legend>Address Information</legend>
    +<p>form content here</p>
    +</fieldset>

    +

    form_fieldset_close()

    +

    Produces a closing </fieldset> tag. The only advantage to using this function is it permits you to pass data to it + which will be added below the tag. For example:

    +$string = "</div></div>";
    +
    +echo fieldset_close($string);
    +
    +// Would produce:
    +</fieldset>
    +</div></div>     +

    form_checkbox()

    +

    Lets you generate a checkbox field. Simple example:

    +echo form_checkbox('newsletter', 'accept', TRUE);
    +
    +// Would produce:
    +
    +<input type="checkbox" name="newsletter" value="accept" checked="checked" />     +

    The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

    +

    Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

    + +$data = array(
    +              'name'        => 'newsletter',
    +              'id'          => 'newsletter',
    +              'value'       => 'accept',
    +              'checked'     => TRUE,
    +              'style'       => 'margin:10px',
    +            );
    +
    +echo form_checkbox($data);
    +
    +// Would produce:

    +<input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />     + +

    As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the +fourth parameter:

    + +$js = 'onClick="some_function()"';
    +
    + echo form_checkbox('newsletter', 'accept', TRUE, $js)     + + +

    form_radio()

    +

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    + + +

    form_submit()

    + +

    Lets you generate a standard submit button. Simple example:

    +echo form_submit('mysubmit', 'Submit Post!');
    +
    +// Would produce:
    +
    +<input type="submit" name="mysubmit" value="Submit Post!" />     +

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. + The third parameter lets you add extra data to your form, like JavaScript.

    +

    form_label()

    +

    Lets you generate a <label>. Simple example:

    +echo form_label('What is your Name', 'username');
    +
    +// Would produce: +
    +<label id="username">What is your Name</label>     +

    Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

    +

    $attributes = array(
    + 'class' => 'mycustomclass',
    + 'style' => 'color: #000;',
    +);
    + echo form_label('What is your Name', 'username', $attributes);
    +
    +// Would produce:
    +<label id="username" class="mycustomclass" style="color: #000;">What is your Name</label>

    +

    form_reset()

    + +

    Lets you generate a standard reset button. Use is identical to form_submit().

    + +

    form_close()

    + +

    Produces a closing </form> tag. The only advantage to using this function is it permits you to pass data to it +which will be added below the tag. For example:

    + +$string = "</div></div>";
    +
    +echo form_close($string);
    +
    +// Would produce:
    +
    +</form>
    +</div></div>     + + + + + +

    form_prep()

    + +

    Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form. Consider this example:

    + +$string = 'Here is a string containing "quoted" text.';
    +
    +<input type="text" name="myform" value="$string" />     + +

    Since the above string contains a set of quotes it will cause the form to break. +The form_prep function converts HTML so that it can be used safely:

    + +<input type="text" name="myform" value="<?php echo form_prep($string); ?>" /> + +

    Note: If you use any of the form helper functions listed in this page the form +values will be prepped automatically, so there is no need to call this function. Use it only if you are +creating your own form elements.

    + + + + +
    + + + + + + + \ No newline at end of file From 4bbc5c7e832604a468681ea50511f114ef7fb1d5 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 4 Jan 2008 17:00:42 +0000 Subject: [PATCH 0774/2544] d'oh! Incomplete example. --- user_guide/helpers/form_helper.html | 770 ++++++++++++++-------------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 82ee29a5..c2659528 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -1,386 +1,386 @@ - - - - -CodeIgniter User Guide : Form Helper - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Form Helper

    - -

    The Form Helper file contains functions that assist in working with forms.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('form'); - -

    The following functions are available:

    - - - -

    form_open()

    - -

    Creates an opening form tag with a base URL built from your config preferences. It will optionally let you -add form attributes and hidden input fields.

    - -

    The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable -in the event your URLs ever change.

    - -

    Here's a simple example:

    - -echo form_open('email/send'); - -

    The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

    - -<form method="post" action="http:/www.your-site.com/index.php/email/send" /> - -

    Adding Attributes

    - -

    Attributes can be added by passing an associative array to the second parameter, like this:

    - - -$attributes = array('class' => 'email', 'id' => 'myform');
    -
    -echo form_open('email/send', $attributes);     - -

    The above example would create a form similar to this:

    - -<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" /> - -

    Adding Hidden Input Fields

    - -

    Hidden fields can be added by passing an associative array to the third parameter, like this:

    - - -$hidden = array('username' => 'Joe', 'member_id' => '234');
    -
    -echo form_open('email/send', '', $hidden);     - -

    The above example would create a form similar to this:

    - -<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />
    -<input type="hidden" name="username" value="Joe" />
    -<input type="hidden" name="member_id" value="234" />     - - -

    form_open_multipart()

    - -

    This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute, -which is necessary if you would like to use the form to upload files with.

    - -

    form_hidden()

    - -

    Lets you generate hidden input fields. You can either submit a name/value string to create one field:

    - -form_hidden('username', 'johndoe');
    -
    -// Would produce:

    -<input type="hidden" name="username" value="johnodoe" />     - -

    Or you can submit an associative array to create multiple fields:

    - -$data = array(
    -              'name'  => 'John Doe',
    -              'email' => 'john@example.com',
    -              'url'   => 'http://www.example.com'
    -            );
    -
    -echo form_hidden($data);
    -
    -// Would produce:

    -<input type="hidden" name="name" value="John Doe" />
    -<input type="hidden" name="email" value="john@example.com" />
    -<input type="hidden" name="url" value="http://www.example.com" />     - - - - -

    form_input()

    - -

    Lets you generate a standard text input field. You can minimally pass the field name and value in the first -and second parameter:

    - -echo form_input('username', 'johndoe'); - -

    Or you can pass an associative array containing any data you wish your form to contain:

    - -$data = array(
    -              'name'        => 'username',
    -              'id'          => 'username',
    -              'value'       => 'johndoe',
    -              'maxlength'   => '100',
    -              'size'        => '50',
    -              'style'       => 'width:50%',
    -            );
    -
    -echo form_input($data);
    -
    -// Would produce:

    -<input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />     - -

    If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the -third parameter:

    - -$js = 'onClick="some_function()"';
    -
    -echo form_input('username', 'johndoe', $js);     - -

    form_password()

    - -

    This function is identical in all respects to the form_input() function above -except that is sets it as a "password" type.

    - -

    form_upload()

    - -

    This function is identical in all respects to the form_input() function above -except that is sets it as a "file" type, allowing it to be used to upload files.

    - -

    form_textarea()

    - -

    This function is identical in all respects to the form_input() function above -except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above -example, you will instead specify "rows" and "cols".

    - - -

    form_dropdown()

    - -

    Lets you create a standard drop-down field. The first parameter will contain the name of the field, -the second parameter will contain an associative array of options, and the third parameter will contain the -value you wish to be selected. Example:

    - -$options = array(
    -                  'small'  => 'Small Shirt',
    -                  'med'    => 'Medium Shirt',
    -                  'large'   => 'Large Shirt',
    -                  'xlarge' => 'Extra Large Shirt',
    -                );
    -
    -echo form_dropdown('shirts', $options, 'large');
    -
    -// Would produce:

    - -<select name="shirts">
    -<option value="small">Small Shirt</option>
    -<option value="med">Medium Shirt</option>
    -<option value="large" selected>Large Shirt</option>
    -<option value="xlarge">Extra Large Shirt</option>
    -</select>     - - -

    If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the -fourth parameter:

    - -$js = 'onChange="some_function()"';
    -
    -echo form_dropdown('shirts', $options, 'large', $js);     - - -

    form_fieldset()

    - -

    Lets you generate fieldset/legend fields.

    -echo form_fieldset('Address Information');
    -echo "<p>fieldset content here</p>\n";
    -echo form_fieldset_close(); -
    -
    -// Produces
    -<fieldset id="address_info"> -
    -<legend>Address Information</legend> -
    -<p>form content here</p> -
    -</fieldset>     -

    Similar to other functions, you can submit an associative array in the second parameter if you prefer to set additional attributes.

    -

    $attributes = array('class' => 'address_info');
    - echo form_fieldset('Address Information', $attributes);
    -echo "<p>fieldset content here</p>\n";
    -echo form_fieldset_close();
    -
    -// Produces
    -<fieldset id="address_info" class="address_info">
    -<legend>Address Information</legend>
    -<p>form content here</p>
    -</fieldset>

    -

    form_fieldset_close()

    -

    Produces a closing </fieldset> tag. The only advantage to using this function is it permits you to pass data to it - which will be added below the tag. For example:

    -$string = "</div></div>";
    -
    -echo fieldset_close($string);
    -
    -// Would produce:
    -</fieldset>
    -</div></div>     -

    form_checkbox()

    -

    Lets you generate a checkbox field. Simple example:

    -echo form_checkbox('newsletter', 'accept', TRUE);
    -
    -// Would produce:
    -
    -<input type="checkbox" name="newsletter" value="accept" checked="checked" />     -

    The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

    -

    Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

    - -$data = array(
    -              'name'        => 'newsletter',
    -              'id'          => 'newsletter',
    -              'value'       => 'accept',
    -              'checked'     => TRUE,
    -              'style'       => 'margin:10px',
    -            );
    -
    -echo form_checkbox($data);
    -
    -// Would produce:

    -<input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />     - -

    As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the -fourth parameter:

    - -$js = 'onClick="some_function()"';
    -
    - echo form_checkbox('newsletter', 'accept', TRUE, $js)     - - -

    form_radio()

    -

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    - - -

    form_submit()

    - -

    Lets you generate a standard submit button. Simple example:

    -echo form_submit('mysubmit', 'Submit Post!');
    -
    -// Would produce:
    -
    -<input type="submit" name="mysubmit" value="Submit Post!" />     -

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. - The third parameter lets you add extra data to your form, like JavaScript.

    -

    form_label()

    -

    Lets you generate a <label>. Simple example:

    -echo form_label('What is your Name', 'username');
    -
    -// Would produce: -
    -<label id="username">What is your Name</label>     -

    Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

    -

    $attributes = array(
    - 'class' => 'mycustomclass',
    - 'style' => 'color: #000;',
    -);
    - echo form_label('What is your Name', 'username', $attributes);
    -
    -// Would produce:
    -<label id="username" class="mycustomclass" style="color: #000;">What is your Name</label>

    -

    form_reset()

    - -

    Lets you generate a standard reset button. Use is identical to form_submit().

    - -

    form_close()

    - -

    Produces a closing </form> tag. The only advantage to using this function is it permits you to pass data to it -which will be added below the tag. For example:

    - -$string = "</div></div>";
    -
    -echo form_close($string);
    -
    -// Would produce:
    -
    -</form>
    -</div></div>     - - - - - -

    form_prep()

    - -

    Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form. Consider this example:

    - -$string = 'Here is a string containing "quoted" text.';
    -
    -<input type="text" name="myform" value="$string" />     - -

    Since the above string contains a set of quotes it will cause the form to break. -The form_prep function converts HTML so that it can be used safely:

    - -<input type="text" name="myform" value="<?php echo form_prep($string); ?>" /> - -

    Note: If you use any of the form helper functions listed in this page the form -values will be prepped automatically, so there is no need to call this function. Use it only if you are -creating your own form elements.

    - - - - -
    - - - - - - + + + + +CodeIgniter User Guide : Form Helper + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.5.4

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Form Helper

    + +

    The Form Helper file contains functions that assist in working with forms.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('form'); + +

    The following functions are available:

    + + + +

    form_open()

    + +

    Creates an opening form tag with a base URL built from your config preferences. It will optionally let you +add form attributes and hidden input fields.

    + +

    The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable +in the event your URLs ever change.

    + +

    Here's a simple example:

    + +echo form_open('email/send'); + +

    The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

    + +<form method="post" action="http:/www.your-site.com/index.php/email/send" /> + +

    Adding Attributes

    + +

    Attributes can be added by passing an associative array to the second parameter, like this:

    + + +$attributes = array('class' => 'email', 'id' => 'myform');
    +
    +echo form_open('email/send', $attributes);     + +

    The above example would create a form similar to this:

    + +<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" /> + +

    Adding Hidden Input Fields

    + +

    Hidden fields can be added by passing an associative array to the third parameter, like this:

    + + +$hidden = array('username' => 'Joe', 'member_id' => '234');
    +
    +echo form_open('email/send', '', $hidden);     + +

    The above example would create a form similar to this:

    + +<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />
    +<input type="hidden" name="username" value="Joe" />
    +<input type="hidden" name="member_id" value="234" />     + + +

    form_open_multipart()

    + +

    This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute, +which is necessary if you would like to use the form to upload files with.

    + +

    form_hidden()

    + +

    Lets you generate hidden input fields. You can either submit a name/value string to create one field:

    + +form_hidden('username', 'johndoe');
    +
    +// Would produce:

    +<input type="hidden" name="username" value="johnodoe" />     + +

    Or you can submit an associative array to create multiple fields:

    + +$data = array(
    +              'name'  => 'John Doe',
    +              'email' => 'john@example.com',
    +              'url'   => 'http://www.example.com'
    +            );
    +
    +echo form_hidden($data);
    +
    +// Would produce:

    +<input type="hidden" name="name" value="John Doe" />
    +<input type="hidden" name="email" value="john@example.com" />
    +<input type="hidden" name="url" value="http://www.example.com" />     + + + + +

    form_input()

    + +

    Lets you generate a standard text input field. You can minimally pass the field name and value in the first +and second parameter:

    + +echo form_input('username', 'johndoe'); + +

    Or you can pass an associative array containing any data you wish your form to contain:

    + +$data = array(
    +              'name'        => 'username',
    +              'id'          => 'username',
    +              'value'       => 'johndoe',
    +              'maxlength'   => '100',
    +              'size'        => '50',
    +              'style'       => 'width:50%',
    +            );
    +
    +echo form_input($data);
    +
    +// Would produce:

    +<input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />     + +

    If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the +third parameter:

    + +$js = 'onClick="some_function()"';
    +
    +echo form_input('username', 'johndoe', $js);     + +

    form_password()

    + +

    This function is identical in all respects to the form_input() function above +except that is sets it as a "password" type.

    + +

    form_upload()

    + +

    This function is identical in all respects to the form_input() function above +except that is sets it as a "file" type, allowing it to be used to upload files.

    + +

    form_textarea()

    + +

    This function is identical in all respects to the form_input() function above +except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above +example, you will instead specify "rows" and "cols".

    + + +

    form_dropdown()

    + +

    Lets you create a standard drop-down field. The first parameter will contain the name of the field, +the second parameter will contain an associative array of options, and the third parameter will contain the +value you wish to be selected. Example:

    + +$options = array(
    +                  'small'  => 'Small Shirt',
    +                  'med'    => 'Medium Shirt',
    +                  'large'   => 'Large Shirt',
    +                  'xlarge' => 'Extra Large Shirt',
    +                );
    +
    +echo form_dropdown('shirts', $options, 'large');
    +
    +// Would produce:

    + +<select name="shirts">
    +<option value="small">Small Shirt</option>
    +<option value="med">Medium Shirt</option>
    +<option value="large" selected>Large Shirt</option>
    +<option value="xlarge">Extra Large Shirt</option>
    +</select>     + + +

    If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the +fourth parameter:

    + +$js = 'onChange="some_function()"';
    +
    +echo form_dropdown('shirts', $options, 'large', $js);     + + +

    form_fieldset()

    + +

    Lets you generate fieldset/legend fields.

    +echo form_fieldset('Address Information');
    +echo "<p>fieldset content here</p>\n";
    +echo form_fieldset_close(); +
    +
    +// Produces
    +<fieldset id="address_info"> +
    +<legend>Address Information</legend> +
    +<p>form content here</p> +
    +</fieldset>     +

    Similar to other functions, you can submit an associative array in the second parameter if you prefer to set additional attributes.

    +

    $attributes = array('id' => 'address_info', 'class' => 'address_info');
    + echo form_fieldset('Address Information', $attributes);
    +echo "<p>fieldset content here</p>\n";
    +echo form_fieldset_close();
    +
    +// Produces
    +<fieldset id="address_info" class="address_info">
    +<legend>Address Information</legend>
    +<p>form content here</p>
    +</fieldset>

    +

    form_fieldset_close()

    +

    Produces a closing </fieldset> tag. The only advantage to using this function is it permits you to pass data to it + which will be added below the tag. For example:

    +$string = "</div></div>";
    +
    +echo fieldset_close($string);
    +
    +// Would produce:
    +</fieldset>
    +</div></div>     +

    form_checkbox()

    +

    Lets you generate a checkbox field. Simple example:

    +echo form_checkbox('newsletter', 'accept', TRUE);
    +
    +// Would produce:
    +
    +<input type="checkbox" name="newsletter" value="accept" checked="checked" />     +

    The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

    +

    Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

    + +$data = array(
    +              'name'        => 'newsletter',
    +              'id'          => 'newsletter',
    +              'value'       => 'accept',
    +              'checked'     => TRUE,
    +              'style'       => 'margin:10px',
    +            );
    +
    +echo form_checkbox($data);
    +
    +// Would produce:

    +<input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />     + +

    As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the +fourth parameter:

    + +$js = 'onClick="some_function()"';
    +
    + echo form_checkbox('newsletter', 'accept', TRUE, $js)     + + +

    form_radio()

    +

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    + + +

    form_submit()

    + +

    Lets you generate a standard submit button. Simple example:

    +echo form_submit('mysubmit', 'Submit Post!');
    +
    +// Would produce:
    +
    +<input type="submit" name="mysubmit" value="Submit Post!" />     +

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. + The third parameter lets you add extra data to your form, like JavaScript.

    +

    form_label()

    +

    Lets you generate a <label>. Simple example:

    +echo form_label('What is your Name', 'username');
    +
    +// Would produce: +
    +<label id="username">What is your Name</label>     +

    Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

    +

    $attributes = array(
    + 'class' => 'mycustomclass',
    + 'style' => 'color: #000;',
    +);
    + echo form_label('What is your Name', 'username', $attributes);
    +
    +// Would produce:
    +<label id="username" class="mycustomclass" style="color: #000;">What is your Name</label>

    +

    form_reset()

    + +

    Lets you generate a standard reset button. Use is identical to form_submit().

    + +

    form_close()

    + +

    Produces a closing </form> tag. The only advantage to using this function is it permits you to pass data to it +which will be added below the tag. For example:

    + +$string = "</div></div>";
    +
    +echo form_close($string);
    +
    +// Would produce:
    +
    +</form>
    +</div></div>     + + + + + +

    form_prep()

    + +

    Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form. Consider this example:

    + +$string = 'Here is a string containing "quoted" text.';
    +
    +<input type="text" name="myform" value="$string" />     + +

    Since the above string contains a set of quotes it will cause the form to break. +The form_prep function converts HTML so that it can be used safely:

    + +<input type="text" name="myform" value="<?php echo form_prep($string); ?>" /> + +

    Note: If you use any of the form helper functions listed in this page the form +values will be prepped automatically, so there is no need to call this function. Use it only if you are +creating your own form elements.

    + + + + +
    + + + + + + \ No newline at end of file From 4021b51750afb7e39dc0e5ea6e839c7da4e069ab Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 4 Jan 2008 22:26:12 +0000 Subject: [PATCH 0775/2544] added the ability to have multiple selected items in form_dropdown() --- system/helpers/form_helper.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index e591eb74..a67ea050 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -221,18 +221,24 @@ function form_textarea($data = '', $value = '', $extra = '') * @param string * @return string */ -function form_dropdown($name = '', $options = array(), $selected = '', $extra = '') +function form_dropdown($name = '', $options = array(), $selected = array(), $extra = '') { + if ( ! is_array($selected)) + { + $selected = array($selected); + } + if ($extra != '') $extra = ' '.$extra; - - $form = '\n"; foreach ($options as $key => $val) { $key = (string) $key; $val = (string) $val; - $sel = ($selected != $key) ? '' : ' selected="selected"'; + $sel = (in_array($key, $selected))?' selected="selected"':''; $form .= '\n"; } From 1a2cbdf2ec852bfe9b122ebf47fb6fb0216f38ca Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 4 Jan 2008 22:26:37 +0000 Subject: [PATCH 0776/2544] documented the ability to have multiple selected items in form_dropdown() --- user_guide/helpers/form_helper.html | 783 ++++++++++++++-------------- 1 file changed, 398 insertions(+), 385 deletions(-) diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index c2659528..62c1f68f 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -1,386 +1,399 @@ - - - - -CodeIgniter User Guide : Form Helper - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.5.4

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Form Helper

    - -

    The Form Helper file contains functions that assist in working with forms.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('form'); - -

    The following functions are available:

    - - - -

    form_open()

    - -

    Creates an opening form tag with a base URL built from your config preferences. It will optionally let you -add form attributes and hidden input fields.

    - -

    The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable -in the event your URLs ever change.

    - -

    Here's a simple example:

    - -echo form_open('email/send'); - -

    The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

    - -<form method="post" action="http:/www.your-site.com/index.php/email/send" /> - -

    Adding Attributes

    - -

    Attributes can be added by passing an associative array to the second parameter, like this:

    - - -$attributes = array('class' => 'email', 'id' => 'myform');
    -
    -echo form_open('email/send', $attributes);     - -

    The above example would create a form similar to this:

    - -<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" /> - -

    Adding Hidden Input Fields

    - -

    Hidden fields can be added by passing an associative array to the third parameter, like this:

    - - -$hidden = array('username' => 'Joe', 'member_id' => '234');
    -
    -echo form_open('email/send', '', $hidden);     - -

    The above example would create a form similar to this:

    - -<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />
    -<input type="hidden" name="username" value="Joe" />
    -<input type="hidden" name="member_id" value="234" />     - - -

    form_open_multipart()

    - -

    This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute, -which is necessary if you would like to use the form to upload files with.

    - -

    form_hidden()

    - -

    Lets you generate hidden input fields. You can either submit a name/value string to create one field:

    - -form_hidden('username', 'johndoe');
    -
    -// Would produce:

    -<input type="hidden" name="username" value="johnodoe" />     - -

    Or you can submit an associative array to create multiple fields:

    - -$data = array(
    -              'name'  => 'John Doe',
    -              'email' => 'john@example.com',
    -              'url'   => 'http://www.example.com'
    -            );
    -
    -echo form_hidden($data);
    -
    -// Would produce:

    -<input type="hidden" name="name" value="John Doe" />
    -<input type="hidden" name="email" value="john@example.com" />
    -<input type="hidden" name="url" value="http://www.example.com" />     - - - - -

    form_input()

    - -

    Lets you generate a standard text input field. You can minimally pass the field name and value in the first -and second parameter:

    - -echo form_input('username', 'johndoe'); - -

    Or you can pass an associative array containing any data you wish your form to contain:

    - -$data = array(
    -              'name'        => 'username',
    -              'id'          => 'username',
    -              'value'       => 'johndoe',
    -              'maxlength'   => '100',
    -              'size'        => '50',
    -              'style'       => 'width:50%',
    -            );
    -
    -echo form_input($data);
    -
    -// Would produce:

    -<input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />     - -

    If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the -third parameter:

    - -$js = 'onClick="some_function()"';
    -
    -echo form_input('username', 'johndoe', $js);     - -

    form_password()

    - -

    This function is identical in all respects to the form_input() function above -except that is sets it as a "password" type.

    - -

    form_upload()

    - -

    This function is identical in all respects to the form_input() function above -except that is sets it as a "file" type, allowing it to be used to upload files.

    - -

    form_textarea()

    - -

    This function is identical in all respects to the form_input() function above -except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above -example, you will instead specify "rows" and "cols".

    - - -

    form_dropdown()

    - -

    Lets you create a standard drop-down field. The first parameter will contain the name of the field, -the second parameter will contain an associative array of options, and the third parameter will contain the -value you wish to be selected. Example:

    - -$options = array(
    -                  'small'  => 'Small Shirt',
    -                  'med'    => 'Medium Shirt',
    -                  'large'   => 'Large Shirt',
    -                  'xlarge' => 'Extra Large Shirt',
    -                );
    -
    -echo form_dropdown('shirts', $options, 'large');
    -
    -// Would produce:

    - -<select name="shirts">
    -<option value="small">Small Shirt</option>
    -<option value="med">Medium Shirt</option>
    -<option value="large" selected>Large Shirt</option>
    -<option value="xlarge">Extra Large Shirt</option>
    -</select>     - - -

    If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the -fourth parameter:

    - -$js = 'onChange="some_function()"';
    -
    -echo form_dropdown('shirts', $options, 'large', $js);     - - -

    form_fieldset()

    - -

    Lets you generate fieldset/legend fields.

    -echo form_fieldset('Address Information');
    -echo "<p>fieldset content here</p>\n";
    -echo form_fieldset_close(); -
    -
    -// Produces
    -<fieldset id="address_info"> -
    -<legend>Address Information</legend> -
    -<p>form content here</p> -
    -</fieldset>     -

    Similar to other functions, you can submit an associative array in the second parameter if you prefer to set additional attributes.

    -

    $attributes = array('id' => 'address_info', 'class' => 'address_info');
    - echo form_fieldset('Address Information', $attributes);
    -echo "<p>fieldset content here</p>\n";
    -echo form_fieldset_close();
    -
    -// Produces
    -<fieldset id="address_info" class="address_info">
    -<legend>Address Information</legend>
    -<p>form content here</p>
    -</fieldset>

    -

    form_fieldset_close()

    -

    Produces a closing </fieldset> tag. The only advantage to using this function is it permits you to pass data to it - which will be added below the tag. For example:

    -$string = "</div></div>";
    -
    -echo fieldset_close($string);
    -
    -// Would produce:
    -</fieldset>
    -</div></div>     -

    form_checkbox()

    -

    Lets you generate a checkbox field. Simple example:

    -echo form_checkbox('newsletter', 'accept', TRUE);
    -
    -// Would produce:
    -
    -<input type="checkbox" name="newsletter" value="accept" checked="checked" />     -

    The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

    -

    Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

    - -$data = array(
    -              'name'        => 'newsletter',
    -              'id'          => 'newsletter',
    -              'value'       => 'accept',
    -              'checked'     => TRUE,
    -              'style'       => 'margin:10px',
    -            );
    -
    -echo form_checkbox($data);
    -
    -// Would produce:

    -<input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />     - -

    As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the -fourth parameter:

    - -$js = 'onClick="some_function()"';
    -
    - echo form_checkbox('newsletter', 'accept', TRUE, $js)     - - -

    form_radio()

    -

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    - - -

    form_submit()

    - -

    Lets you generate a standard submit button. Simple example:

    -echo form_submit('mysubmit', 'Submit Post!');
    -
    -// Would produce:
    -
    -<input type="submit" name="mysubmit" value="Submit Post!" />     -

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. - The third parameter lets you add extra data to your form, like JavaScript.

    -

    form_label()

    -

    Lets you generate a <label>. Simple example:

    -echo form_label('What is your Name', 'username');
    -
    -// Would produce: -
    -<label id="username">What is your Name</label>     -

    Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

    -

    $attributes = array(
    - 'class' => 'mycustomclass',
    - 'style' => 'color: #000;',
    -);
    - echo form_label('What is your Name', 'username', $attributes);
    -
    -// Would produce:
    -<label id="username" class="mycustomclass" style="color: #000;">What is your Name</label>

    -

    form_reset()

    - -

    Lets you generate a standard reset button. Use is identical to form_submit().

    - -

    form_close()

    - -

    Produces a closing </form> tag. The only advantage to using this function is it permits you to pass data to it -which will be added below the tag. For example:

    - -$string = "</div></div>";
    -
    -echo form_close($string);
    -
    -// Would produce:
    -
    -</form>
    -</div></div>     - - - - - -

    form_prep()

    - -

    Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form. Consider this example:

    - -$string = 'Here is a string containing "quoted" text.';
    -
    -<input type="text" name="myform" value="$string" />     - -

    Since the above string contains a set of quotes it will cause the form to break. -The form_prep function converts HTML so that it can be used safely:

    - -<input type="text" name="myform" value="<?php echo form_prep($string); ?>" /> - -

    Note: If you use any of the form helper functions listed in this page the form -values will be prepped automatically, so there is no need to call this function. Use it only if you are -creating your own form elements.

    - - - - -
    - - - - - - + + + + +CodeIgniter User Guide : Form Helper + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.5.4

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Form Helper

    + +

    The Form Helper file contains functions that assist in working with forms.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('form'); + +

    The following functions are available:

    + + + +

    form_open()

    + +

    Creates an opening form tag with a base URL built from your config preferences. It will optionally let you +add form attributes and hidden input fields.

    + +

    The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable +in the event your URLs ever change.

    + +

    Here's a simple example:

    + +echo form_open('email/send'); + +

    The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

    + +<form method="post" action="http:/www.your-site.com/index.php/email/send" /> + +

    Adding Attributes

    + +

    Attributes can be added by passing an associative array to the second parameter, like this:

    + + +$attributes = array('class' => 'email', 'id' => 'myform');
    +
    +echo form_open('email/send', $attributes);     + +

    The above example would create a form similar to this:

    + +<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" /> + +

    Adding Hidden Input Fields

    + +

    Hidden fields can be added by passing an associative array to the third parameter, like this:

    + + +$hidden = array('username' => 'Joe', 'member_id' => '234');
    +
    +echo form_open('email/send', '', $hidden);     + +

    The above example would create a form similar to this:

    + +<form method="post" action="http:/www.your-site.com/index.php/email/send"  class="email"  id="myform" />
    +<input type="hidden" name="username" value="Joe" />
    +<input type="hidden" name="member_id" value="234" />     + + +

    form_open_multipart()

    + +

    This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute, +which is necessary if you would like to use the form to upload files with.

    + +

    form_hidden()

    + +

    Lets you generate hidden input fields. You can either submit a name/value string to create one field:

    + +form_hidden('username', 'johndoe');
    +
    +// Would produce:

    +<input type="hidden" name="username" value="johnodoe" />     + +

    Or you can submit an associative array to create multiple fields:

    + +$data = array(
    +              'name'  => 'John Doe',
    +              'email' => 'john@example.com',
    +              'url'   => 'http://www.example.com'
    +            );
    +
    +echo form_hidden($data);
    +
    +// Would produce:

    +<input type="hidden" name="name" value="John Doe" />
    +<input type="hidden" name="email" value="john@example.com" />
    +<input type="hidden" name="url" value="http://www.example.com" />     + + + + +

    form_input()

    + +

    Lets you generate a standard text input field. You can minimally pass the field name and value in the first +and second parameter:

    + +echo form_input('username', 'johndoe'); + +

    Or you can pass an associative array containing any data you wish your form to contain:

    + +$data = array(
    +              'name'        => 'username',
    +              'id'          => 'username',
    +              'value'       => 'johndoe',
    +              'maxlength'   => '100',
    +              'size'        => '50',
    +              'style'       => 'width:50%',
    +            );
    +
    +echo form_input($data);
    +
    +// Would produce:

    +<input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />     + +

    If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the +third parameter:

    + +$js = 'onClick="some_function()"';
    +
    +echo form_input('username', 'johndoe', $js);     + +

    form_password()

    + +

    This function is identical in all respects to the form_input() function above +except that is sets it as a "password" type.

    + +

    form_upload()

    + +

    This function is identical in all respects to the form_input() function above +except that is sets it as a "file" type, allowing it to be used to upload files.

    + +

    form_textarea()

    + +

    This function is identical in all respects to the form_input() function above +except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above +example, you will instead specify "rows" and "cols".

    + + +

    form_dropdown()

    + +

    Lets you create a standard drop-down field. The first parameter will contain the name of the field, +the second parameter will contain an associative array of options, and the third parameter will contain the +value you wish to be selected. You can also pass an array through the third parameter, and CodeIgniter will create a multiple select for you. Example:

    + +$options = array(
    +                  'small'  => 'Small Shirt',
    +                  'med'    => 'Medium Shirt',
    +                  'large'   => 'Large Shirt',
    +                  'xlarge' => 'Extra Large Shirt',
    +                );
    +
    +$shirts_on_sale = array('small', 'large');
    +
    +echo form_dropdown('shirts', $options, 'large');
    +
    +// Would produce:
    +
    +<select name="shirts">
    +<option value="small">Small Shirt</option>
    +<option value="med">Medium Shirt</option>
    +<option value="large" selected="selected">Large Shirt</option>
    +<option value="xlarge">Extra Large Shirt</option>
    +</select>
    +
    +echo form_dropdown('shirts', $options, $shirts_on_sale);
    +
    +// Would produce:
    +
    +<select name="shirts" multiple="multiple">
    +<option value="small" selected="selected">Small Shirt</option>
    +<option value="med">Medium Shirt</option>
    +<option value="large" selected="selected">Large Shirt</option>
    +<option value="xlarge">Extra Large Shirt</option>
    +</select>     + + +

    If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the +fourth parameter:

    + +$js = 'onChange="some_function()"';
    +
    +echo form_dropdown('shirts', $options, 'large', $js);     + + +

    form_fieldset()

    + +

    Lets you generate fieldset/legend fields.

    +echo form_fieldset('Address Information');
    +echo "<p>fieldset content here</p>\n";
    +echo form_fieldset_close(); +
    +
    +// Produces
    +<fieldset id="address_info"> +
    +<legend>Address Information</legend> +
    +<p>form content here</p> +
    +</fieldset>     +

    Similar to other functions, you can submit an associative array in the second parameter if you prefer to set additional attributes.

    +

    $attributes = array('id' => 'address_info', 'class' => 'address_info');
    + echo form_fieldset('Address Information', $attributes);
    +echo "<p>fieldset content here</p>\n";
    +echo form_fieldset_close();
    +
    +// Produces
    +<fieldset id="address_info" class="address_info">
    +<legend>Address Information</legend>
    +<p>form content here</p>
    +</fieldset>

    +

    form_fieldset_close()

    +

    Produces a closing </fieldset> tag. The only advantage to using this function is it permits you to pass data to it + which will be added below the tag. For example:

    +$string = "</div></div>";
    +
    +echo fieldset_close($string);
    +
    +// Would produce:
    +</fieldset>
    +</div></div>     +

    form_checkbox()

    +

    Lets you generate a checkbox field. Simple example:

    +echo form_checkbox('newsletter', 'accept', TRUE);
    +
    +// Would produce:
    +
    +<input type="checkbox" name="newsletter" value="accept" checked="checked" />     +

    The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

    +

    Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

    + +$data = array(
    +              'name'        => 'newsletter',
    +              'id'          => 'newsletter',
    +              'value'       => 'accept',
    +              'checked'     => TRUE,
    +              'style'       => 'margin:10px',
    +            );
    +
    +echo form_checkbox($data);
    +
    +// Would produce:

    +<input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />     + +

    As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the +fourth parameter:

    + +$js = 'onClick="some_function()"';
    +
    + echo form_checkbox('newsletter', 'accept', TRUE, $js)     + + +

    form_radio()

    +

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    + + +

    form_submit()

    + +

    Lets you generate a standard submit button. Simple example:

    +echo form_submit('mysubmit', 'Submit Post!');
    +
    +// Would produce:
    +
    +<input type="submit" name="mysubmit" value="Submit Post!" />     +

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. + The third parameter lets you add extra data to your form, like JavaScript.

    +

    form_label()

    +

    Lets you generate a <label>. Simple example:

    +echo form_label('What is your Name', 'username');
    +
    +// Would produce: +
    +<label id="username">What is your Name</label>     +

    Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

    +

    $attributes = array(
    + 'class' => 'mycustomclass',
    + 'style' => 'color: #000;',
    +);
    + echo form_label('What is your Name', 'username', $attributes);
    +
    +// Would produce:
    +<label id="username" class="mycustomclass" style="color: #000;">What is your Name</label>

    +

    form_reset()

    + +

    Lets you generate a standard reset button. Use is identical to form_submit().

    + +

    form_close()

    + +

    Produces a closing </form> tag. The only advantage to using this function is it permits you to pass data to it +which will be added below the tag. For example:

    + +$string = "</div></div>";
    +
    +echo form_close($string);
    +
    +// Would produce:
    +
    +</form>
    +</div></div>     + + + + + +

    form_prep()

    + +

    Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form. Consider this example:

    + +$string = 'Here is a string containing "quoted" text.';
    +
    +<input type="text" name="myform" value="$string" />     + +

    Since the above string contains a set of quotes it will cause the form to break. +The form_prep function converts HTML so that it can be used safely:

    + +<input type="text" name="myform" value="<?php echo form_prep($string); ?>" /> + +

    Note: If you use any of the form helper functions listed in this page the form +values will be prepped automatically, so there is no need to call this function. Use it only if you are +creating your own form elements.

    + + + + +
    + + + + + + \ No newline at end of file From a070db9c481346b4f9884bd32c3d1445a795f7a8 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 5 Jan 2008 20:30:22 +0000 Subject: [PATCH 0777/2544] added strtolower into charset and lang test --- system/libraries/User_agent.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index 67a3c2b8..f80bb0bb 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -256,7 +256,7 @@ function _set_languages() { if ((count($this->languages) == 0) AND isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) AND $_SERVER['HTTP_ACCEPT_LANGUAGE'] != '') { - $languages = preg_replace('/(;q=.+)/i', '', trim($_SERVER['HTTP_ACCEPT_LANGUAGE'])); + $languages = preg_replace('/(;q=.+)/i', '', strtolower(trim($_SERVER['HTTP_ACCEPT_LANGUAGE']))); $this->languages = explode(',', $languages); } @@ -279,7 +279,7 @@ function _set_charsets() { if ((count($this->charsets) == 0) AND isset($_SERVER['HTTP_ACCEPT_CHARSET']) AND $_SERVER['HTTP_ACCEPT_CHARSET'] != '') { - $charsets = preg_replace('/(;q=.+)/i', '', trim($_SERVER['HTTP_ACCEPT_CHARSET'])); + $charsets = preg_replace('/(;q=.+)/i', '', strtolower(trim($_SERVER['HTTP_ACCEPT_CHARSET']))); $this->charsets = explode(',', $charsets); } From fd5c01a1c14f396bb63b3e2dce7dab2548a1cefa Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 6 Jan 2008 20:04:12 +0000 Subject: [PATCH 0778/2544] Fixed a bug in the upload library when allowed_files wasn't defined. --- system/libraries/Upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index f804dcec..33ee9477 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -512,7 +512,7 @@ function is_image() */ function is_allowed_filetype() { - if (count($this->allowed_types) == 0) + if (count($this->allowed_types) == 0 || ! is_array($this->allowed_types)) { $this->set_error('upload_no_file_types'); return FALSE; From e4e603b1083242fd08fc84e2cb29e998dddaee0c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 9 Jan 2008 14:18:14 +0000 Subject: [PATCH 0779/2544] fix for is_really_writable --- system/helpers/file_helper.php | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index d07d35f9..83ef6a06 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -176,4 +176,39 @@ function get_filenames($source_dir, $include_path = FALSE) } } +// -------------------------------------------------------------------- + +/** + * Tests for file writability + * + * is_writable() returns TRUE on Windows servers + * when you really can't write to the file + * as the OS reports to PHP as FALSE only if the + * read-only attribute is marked. Ugh? + * + * @access private + * @return void + */ +function is_really_writable($file) +{ + if (is_dir($file)) + { + $file = rtrim($file, '/').'/'.md5(rand(1,100)); + + if (($fp = @fopen($file, 'ab')) === FALSE) + { + return FALSE; + } + + @chmod($file, 0777); + @unlink($file); + } + elseif (($fp = @fopen($file, 'ab')) === FALSE) + { + return FALSE; + } + + fclose($fp); + return TRUE; +} ?> \ No newline at end of file From 56e5722f2861f0e4c2bd0c9bb4e9d5065dd0a5b0 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 9 Jan 2008 19:43:40 +0000 Subject: [PATCH 0780/2544] bugfix --- system/helpers/form_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index a67ea050..1d2cb860 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -229,7 +229,7 @@ function form_dropdown($name = '', $options = array(), $selected = array(), $ext } if ($extra != '') $extra = ' '.$extra; - $multiple = (count($selected > 1))?' multiple="multiple"':''; + $multiple = (count($selected) > 1)?' multiple="multiple"':''; $form = '\n"; From 67b44edaf539245ca12789f19cca1e7a9437f4f3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 12 Jan 2008 16:18:02 +0000 Subject: [PATCH 0782/2544] added raw_where() and raw_or_where() into AR --- system/database/DB_active_rec.php | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index b9594050..683ded0a 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -206,6 +206,44 @@ function orwhere($key, $value = NULL) // -------------------------------------------------------------------- + /** + * Raw Where + * + * Generates an unfiltered WHERE portion of the query. + * Separates multiple calls with AND + * + * @access public + * @param string + * @return string + */ + function raw_where($statement) + { + $prefix = (count($this->ar_where) == 0) ? '' : ' AND '; + $this->ar_where[] = $prefix.$statement; + return $statement; + } + + // -------------------------------------------------------------------- + + /** + * Raw OR Where + * + * Generates an unfiltered WHERE portion of the query. + * Separates multiple calls with OR + * + * @access public + * @param string + * @return string + */ + function raw_or_where($statement) + { + $prefix = (count($this->ar_where) == 0) ? '' : ' OR '; + $this->ar_where[] = $prefix.$statement; + return $statement; + } + + // -------------------------------------------------------------------- + /** * Where * From 39af731090428b2a50bc196cc89931520483569f Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 14 Jan 2008 05:46:49 +0000 Subject: [PATCH 0783/2544] removed raw_where and raw_or_where. They duplicated existing functionality better left elsewhere. --- system/database/DB_active_rec.php | 38 ------------------------------- 1 file changed, 38 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 683ded0a..e697cac7 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -203,44 +203,6 @@ function orwhere($key, $value = NULL) { return $this->or_where($key, $value); } - - // -------------------------------------------------------------------- - - /** - * Raw Where - * - * Generates an unfiltered WHERE portion of the query. - * Separates multiple calls with AND - * - * @access public - * @param string - * @return string - */ - function raw_where($statement) - { - $prefix = (count($this->ar_where) == 0) ? '' : ' AND '; - $this->ar_where[] = $prefix.$statement; - return $statement; - } - - // -------------------------------------------------------------------- - - /** - * Raw OR Where - * - * Generates an unfiltered WHERE portion of the query. - * Separates multiple calls with OR - * - * @access public - * @param string - * @return string - */ - function raw_or_where($statement) - { - $prefix = (count($this->ar_where) == 0) ? '' : ' OR '; - $this->ar_where[] = $prefix.$statement; - return $statement; - } // -------------------------------------------------------------------- From 85c7c61523177bb9307c6ea8439090de4c39c457 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 14 Jan 2008 13:18:36 +0000 Subject: [PATCH 0784/2544] fix a segment db cache bug --- system/database/DB_cache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php index f8ea616c..1e741070 100644 --- a/system/database/DB_cache.php +++ b/system/database/DB_cache.php @@ -163,7 +163,7 @@ function delete($segment_one = '', $segment_two = '') { if ($segment_one == '') { - $segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(2); + $segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1); } if ($segment_two == '') From 8f4f7b10a8161a453d7a21e951248d471dbb3b3f Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 15 Jan 2008 13:58:35 +0000 Subject: [PATCH 0785/2544] Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login). --- system/language/english/email_lang.php | 40 +++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index 430ae4ab..040e0eaa 100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php @@ -1,21 +1,21 @@ - \ No newline at end of file From 0fe8297a38fcf1237914d633201e2f8486f3e7d4 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 15 Jan 2008 13:58:47 +0000 Subject: [PATCH 0786/2544] Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login). --- system/libraries/Email.php | 1818 +++++++++++++++++++++++++++++++++++- 1 file changed, 1817 insertions(+), 1 deletion(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index c0593df0..7b5ebca8 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1 +1,1817 @@ - 0) { $this->initialize($config); } log_message('debug', "Email Class Initialized"); } // -------------------------------------------------------------------- /** * Initialize preferences * * @access public * @param array * @return void */ function initialize($config = array()) { $this->clear(); foreach ($config as $key => $val) { if (isset($this->$key)) { $method = 'set_'.$key; if (method_exists($this, $method)) { $this->$method($val); } else { $this->$key = $val; } } } $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE; $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE; } // -------------------------------------------------------------------- /** * Initialize the Email Data * * @access public * @return void */ function clear($clear_attachments = FALSE) { $this->_subject = ""; $this->_body = ""; $this->_finalbody = ""; $this->_header_str = ""; $this->_replyto_flag = FALSE; $this->_recipients = array(); $this->_headers = array(); $this->_debug_msg = array(); $this->_set_header('User-Agent', $this->useragent); $this->_set_header('Date', $this->_set_date()); if ($clear_attachments !== FALSE) { $this->_attach_name = array(); $this->_attach_type = array(); $this->_attach_disp = array(); } } // -------------------------------------------------------------------- /** * Set FROM * * @access public * @param string * @param string * @return void */ function from($from, $name = '') { if (preg_match( '/\<(.*)\>/', $from, $match)) $from = $match['1']; if ($this->validate) $this->validate_email($this->_str_to_array($from)); if ($name != '' && substr($name, 0, 1) != '"') { $name = '"'.$name.'"'; } $this->_set_header('From', $name.' <'.$from.'>'); $this->_set_header('Return-Path', '<'.$from.'>'); } // -------------------------------------------------------------------- /** * Set Reply-to * * @access public * @param string * @param string * @return void */ function reply_to($replyto, $name = '') { if (preg_match( '/\<(.*)\>/', $replyto, $match)) $replyto = $match['1']; if ($this->validate) $this->validate_email($this->_str_to_array($replyto)); if ($name == '') { $name = $replyto; } if (substr($name, 0, 1) != '"') { $name = '"'.$name.'"'; } $this->_set_header('Reply-To', $name.' <'.$replyto.'>'); $this->_replyto_flag = TRUE; } // -------------------------------------------------------------------- /** * Set Recipients * * @access public * @param string * @return void */ function to($to) { $to = $this->_str_to_array($to); $to = $this->clean_email($to); if ($this->validate) $this->validate_email($to); if ($this->_get_protocol() != 'mail') $this->_set_header('To', implode(", ", $to)); switch ($this->_get_protocol()) { case 'smtp' : $this->_recipients = $to; break; case 'sendmail' : $this->_recipients = implode(", ", $to); break; case 'mail' : $this->_recipients = implode(", ", $to); break; } } // -------------------------------------------------------------------- /** * Set CC * * @access public * @param string * @return void */ function cc($cc) { $cc = $this->_str_to_array($cc); $cc = $this->clean_email($cc); if ($this->validate) $this->validate_email($cc); $this->_set_header('Cc', implode(", ", $cc)); if ($this->_get_protocol() == "smtp") $this->_cc_array = $cc; } // -------------------------------------------------------------------- /** * Set BCC * * @access public * @param string * @param string * @return void */ function bcc($bcc, $limit = '') { if ($limit != '' && is_numeric($limit)) { $this->bcc_batch_mode = true; $this->bcc_batch_size = $limit; } $bcc = $this->_str_to_array($bcc); $bcc = $this->clean_email($bcc); if ($this->validate) $this->validate_email($bcc); if (($this->_get_protocol() == "smtp") OR ($this->bcc_batch_mode && count($bcc) > $this->bcc_batch_size)) $this->_bcc_array = $bcc; else $this->_set_header('Bcc', implode(", ", $bcc)); } // -------------------------------------------------------------------- /** * Set Email Subject * * @access public * @param string * @return void */ function subject($subject) { $subject = preg_replace("/(\r\n)|(\r)|(\n)/", "", $subject); $subject = preg_replace("/(\t)/", " ", $subject); $this->_set_header('Subject', trim($subject)); } // -------------------------------------------------------------------- /** * Set Body * * @access public * @param string * @return void */ function message($body) { $this->_body = stripslashes(rtrim(str_replace("\r", "", $body))); } // -------------------------------------------------------------------- /** * Assign file attachments * * @access public * @param string * @return string */ function attach($filename, $disposition = 'attachment') { $this->_attach_name[] = $filename; $this->_attach_type[] = $this->_mime_types(next(explode('.', basename($filename)))); $this->_attach_disp[] = $disposition; // Can also be 'inline' Not sure if it matters } // -------------------------------------------------------------------- /** * Add a Header Item * * @access public * @param string * @param string * @return void */ function _set_header($header, $value) { $this->_headers[$header] = $value; } // -------------------------------------------------------------------- /** * Convert a String to an Array * * @access public * @param string * @return array */ function _str_to_array($email) { if ( ! is_array($email)) { if (ereg(',$', $email)) $email = substr($email, 0, -1); if (ereg('^,', $email)) $email = substr($email, 1); if (ereg(',', $email)) { $x = explode(',', $email); $email = array(); for ($i = 0; $i < count($x); $i ++) $email[] = trim($x[$i]); } else { $email = trim($email); settype($email, "array"); } } return $email; } // -------------------------------------------------------------------- /** * Set Multipart Value * * @access public * @param string * @return void */ function set_alt_message($str = '') { $this->alt_message = ($str == '') ? '' : $str; } // -------------------------------------------------------------------- /** * Set Mailtype * * @access public * @param string * @return void */ function set_mailtype($type = 'text') { $this->mailtype = ($type == 'html') ? 'html' : 'text'; } // -------------------------------------------------------------------- /** * Set Wordwrap * * @access public * @param string * @return void */ function set_wordwrap($wordwrap = TRUE) { $this->wordwrap = ($wordwrap === FALSE) ? FALSE : TRUE; } // -------------------------------------------------------------------- /** * Set Protocol * * @access public * @param string * @return void */ function set_protocol($protocol = 'mail') { $this->protocol = ( ! in_array($protocol, $this->_protocols, TRUE)) ? 'mail' : strtolower($protocol); } // -------------------------------------------------------------------- /** * Set Priority * * @access public * @param integer * @return void */ function set_priority($n = 3) { if ( ! is_numeric($n)) { $this->priority = 3; return; } if ($n < 1 OR $n > 5) { $this->priority = 3; return; } $this->priority = $n; } // -------------------------------------------------------------------- /** * Set Newline Character * * @access public * @param string * @return void */ function set_newline($newline = "\n") { if ($newline != "\n" AND $newline != "\r\n" AND $newline != "\r") { $this->newline = "\n"; return; } $this->newline = $newline; } // -------------------------------------------------------------------- /** * Set Message Boundary * * @access private * @return void */ function _set_boundaries() { $this->_alt_boundary = "B_ALT_".uniqid(''); // multipart/alternative $this->_atc_boundary = "B_ATC_".uniqid(''); // attachment boundary } // -------------------------------------------------------------------- /** * Get the Message ID * * @access private * @return string */ function _get_message_id() { $from = $this->_headers['Return-Path']; $from = str_replace(">", "", $from); $from = str_replace("<", "", $from); return "<".uniqid('').strstr($from, '@').">"; } // -------------------------------------------------------------------- /** * Get Mail Protocol * * @access private * @param bool * @return string */ function _get_protocol($return = true) { $this->protocol = strtolower($this->protocol); $this->protocol = ( ! in_array($this->protocol, $this->_protocols, TRUE)) ? 'mail' : $this->protocol; if ($return == true) return $this->protocol; } // -------------------------------------------------------------------- /** * Get Mail Encoding * * @access private * @param bool * @return string */ function _get_encoding($return = true) { $this->_encoding = ( ! in_array($this->_encoding, $this->_bit_depths)) ? '7bit' : $this->_encoding; if ( ! in_array($this->charset, $this->_base_charsets, TRUE)) $this->_encoding = "8bit"; if ($return == true) return $this->_encoding; } // -------------------------------------------------------------------- /** * Get content type (text/html/attachment) * * @access private * @return string */ function _get_content_type() { if ($this->mailtype == 'html' && count($this->_attach_name) == 0) return 'html'; elseif ($this->mailtype == 'html' && count($this->_attach_name) > 0) return 'html-attach'; elseif ($this->mailtype == 'text' && count($this->_attach_name) > 0) return 'plain-attach'; else return 'plain'; } // -------------------------------------------------------------------- /** * Set RFC 822 Date * * @access public * @return string */ function _set_date() { $timezone = date("Z"); $operator = (substr($timezone, 0, 1) == '-') ? '-' : '+'; $timezone = abs($timezone); $timezone = floor($timezone/3600) * 100 + ($timezone % 3600 ) / 60; return sprintf("%s %s%04d", date("D, j M Y H:i:s"), $operator, $timezone); } // -------------------------------------------------------------------- /** * Mime message * * @access private * @return string */ function _get_mime_message() { return "This is a multi-part message in MIME format.".$this->newline."Your email application may not support this format."; } // -------------------------------------------------------------------- /** * Validate Email Address * * @access public * @param string * @return bool */ function validate_email($email) { if ( ! is_array($email)) { $this->_set_error_message('email_must_be_array'); return FALSE; } foreach ($email as $val) { if ( ! $this->valid_email($val)) { $this->_set_error_message('email_invalid_address', $val); return FALSE; } } } // -------------------------------------------------------------------- /** * Email Validation * * @access public * @param string * @return bool */ function valid_email($address) { if ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $address)) return FALSE; else return TRUE; } // -------------------------------------------------------------------- /** * Clean Extended Email Address: Joe Smith * * @access public * @param string * @return string */ function clean_email($email) { if ( ! is_array($email)) { if (preg_match('/\<(.*)\>/', $email, $match)) return $match['1']; else return $email; } $clean_email = array(); for ($i=0; $i < count($email); $i++) { if (preg_match( '/\<(.*)\>/', $email[$i], $match)) $clean_email[] = $match['1']; else $clean_email[] = $email[$i]; } return $clean_email; } // -------------------------------------------------------------------- /** * Build alternative plain text message * * This function provides the raw message for use * in plain-text headers of HTML-formatted emails. * If the user hasn't specified his own alternative message * it creates one by stripping the HTML * * @access private * @return string */ function _get_alt_message() { if ($this->alt_message != "") { return $this->word_wrap($this->alt_message, '76'); } if (eregi( '\', $this->_body, $match)) { $body = $match['1']; $body = substr($body, strpos($body, ">") + 1); } else { $body = $this->_body; } $body = trim(strip_tags($body)); $body = preg_replace( '#

    CodeIgniter User Guide Version 1.5.4

    Database Configuration

    CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.). The config file is located at:

    application/config/database.php

    The config settings are stored in a multi-dimensional array with this prototype:

    $db['default']['hostname'] = "localhost";
    $db['default']['username'] = "root";
    $db['default']['password'] = "";
    $db['default']['database'] = "database_name";
    $db['default']['dbdriver'] = "mysql";
    $db['default']['dbprefix'] = "";
    $db['default']['pconnect'] = TRUE;
    $db['default']['db_debug'] = FALSE;
    $db['default']['active_r'] = TRUE;

    The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store multiple sets of connection values. If, for example, you run multiple environments (development, production, test, etc.) under a single installation, you can set up a connection group for each, then switch between groups as needed. For example, to set up a "test" environment you would do this:

    $db['test']['hostname'] = "localhost";
    $db['test']['username'] = "root";
    $db['test']['password'] = "";
    $db['test']['database'] = "database_name";
    $db['test']['dbdriver'] = "mysql";
    $db['test']['dbprefix'] = "";
    $db['test']['pconnect'] = TRUE;
    $db['test']['db_debug'] = FALSE;
    $db['test']['active_r'] = TRUE;

    Then, to globally tell the system to use that group you would set this variable located in the config file:

    $active_group = "test";

    Note: The name "test" is arbitrary. It can be anything you want. By default we've used the word "default" for the primary connection, but it too can be renamed to something more relevant to your project.

    Explanation of Values:

    • hostname - The hostname of your database server. Often this is "localhost".
    • 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, postgre, obdc, etc. Must be specified in lower case.
    • dbprefix - An optional table prefix which will added to the table name when running Active Record queries. This permits multiple CodeIgniter installations to share one database.
    • pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
    • db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
    • active_r - TRUE/FALSE (boolean) - Whether to load the Active Record Class. If you are not using the active record class you can have it omitted when the database classes are initialized in order to utilize less resources.

      Note: that some CodeIgniter classes such as Sessions require Active Records be enabled to access certain functionality.

    • port - The database port number. Currently only used with the Postgre driver.

    Note: Depending on what database platform you are using (MySQL, Postgre, etc.) not all values will be needed. For example, when using SQLite you will not need to supply a username or password, and the database name will be the path to your database file. The information above assumes you are using MySQL.

    \ No newline at end of file + + + + +CodeIgniter User Guide : Database Configuration + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.5.4

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + + +

    Database Configuration

    + +

    CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.). +The config file is located at:

    + +

    application/config/database.php

    + +

    The config settings are stored in a multi-dimensional array with this prototype:

    + +$db['default']['hostname'] = "localhost";
    +$db['default']['username'] = "root";
    +$db['default']['password'] = "";
    +$db['default']['database'] = "database_name";
    +$db['default']['dbdriver'] = "mysql";
    +$db['default']['dbprefix'] = "";
    +$db['default']['pconnect'] = TRUE;
    +$db['default']['db_debug'] = FALSE;
    +$db['default']['active_r'] = TRUE;
    +$db['default']['cache_on'] = FALSE;
    +$db['default']['cachedir'] = "";     + +

    The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store +multiple sets of connection values. If, for example, you run multiple environments (development, production, test, etc.) +under a single installation, you can set up a connection group for each, then switch between groups as needed. +For example, to set up a "test" environment you would do this:

    + +$db['test']['hostname'] = "localhost";
    +$db['test']['username'] = "root";
    +$db['test']['password'] = "";
    +$db['test']['database'] = "database_name";
    +$db['test']['dbdriver'] = "mysql";
    +$db['test']['dbprefix'] = "";
    +$db['test']['pconnect'] = TRUE;
    +$db['test']['db_debug'] = FALSE;
    +$db['test']['active_r'] = TRUE;
    +$db['default']['cache_on'] = FALSE;
    +$db['default']['cachedir'] = "";     + + +

    Then, to globally tell the system to use that group you would set this variable located in the config file:

    + +$active_group = "test"; + +

    Note: The name "test" is arbitrary. It can be anything you want. By default we've used the word "default" +for the primary connection, but it too can be renamed to something more relevant to your project.

    + +

    Explanation of Values:

    + +
      +
    • hostname - The hostname of your database server. Often this is "localhost".
      • +
    • 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, postgre, obdc, etc. Must be specified in lower case.
      • +
    • dbprefix - An optional table prefix which will added to the table name when running Active Record queries. This permits multiple CodeIgniter installations to share one database.
      • +
    • pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
      • +
    • db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
      • +
    • active_r - TRUE/FALSE (boolean) - Whether to load the Active Record Class. If you are not using the active record class you can have it omitted when the database classes are initialized in order to utilize less resources. +

      Note: that some CodeIgniter classes such as Sessions require Active Records be enabled to access certain functionality.

      • +
    • cache_on - TRUE/FALSE (boolean) - Whether database query caching is enabled, see also Database Caching Class.
      • +
    • cachedir - The absolute server path to your database query cache directory.
      • +
    • port - The database port number. Currently only used with the Postgre driver. To use this value you have to add a line to the database config array.$db['default']['port'] = 5432;
      • +
    + +

    Note: Depending on what database platform you are using (MySQL, Postgre, etc.) +not all values will be needed. For example, when using SQLite you will not need to supply a username or password, and +the database name will be the path to your database file. The information above assumes you are using MySQL.

    + + + +
    + + + + + + + \ No newline at end of file From 6e848ed2afa39b5c99fda7bc061c864bd619269f Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 15 Jan 2008 14:26:23 +0000 Subject: [PATCH 0788/2544] Fixed a bug in the Oracle driver that prevented num_rows from working. --- system/database/DB_driver.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index fc700ec3..a7f03e3e 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -329,7 +329,6 @@ function query($sql, $binds = FALSE, $return_object = TRUE) $RES = new $driver(); $RES->conn_id = $this->conn_id; $RES->result_id = $this->result_id; - $RES->num_rows = $RES->num_rows(); if ($this->dbdriver == 'oci8') { @@ -337,7 +336,9 @@ function query($sql, $binds = FALSE, $return_object = TRUE) $RES->curs_id = NULL; $RES->limit_used = $this->limit_used; } - + + $RES->num_rows = $RES->num_rows(); + // Is query caching enabled? If so, we'll serialize the // result object and save it to a cache file. if ($this->cache_on == TRUE AND $this->_cache_init()) From 305f63b920acb8f58125f932f7462c1b71ba18c4 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 15 Jan 2008 17:41:32 +0000 Subject: [PATCH 0789/2544] fixed a bug in parser where numeric data is ignored --- system/libraries/Parser.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php index 4e1f9b9a..33cb1214 100644 --- a/system/libraries/Parser.php +++ b/system/libraries/Parser.php @@ -54,13 +54,13 @@ function parse($template, $data, $return = FALSE) foreach ($data as $key => $val) { - if (is_string($val)) + if (is_array($val)) { - $template = $this->_parse_single($key, $val, $template); + $template = $this->_parse_pair($key, $val, $template); } - elseif (is_array($val)) + else { - $template = $this->_parse_pair($key, $val, $template); + $template = $this->_parse_single($key, (string)$val, $template); } } From 76708b780c558c0d5db1efd8e11787269e0507e3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 15 Jan 2008 23:58:19 +0000 Subject: [PATCH 0790/2544] bug(re)fix: I am so smart. s - m - r - t --- system/helpers/form_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 7c3bc9d8..9f3509d5 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -231,7 +231,7 @@ function form_dropdown($name = '', $options = array(), $selected = array(), $ext } if ($extra != '') $extra = ' '.$extra; - $multiple = (count($selected > 1))?' multiple="multiple"':''; + $multiple = (count($selected) > 1))?' multiple="multiple"':''; $form = '\n"; diff --git a/system/language/english/db_lang.php b/system/language/english/db_lang.php index 57897263..c8c48f84 100644 --- a/system/language/english/db_lang.php +++ b/system/language/english/db_lang.php @@ -8,7 +8,7 @@ $lang['db_must_set_table'] = 'You must set the database table to be used with your query.'; $lang['db_must_use_set'] = 'You must use the "set" method to update an entry.'; $lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.'; -$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" clause.'; +$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.'; $lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.'; $lang['db_unsupported_function'] = 'This feature is not available for the database you are using.'; $lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.'; @@ -17,8 +17,8 @@ $lang['db_unsuported_compression'] = 'The file compression format you chose is not supported by your server.'; $lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.'; $lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.'; - - - +$lang['db_table_name_required'] = 'A table name is required for that operation.'; +$lang['db_column_name_required'] = 'A column name is required for that operation.'; +$lang['db_column_definition_required'] = 'A column definition is required for that operation.'; ?> \ No newline at end of file diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index 040e0eaa..430ae4ab 100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php @@ -1,21 +1,21 @@ - \ No newline at end of file diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 99652c0b..f833cb71 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -236,15 +236,44 @@ function dbutil() } $CI =& get_instance(); + + // for backwards compatibility, load dbforge so we can extend dbutils off it + // this use is deprecated and strongly discouraged + $CI->load->dbforge(); require_once(BASEPATH.'database/DB_utility'.EXT); require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility'.EXT); $class = 'CI_DB_'.$CI->db->dbdriver.'_utility'; - $CI->dbutil = new $class(); + $CI->dbutil =& new $class(); + $CI->load->_ci_assign_to_models(); } + // -------------------------------------------------------------------- + + /** + * Load the Database Forge Class + * + * @access public + * @return string + */ + function dbforge() + { + if ( ! class_exists('CI_DB')) + { + $this->database(); + } + + $CI =& get_instance(); + + require_once(BASEPATH.'database/DB_forge'.EXT); + require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_forge'.EXT); + $class = 'CI_DB_'.$CI->db->dbdriver.'_forge'; + + $CI->dbforge = new $class(); + } + // -------------------------------------------------------------------- /** diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8fa74a13..902e5e64 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    @@ -57,7 +57,7 @@

    Change Log

    -

    Version 1.5.5

    +

    Version 1.6.0

    Release Date: -- still in development

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
      • @@ -66,30 +66,42 @@

      Version 1.5.5

    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
      • -
    • Removed "rand()" as a listed option from orderby in the Active Record, as it was MySQL only.
      • -
    • Added 'random' as an order_by() option in Active Record.
      • -
    • Added where_in(), where_in_or(), where_not_in(), and where_not_in_or() to Active Record.
      • -
    • Added support for limit() into update() and delete() statements in Active Record.
      • +
    • Added DBForge to the database tools.
      • +
    • Moved create_database() and drop_database() into DBForge.
      • +
    • Added add_field(), add_key(), create_table(), drop_table(), add_column(), drop_column(), modify_column() into DBForge.
      • +
    • Added 'random' as an order_by() option , and removed "rand()" as a listed option as it was MySQL only.
      • +
    • Added protect_identifiers() in Active Record.
      • +
    • Alll AR queries are backticked if appropriate to the database.
      • +
    • Added where_in(), where_in_or(), where_not_in(), where_not_in_or(), not_like() and or_not_like() to Active Record.
      • +
    • Added support for limit() into update() and delete() statements in Active Record.
      • +
    • Added empty_table() and truncate_table() to Active Record.
    • Added the ability to pass an array of tables to the delete() statement in Active Record.
      • -
    • Added titles to all user manual pages.
      • +
    • Added count_all_results() function to Active Record.
      • +
    • Added select_max(), select_min(), select_avg() and select_sum() to Active Record.
      • +
    • Added the ability to use aliases with joins in Active Record.
      • +
    • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
      • +
    • Added a third parameter to set() in Active Record that withholds escaping data.
    • Added a check for NULL fields in the MySQL database backup utility.
      • -
    • Documented the timezones() function in the Date Helper.
      • -
    • Documented unset_userdata in the Session class.
      • -
    • Documented distinct() in Active Record.
      • -
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Added a few additional mime type variations for CSV.
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
      • -
    • Added form_reset() function to form helper.
      • -
    • Added count_all_results() function to Active Record.
      • -
    • Added the ability to use aliases with joins in Active Record.
      • +
    • Added form_fieldset(), form_fieldset_close(), form_label(), and form_reset() function to form helper.
      • +
    • Added support for external urls in form_open().
    • Added a language entry for valid_ip validation error.
      • -
    • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
      • +
    • Added titles to all user manual pages.
      • +
    • Added Zip Encoding Class to the table of contents of the userguide.
    • Moved the safe mode and auth checks for the Email library into the constructor.
      • +
    • Moved part of the userguide menu javascript to an external file.
      • +
    • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
    • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
      • +
    • Documented distinct() in Active Record.
      • +
    • Documented the timezones() function in the Date Helper.
      • +
    • Documented unset_userdata in the Session class.
      • +
    • Documented 2 config options to the Database configuration page.
    • Fixed a bug in highlight_pharse() that caused an error with slashes.
      • -
    • Fixed a bug: $field_names[] vs $Ffield_names[] in postgre and sqlite drivers
      • +
    • Fixed a bug: $field_names[] vs $Ffield_names[] in postgre and sqlite drivers.
      • +
    • Fixed a bug in the upload library when allowed_files wasn't defined.
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • Fixed a bug in the Email library where some timezones were calculated incorrectly.
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
      • @@ -102,19 +114,22 @@

      Version 1.5.5

    • Fixed a bug that was making validation callbacks required even when not set as such.
    • Fixed a bug in _object_to_array that broke some types of inserts and updates.
    • Fixed a bug in get_filenames() in the File Helper where the array wasn't cleared after each call.
      • +
    • Fixed a bug that prevented num_rows from working in Oracle.
      • +
    • Fixed a bug in the parser class where numeric data was ignored.
      • +
    • Fixed a bug when loading plugin files as _plugin. and not _pi.
      • +
    • Fixed a bug in the SQLite driver for PHP 4.
    • Fixed an example of comma-separated emails in the email library documentation.
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
    • Fixed a typo in the database language file.
      • -
    • Fixed a typo in the image language file "suppor" to "support".
      • +
    • Fixed a typo in the image language file "suppor" to "support".
    • Fixed an example for XML RPC.
      • -
    • Fixed an example of accept_charset() in the User Agent Library.
      • -
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
      • -
    • Fixed a typo in the String Helper (uniquid changed to uniqid)
      • +
    • Fixed an example of accept_charset() in the User Agent Library.
      • +
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
      • +
    • Fixed a typo in the String Helper (uniquid changed to uniqid).
      • +
    • Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login).
    • Fixed assorted user guide typos.
      • -
    • Moved part of the userguide menu javascript to an external file.
      • -
    • Added Zip Encoding Class to the table of contents of the userguide.
      • -
    • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
      • -
    +
  • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); havingor() for having_or(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
    • + diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index d4310164..45cabdba 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -27,7 +27,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    @@ -128,19 +128,53 @@

    $this->db->get_where();

    Please read the about the where function below for more information.

    Note: get_where() was formerly known as getwhere(), which has been deprecated

    -

    $this->db->select();

    +

    $this->db->select();

    Permits you to write the SELECT portion of your query:

    - - +

    $this->db->select('title, content, date');

    $query = $this->db->get('mytable');

    -// Produces: SELECT title, content, date FROM mytable     +// Produces: SELECT title, content, date FROM mytable

    +

    Note: If you are selecting all (*) from a table you do not need to use this function. When omitted, CodeIgniter assumes you wish to SELECT *

    -

    Note: If you are selecting all (*) from a table you do not need to use this function. When omitted, CodeIgniter assumes you wish to SELECT *

    +

    $this->Db->select() accepts an optional second parameter. If you set it to FALSE, CodeIgniter will not try to protect your field or table names with backticks. This is useful if you need a compound select statement.

    +

    $this->db->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4') AS amount_paid', FALSE);
    + $query = $this->db->get('mytable');
    +

    +

    $this->db->select_max();

    +

    Writes a "SELECT MAX(field)" portion for your query. You can optionally include a second parameter to rename the resulting field.

    +

    +$this->db->select_max('age');
    +$query = $this->db->get('members');
    +// Produces: SELECT MAX(age) as age FROM members
    +
    +$this->db->select_max('age', 'member_age');
    +$query = $this->db->get('members');
    +// Produces: SELECT MAX(age) as member_age FROM members

    + +

    $this->db->select_min();

    +

    Writes a "SELECT MIN(field)" portion for your query. As with select_max(), You can optionally include a second parameter to rename the resulting field.

    +

    +$this->db->select_min('age');
    +$query = $this->db->get('members');
    +// Produces: SELECT MIN(age) as age FROM members

    + +

    $this->db->select_avg();

    +

    Writes a "SELECT AVG(field)" portion for your query. As with select_max(), You can optionally include a second parameter to rename the resulting field.

    +

    +$this->db->select_avg('age');
    +$query = $this->db->get('members');
    +// Produces: SELECT AVG(age) as age FROM members

    + +

    $this->db->select_sum();

    +

    Writes a "SELECT SUM(field)" portion for your query. As with select_max(), You can optionally include a second parameter to rename the resulting field.

    +

    +$this->db->select_sum('age');
    +$query = $this->db->get('members');
    +// Produces: SELECT SUM(age) as age FROM members

    $this->db->from();

    @@ -154,8 +188,8 @@

    $this->db->from();


    // Produces: SELECT title, content, date FROM mytable -

    Note: As shown earlier, the FROM portion of your query can be specified in the $this->db->get() function, so use whichever method -you prefer.

    +

    Note: As shown earlier, the FROM portion of your query can be specified in the $this->db->get() function, so use whichever method +you prefer.

    $this->db->join();

    @@ -294,6 +328,19 @@

    $this->db->or_where_not_in();

    $this->db->where_in('username', $names);
    // Produces: OR WHERE username NOT IN ('Frank', 'Todd', 'James')

    +

    $this->db->raw_where();

    +

    Generates an unfiltered WHERE portion of the query exactly as the developer passes it. Separates multiple calls with AND
    + $this->db->raw_where('(grade > 50 AND grade < 75)');
    + // Produces: AND WHERE (grade > 50 AND grade < 75)

    + +

    $this->db->raw_or_where();

    +

    Generates an unfiltered WHERE portion of the query exactly as the developer passes it. Separates multiple calls with OR
    + $this->db->raw_where('(grade > 50 AND grade < 75)');
    + // Produces: OR WHERE (grade > 50 AND grade < 75)

    + +

    Note: All values passed through raw_where() and raw_or_where() are not escaped automatically, or otherwise touched. It is the responsibility of the developer to ensure all queries are safe. Consider using protect_identifiers() and escaping your queries as appropriate.

    + +

    $this->db->like();

    This function enables you to generate LIKE clauses, useful for doing searches.

    @@ -390,11 +437,12 @@

    $this->db->having();

    $this->db->having(array('title =' => 'My Title', 'id <' => $id)); -

    // Produces: HAVING title = 'My Title', 'id < 45' -     +

    // Produces: HAVING title = 'My Title', 'id < 45' +

    $this->db->or_having();

    +

    Identical to having(), only separates multiple clauses with "OR".

    $this->db->order_by();

    Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. The second parameter lets you set the direction of the result. Options are asc or desc, or random.

    @@ -419,7 +467,7 @@

    $this->db->order_by();

    // Produces: ORDER BY title DESC, name ASC

    Note: order_by() was formerly known as orderby(), which has been deprecated.

    -

    Note: random ordering is not currently supported in Orcacle or MSSQL drivers.

    +

    Note: random ordering is not currently supported in Orcacle or MSSQL drivers. These will default to 'ASC'.

    $this->db->limit();

    Lets you limit the number of rows you would like returned by the query:

    @@ -516,14 +564,19 @@

    $this->db->set();

    If you use multiple function called they will be assembled properly based on whether you are doing an insert or an update:

    -$this->db->set('name', $name);
    -$this->db->set('title', $title);
    -$this->db->set('status', $status);
    -$this->db->insert('mytable'); -     - +$this->db->set('name', $name);
    +$this->db->set('title', $title);
    +$this->db->set('status', $status);
    +$this->db->insert('mytable');     +

    set() will also accept an optional third parameter ($escape), that will prevent data from being escaped if set to FALSE. To illustrate the difference, here is set() used both with and without the escape parameter.

    +

    $this->db->set('field', 'field+1', FALSE);
    + $this->db->insert('mytable');
    + // gives INSERT INTO mytable (field) VALUES (field+1)
    +
    + $this->db->set('field', 'field+1');
    + $this->db->insert('mytable');
    + // gives INSERT INTO mytable (field) VALUES ('field+1')

    You can also pass an associative array to this function:

    - $array = array('name' => $name, 'title' => $title, 'status' => $status);

    @@ -640,9 +693,23 @@

    $this->db->delete();

    $tables = array('table1', 'table2', 'table3');
    $this->db->where('id', '5');
    $this->db->delete($tables);

    -

    Note: All values are escaped automatically producing safer queries.

    - - +

    If you want to delete all data from a table, you can use the truncate() function, or empty_table().

    +

    $this->db->empty_table();

    +

    Generates a delete SQL string and runs the query. $this->db->empty_table('mytable');
    +
    +// Produces
    +// DELETE FROM mytable

    +

    $this->db->truncate();

    +

    Generates a truncate SQL string and runs the query.

    + $this->db->from('mytable');
    +$this->db->truncate();
    +// or
    +$this->db->truncate('mytable');
    +
    +// Produce:
    +// TRUNCATE mytable
    +     +

    Note: If the TRUNCATE command isn't available, truncate() will execute as "DELETE FROM table".

     

    Method Chaining

    diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index d2cbd9c8..11cc3f5c 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index f61b6f7e..6157acfa 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index b9b61d32..f6097f2b 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 04c0c2c4..96dd1f06 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 8989b961..bcda80f8 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 6dc4eeb8..ab092075 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html new file mode 100644 index 00000000..90991a9c --- /dev/null +++ b/user_guide/database/forge.html @@ -0,0 +1,221 @@ + + + + +CodeIgniter User Guide : Database Utility Class + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + +

    Database Forge Class

    + +

    The Database Forge Class contains functions that help you manage your database.

    + +

    Table of Contents

    + + + + +

    Initializing the Forge Class

    + +

    Important:  In order to initialize the Forge class, your database driver must +already be running, since the forge class relies on it.

    + +

    Load the Forge Class as follows:

    + +$this->load->dbforge() + +

    Once initialized you will access the functions using the $this->dbforge object:

    + +$this->dbforge->some_function() +

    $this->dbforge->create_database('db_name')

    + +

    Permits you to create the database specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    + +if ($this->dbutil->create_database('my_db'))
    +{
    +    echo 'Database created!';
    +}     + + + + +

    $this->dbforge->drop_database('db_name')

    + +

    Permits you to drop the database specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    + +if ($this->dbutil->drop_database('my_db'))
    +{
    +    echo 'Database deleted!';
    +}     + + +

    Creating and Dropping Tables

    +

    There are several things you may wish to do when creating tables. Add fields, add keys to the table, alter columns. CodeIgniter provides a mechanism for this.

    +

    Adding fields

    +

    Fields are created via an associative array. Within the array you must include a 'type' key that relates to the datatype of the field. For example, INT, VARCHAR, TEXT, etc. Many datatypes (for example VARCHAR) also require a 'constraint' key.

    +

    $fields = array(
    +                        'users' => array(
    +                                                  'type' => 'varchar',
    +                                                  'constraint' => '100',
    +                                           ),
    +                 );
    +
    +// will translate to "users VARCHAR(100)" when the field is added.

    +

    Additionally, the following key/values can be used:

    +
      +
    • unsigned/true : to generate "UNSIGNED" in the field definition
      • +
    • default/value : to generate a default value in the field definition
      • +
    • null/true : to generate "NULL" in the field definition. Without this, the field will default to "NOT NULL"
      • +
    • auto_increment/true : generates an auto_increment flag on the field. Note that the field type must
      • +
    +

    $fields = array(
    +                         'blog_id' => array(
    +                                                  'type' => 'INT',
    +                                                  'constraint' => 5,
    +                                                  'unsigned' => TRUE,
    +                                                  'auto_increment' => TRUE
    +                                           ),
    +                         'blog_title' => array(
    +                                                 'type' => 'VARCHAR',
    +                                                 'constraint' => '100',
    +                                          ),
    +                        'blog_author' => array(
    +                                                 'type' =>'VARCHAR',
    +                                                 'constraint' => '100',
    +                                                 'default' => 'King of Town',
    +                                          ),
    +                        'blog_description' => array(
    +                                                 'type' => 'TEXT',
    +                                                 'null' => TRUE,
    +                                          ),
    +                );
    + );

    +

    After the fields have been defined, they can be added using $this->dbforge->add_field($fields); followed by a call to the create_table() function.

    +

    $this->dbforge->add_field()

    +

    The add fields function will accept the above array.

    +

    Passing strings as fields

    +

    If you know exactly how you want a field to be created, you can pass the string into the field definitions with add_field()

    +

    $this->dbforge->add_field("label varchar(100) NOT NULL DEFAULT 'default label'");

    +

    Note: Multiple calls to add_field() are cumulative.

    +

    Creating an id field

    +

    There is a special exception for creating id fields. A field with type id will automatically be assinged as an INT(9) auto_incrementing Primary Key.

    +

    $this->dbforge->add_field('id');
    + // gives id INT(9) NOT NULL AUTO_INCREMENT

    +

    Adding Keys

    +

    Generally speaking, you'll want your table to have Keys. This is accomplished with $this->dbforge->add_key('field'). An optional second parameter set to TRUE will make it a primary key. Note that add_key() must be followed by a call to create_table().

    +

    $this->dbforge->add_key('blog_id', TRUE);
    + // gives PRIMARY KEY (blog_id)
    +
    + $this->dbforge->add_key('blog_name');
    + // gives KEY (blog_name)

    +

    Creating a table

    +

    After fields and keys have been declared, you can create a new table with

    +

    $this->dbforge->create_table('table_name')
    +// gives CREATE TABLE table_name

    +

    An optional second parameter set to TRUE adds an "IF NOT EXISTS" clause into the definition

    +

    $this->dbforge->create_table('table_name')
    +// gives CREATE TABLE IF NOT EXISTS table_name

    +

    Dropping a table

    +

    Executes a DROP TABLE sql

    +

    $this->dbforge->drop_table('table_name')
    +// gives DROP TABLE IF EXISTS table_name

    +

    Modifying Tables

    +

    $this->dbforge->add_column()

    +

    The add_column() function is used to modify an existing table. It accepts the same field array as above, and can be used for an unlimited number of additional fields.

    +

    $fields = array(
    +                         'preferences' => array('type' => 'TEXT')
    +);
    +$this->dbforge->add_column('table_name', $fields);
    +
    +// gives ALTER TABLE sites ADD preferences TEXT

    +

    $this->dbforge->drop_column()

    +

    Used to remove a column from a table.

    +

    $this->dbforge->drop_column('table_name', 'column_to_drop');

    +

    $this->dbforge->modify_column()

    +

    The usage of this function is identical to add_coumn(), except it alters an existing column rather than adding a new one. In order to use it you must add a "name" key into the field defining array.

    +

    $fields = array(
    +                        'old_name' => array(
    +                                                         'name' => 'new_name',
    +                                                         'type' => 'TEXT',
    +                                                ),
    +);
    +$this->dbforge->modify_column('sites', $fields);
    +
    + // gives ALTER TABLE sites CHANGE old_name new_name TEXT

    +

     

    +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 6db89e0c..93b9a6dd 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 7ad5ace4..d4319b91 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    @@ -75,7 +75,8 @@

    The Database Class

  • Field MetaData
  • Custom Function Calls
  • Query Caching
    • -
  • Database Utilities Class
    • +
  • Database manipulation with Database Forge
    • +
  • Database Utilities Class
    • diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index e1d346c3..3ff8cc70 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    @@ -80,8 +80,10 @@

    $this->db->simple_query();

    It simply lets you submit a query. Most users will rarely use this function.

    +

    Protecting identifiers

    +

    In many databases it is advisable to protect table and field names - for example with backticks in MySQL. Active Record queries are automatically protected, however if you need to manually protect an identifier you can use:

    +

    $this->db->protect_identifier('table_name');

    Escaping Queries

    -

    It's a very good security practice to escape your data before submitting it into your database. CodeIgniter has two functions that help you do this:

    diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 9ce6a310..31b07567 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 22e05c10..16c3bba9 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -1 +1,113 @@ - CodeIgniter User Guide : Table Data

    CodeIgniter User Guide Version 1.5.4

    Table Data

    These functions let you fetch table information.

    $this->db->list_tables();

    Returns an array containing the names of all the tables in the database you are currently connected to. Example:

    $tables = $this->db->list_tables();

    foreach ($tables as $table)
    {
       echo $table;
    }

    $this->db->table_exists();

    Sometimes it's helpful to know whether a particular table exists before running an operation on it. Returns a boolean TRUE/FALSE. Usage example:

    if ($this->db->table_exists('table_name'))
    {
       // some code...
    }

    Note: Replace table_name with the name of the table you are looking for.

    \ No newline at end of file + + + + +CodeIgniter User Guide : Table Data + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + + + +

    Table Data

    + +

    These functions let you fetch table information.

    + +

    $this->db->list_tables();

    + +

    Returns an array containing the names of all the tables in the database you are currently connected to. Example:

    + +$tables = $this->db->list_tables();
    +
    +foreach ($tables as $table)
    +{
    +   echo $table;
    +} +     + + +

    $this->db->table_exists();

    + +

    Sometimes it's helpful to know whether a particular table exists before running an operation on it. +Returns a boolean TRUE/FALSE. Usage example:

    + + +if ($this->db->table_exists('table_name'))
    +{
    +   // some code...
    +} +     + +

    Note: Replace table_name with the name of the table you are looking for.

    + + + + + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 8a9ac1b0..3adf0192 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 6b6956c8..cdf3f68f 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    @@ -65,8 +65,6 @@

    Table of Contents

    - -

    Initializing the Utility Class

    + +

    Initializing the Utility Class

    Important:  In order to initialize the Utility class, your database driver must already be running, since the utilities class relies on it.

    @@ -91,36 +89,9 @@

    Initializing the Utility Class

    $this->dbutil->some_function() - - - -

    $this->dbutil->create_database('db_name')

    - -

    Permits you to create the database specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    - -if ($this->dbutil->create_database('my_db'))
    -{
    -    echo 'Database created!';
    -}     - - - - -

    $this->dbutil->drop_database('db_name')

    - -

    Permits you to drop the database specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    - -if ($this->dbutil->drop_database('my_db'))
    -{
    -    echo 'Database deleted!';
    -}     - - - -

    $this->dbutil->list_databases()

    +

    $this->dbutil->list_databases()

    Returns an array of database names:

    - $dbs = $this->dbutil->list_databases();

    @@ -128,10 +99,7 @@

    $this->dbutil->list_databases()

    {
        echo $db;
    }     - - - -

    $this->dbutil->optimize_table('table_name');

    +

    $this->dbutil->optimize_table('table_name');

    Note:  This features is only available for MySQL/MySQLi databases.

    @@ -148,8 +116,7 @@

    $this->dbutil->optimize_table('table_name');

    Note: Not all database platforms support table optimization.

    - -

    $this->dbutil->repair_table('table_name');

    +

    $this->dbutil->repair_table('table_name');

    Note:  This features is only available for MySQL/MySQLi databases.

    @@ -166,8 +133,7 @@

    $this->dbutil->repair_table('table_name');

    Note: Not all database platforms support table repairs.

    - -

    $this->dbutil->optimize_database();

    +

    $this->dbutil->optimize_database();

    Note:  This features is only available for MySQL/MySQLi databases.

    @@ -185,8 +151,7 @@

    $this->dbutil->optimize_database();

    Note: Not all database platforms support table optimization.

    - -

    $this->dbutil->csv_from_result($db_result)

    +

    $this->dbutil->csv_from_result($db_result)

    Permits you to generate a CSV file from a query result. The first parameter of the function must contain the result object from your query. Example:

    @@ -213,8 +178,7 @@

    $this->dbutil->csv_from_result($db_result)

    If you need to write the file use the File Helper.

    - -

    $this->dbutil->xml_from_result($db_result)

    +

    $this->dbutil->xml_from_result($db_result)

    Permits you to generate an XML file from a query result. The first parameter expects a query result object, the second may contain an optional array of config parameters. Example:

    @@ -238,8 +202,7 @@

    $this->dbutil->xml_from_result($db_result)

    If you need to write the file use the File Helper.

    - -

    $this->dbutil->backup()

    +

    $this->dbutil->backup()

    Permits you to backup your full database or individual tables. The backup data can be compressed in either Zip or Gzip format.

    @@ -320,12 +283,11 @@

    Description of Backup Preferences

    diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index b5a9d695..1db17274 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 5398d85f..84869083 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 5af8be10..0ece5b01 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 959994f0..67b1dd85 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -1 +1,115 @@ - CodeIgniter User Guide : Web Page Caching

    CodeIgniter User Guide Version 1.5.4

    Web Page Caching

    CodeIgniter lets you cache your pages in order to achieve maximum performance.

    Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the server resources, memory, and processing cycles utilized, which affect your page load speeds. By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.

    How Does Caching Work?

    Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed. When a page is loaded for the first time, the cache file will be written to your system/cache folder. On subsequent page loads the cache file will be retrieved and sent to the requesting user's browser. If it has expired, it will be deleted and refreshed before being sent to the browser.

    Note: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled.

    Enabling Caching

    To enable caching, put the following tag in any of your controller functions:

    $this->output->cache(n);

    Where n is the number of minutes you wish the page to remain cached between refreshes.

    The above tag can go anywhere within a function. It is not affected by the order that it appears, so place it wherever it seems most logical to you. Once the tag is in place, your pages will begin being cached.

    Warning: Because of the way CodeIgniter stores content for output, caching will only work if you are generating display for your controller with a view.

    Note: Before the cache files can be written you must set the file permissions on your system/cache folder such that it is writable.

    Deleting Caches

    If you no longer wish to cache a file you can remove the caching tag and it will no longer be refreshed when it expires. Note: Removing the tag will not delete the cache immediately. It will have to expire normally. If you need to remove it earlier you will need to manually delete it from your cache folder.

    \ No newline at end of file + + + + +CodeIgniter User Guide : Web Page Caching + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Web Page Caching

    + +

    CodeIgniter lets you cache your pages in order to achieve maximum performance.

    + +

    Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the +server resources, memory, and processing cycles utilized, which affect your page load speeds. +By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.

    + + +

    How Does Caching Work?

    + +

    Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed. +When a page is loaded for the first time, the cache file will be written to your system/cache folder. On subsequent page loads the cache file will be retrieved +and sent to the requesting user's browser. If it has expired, it will be deleted and refreshed before being sent to the browser.

    + +

    Note: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled.

    + +

    Enabling Caching

    + +

    To enable caching, put the following tag in any of your controller functions:

    + +$this->output->cache(n); + +

    Where n is the number of minutes you wish the page to remain cached between refreshes.

    + +

    The above tag can go anywhere within a function. It is not affected by the order that it appears, so place it wherever it seems +most logical to you. Once the tag is in place, your pages will begin being cached.

    + +

    Warning: Because of the way CodeIgniter stores content for output, caching will only work if you are generating display for your controller with a view.

    +

    Note: Before the cache files can be written you must set the file permissions on your +system/cache folder such that it is writable.

    + +

    Deleting Caches

    + +

    If you no longer wish to cache a file you can remove the caching tag and it will no longer be refreshed when it expires. Note: +Removing the tag will not delete the cache immediately. It will have to expire normally. If you need to remove it earlier you +will need to manually delete it from your cache folder.

    + + + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index f9426212..b85c6e14 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 870ff8c3..b284e4f6 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index f5e12f8f..d489963b 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 99a670c8..48a705c5 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 6dc061f6..9da97b41 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 8c4f6957..0ac71075 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 96b6bc69..7e564bae 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/index.html b/user_guide/general/index.html index 40fb40d7..e5d0f110 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 3e2f9d35..24b47a5e 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index e22114ae..747b5f39 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 90f89553..cfeefaca 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 6fd75586..5b84d7a4 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 9eb6f1b4..ebcdb41b 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index d93d646c..b57673c5 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 74952d75..1849ddaa 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index f7f93c83..88e13ff6 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index 48d1b193..25f20a5d 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 843b6c58..8c9c6c8c 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 48c4a1ff..c8e3c672 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 1bcaf419..eba45738 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 136d475a..8dd8cc79 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 46307d18..f902592c 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 7b91d880..ea2612e2 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index d739778b..c3b35c56 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index dd644e54..55f13db0 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index da8337cb..646956cd 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 62c1f68f..bc9c8902 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 8dc3f006..564f4e6f 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index 41526906..2946641c 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index e19eaec5..917e0cc7 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 0c9f7b92..6032d68c 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 715c3df4..c9b86c82 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -1 +1,204 @@ - CodeIgniter User Guide : Smiley Helper

    CodeIgniter User Guide Version 1.5.4

    Smiley Helper

    The Smiley Helper file contains functions that let you manage smileys (emoticons).

    Loading this Helper

    This helper is loaded using the following code:

    $this->load->helper('smiley');

    Overview

    The Smiley helper has a renderer that takes plain text simileys, like :-) and turns them into a image representation, like smile!

    It also lets you display a set of smiley images that when clicked will be inserted into a form field. For example, if you have a blog that allows user commenting you can show the smileys next to the comment form. Your users can click a desired smiley and with the help of some JavaScript it will be placed into the form field.

    Clickable Smileys Tutorial

    Here is an example demonstrating how you might create a set of clickable smileys next to a form field. This example requires that you first download and install the smiley images, then create a controller and the View as described.

    Important: Before you begin, please download the smiley images and put them in a publicly accessible place on your server. This helper also assumes you have the smiley replacement array located at application/config/smileys.php

    The Controller

    In your application/controllers/ folder, create a file called smileys.php and place the code below in it.

    Important: Change the URL in the get_clickable_smileys() function below so that it points to your smiley folder.

    You'll notice that in addition to the smiley helper we are using the Table Class.

    In your application/views/ folder, create a file called smiley_view.php and place this code in it:

    When you have created the above controller and view, load it by visiting http://www.your=site.com/index.php/smileys/

    Function Reference

    get_clickable_smileys()

    Returns an array containing your smiley images wrapped in a cliackable link. You must supply the URL to your smiley folder via the first parameter:

    $image_array = get_clickable_smileys("http://www.your-site.com/images/smileys/");

    js_insert_smiley()

    Generates the JavaScript that allows the images to be clicked and inserted into a form field. The first parameter must contain the name of your form, the second parameter must contain the name of the form field. This function is designed to be placed into the <head> area of your web page.

    <?php echo js_insert_smiley('blog', 'comments'); ?>

    parse_smileys()

    Takes a string of text as input and replaces any contained plain text smileys into the image equivalent. The first parameter must contain your string, the second must contain the the URL to your smiley folder:

    $str = 'Here are some simileys: :-) ;-)'; $str = parse_smileys($str, "http://www.your-site.com/images/smileys/"); echo $str;
    \ No newline at end of file + + + + +CodeIgniter User Guide : Smiley Helper + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Smiley Helper

    + +

    The Smiley Helper file contains functions that let you manage smileys (emoticons).

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('smiley'); + +

    Overview

    + +

    The Smiley helper has a renderer that takes plain text simileys, like :-) and turns +them into a image representation, like smile!

    + +

    It also lets you display a set of smiley images that when clicked will be inserted into a form field. +For example, if you have a blog that allows user commenting you can show the smileys next to the comment form. +Your users can click a desired smiley and with the help of some JavaScript it will be placed into the form field.

    + + + +

    Clickable Smileys Tutorial

    + +

    Here is an example demonstrating how you might create a set of clickable smileys next to a form field. This example +requires that you first download and install the smiley images, then create a controller and the View as described.

    + +

    Important: Before you begin, please download the smiley images and put them in +a publicly accessible place on your server. This helper also assumes you have the smiley replacement array located at +application/config/smileys.php

    + + +

    The Controller

    + +

    In your application/controllers/ folder, create a file called smileys.php and place the code below in it.

    + +

    Important: Change the URL in the get_clickable_smileys() function below so that it points to +your smiley folder.

    + +

    You'll notice that in addition to the smiley helper we are using the Table Class.

    + + + +

    In your application/views/ folder, create a file called smiley_view.php and place this code in it:

    + + + + + +

    When you have created the above controller and view, load it by visiting http://www.your=site.com/index.php/smileys/

    + +

    Function Reference

    + + +

    get_clickable_smileys()

    + +

    Returns an array containing your smiley images wrapped in a cliackable link. You must supply the URL to your smiley folder +via the first parameter:

    + +$image_array = get_clickable_smileys("http://www.your-site.com/images/smileys/"); + + +

    js_insert_smiley()

    + +

    Generates the JavaScript that allows the images to be clicked and inserted into a form field. +The first parameter must contain the name of your form, the second parameter must contain the name of the +form field. This function is designed to be placed into the <head> area of your web page.

    + +<?php echo js_insert_smiley('blog', 'comments'); ?> + + +

    parse_smileys()

    + +

    Takes a string of text as input and replaces any contained plain text smileys into the image +equivalent. The first parameter must contain your string, the second must contain the the URL to your smiley folder:

    + + + +$str = 'Here are some simileys: :-) ;-)'; + +$str = parse_smileys($str, "http://www.your-site.com/images/smileys/"); + +echo $str; + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 554afc82..74be2306 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -1 +1,176 @@ - CodeIgniter User Guide : String Helper

    CodeIgniter User Guide Version 1.5.4

    String Helper

    The String Helper file contains functions that assist in working with strings.

    Loading this Helper

    This helper is loaded using the following code:

    $this->load->helper('string');

    The following functions are available:

    random_string()

    Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes.

    The first parameter specifies the type of string, the second parameter specifies the length. The following choices are available:

    • alnum:  Alpha-numeric string with lower and uppercase characters.
    • numeric:  Numeric string.
    • nozero:  Numeric string with no zeros.
    • unique:  Encrypted with MD5 and uniqid(). Note: The length parameter is not available for this type. Returns a fixed length 33 character string.

    Usage example:

    echo random_string('alnum', 16);

    alternator()

    Allows two or more items to be alternated between, when cycling through a loop. Example:

    for ($i = 0; $i < 10; $i++)
    {
        echo alternator('string one', 'string two');
    }

    You can add as many parameters as you want, and with each iteration of your loop the next item will be returned.

    for ($i = 0; $i < 10; $i++)
    {
        echo alternator('one', 'two', 'three', 'four', 'five');
    }

    Note: To use multiple separate calls to this function simply call the function with no arguments to re-initialize.

    repeater()

    Generates repeating copies of the data you submit. Example:

    $string = "\n";
    echo repeater($string, 30);

    The above would generate 30 newlines.

    reduce_double_slashes()

    Converts double slashes in a string to a single slash, except those found in http://. Example:

    $string = "http://www.example.com//index.php";
    echo reduce_double_slashes($string); // results in "http://www.example.com/index.php"

    trim_slashes()

    Removes any leading/trailing slashes from a string. Example:

    $string = "/this/that/theother/";
    echo trim_slashes($string); // results in this/that/theother

    reduce_multiples()

    Reduces multiple instances of a particular character occuring directly after each other. Example:

    $string="Fred, Bill,, Joe, Jimmy";
    $string=reduce_multiples($string,","); //results in "Fred, Bill, Joe, Jimmy"

    The function accepts the following parameters: reduce_multiples(string: text to search in, string: character to reduce, boolean: whether to remove the character from the front and end of the string) The first parameter contrains the string in which you want to reduce the multiplies. The second parameter contains the character you want to have reduced. The third parameter is False by default. If it it's to true it will remove occurences of the character at the beginning and the end of the string. Example: $string=",Fred, Bill,, Joe, Jimmy,";
    $string=reduce_multiples($string,",",true); //results in "Fred, Bill, Joe, Jimmy"

    quotes_to_entities()

    Converts single and double quotes in a string to the corresponding HTML entities. Example:

    $string="Joe's \"dinner\"";
    $string=quotes_to_entities($string); //results in "Joe&#39;s &quot;dinner&quot;"

    strip_quotes()

    Removes single and double quotes from a string. Example:

    $string="Joe's \"dinner\"";
    $string=strip_quotes($string); //results in "Joes dinner"
    \ No newline at end of file + + + + +CodeIgniter User Guide : String Helper + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    String Helper

    + +

    The String Helper file contains functions that assist in working with strings.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('string'); + +

    The following functions are available:

    + +

    random_string()

    + +

    Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes.

    + +

    The first parameter specifies the type of string, the second parameter specifies the length. The following choices are available:

    + + +
      +
    • alnum:  Alpha-numeric string with lower and uppercase characters.
      • +
    • numeric:  Numeric string.
      • +
    • nozero:  Numeric string with no zeros.
      • +
    • unique:  Encrypted with MD5 and uniqid(). Note: The length parameter is not available for this type. +Returns a fixed length 33 character string.
      • +
    + +

    Usage example:

    + +echo random_string('alnum', 16); + + +

    alternator()

    + +

    Allows two or more items to be alternated between, when cycling through a loop. Example:

    + +for ($i = 0; $i < 10; $i++)
    +{
    +    echo alternator('string one', 'string two');
    +}
    +     + +

    You can add as many parameters as you want, and with each iteration of your loop the next item will be returned.

    + +for ($i = 0; $i < 10; $i++)
    +{
    +    echo alternator('one', 'two', 'three', 'four', 'five');
    +}
    +     + +

    Note: To use multiple separate calls to this function simply call the function with no arguments to re-initialize.

    + + + +

    repeater()

    +

    Generates repeating copies of the data you submit. Example:

    +$string = "\n";
    +echo repeater($string, 30);     + +

    The above would generate 30 newlines.

    +

    reduce_double_slashes()

    +

    Converts double slashes in a string to a single slash, except those found in http://. Example:

    +$string = "http://www.example.com//index.php";
    +echo reduce_double_slashes($string); // results in "http://www.example.com/index.php"     +

    trim_slashes()

    +

    Removes any leading/trailing slashes from a string. Example:
    +
    + $string = "/this/that/theother/";
    +echo trim_slashes($string); // results in this/that/theother

    + + +

    reduce_multiples()

    +

    Reduces multiple instances of a particular character occuring directly after each other. Example:

    + +$string="Fred, Bill,, Joe, Jimmy";
    +$string=reduce_multiples($string,","); //results in "Fred, Bill, Joe, Jimmy" +     +

    The function accepts the following parameters: +reduce_multiples(string: text to search in, string: character to reduce, boolean: whether to remove the character from the front and end of the string) + +The first parameter contrains the string in which you want to reduce the multiplies. The second parameter contains the character you want to have reduced. +The third parameter is False by default. If it it's to true it will remove occurences of the character at the beginning and the end of the string. Example: + + +$string=",Fred, Bill,, Joe, Jimmy,";
    +$string=reduce_multiples($string,",",true); //results in "Fred, Bill, Joe, Jimmy" +     +

    + +

    quotes_to_entities()

    +

    Converts single and double quotes in a string to the corresponding HTML entities. Example:

    +$string="Joe's \"dinner\"";
    +$string=quotes_to_entities($string); //results in "Joe&#39;s &quot;dinner&quot;" +     + +

    strip_quotes()

    +

    Removes single and double quotes from a string. Example:

    +$string="Joe's \"dinner\"";
    +$string=strip_quotes($string); //results in "Joes dinner" +     + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 7a83d8f9..217689c4 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 686f5c23..e3d18f8f 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index f2c45c34..854d06a2 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 6336eec5..47082a59 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/index.html b/user_guide/index.html index e944de71..69c90fc0 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index f93b8977..1104f8ba 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 299f73e8..c31c6615 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 40b7e36c..ceff6a52 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 0c251cb8..ee4b1b21 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index 7a296def..9a5f7d72 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index f74eadc0..0edef1d5 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 628ce9b3..e3cd1abf 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 3aa8a633..ece73a58 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index bc5fab1f..04e68f35 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 69867888..ff4bcc39 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 6b15a8e8..9a3e801e 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 7a3e8955..22d8d288 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 7c455422..54dabda3 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 8b94fdf7..c1c90b33 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html new file mode 100644 index 00000000..9aa15b2e --- /dev/null +++ b/user_guide/installation/upgrade_160.html @@ -0,0 +1,108 @@ + + + + +CodeIgniter User Guide : Upgrading from 1.5.3 to 1.5.4 + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.5.4 to 1.6.0

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • system/codeigniter
      • +
    • system/database
      • +
    • system/helpers
      • +
    • system/libraries
      • +
    • system/plugins
      • +
    • system/language
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +

    Step 2: Add time_to_update to your config.php

    +

    Add the following to system/application/config/config.php with the other session configuration options

    +

    $config['sess_time_to_update'] = 300;

    + +

    Step 3: Add to your database.php

    +

    Add the following to system/application/config/database.php with the other database configuration options

    +

    $db['default']['char_set'] = "utf8";
    +$db['default']['dbcollat'] = "utf8_general_ci";

    + +

    Step 4: Update your user guide

    +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 7253e4fc..a57d5529 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 6546a5bb..ecc00b2f 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index f17554e0..af83f8e5 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index ae6c571a..698df01c 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 3eec0a02..67352adc 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 527c34a4..c59374ca 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -1 +1,299 @@ - CodeIgniter User Guide : Email Class

    CodeIgniter User Guide Version 1.5.4

    Email Class

    CodeIgniter's robust Email Class supports the following features:

    • Multiple Protocols: Mail, Sendmail, and SMTP
    • Multiple recipients
    • CC and BCCs
    • HTML or Plaintext email
    • Attachments
    • Word wrapping
    • Priorities
    • BCC Batch Mode, enabling large email lists to be broken into small BCC batches.
    • Email Debugging tools

    Sending Email

    Sending email is not only simple, but you can configure it on the fly or set your preferences in a config file.

    Here is a basic example demonstrating how you might send email. Note: This example assumes you are sending the email from one of your controllers.

    $this->load->library('email');

    $this->email->from('your@your-site.com', 'Your Name');
    $this->email->to('someone@example.com');
    $this->email->cc('another@another-example.com');
    $this->email->bcc('them@their-example.com');

    $this->email->subject('Email Test');
    $this->email->message('Testing the email class.');

    $this->email->send();

    echo $this->email->print_debugger();

    Setting Email Preferences

    There are 17 different preferences available to tailor how your email messages are sent. You can either set them manually as described here, or automatically via preferences stored in your config file, described below:

    Preferences are set by passing an array of preference values to the email initialize function. Here is an example of how you might set some preferences:

    $config['protocol'] = 'sendmail';
    $config['mailpath'] = '/usr/sbin/sendmail';
    $config['charset'] = 'iso-8859-1';
    $config['wordwrap'] = TRUE;

    $this->email->initialize($config);

    Note: Most of the preferences have default values that will be used if you do not set them.

    Setting Email Preferences in a Config File

    If you prefer not to set preferences using the above method, you can instead put them into a config file. Simply create a new file called the email.php, add the $config array in that file. Then save the file at config/email.php and it will be used automatically. You will NOT need to use the $this->email->initialize() function if you save your preferences in a config file.

    Email Preferences

    The following is a list of all the preferences that can be set when sending email.

    Preference Default Value Options Description
    useragentCodeIgniterNoneThe "user agent".
    protocolmailmail, sendmail, or smtpThe mail sending protocol.
    mailpath/usr/sbin/sendmailNoneThe server path to Sendmail.
    smtp_hostNo DefaultNoneSMTP Server Address.
    smtp_userNo DefaultNoneSMTP Username.
    smtp_passNo DefaultNoneSMTP Password.
    smtp_port25NoneSMTP Port.
    smtp_timeout5NoneSMTP Timeout (in seconds).
    wordwrapTRUETRUE or FALSE (boolean)Enable word-wrap.
    wrapchars76 Character count to wrap at.
    mailtypetexttext or htmlType of mail. If you send HTML email you must send it as a complete web page. Make sure you don't have any relative links or relative image paths otherwise they will not work.
    charsetutf-8Character set (utf-8, iso-8859-1, etc.).
    validateFALSETRUE or FALSE (boolean)Whether to validate the email address.
    priority31, 2, 3, 4, 5Email Priority. 1 = highest. 5 = lowest. 3 = normal.
    newline\n"\r\n" or "\n"Newline character. (Use "\r\n" to comply with RFC 822).
    bcc_batch_modeFALSETRUE or FALSE (boolean)Enable BCC Batch Mode.
    bcc_batch_size200NoneNumber of emails in each BCC batch.

    Email Function Reference

    $this->email->from()

    Sets the email address and name of the person sending the email:

    $this->email->from('you@your-site.com', 'Your Name');

    $this->email->reply_to()

    Sets the reply-to address. If the information is not provided the information in the "from" function is used. Example:

    $this->email->reply_to('you@your-site.com', 'Your Name');

    $this->email->to()

    Sets the email address(s) of the recipient(s). Can be a single email, a comma-delimited list or an array:

    $this->email->to('someone@example.com'); $this->email->to('one@example.com, two@example.com, three@example.com'); $list = array('one@example.com', 'two@example.com', 'three@example.com');

    $this->email->to($list);

    $this->email->cc()

    Sets the CC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

    $this->email->bcc()

    Sets the BCC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

    $this->email->subject()

    Sets the email subject:

    $this->email->subject('This is my subject');

    $this->email->message()

    Sets the email message body:

    $this->email->message('This is my message');

    $this->email->set_alt_message()

    Sets the alternative email message body:

    $this->email->set_alt_message('This is the alternative message');

    This is an optional message string which can be used if you send HTML formatted email. It lets you specify an alternative message with no HTML formatting which is added to the header string for people who do not accept HTML email. If you do not set your own message CodeIgniter will extract the message from your HTML email and strip the tags.

    $this->email->clear()

    Initializes all the email variables to an empty state. This function is intended for use if you run the email sending function in a loop, permitting the data to be reset between cycles.

    foreach ($list as $name => $address)
    {
        $this->email->clear();

        $this->email->to($address);
        $this->email->from('your@your-site.com');
        $this->email->subject('Here is your info '.$name);
        $this->email->message('Hi '.$name.' Here is the info you requested.');
        $this->email->send();
    }

    If you set the parameter to TRUE any attachments will be cleared as well:

    $this->email->clear(TRUE);

    $this->email->send()

    The Email sending function. Returns boolean TRUE or FALSE based on success or failure, enabling it to be used conditionally:

    if ( ! $this->email->send())
    {
        // Generate error
    }

    $this->email->attach()

    Enables you to send an attachment. Put the file path/name in the first parameter. Note: Use a file path, not a URL. For multiple attachments use the function multiple times. For example:

    $this->email->attach('/path/to/photo1.jpg');
    $this->email->attach('/path/to/photo2.jpg');
    $this->email->attach('/path/to/photo3.jpg');

    $this->email->send();

    $this->email->print_debugger()

    Returns a string containing any server messages, the email headers, and the email messsage. Useful for debugging.

    Overriding Word Wrapping

    If you have word wrapping enabled (recommended to comply with RFC 822) and you have a very long link in your email it can get wrapped too, causing it to become un-clickable by the person receiving it. CodeIgniter lets you manually override word wrapping within part of your message like this:

    The text of your email that
    gets wrapped normally.

    {unwrap}http://www.example.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}

    More text that will be
    wrapped normally.

    Place the item you do not want word-wrapped between: {unwrap} {/unwrap}

    \ No newline at end of file + + + + +CodeIgniter User Guide : Email Class + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Email Class

    + +

    CodeIgniter's robust Email Class supports the following features:

    + + +
      +
    • Multiple Protocols: Mail, Sendmail, and SMTP
      • +
    • Multiple recipients
      • +
    • CC and BCCs
      • +
    • HTML or Plaintext email
      • +
    • Attachments
      • +
    • Word wrapping
      • +
    • Priorities
      • +
    • BCC Batch Mode, enabling large email lists to be broken into small BCC batches.
      • +
    • Email Debugging tools
      • +
    + + +

    Sending Email

    + +

    Sending email is not only simple, but you can configure it on the fly or set your preferences in a config file.

    + +

    Here is a basic example demonstrating how you might send email. Note: This example assumes you are sending the email from one of your +controllers.

    + +$this->load->library('email');
    +
    +$this->email->from('your@your-site.com', 'Your Name');
    +$this->email->to('someone@example.com');
    +$this->email->cc('another@another-example.com');
    +$this->email->bcc('them@their-example.com');
    +
    +$this->email->subject('Email Test');
    +$this->email->message('Testing the email class.');
    +
    +$this->email->send();
    +
    +echo $this->email->print_debugger();     + + + + +

    Setting Email Preferences

    + +

    There are 17 different preferences available to tailor how your email messages are sent. You can either set them manually +as described here, or automatically via preferences stored in your config file, described below:

    + +

    Preferences are set by passing an array of preference values to the email initialize function. Here is an example of how you might set some preferences:

    + +$config['protocol'] = 'sendmail';
    +$config['mailpath'] = '/usr/sbin/sendmail';
    +$config['charset'] = 'iso-8859-1';
    +$config['wordwrap'] = TRUE;
    +
    +$this->email->initialize($config);     + +

    Note: Most of the preferences have default values that will be used if you do not set them.

    Setting Email Preferences in a Config File

    + +

    If you prefer not to set preferences using the above method, you can instead put them into a config file. +Simply create a new file called the email.php, add the $config +array in that file. Then save the file at config/email.php and it will be used automatically. You +will NOT need to use the $this->email->initialize() function if you save your preferences in a config file.

    + + + + +

    Email Preferences

    + +

    The following is a list of all the preferences that can be set when sending email.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescription
    useragentCodeIgniterNoneThe "user agent".
    protocolmailmail, sendmail, or smtpThe mail sending protocol.
    mailpath/usr/sbin/sendmailNoneThe server path to Sendmail.
    smtp_hostNo DefaultNoneSMTP Server Address.
    smtp_userNo DefaultNoneSMTP Username.
    smtp_passNo DefaultNoneSMTP Password.
    smtp_port25NoneSMTP Port.
    smtp_timeout5NoneSMTP Timeout (in seconds).
    wordwrapTRUETRUE or FALSE (boolean)Enable word-wrap.
    wrapchars76 Character count to wrap at.
    mailtypetexttext or htmlType of mail. If you send HTML email you must send it as a complete web page. Make sure you don't have any relative links or relative image paths otherwise they will not work.
    charsetutf-8Character set (utf-8, iso-8859-1, etc.).
    validateFALSETRUE or FALSE (boolean)Whether to validate the email address.
    priority31, 2, 3, 4, 5Email Priority. 1 = highest. 5 = lowest. 3 = normal.
    newline\n"\r\n" or "\n"Newline character. (Use "\r\n" to comply with RFC 822).
    bcc_batch_modeFALSETRUE or FALSE (boolean)Enable BCC Batch Mode.
    bcc_batch_size200NoneNumber of emails in each BCC batch.
    + + +

    Email Function Reference

    + +

    $this->email->from()

    +

    Sets the email address and name of the person sending the email:

    +$this->email->from('you@your-site.com', 'Your Name'); + +

    $this->email->reply_to()

    +

    Sets the reply-to address. If the information is not provided the information in the "from" function is used. Example:

    +$this->email->reply_to('you@your-site.com', 'Your Name'); + + +

    $this->email->to()

    +

    Sets the email address(s) of the recipient(s). Can be a single email, a comma-delimited list or an array:

    + +$this->email->to('someone@example.com'); +$this->email->to('one@example.com, two@example.com, three@example.com'); + +$list = array('one@example.com', 'two@example.com', 'three@example.com');
    +
    +$this->email->to($list);     + +

    $this->email->cc()

    +

    Sets the CC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

    + +

    $this->email->bcc()

    +

    Sets the BCC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

    + + +

    $this->email->subject()

    +

    Sets the email subject:

    +$this->email->subject('This is my subject'); + +

    $this->email->message()

    +

    Sets the email message body:

    +$this->email->message('This is my message'); + +

    $this->email->set_alt_message()

    +

    Sets the alternative email message body:

    +$this->email->set_alt_message('This is the alternative message'); + +

    This is an optional message string which can be used if you send HTML formatted email. It lets you specify an alternative +message with no HTML formatting which is added to the header string for people who do not accept HTML email. +If you do not set your own message CodeIgniter will extract the message from your HTML email and strip the tags.

    + + + +

    $this->email->clear()

    +

    Initializes all the email variables to an empty state. This function is intended for use if you run the email sending function +in a loop, permitting the data to be reset between cycles.

    +foreach ($list as $name => $address)
    +{
    +    $this->email->clear();

    + +    $this->email->to($address);
    +    $this->email->from('your@your-site.com');
    +    $this->email->subject('Here is your info '.$name);
    +    $this->email->message('Hi '.$name.' Here is the info you requested.');
    +    $this->email->send();
    +}     + +

    If you set the parameter to TRUE any attachments will be cleared as well:

    + +$this->email->clear(TRUE); + + +

    $this->email->send()

    +

    The Email sending function. Returns boolean TRUE or FALSE based on success or failure, enabling it to be used +conditionally:

    + +if ( ! $this->email->send())
    +{
    +    // Generate error
    +}     + + +

    $this->email->attach()

    +

    Enables you to send an attachment. Put the file path/name in the first parameter. Note: Use a file path, not a URL. +For multiple attachments use the function multiple times. For example:

    + +$this->email->attach('/path/to/photo1.jpg');
    +$this->email->attach('/path/to/photo2.jpg');
    +$this->email->attach('/path/to/photo3.jpg');
    +
    +$this->email->send();     + + +

    $this->email->print_debugger()

    +

    Returns a string containing any server messages, the email headers, and the email messsage. Useful for debugging.

    + + +

    Overriding Word Wrapping

    + +

    If you have word wrapping enabled (recommended to comply with RFC 822) and you have a very long link in your email it can +get wrapped too, causing it to become un-clickable by the person receiving it. CodeIgniter lets you manually override +word wrapping within part of your message like this:

    + +The text of your email that
    +gets wrapped normally.
    +
    +{unwrap}http://www.example.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}
    +
    +More text that will be
    +wrapped normally.     + +

    Place the item you do not want word-wrapped between: {unwrap} {/unwrap}

    + + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index ab6195cb..f3b3d440 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 86ee0cc8..46865aca 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index b88b640a..58581196 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 83dc8b3c..39c1bd27 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index de623c07..2bca88ae 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 7883e2a0..3ee62008 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 7ff597c6..6aec87c1 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 27a458a8..2d131956 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index d18d364f..e05a6e88 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index a5271dea..dab6937e 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 0e627d12..93eb38dd 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -1 +1,292 @@ - CodeIgniter User Guide : HTML Table Class

    CodeIgniter User Guide Version 1.5.4

    HTML Table Class

    The Table Class provides functions that enable you to auto-generate HTML tables from arrays or database result sets.

    Initializing the Class

    Like most other classes in CodeIgniter, the Table class is initialized in your controller using the $this->load->library function:

    $this->load->library('table');

    Once loaded, the Table library object will be available using: $this->table

    Examples

    Here is an example showing how you can create a table from a multi-dimensional array. Note that the first array index will become the table heading (or you can set your own headings using the set_heading() function described in the function reference below).

    $this->load->library('table');

    $data = array(
                 array('Name', 'Color', 'Size'),
                 array('Fred', 'Blue', 'Small'),
                 array('Mary', 'Red', 'Large'),
                 array('John', 'Green', 'Medium')
                 );

    echo $this->table->generate($data);

    Here is an example of a table created from a database query result. The table class will automatically generate the headings based on the table names (or you can set your own headings using the set_heading() function described in the function reference below).

    $this->load->library('table');

    $query = $this->db->query("SELECT * FROM my_table");

    echo $this->table->generate($query);

    Here is an example showing how you might create a table using discreet parameters:

    $this->load->library('table');

    $this->table->set_heading('Name', 'Color', 'Size');

    $this->table->add_row('Fred', 'Blue', 'Small');
    $this->table->add_row('Mary', 'Red', 'Large');
    $this->table->add_row('John', 'Green', 'Medium');

    echo $this->table->generate();

    Here is the same example, except instead of individual parameters, arrays are used:

    $this->load->library('table');

    $this->table->set_heading(array('Name', 'Color', 'Size'));

    $this->table->add_row(array('Fred', 'Blue', 'Small'));
    $this->table->add_row(array('Mary', 'Red', 'Large'));
    $this->table->add_row(array('John', 'Green', 'Medium'));

    echo $this->table->generate();

    Changing the Look of Your Table

    The Table Class permits you to set a table template with which you can specify the design of your layout. Here is the template prototype:

    $tmpl = array (
                        'table_open'          => '<table border="0" cellpadding="4" cellspacing="0">',

                        'heading_row_start'   => '<tr>',
                        'heading_row_end'     => '</tr>',
                        'heading_cell_start'  => '<th>',
                        'heading_cell_end'    => '</th>',

                        'row_start'           => '<tr>',
                        'row_end'             => '</tr>',
                        'cell_start'          => '<td>',
                        'cell_end'            => '</td>',

                        'row_alt_start'       => '<tr>',
                        'row_alt_end'         => '</tr>',
                        'cell_alt_start'      => '<td>',
                        'cell_alt_end'        => '</td>',

                        'table_close'         => '</table>'
                  );

    $this->table->set_template($tmpl);

    Note:  You'll notice there are two sets of "row" blocks in the template. These permit you to create alternating row colors or design elements that alternate with each iteration of the row data.

    You are NOT required to submit a complete template. If you only need to change parts of the layout you can simply submit those elements. In this example, only the table opening tag is being changed:

    $tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );

    $this->table->set_template($tmpl);

    Function Reference

    $this->table->generate()

    Returns a string containing the generated table. Accepts an optional parameter which can be an array or a database result object.

    $this->table->set_caption()

    Permits you to add a caption to the table.

    $this->table->set_caption('Colors');

    $this->table->set_heading()

    Permits you to set the table heading. You can submit an array or discreet params:

    $this->table->set_heading('Name', 'Color', 'Size'); $this->table->set_heading(array('Name', 'Color', 'Size'));

    $this->table->add_row()

    Permits you to add a row to your table. You can submit an array or discreet params:

    $this->table->add_row('Blue', 'Red', 'Green'); $this->table->add_row(array('Blue', 'Red', 'Green'));

    $this->table->make_columns()

    This function takes a one-dimensional array as input and creates a multi-dimensional array with a depth equal to the number of columns desired. This allows a single array with many elements to be displayed in a table that has a fixed column count. Consider this example:

    $list = array('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve');

    $new_list = $this->table->make_columns($list, 3);

    $this->table->generate($new_list);

    // Generates a table with this prototype

    <table border="0" cellpadding="4" cellspacing="0">
    <tr>
    <td>one</td><td>two</td><td>three</td>
    </tr><tr>
    <td>four</td><td>five</td><td>six</td>
    </tr><tr>
    <td>seven</td><td>eight</td><td>nine</td>
    </tr><tr>
    <td>ten</td><td>eleven</td><td>twelve</td></tr>
    </table>

    $this->table->set_template()

    Permits you to set your template. You can submit a full or partial template.

    $tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );

    $this->table->set_template($tmpl);

    $this->table->set_empty()

    Let's you set a default value for use in any table cells that are empty. You might, for example, set a non-breaking space:

    $this->table->set_empty("&nbsp;");

    $this->table->clear()

    Lets you clear the table heading and row data. If you need to show multiple tables with different data you should to call this function after each table has been generated to empty the previous table information. Example:

    $this->load->library('table');

    $this->table->set_heading('Name', 'Color', 'Size');
    $this->table->add_row('Fred', 'Blue', 'Small');
    $this->table->add_row('Mary', 'Red', 'Large');
    $this->table->add_row('John', 'Green', 'Medium');

    echo $this->table->generate();

    $this->table->clear();

    $this->table->set_heading('Name', 'Day', 'Delivery');
    $this->table->add_row('Fred', 'Wednesday', 'Express');
    $this->table->add_row('Mary', 'Monday', 'Air');
    $this->table->add_row('John', 'Saturday', 'Overnight');

    echo $this->table->generate();
    \ No newline at end of file + + + + +CodeIgniter User Guide : HTML Table Class + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    HTML Table Class

    + +

    The Table Class provides functions that enable you to auto-generate HTML tables from arrays or database result sets.

    + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the Table class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('table'); +

    Once loaded, the Table library object will be available using: $this->table

    + + +

    Examples

    + +

    Here is an example showing how you can create a table from a multi-dimensional array. +Note that the first array index will become the table heading (or you can set your own headings using the +set_heading() function described in the function reference below).

    + + +$this->load->library('table');
    +
    +$data = array(
    +             array('Name', 'Color', 'Size'),
    +             array('Fred', 'Blue', 'Small'),
    +             array('Mary', 'Red', 'Large'),
    +             array('John', 'Green', 'Medium')
    +             );
    +
    +echo $this->table->generate($data); +     + +

    Here is an example of a table created from a database query result. The table class will automatically generate the +headings based on the table names (or you can set your own headings using the set_heading() function described +in the function reference below).

    + + +$this->load->library('table');
    +
    +$query = $this->db->query("SELECT * FROM my_table");
    +
    +echo $this->table->generate($query); +     + + +

    Here is an example showing how you might create a table using discreet parameters:

    + + +$this->load->library('table');
    +
    +$this->table->set_heading('Name', 'Color', 'Size');
    +
    +$this->table->add_row('Fred', 'Blue', 'Small');
    +$this->table->add_row('Mary', 'Red', 'Large');
    +$this->table->add_row('John', 'Green', 'Medium');
    +
    +echo $this->table->generate(); +     + +

    Here is the same example, except instead of individual parameters, arrays are used:

    + + +$this->load->library('table');
    +
    +$this->table->set_heading(array('Name', 'Color', 'Size'));
    +
    +$this->table->add_row(array('Fred', 'Blue', 'Small'));
    +$this->table->add_row(array('Mary', 'Red', 'Large'));
    +$this->table->add_row(array('John', 'Green', 'Medium'));
    +
    +echo $this->table->generate(); +     + + +

    Changing the Look of Your Table

    + +

    The Table Class permits you to set a table template with which you can specify the design of your layout. Here is the template +prototype:

    + + +$tmpl = array (
    +                    'table_open'          => '<table border="0" cellpadding="4" cellspacing="0">',
    +
    +                    'heading_row_start'   => '<tr>',
    +                    'heading_row_end'     => '</tr>',
    +                    'heading_cell_start'  => '<th>',
    +                    'heading_cell_end'    => '</th>',
    +
    +                    'row_start'           => '<tr>',
    +                    'row_end'             => '</tr>',
    +                    'cell_start'          => '<td>',
    +                    'cell_end'            => '</td>',
    +
    +                    'row_alt_start'       => '<tr>',
    +                    'row_alt_end'         => '</tr>',
    +                    'cell_alt_start'      => '<td>',
    +                    'cell_alt_end'        => '</td>',
    +
    +                    'table_close'         => '</table>'
    +              );
    + +
    +$this->table->set_template($tmpl); +     + +

    Note:  You'll notice there are two sets of "row" blocks in the template. These permit you to create alternating row colors or design elements that alternate with each +iteration of the row data.

    + +

    You are NOT required to submit a complete template. If you only need to change parts of the layout you can simply submit those elements. +In this example, only the table opening tag is being changed:

    + + +$tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );
    + +
    +$this->table->set_template($tmpl); +     + +
    +

    Function Reference

    + +

    $this->table->generate()

    +

    Returns a string containing the generated table. Accepts an optional parameter which can be an array or a database result object.

    + +

    $this->table->set_caption()

    + +

    Permits you to add a caption to the table.

    + +$this->table->set_caption('Colors'); + +

    $this->table->set_heading()

    + +

    Permits you to set the table heading. You can submit an array or discreet params:

    + +$this->table->set_heading('Name', 'Color', 'Size'); +$this->table->set_heading(array('Name', 'Color', 'Size')); + +

    $this->table->add_row()

    + +

    Permits you to add a row to your table. You can submit an array or discreet params:

    + +$this->table->add_row('Blue', 'Red', 'Green'); +$this->table->add_row(array('Blue', 'Red', 'Green')); + + +

    $this->table->make_columns()

    + +

    This function takes a one-dimensional array as input and creates +a multi-dimensional array with a depth equal to the number of +columns desired. This allows a single array with many elements to be +displayed in a table that has a fixed column count. Consider this example:

    + + +$list = array('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve');
    +
    +$new_list = $this->table->make_columns($list, 3);
    +
    +$this->table->generate($new_list);
    +
    +// Generates a table with this prototype
    +
    +<table border="0" cellpadding="4" cellspacing="0">
    +<tr>
    +<td>one</td><td>two</td><td>three</td>
    +</tr><tr>
    +<td>four</td><td>five</td><td>six</td>
    +</tr><tr>
    +<td>seven</td><td>eight</td><td>nine</td>
    +</tr><tr>
    +<td>ten</td><td>eleven</td><td>twelve</td></tr>
    +</table>     + + + +

    $this->table->set_template()

    + +

    Permits you to set your template. You can submit a full or partial template.

    + + +$tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );
    + +
    +$this->table->set_template($tmpl); +     + + +

    $this->table->set_empty()

    + +

    Let's you set a default value for use in any table cells that are empty. You might, for example, set a non-breaking space:

    + + +$this->table->set_empty("&nbsp;"); + + +

    $this->table->clear()

    + +

    Lets you clear the table heading and row data. If you need to show multiple tables with different data you should +to call this function after each table has been generated to empty the previous table information. Example:

    + + +$this->load->library('table');
    +
    +$this->table->set_heading('Name', 'Color', 'Size');
    +$this->table->add_row('Fred', 'Blue', 'Small');
    +$this->table->add_row('Mary', 'Red', 'Large');
    +$this->table->add_row('John', 'Green', 'Medium');
    +
    +echo $this->table->generate();
    +
    +$this->table->clear();
    +
    +$this->table->set_heading('Name', 'Day', 'Delivery');
    +$this->table->add_row('Fred', 'Wednesday', 'Express');
    +$this->table->add_row('Mary', 'Monday', 'Air');
    +$this->table->add_row('John', 'Saturday', 'Overnight');
    +
    +echo $this->table->generate(); +     + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index a971cb0c..096e16ac 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index e2f1d114..1f37649c 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 4b71480b..2306d82a 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -1 +1,252 @@ - CodeIgniter User Guide : URI Class

    CodeIgniter User Guide Version 1.5.4

    URI Class

    The URI Class provides functions that help you retrieve information from your URI strings. If you use URI routing, you can also retrieve information about the re-routed segments.

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    $this->uri->segment(n)

    Permits you to retrieve a specific segment. Where n is the segment number you wish to retrieve. Segments are numbered from left to right. For example, if your full URL is this:

    http://www.your-site.com/index.php/news/local/metro/crime_is_up

    The segment numbers would be this:

    1. news
    2. local
    3. metro
    4. crime_is_up

    By default the function returns FALSE (boolean) if the segment does not exist. There is an optional second parameter that permits you to set your own default value if the segment is missing. For example, this would tell the function to return the number zero in the event of failure:

    $product_id = $this->uri->segment(3, 0);

    It helps avoid having to write code like this:

    if ($this->uri->segment(3) === FALSE)
    {
        $product_id = 0;
    }
    else
    {
        $product_id = $this->uri->segment(3);
    }

    $this->uri->rsegment(n)

    This function is identical to the previous one, except that it lets you retrieve a specific segment from your re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->slash_segment(n)

    This function is almost identical to $this->uri->segment(), except it adds a trailing and/or leading slash based on the second parameter. If the parameter is not used, a trailing slash added. Examples:

    $this->uri->slash_segment(3);
    $this->uri->slash_segment(3, 'leading');
    $this->uri->slash_segment(3, 'both');

    Returns:

    1. segment/
    2. /segment
    3. /segment/

    $this->uri->slash_rsegment(n)

    This function is identical to the previous one, except that it lets you add slashes a specific segment from your re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->uri_to_assoc(n)

    This function lets you turn URI segments into and associative array of key/value pairs. Consider this URI:

    index.php/user/search/name/joe/location/UK/gender/male

    Using this function you can turn the URI into an associative array with this prototype:

    [array]
    (
        'name' => 'joe'
        'location' => 'UK'
        'gender' => 'male'
    )

    The first parameter of the function lets you set an offset. By default it is set to 3 since your URI will normally contain a controller/function in the first and second segments. Example:

    $array = $this->uri->uri_to_assoc(3);

    echo $array['name'];

    The second parameter lets you set default key names, so that the array returned by the function will always contain expected indexes, even if missing from the URI. Example:

    $default = array('name', 'gender', 'location', 'type', 'sort');

    $array = $this->uri->uri_to_assoc(3, $default);

    If the URI does not contain a value in your default, an array index will be set to that name, with a value of FALSE.

    Lastly, if a corresponding value is not found for a given key (if there is an odd number of URI segments) the value will be set to FALSE (boolean).

    $this->uri->ruri_to_assoc(n)

    This function is identical to the previous one, except that it creates an associative array using the re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->assoc_to_uri()

    Takes an associative array as input and generates a URI string from it. The array keys will be included in the string. Example:

    $array = array('product' => 'shoes', 'size' => 'large', 'color' => 'red');

    $str = $this->uri->assoc_to_uri($array);

    // Produces: product/shoes/size/large/color/red

    $this->uri->uri_string()

    Returns a string with the complete URI. For example, if this is your full URL:

    http://www.your-site.com/index.php/news/local/345

    The function would return this:

    /news/local/345

    $this->uri->ruri_string(n)

    This function is identical to the previous one, except that it returns the re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->total_segments()

    Returns the total number of segments.

    $this->uri->total_rsegments(n)

    This function is identical to the previous one, except that it returns the total number of segments in your re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    $this->uri->segment_array()

    Returns an array containing the URI segments. For example:

    $segs = $this->uri->segment_array();

    foreach ($segs as $segment)
    {
        echo $segment;
        echo '<br />';
    }

    $this->uri->rsegment_array(n)

    This function is identical to the previous one, except that it returns the array of segments in your re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    \ No newline at end of file + + + + +CodeIgniter User Guide : URI Class + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    URI Class

    + +

    The URI Class provides functions that help you retrieve information from your URI strings. If you use URI routing, you can +also retrieve information about the re-routed segments.

    + +

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    + +

    $this->uri->segment(n)

    + +

    Permits you to retrieve a specific segment. Where n is the segment number you wish to retrieve. +Segments are numbered from left to right. For example, if your full URL is this:

    + +http://www.your-site.com/index.php/news/local/metro/crime_is_up + +

    The segment numbers would be this:

    + +
      +
    1. news
      2. +
    2. local
      3. +
    3. metro
      4. +
    4. crime_is_up
      5. +
    + +

    By default the function returns FALSE (boolean) if the segment does not exist. There is an optional second parameter that +permits you to set your own default value if the segment is missing. +For example, this would tell the function to return the number zero in the event of failure:

    + +$product_id = $this->uri->segment(3, 0); + +

    It helps avoid having to write code like this:

    + +if ($this->uri->segment(3) === FALSE)
    +{
    +    $product_id = 0;
    +}
    +else
    +{
    +    $product_id = $this->uri->segment(3);
    +}
    +     + +

    $this->uri->rsegment(n)

    + +

    This function is identical to the previous one, except that it lets you retrieve a specific segment from your +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + +

    $this->uri->slash_segment(n)

    + +

    This function is almost identical to $this->uri->segment(), except it adds a trailing and/or leading slash based on the second +parameter. If the parameter is not used, a trailing slash added. Examples:

    + +$this->uri->slash_segment(3);
    +$this->uri->slash_segment(3, 'leading');
    +$this->uri->slash_segment(3, 'both');     + +

    Returns:

    + +
      +
    1. segment/
      2. +
    2. /segment
      3. +
    3. /segment/
      4. +
    + + +

    $this->uri->slash_rsegment(n)

    + +

    This function is identical to the previous one, except that it lets you add slashes a specific segment from your +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + + +

    $this->uri->uri_to_assoc(n)

    + +

    This function lets you turn URI segments into and associative array of key/value pairs. Consider this URI:

    + +index.php/user/search/name/joe/location/UK/gender/male + +

    Using this function you can turn the URI into an associative array with this prototype:

    + +[array]
    +(
    +    'name' => 'joe'
    +    'location' => 'UK'
    +    'gender' => 'male'
    +)     + +

    The first parameter of the function lets you set an offset. By default it is set to 3 since your +URI will normally contain a controller/function in the first and second segments. Example:

    + + +$array = $this->uri->uri_to_assoc(3);
    +
    +echo $array['name']; +     + + +

    The second parameter lets you set default key names, so that the array returned by the function will always contain expected indexes, even if missing from the URI. Example:

    + + +$default = array('name', 'gender', 'location', 'type', 'sort');
    +
    +$array = $this->uri->uri_to_assoc(3, $default);     + +

    If the URI does not contain a value in your default, an array index will be set to that name, with a value of FALSE.

    + +

    Lastly, if a corresponding value is not found for a given key (if there is an odd number of URI segments) the value will be set to FALSE (boolean).

    + + +

    $this->uri->ruri_to_assoc(n)

    + +

    This function is identical to the previous one, except that it creates an associative array using the +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + +

    $this->uri->assoc_to_uri()

    + +

    Takes an associative array as input and generates a URI string from it. The array keys will be included in the string. Example:

    + +$array = array('product' => 'shoes', 'size' => 'large', 'color' => 'red');
    +
    +$str = $this->uri->assoc_to_uri($array);
    +
    +// Produces: product/shoes/size/large/color/red +     + + +

    $this->uri->uri_string()

    + +

    Returns a string with the complete URI. For example, if this is your full URL:

    + +http://www.your-site.com/index.php/news/local/345 + +

    The function would return this:

    + +/news/local/345 + + +

    $this->uri->ruri_string(n)

    + +

    This function is identical to the previous one, except that it returns the +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + + +

    $this->uri->total_segments()

    + +

    Returns the total number of segments.

    + + +

    $this->uri->total_rsegments(n)

    + +

    This function is identical to the previous one, except that it returns the total number of segments in your +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + + +

    $this->uri->segment_array()

    + +

    Returns an array containing the URI segments. For example:

    + + +$segs = $this->uri->segment_array();
    +
    +foreach ($segs as $segment)
    +{
    +    echo $segment;
    +    echo '<br />';
    +}     + +

    $this->uri->rsegment_array(n)

    + +

    This function is identical to the previous one, except that it returns the array of segments in your +re-routed URI in the event you are using CodeIgniter's URI Routing feature. + + + +

    + + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 7dc747ef..ab37935e 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -1 +1,201 @@ - CodeIgniter User Guide : User Agent Class

    CodeIgniter User Guide Version 1.5.4

    User Agent Class

    The User Agent Class provides functions that help identify information about the browser, mobile device, or robot visiting your site. In addition you can get referrer information as well as language and supported character-set information.

    Initializing the Class

    Like most other classes in CodeIgniter, the User Agent class is initialized in your controller using the $this->load->library function:

    $this->load->library('user_agent');

    Once loaded, the object will be available using: $this->agent

    User Agent Definitions

    The user agent name definitions are located in a config file located at: application/config/user_agents.php. You may add items to the various user agent arrays if needed.

    Example

    When the User Agent class is initialized it will attempt to determine whether the user agent browsing your site is a web browser, a mobile device, or a robot. It will also gather the platform information if it is available.

    $this->load->library('user_agent');

    if ($this->agent->is_browser())
    {
        $agent = $this->agent->browser().' '.$this->agent->version();
    }
    elseif ($this->agent->is_robot())
    {
        $agent = $this->agent->robot();
    }
    elseif ($this->agent->is_mobile())
    {
        $agent = $this->agent->mobile();
    }
    else
    {
        $agent = 'Unidentified User Agent';
    }

    echo $agent;

    echo $this->agent->platform(); // Platform info (Windows, Linux, Mac, etc.)

    Function Reference

    $this->agent->is_browser()

    Returns TRUE/FALSE (boolean) if the user agent is a known web browser.

    $this->agent->is_mobile()

    Returns TRUE/FALSE (boolean) if the user agent is a known mobile device.

    $this->agent->is_robot()

    Returns TRUE/FALSE (boolean) if the user agent is a known robot.

    Note:  The user agent library only contains the most common robot definitions. It is not a complete list of bots. There are hundreds of them so searching for each one would not be very efficient. If you find that some bots that commonly visit your site are missing from the list you can add them to your application/config/user_agents.php file.

    $this->agent->is_referral()

    Returns TRUE/FALSE (boolean) if the user agent was referred from another site.

    $this->agent->browser()

    Returns a string containing the name of the web browser viewing your site.

    $this->agent->version()

    Returns a string containing the version number of the web browser viewing your site.

    $this->agent->mobile()

    Returns a string containing the name of the mobile device viewing your site.

    $this->agent->robot()

    Returns a string containing the name of the robot viewing your site.

    $this->agent->platform()

    Returns a string containing the platform viewing your site (Linux, Windows, OS X, etc.).

    $this->agent->referrer()

    The referrer, if the user agent was referred from another site. Typically you'll test for this as follows:

    if ($this->agent->is_referral())
    {
        echo $this->agent->referrer();
    }

    $this->agent->agent_string()

    Returns a string containing the full user agent string. Typically it will be something like this:

    Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.0.4) Gecko/20060613 Camino/1.0.2

    $this->agent->accept_lang()

    Lets you determine if the user agent accepts a particular language. Example:

    if ($this->agent->accept_lang('en'))
    {
        echo 'You accept English!';
    }

    Note: This function is not typically very reliable since some browsers do not provide language info, and even among those that do, it is not always accurate.

    $this->agent->accept_charset()

    Lets you determine if the user agent accepts a particular character set. Example:

    if ($this->agent->accept_charset('utf-8'))
    {
        echo 'You browser supports UTF-8!';
    }

    Note: This function is not typically very reliable since some browsers do not provide character-set info, and even among those that do, it is not always accurate.

    \ No newline at end of file + + + + +CodeIgniter User Guide : User Agent Class + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    User Agent Class

    + +

    The User Agent Class provides functions that help identify information about the browser, mobile device, or robot visiting your site. +In addition you can get referrer information as well as language and supported character-set information.

    + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the User Agent class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('user_agent'); +

    Once loaded, the object will be available using: $this->agent

    + +

    User Agent Definitions

    + +

    The user agent name definitions are located in a config file located at: application/config/user_agents.php. You may add items to the +various user agent arrays if needed.

    + +

    Example

    + +

    When the User Agent class is initialized it will attempt to determine whether the user agent browsing your site is +a web browser, a mobile device, or a robot. It will also gather the platform information if it is available.

    + + + +$this->load->library('user_agent');
    +
    +if ($this->agent->is_browser())
    +{
    +    $agent = $this->agent->browser().' '.$this->agent->version();
    +}
    +elseif ($this->agent->is_robot())
    +{
    +    $agent = $this->agent->robot();
    +}
    +elseif ($this->agent->is_mobile())
    +{
    +    $agent = $this->agent->mobile();
    +}
    +else
    +{
    +    $agent = 'Unidentified User Agent';
    +}
    +
    +echo $agent;
    +
    +echo $this->agent->platform(); // Platform info (Windows, Linux, Mac, etc.) +     + + +

    Function Reference

    + + +

    $this->agent->is_browser()

    +

    Returns TRUE/FALSE (boolean) if the user agent is a known web browser.

    + +

    $this->agent->is_mobile()

    +

    Returns TRUE/FALSE (boolean) if the user agent is a known mobile device.

    + +

    $this->agent->is_robot()

    +

    Returns TRUE/FALSE (boolean) if the user agent is a known robot.

    + +

    Note:  The user agent library only contains the most common robot +definitions. It is not a complete list of bots. There are hundreds of them so searching for each one would not be +very efficient. If you find that some bots that commonly visit your site are missing from the list you can add them to your +application/config/user_agents.php file.

    + +

    $this->agent->is_referral()

    +

    Returns TRUE/FALSE (boolean) if the user agent was referred from another site.

    + + +

    $this->agent->browser()

    +

    Returns a string containing the name of the web browser viewing your site.

    + +

    $this->agent->version()

    +

    Returns a string containing the version number of the web browser viewing your site.

    + +

    $this->agent->mobile()

    +

    Returns a string containing the name of the mobile device viewing your site.

    + +

    $this->agent->robot()

    +

    Returns a string containing the name of the robot viewing your site.

    + +

    $this->agent->platform()

    +

    Returns a string containing the platform viewing your site (Linux, Windows, OS X, etc.).

    + +

    $this->agent->referrer()

    +

    The referrer, if the user agent was referred from another site. Typically you'll test for this as follows:

    + + if ($this->agent->is_referral())
    +{
    +    echo $this->agent->referrer();
    +}     + + +

    $this->agent->agent_string()

    +

    Returns a string containing the full user agent string. Typically it will be something like this:

    + +Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.0.4) Gecko/20060613 Camino/1.0.2 + + +

    $this->agent->accept_lang()

    +

    Lets you determine if the user agent accepts a particular language. Example:

    + +if ($this->agent->accept_lang('en'))
    +{
    +    echo 'You accept English!';
    +}     + +

    Note: This function is not typically very reliable +since some browsers do not provide language info, and even among those that do, it is not always accurate.

    + + + +

    $this->agent->accept_charset()

    +

    Lets you determine if the user agent accepts a particular character set. Example:

    + +if ($this->agent->accept_charset('utf-8'))
    +{
    +    echo 'You browser supports UTF-8!';
    +}     + +

    Note: This function is not typically very reliable +since some browsers do not provide character-set info, and even among those that do, it is not always accurate.

    + + + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 90ff0c12..30de0fd2 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index cd2f9e30..03912791 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -1 +1,487 @@ - CodeIgniter User Guide : XML-RPC and XML-RPC Server Classes

    CodeIgniter User Guide Version 1.5.4

    XML-RPC and XML-RPC Server Classes

    CodeIgniter's XML-RPC classes permit you to send requests to another server, or set up your own XML-RPC server to receive requests.

    What is XML-RPC?

    Quite simply it is a way for two computers to communicate over the internet using XML. One computer, which we will call the client, sends an XML-RPC request to another computer, which we will call the server. Once the server receives and processes the request it will send back a response to the client.

    For example, using the MetaWeblog API, an XML-RPC Client (usually a desktop publishing tool) will send a request to an XML-RPC Server running on your site. This request might be a new weblog entry being sent for publication, or it could be a request for an existing entry for editing. When the XML-RPC Server receives this request it will examine it to determine which class/method should be called to process the request. Once processed, the server will then send back a response message.

    For detailed specifications, you can visit the XML-RPC site.

    Initializing the Class

    Like most other classes in CodeIgniter, the XML-RPC and XML-RPCS classes are initialized in your controller using the $this->load->library function:

    To load the XML-RPC class you will use:

    $this->load->library('xmlrpc');

    Once loaded, the xml-rpc library object will be available using: $this->xmlrpc

    To load the XML-RPC Server class you will use:

    $this->load->library('xmlrpc');
    $this->load->library('xmlrpcs');

    Once loaded, the xml-rpcs library object will be available using: $this->xmlrpcs

    Note:  When using the XML-RPC Server class you must load BOTH the XML-RPC class and the XML-RPC Server class.

    Sending XML-RPC Requests

    To send a request to an XML-RPC server you must specify the following information:

    • The URL of the server
    • The method on the server you wish to call
    • The request data (explained below).

    Here is a basic example that sends a simple Weblogs.com ping to the Ping-o-Matic

    $this->load->library('xmlrpc');

    $this->xmlrpc->server('http://rpc.pingomatic.com/', 80);
    $this->xmlrpc->method('weblogUpdates.ping');

    $request = array('My Photoblog', 'http://www.my-site.com/photoblog/');
    $this->xmlrpc->request($request);

    if ( ! $this->xmlrpc->send_request())
    {
        echo $this->xmlrpc->display_error();
    }

    Explanation

    The above code initializes the XML-RPC class, sets the server URL and method to be called (weblogUpdates.ping). The request (in this case, the title and URL of your site) is placed into an array for transportation, and compiled using the request() function. Lastly, the full request is sent. If the send_request() method returns false we will display the error message sent back from the XML-RPC Server.

    Anatomy of a Request

    An XML-RPC request is simply the data you are sending to the XML-RPC server. Each piece of data in a request is referred to as a request parameter. The above example has two parameters: The URL and title of your site. When the XML-RPC server receives your request, it will look for parameters it requires.

    Request parameters must be placed into an array for transportation, and each parameter can be one of seven data types (strings, numbers, dates, etc.). If your parameters are something other than strings you will have to include the data type in the request array.

    Here is an example of a simple array with three parameters:

    $request = array('John', 'Doe', 'www.some-site.com');
    $this->xmlrpc->request($request);

    If you use data types other than strings, or if you have several different data types, you will place each parameter into its own array, with the data type in the second position:

    $request = array (
                       array('John', 'string'),
                       array('Doe', 'string'),
                       array(FALSE, 'boolean'),
                       array(12345, 'int')
                     );
    $this->xmlrpc->request($request);     The Data Types section below has a full list of data types.

    Creating an XML-RPC Server

    An XML-RPC Server acts as a traffic cop of sorts, waiting for incoming requests and redirecting them to the appropriate functions for processing.

    To create your own XML-RPC server involves initializing the XML-RPC Server class in your controller where you expect the incoming request to appear, then setting up an array with mapping instructions so that incoming requests can be sent to the appropriate class and method for processing.

    Here is an example to illustrate:

    $this->load->library('xmlrpc');
    $this->load->library('xmlrpcs');

    $config['functions']['new_post']  = array('function' => 'My_blog.new_entry');
    $config['functions']['update_post'] = array('function' => 'My_blog.update_entry');

    $this->xmlrpcs->initialize($config);
    $this->xmlrpcs->serve();

    The above example contains an array specifying two method requests that the Server allows. The allowed methods are on the left side of the array. When either of those are received, they will be mapped to the class and method on the right.

    In other words, if an XML-RPC Client sends a request for the new_post method, your server will load the My_blog class and call the new_entry function. If the request is for the update_post method, your server will load the My_blog class and call the update_entry function.

    The function names in the above example are arbitrary. You'll decide what they should be called on your server, or if you are using standardized APIs, like the Blogger or MetaWeblog API, you'll use their function names.

    Processing Server Requests

    When the XML-RPC Server receives a request and loads the class/method for processing, it will pass an object to that method containing the data sent by the client.

    Using the above example, if the new_post method is requested, the server will expect a class to exist with this prototype:

    class My_blog extends Controller {

        function new_post($request)
        {

        }
    }

    The $request variable is an object compiled by the Server, which contains the data sent by the XML-RPC Client. Using this object you will have access to the request parameters enabling you to process the request. When you are done you will send a Response back to the Client.

    Below is a real-world example, using the Blogger API. One of the methods in the Blogger API is getUserInfo(). Using this method, an XML-RPC Client can send the Server a username and password, in return the Server sends back information about that particular user (nickname, user ID, email address, etc.). Here is how the processing function might look:

    class My_blog extends Controller {

        function getUserInfo($request)
        {
            $username = 'smitty';
            $password = 'secretsmittypass';

            $this->load->library('xmlrpc');
        
            $parameters = $request->output_parameters();
        
            if ($parameters['1'] != $username AND $parameters['2'] != $password)
            {
                return $this->xmlrpc->send_error_message('100', 'Invalid Access');
            }
        
            $response = array(array('nickname'  => array('Smitty','string'),
                                    'userid'    => array('99','string'),
                                    'url'       => array('http://yoursite.com','string'),
                                    'email'     => array('jsmith@yoursite.com','string'),
                                    'lastname'  => array('Smith','string'),
                                    'firstname' => array('John','string')
                                    ),
                             'struct');

            return $this->xmlrpc->send_response($response);
        }
    }

    Notes:

    The output_parameters() function retrieves an indexed array corresponding to the request parameters sent by the client. In the above example, the output parameters will be the username and password.

    If the username and password sent by the client were not valid, and error message is returned using send_error_message().

    If the operation was successful, the client will be sent back a response array containing the user's info.

    Formatting a Response

    Similar to Requests, Responses must be formatted as an array. However, unlike requests, a response is an array that contains a single item. This item can be an array with several additional arrays, but there can be only one primary array index. In other words, the basic prototype is this:

    $response = array('Response data', 'array');

    Responses, however, usually contain multiple pieces of information. In order to accomplish this we must put the response into its own array so that the primary array continues to contain a single piece of data. Here's an example showing how this might be accomplished:

    $response = array (
                       array(
                             'first_name' => array('John', 'string'),
                             'last_name' => array('Doe', 'string'),
                             'member_id' => array(123435, 'int'),
                             'todo_list' => array(array('clean house', 'call mom', 'water plants'), 'array'),
                            ),
                     'struct'
                     );

    Notice that the above array is formatted as a struct. This is the most common data type for responses.

    As with Requests, a response can be on of the seven data types listed in the Data Types section.

    Sending an Error Response

    If you need to send the client an error response you will use the following:

    return $this->xmlrpc->send_error_message('123', 'Requested data not available');

    The first parameter is the error number while the second parameter is the error message.

    Creating Your Own Client and Server

    To help you understand everything we've covered thus far, let's create a couple controllers that act as XML-RPC Client and Server. You'll use the Client to send a request to the Server and receive a response.

    The Client

    Using a text editor, create a controller called xmlrpc_client.php. In it, place this code and save it to your applications/controllers/ folder:

    Note: In the above code we are using a "url helper". You can find more information in the Helpers Functions page.

    The Server

    Using a text editor, create a controller called xmlrpc_server.php. In it, place this code and save it to your applications/controllers/ folder:

    Try it!

    Now visit the your site using a URL similar to this:

    www.your-site.com/index.php/xmlrpc_client/

    You should now see the message you sent to the server, and its response back to you.

    The client you created sends a message ("How's is going?") to the server, along with a reqest for the "Greetings" method. The Server receives the request and maps it to the "process" function, where a response is sent back.

     

    XML-RPC Function Reference

    $this->xmlrpc->server()

    Sets the URL and port number of the server to which a request is to be sent:

    $this->xmlrpc->server('http://www.sometimes.com/pings.php', 80);

    $this->xmlrpc->timeout()

    Set a time out period (in seconds) after which the request will be canceled:

    $this->xmlrpc->timeout(6);

    $this->xmlrpc->method()

    Sets the method that will be requested from the XML-RPC server:

    $this->xmlrpc->method('method');

    Where method is the name of the method.

    $this->xmlrpc->request()

    Takes an array of data and builds request to be sent to XML-RPC server:

    $request = array(array('My Photoblog', 'string'), 'http://www.yoursite.com/photoblog/');
    $this->xmlrpc->request($request);

    $this->xmlrpc->send_request()

    The request sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

    $this->xmlrpc->set_debug(TRUE);

    Enables debugging, which will display a variety of information and error data helpful during development.

    $this->xmlrpc->display_error()

    Returns an error message as a string if your request failed for some reason.

    echo $this->xmlrpc->display_error();

    $this->xmlrpc->display_response()

    Returns the response from the remote server once request is received. The response will typically be an associative array.

    $this->xmlrpc->display_response();

    $this->xmlrpc->send_error_message()

    This function lets you send an error message from your server to the client. First parameter is the error number while the second parameter is the error message.

    return $this->xmlrpc->send_error_message('123', 'Requested data not available');

    $this->xmlrpc->send_response()

    Lets you send the response from your server to the client. An array of valid data values must be sent with this method.

    $response = array(
                     array(
                            'flerror' => array(FALSE, 'boolean'),
                            'message' => "Thanks for the ping!")
                         )
                     'struct');
    return $this->xmlrpc->send_response($response);

    Data Types

    According to the XML-RPC spec there are seven types of values that you can send via XML-RPC:

    • int or i4
    • boolean
    • string
    • double
    • dateTime.iso8601
    • base64
    • struct (contains array of values)
    • array (contains array of values)
    \ No newline at end of file + + + + +CodeIgniter User Guide : XML-RPC and XML-RPC Server Classes + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    XML-RPC and XML-RPC Server Classes

    + + +

    CodeIgniter's XML-RPC classes permit you to send requests to another server, or set up +your own XML-RPC server to receive requests.

    + + +

    What is XML-RPC?

    + +

    Quite simply it is a way for two computers to communicate over the internet using XML. +One computer, which we will call the client, sends an XML-RPC request to +another computer, which we will call the server. Once the server receives and processes the request it +will send back a response to the client.

    + +

    For example, using the MetaWeblog API, an XML-RPC Client (usually a desktop publishing tool) will +send a request to an XML-RPC Server running on your site. This request might be a new weblog entry +being sent for publication, or it could be a request for an existing entry for editing. + +When the XML-RPC Server receives this request it will examine it to determine which class/method should be called to process the request. +Once processed, the server will then send back a response message.

    + +

    For detailed specifications, you can visit the XML-RPC site.

    + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the XML-RPC and XML-RPCS classes are initialized in your controller using the $this->load->library function:

    + +

    To load the XML-RPC class you will use:

    +$this->load->library('xmlrpc'); +

    Once loaded, the xml-rpc library object will be available using: $this->xmlrpc

    + +

    To load the XML-RPC Server class you will use:

    + +$this->load->library('xmlrpc');
    +$this->load->library('xmlrpcs'); +     +

    Once loaded, the xml-rpcs library object will be available using: $this->xmlrpcs

    + +

    Note:  When using the XML-RPC Server class you must load BOTH the XML-RPC class and the XML-RPC Server class.

    + + + +

    Sending XML-RPC Requests

    + +

    To send a request to an XML-RPC server you must specify the following information:

    + +
      +
    • The URL of the server
      • +
    • The method on the server you wish to call
      • +
    • The request data (explained below).
      • +
    + +

    Here is a basic example that sends a simple Weblogs.com ping to the Ping-o-Matic

    + + +$this->load->library('xmlrpc');
    +
    +$this->xmlrpc->server('http://rpc.pingomatic.com/', 80);
    +$this->xmlrpc->method('weblogUpdates.ping');
    + +
    +$request = array('My Photoblog', 'http://www.my-site.com/photoblog/');
    +$this->xmlrpc->request($request);
    +
    +if ( ! $this->xmlrpc->send_request())
    +{
    +    echo $this->xmlrpc->display_error();
    +}     + +

    Explanation

    + +

    The above code initializes the XML-RPC class, sets the server URL and method to be called (weblogUpdates.ping). The +request (in this case, the title and URL of your site) is placed into an array for transportation, and +compiled using the request() function. +Lastly, the full request is sent. If the send_request() method returns false we will display the error message +sent back from the XML-RPC Server.

    + +

    Anatomy of a Request

    + +

    An XML-RPC request is simply the data you are sending to the XML-RPC server. Each piece of data in a request +is referred to as a request parameter. The above example has two parameters: +The URL and title of your site. When the XML-RPC server receives your request, it will look for parameters it requires.

    + +

    Request parameters must be placed into an array for transportation, and each parameter can be one +of seven data types (strings, numbers, dates, etc.). If your parameters are something other than strings +you will have to include the data type in the request array.

    + +

    Here is an example of a simple array with three parameters:

    + +$request = array('John', 'Doe', 'www.some-site.com');
    +$this->xmlrpc->request($request);     + +

    If you use data types other than strings, or if you have several different data types, you will place +each parameter into its own array, with the data type in the second position:

    + + +$request = array (
    +                   array('John', 'string'),
    +                   array('Doe', 'string'),
    +                   array(FALSE, 'boolean'),
    +                   array(12345, 'int')
    +                 ); +
    +$this->xmlrpc->request($request);     + +The Data Types section below has a full list of data types. + + + +

    Creating an XML-RPC Server

    + +

    An XML-RPC Server acts as a traffic cop of sorts, waiting for incoming requests and redirecting them to the +appropriate functions for processing.

    + +

    To create your own XML-RPC server involves initializing the XML-RPC Server class in your controller where you expect the incoming +request to appear, then setting up an array with mapping instructions so that incoming requests can be sent to the appropriate +class and method for processing.

    + +

    Here is an example to illustrate:

    + + +$this->load->library('xmlrpc');
    +$this->load->library('xmlrpcs');
    +
    +$config['functions']['new_post']  = array('function' => 'My_blog.new_entry');
    +$config['functions']['update_post'] = array('function' => 'My_blog.update_entry');
    +
    +$this->xmlrpcs->initialize($config);
    +$this->xmlrpcs->serve();     + +

    The above example contains an array specifying two method requests that the Server allows. +The allowed methods are on the left side of the array. When either of those are received, they will be mapped to the class and method on the right.

    + +

    In other words, if an XML-RPC Client sends a request for the new_post method, your +server will load the My_blog class and call the new_entry function. +If the request is for the update_post method, your +server will load the My_blog class and call the update_entry function.

    + +

    The function names in the above example are arbitrary. You'll decide what they should be called on your server, +or if you are using standardized APIs, like the Blogger or MetaWeblog API, you'll use their function names.

    + + +

    Processing Server Requests

    + +

    When the XML-RPC Server receives a request and loads the class/method for processing, it will pass +an object to that method containing the data sent by the client.

    + +

    Using the above example, if the new_post method is requested, the server will expect a class +to exist with this prototype:

    + +class My_blog extends Controller {
    +
    +    function new_post($request)
    +    {
    +
    +    }
    +} +     + +

    The $request variable is an object compiled by the Server, which contains the data sent by the XML-RPC Client. +Using this object you will have access to the request parameters enabling you to process the request. When +you are done you will send a Response back to the Client.

    + +

    Below is a real-world example, using the Blogger API. One of the methods in the Blogger API is getUserInfo(). +Using this method, an XML-RPC Client can send the Server a username and password, in return the Server sends +back information about that particular user (nickname, user ID, email address, etc.). Here is how the processing +function might look:

    + + +class My_blog extends Controller {
    +
    +    function getUserInfo($request)
    +    {
    + +        $username = 'smitty';
    +        $password = 'secretsmittypass';

    + +        $this->load->library('xmlrpc');
    +    
    +        $parameters = $request->output_parameters();
    +    
    +        if ($parameters['1'] != $username AND $parameters['2'] != $password)
    +        {
    +            return $this->xmlrpc->send_error_message('100', 'Invalid Access');
    +        }
    +    
    +        $response = array(array('nickname'  => array('Smitty','string'),
    +                                'userid'    => array('99','string'),
    +                                'url'       => array('http://yoursite.com','string'),
    +                                'email'     => array('jsmith@yoursite.com','string'),
    +                                'lastname'  => array('Smith','string'),
    +                                'firstname' => array('John','string')
    +                                ),
    +                         'struct');
    +
    +        return $this->xmlrpc->send_response($response);
    +    }
    +} +     + +

    Notes:

    +

    The output_parameters() function retrieves an indexed array corresponding to the request parameters sent by the client. +In the above example, the output parameters will be the username and password.

    + +

    If the username and password sent by the client were not valid, and error message is returned using send_error_message().

    + +

    If the operation was successful, the client will be sent back a response array containing the user's info.

    + + +

    Formatting a Response

    + +

    Similar to Requests, Responses must be formatted as an array. However, unlike requests, a response is an array +that contains a single item. This item can be an array with several additional arrays, but there +can be only one primary array index. In other words, the basic prototype is this:

    + +$response = array('Response data', 'array'); + +

    Responses, however, usually contain multiple pieces of information. In order to accomplish this we must put the response into its own +array so that the primary array continues to contain a single piece of data. Here's an example showing how this might be accomplished:

    + + +$response = array (
    +                   array(
    +                         'first_name' => array('John', 'string'),
    +                         'last_name' => array('Doe', 'string'),
    +                         'member_id' => array(123435, 'int'),
    +                         'todo_list' => array(array('clean house', 'call mom', 'water plants'), 'array'),
    +                        ),
    +                 'struct'
    +                 ); +     + +

    Notice that the above array is formatted as a struct. This is the most common data type for responses.

    + +

    As with Requests, a response can be on of the seven data types listed in the Data Types section.

    + + +

    Sending an Error Response

    + +

    If you need to send the client an error response you will use the following:

    + +return $this->xmlrpc->send_error_message('123', 'Requested data not available'); + +

    The first parameter is the error number while the second parameter is the error message.

    + + + + + + +

    Creating Your Own Client and Server

    + +

    To help you understand everything we've covered thus far, let's create a couple controllers that act as +XML-RPC Client and Server. You'll use the Client to send a request to the Server and receive a response.

    + +

    The Client

    + +

    Using a text editor, create a controller called xmlrpc_client.php. +In it, place this code and save it to your applications/controllers/ folder:

    + + + +

    Note: In the above code we are using a "url helper". You can find more information in the Helpers Functions page.

    + +

    The Server

    + +

    Using a text editor, create a controller called xmlrpc_server.php. +In it, place this code and save it to your applications/controllers/ folder:

    + + + +

    Try it!

    + +

    Now visit the your site using a URL similar to this:

    +www.your-site.com/index.php/xmlrpc_client/ + +

    You should now see the message you sent to the server, and its response back to you.

    + +

    The client you created sends a message ("How's is going?") to the server, along with a reqest for the "Greetings" method. +The Server receives the request and maps it to the "process" function, where a response is sent back.

    + + + +

     

    +

    XML-RPC Function Reference

    + +

    $this->xmlrpc->server()

    +

    Sets the URL and port number of the server to which a request is to be sent:

    +$this->xmlrpc->server('http://www.sometimes.com/pings.php', 80); + +

    $this->xmlrpc->timeout()

    +

    Set a time out period (in seconds) after which the request will be canceled:

    +$this->xmlrpc->timeout(6); + +

    $this->xmlrpc->method()

    +

    Sets the method that will be requested from the XML-RPC server:

    +$this->xmlrpc->method('method'); + +

    Where method is the name of the method.

    + +

    $this->xmlrpc->request()

    +

    Takes an array of data and builds request to be sent to XML-RPC server:

    +$request = array(array('My Photoblog', 'string'), 'http://www.yoursite.com/photoblog/');
    +$this->xmlrpc->request($request);     + +

    $this->xmlrpc->send_request()

    +

    The request sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

    + +

    $this->xmlrpc->set_debug(TRUE);

    +

    Enables debugging, which will display a variety of information and error data helpful during development.

    + + +

    $this->xmlrpc->display_error()

    +

    Returns an error message as a string if your request failed for some reason.

    +echo $this->xmlrpc->display_error(); + +

    $this->xmlrpc->display_response()

    +

    Returns the response from the remote server once request is received. The response will typically be an associative array.

    +$this->xmlrpc->display_response(); + +

    $this->xmlrpc->send_error_message()

    +

    This function lets you send an error message from your server to the client. First parameter is the error number while the second parameter +is the error message.

    +return $this->xmlrpc->send_error_message('123', 'Requested data not available'); + +

    $this->xmlrpc->send_response()

    +

    Lets you send the response from your server to the client. An array of valid data values must be sent with this method.

    +$response = array(
    +                 array(
    +                        'flerror' => array(FALSE, 'boolean'),
    +                        'message' => "Thanks for the ping!")
    +                     )
    +                 'struct');
    +return $this->xmlrpc->send_response($response);     + + + +

    Data Types

    + +

    According to the XML-RPC spec there are seven types +of values that you can send via XML-RPC:

    + +
      +
    • int or i4
      • +
    • boolean
      • +
    • string
      • +
    • double
      • +
    • dateTime.iso8601
      • +
    • base64
      • +
    • struct (contains array of values)
      • +
    • array (contains array of values)
      • +
    + + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 165d61b0..a2ef6c42 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/license.html b/user_guide/license.html index 8c712e53..ddee1c08 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 9e070ac3..2a3d52fe 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 8614daed..7fe91530 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -1 +1,172 @@ - CodeIgniter User Guide : CodeIgniter at a Glance

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter at a Glance

    CodeIgniter is an Application Framework

    CodeIgniter is a toolkit for people who build web application using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by minimizing the amount of code needed for a given task.

    CodeIgniter is Free

    CodeIgniter is licensed under an Apache/BSD-style open source license so you can use it however you please. For more information please read the license agreement.

    CodeIgniter Runs on PHP 4

    CodeIgniter is written to be compatible with PHP 4. Although we would have loved to take advantage of the better object handling in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance), at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our potential audience. Major OS vendors like RedHat have yet to support PHP 5, and they are unlikely to do so until 2007, so we felt that it did not serve the best interests of the PHP community to write CodeIgniter in PHP 5.

    Note: CodeIgniter will run on PHP 5. It simply does not take advantage of any native features that are only available in that version.

    CodeIgniter is Light Weight

    Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. Additional libraries are loaded dynamically upon request, based on your needs for a given process, so the base system is very lean and quite fast.

    CodeIgniter is Fast

    Really fast. We challenge you to find a framework that has better performance than CodeIgniter.

    CodeIgniter Uses M-V-C

    CodeIgniter uses the Model-View-Controller approach, which allows great separation between logic and presentation. This is particularly good for projects in which designers are working with your template files, as the code these file contain will be minimized. We describe MVC in more detail on its own page.

    CodeIgniter Generates Clean URLs

    The URLs generated by CodeIgniter are clean and search-engine friendly. Rather than using the standard "query string" approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a segment-based approach:

    www.your-site.com/news/article/345

    Note: By default the index.php file is included in the URL but it can be removed using a simple .htaccess file.

    CodeIgniter Packs a Punch

    CodeIgniter comes with full-range of libraries that enable the most commonly needed web development tasks, like accessing a database, sending email, validating form data, maintaining sessions, manipulating images, working with XML-RPC data and much more.

    CodeIgniter is Extensible

    The system can be easily extended through the use of plugins and helper libraries, or through class extensions or system hooks.

    CodeIgniter Does Not Require a Template Engine

    Although CodeIgniter does come with a simple template parser that can be optionally used, it does not force you to use one. Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:

    <ul>

    <?php foreach ($addressbook as $name):?>

    <li><?=$name?></li>

    <?php endforeach; ?>

    </ul>

    Contrast this with the pseudo-code used by a template engine:

    <ul>

    {foreach from=$addressbook item="name"}

    <li>{$name}</li>

    {/foreach}

    </ul>

    Yes, the template engine example is a bit cleaner, but it comes at the price of performance, as the pseudo-code must be converted back into PHP to run. Since one of our goals is maximum performance, we opted to not require the use of a template engine.

    CodeIgniter is Thoroughly Documented

    Programmers love to code and hate to write documentation. We're no different, of course, but since documentation is as important as the code itself, we are committed to doing it. Our source code is extremely clean and well commented as well.

    CodeIgniter has a Friendly Community of Users

    Our growing community of users can be seen actively participating in our Community Forums.

    \ No newline at end of file + + + + +CodeIgniter User Guide : CodeIgniter at a Glance + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    CodeIgniter at a Glance

    + + +

    CodeIgniter is an Application Framework

    + +

    CodeIgniter is a toolkit for people who build web application using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code +from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and +logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by +minimizing the amount of code needed for a given task.

    + +

    CodeIgniter is Free

    +

    CodeIgniter is licensed under an Apache/BSD-style open source license so you can use it however you please. +For more information please read the license agreement.

    + + +

    CodeIgniter Runs on PHP 4

    +

    CodeIgniter is written to be compatible with PHP 4. Although we would have loved to take advantage of the better object handling +in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance), +at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our +potential audience. Major OS vendors like RedHat have yet to support PHP 5, and they are unlikely to do so until 2007, so +we felt that it did not serve the best interests of the PHP community to write CodeIgniter in PHP 5.

    + +

    Note: CodeIgniter will run on PHP 5. It simply does not take advantage of any native features that are only available in that version.

    + +

    CodeIgniter is Light Weight

    +

    Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. +Additional libraries are loaded dynamically upon request, based on your needs for a given process, so the base system +is very lean and quite fast. +

    + +

    CodeIgniter is Fast

    +

    Really fast. We challenge you to find a framework that has better performance than CodeIgniter.

    + + +

    CodeIgniter Uses M-V-C

    +

    CodeIgniter uses the Model-View-Controller approach, which allows great separation between logic and presentation. +This is particularly good for projects in which designers are working with your template files, as the code these file contain will be minimized. We describe MVC in more detail on its own page.

    + +

    CodeIgniter Generates Clean URLs

    +

    The URLs generated by CodeIgniter are clean and search-engine friendly. Rather than using the standard "query string" +approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a segment-based approach:

    + +www.your-site.com/news/article/345 + +

    Note: By default the index.php file is included in the URL but it can be removed using a simple .htaccess file.

    + +

    CodeIgniter Packs a Punch

    +

    CodeIgniter comes with full-range of libraries that enable the most commonly needed web development tasks, +like accessing a database, sending email, validating form data, maintaining sessions, manipulating images, working with XML-RPC data and +much more.

    + +

    CodeIgniter is Extensible

    +

    The system can be easily extended through the use of plugins and helper libraries, or through class extensions or system hooks.

    + + +

    CodeIgniter Does Not Require a Template Engine

    +

    Although CodeIgniter does come with a simple template parser that can be optionally used, it does not force you to use one. + +Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template +engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:

    + +<ul>
    +
    +<?php foreach ($addressbook as $name):?>
    +
    +<li><?=$name?></li>
    +
    +<?php endforeach; ?>
    +
    +</ul>     + +

    Contrast this with the pseudo-code used by a template engine:

    + +<ul>
    +
    +{foreach from=$addressbook item="name"}
    +
    +<li>{$name}</li>
    +
    +{/foreach}
    +
    +</ul>     + +

    Yes, the template engine example is a bit cleaner, but it comes at the price of performance, as the pseudo-code must be converted +back into PHP to run. Since one of our goals is maximum performance, we opted to not require the use of a template engine.

    + + +

    CodeIgniter is Thoroughly Documented

    +

    Programmers love to code and hate to write documentation. We're no different, of course, but +since documentation is as important as the code itself, +we are committed to doing it. Our source code is extremely clean and well commented as well.

    + + +

    CodeIgniter has a Friendly Community of Users

    + +

    Our growing community of users can be seen actively participating in our Community Forums.

    + + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 02b953ed..14bace86 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 4685da8e..738c91da 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 9b6abac2..66622b44 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index b168542f..868c9612 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/toc.html b/user_guide/toc.html index 3f6b16e4..6ab19a3c 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -29,7 +29,7 @@
    - +

    CodeIgniter User Guide Version 1.5.4

    CodeIgniter User Guide Version 1.6.0
    From 35683d6584628220510d964da0015f9f98af34dc Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 16 Jan 2008 21:22:03 +0000 Subject: [PATCH 0795/2544] added char_set and dbcollat to the code comments --- system/application/config/database.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/application/config/database.php b/system/application/config/database.php index 1ee0c4bb..59b97398 100644 --- a/system/application/config/database.php +++ b/system/application/config/database.php @@ -25,6 +25,8 @@ | ['active_r'] TRUE/FALSE - Whether to load the active record class | ['cache_on'] TRUE/FALSE - Enables/disables query caching | ['cachedir'] The path to the folder where cache files should be stored +| ['char_set'] The character set used in communicating with the database +| ['dbcollat'] The character collation used in communicating with the database | | The $active_group variable lets you choose which connection group to | make active. By default there is only one group (the "default" group). From 60e8d912da6380f3d9a2a1c58058cc99b70a8c45 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 16 Jan 2008 21:47:29 +0000 Subject: [PATCH 0796/2544] typos --- user_guide/changelog.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 902e5e64..9bf79659 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,7 +71,7 @@

    Version 1.6.0

  • Added add_field(), add_key(), create_table(), drop_table(), add_column(), drop_column(), modify_column() into DBForge.
  • Added 'random' as an order_by() option , and removed "rand()" as a listed option as it was MySQL only.
  • Added protect_identifiers() in Active Record.
    • -
  • Alll AR queries are backticked if appropriate to the database.
    • +
  • All AR queries are backticked if appropriate to the database.
  • Added where_in(), where_in_or(), where_not_in(), where_not_in_or(), not_like() and or_not_like() to Active Record.
  • Added support for limit() into update() and delete() statements in Active Record.
  • Added empty_table() and truncate_table() to Active Record.
    • @@ -99,7 +99,7 @@

    Version 1.6.0

  • Documented the timezones() function in the Date Helper.
  • Documented unset_userdata in the Session class.
  • Documented 2 config options to the Database configuration page.
    • -
  • Fixed a bug in highlight_pharse() that caused an error with slashes.
    • +
  • Fixed a bug in highlight_phrase() that caused an error with slashes.
  • Fixed a bug: $field_names[] vs $Ffield_names[] in postgre and sqlite drivers.
  • Fixed a bug in the upload library when allowed_files wasn't defined.
  • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • From 91f50b626517ff34a0436df8e08f2dddfd2d5d7a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 16 Jan 2008 21:48:18 +0000 Subject: [PATCH 0797/2544] fix for single word identifiers with no spaces that need protecting in _protect_identifiers() --- system/database/drivers/mysql/mysql_driver.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index a164552e..9dc69767 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -452,7 +452,7 @@ function _protect_identifiers($item, $first_word_only = FALSE) // This function may get "item1 item2" as a string, and so // we may need "`item1` `item2`" and not "`item1 item2`" - if (strpos($item, ' ') !== FALSE) + if (ctype_alnum($item) !== FALSE) { // This function may get "field >= 1", and need it to return "`field` >= 1" if ($first_word_only === TRUE) @@ -462,6 +462,10 @@ function _protect_identifiers($item, $first_word_only = FALSE) $item = preg_replace('/(^|\s|\()([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); } + else + { + return "`{$item}`"; + } $exceptions = array('AS', '/', '-', '%', '+', '*'); From 68d021b7d83a9c9a991fc0cef8cddd8149487255 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 16 Jan 2008 21:58:37 +0000 Subject: [PATCH 0798/2544] === instead of !== ::blush:: --- system/database/drivers/mysql/mysql_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 9dc69767..4535e8cd 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -452,7 +452,7 @@ function _protect_identifiers($item, $first_word_only = FALSE) // This function may get "item1 item2" as a string, and so // we may need "`item1` `item2`" and not "`item1 item2`" - if (ctype_alnum($item) !== FALSE) + if (ctype_alnum($item) === FALSE) { // This function may get "field >= 1", and need it to return "`field` >= 1" if ($first_word_only === TRUE) From cdbdf2d30dd1dd6aff2ea25e9875814080d416e2 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 16 Jan 2008 22:18:03 +0000 Subject: [PATCH 0799/2544] special fix for $first_word_only to work with other changes to _protect_identifiers() --- system/database/drivers/mysql/mysql_driver.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 4535e8cd..36e36516 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -455,12 +455,9 @@ function _protect_identifiers($item, $first_word_only = FALSE) if (ctype_alnum($item) === FALSE) { // This function may get "field >= 1", and need it to return "`field` >= 1" - if ($first_word_only === TRUE) - { - return '`'.preg_replace('/ /', '` ', $item, 1); - } + $lbound = ($first_word_only === TRUE) ? '' : '|\s|\('; - $item = preg_replace('/(^|\s|\()([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); + $item = preg_replace('/(^'.$lbound.')([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); } else { From 6157938ad5dd9d48607921593ca4ed7bff3e3a8b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 16 Jan 2008 22:22:42 +0000 Subject: [PATCH 0800/2544] --- system/database/drivers/mysqli/mysqli_driver.php | 15 ++++++++------- system/database/drivers/oci8/oci8_driver.php | 15 ++++++++------- system/database/drivers/odbc/odbc_driver.php | 15 ++++++++------- .../database/drivers/postgre/postgre_driver.php | 15 ++++++++------- system/database/drivers/sqlite/sqlite_driver.php | 15 ++++++++------- 5 files changed, 40 insertions(+), 35 deletions(-) diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index d295ca9f..94a29937 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -446,27 +446,28 @@ function _protect_identifiers($item, $first_word_only = FALSE) // This function may get "item1 item2" as a string, and so // we may need "`item1` `item2`" and not "`item1 item2`" - if (strpos($item, ' ') !== FALSE) + if (ctype_alnum($item) === FALSE) { // This function may get "field >= 1", and need it to return "`field` >= 1" - if ($first_word_only === TRUE) - { - return '`'.preg_replace('/ /', '` ', $item, 1); - } + $lbound = ($first_word_only === TRUE) ? '' : '|\s|\('; - $item = preg_replace('/(^|\s|\()([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); + $item = preg_replace('/(^'.$lbound.')([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); + } + else + { + return "`{$item}`"; } $exceptions = array('AS', '/', '-', '%', '+', '*'); foreach ($exceptions as $exception) { + if (stristr($item, " `{$exception}` ") !== FALSE) { $item = preg_replace('/ `('.preg_quote($exception).')` /i', ' $1 ', $item); } } - return $item; } diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 6d3b7226..160a56d5 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -557,27 +557,28 @@ function _protect_identifiers($item, $first_word_only = FALSE) // This function may get "item1 item2" as a string, and so // we may need "`item1` `item2`" and not "`item1 item2`" - if (strpos($item, ' ') !== FALSE) + if (ctype_alnum($item) === FALSE) { // This function may get "field >= 1", and need it to return "`field` >= 1" - if ($first_word_only === TRUE) - { - return '`'.preg_replace('/ /', '` ', $item, 1); - } + $lbound = ($first_word_only === TRUE) ? '' : '|\s|\('; - $item = preg_replace('/(^|\s|\()([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); + $item = preg_replace('/(^'.$lbound.')([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); + } + else + { + return "`{$item}`"; } $exceptions = array('AS', '/', '-', '%', '+', '*'); foreach ($exceptions as $exception) { + if (stristr($item, " `{$exception}` ") !== FALSE) { $item = preg_replace('/ `('.preg_quote($exception).')` /i', ' $1 ', $item); } } - return $item; } diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 0bdfc41d..c5c582d0 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -422,27 +422,28 @@ function _protect_identifiers($item, $first_word_only = FALSE) // This function may get "item1 item2" as a string, and so // we may need "`item1` `item2`" and not "`item1 item2`" - if (strpos($item, ' ') !== FALSE) + if (ctype_alnum($item) === FALSE) { // This function may get "field >= 1", and need it to return "`field` >= 1" - if ($first_word_only === TRUE) - { - return '`'.preg_replace('/ /', '` ', $item, 1); - } + $lbound = ($first_word_only === TRUE) ? '' : '|\s|\('; - $item = preg_replace('/(^|\s|\()([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); + $item = preg_replace('/(^'.$lbound.')([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); + } + else + { + return "`{$item}`"; } $exceptions = array('AS', '/', '-', '%', '+', '*'); foreach ($exceptions as $exception) { + if (stristr($item, " `{$exception}` ") !== FALSE) { $item = preg_replace('/ `('.preg_quote($exception).')` /i', ' $1 ', $item); } } - return $item; } diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 63a72f5d..fa27f03d 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -444,27 +444,28 @@ function _protect_identifiers($item, $first_word_only = FALSE) // This function may get "item1 item2" as a string, and so // we may need ""item1" "item2"" and not ""item1 item2"" - if (strpos($item, ' ') !== FALSE) + if (ctype_alnum($item) === FALSE) { // This function may get "field >= 1", and need it to return ""field" >= 1" - if ($first_word_only === TRUE) - { - return '"'.preg_replace('/ /', '" ', $item, 1); - } + $lbound = ($first_word_only === TRUE) ? '' : '|\s|\('; - $item = preg_replace('/(^|\s|\()([\w\d\-\_]+?)(\s|\)|$)/iS', '$1"$2"$3', $item); + $item = preg_replace('/(^'.$lbound.')([\w\d\-\_]+?)(\s|\)|$)/iS', '$1"$2"$3', $item); + } + else + { + return ""{$item}""; } $exceptions = array('AS', '/', '-', '%', '+', '*'); foreach ($exceptions as $exception) { + if (stristr($item, " "{$exception}" ") !== FALSE) { $item = preg_replace('/ "('.preg_quote($exception).')" /i', ' $1 ', $item); } } - return $item; } diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 2d0ca157..110b208d 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -438,27 +438,28 @@ function _protect_identifiers($item, $first_word_only = FALSE) // This function may get "item1 item2" as a string, and so // we may need "`item1` `item2`" and not "`item1 item2`" - if (strpos($item, ' ') !== FALSE) + if (ctype_alnum($item) === FALSE) { // This function may get "field >= 1", and need it to return "`field` >= 1" - if ($first_word_only === TRUE) - { - return '`'.preg_replace('/ /', '` ', $item, 1); - } + $lbound = ($first_word_only === TRUE) ? '' : '|\s|\('; - $item = preg_replace('/(^|\s|\()([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); + $item = preg_replace('/(^'.$lbound.')([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item); + } + else + { + return "`{$item}`"; } $exceptions = array('AS', '/', '-', '%', '+', '*'); foreach ($exceptions as $exception) { + if (stristr($item, " `{$exception}` ") !== FALSE) { $item = preg_replace('/ `('.preg_quote($exception).')` /i', ' $1 ', $item); } } - return $item; } From 9884449add2bf1a52de10b82a366637b595734fd Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 16 Jan 2008 22:26:37 +0000 Subject: [PATCH 0801/2544] Added Compat.php file --- index.php | 16 ------ system/codeigniter/CodeIgniter.php | 2 +- system/codeigniter/Compat.php | 84 ++++++++++++++++++++++++++++++ user_guide/changelog.html | 2 + 4 files changed, 87 insertions(+), 17 deletions(-) create mode 100644 system/codeigniter/Compat.php diff --git a/index.php b/index.php index 7b47d081..eb364ec0 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,4 @@ mark('total_execution_time_start'); $BM->mark('loading_time_base_classes_start'); /* * ------------------------------------------------------ * Instantiate the hooks class * ------------------------------------------------------ */ $EXT =& load_class('Hooks'); /* * ------------------------------------------------------ * Is there a "pre_system" hook? * ------------------------------------------------------ */ $EXT->_call_hook('pre_system'); /* * ------------------------------------------------------ * Instantiate the base classes * ------------------------------------------------------ */ $CFG =& load_class('Config'); $URI =& load_class('URI'); $RTR =& load_class('Router'); $OUT =& load_class('Output'); /* * ------------------------------------------------------ * Is there a valid cache file? If so, we're done... * ------------------------------------------------------ */ if ($EXT->_call_hook('cache_override') === FALSE) { if ($OUT->_display_cache($CFG, $RTR) == TRUE) { exit; } } /* * ------------------------------------------------------ * Load the remaining base classes * ------------------------------------------------------ */ $IN =& load_class('Input'); $LANG =& load_class('Language'); /* * ------------------------------------------------------ * Load the app controller and local controller * ------------------------------------------------------ * * Note: Due to the poor object handling in PHP 4 we'll * conditionally load different versions of the base * class. Retaining PHP 4 compatibility requires a bit of a hack. * * Note: The Loader class needs to be included first * */ if (floor(phpversion()) < 5) { load_class('Loader', FALSE); require(BASEPATH.'codeigniter/Base4'.EXT); } else { require(BASEPATH.'codeigniter/Base5'.EXT); } // Load the base controller class load_class('Controller', FALSE); // Load the local application controller // Note: The Router class automatically validates the controller path. If this include fails it // means that the default controller in the Routes.php file is not resolving to something valid. if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) { show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); } include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT); // Set a mark point for benchmarking $BM->mark('loading_time_base_classes_end'); /* * ------------------------------------------------------ * 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 */ $class = $RTR->fetch_class(); $method = $RTR->fetch_method(); if ( ! class_exists($class) OR $method == 'controller' OR substr($method, 0, 1) == '_' OR in_array($method, get_class_methods('Controller'), TRUE) ) { show_404(); } /* * ------------------------------------------------------ * Is there a "pre_controller" hook? * ------------------------------------------------------ */ $EXT->_call_hook('pre_controller'); /* * ------------------------------------------------------ * Instantiate the controller and call requested method * ------------------------------------------------------ */ // Mark a start point so we can benchmark the controller $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); // Instantiate the Controller and pass any global data that might exist $assign_to_controller = ( ! isset($assign_to_controller)) ? NULL : $assign_to_controller; $CI = new $class($assign_to_controller); unset($assign_to_controller); // Is this a scaffolding request? if ($RTR->scaffolding_request === TRUE) { if ($EXT->_call_hook('scaffolding_override') === FALSE) { $CI->_ci_scaffolding(); } } else { /* * ------------------------------------------------------ * Is there a "post_controller_constructor" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_controller_constructor'); // Is there a "remap" function? if (method_exists($CI, '_remap')) { $CI->_remap($method); } else { if ( ! method_exists($CI, $method)) { show_404(); } // Call the requested method. // Any URI segments present (besides the class/function) will be passed to the method for convenience call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3))); } } // Mark a benchmark end point $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end'); /* * ------------------------------------------------------ * Is there a "post_controller" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_controller'); /* * ------------------------------------------------------ * Send the final rendered output to the browser * ------------------------------------------------------ */ if ($EXT->_call_hook('display_override') === FALSE) { $OUT->_display(); } /* * ------------------------------------------------------ * Is there a "post_system" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_system'); /* * ------------------------------------------------------ * Close the DB connection if one exists * ------------------------------------------------------ */ if (class_exists('CI_DB') AND isset($CI->db)) { $CI->db->close(); } ?> \ No newline at end of file +mark('total_execution_time_start'); $BM->mark('loading_time_base_classes_start'); /* * ------------------------------------------------------ * Instantiate the hooks class * ------------------------------------------------------ */ $EXT =& load_class('Hooks'); /* * ------------------------------------------------------ * Is there a "pre_system" hook? * ------------------------------------------------------ */ $EXT->_call_hook('pre_system'); /* * ------------------------------------------------------ * Instantiate the base classes * ------------------------------------------------------ */ $CFG =& load_class('Config'); $URI =& load_class('URI'); $RTR =& load_class('Router'); $OUT =& load_class('Output'); /* * ------------------------------------------------------ * Is there a valid cache file? If so, we're done... * ------------------------------------------------------ */ if ($EXT->_call_hook('cache_override') === FALSE) { if ($OUT->_display_cache($CFG, $RTR) == TRUE) { exit; } } /* * ------------------------------------------------------ * Load the remaining base classes * ------------------------------------------------------ */ $IN =& load_class('Input'); $LANG =& load_class('Language'); /* * ------------------------------------------------------ * Load the app controller and local controller * ------------------------------------------------------ * * Note: Due to the poor object handling in PHP 4 we'll * conditionally load different versions of the base * class. Retaining PHP 4 compatibility requires a bit of a hack. * * Note: The Loader class needs to be included first * */ if (floor(phpversion()) < 5) { load_class('Loader', FALSE); require(BASEPATH.'codeigniter/Base4'.EXT); } else { require(BASEPATH.'codeigniter/Base5'.EXT); } // Load the base controller class load_class('Controller', FALSE); // Load the local application controller // Note: The Router class automatically validates the controller path. If this include fails it // means that the default controller in the Routes.php file is not resolving to something valid. if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) { show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); } include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT); // Set a mark point for benchmarking $BM->mark('loading_time_base_classes_end'); /* * ------------------------------------------------------ * 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 */ $class = $RTR->fetch_class(); $method = $RTR->fetch_method(); if ( ! class_exists($class) OR $method == 'controller' OR substr($method, 0, 1) == '_' OR in_array($method, get_class_methods('Controller'), TRUE) ) { show_404(); } /* * ------------------------------------------------------ * Is there a "pre_controller" hook? * ------------------------------------------------------ */ $EXT->_call_hook('pre_controller'); /* * ------------------------------------------------------ * Instantiate the controller and call requested method * ------------------------------------------------------ */ // Mark a start point so we can benchmark the controller $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); // Instantiate the Controller and pass any global data that might exist $assign_to_controller = ( ! isset($assign_to_controller)) ? NULL : $assign_to_controller; $CI = new $class($assign_to_controller); unset($assign_to_controller); // Is this a scaffolding request? if ($RTR->scaffolding_request === TRUE) { if ($EXT->_call_hook('scaffolding_override') === FALSE) { $CI->_ci_scaffolding(); } } else { /* * ------------------------------------------------------ * Is there a "post_controller_constructor" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_controller_constructor'); // Is there a "remap" function? if (method_exists($CI, '_remap')) { $CI->_remap($method); } else { if ( ! method_exists($CI, $method)) { show_404(); } // Call the requested method. // Any URI segments present (besides the class/function) will be passed to the method for convenience call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3))); } } // Mark a benchmark end point $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end'); /* * ------------------------------------------------------ * Is there a "post_controller" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_controller'); /* * ------------------------------------------------------ * Send the final rendered output to the browser * ------------------------------------------------------ */ if ($EXT->_call_hook('display_override') === FALSE) { $OUT->_display(); } /* * ------------------------------------------------------ * Is there a "post_system" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_system'); /* * ------------------------------------------------------ * Close the DB connection if one exists * ------------------------------------------------------ */ if (class_exists('CI_DB') AND isset($CI->db)) { $CI->db->close(); } ?> \ No newline at end of file diff --git a/system/codeigniter/Compat.php b/system/codeigniter/Compat.php new file mode 100644 index 00000000..3c5f70d6 --- /dev/null +++ b/system/codeigniter/Compat.php @@ -0,0 +1,84 @@ + \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9bf79659..e879918e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -90,6 +90,7 @@

    Version 1.6.0

  • Added support for external urls in form_open().
  • Added a language entry for valid_ip validation error.
  • Added titles to all user manual pages.
    • +
  • Added Compat.php to allow function overrides for older versions of PHP or PHP environments missing certain extensions / libraries
  • Added Zip Encoding Class to the table of contents of the userguide.
  • Moved the safe mode and auth checks for the Email library into the constructor.
  • Moved part of the userguide menu javascript to an external file.
    • @@ -118,6 +119,7 @@

    Version 1.6.0

  • Fixed a bug in the parser class where numeric data was ignored.
  • Fixed a bug when loading plugin files as _plugin. and not _pi.
  • Fixed a bug in the SQLite driver for PHP 4.
    • +
  • Fixed a bug in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
  • Fixed an example of comma-separated emails in the email library documentation.
  • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
  • Fixed a typo in the database language file.
    • From ba1e4f852dcbccedbb7be89ae4dfeefc8018aaae Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 16 Jan 2008 23:09:30 +0000 Subject: [PATCH 0802/2544] deprecated scaffolding --- user_guide/changelog.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index e879918e..ce24491e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -131,7 +131,8 @@

    Version 1.6.0

  • Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login).
  • Fixed assorted user guide typos.
  • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); havingor() for having_or(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
    • - +
  • Deprecated Scaffolding.
    • + From 47845f201626e4e2751bd73cd5823f334f47e43d Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 16 Jan 2008 23:23:02 +0000 Subject: [PATCH 0803/2544] prefixed reserved variables of _ci_load() in order to not conflict with view file variables --- system/libraries/Loader.php | 30 +++++++++++++++--------------- user_guide/changelog.html | 1 + 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index f833cb71..b78790d6 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -295,7 +295,7 @@ function dbforge() */ function view($view, $vars = array(), $return = FALSE) { - return $this->_ci_load(array('view' => $view, 'vars' => $this->_ci_object_to_array($vars), 'return' => $return)); + return $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_object_to_array($vars), '_ci_return' => $return)); } // -------------------------------------------------------------------- @@ -312,7 +312,7 @@ function view($view, $vars = array(), $return = FALSE) */ function file($path, $return = FALSE) { - return $this->_ci_load(array('path' => $path, 'return' => $return)); + return $this->_ci_load(array('_ci_path' => $path, '_ci_return' => $return)); } // -------------------------------------------------------------------- @@ -611,25 +611,25 @@ function scaffolding($table = '') function _ci_load($data) { // Set the default data variables - foreach (array('view', 'vars', 'path', 'return') as $val) + foreach (array('_ci_view', '_ci_vars', '_ci_path', '_ci_return') as $val) { $$val = ( ! isset($data[$val])) ? FALSE : $data[$val]; } // Set the path to the requested file - if ($path == '') + if ($_ci_path == '') { - $ext = pathinfo($view, PATHINFO_EXTENSION); - $file = ($ext == '') ? $view.EXT : $view; - $path = $this->_ci_view_path.$file; + $ext = pathinfo($_ci_view, PATHINFO_EXTENSION); + $file = ($ext == '') ? $_ci_view.EXT : $_ci_view; + $_ci_path = $this->_ci_view_path.$file; } else { - $x = explode('/', $path); + $x = explode('/', $_ci_path); $file = end($x); } - if ( ! file_exists($path)) + if ( ! file_exists($_ci_path)) { show_error('Unable to load the requested file: '.$file); } @@ -658,9 +658,9 @@ function _ci_load($data) * the two types and cache them so that views that are embedded within * other views can have access to these variables. */ - if (is_array($vars)) + if (is_array($_ci_vars)) { - $this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $vars); + $this->_ci_cached_vars = array_merge($this->_ci_cached_vars, $_ci_vars); } extract($this->_ci_cached_vars); @@ -684,17 +684,17 @@ function _ci_load($data) if ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE) { - echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace(''.preg_replace("/;*\s*\?>/", "; ?>", str_replace('Version 1.6.0
  • Added Zip Encoding Class to the table of contents of the userguide.
  • Moved the safe mode and auth checks for the Email library into the constructor.
  • Moved part of the userguide menu javascript to an external file.
    • +
  • Modified variable names in _ci_load() method of Loader class to avoid conflicts with view variables.
  • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
  • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
  • Documented distinct() in Active Record.
    • From 825bc9b3d6e4895a8c1473cd25852dad0fe6d5f5 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 16 Jan 2008 23:37:42 +0000 Subject: [PATCH 0804/2544] fixed a bug if num_link wasn't postive --- system/libraries/Pagination.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 538c4272..76968197 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -124,6 +124,13 @@ function create_links() // Prep the current page - no funny business! $this->cur_page = (int) $this->cur_page; } + + $this->num_links = (int)$this->num_links; + + if ($this->num_links < 1) + { + show_error('Your number of links must be a positive number.'); + } if ( ! is_numeric($this->cur_page)) { From 7226bb9036833a5619014f7c64f036cdc281e5cd Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 16 Jan 2008 23:39:13 +0000 Subject: [PATCH 0805/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d5fb0242..91e6168e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -121,6 +121,7 @@

    Version 1.6.0

  • Fixed a bug when loading plugin files as _plugin. and not _pi.
  • Fixed a bug in the SQLite driver for PHP 4.
  • Fixed a bug in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
    • +
  • Fixed a bug in Pagination to scan for non-positive num_links.
  • Fixed an example of comma-separated emails in the email library documentation.
  • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
  • Fixed a typo in the database language file.
    • From fbe122d0c029f254019d6ebb53c9b85706d0a1a1 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 16 Jan 2008 23:59:30 +0000 Subject: [PATCH 0806/2544] added some extra protection in ctype_ function overrides to make return values match PHP's native methods for non-string types and empty strings --- system/codeigniter/Compat.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/system/codeigniter/Compat.php b/system/codeigniter/Compat.php index 3c5f70d6..108b0a1a 100644 --- a/system/codeigniter/Compat.php +++ b/system/codeigniter/Compat.php @@ -55,6 +55,11 @@ { function ctype_digit($str) { + if (! is_string($str) OR $str == '') + { + return FALSE; + } + return ! preg_match('/[^0-9]/', $str); } } @@ -75,6 +80,11 @@ function ctype_digit($str) { function ctype_alnum($str) { + if (! is_string($str) OR $str == '') + { + return FALSE; + } + return ! preg_match('/[^0-9a-z]/i', $str); } } From 8b25191aededd91dd4ab942fd0c776f073433db2 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 17 Jan 2008 00:34:37 +0000 Subject: [PATCH 0807/2544] Fixed bug #2810 with nested tags improperly having paragraph tags placed around them. --- system/helpers/typography_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php index 355f02cf..aa751db8 100644 --- a/system/helpers/typography_helper.php +++ b/system/helpers/typography_helper.php @@ -152,8 +152,8 @@ function convert($str) * ends. Later on we'll do some further clean up. * */ - $str = preg_replace("#(<.*?)(".$this->block_elements.")(.*?>)#", "

    \\1\\2\\3", $str); - $str = preg_replace("#(block_elements.")(.*?>)#", "\\1\\2\\3

    ", $str); + $str = preg_replace("#(<)(".$this->block_elements.")(.*?>)#", "

    \\1\\2\\3", $str); + $str = preg_replace("#(block_elements.")(.*?>)#", "\\1\\2\\3

    ", $str); /* * Convert "ignore" tags to temporary marker From 6b9e36d35da9c1963b9e22c7c526e24a87f35e6a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 17 Jan 2008 00:37:46 +0000 Subject: [PATCH 0808/2544] typography helper bugfix note --- user_guide/changelog.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 91e6168e..f2ae1f8c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -122,6 +122,7 @@

    Version 1.6.0

  • Fixed a bug in the SQLite driver for PHP 4.
  • Fixed a bug in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
  • Fixed a bug in Pagination to scan for non-positive num_links.
    • +
  • Fixed a bug in the typography helper causing extraneous paragraph tags when string contains tags.
  • Fixed an example of comma-separated emails in the email library documentation.
  • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
  • Fixed a typo in the database language file.
    • @@ -529,4 +530,4 @@

    Version Beta 1.0

    - \ No newline at end of file + From bafe651a15358793689e2e2f7efcfcdfec2869ae Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 17 Jan 2008 03:37:53 +0000 Subject: [PATCH 0809/2544] typos --- user_guide/changelog.html | 4 ++-- user_guide/general/models.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f2ae1f8c..eec1c2e9 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -62,7 +62,7 @@

    Version 1.6.0

    • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
    • Added the ability to auto-load Models
      • -
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or no. Previously they were always saved.
      • +
    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or not. Previously they were always saved.
    • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
    • Reorganized the URI and Routes classes for better clarity.
    • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
      • @@ -530,4 +530,4 @@

      Version Beta 1.0

    - + diff --git a/user_guide/general/models.html b/user_guide/general/models.html index cfeefaca..f5238eec 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -203,7 +203,7 @@

    Loading a Model

    }

    Auto-loading Models

    -

    If you find that you need a particular model globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. This is done by opening the application/config/autoload.php file and adding the mdoel to the autoload array.

    +

    If you find that you need a particular model globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. This is done by opening the application/config/autoload.php file and adding the model to the autoload array.

    Connecting to your Database

    From 0796b8df9e0abcda2caeb078aef2722a0f9aa193 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 17 Jan 2008 03:41:37 +0000 Subject: [PATCH 0810/2544] moved an strtolower higher into the init_class function for case insensitivity --- system/libraries/Loader.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index b78790d6..842e375a 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -820,6 +820,8 @@ function _ci_load_class($class, $params = NULL) */ function _ci_init_class($class, $prefix = '', $config = FALSE) { + $class = strtolower($class); + // Is there an associated config file for this class? if ($config === NULL) { @@ -838,8 +840,7 @@ function _ci_init_class($class, $prefix = '', $config = FALSE) $name = $prefix.$class; } - // Set the variable name we will assign the class to - $class = strtolower($class); + // Set the variable name we will assign the class to $classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class]; // Instantiate the class From c2cfd266abef9f42b8857ad7ae39c7b87fcf1e23 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 17 Jan 2008 13:30:57 +0000 Subject: [PATCH 0811/2544] added language folder to application --- system/application/language/english/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 system/application/language/english/index.html diff --git a/system/application/language/english/index.html b/system/application/language/english/index.html new file mode 100644 index 00000000..5a1f5d6a --- /dev/null +++ b/system/application/language/english/index.html @@ -0,0 +1,15 @@ + + + + +403 Forbidden + + + + + +

    Directory access is forbidden.

    + + + + \ No newline at end of file From 57211eb60cb5bcb844695746e8cba9aa6c1f9924 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 17 Jan 2008 15:56:05 +0000 Subject: [PATCH 0812/2544] clarified capitalization of model class names --- user_guide/general/models.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/general/models.html b/user_guide/general/models.html index f5238eec..8aea194e 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -137,7 +137,7 @@

    Anatomy of a Model

        }
    } -

    Where Model_name is the name of your class. Class names must be capitalized. +

    Where Model_name is the name of your class. Class names must have the first letter capitalized with the rest of the name lowercase. Make sure your class extends the base Model class.

    The file name will be a lower case version of your class name. For example, if your class is this:

    From d32d45c350ac692db6397648d77b8b0d69ef7923 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 17 Jan 2008 19:21:03 +0000 Subject: [PATCH 0813/2544] fixed bug #3003 preventing encryption from working with modes other than MCRYPT_MODE_ECB. Also added some noise to the cipher so the IV can safely be transported along with the encrypted data. --- system/libraries/Encrypt.php | 77 +++++++++++++++++++++++++++++++++++- user_guide/changelog.html | 6 ++- 2 files changed, 79 insertions(+), 4 deletions(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index e5ad78c1..5b2b7c01 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -249,7 +249,7 @@ function mcrypt_encode($data, $key) { $init_size = mcrypt_get_iv_size($this->_get_cipher(), $this->_get_mode()); $init_vect = mcrypt_create_iv($init_size, MCRYPT_RAND); - return mcrypt_encrypt($this->_get_cipher(), $key, $data, $this->_get_mode(), $init_vect); + return $this->_add_cipher_noise($init_vect.mcrypt_encrypt($this->_get_cipher(), $key, $data, $this->_get_mode(), $init_vect), $key); } // -------------------------------------------------------------------- @@ -264,13 +264,86 @@ function mcrypt_encode($data, $key) */ function mcrypt_decode($data, $key) { + $data = $this->_remove_cipher_noise($data, $key); $init_size = mcrypt_get_iv_size($this->_get_cipher(), $this->_get_mode()); - $init_vect = mcrypt_create_iv($init_size, MCRYPT_RAND); + $init_vect = substr($data, 0, $init_size); + $data = substr($data, $init_size); return rtrim(mcrypt_decrypt($this->_get_cipher(), $key, $data, $this->_get_mode(), $init_vect), "\0"); } // -------------------------------------------------------------------- + /** + * Adds permuted noise to the IV + encrypted data to protect + * against Man-in-the-middle attacks on CBC mode ciphers + * http://www.ciphersbyritter.com/GLOSSARY.HTM#IV + * + * Function description + * + * @access private + * @param string + * @param string + * @return string + */ + function _add_cipher_noise($data, $key) + { + $keyhash = $this->hash($key); + $keylen = strlen($keyhash); + $str = ''; + + for ($i = 0, $j = 0, $len = strlen($data); $i < $len; ++$i, ++$j) + { + if ($j >= $keylen) + { + $j = 0; + } + + $str .= chr((ord($data[$i]) + ord($keyhash[$j])) % 256); + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Removes permuted noise from the IV + encrypted data, reversing + * _add_cipher_noise() + * + * Function description + * + * @access public + * @param type + * @return type + */ + function _remove_cipher_noise($data, $key) + { + $keyhash = $this->hash($key); + $keylen = strlen($keyhash); + $str = ''; + + for ($i = 0, $j = 0, $len = strlen($data); $i < $len; ++$i, ++$j) + { + if ($j >= $keylen) + { + $j = 0; + } + + $temp = ord($data[$i]) - ord($keyhash[$j]); + + if ($temp < 0) + { + $temp = $temp + 256; + } + + $str .= chr($temp); + } + + return $str; + } + + // -------------------------------------------------------------------- + /** * Set the Mcrypt Cipher * diff --git a/user_guide/changelog.html b/user_guide/changelog.html index eec1c2e9..3b6a3220 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -97,7 +97,8 @@

    Version 1.6.0

  • Modified variable names in _ci_load() method of Loader class to avoid conflicts with view variables.
  • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
  • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
    • -
  • Documented distinct() in Active Record.
    • +
  • Strengthened the Encryption library to help protect against man in the middle attacks when MCRYPT_MODE_CBC mode is used.
    • +
  • Documented distinct() in Active Record.
  • Documented the timezones() function in the Date Helper.
  • Documented unset_userdata in the Session class.
  • Documented 2 config options to the Database configuration page.
    • @@ -123,7 +124,8 @@

    Version 1.6.0

  • Fixed a bug in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
  • Fixed a bug in Pagination to scan for non-positive num_links.
  • Fixed a bug in the typography helper causing extraneous paragraph tags when string contains tags.
    • -
  • Fixed an example of comma-separated emails in the email library documentation.
    • +
  • Fixed a bug in the Encryption Library to support modes other than MCRYPT_MODE_ECB
    • +
  • Fixed an example of comma-separated emails in the email library documentation.
  • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
  • Fixed a typo in the database language file.
  • Fixed a typo in the image language file "suppor" to "support".
    • From 1d4191447297c4404c59e364c465476b795ba28e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 17 Jan 2008 19:56:03 +0000 Subject: [PATCH 0814/2544] typo fixes --- user_guide/libraries/sessions.html | 2 +- user_guide/toc.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 0bc743c8..9fca09be 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -28,7 +28,7 @@
    - +

    CodeIgniter User Guide Version 1.5.3

    CodeIgniter User Guide Version 1.6.0
    diff --git a/user_guide/toc.html b/user_guide/toc.html index 6ab19a3c..5bd0a384 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -144,7 +144,7 @@

    Class Reference

  • User Agent Class
  • Validation Class
  • XML-RPC Class
    • -
  • Zip Encoding Class
    • +
  • Zip Encoding Class
    • From 05b3a5df12ec91f4762786c4b8a70136825b1e41 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 17 Jan 2008 20:25:46 +0000 Subject: [PATCH 0815/2544] orderby fix --- system/database/DB_active_rec.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 3cc65aff..c899b7f4 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -749,7 +749,8 @@ function order_by($orderby, $direction = '') $direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC'), TRUE)) ? ' '.$direction : ' ASC'; } - $this->ar_orderby[] = $this->_protect_identifiers($orderby).$direction; + $this->ar_orderby[] = $this->_protect_identifiers($orderby, TRUE).$direction; + return $this; } From 73ed7b1c00db25b624d59fd11eacb868aa680d63 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 17 Jan 2008 21:28:06 +0000 Subject: [PATCH 0816/2544] --- system/language/english/email_lang.php | 40 +++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index 430ae4ab..040e0eaa 100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php @@ -1,21 +1,21 @@ - \ No newline at end of file From dd4fe956952f9f9fd3184c34e75d4be76f899b64 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 17 Jan 2008 23:00:01 +0000 Subject: [PATCH 0817/2544] modified download links to work with new location --- user_guide/installation/downloads.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 1104f8ba..e1b7605b 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -59,17 +59,17 @@

    Downloading CodeIgniter

    From 646c04f97188b5b95ed14dbb3fc8a976c7c79322 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 17 Jan 2008 23:01:42 +0000 Subject: [PATCH 0818/2544] removed $assign_to_controller - seems redundant all things considered --- index.php | 14 -------------- system/codeigniter/CodeIgniter.php | 2 +- user_guide/changelog.html | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/index.php b/index.php index eb364ec0..85042d41 100644 --- a/index.php +++ b/index.php @@ -42,20 +42,6 @@ */ $application_folder = "application"; - -/* -|--------------------------------------------------------------- -| Default Controller Data Assignment -|--------------------------------------------------------------- -| -| If you need any data passed by default to your controllers you -| can use this variable. When a controller class is instantiated -| this data will be passed to the controller constructor. -| -*/ - $assign_to_controller = NULL; - - /* |=============================================================== | END OF USER CONFIGURABLE SETTINGS diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 1b38f272..39d07b0d 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -1 +1 @@ -mark('total_execution_time_start'); $BM->mark('loading_time_base_classes_start'); /* * ------------------------------------------------------ * Instantiate the hooks class * ------------------------------------------------------ */ $EXT =& load_class('Hooks'); /* * ------------------------------------------------------ * Is there a "pre_system" hook? * ------------------------------------------------------ */ $EXT->_call_hook('pre_system'); /* * ------------------------------------------------------ * Instantiate the base classes * ------------------------------------------------------ */ $CFG =& load_class('Config'); $URI =& load_class('URI'); $RTR =& load_class('Router'); $OUT =& load_class('Output'); /* * ------------------------------------------------------ * Is there a valid cache file? If so, we're done... * ------------------------------------------------------ */ if ($EXT->_call_hook('cache_override') === FALSE) { if ($OUT->_display_cache($CFG, $RTR) == TRUE) { exit; } } /* * ------------------------------------------------------ * Load the remaining base classes * ------------------------------------------------------ */ $IN =& load_class('Input'); $LANG =& load_class('Language'); /* * ------------------------------------------------------ * Load the app controller and local controller * ------------------------------------------------------ * * Note: Due to the poor object handling in PHP 4 we'll * conditionally load different versions of the base * class. Retaining PHP 4 compatibility requires a bit of a hack. * * Note: The Loader class needs to be included first * */ if (floor(phpversion()) < 5) { load_class('Loader', FALSE); require(BASEPATH.'codeigniter/Base4'.EXT); } else { require(BASEPATH.'codeigniter/Base5'.EXT); } // Load the base controller class load_class('Controller', FALSE); // Load the local application controller // Note: The Router class automatically validates the controller path. If this include fails it // means that the default controller in the Routes.php file is not resolving to something valid. if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) { show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); } include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT); // Set a mark point for benchmarking $BM->mark('loading_time_base_classes_end'); /* * ------------------------------------------------------ * 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 */ $class = $RTR->fetch_class(); $method = $RTR->fetch_method(); if ( ! class_exists($class) OR $method == 'controller' OR substr($method, 0, 1) == '_' OR in_array($method, get_class_methods('Controller'), TRUE) ) { show_404(); } /* * ------------------------------------------------------ * Is there a "pre_controller" hook? * ------------------------------------------------------ */ $EXT->_call_hook('pre_controller'); /* * ------------------------------------------------------ * Instantiate the controller and call requested method * ------------------------------------------------------ */ // Mark a start point so we can benchmark the controller $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); // Instantiate the Controller and pass any global data that might exist $assign_to_controller = ( ! isset($assign_to_controller)) ? NULL : $assign_to_controller; $CI = new $class($assign_to_controller); unset($assign_to_controller); // Is this a scaffolding request? if ($RTR->scaffolding_request === TRUE) { if ($EXT->_call_hook('scaffolding_override') === FALSE) { $CI->_ci_scaffolding(); } } else { /* * ------------------------------------------------------ * Is there a "post_controller_constructor" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_controller_constructor'); // Is there a "remap" function? if (method_exists($CI, '_remap')) { $CI->_remap($method); } else { if ( ! method_exists($CI, $method)) { show_404(); } // Call the requested method. // Any URI segments present (besides the class/function) will be passed to the method for convenience call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3))); } } // Mark a benchmark end point $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end'); /* * ------------------------------------------------------ * Is there a "post_controller" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_controller'); /* * ------------------------------------------------------ * Send the final rendered output to the browser * ------------------------------------------------------ */ if ($EXT->_call_hook('display_override') === FALSE) { $OUT->_display(); } /* * ------------------------------------------------------ * Is there a "post_system" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_system'); /* * ------------------------------------------------------ * Close the DB connection if one exists * ------------------------------------------------------ */ if (class_exists('CI_DB') AND isset($CI->db)) { $CI->db->close(); } ?> \ No newline at end of file +mark('total_execution_time_start'); $BM->mark('loading_time_base_classes_start'); /* * ------------------------------------------------------ * Instantiate the hooks class * ------------------------------------------------------ */ $EXT =& load_class('Hooks'); /* * ------------------------------------------------------ * Is there a "pre_system" hook? * ------------------------------------------------------ */ $EXT->_call_hook('pre_system'); /* * ------------------------------------------------------ * Instantiate the base classes * ------------------------------------------------------ */ $CFG =& load_class('Config'); $URI =& load_class('URI'); $RTR =& load_class('Router'); $OUT =& load_class('Output'); /* * ------------------------------------------------------ * Is there a valid cache file? If so, we're done... * ------------------------------------------------------ */ if ($EXT->_call_hook('cache_override') === FALSE) { if ($OUT->_display_cache($CFG, $RTR) == TRUE) { exit; } } /* * ------------------------------------------------------ * Load the remaining base classes * ------------------------------------------------------ */ $IN =& load_class('Input'); $LANG =& load_class('Language'); /* * ------------------------------------------------------ * Load the app controller and local controller * ------------------------------------------------------ * * Note: Due to the poor object handling in PHP 4 we'll * conditionally load different versions of the base * class. Retaining PHP 4 compatibility requires a bit of a hack. * * Note: The Loader class needs to be included first * */ if (floor(phpversion()) < 5) { load_class('Loader', FALSE); require(BASEPATH.'codeigniter/Base4'.EXT); } else { require(BASEPATH.'codeigniter/Base5'.EXT); } // Load the base controller class load_class('Controller', FALSE); // Load the local application controller // Note: The Router class automatically validates the controller path. If this include fails it // means that the default controller in the Routes.php file is not resolving to something valid. if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) { show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); } include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT); // Set a mark point for benchmarking $BM->mark('loading_time_base_classes_end'); /* * ------------------------------------------------------ * 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 */ $class = $RTR->fetch_class(); $method = $RTR->fetch_method(); if ( ! class_exists($class) OR $method == 'controller' OR substr($method, 0, 1) == '_' OR in_array($method, get_class_methods('Controller'), TRUE) ) { show_404(); } /* * ------------------------------------------------------ * Is there a "pre_controller" hook? * ------------------------------------------------------ */ $EXT->_call_hook('pre_controller'); /* * ------------------------------------------------------ * Instantiate the controller and call requested method * ------------------------------------------------------ */ // Mark a start point so we can benchmark the controller $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); $CI = new $class(); // Is this a scaffolding request? if ($RTR->scaffolding_request === TRUE) { if ($EXT->_call_hook('scaffolding_override') === FALSE) { $CI->_ci_scaffolding(); } } else { /* * ------------------------------------------------------ * Is there a "post_controller_constructor" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_controller_constructor'); // Is there a "remap" function? if (method_exists($CI, '_remap')) { $CI->_remap($method); } else { if ( ! method_exists($CI, $method)) { show_404(); } // Call the requested method. // Any URI segments present (besides the class/function) will be passed to the method for convenience call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, (($RTR->fetch_directory() == '') ? 2 : 3))); } } // Mark a benchmark end point $BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end'); /* * ------------------------------------------------------ * Is there a "post_controller" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_controller'); /* * ------------------------------------------------------ * Send the final rendered output to the browser * ------------------------------------------------------ */ if ($EXT->_call_hook('display_override') === FALSE) { $OUT->_display(); } /* * ------------------------------------------------------ * Is there a "post_system" hook? * ------------------------------------------------------ */ $EXT->_call_hook('post_system'); /* * ------------------------------------------------------ * Close the DB connection if one exists * ------------------------------------------------------ */ if (class_exists('CI_DB') AND isset($CI->db)) { $CI->db->close(); } ?> \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3b6a3220..ab933811 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -63,7 +63,6 @@

    Version 1.6.0

  • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
  • Added the ability to auto-load Models
  • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or not. Previously they were always saved.
    • -
  • Added $assign_to_controller variable in the main index.php file. Anything that this variable contains will be passed automatically to a controller constructor when initialized.
  • Reorganized the URI and Routes classes for better clarity.
  • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
  • Added DBForge to the database tools.
    • From c76a3746c9141ab767219fca0f0dbc7535d52cb7 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 18 Jan 2008 00:42:35 +0000 Subject: [PATCH 0819/2544] Fixed a bug (#3175) preventing certain libraries from working properly when autoloaded in PHP 4 by re-syncing the master object from the copy --- system/libraries/Controller.php | 9 +++++++++ user_guide/changelog.html | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 0b34465a..1b9a42a1 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -84,6 +84,15 @@ function _ci_initialize() else { $this->_ci_autoloader(); + + // sync up the objects since PHP4 was working from a copy + foreach (array_keys(get_object_vars($this)) as $attribute) + { + if (is_object($this->$attribute)) + { + $this->load->$attribute =& $this->$attribute; + } + } } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ab933811..89276e24 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -123,7 +123,8 @@

    Version 1.6.0

  • Fixed a bug in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
  • Fixed a bug in Pagination to scan for non-positive num_links.
  • Fixed a bug in the typography helper causing extraneous paragraph tags when string contains tags.
    • -
  • Fixed a bug in the Encryption Library to support modes other than MCRYPT_MODE_ECB
    • +
  • Fixed a bug in the Encryption Library to support modes other than MCRYPT_MODE_ECB
    • +
  • Fixed a bug (#3175) preventing certain libraries from working properly when autoloaded in PHP 4
  • Fixed an example of comma-separated emails in the email library documentation.
  • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
  • Fixed a typo in the database language file.
    • From cdf6a5f6b3c182cdce94c105e61dbea8830dea53 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 18 Jan 2008 03:08:09 +0000 Subject: [PATCH 0820/2544] added link to upgrading guide --- user_guide/installation/upgrading.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index ecc00b2f..fb931bb9 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -60,6 +60,7 @@

    Upgrading From a Previous Version

    Please read the upgrade notes corresponding to the version you are upgrading from.

      +
    • Upgrading from 1.5.4 to 1.6.0
    • Upgrading from 1.5.3 to 1.5.4
    • Upgrading from 1.5.2 to 1.5.3
    • Upgrading from 1.5.0 or 1.5.1 to 1.5.2
      • From f6cd45ccb9f8825eb44dd2fa736c7aa0082ff98c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 18 Jan 2008 14:31:51 +0000 Subject: [PATCH 0821/2544] fix for count_all --- system/database/drivers/mssql/mssql_driver.php | 4 ++-- system/database/drivers/mysql/mysql_driver.php | 2 +- system/database/drivers/mysqli/mysqli_driver.php | 2 +- system/database/drivers/oci8/oci8_driver.php | 2 +- system/database/drivers/odbc/odbc_driver.php | 4 ++-- system/database/drivers/postgre/postgre_driver.php | 4 +--- system/database/drivers/sqlite/sqlite_driver.php | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 06a508e7..71d6c427 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -297,8 +297,8 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->_count_string . "FROM ".$this->dbprefix.$table); - + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table)); + if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 36e36516..9ba37b45 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -312,7 +312,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table)); if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 94a29937..e548fb05 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -306,7 +306,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table)); if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 160a56d5..56095e92 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -413,7 +413,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->_count_string . "FROM ".$table); + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table)); if ($query == FALSE) { diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index c5c582d0..03f58e26 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -281,8 +281,8 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`"); - + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table)); + if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index fa27f03d..8ea76033 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -302,9 +302,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->_count_string .'FROM "'.$this->dbprefix.$table.'"'); -// original query before _count_string was used. Kept for reference -// $query = $this->query('SELECT COUNT(*) AS numrows FROM "'.$this->dbprefix.$table.'"'); + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table)); if ($query->num_rows() == 0) return '0'; diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 110b208d..31b29289 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -298,7 +298,7 @@ function count_all($table = '') if ($table == '') return '0'; - $query = $this->query($this->_count_string . "FROM `".$this->dbprefix.$table."`"); + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table)); if ($query->num_rows() == 0) return '0'; From f8f05703f61689b4d0b432f12e36a27f15778458 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 18 Jan 2008 14:39:23 +0000 Subject: [PATCH 0822/2544] added check for "multiple" attribute in form_dropdown() (bug# 3261) --- system/helpers/form_helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index c3a3ccb5..a727f471 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -231,7 +231,8 @@ function form_dropdown($name = '', $options = array(), $selected = array(), $ext } if ($extra != '') $extra = ' '.$extra; - $multiple = (count($selected) > 1) ? ' multiple="multiple"' : ''; + + $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; $form = 'Search User Guide    - - - - -
      - - - -
      - -

      Upgrading from 1.5.4 to 1.5.5

      - -

      Before performing an update you should take your site offline by replacing the index.php file with a static one.

      - - - -

      Step 1: Update your CodeIgniter files

      - -

      Replace these files and directories in your "system" folder with the new versions:

      - -
        - -
      • system/codeigniter
        • -
      • system/database
        • -
      • system/helpers
        • -
      • system/libraries
        • -
      • system/plugins
        • -
      - -

      Note: If you have any custom developed files in these folders please make copies of them first.

      - -

      Step 2: Add time_to_update to your config.php

      -

      Add the following to system/application/config/config.php with the other

      -$config['sess_time_to_update'] = 300; -

      Step 3: Update your user guide

      -

      Please also replace your local copy of the user guide with the new version.

      - -
      - - - - - - - \ No newline at end of file From 5a34f04129f97fff9f6a3f8b9d02bf724134cd06 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 19 Jan 2008 19:41:54 +0000 Subject: [PATCH 0839/2544] added email helper --- system/helpers/email_helper.php | 54 +++++++++++++ user_guide/helpers/download_helper.html | 3 +- user_guide/helpers/email_helper.html | 103 ++++++++++++++++++++++++ user_guide/helpers/file_helper.html | 5 +- user_guide/nav/nav.js | 1 + user_guide/toc.html | 1 + 6 files changed, 162 insertions(+), 5 deletions(-) create mode 100644 system/helpers/email_helper.php create mode 100644 user_guide/helpers/email_helper.html diff --git a/system/helpers/email_helper.php b/system/helpers/email_helper.php new file mode 100644 index 00000000..3729e042 --- /dev/null +++ b/system/helpers/email_helper.php @@ -0,0 +1,54 @@ + \ No newline at end of file diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index ff9bd2e8..a82d1980 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -104,8 +104,7 @@

      force_download('filename', 'data')

         ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  File Helper -

      +Next Topic:  Email Helper

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html new file mode 100644 index 00000000..fe0e3cc4 --- /dev/null +++ b/user_guide/helpers/email_helper.html @@ -0,0 +1,103 @@ + + + + +CodeIgniter User Guide : Download Helper + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.0

    +
    + + + + + + + + + + +
    + + +
    + + + +
    + + +

    Download Helper

    + +

    The Download Helper lets you download data to your desktop.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper(email); + +

    The following functions are available:

    + +

    valid_email('email')

    + +

    Checks if an email is a correctly formatted email. Note that is doesn't actually prove the email will recieve mail, simply that it is a validly formed address.

    +

    It returns TRUE/FALSE

    + $this->load->helper(email);
    +
    +if (valid_email('email@somesite.com'))
    +{
    +    echo 'email is valid';
    +}
    +else
    +{
    +    echo 'email is not valid';
    +}     +

    send_email('recipient', 'subject', 'message')

    +

    Sends an email using PHP's native mail() function. For a more robust email solution, see CodeIgniter's Email Class.

    +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 29a85940..d2d61ad0 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -136,12 +136,11 @@

    get_filenames('path/to/directory/')

    diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index ef484f6f..951c1905 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -102,6 +102,7 @@ function create_menu(basepath) '
  • Date Helper
    • ' + '
  • Directory Helper
    • ' + '
  • Download Helper
    • ' + + '
  • Email Helper
    • ' + '
  • File Helper
    • ' + '
  • Form Helper
    • ' + '
  • HTML Helper
    • ' + diff --git a/user_guide/toc.html b/user_guide/toc.html index 3c6b827c..465d8f4b 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -158,6 +158,7 @@

    Helper Reference

  • Date Helper
  • Directory Helper
  • Download Helper
    • +
  • Email Helper
  • File Helper
  • Form Helper
  • HTML Helper
    • From 08c688747f7ed2757ad428c7c4e2f6a5fd97dc23 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 19 Jan 2008 19:43:17 +0000 Subject: [PATCH 0840/2544] Added an email helper into core helpers. --- user_guide/changelog.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 74068ef3..684d3fa9 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -120,7 +120,8 @@

    Version 1.6.0

  • Helpers & Plugins
      -
    • Added strip_quotes() function to string helper.
      • +
    • Added an email helper into core helpers.
      • +
    • Added strip_quotes() function to string helper.
    • Added reduce_multiples() function to string helper.
    • Added quotes_to_entities() function to string helper.
    • Added form_fieldset(), form_fieldset_close(), form_label(), and form_reset() function to form helper.
      • From d87815d21ec08974eaa386f0be9936a5f1e630fa Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 19 Jan 2008 19:48:33 +0000 Subject: [PATCH 0841/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 684d3fa9..3283b1a6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -90,6 +90,7 @@

      Version 1.6.0

    • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or not. Previously they were always saved.
    • Added 'random' as an order_by() option , and removed "rand()" as a listed option as it was MySQL only.
    • Added a check for NULL fields in the MySQL database backup utility.
      • +
    • Added "constrain_by_prefix" parameter to db->list_table() function. If set to TRUE it will limit the result to only table names with the current prefix.
    • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); havingor() for having_or(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
    • From afd99ac2c240faafc3c3d18f5bb4aa03cd24c41c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 19 Jan 2008 19:59:14 +0000 Subject: [PATCH 0842/2544] Added attributes into of userguide for valid html. --- user_guide/changelog.html | 7 ++++--- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/forge.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/index.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/email_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/index.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_153.html | 2 +- user_guide/installation/upgrade_154.html | 2 +- user_guide/installation/upgrade_160.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 107 files changed, 110 insertions(+), 109 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3283b1a6..f86e1f53 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Change Log @@ -136,6 +136,7 @@

    Version 1.6.0

  • Documentation Changes
    • Added titles to all user manual pages.
      • +
    • Added attributes into <html> of userguide for valid html.
    • Added Zip Encoding Class to the table of contents of the userguide.
    • Moved part of the userguide menu javascript to an external file.
    • Documented distinct() in Active Record.
      • @@ -308,7 +309,7 @@

      Version 1.5.0

    • Added new helper: Smiley Helper
    • Added support for <ul> and <ol> lists in the HTML Helper
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
      • -
    • Added the ability to rename or relocate the "application" folder. +
    • Added the ability to rename or relocate the "application" folder.
    • Added more thorough initialization in the upload class so that all class variables are reset.
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
      • @@ -492,7 +493,7 @@

      Version 1.3

    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
    • Added a new error template for use with native PHP errors.
      • -
    • Added "alternator" function in the string helpers. +
    • Added "alternator" function in the string helpers.
    • Removed slashing from the input class. After much debate we decided to kill this feature.
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 4ba5bfd9..bf436996 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Active Record diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 9e007f92..d286c928 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Database Caching Class diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 87ff2dfe..97661de2 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Custom Function Calls diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index b6126d9f..c9ad2e3c 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Database Configuration diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index adf0c518..a86866d2 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Connecting to your Database diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 434aa828..d8c01aa0 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Database Quick Start diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index de5e021b..6da71c11 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Field Data diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index 0a404544..7fc6589c 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Database Utility Class diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 6567c027..edf7faec 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Query Helper Functions diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 6ad90e97..76c32e2d 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : The Database Class diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 21b550ae..687076f9 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Queries diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 6c6142c0..6a7bf04a 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Generating Query Results diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index c5d2aaae..9f1c9746 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Table Data diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 19f091e9..1c2d9b13 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Transactions diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 56a728b1..b6cdb8ac 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Database Utility Class diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index a91af151..3446b263 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Alternate PHP Syntax for View Files diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 148850ee..daf5fb6c 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Creating Ancillary Classes diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 8d000a96..8cf89194 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Auto-loading Resources diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 5cf81167..ecf06531 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Web Page Caching diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 3b25087d..cd11eb1a 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Controllers diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 9ba027ca..c8117b96 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Creating Core System Classes diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 38ad1077..370f1d40 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Creating Libraries diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index eb1d4b81..04f9475d 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Credits diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 4db0c4d4..a3baf696 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Error Handling diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 65e549c6..f4e607f5 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Helper Functions diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 0441aca1..63bf4bea 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Hooks diff --git a/user_guide/general/index.html b/user_guide/general/index.html index a2200422..f7cb9e87 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Getting Started With CodeIgniter diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 3ae4c587..a9d3703d 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Using CodeIgniter Libraries diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 3cc899eb..7b0613b6 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Managing your Applications diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 3164669e..9a672ff2 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Models diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index a34f3680..20272891 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Plugins diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index f9c937db..adb16849 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Profiling Your Application diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 9dd9e9e8..7ac2938c 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Quick Reference Chart diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index df63b914..9acbd57d 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Server Requirements diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 9b29c3f2..ce1700b8 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : URI Routing diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index 27ee2090..cb4eceb0 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Scaffolding diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 9a48c7ea..0dd1f1f2 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Security diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index f3a01e5c..a3389dee 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : CodeIgniter URLs diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 5ad9fc5c..e41503f5 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Views diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index a9c443cd..b9fac010 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Array Helper diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 37167d87..81e679b6 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Cookie Helper diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 73a980aa..d98a72e9 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Date Helper diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index fcb10cc9..0fd84695 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Directory Helper diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index a82d1980..7da50777 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Download Helper diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index fe0e3cc4..b7aff6f2 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Download Helper diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index d2d61ad0..f78cc58c 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : File Helper diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index cc2dda1f..ed583b0b 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Form Helper diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index c3133a15..be59bf07 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : HTML Helper diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html index 23fb245d..04aafe98 100644 --- a/user_guide/helpers/index.html +++ b/user_guide/helpers/index.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Helper Functions diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 699be580..e931cb10 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Inflector Helper diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 4cd5d6e4..8b15d907 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Security Helper diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 50b095f9..50805488 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Smiley Helper diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 206c5eaf..4cebf502 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : String Helper diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 43db044d..5e6af006 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Text Helper diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 5a283840..543db3f4 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Typography Helper diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index d28b6956..a177a1c2 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : URL Helper diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 936f1e82..086a3f27 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : XML Helper diff --git a/user_guide/index.html b/user_guide/index.html index 62ebcbc5..491e5c80 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Welcome to CodeIgniter diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 03ce391b..f6561d43 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Downloading CodeIgniter diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 89bd2563..f01fbb3d 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Installation Instructions diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 80122619..294ec8a6 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Troubleshooting diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 01ffa0aa..554a80ad 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index 202cc33c..95cec499 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 32195404..dad3e8ca 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 2cf13cc7..9a6d0751 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 9bd50aca..b71694c2 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 6ee915f4..e03547b2 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 90bb62af..239fa51e 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index a6c93e80..456e4dac 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index d0a19bac..370e3b87 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 5671b48a..33d3837b 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 07dfa5dc..6e8316c9 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Upgrading from 1.5.3 to 1.5.4 diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index dffbb76f..231404d0 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Upgrading from 1.5.3 to 1.5.4 diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 09e93c09..1f47418d 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index fccebe0b..c40da5af 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Upgrading From a Previous Version diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 1a91abff..9fcd6459 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Benchmarking Class diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 5e4e30c2..2e75a7ed 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Calendaring Class diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index bf653fe8..93b08571 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Config Class diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 01085d58..6da687bf 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Email Class diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index c4499a8d..1890c2ea 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Encryption Class diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 46f6120d..64a93031 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : File Uploading Class diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 87309f83..8f3c10a9 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : FTP Class diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 1cca5bc6..9cb31a58 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Image Manipulation Class diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index e1c5fcb2..0cd81e3f 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Input Class diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 38fd4ae5..72fec89a 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Language Class diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 56ccc213..ad120f50 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Loader Class diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 827cc8bd..1905f324 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Output Class diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index f8389f9b..e8696f68 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Pagination Class diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 8bf4afd1..0809ea16 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Template Parser Class diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 86d6e161..7d6c6930 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 59930d4f..0c15a070 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : HTML Table Class diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index d816fab3..b0956061 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Trackback Class diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 0143c9c7..70567fcd 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Unit Testing Class diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 180e56ce..6c424cb1 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : URI Class diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 1d11fbd0..59304f6a 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : User Agent Class diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 377503be..af5631ca 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Form Validation diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index a44f8bd1..49678a64 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : XML-RPC and XML-RPC Server Classes diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 23e7587c..8361c92d 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Zip Encoding Class diff --git a/user_guide/license.html b/user_guide/license.html index b8230251..5962967d 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : CodeIgniter License Agreement diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 2a7e5622..74e6f70c 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Application Flow Chart diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 665d0a5b..28208109 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : CodeIgniter at a Glance diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 4d380b75..139dd8c8 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : CodeIgniter Features diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 61d156bf..bcbd1794 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Design and Architectural Goals diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 7a05862d..2f3df3c5 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : CodeIgniter Overview diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 603e58a3..03c94fe5 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Model-View-Controller diff --git a/user_guide/toc.html b/user_guide/toc.html index 465d8f4b..b729b528 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -1,5 +1,5 @@ - + CodeIgniter User Guide : Table of Contents From 5b0a881d9251ce94114f0cc0eb6f080c163044aa Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 21 Jan 2008 14:26:33 +0000 Subject: [PATCH 0843/2544] documented sess_time_to_update --- user_guide/libraries/sessions.html | 104 +++++++++++++++-------------- 1 file changed, 53 insertions(+), 51 deletions(-) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 7d6c6930..4e46b85a 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -231,57 +231,59 @@

      Session Preferences

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      PreferenceDefaultOptionsDescription
      sess_cookie_nameci_sessionNoneThe name you world the session cookie saved as.
      sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). -If you would like a non-expiring session set the value to zero: 0
      sess_encrypt_cookieFALSETRUE/FALSE (boolean)Whether to encrypt the session data.
      sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database. You must create the table before enabling this option.
      sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.
      sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data. Note that some ISPs dynamically -changes the IP, so if you want a non-expiring session you will likely set this to FALSE.
      sess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.PreferenceDefaultOptionsDescription
      sess_cookie_nameci_sessionNoneThe name you world the session cookie saved as.
      sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). If you would like a non-expiring session set the value to zero: 0
      sess_encrypt_cookieFALSETRUE/FALSE (boolean)Whether to encrypt the session data.
      sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database. You must create the table before enabling this option.
      sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.
      sess_time_to_update300Time in millisecondsThis options controls how often the session class will regenerate itself and create a new session id.
      sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data. Note that some ISPs dynamically + changes the IP, so if you want a non-expiring session you will likely set this to FALSE.
      sess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.
      From 78c3fa83531d4c1ca292f64e9383a9a4ff0f795b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 21 Jan 2008 15:11:13 +0000 Subject: [PATCH 0844/2544] assorted guide fixes and additions --- user_guide/changelog.html | 4 ++-- user_guide/general/controllers.html | 2 ++ user_guide/general/requirements.html | 4 ++-- user_guide/general/views.html | 15 ++++++--------- user_guide/helpers/email_helper.html | 9 ++++----- user_guide/overview/at_a_glance.html | 2 +- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f86e1f53..e1d2365d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -72,7 +72,7 @@

      Version 1.6.0

      • Added protect_identifiers() in Active Record.
      • All AR queries are backticked if appropriate to the database.
        • -
      • Added where_in(), where_in_or(), where_not_in(), where_not_in_or(), not_like() and or_not_like() to Active Record.
        • +
      • Added where_in(), or_where_in(), where_not_in(), or_where_not_in(), not_like() and or_not_like() to Active Record.
      • Added support for limit() into update() and delete() statements in Active Record.
      • Added empty_table() and truncate_table() to Active Record.
      • Added the ability to pass an array of tables to the delete() statement in Active Record.
        • @@ -113,7 +113,7 @@

        Version 1.6.0

      • Moved the safe mode and auth checks for the Email library into the constructor.
      • Modified prep_for_form() in the Validation class to accept arrays, adding support for POST array validation (via callbacks only)
      • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
        • -
      • Modified Upload class $_FILE error messages to be more precise.
        • +
      • Modified Upload class $_FILES error messages to be more precise.
      • Modified variable names in _ci_load() method of Loader class to avoid conflicts with view variables.
      • Added a few additional mime type variations for CSV.
      diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index cd11eb1a..d4f1489c 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -375,6 +375,8 @@

      Reserved Function Names

    • CI_Loader
    • config
    • database
      • +
    • dbutil
      • +
    • dbforge
    • file
    • helper
    • helpers
      • diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 9acbd57d..11a50767 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -58,8 +58,8 @@

      Server Requirements

        -
      • PHP version 4.3.2 or newer
        • -
      • A Database. Supported databases are MySQL, MySQLi, MS SQL, Postgre, Oracle, SQLite, and ODBC
        • +
      • PHP version 4.3.2 or newer.
        • +
      • A Database is required for most web appliction programming. Current supported databases are MySQL, MySQLi, MS SQL, Postgre, Oracle, SQLite, and ODBC.
      diff --git a/user_guide/general/views.html b/user_guide/general/views.html index e41503f5..851da92e 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -162,7 +162,7 @@

      Adding Dynamic Data to the View

      Let's try it with your controller file. Open it add this code:

      @@ -193,9 +193,6 @@

      Adding Dynamic Data to the View

      Then load the page at the URL you've been using and you should see the variables replaced.

      -

      Note: You'll notice that in the example above we are using PHP's alternative syntax. If you -are not familiar with it you can read about it here.

      -

      Creating Loops

      The data array you pass to your view files is not limited to simple variables. You can @@ -205,7 +202,7 @@

      Creating Loops

      Here's a simple example. Add this to your controller:

      @@ -242,12 +239,12 @@

      Creating Loops

      <?php endforeach;?> </ul> - </body> </html> - +

      Note: You'll notice that in the example above we are using PHP's alternative syntax. If you +are not familiar with it you can read about it here.

    • diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index b7aff6f2..48c47f29 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -2,7 +2,7 @@ -CodeIgniter User Guide : Download Helper +CodeIgniter User Guide : Email Helper @@ -57,15 +57,14 @@
    -

    Download Helper

    - -

    The Download Helper lets you download data to your desktop.

    +

    Email Helper

    +

    The Email Helper provides some assitive functions for working with Email. For a more robust email solution, see CodeIgniter's Email Class.

    Loading this Helper

    This helper is loaded using the following code:

    -$this->load->helper(email); +

    $this->load->helper('email');

    The following functions are available:

    diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 28208109..f762f789 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -74,7 +74,7 @@

    CodeIgniter Runs on PHP 4

    CodeIgniter is written to be compatible with PHP 4. Although we would have loved to take advantage of the better object handling in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance), at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our -potential audience. Major OS vendors like RedHat have yet to support PHP 5, and they are unlikely to do so until 2007, so +potential audience. Major OS vendors like RedHat are moving slowly to support PHP 5, and they are unlikely to do so in the short term, so we felt that it did not serve the best interests of the PHP community to write CodeIgniter in PHP 5.

    Note: CodeIgniter will run on PHP 5. It simply does not take advantage of any native features that are only available in that version.

    From af6a8be88c21e80889980426792b52f7aeee01f9 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 21 Jan 2008 15:24:06 +0000 Subject: [PATCH 0845/2544] typo fix string helper --- user_guide/helpers/string_helper.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 4cebf502..476822e4 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -80,7 +80,7 @@

    random_string()

  • numeric:  Numeric string.
  • nozero:  Numeric string with no zeros.
  • unique:  Encrypted with MD5 and uniqid(). Note: The length parameter is not available for this type. -Returns a fixed length 33 character string.
    • +Returns a fixed length 32 character string.

    Usage example:

    From df264429b7171da21524be93d38e334fadec801b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 21 Jan 2008 16:48:11 +0000 Subject: [PATCH 0846/2544] added dbprefix to dbforge functions --- system/database/DB_forge.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index d4f1faeb..f8b74c08 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -180,7 +180,7 @@ function create_table($table = '', $if_not_exists = FALSE) show_error('Field information is required.'); } - $sql = $this->_create_table($table, $this->fields, $this->primary_keys, $this->keys, $if_not_exists); + $sql = $this->_create_table($this->db->dbprefix.$table, $this->fields, $this->primary_keys, $this->keys, $if_not_exists); $this->_reset(); return $this->db->query($sql); @@ -197,7 +197,7 @@ function create_table($table = '', $if_not_exists = FALSE) */ function drop_table($table_name) { - $sql = $this->_drop_table($table_name); + $sql = $this->_drop_table($this->db->dbprefix.$table_name); if (is_bool($sql)) { @@ -234,7 +234,7 @@ function add_column($table = '', $field = array(), $after_field = '') show_error('Field information is required.'); } - $sql = $this->_alter_table('ADD', $table, $this->fields, $after_field); + $sql = $this->_alter_table('ADD', $this->db->dbprefix.$table, $this->fields, $after_field); $this->_reset(); return $this->db->query($sql); @@ -263,7 +263,7 @@ function drop_column($table = '', $column_name = '') show_error('A column name is required for that operation.'); } - $sql = $this->_alter_table('DROP', $table, $column_name); + $sql = $this->_alter_table('DROP', $this->db->dbprefix.$table, $column_name); return $this->db->query($sql); } @@ -296,7 +296,7 @@ function modify_column($table = '', $field = array()) show_error('Field information is required.'); } - $sql = $this->_alter_table('CHANGE', $table, $this->fields); + $sql = $this->_alter_table('CHANGE', $this->db->dbprefix.$table, $this->fields); $this->_reset(); return $this->db->query($sql); From 7a9193afa6d890a91eb3528fa0e62df799b07ed6 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 21 Jan 2008 18:39:20 +0000 Subject: [PATCH 0847/2544] replaced www.codeigniter.com with codeigniter.com --- index.php | 2 +- system/application/config/config.php | 6 ++-- system/application/config/hooks.php | 2 +- system/application/config/routes.php | 2 +- system/application/config/smileys.php | 2 +- system/codeigniter/Base4.php | 6 ++-- system/codeigniter/Base5.php | 6 ++-- system/codeigniter/CodeIgniter.php | 6 ++-- system/codeigniter/Common.php | 6 ++-- system/codeigniter/Compat.php | 6 ++-- system/database/DB.php | 6 ++-- system/database/DB_active_rec.php | 6 ++-- system/database/DB_cache.php | 6 ++-- system/database/DB_driver.php | 6 ++-- system/database/DB_forge.php | 6 ++-- system/database/DB_result.php | 6 ++-- system/database/DB_utility.php | 6 ++-- .../database/drivers/mssql/mssql_driver.php | 6 ++-- system/database/drivers/mssql/mssql_forge.php | 6 ++-- .../database/drivers/mssql/mssql_result.php | 6 ++-- .../database/drivers/mssql/mssql_utility.php | 6 ++-- .../database/drivers/mysql/mysql_driver.php | 6 ++-- system/database/drivers/mysql/mysql_forge.php | 6 ++-- .../database/drivers/mysql/mysql_result.php | 6 ++-- .../database/drivers/mysql/mysql_utility.php | 6 ++-- .../database/drivers/mysqli/mysqli_driver.php | 6 ++-- .../database/drivers/mysqli/mysqli_forge.php | 6 ++-- .../database/drivers/mysqli/mysqli_result.php | 6 ++-- .../drivers/mysqli/mysqli_utility.php | 6 ++-- system/database/drivers/oci8/oci8_driver.php | 6 ++-- system/database/drivers/oci8/oci8_forge.php | 6 ++-- system/database/drivers/oci8/oci8_result.php | 6 ++-- system/database/drivers/oci8/oci8_utility.php | 6 ++-- system/database/drivers/odbc/odbc_driver.php | 6 ++-- system/database/drivers/odbc/odbc_forge.php | 6 ++-- system/database/drivers/odbc/odbc_result.php | 6 ++-- system/database/drivers/odbc/odbc_utility.php | 6 ++-- .../drivers/postgre/postgre_driver.php | 6 ++-- .../drivers/postgre/postgre_forge.php | 6 ++-- .../drivers/postgre/postgre_result.php | 6 ++-- .../drivers/postgre/postgre_utility.php | 6 ++-- .../database/drivers/sqlite/sqlite_driver.php | 6 ++-- .../database/drivers/sqlite/sqlite_forge.php | 6 ++-- .../database/drivers/sqlite/sqlite_result.php | 6 ++-- .../drivers/sqlite/sqlite_utility.php | 6 ++-- system/helpers/array_helper.php | 6 ++-- system/helpers/cookie_helper.php | 6 ++-- system/helpers/date_helper.php | 6 ++-- system/helpers/directory_helper.php | 6 ++-- system/helpers/download_helper.php | 6 ++-- system/helpers/email_helper.php | 6 ++-- system/helpers/file_helper.php | 6 ++-- system/helpers/form_helper.php | 6 ++-- system/helpers/html_helper.php | 6 ++-- system/helpers/inflector_helper.php | 6 ++-- system/helpers/security_helper.php | 6 ++-- system/helpers/smiley_helper.php | 6 ++-- system/helpers/string_helper.php | 6 ++-- system/helpers/text_helper.php | 6 ++-- system/helpers/typography_helper.php | 8 +++--- system/helpers/url_helper.php | 6 ++-- system/helpers/xml_helper.php | 6 ++-- system/libraries/Benchmark.php | 6 ++-- system/libraries/Calendar.php | 6 ++-- system/libraries/Config.php | 6 ++-- system/libraries/Controller.php | 6 ++-- system/libraries/Email.php | 6 ++-- system/libraries/Encrypt.php | 6 ++-- system/libraries/Exceptions.php | 6 ++-- system/libraries/Ftp.php | 6 ++-- system/libraries/Hooks.php | 6 ++-- system/libraries/Image_lib.php | 6 ++-- system/libraries/Input.php | 6 ++-- system/libraries/Language.php | 6 ++-- system/libraries/Loader.php | 6 ++-- system/libraries/Log.php | 6 ++-- system/libraries/Model.php | 6 ++-- system/libraries/Output.php | 6 ++-- system/libraries/Pagination.php | 6 ++-- system/libraries/Parser.php | 6 ++-- system/libraries/Profiler.php | 6 ++-- system/libraries/Router.php | 6 ++-- system/libraries/Session.php | 6 ++-- system/libraries/Sha1.php | 6 ++-- system/libraries/Table.php | 6 ++-- system/libraries/Trackback.php | 6 ++-- system/libraries/URI.php | 6 ++-- system/libraries/Unit_test.php | 6 ++-- system/libraries/Upload.php | 6 ++-- system/libraries/User_agent.php | 6 ++-- system/libraries/Validation.php | 6 ++-- system/libraries/Xmlrpc.php | 14 +++++----- system/libraries/Xmlrpcs.php | 6 ++-- system/libraries/Zip.php | 6 ++-- system/plugins/captcha_pi.php | 4 +-- system/plugins/js_calendar_pi.php | 4 +-- system/scaffolding/Scaffolding.php | 6 ++-- system/scaffolding/views/footer.php | 2 +- user_guide/changelog.html | 6 ++-- user_guide/database/active_record.html | 4 +-- user_guide/database/caching.html | 4 +-- user_guide/database/call_function.html | 4 +-- user_guide/database/configuration.html | 4 +-- user_guide/database/connecting.html | 4 +-- user_guide/database/examples.html | 4 +-- user_guide/database/fields.html | 4 +-- user_guide/database/forge.html | 4 +-- user_guide/database/helpers.html | 4 +-- user_guide/database/index.html | 4 +-- user_guide/database/queries.html | 4 +-- user_guide/database/results.html | 4 +-- user_guide/database/table_data.html | 4 +-- user_guide/database/transactions.html | 4 +-- user_guide/database/utilities.html | 4 +-- user_guide/general/alternative_php.html | 4 +-- user_guide/general/ancillary_classes.html | 4 +-- user_guide/general/autoloader.html | 4 +-- user_guide/general/caching.html | 4 +-- user_guide/general/controllers.html | 4 +-- user_guide/general/core_classes.html | 4 +-- user_guide/general/creating_libraries.html | 4 +-- user_guide/general/credits.html | 4 +-- user_guide/general/errors.html | 4 +-- user_guide/general/helpers.html | 4 +-- user_guide/general/hooks.html | 4 +-- user_guide/general/index.html | 8 +++--- user_guide/general/libraries.html | 4 +-- user_guide/general/managing_apps.html | 4 +-- user_guide/general/models.html | 4 +-- user_guide/general/plugins.html | 4 +-- user_guide/general/profiling.html | 4 +-- user_guide/general/quick_reference.html | 6 ++-- user_guide/general/requirements.html | 4 +-- user_guide/general/routing.html | 4 +-- user_guide/general/scaffolding.html | 4 +-- user_guide/general/security.html | 4 +-- user_guide/general/urls.html | 4 +-- user_guide/general/views.html | 4 +-- user_guide/helpers/array_helper.html | 4 +-- user_guide/helpers/cookie_helper.html | 4 +-- user_guide/helpers/date_helper.html | 4 +-- user_guide/helpers/directory_helper.html | 4 +-- user_guide/helpers/download_helper.html | 4 +-- user_guide/helpers/email_helper.html | 4 +-- user_guide/helpers/file_helper.html | 4 +-- user_guide/helpers/form_helper.html | 4 +-- user_guide/helpers/html_helper.html | 4 +-- user_guide/helpers/index.html | 4 +-- user_guide/helpers/inflector_helper.html | 4 +-- user_guide/helpers/security_helper.html | 4 +-- user_guide/helpers/smiley_helper.html | 6 ++-- user_guide/helpers/string_helper.html | 4 +-- user_guide/helpers/text_helper.html | 4 +-- user_guide/helpers/typography_helper.html | 4 +-- user_guide/helpers/url_helper.html | 4 +-- user_guide/helpers/xml_helper.html | 4 +-- user_guide/index.html | 4 +-- user_guide/installation/downloads.html | 28 +++++++++---------- user_guide/installation/index.html | 4 +-- user_guide/installation/troubleshooting.html | 4 +-- user_guide/installation/upgrade_120.html | 4 +-- user_guide/installation/upgrade_130.html | 4 +-- user_guide/installation/upgrade_131.html | 4 +-- user_guide/installation/upgrade_132.html | 4 +-- user_guide/installation/upgrade_133.html | 4 +-- user_guide/installation/upgrade_140.html | 4 +-- user_guide/installation/upgrade_141.html | 4 +-- user_guide/installation/upgrade_150.html | 8 +++--- user_guide/installation/upgrade_152.html | 4 +-- user_guide/installation/upgrade_153.html | 4 +-- user_guide/installation/upgrade_154.html | 4 +-- user_guide/installation/upgrade_160.html | 4 +-- user_guide/installation/upgrade_b11.html | 4 +-- user_guide/installation/upgrading.html | 4 +-- user_guide/libraries/benchmark.html | 4 +-- user_guide/libraries/calendar.html | 4 +-- user_guide/libraries/config.html | 4 +-- user_guide/libraries/email.html | 4 +-- user_guide/libraries/encryption.html | 4 +-- user_guide/libraries/file_uploading.html | 4 +-- user_guide/libraries/ftp.html | 4 +-- user_guide/libraries/image_lib.html | 4 +-- user_guide/libraries/input.html | 4 +-- user_guide/libraries/language.html | 4 +-- user_guide/libraries/loader.html | 4 +-- user_guide/libraries/output.html | 4 +-- user_guide/libraries/pagination.html | 4 +-- user_guide/libraries/parser.html | 4 +-- user_guide/libraries/sessions.html | 4 +-- user_guide/libraries/table.html | 4 +-- user_guide/libraries/trackback.html | 4 +-- user_guide/libraries/unit_testing.html | 4 +-- user_guide/libraries/uri.html | 4 +-- user_guide/libraries/user_agent.html | 4 +-- user_guide/libraries/validation.html | 4 +-- user_guide/libraries/xmlrpc.html | 4 +-- user_guide/libraries/zip.html | 4 +-- user_guide/license.html | 4 +-- user_guide/nav/nav.js | 4 +-- user_guide/overview/appflow.html | 4 +-- user_guide/overview/at_a_glance.html | 6 ++-- user_guide/overview/features.html | 4 +-- user_guide/overview/goals.html | 4 +-- user_guide/overview/index.html | 4 +-- user_guide/overview/mvc.html | 4 +-- user_guide/toc.html | 8 +++--- 206 files changed, 525 insertions(+), 525 deletions(-) diff --git a/index.php b/index.php index 85042d41..ebf696e8 100644 --- a/index.php +++ b/index.php @@ -34,7 +34,7 @@ | folder then the default one you can set its name here. The folder | can also be renamed or relocated anywhere on your server. | For more info please see the user guide: -| http://www.codeigniter.com/user_guide/general/managing_apps.html +| http://codeigniter.com/user_guide/general/managing_apps.html | | | NO TRAILING SLASH! diff --git a/system/application/config/config.php b/system/application/config/config.php index 3b2ca4a1..a02fed14 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -51,7 +51,7 @@ | This option allows you to add a suffix to all URLs generated by CodeIgniter. | For more information please see the user guide: | -| http://www.codeigniter.com/user_guide/general/urls.html +| http://codeigniter.com/user_guide/general/urls.html */ $config['url_suffix'] = ""; @@ -99,8 +99,8 @@ | 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 +| http://codeigniter.com/user_guide/general/core_classes.html +| http://codeigniter.com/user_guide/general/creating_libraries.html | */ $config['subclass_prefix'] = 'MY_'; diff --git a/system/application/config/hooks.php b/system/application/config/hooks.php index 95e74cbf..f0a0d6e3 100644 --- a/system/application/config/hooks.php +++ b/system/application/config/hooks.php @@ -6,7 +6,7 @@ | This file lets you define "hooks" to extend CI without hacking the core | files. Please see the user guide for info: | -| http://www.codeigniter.com/user_guide/general/hooks.html +| http://codeigniter.com/user_guide/general/hooks.html | */ diff --git a/system/application/config/routes.php b/system/application/config/routes.php index be09f5aa..1395b7ae 100644 --- a/system/application/config/routes.php +++ b/system/application/config/routes.php @@ -17,7 +17,7 @@ | | Please see the user guide for complete details: | -| http://www.codeigniter.com/user_guide/general/routing.html +| http://codeigniter.com/user_guide/general/routing.html | | ------------------------------------------------------------------------- | RESERVED ROUTES diff --git a/system/application/config/smileys.php b/system/application/config/smileys.php index 2a0d6891..a227d8b6 100644 --- a/system/application/config/smileys.php +++ b/system/application/config/smileys.php @@ -8,7 +8,7 @@ | :-) and :) use the same image replacement. | | Please see user guide for more info: -| http://www.codeigniter.com/user_guide/helpers/smiley_helper.html +| http://codeigniter.com/user_guide/helpers/smiley_helper.html | */ diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php index 4d276f43..577977c1 100644 --- a/system/codeigniter/Base4.php +++ b/system/codeigniter/Base4.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.3 * @filesource */ @@ -36,7 +36,7 @@ * @subpackage codeigniter * @category front-controller * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/ + * @link http://codeigniter.com/user_guide/ */ class CI_Base extends CI_Loader { diff --git a/system/codeigniter/Base5.php b/system/codeigniter/Base5.php index 9b59197d..c731a00c 100644 --- a/system/codeigniter/Base5.php +++ b/system/codeigniter/Base5.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.3 * @filesource */ @@ -27,7 +27,7 @@ * @subpackage codeigniter * @category front-controller * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/ + * @link http://codeigniter.com/user_guide/ */ class CI_Base { diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 07973863..7556f48d 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage codeigniter * @category Front-controller * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/ + * @link http://codeigniter.com/user_guide/ */ // CI Version diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index 327702f1..b6f0a46e 100644 --- a/system/codeigniter/Common.php +++ b/system/codeigniter/Common.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage codeigniter * @category Common Functions * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/ + * @link http://codeigniter.com/user_guide/ */ // ------------------------------------------------------------------------ diff --git a/system/codeigniter/Compat.php b/system/codeigniter/Compat.php index 357eb53c..56ebbf45 100644 --- a/system/codeigniter/Compat.php +++ b/system/codeigniter/Compat.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -25,7 +25,7 @@ * @subpackage codeigniter * @category Compatibility Functions * @author ExpressionEngine Development Team - * @link http://www.codeigniter.com/user_guide/ + * @link http://codeigniter.com/user_guide/ */ // ------------------------------------------------------------------------ diff --git a/system/database/DB.php b/system/database/DB.php index b059e76a..abd782c3 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ function &DB($params = '', $active_record = FALSE) { diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index ace2a275..08213af5 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Drivers * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_active_record extends CI_DB_driver { diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php index ac297acf..44b8e815 100644 --- a/system/database/DB_cache.php +++ b/system/database/DB_cache.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_Cache { diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index bffdfc63..65be13dc 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -26,7 +26,7 @@ * @subpackage Drivers * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_driver { diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index f8b74c08..7febb72c 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_forge { diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 7b5b384b..7d509791 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_result { diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index 513664be..9b78aa8e 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_utility extends CI_DB_forge { diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 6b453abb..e0c4db75 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -26,7 +26,7 @@ * @subpackage Drivers * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mssql_driver extends CI_DB { diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php index eda308fb..baf776c7 100644 --- a/system/database/drivers/mssql/mssql_forge.php +++ b/system/database/drivers/mssql/mssql_forge.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mssql_forge extends CI_DB_forge { diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php index ca3ca4b4..c95fd91f 100644 --- a/system/database/drivers/mssql/mssql_result.php +++ b/system/database/drivers/mssql/mssql_result.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mssql_result extends CI_DB_result { diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php index 08527120..87f8196f 100644 --- a/system/database/drivers/mssql/mssql_utility.php +++ b/system/database/drivers/mssql/mssql_utility.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mssql_utility extends CI_DB_utility { diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index e876deb4..6e53537b 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -26,7 +26,7 @@ * @subpackage Drivers * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mysql_driver extends CI_DB { diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index 71327f57..6e3a2d17 100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mysql_forge extends CI_DB_forge { diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php index bfbac29d..9e6a3c3d 100644 --- a/system/database/drivers/mysql/mysql_result.php +++ b/system/database/drivers/mysql/mysql_result.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mysql_result extends CI_DB_result { diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php index 38feaaff..dc8fd086 100644 --- a/system/database/drivers/mysql/mysql_utility.php +++ b/system/database/drivers/mysql/mysql_utility.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mysql_utility extends CI_DB_utility { diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index bfdabe19..d645cc82 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -26,7 +26,7 @@ * @subpackage Drivers * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mysqli_driver extends CI_DB { diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index 388c6652..cb315a45 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mysqli_forge extends CI_DB_forge { diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index 6861da79..586c2925 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mysqli_result extends CI_DB_result { diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php index 2aa5eccd..bb1f6f91 100644 --- a/system/database/drivers/mysqli/mysqli_utility.php +++ b/system/database/drivers/mysqli/mysqli_utility.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_mysqli_utility extends CI_DB_utility { diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 820501c0..bc0862b5 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -26,7 +26,7 @@ * @subpackage Drivers * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ /** diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php index 57f2885b..b9d9e635 100644 --- a/system/database/drivers/oci8/oci8_forge.php +++ b/system/database/drivers/oci8/oci8_forge.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_oci8_forge extends CI_DB_forge { diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index b1a703b2..30dd0da0 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_oci8_result extends CI_DB_result { diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php index 6b53a4f2..117f8e62 100644 --- a/system/database/drivers/oci8/oci8_utility.php +++ b/system/database/drivers/oci8/oci8_utility.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_oci8_utility extends CI_DB_utility { diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index c4a3df16..daecabe1 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -26,7 +26,7 @@ * @subpackage Drivers * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_odbc_driver extends CI_DB { diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php index 455cb0ff..374c15fc 100644 --- a/system/database/drivers/odbc/odbc_forge.php +++ b/system/database/drivers/odbc/odbc_forge.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/database/ + * @link http://codeigniter.com/database/ */ class CI_DB_odbc_forge extends CI_DB_forge { diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php index c818c337..dd3f9238 100644 --- a/system/database/drivers/odbc/odbc_result.php +++ b/system/database/drivers/odbc/odbc_result.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_odbc_result extends CI_DB_result { diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php index 561a6e4b..f74d031b 100644 --- a/system/database/drivers/odbc/odbc_utility.php +++ b/system/database/drivers/odbc/odbc_utility.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/database/ + * @link http://codeigniter.com/database/ */ class CI_DB_odbc_utility extends CI_DB_utility { diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 5bf87c59..34d76de6 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -26,7 +26,7 @@ * @subpackage Drivers * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_postgre_driver extends CI_DB { diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php index e3d6a8f7..81ac8e92 100644 --- a/system/database/drivers/postgre/postgre_forge.php +++ b/system/database/drivers/postgre/postgre_forge.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_postgre_forge extends CI_DB_forge { diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php index d09e5730..fdce01aa 100644 --- a/system/database/drivers/postgre/postgre_result.php +++ b/system/database/drivers/postgre/postgre_result.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_postgre_result extends CI_DB_result { diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php index 240e1b7d..573654f6 100644 --- a/system/database/drivers/postgre/postgre_utility.php +++ b/system/database/drivers/postgre/postgre_utility.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_postgre_utility extends CI_DB_utility { diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 60289c74..9cc69bb6 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -28,7 +28,7 @@ * @subpackage Drivers * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_sqlite_driver extends CI_DB { diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php index efc94fbf..e3196cce 100644 --- a/system/database/drivers/sqlite/sqlite_forge.php +++ b/system/database/drivers/sqlite/sqlite_forge.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_sqlite_forge extends CI_DB_forge { diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php index 859b65ff..b8f3dc5b 100644 --- a/system/database/drivers/sqlite/sqlite_result.php +++ b/system/database/drivers/sqlite/sqlite_result.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_sqlite_result extends CI_DB_result { diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php index c2f8b9bb..d1e1fe02 100644 --- a/system/database/drivers/sqlite/sqlite_utility.php +++ b/system/database/drivers/sqlite/sqlite_utility.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -20,7 +20,7 @@ * * @category Database * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/database/ + * @link http://codeigniter.com/user_guide/database/ */ class CI_DB_sqlite_utility extends CI_DB_utility { diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php index d559adf2..85d03794 100644 --- a/system/helpers/array_helper.php +++ b/system/helpers/array_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/array_helper.html + * @link http://codeigniter.com/user_guide/helpers/array_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php index c1469a9e..2a4a963d 100644 --- a/system/helpers/cookie_helper.php +++ b/system/helpers/cookie_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/cookie_helper.html + * @link http://codeigniter.com/user_guide/helpers/cookie_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index 7213c3aa..9f4c66b4 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/date_helper.html + * @link http://codeigniter.com/user_guide/helpers/date_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php index 273c8eeb..4a499de5 100644 --- a/system/helpers/directory_helper.php +++ b/system/helpers/directory_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/directory_helper.html + * @link http://codeigniter.com/user_guide/helpers/directory_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index ece22d9a..e8bc2f7f 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/download_helper.html + * @link http://codeigniter.com/user_guide/helpers/download_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/email_helper.php b/system/helpers/email_helper.php index 3729e042..b44fae55 100644 --- a/system/helpers/email_helper.php +++ b/system/helpers/email_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/email_helper.html + * @link http://codeigniter.com/user_guide/helpers/email_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index ebf30e94..a5dc437c 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/file_helpers.html + * @link http://codeigniter.com/user_guide/helpers/file_helpers.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 5c145706..a2bc2002 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/form_helper.html + * @link http://codeigniter.com/user_guide/helpers/form_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index 07757c27..a11d23e1 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/html_helper.html + * @link http://codeigniter.com/user_guide/helpers/html_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php index a72d0cef..b1864cb0 100644 --- a/system/helpers/inflector_helper.php +++ b/system/helpers/inflector_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/directory_helper.html + * @link http://codeigniter.com/user_guide/helpers/directory_helper.html */ diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php index 44c6811d..97c9a6ba 100644 --- a/system/helpers/security_helper.php +++ b/system/helpers/security_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/security_helper.html + * @link http://codeigniter.com/user_guide/helpers/security_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 58ed20ef..d61ea782 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/smiley_helper.html + * @link http://codeigniter.com/user_guide/helpers/smiley_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index ff7dc0aa..42bcd57a 100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/string_helper.html + * @link http://codeigniter.com/user_guide/helpers/string_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 211ef105..9620e03e 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/text_helper.html + * @link http://codeigniter.com/user_guide/helpers/text_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php index 93a887db..4a746c6e 100644 --- a/system/helpers/typography_helper.php +++ b/system/helpers/typography_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/typography_helper.html + * @link http://codeigniter.com/user_guide/helpers/typography_helper.html */ // ------------------------------------------------------------------------ @@ -83,7 +83,7 @@ function auto_typography($str) * @access private * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/ + * @link http://codeigniter.com/user_guide/helpers/ */ class Auto_typography { diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 39ef484c..9969af04 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/url_helper.html + * @link http://codeigniter.com/user_guide/helpers/url_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php index 8c39a751..1a2c7379 100644 --- a/system/helpers/xml_helper.php +++ b/system/helpers/xml_helper.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Helpers * @category Helpers * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/helpers/xml_helper.html + * @link http://codeigniter.com/user_guide/helpers/xml_helper.html */ // ------------------------------------------------------------------------ diff --git a/system/libraries/Benchmark.php b/system/libraries/Benchmark.php index 88ef95ce..bca37822 100644 --- a/system/libraries/Benchmark.php +++ b/system/libraries/Benchmark.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -25,7 +25,7 @@ * @subpackage Libraries * @category Libraries * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/benchmark.html + * @link http://codeigniter.com/user_guide/libraries/benchmark.html */ class CI_Benchmark { diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php index 5aa3cb60..a85c1830 100644 --- a/system/libraries/Calendar.php +++ b/system/libraries/Calendar.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category Libraries * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/calendar.html + * @link http://codeigniter.com/user_guide/libraries/calendar.html */ class CI_Calendar { diff --git a/system/libraries/Config.php b/system/libraries/Config.php index 92c60b4d..9b8b07c5 100644 --- a/system/libraries/Config.php +++ b/system/libraries/Config.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category Libraries * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/config.html + * @link http://codeigniter.com/user_guide/libraries/config.html */ class CI_Config { diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index d515bedb..ad9c6680 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -25,7 +25,7 @@ * @subpackage Libraries * @category Libraries * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/general/controllers.html + * @link http://codeigniter.com/user_guide/general/controllers.html */ class Controller extends CI_Base { diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 77e5bf5c..6136a050 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category Libraries * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/email.html + * @link http://codeigniter.com/user_guide/libraries/email.html */ class CI_Email { diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index ccc470c2..b533c043 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category Libraries * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/encryption.html + * @link http://codeigniter.com/user_guide/libraries/encryption.html */ class CI_Encrypt { diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php index 9223ff2b..b22ef9f7 100644 --- a/system/libraries/Exceptions.php +++ b/system/libraries/Exceptions.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Exceptions * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/exceptions.html + * @link http://codeigniter.com/user_guide/libraries/exceptions.html */ class CI_Exceptions { var $action; diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 77a982f8..9fdee012 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Libraries * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/ftp.html + * @link http://codeigniter.com/user_guide/libraries/ftp.html */ class CI_FTP { diff --git a/system/libraries/Hooks.php b/system/libraries/Hooks.php index 04cdd0a3..49cb230c 100644 --- a/system/libraries/Hooks.php +++ b/system/libraries/Hooks.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -25,7 +25,7 @@ * @subpackage Libraries * @category Libraries * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/encryption.html + * @link http://codeigniter.com/user_guide/libraries/encryption.html */ class CI_Hooks { diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index f563adab..9a78adf6 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Image_lib * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/image_lib.html + * @link http://codeigniter.com/user_guide/libraries/image_lib.html */ class CI_Image_lib { diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 40440249..de70738e 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category Input * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/input.html + * @link http://codeigniter.com/user_guide/libraries/input.html */ class CI_Input { var $use_xss_clean = FALSE; diff --git a/system/libraries/Language.php b/system/libraries/Language.php index 40816f94..3dac1a61 100644 --- a/system/libraries/Language.php +++ b/system/libraries/Language.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Language * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/language.html + * @link http://codeigniter.com/user_guide/libraries/language.html */ class CI_Language { diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index d2f57027..e2420a0c 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @author ExpressionEngine Dev Team * @category Loader - * @link http://www.codeigniter.com/user_guide/libraries/loader.html + * @link http://codeigniter.com/user_guide/libraries/loader.html */ class CI_Loader { diff --git a/system/libraries/Log.php b/system/libraries/Log.php index 2218addc..011bdbfd 100644 --- a/system/libraries/Log.php +++ b/system/libraries/Log.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Logging * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/general/errors.html + * @link http://codeigniter.com/user_guide/general/errors.html */ class CI_Log { diff --git a/system/libraries/Model.php b/system/libraries/Model.php index bfadd9a4..8181ead3 100644 --- a/system/libraries/Model.php +++ b/system/libraries/Model.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Libraries * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/config.html + * @link http://codeigniter.com/user_guide/libraries/config.html */ class Model { diff --git a/system/libraries/Output.php b/system/libraries/Output.php index 14640d85..ed9f6f4f 100644 --- a/system/libraries/Output.php +++ b/system/libraries/Output.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category Output * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/output.html + * @link http://codeigniter.com/user_guide/libraries/output.html */ class CI_Output { diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 8c057364..ba1572f6 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Pagination * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/pagination.html + * @link http://codeigniter.com/user_guide/libraries/pagination.html */ class CI_Pagination { diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php index 8e4d6040..a0b310f0 100644 --- a/system/libraries/Parser.php +++ b/system/libraries/Parser.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Parser * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/parser.html + * @link http://codeigniter.com/user_guide/libraries/parser.html */ class CI_Parser { diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 65d62f2a..3b189027 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -28,7 +28,7 @@ * @subpackage Libraries * @category Libraries * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/general/profiling.html + * @link http://codeigniter.com/user_guide/general/profiling.html */ class CI_Profiler { diff --git a/system/libraries/Router.php b/system/libraries/Router.php index 685426ac..df72cea2 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @author ExpressionEngine Dev Team * @category Libraries - * @link http://www.codeigniter.com/user_guide/general/routing.html + * @link http://codeigniter.com/user_guide/general/routing.html */ class CI_Router { diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 5bc17f16..a92db0ec 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Sessions * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/sessions.html + * @link http://codeigniter.com/user_guide/libraries/sessions.html */ class CI_Session { diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php index e9b724b3..6bb89117 100644 --- a/system/libraries/Sha1.php +++ b/system/libraries/Sha1.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -40,7 +40,7 @@ * @subpackage Libraries * @category Encryption * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/general/encryption.html + * @link http://codeigniter.com/user_guide/general/encryption.html */ class CI_SHA { diff --git a/system/libraries/Table.php b/system/libraries/Table.php index f67b17ea..d1c52548 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.3.1 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category HTML Tables * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/uri.html + * @link http://codeigniter.com/user_guide/libraries/uri.html */ class CI_Table { diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php index d325b7ee..5371e905 100644 --- a/system/libraries/Trackback.php +++ b/system/libraries/Trackback.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category Trackbacks * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/trackback.html + * @link http://codeigniter.com/user_guide/libraries/trackback.html */ class CI_Trackback { diff --git a/system/libraries/URI.php b/system/libraries/URI.php index 5aafbb4c..1349ebed 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category URI * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/uri.html + * @link http://codeigniter.com/user_guide/libraries/uri.html */ class CI_URI { diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php index 4bf32d64..33a8f310 100644 --- a/system/libraries/Unit_test.php +++ b/system/libraries/Unit_test.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.3.1 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category UnitTesting * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/uri.html + * @link http://codeigniter.com/user_guide/libraries/uri.html */ class CI_Unit_test { diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 387f7252..6511c68a 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Uploads * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/file_uploading.html + * @link http://codeigniter.com/user_guide/libraries/file_uploading.html */ class CI_Upload { diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index 7670d7b8..9fa45c8a 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -24,7 +24,7 @@ * @subpackage Libraries * @category User Agent * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/user_agent.html + * @link http://codeigniter.com/user_guide/libraries/user_agent.html */ class CI_User_agent { diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php index 061cacc9..d96b4f6f 100644 --- a/system/libraries/Validation.php +++ b/system/libraries/Validation.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -22,7 +22,7 @@ * @subpackage Libraries * @category Validation * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/validation.html + * @link http://codeigniter.com/user_guide/libraries/validation.html */ class CI_Validation { diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index 4426ff49..9eb32934 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -28,7 +28,7 @@ * @subpackage Libraries * @category XML-RPC * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/xmlrpc.html + * @link http://codeigniter.com/user_guide/libraries/xmlrpc.html */ class CI_Xmlrpc { @@ -338,7 +338,7 @@ function send_response($response) * * @category XML-RPC * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/xmlrpc.html + * @link http://codeigniter.com/user_guide/libraries/xmlrpc.html */ class XML_RPC_Client extends CI_Xmlrpc { @@ -416,7 +416,7 @@ function sendPayload($msg) * * @category XML-RPC * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/xmlrpc.html + * @link http://codeigniter.com/user_guide/libraries/xmlrpc.html */ class XML_RPC_Response { @@ -596,7 +596,7 @@ function iso8601_decode($time, $utc=0) * * @category XML-RPC * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/xmlrpc.html + * @link http://codeigniter.com/user_guide/libraries/xmlrpc.html */ class XML_RPC_Message extends CI_Xmlrpc { @@ -1193,7 +1193,7 @@ function decode_message($param) * * @category XML-RPC * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/xmlrpc.html + * @link http://codeigniter.com/user_guide/libraries/xmlrpc.html */ class XML_RPC_Values extends CI_Xmlrpc { diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php index 6854c8c3..59ac5857 100644 --- a/system/libraries/Xmlrpcs.php +++ b/system/libraries/Xmlrpcs.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -32,7 +32,7 @@ * @subpackage Libraries * @category XML-RPC * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/xmlrpc.html + * @link http://codeigniter.com/user_guide/libraries/xmlrpc.html */ class CI_Xmlrpcs extends CI_Xmlrpc { diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index da40f8db..a3d42f34 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -28,7 +28,7 @@ * @subpackage Libraries * @category Encryption * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/libraries/zip.html + * @link http://codeigniter.com/user_guide/libraries/zip.html */ class CI_Zip { diff --git a/system/plugins/captcha_pi.php b/system/plugins/captcha_pi.php index 7e6a35f9..11d4564d 100644 --- a/system/plugins/captcha_pi.php +++ b/system/plugins/captcha_pi.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ diff --git a/system/plugins/js_calendar_pi.php b/system/plugins/js_calendar_pi.php index a2259d66..86270cac 100644 --- a/system/plugins/js_calendar_pi.php +++ b/system/plugins/js_calendar_pi.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ diff --git a/system/scaffolding/Scaffolding.php b/system/scaffolding/Scaffolding.php index bffc0ec2..a9777040 100644 --- a/system/scaffolding/Scaffolding.php +++ b/system/scaffolding/Scaffolding.php @@ -7,8 +7,8 @@ * @package CodeIgniter * @author ExpressionEngine Dev Team * @copyright Copyright (c) 2006, EllisLab, Inc. - * @license http://www.codeigniter.com/user_guide/license.html - * @link http://www.codeigniter.com + * @license http://codeigniter.com/user_guide/license.html + * @link http://codeigniter.com * @since Version 1.0 * @filesource */ @@ -23,7 +23,7 @@ * @package CodeIgniter * @subpackage Scaffolding * @author ExpressionEngine Dev Team - * @link http://www.codeigniter.com/user_guide/general/scaffolding.html + * @link http://codeigniter.com/user_guide/general/scaffolding.html */ class Scaffolding { diff --git a/system/scaffolding/views/footer.php b/system/scaffolding/views/footer.php index d25365dd..a287664f 100644 --- a/system/scaffolding/views/footer.php +++ b/system/scaffolding/views/footer.php @@ -2,7 +2,7 @@
    diff --git a/user_guide/changelog.html b/user_guide/changelog.html index e1d2365d..a852d742 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -40,7 +40,7 @@ @@ -371,7 +371,7 @@

    Version 1.4.0

    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • -
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
      • +
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
    • Added regular expressions support for routing rules.
    • Added the ability to remap function calls within your controllers.
    • Added the ability to replace core system classes with your own classes.
      • @@ -576,7 +576,7 @@

      Version Beta 1.0

      User Guide Home   ·   Next Topic:  Credits

      -

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2007  ·  Ellislab, Inc.

      diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index bf436996..42738968 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -39,7 +39,7 @@
    - + diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 8cf5478e..ea347cb5 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -105,7 +105,7 @@

    $this->load->view('file_name', $data, true/fals

    $this->load->model('Model_name');

    $this->load->model('Model_name');

    -

    If you model is located in a sub-folder, include the relative path from your models folder. For example, if you have a model located at application/models/blog/queries.php you'll load it using:

    +

    If your model is located in a sub-folder, include the relative path from your models folder. For example, if you have a model located at application/models/blog/queries.php you'll load it using:

    $this->load->model('blog/queries');

    If you would like your model assigned to a different object name you can specify it via the second parameter of the loading function:

    From 95d06605c68f9b2073b0a01e7fa81aad4aa0e755 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 27 May 2008 21:45:59 +0000 Subject: [PATCH 1178/2544] added routing example --- user_guide/general/routing.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index fca1e3b8..e6642fb0 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -108,7 +108,6 @@

    Wildcards

    Note: Routes will run in the order they are defined. Higher routes will always take precedence over lower ones.

    -

    Examples

    Here are a few routing examples:

    @@ -119,10 +118,12 @@

    Examples

    $route['blog/joe'] = "blogs/users/34";

    A URL containing the segments blog/joe will be remapped to the "blogs" class and the "users" method. The ID will be set to "34".

    - $route['product/:any'] = "catalog/product_lookup";

    A URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the "product_lookup" method.

    +$route['product/(:num)'] = "catalog/product_lookup_by_id/$1"; +

    A URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the "product_lookup_by_id" method passing in the match as a variable to the function.

    +

    Important: Do not use leading/trailing slashes.

    Regular Expressions

    From 9e11220c2b780ca3320deae7e91a272b84c88533 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 28 May 2008 23:46:28 +0000 Subject: [PATCH 1179/2544] added error suppression to fopen() in write_file() --- system/helpers/file_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 0d33fe3f..86c5c09d 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -87,7 +87,7 @@ function read_file($file) { function write_file($path, $data, $mode = FOPEN_WRITE_CREATE_DESTRUCTIVE) { - if ( ! $fp = fopen($path, $mode)) + if ( ! $fp = @fopen($path, $mode)) { return FALSE; } From bd4400988922b2560975a80498404d7ecd000c0b Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 29 May 2008 17:52:11 +0000 Subject: [PATCH 1180/2544] made MySQL/MySQLi forge use explicitly named KEYs, added ability to specify multi-column non-primary keys in table creation --- system/database/drivers/mssql/mssql_forge.php | 16 ++++++++++---- system/database/drivers/mysql/mysql_forge.php | 17 ++++++++++++--- .../database/drivers/mysqli/mysqli_forge.php | 17 ++++++++++++--- system/database/drivers/oci8/oci8_forge.php | 17 ++++++++++++--- system/database/drivers/odbc/odbc_forge.php | 16 ++++++++++---- .../drivers/postgre/postgre_forge.php | 14 ++++++++++--- .../database/drivers/sqlite/sqlite_forge.php | 21 ++++++++++++++----- system/plugins/captcha_pi.php | 4 ++-- user_guide/changelog.html | 2 ++ user_guide/database/forge.html | 12 +++++++++-- user_guide/libraries/trackback.html | 4 ++-- 11 files changed, 109 insertions(+), 31 deletions(-) diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php index ddd1bb6a..6995d342 100644 --- a/system/database/drivers/mssql/mssql_forge.php +++ b/system/database/drivers/mssql/mssql_forge.php @@ -147,16 +147,24 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) $primary_keys = $this->db->_protect_identifiers($primary_keys); $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; } - + if (is_array($keys) && count($keys) > 0) { - $keys = $this->db->_protect_identifiers($keys); foreach ($keys as $key) { - $sql .= ",\n\tFOREIGN KEY ($key)"; + if (is_array($key)) + { + $key = $this->db->_protect_identifiers($key); + } + else + { + $key = array($this->db->_protect_identifiers($key)); + } + + $sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")"; } } - + $sql .= "\n)"; return $sql; diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index a631e430..28143a04 100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php @@ -153,16 +153,27 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) if (count($primary_keys) > 0) { + $key_name = $this->db->_protect_identifiers(implode('_', $primary_keys)); $primary_keys = $this->db->_protect_identifiers($primary_keys); - $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; + $sql .= ",\n\tPRIMARY KEY ".$key_name." (" . implode(', ', $primary_keys) . ")"; } if (is_array($keys) && count($keys) > 0) { - $keys = $this->db->_protect_identifiers($keys); foreach ($keys as $key) { - $sql .= ",\n\tKEY ($key)"; + if (is_array($key)) + { + $key_name = $this->db->_protect_identifiers(implode('_', $key)); + $key = $this->db->_protect_identifiers($key); + } + else + { + $key_name = $this->db->_protect_identifiers($key); + $key = array($key_name); + } + + $sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")"; } } diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index f767acbe..da79bc6a 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -153,16 +153,27 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) if (count($primary_keys) > 0) { + $key_name = $this->db->_protect_identifiers(implode('_', $primary_keys)); $primary_keys = $this->db->_protect_identifiers($primary_keys); - $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; + $sql .= ",\n\tPRIMARY KEY ".$key_name." (" . implode(', ', $primary_keys) . ")"; } if (is_array($keys) && count($keys) > 0) { - $keys = $this->db->_protect_identifiers($keys); foreach ($keys as $key) { - $sql .= ",\n\tKEY ($key)"; + if (is_array($key)) + { + $key_name = $this->db->_protect_identifiers(implode('_', $key)); + $key = $this->db->_protect_identifiers($key); + } + else + { + $key_name = $this->db->_protect_identifiers($key); + $key = array($key_name); + } + + $sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")"; } } diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php index 9f3fac54..6266c75a 100644 --- a/system/database/drivers/oci8/oci8_forge.php +++ b/system/database/drivers/oci8/oci8_forge.php @@ -135,10 +135,21 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; } - if (count($keys) > 0) + if (is_array($keys) && count($keys) > 0) { - $keys = $this->db->_protect_identifiers($keys); - $sql .= ",\n\tUNIQUE COLUMNS (" . implode(', ', $keys) . ")"; + foreach ($keys as $key) + { + if (is_array($key)) + { + $key = $this->db->_protect_identifiers($key); + } + else + { + $key = array($this->db->_protect_identifiers($key)); + } + + $sql .= ",\n\tUNIQUE COLUMNS (" . implode(', ', $key) . ")"; + } } $sql .= "\n)"; diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php index 60df616c..10924abe 100644 --- a/system/database/drivers/odbc/odbc_forge.php +++ b/system/database/drivers/odbc/odbc_forge.php @@ -146,16 +146,24 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) $primary_keys = $this->db->_protect_identifiers($primary_keys); $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; } - + if (is_array($keys) && count($keys) > 0) { - $keys = $this->db->_protect_identifiers($keys); foreach ($keys as $key) { - $sql .= ",\n\tFOREIGN KEY ($key)"; + if (is_array($key)) + { + $key = $this->db->_protect_identifiers($key); + } + else + { + $key = array($this->db->_protect_identifiers($key)); + } + + $sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")"; } } - + $sql .= "\n)"; return $sql; diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php index f8dfca8a..ef578345 100644 --- a/system/database/drivers/postgre/postgre_forge.php +++ b/system/database/drivers/postgre/postgre_forge.php @@ -134,13 +134,21 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) $primary_keys = $this->db->_protect_identifiers($primary_keys); $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; } - + if (is_array($keys) && count($keys) > 0) { - $keys = $this->db->_protect_identifiers($keys); foreach ($keys as $key) { - $sql .= ",\n\tFOREIGN KEY ($key)"; + if (is_array($key)) + { + $key = $this->db->_protect_identifiers($key); + } + else + { + $key = array($this->db->_protect_identifiers($key)); + } + + $sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")"; } } diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php index 25c74a73..a6866c87 100644 --- a/system/database/drivers/sqlite/sqlite_forge.php +++ b/system/database/drivers/sqlite/sqlite_forge.php @@ -144,13 +144,24 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) $primary_keys = $this->db->_protect_identifiers($primary_keys); $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; } - - if (count($keys) > 0) + + if (is_array($keys) && count($keys) > 0) { - $keys = $this->db->_protect_identifiers($keys); - $sql .= ",\n\tUNIQUE (" . implode(', ', $keys) . ")"; + foreach ($keys as $key) + { + if (is_array($key)) + { + $key = $this->db->_protect_identifiers($key); + } + else + { + $key = array($this->db->_protect_identifiers($key)); + } + + $sql .= ",\n\tUNIQUE (" . implode(', ', $key) . ")"; + } } - + $sql .= "\n)"; return $sql; diff --git a/system/plugins/captcha_pi.php b/system/plugins/captcha_pi.php index df95788e..baa0a8dc 100644 --- a/system/plugins/captcha_pi.php +++ b/system/plugins/captcha_pi.php @@ -92,8 +92,8 @@ captcha_time int(10) unsigned NOT NULL, ip_address varchar(16) default '0' NOT NULL, word varchar(20) NOT NULL, - PRIMARY KEY (captcha_id), - KEY (word) + PRIMARY KEY `captcha_id` (`captcha_id`), + KEY `word` (`word`) ) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9e39cb4b..b59b9ef9 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -63,6 +63,8 @@

    Version 1.6.3

    • Database
        +
      • Modified MySQL/MySQLi Forge class to give explicit names to keys
        • +
      • Added ability to set multiple column non-primary keys to the Forge class
      • Added ability to set additional database config values in DSN connections via the query string.
      • diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index f9363f4e..f679a4f2 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -164,11 +164,19 @@

      Creating an id field

      // gives id INT(9) NOT NULL AUTO_INCREMENT

      Adding Keys

      Generally speaking, you'll want your table to have Keys. This is accomplished with $this->dbforge->add_key('field'). An optional second parameter set to TRUE will make it a primary key. Note that add_key() must be followed by a call to create_table().

      +

      Multiple column non-primary keys must be sent as an array. Sample output below is for MySQL.

      $this->dbforge->add_key('blog_id', TRUE);
      - // gives PRIMARY KEY (blog_id)
      + // gives PRIMARY KEY `blog_id` (`blog_id`)

      + $this->dbforge->add_key('blog_id', TRUE);
      + $this->dbforge->add_key('site_id', TRUE);
      + // gives PRIMARY KEY `blog_id_site_id` (`blog_id`, `site_id`)
      +
      $this->dbforge->add_key('blog_name');
      - // gives KEY (blog_name)

      + // gives KEY `blog_name` (`blog_name`)
      +
      + $this->dbforge->add_key(array('blog_name', 'blog_label'));
      + // gives KEY `blog_name_blog_label` (`blog_name`, `blog_label`)

      Creating a table

      After fields and keys have been declared, you can create a new table with

      $this->dbforge->create_table('table_name');
      diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index f86ccca0..4f60f5ab 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -152,8 +152,8 @@

      Creating a Trackback Table

      blog_name varchar(100) NOT NULL, tb_date int(10) NOT NULL, ip_address varchar(16) NOT NULL, - PRIMARY KEY (tb_id), - KEY (entry_id) + PRIMARY KEY `tb_id` (`tb_id`), + KEY `entry_id` (`entry_id`) ); From 9f23e7c24c9786bbe576ca6df3dc362581216bef Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 30 May 2008 20:00:11 +0000 Subject: [PATCH 1181/2544] moved word compacting to a callback for clarity, added a few js event handlers for removal --- system/libraries/Input.php | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index cac05c71..5f066cc5 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -715,10 +715,10 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') { $temp .= substr($word, $i, 1)."\s*"; } - + // We only want to do this when it is followed by a non-word character // That way valid stuff like "dealer to" does not become "dealerto" - $str = preg_replace('#('.substr($temp, 0, -3).')(\W)#ise', "preg_replace('/\s+/s', '', '\\1').'\\2'", $str); + $str = preg_replace_callback('#('.substr($temp, 0, -3).')(\W)#is', array($this, '_compact_exploded_words'), $str); } /* @@ -757,7 +757,7 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') * but it's unlikely to be a problem. * */ - $event_handlers = array('onblur','onchange','onclick','onended','onerror','onfocus','onkeydown','onkeypress','onkeyup','onload','onmousedown','onmouseover','onmouseup','onresize','onselect','onsubmit','onunload','xmlns'); + $event_handlers = array('onblur','onchange','onclick','ondblclick','onended','onerror','onfocus','onkeydown','onkeypress','onkeyup','onload','onmousedown','onmousemove','onmouseover','onmouseout','onmouseup','onresize','onselect','onsubmit','onunload','xmlns'); if ($is_image === TRUE) { @@ -874,6 +874,23 @@ function xss_hash() // -------------------------------------------------------------------- + /** + * Compact Exploded Words + * + * Callback function for xss_clean() to remove whitespace from + * things like j a v a s c r i p t + * + * @access public + * @param type + * @return type + */ + function _compact_exploded_words($matches) + { + return preg_replace('/\s+/s', '', $matches[1]).$matches[2]; + } + + // -------------------------------------------------------------------- + /** * Sanitize Naughty HTML * From 92bb3e6ad6083b13213c4c3e71d0fbb6a7f83971 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 30 May 2008 21:22:27 +0000 Subject: [PATCH 1182/2544] decided just to kill all on*= event handlers, rather than trying to keep up with (and require users to do the same) with a blacklist. --- system/libraries/Input.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 5f066cc5..b111108e 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -757,7 +757,7 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') * but it's unlikely to be a problem. * */ - $event_handlers = array('onblur','onchange','onclick','ondblclick','onended','onerror','onfocus','onkeydown','onkeypress','onkeyup','onload','onmousedown','onmousemove','onmouseover','onmouseout','onmouseup','onresize','onselect','onsubmit','onunload','xmlns'); + $event_handlers = array('xmlns'); if ($is_image === TRUE) { @@ -768,7 +768,7 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') unset($event_handlers[array_search('xmlns', $event_handlers)]); } - $str = preg_replace("#<([^><]+)(".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); + $str = preg_replace("#<([^><]+)((?=on\w*)|".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); /* * Sanitize naughty HTML elements From 8039d4c217cd0324e191f3c7887803246070a194 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 31 May 2008 02:47:56 +0000 Subject: [PATCH 1183/2544] Charset information in the userguide has been moved above title for internationalization purposes (#4614) --- user_guide/changelog.html | 7 +- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/forge.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/doc_style/index.html | 2 +- user_guide/doc_style/template.html | 246 +++++++++---------- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/common_functions.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/index.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/reserved_names.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/compatibility_helper.html | 234 +++++++++--------- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/email_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/path_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_153.html | 2 +- user_guide/installation/upgrade_154.html | 2 +- user_guide/installation/upgrade_160.html | 2 +- user_guide/installation/upgrade_161.html | 2 +- user_guide/installation/upgrade_162.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 114 files changed, 355 insertions(+), 354 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b59b9ef9..f37982cf 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -2,8 +2,6 @@ -Change Log : CodeIgniter User Guide - @@ -12,13 +10,15 @@ - + +Change Log : CodeIgniter User Guide + @@ -79,6 +79,7 @@

      Version 1.6.3

    • Added ability to use xss_clean() to test images for XSS, useful for upload security.
    • Improved security in xss_clean().
    • Considerably expanded list of mobile user-agents in config/user_agents.php.
      • +
    • Charset information in the userguide has been moved above title for internationalization purposes (#4614)
    diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 796d1b25..1a3c9b6e 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -2,6 +2,7 @@ + Active Record : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index bc1cd0d8..d9b90621 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -2,6 +2,7 @@ + Database Caching Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 08b855b5..9ea2aba7 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -2,6 +2,7 @@ + Custom Function Calls : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index b7780405..e14e1615 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -2,6 +2,7 @@ + Database Configuration : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index bc4b2e7e..8de04604 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -2,6 +2,7 @@ + Connecting to your Database : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index debecbf8..22d2eba5 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -2,6 +2,7 @@ + Database Quick Start : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 15631df4..06ee20e6 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -2,6 +2,7 @@ + Field Data : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index f679a4f2..cbe50384 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -2,6 +2,7 @@ + Database Forge Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 7d3d0e46..10598f8a 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -2,6 +2,7 @@ + Query Helper Functions : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 506efcc4..d67dfc20 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -2,6 +2,7 @@ + The Database Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 6c030059..e5f0a086 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -2,6 +2,7 @@ + Queries : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 50f32de9..468a8350 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -2,6 +2,7 @@ + Generating Query Results : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 6e4d7688..8c82a70f 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -2,6 +2,7 @@ + Table Data : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index b1187a04..5fcc8e39 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -2,6 +2,7 @@ + Transactions : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 3050801b..dd16f5c7 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -2,6 +2,7 @@ + Database Utility Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index ceb8beaa..3253ea7e 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -2,6 +2,7 @@ + Writing Documentation : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/doc_style/template.html b/user_guide/doc_style/template.html index bfec1a25..b267effe 100644 --- a/user_guide/doc_style/template.html +++ b/user_guide/doc_style/template.html @@ -1,124 +1,124 @@ - - - - -CodeIgniter Project Documentation Template - - - - - - - - - - - - - - - -
    -

    wm_type texttype, overlaytext, overlay Sets the type of watermarking that should be used.
    - - - - -

    Project Title

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Foo Class

    - -

    Brief description of Foo Class. If it extends a native CodeIgniter class, please link to the class in the CodeIgniter documents here.

    - -

    Important:  This is an important note with EMPHASIS.

    - -

    Features:

    - -
      -
    • Foo
      • -
    • Bar
      • -
    - -

    Usage Heading

    - -

    Description of using Foo. Highlight variables and filenames in regular text with the <var> tag, and code using the <dfn> tag.

    - - - $this->load->library('foo');
    -
    - $this->foo->bar('bat'); -     - - -

    Table Preferences

    - -

    Use tables where appropriate for long lists of preferences.

    - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefault ValueOptionsDescription
    fooFooNoneDescription of foo.
    barBarbat, bag, or bakDescription of bar.
    - -

    Foo Function Reference

    - -

    $this->foo->bar()

    -

    Description

    -$this->foo->bar('baz') - -
    - - - - - - + + + + + +CodeIgniter Project Documentation Template + + + + + + + + + + + + + + +
    + + + + + +

    Project Title

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Foo Class

    + +

    Brief description of Foo Class. If it extends a native CodeIgniter class, please link to the class in the CodeIgniter documents here.

    + +

    Important:  This is an important note with EMPHASIS.

    + +

    Features:

    + +
      +
    • Foo
      • +
    • Bar
      • +
    + +

    Usage Heading

    + +

    Description of using Foo. Highlight variables and filenames in regular text with the <var> tag, and code using the <dfn> tag.

    + + + $this->load->library('foo');
    +
    + $this->foo->bar('bat'); +     + + +

    Table Preferences

    + +

    Use tables where appropriate for long lists of preferences.

    + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescription
    fooFooNoneDescription of foo.
    barBarbat, bag, or bakDescription of bar.
    + +

    Foo Function Reference

    + +

    $this->foo->bar()

    +

    Description

    +$this->foo->bar('baz') + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 221109aa..1d9bd504 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -2,6 +2,7 @@ + Alternate PHP Syntax for View Files : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 75307668..6a896cc9 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -2,6 +2,7 @@ + Creating Ancillary Classes : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 3456fba2..6233fe17 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -2,6 +2,7 @@ + Auto-loading Resources : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 591fbb62..136f505c 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -2,6 +2,7 @@ + Web Page Caching : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index e7cf9e06..0daa36b6 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -2,6 +2,7 @@ + Common Functions : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 4c0c506a..034f1b23 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -2,6 +2,7 @@ + Controllers : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index ff9896c3..bc307ddd 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -2,6 +2,7 @@ + Creating Core System Classes : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index c1318709..eda7e574 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -2,6 +2,7 @@ + Creating Libraries : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index ed2d08dc..a0d2c469 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -2,6 +2,7 @@ + Credits : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 91bd3430..548f7cea 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -2,6 +2,7 @@ + Error Handling : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index aa14a2dd..30a114e0 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -2,6 +2,7 @@ + Helper Functions : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 60bdf023..d0ea96e1 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -2,6 +2,7 @@ + Hooks : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/index.html b/user_guide/general/index.html index 2b114421..a7bba69d 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -2,6 +2,7 @@ + Getting Started With CodeIgniter : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 395b9ea6..5d17a765 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -2,6 +2,7 @@ + Using CodeIgniter Libraries : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 7f65b79f..517c08ce 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -2,6 +2,7 @@ + Managing your Applications : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 52172570..8472cc5e 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -2,6 +2,7 @@ + Models : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 4b394f02..dcd3a6f9 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -2,6 +2,7 @@ + Plugins : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index e7d3a530..1cc9e882 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -2,6 +2,7 @@ + Profiling Your Application : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 71163a4f..91e549d7 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -2,6 +2,7 @@ + Quick Reference Chart : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index c45c1efd..5b536ecb 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -2,6 +2,7 @@ + Server Requirements : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 79e5940f..a5d8f5d9 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -2,6 +2,7 @@ + Reserved Names : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index e6642fb0..b282e18d 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -2,6 +2,7 @@ + URI Routing : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index 7dc66d1d..417cb100 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -2,6 +2,7 @@ + Scaffolding : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 779292a8..979397c6 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -2,6 +2,7 @@ + Security : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 8ba46e3d..9230f98c 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -2,6 +2,7 @@ + CodeIgniter URLs : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 4aa2a1fc..3417f55b 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -2,6 +2,7 @@ + Views : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 474f9530..fbe75bbd 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -2,6 +2,7 @@ + Array Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/compatibility_helper.html b/user_guide/helpers/compatibility_helper.html index cc145a82..434c2741 100644 --- a/user_guide/helpers/compatibility_helper.html +++ b/user_guide/helpers/compatibility_helper.html @@ -1,118 +1,118 @@ - - - - -Compatibility Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.6.2

    -
    - - - - - - - - - - -
    - - -
    - - - -
    - - -

    Compatibility Helper

    - -

    The Compatibility Helper file contains PHP 4 implementations of some PHP 5 only native PHP functions and constants. This can be useful - if you'd like to take advantage of some of these native function but your application may end up running on a PHP 4 server. - In these cases, it may be advantageous to Auto-load the Compatibility Helper so you - do not have to load it in each controller.

    - -

    Note: There are a few compatibility functions that are in CodeIgniter's native Compat.php file. - You may use those functions without loading this helper. The functions are split between that file and this Helper so that only - functions required by the framework are included by default. This way, whether or not you load the additional functions in this Helper - remains your choice.

    - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('compatibility'); - -

    Available Constants

    -

    The following constants are available:

    - -

    PHP_EOL

    -

    The newline character for the server's current OS, e.g. on Windows systems "\r\n", on *nix "\n". - -

    Available Functions

    -

    The following functions are available (see linked PHP documentation for documentation):

    - -

    file_put_contents() - The fourth parameter, $context, is not supported.

    - -

    fputcsv()

    - -

    http_build_query()

    - -

    str_ireplace() - The fourth parameter, $count, is not supported, as PHP 4 would make it become required.

    - -

    stripos()

    - - - - - - - -
    - - - - - - + + + + + +Compatibility Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.2

    +
    + + + + + + + + + + +
    + + +
    + + + +
    + + +

    Compatibility Helper

    + +

    The Compatibility Helper file contains PHP 4 implementations of some PHP 5 only native PHP functions and constants. This can be useful + if you'd like to take advantage of some of these native function but your application may end up running on a PHP 4 server. + In these cases, it may be advantageous to Auto-load the Compatibility Helper so you + do not have to load it in each controller.

    + +

    Note: There are a few compatibility functions that are in CodeIgniter's native Compat.php file. + You may use those functions without loading this helper. The functions are split between that file and this Helper so that only + functions required by the framework are included by default. This way, whether or not you load the additional functions in this Helper + remains your choice.

    + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('compatibility'); + +

    Available Constants

    +

    The following constants are available:

    + +

    PHP_EOL

    +

    The newline character for the server's current OS, e.g. on Windows systems "\r\n", on *nix "\n". + +

    Available Functions

    +

    The following functions are available (see linked PHP documentation for documentation):

    + +

    file_put_contents() - The fourth parameter, $context, is not supported.

    + +

    fputcsv()

    + +

    http_build_query()

    + +

    str_ireplace() - The fourth parameter, $count, is not supported, as PHP 4 would make it become required.

    + +

    stripos()

    + + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 8f86fb4a..7e589f4b 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -2,6 +2,7 @@ + Cookie Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index ae19f607..0b74ba1d 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -2,6 +2,7 @@ + Date Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index c677e2ed..38e06412 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -2,6 +2,7 @@ + Directory Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 778aafbc..61c64450 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -2,6 +2,7 @@ + Download Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index 39bbdb36..8b72de41 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -2,6 +2,7 @@ + Email Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 2c3dba13..e1205f99 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -2,6 +2,7 @@ + File Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 32406846..5e556dca 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -2,6 +2,7 @@ + Form Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 3b68c399..1fea3ced 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -2,6 +2,7 @@ + HTML Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 464d129d..328b41d3 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -2,6 +2,7 @@ + Inflector Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 0fba20bb..c2aa3479 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -2,6 +2,7 @@ + Path Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 0e1b3e76..4dbd1653 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -2,6 +2,7 @@ + Security Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index a3444fff..7b59ec20 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -2,6 +2,7 @@ + Smiley Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 07c6cc8d..daa57356 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -2,6 +2,7 @@ + String Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 7697f887..231887ec 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -2,6 +2,7 @@ + Text Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 547338dc..18efb9d8 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -2,6 +2,7 @@ + Typography Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 1650fdbe..2c0b255d 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -2,6 +2,7 @@ + URL Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index b9dd818b..5d5360aa 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -2,6 +2,7 @@ + XML Helper : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/index.html b/user_guide/index.html index 7d69b33a..8200bf5c 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -2,6 +2,7 @@ + Welcome to CodeIgniter : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 661ec48a..3f42040e 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -2,6 +2,7 @@ + Downloading CodeIgniter : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index e6eaaab2..8628784f 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -2,6 +2,7 @@ + Installation Instructions : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 1f3875b2..fc267c30 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -2,6 +2,7 @@ + Troubleshooting : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 5a3373d5..0013784f 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index 941aaf8b..9c91adae 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 13d2eeab..bc79fb34 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index b65e5023..94099b46 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 945f8eb9..d0e68c41 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 9c1b6b7c..bbd1f866 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index c2fe128a..b7dfe006 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index cb9d25c6..b5a2afdf 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 0310f12c..984ad216 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index ea545053..e86b306f 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 83ea6e26..96e133d9 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -2,6 +2,7 @@ + Upgrading from 1.5.3 to 1.5.4 : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index 88c66d10..d111069e 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -2,6 +2,7 @@ + Upgrading from 1.5.4 to 1.6.0 : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index 88992a28..43b0c5c3 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -2,6 +2,7 @@ + Upgrading from 1.6.0 to 1.6.1 : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index 20917e91..ea9f62b8 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -2,6 +2,7 @@ + Upgrading from 1.6.1 to 1.6.2 : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index d9e71e95..9e3e61da 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -2,6 +2,7 @@ + CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 307d6b7c..7b9eb651 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -2,6 +2,7 @@ + Upgrading From a Previous Version : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 8f8a33e0..0ffa5eab 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -2,6 +2,7 @@ + Benchmarking Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index a4eaac37..81cdc713 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -2,6 +2,7 @@ + Calendaring Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 3fe19123..4c6460b0 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -2,6 +2,7 @@ + Config Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index d4990dff..e8325431 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -2,6 +2,7 @@ + Email Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 25cb5155..47246be3 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -2,6 +2,7 @@ + Encryption Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 27787814..58317355 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -2,6 +2,7 @@ + File Uploading Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 1d55df20..1e2b7de4 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -2,6 +2,7 @@ + FTP Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 06e58696..59e26674 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -2,6 +2,7 @@ + Image Manipulation Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index c95ebbd9..2cf8b6d0 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -2,6 +2,7 @@ + Input Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 780f0451..eff7d32a 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -2,6 +2,7 @@ + Language Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index ea347cb5..4f7d08e5 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -2,6 +2,7 @@ + Loader Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 7b778b80..1aac4d7a 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -2,6 +2,7 @@ + Output Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 5592bc22..65529be4 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -2,6 +2,7 @@ + Pagination Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 73838293..2924a386 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -2,6 +2,7 @@ + Template Parser Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index fbde7123..0949d98b 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -2,6 +2,7 @@ + Session Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index b699ceab..1c65372a 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -2,6 +2,7 @@ + HTML Table Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 4f60f5ab..b8284ea9 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -2,6 +2,7 @@ + Trackback Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index ee53d8c0..ef4d5672 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -2,6 +2,7 @@ + Unit Testing Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 44b8bb92..75f57545 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -2,6 +2,7 @@ + URI Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 3f52a9a1..aa6e3b80 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -2,6 +2,7 @@ + User Agent Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index a0be4d61..b04f9f6b 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -2,6 +2,7 @@ + Form Validation : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index ae863bb2..e426f700 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -2,6 +2,7 @@ + XML-RPC and XML-RPC Server Classes : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 17e2617c..46a82440 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -2,6 +2,7 @@ + Zip Encoding Class : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/license.html b/user_guide/license.html index a47f29d5..e8c05a59 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -2,6 +2,7 @@ + CodeIgniter License Agreement : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 8fc5e141..60c12c2a 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -2,6 +2,7 @@ + Application Flow Chart : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 9c9d98ee..a4d0f360 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -2,6 +2,7 @@ + CodeIgniter at a Glance : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 7fb46fb3..4ae1b0fe 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -2,6 +2,7 @@ + CodeIgniter Features : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index c2c19d3b..c8347aae 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -2,6 +2,7 @@ + Design and Architectural Goals : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 0c89b51e..4aa59f56 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -2,6 +2,7 @@ + CodeIgniter Overview : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index e1c1a72d..bac0a805 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -2,6 +2,7 @@ + Model-View-Controller : CodeIgniter User Guide @@ -12,7 +13,6 @@ - diff --git a/user_guide/toc.html b/user_guide/toc.html index 5a476349..2200550f 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -2,6 +2,7 @@ + Table of Contents : CodeIgniter User Guide @@ -12,7 +13,6 @@ - From a5481acfbee750e5295713ad250dbb2573d374b0 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 2 Jun 2008 18:11:50 +0000 Subject: [PATCH 1184/2544] added a missing word --- user_guide/database/caching.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index d9b90621..6d157abe 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -91,7 +91,7 @@

    How Does Caching Work?

    Cache files DO NOT expire. Any queries that have been cached will remain cached until you delete them. The caching system permits you clear caches associated with individual pages, or you can delete the entire collection of cache files. -Typically you'll to use the housekeeping functions described below to delete cache files after certain +Typically you'll want to use the housekeeping functions described below to delete cache files after certain events take place, like when you've added new information to your database.

    Will Caching Improve Your Site's Performance?

    From 694096e5923057bec182726ef6fc8dbd2908978d Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 4 Jun 2008 16:37:00 +0000 Subject: [PATCH 1185/2544] change AR behaviour so that blank values result in empty quotes --- system/database/DB_active_rec.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 05a04350..17cdc322 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -454,13 +454,11 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = TRUE) $k .= ' ='; } - if ($v !== '' AND $v !== NULL) - { - if ($escape === TRUE) - { - $v = ' '.$this->escape($v); - } + if ($v !== NULL AND $escape === TRUE) + { + $v = ' '.$this->escape($v); } + } else { From d8364c4267ddccb64ac330067162a3ce0d4e08c2 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 4 Jun 2008 17:01:00 +0000 Subject: [PATCH 1186/2544] bit of a code cleanup --- system/database/DB_active_rec.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 17cdc322..4eff400c 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -427,7 +427,7 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = TRUE) { $prefix = (count($this->ar_where) == 0) ? '' : $type; - if ( ! $this->_has_operator($k) && is_null($key[$k])) + if (is_null($v) && ! $this->_has_operator($k)) { // value appears not to have been set, assign the test to IS NULL $k .= ' IS NULL'; @@ -447,6 +447,9 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = TRUE) { $k = $this->_protect_identifiers($k); } + + $v = ' '.$this->escape($v); + } if ( ! $this->_has_operator($k)) @@ -454,11 +457,6 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = TRUE) $k .= ' ='; } - if ($v !== NULL AND $escape === TRUE) - { - $v = ' '.$this->escape($v); - } - } else { @@ -471,6 +469,7 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = TRUE) } $this->ar_where[] = $prefix.$k.$v; + if ($this->ar_caching === TRUE) { $this->ar_cache_where[] = $prefix.$k.$v; From c06f58e19ba52820ca400e3f1a139f8f86961724 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 4 Jun 2008 17:04:48 +0000 Subject: [PATCH 1187/2544] compacting some whitespace --- system/database/DB_active_rec.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 4eff400c..818c8dd8 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -435,7 +435,6 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = TRUE) if ( ! is_null($v)) { - if ($escape === TRUE) { // exception for "field<=" keys @@ -456,16 +455,13 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = TRUE) { $k .= ' ='; } - } else { - if ($escape === TRUE) { $k = $this->_protect_identifiers($k, TRUE); - } - + } } $this->ar_where[] = $prefix.$k.$v; From 7e98a2780131b01d7ecea5e3e4d363ae9601149d Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 4 Jun 2008 17:05:44 +0000 Subject: [PATCH 1188/2544] whitespace, whitespace, schmeitespace --- system/database/DB_active_rec.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 818c8dd8..8d8b23c4 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -448,7 +448,6 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = TRUE) } $v = ' '.$this->escape($v); - } if ( ! $this->_has_operator($k)) @@ -472,6 +471,7 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = TRUE) } } + return $this; } From c04f0fc794c503ca957257f29fc6fc2bed7bd6fa Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 4 Jun 2008 18:20:18 +0000 Subject: [PATCH 1189/2544] emendation to on* event handler removal --- system/libraries/Input.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index b111108e..c2c28fb1 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -757,7 +757,7 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') * but it's unlikely to be a problem. * */ - $event_handlers = array('xmlns'); + $event_handlers = array('on\w*','xmlns'); if ($is_image === TRUE) { @@ -768,8 +768,7 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') unset($event_handlers[array_search('xmlns', $event_handlers)]); } - $str = preg_replace("#<([^><]+)((?=on\w*)|".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); - + $str = preg_replace("#<([^><]+)(".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); /* * Sanitize naughty HTML elements * From 144cb5b3c82ff9a25bd4e675385603675e3699d0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 4 Jun 2008 19:38:00 +0000 Subject: [PATCH 1190/2544] simplified and refactored input filtering and retrieval --- system/libraries/Input.php | 129 +++++++++---------------------------- 1 file changed, 32 insertions(+), 97 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index c2c28fb1..b0a39c59 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -133,32 +133,14 @@ function _sanitize_globals() } else { - if (is_array($_GET) AND count($_GET) > 0) - { - foreach($_GET as $key => $val) - { - $_GET[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); - } - } + $_GET = $this->_clean_input_data($_GET); } // Clean $_POST Data - if (is_array($_POST) AND count($_POST) > 0) - { - foreach($_POST as $key => $val) - { - $_POST[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); - } - } - + $_POST = $this->_clean_input_data($_POST); + // Clean $_COOKIE Data - if (is_array($_COOKIE) AND count($_COOKIE) > 0) - { - foreach($_COOKIE as $key => $val) - { - $_COOKIE[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); - } - } + $_COOKIE = $this->_clean_input_data($_COOKIE); log_message('debug', "Global POST and COOKIE data sanitized"); } @@ -232,38 +214,46 @@ function _clean_input_keys($str) } // -------------------------------------------------------------------- - + /** - * Fetch an item from the GET array + * Fetch from array * - * @access public + * This is a helper function to retrieve values from global arrays + * + * @access private + * @param array * @param string * @param bool * @return string */ - function get($index = '', $xss_clean = FALSE) + function _fetch_from_array(&$array, $index = '', $xss_clean = FALSE) { - if ( ! isset($_GET[$index])) + if ( ! isset($array[$index])) { return FALSE; } if ($xss_clean === TRUE) { - if (is_array($_GET[$index])) - { - foreach($_GET[$index] as $key => $val) - { - $_GET[$index][$key] = $this->xss_clean($val); - } - } - else - { - return $this->xss_clean($_GET[$index]); - } + return $this->xss_clean($array[$index]); } - return $_GET[$index]; + return $array[$index]; + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the GET array + * + * @access public + * @param string + * @param bool + * @return string + */ + function get($index = '', $xss_clean = FALSE) + { + return $this->_fetch_from_array($_GET, $index, $xss_clean); } // -------------------------------------------------------------------- @@ -278,27 +268,7 @@ function get($index = '', $xss_clean = FALSE) */ function post($index = '', $xss_clean = FALSE) { - if ( ! isset($_POST[$index])) - { - return FALSE; - } - - if ($xss_clean === TRUE) - { - if (is_array($_POST[$index])) - { - foreach($_POST[$index] as $key => $val) - { - $_POST[$index][$key] = $this->xss_clean($val); - } - } - else - { - return $this->xss_clean($_POST[$index]); - } - } - - return $_POST[$index]; + return $this->_fetch_from_array($_POST, $index, $xss_clean); } // -------------------------------------------------------------------- @@ -313,32 +283,7 @@ function post($index = '', $xss_clean = FALSE) */ function cookie($index = '', $xss_clean = FALSE) { - if ( ! isset($_COOKIE[$index])) - { - return FALSE; - } - - if ($xss_clean === TRUE) - { - if (is_array($_COOKIE[$index])) - { - $cookie = array(); - foreach($_COOKIE[$index] as $key => $val) - { - $cookie[$key] = $this->xss_clean($val); - } - - return $cookie; - } - else - { - return $this->xss_clean($_COOKIE[$index]); - } - } - else - { - return $_COOKIE[$index]; - } + return $this->_fetch_from_array($_COOKIE, $index, $xss_clean); } // -------------------------------------------------------------------- @@ -353,17 +298,7 @@ function cookie($index = '', $xss_clean = FALSE) */ function server($index = '', $xss_clean = FALSE) { - if ( ! isset($_SERVER[$index])) - { - return FALSE; - } - - if ($xss_clean === TRUE) - { - return $this->xss_clean($_SERVER[$index]); - } - - return $_SERVER[$index]; + return $this->_fetch_from_array($_SERVER, $index, $xss_clean); } // -------------------------------------------------------------------- From c1acb410524414fa925c47834d124a3884b68dcb Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 4 Jun 2008 20:58:03 +0000 Subject: [PATCH 1191/2544] a few tweaks for speed --- system/libraries/Input.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index b0a39c59..50b4d823 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -521,8 +521,7 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') * between ascii characters, like Java\0script. * */ - $str = preg_replace('/\0+/', '', $str); - $str = preg_replace('/(\\\\0)+/', '', $str); + $str = preg_replace(array('/\0+/', '/(\\\\0)+/'), '', $str); /* * Protect GET variables in URLs @@ -646,7 +645,9 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') foreach ($words as $word) { $temp = ''; - for ($i = 0; $i < strlen($word); $i++) + $wordlen = strlen($word); + + for ($i = 0; $i < $wordlen; $i++) { $temp .= substr($word, $i, 1)."\s*"; } From 7a3b96e27988deeebeeff4469f5de3b9fb50918f Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 4 Jun 2008 21:01:56 +0000 Subject: [PATCH 1192/2544] picky picky Jones adjusts some syntax --- system/libraries/Input.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 50b4d823..8c08468b 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -645,9 +645,8 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') foreach ($words as $word) { $temp = ''; - $wordlen = strlen($word); - for ($i = 0; $i < $wordlen; $i++) + for ($i = 0, $wordlen = strlen($word); $i < $wordlen; $i++) { $temp .= substr($word, $i, 1)."\s*"; } From 1e6ab99c692bb0337559d3303143838dff37d638 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 6 Jun 2008 11:37:34 +0000 Subject: [PATCH 1193/2544] Form helper refactored to allow form_open() and form_fieldset() to accept arrays or strings as arguments. --- system/helpers/form_helper.php | 70 +++++++++++++++++++++++++--------- user_guide/changelog.html | 5 +++ 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index c6aa0d2b..cc08f4fe 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -48,18 +48,7 @@ function form_open($action = '', $attributes = array(), $hidden = array()) $form = '
    0) - { - foreach ($attributes as $key => $val) - { - $form .= ' '.$key.'="'.$val.'"'; - } - } + $form .= _attributes_to_string($attributes, TRUE); $form .= '>'; @@ -467,13 +456,7 @@ function form_fieldset($legend_text = '', $attributes = array()) $fieldset = " 0) - { - foreach ($attributes as $key => $val) - { - $fieldset .= ' '.$key.'="'.$val.'"'; - } - } + $fieldset .= _attributes_to_string($attributes, FALSE); $fieldset .= ">\n"; @@ -610,6 +593,55 @@ function parse_form_attributes($attributes, $default) } } +// ------------------------------------------------------------------------ + +/** + * Attributes To String + * + * Helper function used by some of the form helpers + * + * @access private + * @param mixed + * @param bool + * @return string + */ +if ( ! function_exists('_attributes_to_string')) +{ + function _attributes_to_string($attributes, $formtag = FALSE) + { + if (is_string($attributes) AND strlen($attributes) > 0) + { + if ($formtag == TRUE AND strpos($attributes, 'method=') === FALSE) + { + $attributes .= ' method="post"'; + } + + return ' '.$attributes; + } + + if (is_object($attributes) AND count($attributes) > 0) + { + $attributes = (array)$attributes; + } + + if (is_array($attributes) AND count($attributes) > 0) + { + $atts = ''; + + if ( ! isset($attributes['method']) AND $formtag === TRUE) + { + $atts .= ' method="post"'; + } + + foreach ($attributes as $key => $val) + { + $atts .= ' '.$key.'="'.$val.'"'; + } + + return $atts; + } + } +} /* End of file form_helper.php */ /* Location: ./system/helpers/form_helper.php */ \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f37982cf..47e517dc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -74,6 +74,11 @@

    Version 1.6.3

  • Added support for query strings to the Pagination class, automatically detected or explicitly declared.
    • +
  • Helpers +
      +
    • Form helper refactored to allow form_open() and form_fieldset() to accept arrays or strings as arguments.
      • +
    +
  • Other changes
    • Added ability to use xss_clean() to test images for XSS, useful for upload security.
      • From f7623aab9c9d9c0d0dae5911857cf8ba8d7a462c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 6 Jun 2008 13:36:19 +0000 Subject: [PATCH 1194/2544] default to post method --- system/helpers/form_helper.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index cc08f4fe..37afc2da 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -40,7 +40,7 @@ */ if ( ! function_exists('form_open')) { - function form_open($action = '', $attributes = array(), $hidden = array()) + function form_open($action = '', $attributes = = 'method="post"', $hidden = array()) { $CI =& get_instance(); @@ -453,7 +453,6 @@ function form_label($label_text = '', $id = '', $attributes = array()) { function form_fieldset($legend_text = '', $attributes = array()) { - $fieldset = " Date: Fri, 6 Jun 2008 13:41:53 +0000 Subject: [PATCH 1195/2544] goofed. Fixed up. --- system/helpers/form_helper.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 37afc2da..d250d76e 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -40,10 +40,15 @@ */ if ( ! function_exists('form_open')) { - function form_open($action = '', $attributes = = 'method="post"', $hidden = array()) + function form_open($action = '', $attributes = '', $hidden = array()) { $CI =& get_instance(); + if ($attributes == '') + { + $attributes = 'method="post"'; + } + $action = ( strpos($action, '://') === FALSE) ? $CI->config->site_url($action) : $action; $form = ' Date: Fri, 6 Jun 2008 14:17:57 +0000 Subject: [PATCH 1196/2544] Removed an unused Router reference in _display_cache(). --- system/codeigniter/CodeIgniter.php | 2 +- system/libraries/Output.php | 4 +--- user_guide/changelog.html | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index da20c48a..74e5e8b4 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -103,7 +103,7 @@ if ($EXT->_call_hook('cache_override') === FALSE) { - if ($OUT->_display_cache($CFG, $RTR) == TRUE) + if ($OUT->_display_cache($CFG, $URI) == TRUE) { exit; } diff --git a/system/libraries/Output.php b/system/libraries/Output.php index 49cfc0a2..cc88f40a 100644 --- a/system/libraries/Output.php +++ b/system/libraries/Output.php @@ -321,10 +321,8 @@ function _write_cache($output) * @access public * @return void */ - function _display_cache(&$CFG, &$RTR) + function _display_cache(&$CFG, &$URI) { - $URI =& load_class('URI'); - $cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path'); if ( ! is_dir($cache_path) OR ! is_really_writable($cache_path)) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 47e517dc..110f1c27 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -81,6 +81,7 @@

      Version 1.6.3

    • Other changes
        +
      • Removed an unused Router reference in _display_cache().
      • Added ability to use xss_clean() to test images for XSS, useful for upload security.
      • Improved security in xss_clean().
      • Considerably expanded list of mobile user-agents in config/user_agents.php.
        • From 27a5aa1f5c85fb7e53eda5ab0dd3efcbd70b2338 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 6 Jun 2008 18:51:59 +0000 Subject: [PATCH 1197/2544] added quoted-printable headers when $this->send_multipart has been manually changed to FALSE --- system/libraries/Email.php | 3 ++- user_guide/changelog.html | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 8eb47dc8..e02c83d1 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -993,7 +993,8 @@ function _build_message() if ($this->send_multipart === FALSE) { - $hdr .= "Content-Type: text/html;". $this->newline; + $hdr .= "Content-Type: text/html; charset=" . $this->charset . $this->newline; + $hdr .= "Content-Transfer-Encoding: quoted-printable"; } else { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 110f1c27..469a9508 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -102,6 +102,7 @@

        Bug fixes for 1.6.3

      • Removed some unused variables from the code (#4563).
      • Fixed a bug where having() was not adding an = into the statement (#4568).
      • Fixed assorted user guide typos or examples (#4574).
        • +
      • Added quoted-printable headers to Email class when the multi-part override is used.

      Version 1.6.2

      From 61860c92fc3bf693537837448b584f2c8485ee46 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 9 Jun 2008 03:09:12 +0000 Subject: [PATCH 1198/2544] Added a language key for valid_emails in validation_lang.php. --- system/language/english/validation_lang.php | 5 +++-- user_guide/changelog.html | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/system/language/english/validation_lang.php b/system/language/english/validation_lang.php index f26115f4..7da801d1 100644 --- a/system/language/english/validation_lang.php +++ b/system/language/english/validation_lang.php @@ -3,6 +3,7 @@ $lang['required'] = "The %s field is required."; $lang['isset'] = "The %s field must have a value."; $lang['valid_email'] = "The %s field must contain a valid email address."; +$lang['valid_emails'] = "The %s field must contain all valid email addresses."; $lang['valid_url'] = "The %s field must contain a valid URL."; $lang['valid_ip'] = "The %s field must contain a valid IP."; $lang['min_length'] = "The %s field must be at least %s characters in length."; @@ -15,6 +16,6 @@ $lang['integer'] = "The %s field must contain an integer."; $lang['matches'] = "The %s field does not match the %s field."; - -/* End of file validation_lang.php */ + +/* End of file validation_lang.php */ /* Location: ./system/language/english/validation_lang.php */ \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 469a9508..db968b0c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -94,6 +94,7 @@

      Version 1.6.3

      Bug fixes for 1.6.3

        +
      • Added a language key for valid_emails in validation_lang.php.
      • Amended fixes for bug (#3419) with parsing DSN database connections.
      • Moved the _has_operators() function (#4535) into DB_driver from DB_active_rec.
      • Fixed a syntax error in upload_lang.php.
        • From 1249107af8bad0434b310bda51d2de0a429a366c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 13 Jun 2008 20:03:39 +0000 Subject: [PATCH 1199/2544] Added "Using Associative Arrays In a Request Parameter" example to the XMLRPC userguide page. --- user_guide/changelog.html | 3 ++- user_guide/libraries/xmlrpc.html | 29 ++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index db968b0c..d004da64 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -85,7 +85,8 @@

        Version 1.6.3

      • Added ability to use xss_clean() to test images for XSS, useful for upload security.
      • Improved security in xss_clean().
      • Considerably expanded list of mobile user-agents in config/user_agents.php.
        • -
      • Charset information in the userguide has been moved above title for internationalization purposes (#4614)
        • +
      • Charset information in the userguide has been moved above title for internationalization purposes (#4614).
        • +
      • Added "Using Associative Arrays In a Request Parameter" example to the XMLRPC userguide page.
    diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index e426f700..e3d51903 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -398,9 +398,36 @@

    Try it!

    The client you created sends a message ("How's is going?") to the server, along with a request for the "Greetings" method. The Server receives the request and maps it to the "process" function, where a response is sent back.

    +

    Using Associative Arrays In a Request Parameter

    + +

    If you wish to use an associative array in your method parameters you will need to use a struct datatype:

    + +$request = array(
    +                  array(
    +                        // Param 0
    +                        array(
    +                              'name'=>'John'
    +                              ),
    +                              'struct'
    +                        ),
    +                        array(
    +                              // Param 1
    +                              array(
    +                                    'size'=>'large',
    +                                    'shape'=>'round'
    +                                    ),
    +                              'struct'
    +                        )
    +                  );
    + $this->xmlrpc->request($request);     + +

    You can retrieve the associative array when processing the request in the Server.

    +$parameters = $request->output_parameters();
    + $name = $parameters['0']['name'];
    + $size = $parameters['1']['size'];
    + $size = $parameters['1']['shape'];     -

     

    XML-RPC Function Reference

    $this->xmlrpc->server()

    From 810d5015dd535098cef3f7c16d997374d0d431ac Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 15 Jun 2008 17:23:48 +0000 Subject: [PATCH 1200/2544] userguide typo fix --- user_guide/changelog.html | 2 +- user_guide/database/active_record.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d004da64..a75e71ca 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -103,7 +103,7 @@

    Bug fixes for 1.6.3

  • Fixed a bug (#4561) where orhaving() wasn't properly passing values.
  • Removed some unused variables from the code (#4563).
  • Fixed a bug where having() was not adding an = into the statement (#4568).
    • -
  • Fixed assorted user guide typos or examples (#4574).
    • +
  • Fixed assorted user guide typos or examples (#4574, #4706).
  • Added quoted-printable headers to Email class when the multi-part override is used.
    • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 1a3c9b6e..aaee21e9 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -699,7 +699,7 @@

     Method Chaining

     Active Record Caching

    While not "true" caching, Active Record enables you to save (or "cache") certain parts of your queries for reuse later. Normally, when an Active Record call is completed, all stored information is reset for the next call. With caching, you can prevent this reset, and reuse information easily.

    -

    Cached calls are cumulative.  If you makes 2 cached select() calls, and then 2 uncached select() calls, this will result in 4 select() calls. There are three Caching functions available:

    +

    Cached calls are cumulative.  If you make 2 cached select() calls, and then 2 uncached select() calls, this will result in 4 select() calls. There are three Caching functions available:

    $this->db->start_cache()

    This function must be called to begin caching. All Active Record queries of the correct type (see below for supported queries) are stored for later use.

    $this->db->stop_cache()

    From 9736d3fb84260c24faa6c1538c99859441c0e2f8 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 16 Jun 2008 21:36:01 +0000 Subject: [PATCH 1201/2544] correcting some docblock comments --- system/libraries/Email.php | 18 +++++++++--------- system/libraries/Loader.php | 4 ++-- system/libraries/Log.php | 3 --- system/libraries/Validation.php | 4 ++++ system/libraries/Zip.php | 1 - 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index e02c83d1..6ced2c5c 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -377,7 +377,7 @@ function attach($filename, $disposition = 'attachment') /** * Add a Header Item * - * @access public + * @access private * @param string * @param string * @return void @@ -392,7 +392,7 @@ function _set_header($header, $value) /** * Convert a String to an Array * - * @access public + * @access private * @param string * @return array */ @@ -646,7 +646,7 @@ function _get_content_type() /** * Set RFC 822 Date * - * @access public + * @access private * @return string */ function _set_date() @@ -902,7 +902,7 @@ function word_wrap($str, $charlim = '') /** * Build final headers * - * @access public + * @access private * @param string * @return string */ @@ -920,7 +920,7 @@ function _build_headers() /** * Write Headers as a string * - * @access public + * @access private * @return void */ function _write_headers() @@ -953,7 +953,7 @@ function _write_headers() /** * Build Final Body and attachments * - * @access public + * @access private * @return void */ function _build_message() @@ -1145,7 +1145,7 @@ function _build_message() * Prepares string for Quoted-Printable Content-Transfer-Encoding * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt * - * @access public + * @access private * @param string * @param integer * @return string @@ -1525,7 +1525,7 @@ function _send_with_smtp() /** * SMTP Connect * - * @access public + * @access private * @param string * @return string */ @@ -1798,7 +1798,7 @@ function print_debugger() /** * Set Message * - * @access public + * @access private * @param string * @return string */ diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 3346f0a2..9b21bc31 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -100,9 +100,9 @@ function library($library = '', $params = NULL) * * This function lets users load and instantiate models. * - * @access public * @param string the name of the class - * @param mixed any initialization parameters + * @param string name for the model + * @param bool database connection * @return void */ function model($model, $name = '', $db_conn = FALSE) diff --git a/system/libraries/Log.php b/system/libraries/Log.php index 4d64cd32..2ff2c2db 100644 --- a/system/libraries/Log.php +++ b/system/libraries/Log.php @@ -36,9 +36,6 @@ class CI_Log { * Constructor * * @access public - * @param string the log file path - * @param string the error threshold - * @param string the date formatting codes */ function CI_Log() { diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php index 9654b4f4..f5e4d222 100644 --- a/system/libraries/Validation.php +++ b/system/libraries/Validation.php @@ -402,6 +402,7 @@ function required($str) * * @access public * @param string + * @param field * @return bool */ function matches($str, $field) @@ -421,6 +422,7 @@ function matches($str, $field) * * @access public * @param string + * @param value * @return bool */ function min_length($str, $val) @@ -440,6 +442,7 @@ function min_length($str, $val) * * @access public * @param string + * @param value * @return bool */ function max_length($str, $val) @@ -459,6 +462,7 @@ function max_length($str, $val) * * @access public * @param string + * @param value * @return bool */ function exact_length($str, $val) diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index ed476ab4..8958b572 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -291,7 +291,6 @@ function get_zip() * * @access public * @param string the file name - * @param string the data to be encoded * @return bool */ function archive($filepath) From 3640a0b83b610c3e497efa5f739787e225e9b2ad Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 19 Jun 2008 07:46:22 +0000 Subject: [PATCH 1202/2544] removed maxlength and size as automatically added attributes in form helper --- system/helpers/form_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index d250d76e..5b28d3de 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -135,7 +135,7 @@ function form_hidden($name, $value = '') { function form_input($data = '', $value = '', $extra = '') { - $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value, 'maxlength' => '500', 'size' => '50'); + $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); return "\n"; } From fa47bc982d4f81d2bda0470fa3237c37f605c72a Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 19 Jun 2008 07:52:37 +0000 Subject: [PATCH 1203/2544] changelog note that I removed maxlength and size as automatically added attributes in form helper --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a75e71ca..ab006e78 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -87,6 +87,7 @@

    Version 1.6.3

  • Considerably expanded list of mobile user-agents in config/user_agents.php.
  • Charset information in the userguide has been moved above title for internationalization purposes (#4614).
  • Added "Using Associative Arrays In a Request Parameter" example to the XMLRPC userguide page.
    • +
  • Removed maxlength and size as automatically added attributes of form_input() in the form helper.
    • From a935c3f0b0c733641c0b3b6cc8c2f4b2e3df71f2 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 19 Jun 2008 17:42:55 +0000 Subject: [PATCH 1204/2544] added a Number helper --- system/helpers/number_helper.php | 68 ++++++++++++++++++++++++++++++++ user_guide/changelog.html | 1 + 2 files changed, 69 insertions(+) create mode 100644 system/helpers/number_helper.php diff --git a/system/helpers/number_helper.php b/system/helpers/number_helper.php new file mode 100644 index 00000000..f158b1cd --- /dev/null +++ b/system/helpers/number_helper.php @@ -0,0 +1,68 @@ += 1000000000) + { + $num = round($num/107374182)/10; + $unit = 'GB'; + } + elseif ($num >= 1000000) + { + $num = round($num/104857)/10; + $unit = 'MB'; + } + elseif ($num >= 1000) + { + $num = round($num/102)/10; + $unit = 'KB'; + } + else + { + $unit = 'Bytes'; + } + + return number_format($num, 1).' '.$unit; + } +} + +/* End of file number_helper.php */ +/* Location: ./system/helpers/number_helper.php */ \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ab006e78..bf26a67a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -76,6 +76,7 @@

    Version 1.6.3

  • Helpers
      +
    • Added a Number helper.
    • Form helper refactored to allow form_open() and form_fieldset() to accept arrays or strings as arguments.
    • From 33f6c68026a3a6f5d77f6062a3ec0c2d9c04683b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 19 Jun 2008 18:08:04 +0000 Subject: [PATCH 1205/2544] added terabytes to number helper added number helper guide pages, menus, toc, etc --- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/number_helper.html | 102 +++++++++++++++++++++++ user_guide/helpers/path_helper.html | 2 +- user_guide/nav/nav.js | 1 + user_guide/toc.html | 1 + 5 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 user_guide/helpers/number_helper.html diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 328b41d3..4d6196e3 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -142,7 +142,7 @@

    humanize()

       ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  Security Helper +Next Topic:  Number Helper

    CodeIgniter  ·  Copyright © 2006-2008  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html new file mode 100644 index 00000000..e4dab849 --- /dev/null +++ b/user_guide/helpers/number_helper.html @@ -0,0 +1,102 @@ + + + + + +Number Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.6.2

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Number Helper

    + +

    The Number Helper file contains functions that help you work with numeric data.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('number'); + +

    The following functions are available:

    + + +

    byte_format()

    + +

    Formats a numbers as bytes, based on size, and adds the appropriate suffix. Examples:

    + + +echo byte_format(456); // Returns 456.0 Bytes
    +echo byte_format(4567); // Returns 4.5 KB
    +echo byte_format(45678); // Returns 44.8 KB
    +echo byte_format(456789); // Returns 447.8 KB
    +echo byte_format(3456789); // Returns 3.3 MB
    +echo byte_format(12345678912345); // Returns 1.8 GB
    +echo byte_format(123456789123456789); // Returns 11,228.3 TB +     + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index c2aa3479..19979593 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -89,7 +89,7 @@

     

    From 7aae905cdfcc2113b7855585441d640cf665581f Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 25 Jun 2008 16:02:06 +0000 Subject: [PATCH 1211/2544] Further improvements to xss_clean() --- system/libraries/Input.php | 130 +++++++++++++++++++++++-------------- 1 file changed, 83 insertions(+), 47 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 0b05c54d..783446ae 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -511,7 +511,7 @@ function filename_security($str) * @param string * @return string */ - function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') + function xss_clean($str, $is_image = FALSE) { /* * Is the string an array? @@ -528,22 +528,9 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') } /* - * Runaway loop prevention. If the text has had to be examined this many times - * I think it's safe to say that it is best to simply ignore it. + * Remove Invisible Characters */ - if ($loops > 9) - { - return ''; - } - - /* - * Remove Null Characters - * - * This prevents sandwiching null characters - * between ascii characters, like Java\0script. - * - */ - $str = preg_replace(array('/\0+/', '/(\\\\0)+/'), '', $str); + $str = $this->_remove_invisible_characters($str); /* * Protect GET variables in URLs @@ -600,6 +587,11 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') $str = preg_replace_callback("/<\w+.*?(?=>|<|$)/si", array($this, '_html_entity_decode_callback'), $str); + /* + * Remove Invisible Characters Again! + */ + $str = $this->_remove_invisible_characters($str); + /* * Convert all tabs to spaces * @@ -613,22 +605,7 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') if (strpos($str, "\t") !== FALSE) { $str = str_replace("\t", ' ', $str); - } - - /* - * Check and set converted string - */ - if ($looped_convert != '' && $looped_convert == $str) - { - // if we are in a loop, and the converted string is the same as the last pass, - // then this is going to repeat until we hit the runaway loop prevention, - // so we might as well stop now. - return ''; } - else - { - $converted_string = $str; - } /* * Not Allowed Under Any Conditions @@ -677,7 +654,7 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') // That way valid stuff like "dealer to" does not become "dealerto" $str = preg_replace_callback('#('.substr($temp, 0, -3).')(\W)#is', array($this, '_compact_exploded_words'), $str); } - + /* * Remove disallowed Javascript in links or img tags * We used to do some version comparisons and use of stripos for PHP5, but it is dog slow compared @@ -689,17 +666,17 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') if (preg_match("/|<|$)#si", array($this, '_js_link_removal'), $str); + $str = preg_replace_callback("#]*?)(>|$)#si", array($this, '_js_link_removal'), $str); } if (preg_match("/|<|$)#si", array($this, '_js_img_removal'), $str); + $str = preg_replace_callback("#]*?)(>|$)#si", array($this, '_js_img_removal'), $str); } if (preg_match("/script/i", $str) OR preg_match("/xss/i", $str)) { - $str = preg_replace("##si", "", $str); + $str = preg_replace("#<(/*)(script|xss)(.*?)\>#si", '[removed]', $str); } } while($original != $str); @@ -726,6 +703,7 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') } $str = preg_replace("#<([^><]+)(".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); + /* * Sanitize naughty HTML elements * @@ -790,16 +768,6 @@ function xss_clean($str, $is_image = FALSE, $loops = 0, $looped_convert = '') return FALSE; } } - - /* - * If something changed after character conversion, we can be fairly confident that something - * malicious was removed, so let's take no chances that the attacker is counting on specific - * mutations taking place to allow a new attack to reveal itself. So say we all. - */ - if ($converted_string != $str) - { - $str = $this->xss_clean($str, $is_image, ++$loops, $converted_string); - } log_message('debug', "XSS Filtering completed"); return $str; @@ -830,6 +798,44 @@ function xss_hash() // -------------------------------------------------------------------- + /** + * Remove Invisible Characters + * + * This prevents sandwiching null characters + * between ascii characters, like Java\0script. + * + * @access public + * @param string + * @return string + */ + function _remove_invisible_characters($str) + { + static $non_displayables; + + if ( ! isset($non_displayables)) + { + // every control character except newline (10), carriage return (13), and horizontal tab (09), + // both as a URL encoded character (::shakes fist at IE and WebKit::), and the actual character + $non_displayables = array( + '/%0[0-8]/', '/[\x00-\x08]/', // 00-08 + '/%11/', '/\x0b/', '/%12/', '/\x0c/', // 11, 12 + '/%1[4-9]/', '/%2[0-9]/', '/%3[0-1]/', // url encoded 14-31 + '/[\x0e-\x1f]/'); // 14-31 + + } + + do + { + $cleaned = $str; + $str = preg_replace($non_displayables, '', $str); + } + while ($cleaned != $str); + + return $str; + } + + // -------------------------------------------------------------------- + /** * Compact Exploded Words * @@ -883,7 +889,8 @@ function _sanitize_naughty_html($matches) */ function _js_link_removal($match) { - return preg_replace("#href=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|_filter_attributes(str_replace(array('<', '>'), '', $match[1])); + return str_replace($match[1], preg_replace("#href=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|_filter_attributes(str_replace(array('<', '>'), '', $match[1])); + return str_replace($match[1], preg_replace("#src=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie| Date: Wed, 25 Jun 2008 16:12:35 +0000 Subject: [PATCH 1212/2544] added a bit of leeway for images to avoid the more common false-positives that using xss_clean() on image files might trigger --- system/libraries/Input.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 783446ae..04b373e4 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -631,8 +631,17 @@ function xss_clean($str, $is_image = FALSE) * But it doesn't seem to pose a problem. * */ - $str = str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); - + if ($is_image === TRUE) + { + // Images have a tendency to have the PHP short opening and closing tags every so often + // so we skip those and only do the long opening tags. + $str = str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); + } + /* * Compact any exploded words * From d6c69981ba89e52bec1240307b419806503e1283 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 25 Jun 2008 17:29:23 +0000 Subject: [PATCH 1213/2544] fixed accidental removal of $converted_string in xss_clean() for image comparison --- system/libraries/Input.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 04b373e4..5f47909a 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -607,6 +607,11 @@ function xss_clean($str, $is_image = FALSE) $str = str_replace("\t", ' ', $str); } + /* + * Capture converted string for later comparison + */ + $converted_string = $str; + /* * Not Allowed Under Any Conditions */ From 49ccc2327086fbb7d9736d98eabc1f6d1d853547 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 25 Jun 2008 19:01:12 +0000 Subject: [PATCH 1214/2544] guide linking to wrong pages fix --- user_guide/installation/troubleshooting.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index fc267c30..4061f5ed 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -42,7 +42,7 @@ CodeIgniter Home  ›  User Guide Home  ›  -Installation Instructions +Trouble Shooting
    Search User Guide   
    diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index a4d0f360..6dc9287b 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -159,7 +159,7 @@

    CodeIgniter has a Friendly Community of Users

     diff --git a/user_guide/database/index.html b/user_guide/database/index.html index a6854b5b..5dcea988 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -76,7 +76,7 @@

    The Database Class

  • Custom Function Calls
  • Query Caching
  • Database manipulation with Database Forge
    • -
  • Database Utilities Class
    • +
  • Database Utilities Class
    • diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 3c9f1195..ea794f08 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -69,7 +69,7 @@

    Helper Functions

    CodeIgniter does not load Helper Files by default, so the first step in using a Helper is to load it. Once loaded, it becomes globally available in your controller and views.

    -

    Helpers are typically stored in your system/helpers, or system/application/helpers directory. CodeIgniter will look first in your system/application/helpers +

    Helpers are typically stored in your system/helpers, or system/application/helpers directory. CodeIgniter will look first in your system/application/helpers directory. If the directory does not exist or the specified helper is not located there CI will instead look in your global system/helpers folder.

    diff --git a/user_guide/general/views.html b/user_guide/general/views.html index a161fa01..bc086150 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -129,7 +129,7 @@

    Loading multiple views

       }

    }
    - ?>

    + ?>

    In the example above, we are using "dynamically added data", which you will see below.

    Storing Views within Sub-folders

    Your view files can also be stored within sub-folders if you prefer that type of organization. When doing so you will need diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 83b97ab1..839f7251 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -258,7 +258,7 @@

    form_fieldset()

    </fieldset>

    Similar to other functions, you can submit an associative array in the second parameter if you prefer to set additional attributes.

    $attributes = array('id' => 'address_info', 'class' => 'address_info');
    - echo form_fieldset('Address Information', $attributes);
    + echo form_fieldset('Address Information', $attributes);
    echo "<p>fieldset content here</p>\n";
    echo form_fieldset_close();

    @@ -269,7 +269,7 @@

    form_fieldset()

    </fieldset>

    form_fieldset_close()

    Produces a closing </fieldset> tag. The only advantage to using this function is it permits you to pass data to it - which will be added below the tag. For example:

    + which will be added below the tag. For example:

    $string = "</div></div>";

    echo fieldset_close($string);
    @@ -321,7 +321,7 @@

    form_submit()


    <input type="submit" name="mysubmit" value="Submit Post!" />

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. - The third parameter lets you add extra data to your form, like JavaScript.

    + The third parameter lets you add extra data to your form, like JavaScript.

    form_label()

    Lets you generate a <label>. Simple example:

    echo form_label('What is your Name', 'username');
    @@ -329,13 +329,13 @@

    form_label()

    // Would produce:
    <label for="username">What is your Name</label>     -

    Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

    +

    Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

    $attributes = array(
        'class' => 'mycustomclass',
        'style' => 'color: #000;',
    );
    - echo form_label('What is your Name', 'username', $attributes);
    -
    + echo form_label('What is your Name', 'username', $attributes);
    +
    // Would produce:
    <label for="username" class="mycustomclass" style="color: #000;">What is your Name</label>

    form_reset()

    diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index fcbcccdf..62898403 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -80,7 +80,7 @@

    heading()

    The above would produce: <h3>Welcome!</h3>

    img()

    Lets you create HTML <img /> tags. The first parameter contains the image source. There is data, the - second the size of the heading. Example:

    + second the size of the heading. Example:

    echo img('images/picture.jpg');
    // gives <img src="http://site.com/images/picture.jpg" />

    There is an optional second parameter that is a TRUE/FALSE value that specifics if the src should have the page specified by $config['index_page'] added to the address it creates. Presumably, this would be if you were using a media controller.

    @@ -88,17 +88,17 @@

    img()

    // gives <img src="http://site.com/index.php/images/picture.jpg" />

    Additionally, an associative array can be passed to the img() function for complete control over all attributes and values.

    $image_properties = array(
    -           'src' => 'images/picture.jpg',
    -           'alt' => 'Me, demonstrating how to eat 4 slices of pizza at one time',
    -           'class' => 'post_images',
    -           'width' => '200',
    -           'height' => '200',
    -           'title' => 'That was quite a night',
    -           'rel' => 'lightbox',
    - );
    -
    - img($image_properties);
    - // <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />

    +           'src' => 'images/picture.jpg',
    +           'alt' => 'Me, demonstrating how to eat 4 slices of pizza at one time',
    +           'class' => 'post_images',
    +           'width' => '200',
    +           'height' => '200',
    +           'title' => 'That was quite a night',
    +           'rel' => 'lightbox',
    + );
    +
    + img($image_properties);
    + // <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />

    link_tag()

    Lets you create HTML <link /> tags. This is useful for stylesheet links, as well as other links. The parameters are href, with optional rel, type, title, media and index_page. index_page is a TRUE/FALSE value that specifics if the href should have the page specified by $config['index_page'] added to the address it creates. echo link_tag('css/mystyles.css');
    @@ -106,24 +106,24 @@

    link_tag()

    Further examples:

    - echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
    - // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" /> -
    -
    - echo link('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
    - // <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />     + echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
    + // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" /> +
    +
    + echo link('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
    + // <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />

    Additionally, an associative array can be passed to the link() function for complete control over all attributes and values.

    - $link = array(
    -           'href' => 'css/printer.css',
    -           'rel' => 'stylesheet',
    -           'type' => 'text/css',
    -           'media' => 'print'
    - );
    -
    - echo link_tag($link);
    - // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />

    - + $link = array(
    +           'href' => 'css/printer.css',
    +           'rel' => 'stylesheet',
    +           'type' => 'text/css',
    +           'media' => 'print'
    + );
    +
    + echo link_tag($link);
    + // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />

    +

    nbs()

    Generates non-breaking spaces (&nbsp;) based on the number you submit. Example:

    echo nbs(3); diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 025a4329..24a0a661 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -122,8 +122,8 @@

    reduce_double_slashes()

    echo reduce_double_slashes($string); // results in "http://example.com/index.php"

    trim_slashes()

    Removes any leading/trailing slashes from a string. Example:
    -
    - $string = "/this/that/theother/";
    +
    + $string = "/this/that/theother/";
    echo trim_slashes($string); // results in this/that/theother

    diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 90bc7d3c..01389f33 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -80,15 +80,15 @@

    Step 1: Update your CodeIgniter files

    Step 2: Add charset to your config.php

    Add the following to system/application/config/config.php

    /*
    - |--------------------------------------------------------------------------
    - | Default Character Set
    - |--------------------------------------------------------------------------
    - |
    - | This determines which character set is used by default in various methods
    - | that require a character set to be provided.
    - |
    - */
    - $config['charset'] = "UTF-8";     + |--------------------------------------------------------------------------
    + | Default Character Set
    + |--------------------------------------------------------------------------
    + |
    + | This determines which character set is used by default in various methods
    + | that require a character set to be provided.
    + |
    + */
    + $config['charset'] = "UTF-8";

    Step 3: Autoloading language files

    If you want to autoload any language files, add this line to system/application/config/autoload.php

    diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index f4e703ee..b80a6881 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -83,16 +83,16 @@

    Step 2: Add time_to_update to your config.php

    Step 3: Add $autoload['model']

    Add the following to system/application/autoload.php

    /*
    - | -------------------------------------------------------------------
    - |  Auto-load Model files
    - | -------------------------------------------------------------------
    - | Prototype:
    - |
    - |    $autoload['model'] = array('my_model');
    - |
    - */
    -
    - $autoload['model'] = array();

    + | -------------------------------------------------------------------
    + |  Auto-load Model files
    + | -------------------------------------------------------------------
    + | Prototype:
    + |
    + |    $autoload['model'] = array('my_model');
    + |
    + */
    +
    + $autoload['model'] = array();

    Step 4: Add to your database.php

    Make the following changes to your system/application/config/database.php file:

    Add the following variable above the database configuration options, with $active_group

    diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index c8e64f82..7158ca76 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -60,35 +60,35 @@

    Session Class

    The Session class permits you maintain a user's "state" and track their activity while they browse your site. The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie. -It can additionally store the session data in a database table for added security, as this permits the session ID in the +It can also store the session data in a database table for added security, as this permits the session ID in the user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to -use the database option you'll need to create the session table as indicated below. +use the database option you'll need to create the session table as indicated below.

    Note: The Session class does not utilize native PHP sessions. It -generates its own session data so you are not dependent on how a particular hosting environment is set up.

    +generates its own session data, offering more flexibility for developers.

    Initializing a Session

    -

    The Session routines must happen with each page load (and before anything is outputted to the browser), so the session class must either be +

    Sessions will typically run globally with each page load, so the session class must either be initialized in your controller constructors, or it can be auto-loaded by the system. -Once initialized, the Session class will run unattended in the background, reading, writing, and updating the session as needed.

    +For the most part the session class will run unattended in the background, so simply initializing the class +will cause it to read, create, and update sessions.

    To initialize the Session class manually in your controller constructor, use the $this->load->library function:

    $this->load->library('session'); - -

    You can access the Session library object using: $this->session

    +

    Once loaded, the Sessions library object will be available using: $this->session

    How do Sessions work?

    -

    When a page is loaded, the Session class will check to see if valid session data exists in the user's session cookie. +

    When a page is loaded, the session class will check to see if valid session data exists in the user's session cookie. If sessions data does not exist (or if it has expired) a new session will be created and saved in the cookie. -If a session does exist, its information and cookie will be updated automatically. With each update, the session_id will be regenerated for security.

    +If a session does exist, its information will be updated and the cookie will be updated. With each update, the session_id will be regenerated.

    It's important for you to understand that once initialized, the Session class runs automatically. There is nothing you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or @@ -141,7 +141,7 @@

    Retrieving Session Data

    Adding Custom Session Data

    -

    A useful aspect of the session array is that you can add your own data to it and it will be stored in the session array. +

    A useful aspect of the session array is that you can add your own data to it and it will be stored in the user's cookie. Why would you want to do this? Here's one example:

    Let's say a particular user logs into your site. Once authenticated, @@ -156,20 +156,16 @@

    Adding Custom Session Data

    $newdata = array(
    -                    'username'  => 'johndoe',
    -                    'email'     => 'johndoe@some-site.com',
    -                    'logged_in' => TRUE
    -                );
    -
    - $this->session->set_userdata($newdata);

    - +                    'username'  => 'johndoe',
    +                    'email'     => 'johndoe@some-site.com',
    +                    'logged_in' => TRUE
    +                );
    +
    + $this->session->set_userdata($newdata);

    If you want to add userdata one value at a time, set_userdata() also supports this syntax.

    $this->session->set_userdata('some_name', 'some_value');

    - - -

    Note: By default, the session class stores your custom data in the session cookie. Cookies, however, can only hold -4KB of data, so it is easily possible to exceed the capacity, particularly if you use encryption, since it produces a longer data string than the original. -If you need to store a larger amount of data it is recommended that you store your session data in a database table. You'll find instructions for this below.

    +

    Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The +encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

    Removing Session Data

    Just as set_userdata() can be used to add information into a session, unset_userdata() can be used to remove it, by passing the session key. For example, if you wanted to remove 'some_name' from your session information:

    @@ -194,12 +190,8 @@

    Saving Session Data to a Database

    security, session ID validation may not be needed, but if your application requires security, validation is mandatory.

    When session data is available in a database, every time a valid session is found in the user's cookie, a database -query is performed to match it. If the session ID does not match, the session is destroyed.

    - -

    An additional benefit of using a database is that it permits you to store custom data along with the session. Earlier in this page we described how to add -custom data to your session. When you use the database feature, your custom data will be stored automatically in the database instead of in -the user's cookie.

    - +query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never +be updated, they can only be generated when a new session is created.

    In order to store sessions, you must first create a database table for this purpose. Here is the basic prototype (for MySQL) required by the session class:

    @@ -210,15 +202,12 @@

    Saving Session Data to a Database

    ip_address varchar(16) DEFAULT '0' NOT NULL, user_agent varchar(50) NOT NULL, last_activity int(10) unsigned DEFAULT 0 NOT NULL, -user_data text NOT NULL, PRIMARY KEY (session_id) ); -

    Note: By default the table is named ci_sessions, but you can name it anything you want -as long as you update the application/config/config.php file so that it contains the name you have chosen. The Session class, however, -expects the column names to be identical to the ones indicated above.

    - -

    Once you have created your database table you can enable the database option in your config.php file as follows:

    +

    Note: By default the table is called ci_sessions, but you can name it anything you want +as long as you update the application/config/config.php file so that it contains the name you have chosen. +Once you have created your database table you can enable the database option in your config.php file as follows:

    $config['sess_use_database'] = TRUE; @@ -228,7 +217,7 @@

    Saving Session Data to a Database

    $config['sess_table_name'] = 'ci_sessions"; -

    Note: The Session class has a built-in garbage collection routine which clears out expired sessions periodically so you +

    Note: The Session class has built-in garbage collection which clears out expired sessions so you do not need to write your own routine to do it.

    @@ -240,84 +229,64 @@

    Destroying a Session

    Session Preferences

    -

    Normally you will set the Session preferences in your application/config/config.php file.

    - -

    If you prefer to set any of the preferences manually you can do so when you load the session class, by passing an array of values you -wish to set in the second parameter as follows:

    - - -$session_vals = array(
    -                       'sess_expiration' = 10800,
    -                       'sess_match_ip'   = TRUE
    -                     );
    -
    -$this->load->library('session', $session_vals); -     - -

    The following table lists the available preferences:

    +

    You'll find the following Session related preferences in your application/config/config.php file:

    - - - - - - - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + +
    PreferenceDefaultOptionsDescription
    sess_cookie_nameci_sessionNoneThe name you want the session cookie saved as.PreferenceDefaultOptionsDescription
    sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). If you would like a non-expiring session set the value to zero: 0sess_cookie_nameci_sessionNoneThe name you want the session cookie saved as.
    sess_encrypt_cookieFALSETRUE/FALSE (boolean)Whether to encrypt the session data.sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). If you would like a non-expiring session set the value to zero: 0
    sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database. You must create the table before enabling this option.sess_encrypt_cookieFALSETRUE/FALSE (boolean)Whether to encrypt the session data.
    sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database. You must create the table before enabling this option.
    sess_time_to_update300Time in secondsThis options controls how often the session class will regenerate itself and create a new session id.sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.
    sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data. Note that some ISPs dynamically - changes the IP, so if you want a non-expiring session you will likely set this to FALSE.sess_time_to_update300Time in secondsThis options controls how often the session class will regenerate itself and create a new session id.
    sess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data. Note that some ISPs dynamically + changes the IP, so if you want a non-expiring session you will likely set this to FALSE.
    sess_cookie_nameci_sessionNoneThe name of the session cookiesess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.
    diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 8b36e09b..55443060 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -576,64 +576,43 @@

    Rule Reference

    Returns FALSE if the form element contains anything other than alpha-numeric characters, underscores or dashes.   - -numeric -No -Returns FALSE if the form element contains anything other than numeric characters. -  + numeric + No + Returns FALSE if the form element contains anything other than numeric characters. +   - + integer No Returns FALSE if the form element contains anything other than an integer.   - - - -is_natural -No -Returns FALSE if the form element contains anything other than a natural number: 0, 1, 2, 3, etc. -  - - - -is_natural_no_zero -No -Returns FALSE if the form element contains anything other than a natural number, but not zero: 1, 2, 3, etc. -  - + - valid_email No Returns FALSE if the form element does not contain a valid email address.   - -valid_emails -No -Returns FALSE if any value provided in a comma separated list is not a valid email. -  + valid_emails + No + Returns FALSE if any value provided in a comma separated list is not a valid email. +   - valid_ip No Returns FALSE if the supplied IP is not valid.   - -valid_base64 -No -Returns FALSE if the supplied string contains anything other than valid Base64 characters. -  + valid_base64 + No + Returns FALSE if the supplied string contains anything other than valid Base64 characters. +   - -

    Note: These rules can also be called as discrete functions. For example:

    From 782f88be95bdb55238df071ee5ad2d8788c4b1f6 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 21 Aug 2008 13:04:05 +0000 Subject: [PATCH 1282/2544] added user_data field to sessions userguide page --- user_guide/libraries/sessions.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 7158ca76..d4466b73 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -202,6 +202,7 @@

    Saving Session Data to a Database

    ip_address varchar(16) DEFAULT '0' NOT NULL, user_agent varchar(50) NOT NULL, last_activity int(10) unsigned DEFAULT 0 NOT NULL, +user_data text NOT NULL PRIMARY KEY (session_id) ); From 753ff321c6ae0b46a555337e651abe0241f82d6e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 21 Aug 2008 18:21:35 +0000 Subject: [PATCH 1283/2544] typo in xmlrpc --- user_guide/changelog.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ed10c475..2ff2b8c9 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -91,7 +91,7 @@

    Version 1.6.4

    Bug fixes for 1.6.4

    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • -
    • Fixed assorted user guide typos or examples (#4840, #4862, #4864, #4899, #4930, #5006).
      • +
    • Fixed assorted user guide typos or examples (#4840, #4862, #4864, #4899, #4930, #5006, #5071).
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 60609067..cec83d50 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -180,7 +180,7 @@

      Creating an XML-RPC Server

      $this->load->library('xmlrpc');
      $this->load->library('xmlrpcs');

      -$config['functions']['new_post'] = array('function' => 'My_blog.new_entry'),
      +$config['functions']['new_post'] = array('function' => 'My_blog.new_entry');
      $config['functions']['update_post'] = array('function' => 'My_blog.update_entry');
      $config['object'] = $this;

      From 6ad532917aa69d86db70f0da4a3b196003926fe9 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 21 Aug 2008 18:31:28 +0000 Subject: [PATCH 1284/2544] Added the ability to assign a custom object name when loading a library. Added some code that looks to see if a library is in a subdirectory if the class is not found, and if the path was not specified --- system/libraries/Loader.php | 65 ++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 9 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index e5640b07..e090cc09 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -69,9 +69,10 @@ function CI_Loader() * @access public * @param string the name of the class * @param mixed the optional parameters + * @param string an optional object name * @return void */ - function library($library = '', $params = NULL) + function library($library = '', $params = NULL, $object_name = NULL) { if ($library == '') { @@ -87,7 +88,7 @@ function library($library = '', $params = NULL) } else { - $this->_ci_load_class($library, $params); + $this->_ci_load_class($library, $params, $object_name); } $this->_ci_assign_to_models(); @@ -329,8 +330,13 @@ function file($path, $return = FALSE) * @param array * @return void */ - function vars($vars = array()) + function vars($vars = array(), $val = '') { + if ($val != '' AND is_string($vars)) + { + $vars = array($vars => $val); + } + $vars = $this->_ci_object_to_array($vars); if (is_array($vars) AND count($vars) > 0) @@ -753,9 +759,10 @@ function _ci_load($_ci_data) * @access private * @param string the item that is being loaded * @param mixed any additional parameters + * @param string an optional object name * @return void */ - function _ci_load_class($class, $params = NULL) + function _ci_load_class($class, $params = NULL, $object_name = NULL) { // Get the class name, and while we're at it trim any slashes. // The directory path can be included as part of the class name, @@ -799,6 +806,18 @@ function _ci_load_class($class, $params = NULL) // Safety: Was the class already loaded by a previous call? if (in_array($subclass, $this->_ci_classes)) { + // Before we deem this to be a duplicate request, let's see + // if a custom object name is being supplied. If so, we'll + // return a new instance of the object + if ( ! is_null($object_name)) + { + $CI =& get_instance(); + if ( ! isset($CI->$object_name)) + { + return $this->_ci_init_class($class, config_item('subclass_prefix'), $params, $object_name); + } + } + $is_duplicate = TRUE; log_message('debug', $class." class already loaded. Second attempt ignored."); return; @@ -808,7 +827,7 @@ function _ci_load_class($class, $params = NULL) include_once($subclass); $this->_ci_classes[] = $subclass; - return $this->_ci_init_class($class, config_item('subclass_prefix'), $params); + return $this->_ci_init_class($class, config_item('subclass_prefix'), $params, $object_name); } // Lets search for the requested library file and load it. @@ -827,6 +846,18 @@ function _ci_load_class($class, $params = NULL) // Safety: Was the class already loaded by a previous call? if (in_array($filepath, $this->_ci_classes)) { + // Before we deem this to be a duplicate request, let's see + // if a custom object name is being supplied. If so, we'll + // return a new instance of the object + if ( ! is_null($object_name)) + { + $CI =& get_instance(); + if ( ! isset($CI->$object_name)) + { + return $this->_ci_init_class($class, '', $params, $object_name); + } + } + $is_duplicate = TRUE; log_message('debug', $class." class already loaded. Second attempt ignored."); return; @@ -834,9 +865,16 @@ function _ci_load_class($class, $params = NULL) include_once($filepath); $this->_ci_classes[] = $filepath; - return $this->_ci_init_class($class, '', $params); + return $this->_ci_init_class($class, '', $params, $object_name); } } // END FOREACH + + // One last attempt. Maybe the library is in a subdirectory, but it wasn't specified? + if ($subdir == '') + { + $path = strtolower($class).'/'.$class; + return $this->_ci_load_class($path, $params); + } // If we got this far we were unable to find the requested class. // We do not issue errors if the load call failed due to a duplicate request @@ -855,9 +893,10 @@ function _ci_load_class($class, $params = NULL) * @access private * @param string * @param string + * @param string an optional object name * @return null */ - function _ci_init_class($class, $prefix = '', $config = FALSE) + function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NULL) { $class = strtolower($class); @@ -879,8 +918,16 @@ function _ci_init_class($class, $prefix = '', $config = FALSE) $name = $prefix.$class; } - // Set the variable name we will assign the class to - $classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class]; + // Set the variable name we will assign the class to + // Was a custom class name supplied? If so we'll use it + if (is_null($object_name)) + { + $classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class]; + } + else + { + $classvar = $object_name; + } // Instantiate the class $CI =& get_instance(); From 65f46063afcebbe92a8ad67d9092bb073f79b8ce Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 21 Aug 2008 18:55:09 +0000 Subject: [PATCH 1285/2544] Added a bit more error trapping in the load() function --- system/libraries/Loader.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index e090cc09..1d88841d 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -79,6 +79,11 @@ function library($library = '', $params = NULL, $object_name = NULL) return FALSE; } + if ( ! is_null($params) AND ! is_array($params)) + { + $params = NULL; + } + if (is_array($library)) { foreach ($library as $class) From a6543fa8f14ed8041b794f8df3934a007fdf075a Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 21 Aug 2008 18:58:41 +0000 Subject: [PATCH 1286/2544] --- user_guide/libraries/loader.html | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 71f77650..05b7024d 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -90,7 +90,35 @@

      $this->load->library('class_name')

      You may nest the file in as many subdirectories as you want.

      -

      Each library is described in detail in its own page, so please read the information regarding each one you would like to use.

      +

      Setting options

      + +

      The second parameter allows you to optionally pass configuration setting. You will typically pass these as an array:

      + + +$config = array (
      +                  'mailtype' => 'html',
      +                  'charset'  => 'utf-8,
      +                  'priority' => '1'
      +               );
      +
      +$this->load->library('email', $config);       + +

      Config options can usually also be set via a config file. Each library is explained in detail in its own page, so please read the information regarding each one you would like to use.

      + +

      Assigning a Library to a different object name

      + +

      If the third parameter is blank, the library will usually be assigned to an object with the same name as the library. For example, if the library is named Session, it +will be assigned to a variable named $this->session.

      + +

      If you prefer to set your own class names you can pass its value to the third parameter:

      + +$this->load->library('session', '', 'my_session');

      + +// Session class is now accessed using:

      + +$this->my_session + +       From 29efd1577cce0b44423e4606f5a17f23619c7151 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 21 Aug 2008 19:03:17 +0000 Subject: [PATCH 1287/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 2ff2b8c9..4f9eab8d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -67,6 +67,7 @@

      Version 1.6.4

      • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
      • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
        • +
      • Added the ability to assign library objects to your own variable names when you use this->load->library(). Please see the Loader class for more info.
      • Changed the output of the profiler to use style attribute rather then clear, and added the id "codeigniter_profiler" to the container div
      • Added is_natural() and is_natural_no_zero() to the Validation class.
      From f65308f36173d7924f1460e0383e5a6c46e626b5 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 21 Aug 2008 23:11:23 +0000 Subject: [PATCH 1288/2544] fixed a missing semi colon --- system/database/DB.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/database/DB.php b/system/database/DB.php index ef67c80c..2dd86e14 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -44,7 +44,8 @@ function &DB($params = '', $active_record_override = FALSE) show_error('You have specified an invalid database connection group.'); } - $params = $db[$active_group] } + $params = $db[$active_group]; + } elseif (is_string($params)) { From edc41b55c343af2f03fb6fce6fd707c8b1b986fc Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 22 Aug 2008 07:16:47 +0000 Subject: [PATCH 1289/2544] Fixed a comment typo --- system/libraries/Session.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 9fad08cf..ab14bfe1 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -160,7 +160,7 @@ function sess_read() // Unserialize the session array $session = @unserialize(strip_slashes($session)); - // Is the session data we unserialized and array with the correct format? + // Is the session data we unserialized an array with the correct format? if ( ! is_array($session) OR ! isset($session['session_id']) OR ! isset($session['ip_address']) OR ! isset($session['user_agent']) OR ! isset($session['last_activity'])) { $this->sess_destroy(); From 5bcb838cff97500780d773c690870504727eda58 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 17:46:54 +0000 Subject: [PATCH 1290/2544] Fixed a typo --- user_guide/libraries/sessions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index d4466b73..f721e2b6 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -202,7 +202,7 @@

      Saving Session Data to a Database

      ip_address varchar(16) DEFAULT '0' NOT NULL, user_agent varchar(50) NOT NULL, last_activity int(10) unsigned DEFAULT 0 NOT NULL, -user_data text NOT NULL +user_data text NOT NULL, PRIMARY KEY (session_id) ); From 9e3a73b3ac081756a29c55633471acb29c0a76f1 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 18:23:36 +0000 Subject: [PATCH 1291/2544] Adding images folder --- user_guide/images/nav_bg_darker.jpg | Bin 0 -> 445 bytes user_guide/images/nav_separator_darker.jpg | Bin 0 -> 304 bytes user_guide/images/nav_toggle_darker.jpg | Bin 0 -> 1917 bytes user_guide/images/smile.gif | Bin 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 user_guide/images/nav_bg_darker.jpg create mode 100644 user_guide/images/nav_separator_darker.jpg create mode 100644 user_guide/images/nav_toggle_darker.jpg mode change 100755 => 100644 user_guide/images/smile.gif diff --git a/user_guide/images/nav_bg_darker.jpg b/user_guide/images/nav_bg_darker.jpg new file mode 100644 index 0000000000000000000000000000000000000000..816efad6a19fb8b5ec891d50a30bf4436b5bdbc2 GIT binary patch literal 445 zcmex=T;Nd3XdtKm-mL zSy)*)*g5#QxcEi*`1s)BL^J*$U=ZYBFk&!fW)x@ci+Wc+`GArk0pW=5bZ5r7fs zE=E)#prioM%WTXDRX~3Q3Nl@05t$OoE+L4a{QoTm9-z5Qg3N*p_6$cHz#6Ty&)rQu zu_dlp4NC+A5a7wVT^e{8IF*YhQ9GKX!smXvtnE{y)LUtvDUH|_k03bzC A-v9sr literal 0 HcmV?d00001 diff --git a/user_guide/images/nav_separator_darker.jpg b/user_guide/images/nav_separator_darker.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a09bd5a6aa160ee93c46df805c479d4eb2343593 GIT binary patch literal 304 zcma)$I|{-;5QhKBK3z7OETr}-B1k~Jg~rOl%EI0gd4d#PLGaOd0PzazqzPymzhQoc zk71Z}O;41IdR~Jvpy5J#AGlCYt0Ig5 literal 0 HcmV?d00001 diff --git a/user_guide/images/nav_toggle_darker.jpg b/user_guide/images/nav_toggle_darker.jpg new file mode 100644 index 0000000000000000000000000000000000000000..eff33de4fa4238b691742759098cfc1827c27f39 GIT binary patch literal 1917 zcma)$2T;>#8pi+W6+#L{rJR8X0s&M+qzs87L$LsYfQ%qZP&xyNOB3BdXhA_R;KG9b zrLCbVhK^EP6a;oDia>&>6hUd5MNSsDTy$=n+qs*$d%pRedFS`N@AJK~G1(hH$bKxATo2f$%pBzHIxF25)Q z9F9Ptkw_F0iN>Naa-p$U{1?exK>?2^ei7xHAaDc%jY1Q!SOP^+QSlr9zYAFhKtuxu zKmiOw1fWC+j0lna0>sPL22c>WeG>!*M<7vXDCRHp>$4I7fx)0q6cP@_eFac?GeAU; zkh@XY?t`Htr*&97cjCYQ@O4x+0pMW}`6e(TU;_-} z7Qq|S1+Iz3Tn6Z@N5LYX|0*y>J8@|?Lrjx1Ynt~gy;d4Cz0xYm5mz&Q+FVo1V`p!* zq`~hdyEJYIL$+6(qv{c_$PI^#VjDF({eEUmux@BXQ9Mf1NM%D9Z<4L|<-ol@-80ks z7xR_w1X~iS4oyauC}H&Y6}_Zls(Bi}MKueH6^buL`Rg>|XsJbt{$O~$rtQT7jyTZm z8t=G^JKV)B*E*d!O>TU+A?28O3iFTpA$-+bCUd~#1bzF#+}eQpdAdmT6g}LgA{Dn` zJ5|+_>YbIf_Uos*U3E3(sVDkFZ#BJ6{7E~b_w8&UzU|PPlVQY@rsdaDk711X;5%yB zP`Eq){@ zSRRv9`M>V7NhuuFKV0dmtL~9v8ICJ*O>ZhGbs$Lf_5V?$Ie~sqA8jQJfSReqk8q!< znGbZwOsaa?dO(;6ceGNr1D(_2lNfO``s%AZZ>iFtf$m zy_(4aC05|<^2^E3LNdEa22|!q9-b%EBvhKw8|?FfI!*-{wz(U|0$g~bbtWIzMz))j_syQCE&Y0bB+bvs-dU5&J;5xP5g zhWdXhSc>v}nna&e@0)1Wc&7a0Mj<=WiPo&c`w{;f{X~mS;ig_74}|PR1{eHU&7h`t z>Y0Sq3x4tcy)_GFvyWHsae4Z7+FDl+Ue)Dp_GqBqfN1&tM}(n$`qKJf$me)&k8~{I z<;R^t9S6c(43FsWh0E(@$l2WfqK2n$vJbOQT%fY{k5>(vO}jF7WLdzf4`_TE9MaC* zfxBQ>o$Bbhou^=(BbhpPaNOm)2iN=tEOy&^IHaucu?t>CR_~QhI0?JowHf9);=8_I z;O2BLHCN9~o5Y}xl6)X@Ga0{G+`N4`w=AqAFneepRhwg8Tr8GK4)Eq0$i!ya``s7C zy_UMWo7nd$WARQ}-u#4n*Q_#4F{8Um#TV!jvg4JIc<4axRO|6ZpI{%A;CgO$y(7|G zgLE3B3jqGNX5TTQBRm$~#!n=6=14qyFSk80d(jp&`}<e_HKu)jHdfL_}qZIa|!1a6=9E@p3#RC>Ila3|{|4pjc$j*}JQjZo|--f2`2f+5Pi5Q{kH41gesG(2n=&g1+)$(!6%4f71_+g>KHh#F${;Fofvw zNNl-5M9q`$rEPS$wJ!TqyWeK4j|z9evf$h%LHvAGL~xLdtc+cG?U4+|ot(RK<;l9d z6*e4gy1A~^nEN(R^Ja6|)cx(YS{!4oXuxPYb!j%{EUI)lD0vsJhmF?WbD{}+&GN(7y+%Etc*U-&D6 literal 0 HcmV?d00001 diff --git a/user_guide/images/smile.gif b/user_guide/images/smile.gif old mode 100755 new mode 100644 From 4a5676004df37524ce1db8333ce54b50e5438ed0 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 18:25:04 +0000 Subject: [PATCH 1292/2544] --- user_guide/userguide.css | 49 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/user_guide/userguide.css b/user_guide/userguide.css index a53aa012..45663882 100644 --- a/user_guide/userguide.css +++ b/user_guide/userguide.css @@ -3,18 +3,18 @@ body { padding: 0; font-family: Lucida Grande, Verdana, Geneva, Sans-serif; font-size: 14px; - color: #4F5155; + color: #333; background-color: #fff; } a { - color: #003399; + color: #0134c5; background-color: transparent; text-decoration: none; font-weight: normal; } a:visited { - color: #003399; + color: #0134c5; background-color: transparent; text-decoration: none; } @@ -42,13 +42,13 @@ a:hover { color: #666; } #nav { - background-color: #5d5d5d; + background-color: #494949; margin: 0; padding: 0; } #nav2 { - background: #fff url(images/nav_bg.jpg) repeat-x left top; - padding: 0 240px 0 0; + background: #fff url(images/nav_bg_darker.jpg) repeat-x left top; + padding: 0 310px 0 0; margin: 0; text-align: right; } @@ -68,7 +68,7 @@ a:hover { } #nav_inner .td_sep { - background: transparent url(images/nav_separator.jpg) repeat-y left top; + background: transparent url(images/nav_separator_darker.jpg) repeat-y left top; width: 25%; padding: 0 0 0 20px; } @@ -118,7 +118,7 @@ a:hover { #masthead h1 { background-color: transparent; -color: #003399; +color: #e13300; font-size: 18px; font-weight: normal; margin: 0; @@ -146,34 +146,35 @@ padding: 0 0 6px 0; } #content p { - margin: 10px 20px 12px 0; + margin: 12px 20px 12px 0; } #content h1 { -color: #333; -background-color: #efefef; +color: #e13300; +border-bottom: 1px solid #666; +background-color: transparent; font-weight: normal; -font-size: 22px; -margin: 0 0 15px 0; -padding: 3px 2px 3px 10px; +font-size: 24px; +margin: 0 0 20px 0; +padding: 3px 0 7px 3px; } #content h2 { background-color: transparent; - border-bottom: 1px solid #D0D0D0; - color: #444; - font-size: 16px; + border-bottom: 1px solid #999; + color: #000; + font-size: 18px; font-weight: bold; - margin: 24px 0 2px 0; + margin: 28px 0 16px 0; padding: 5px 0 6px 0; } #content h3 { background-color: transparent; color: #333; - font-size: 14px; + font-size: 16px; font-weight: bold; - margin: 22px 0 12px 0; + margin: 16px 0 15px 0; padding: 0 0 0 0; } @@ -249,13 +250,11 @@ padding: 3px 2px 3px 10px; #content ul { list-style-image: url(images/arrow.gif); - padding: 0 0 0 18px; - margin: 8px 0 12px 0; + margin: 10px 0 12px 0; } #content li { - padding: 0; - margin: 0 0 6px 0; + margin-bottom: 9px; } #content li p { @@ -377,7 +376,7 @@ form { background-color: #f9f9f9; border: 1px solid #B3B4BD; width: 100%; - padding: 0; + padding: 6px; margin: 0; } From 7cdef03633cf8cc40678fc837ccec2d2164caade Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 18:44:54 +0000 Subject: [PATCH 1293/2544] Made a Loader changes so that the new validation class will work. Made some doc style changes --- system/libraries/Loader.php | 14 +++++++++----- user_guide/changelog.html | 2 +- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/forge.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/doc_style/index.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/common_functions.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/index.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/reserved_names.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/compatibility_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/email_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/language_helper.html | 2 +- user_guide/helpers/number_helper.html | 2 +- user_guide/helpers/path_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_153.html | 2 +- user_guide/installation/upgrade_154.html | 2 +- user_guide/installation/upgrade_160.html | 2 +- user_guide/installation/upgrade_161.html | 2 +- user_guide/installation/upgrade_162.html | 2 +- user_guide/installation/upgrade_163.html | 2 +- user_guide/installation/upgrade_164.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 118 files changed, 126 insertions(+), 122 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 1d88841d..b870ffba 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -35,6 +35,7 @@ class CI_Loader { var $_ci_is_instance = FALSE; // Whether we should use $this or $CI =& get_instance() var $_ci_cached_vars = array(); var $_ci_classes = array(); + var $_ci_loaded_files = array(); var $_ci_models = array(); var $_ci_helpers = array(); var $_ci_plugins = array(); @@ -809,7 +810,7 @@ function _ci_load_class($class, $params = NULL, $object_name = NULL) } // Safety: Was the class already loaded by a previous call? - if (in_array($subclass, $this->_ci_classes)) + 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 @@ -830,7 +831,7 @@ function _ci_load_class($class, $params = NULL, $object_name = NULL) include_once($baseclass); include_once($subclass); - $this->_ci_classes[] = $subclass; + $this->_ci_loaded_files[] = $subclass; return $this->_ci_init_class($class, config_item('subclass_prefix'), $params, $object_name); } @@ -849,7 +850,7 @@ function _ci_load_class($class, $params = NULL, $object_name = NULL) } // Safety: Was the class already loaded by a previous call? - if (in_array($filepath, $this->_ci_classes)) + 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 @@ -869,7 +870,7 @@ function _ci_load_class($class, $params = NULL, $object_name = NULL) } include_once($filepath); - $this->_ci_classes[] = $filepath; + $this->_ci_loaded_files[] = $filepath; return $this->_ci_init_class($class, '', $params, $object_name); } } // END FOREACH @@ -933,7 +934,10 @@ function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NU { $classvar = $object_name; } - + + // Save the class name and object name + $this->_ci_classes[$class] = $object_name; + // Instantiate the class $CI =& get_instance(); if ($config !== NULL) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4f9eab8d..9c4a1840 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index f3bde15e..3b3dbf46 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -23,7 +23,7 @@ - +
      diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 75adfc59..1034ee94 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index d60302a0..1fa6d182 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 6b8c6b53..4ae8f704 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 42678999..b59034fa 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 55da574e..966700c5 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 4137eb94..bc5bf49b 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index bc67436b..097d396b 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 5e06da20..e1dbef40 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 5dcea988..36e6ffd0 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index c6306cc3..bad2df86 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 2361e878..782cecc3 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 4bb000be..4e6c97b9 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 40630b9d..96570d34 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 02cd6301..4d04a1ca 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 3854efb0..3e44f304 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index ee6dedc0..02774016 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 2ad7e78c..3014d3ff 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index c1c29da2..0f8a2d46 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 9cc4ba53..4913ceab 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index b82b9a23..9261600e 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index c49ca113..31ad8662 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 6b3a6da4..e748eb00 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 540f1717..0f759d7e 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index ae6e1425..482fb71c 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index d801e650..8f4c09c0 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index ea794f08..e91d5a88 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 49131236..6af6ee99 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/index.html b/user_guide/general/index.html index e1459230..d94ec60b 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index a0f79e29..0d0c628e 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index bb13ea41..f3d69628 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 2411e279..3c490874 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -23,7 +23,7 @@ - +
      diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 65c8d420..f0a769d1 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index ce1f9dee..804c9e0b 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 89106eaf..86aa568f 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 8818a7ae..ef238405 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 732b130a..58b0de2d 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 10bcb038..78da9c10 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index cedeb862..c17118f4 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/security.html b/user_guide/general/security.html index f647f1bf..b24edb9d 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 82617c97..7883528c 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/general/views.html b/user_guide/general/views.html index bc086150..7f987a5b 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index e67a9f2b..ffe796c7 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/compatibility_helper.html b/user_guide/helpers/compatibility_helper.html index 7b9d2964..d98332ae 100644 --- a/user_guide/helpers/compatibility_helper.html +++ b/user_guide/helpers/compatibility_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 85d4cd04..456a95ea 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index b6264586..0e174ccc 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index b89e8c81..97444291 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 11eb4516..42e8aba1 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index 74f6a3a2..d8e522a4 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index b16cde50..05700ae8 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -23,7 +23,7 @@ - +
      diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 839f7251..76ded1ee 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 62898403..aff896aa 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 4b061401..4a78287e 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 53a61148..7bf10688 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index 929c9688..8d20cca3 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 6de4a467..ceb509c4 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -23,7 +23,7 @@ - +
      diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index d56f7db4..627d9f98 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index fa7bc24b..fd337c5d 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 24a0a661..2a754a97 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index be189efe..fb58b837 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 38656103..3116c36a 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index c26bbcbf..95599a5d 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -23,7 +23,7 @@ - +
      diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 376dc24d..2d3cd446 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/index.html b/user_guide/index.html index 2fb0681e..2d08fcc0 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 470377ef..f1ac5730 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 25953d98..a4a39f5c 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 62c75481..c6d77585 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 7671701e..0ed75c7e 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index fa78012e..db830e23 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index fc71b57a..2232e2fd 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 907d3e13..f5259efc 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index a37a2dfa..f2bc4b89 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index daff5cd7..c8c01418 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 3ce45201..65b9c42d 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 578241f2..7bdcff0a 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 09196f48..725e7a18 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 2ce0e9b8..26241ec4 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 01389f33..e10511aa 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index b80a6881..d5f1cc99 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index 632d8c7d..14d51229 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index 6c03574f..fa50c621 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 0449d520..31b309d1 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_164.html b/user_guide/installation/upgrade_164.html index a953e1cf..e71a0ad9 100644 --- a/user_guide/installation/upgrade_164.html +++ b/user_guide/installation/upgrade_164.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index b1ed6ba4..c81b6d48 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 9b745d17..82215f3a 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index c9f50b6b..c57df73a 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 22c55674..15737f1a 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index e0ce2025..59bc7d77 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index c9883b96..bd0fa569 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 407d82f1..372b1a34 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index e21a6779..24a7d394 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index d67df5f0..41397d39 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 2421c511..0c32710c 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 25749bb6..a0460228 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 4d93cf9d..3c376a40 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 05b7024d..f3ea64cb 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index a2a87d17..2a51f140 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 7ae396da..2dccd277 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index a8148778..fb29a8d9 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index f721e2b6..2de47d19 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 772e9582..4f4d6059 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index e8fcba74..5458065b 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 03adb587..7c3e7986 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 5543efa5..66919158 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index f5b0e998..d4a55040 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 55443060..3d01a3e2 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -23,7 +23,7 @@ - +
      diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index cec83d50..7ecbe01a 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 07dd98d4..984c4d9c 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/license.html b/user_guide/license.html index 2cb636ed..66a0912f 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 250d11f6..5101f18a 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 113ce200..bedb903a 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 91d53a64..aa01ad31 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 3562ece6..ff125ecd 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index c2a69c96..4dbb7908 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 7af1681b..9d3373c5 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -24,7 +24,7 @@ - +
      diff --git a/user_guide/toc.html b/user_guide/toc.html index a6605b51..683106a2 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -25,7 +25,7 @@ - +
      From 6945097110d174950b13d3d8407f8c0282a178af Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 18:51:19 +0000 Subject: [PATCH 1294/2544] --- system/libraries/Loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index b870ffba..644c4934 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -89,7 +89,7 @@ function library($library = '', $params = NULL, $object_name = NULL) { foreach ($library as $class) { - $this->_ci_load_class($class, $params); + $this->_ci_load_class($class, $params, $object_name); } } else From 76c504e13bc03fa38823e32603706860727d341b Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 19:11:34 +0000 Subject: [PATCH 1295/2544] Made some changes for compatibility with the new form validation class --- system/libraries/Loader.php | 93 +++++++++++++------------------------ 1 file changed, 32 insertions(+), 61 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 644c4934..55023573 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -39,7 +39,6 @@ class CI_Loader { var $_ci_models = array(); var $_ci_helpers = array(); var $_ci_plugins = array(); - var $_ci_scripts = array(); var $_ci_varmap = array('unit_test' => 'unit', 'user_agent' => 'agent'); @@ -74,7 +73,7 @@ function CI_Loader() * @return void */ function library($library = '', $params = NULL, $object_name = NULL) - { + { if ($library == '') { return FALSE; @@ -107,6 +106,7 @@ function library($library = '', $params = NULL, $object_name = NULL) * * This function lets users load and instantiate models. * + * @access public * @param string the name of the class * @param string name for the model * @param bool database connection @@ -375,7 +375,7 @@ function helper($helpers = array()) foreach ($helpers as $helper) { $helper = strtolower(str_replace(EXT, '', str_replace('_helper', '', $helper)).'_helper'); - + if (isset($this->_ci_helpers[$helper])) { continue; @@ -413,10 +413,8 @@ function helper($helpers = array()) } $this->_ci_helpers[$helper] = TRUE; - - } - - log_message('debug', 'Helpers loaded: '.implode(', ', $helpers)); + log_message('debug', 'Helper loaded: '.$helper); + } } // -------------------------------------------------------------------- @@ -480,9 +478,8 @@ function plugin($plugins = array()) } $this->_ci_plugins[$plugin] = TRUE; - } - - log_message('debug', 'Plugins loaded: '.implode(', ', $plugins)); + log_message('debug', 'Plugin loaded: '.$plugin); + } } // -------------------------------------------------------------------- @@ -501,48 +498,6 @@ function plugins($plugins = array()) { $this->plugin($plugins); } - - // -------------------------------------------------------------------- - - /** - * Load Script - * - * This function loads the specified include file from the - * application/scripts/ folder. - * - * NOTE: This feature has been deprecated but it will remain available - * for legacy users. - * - * @access public - * @param array - * @return void - */ - function script($scripts = array()) - { - if ( ! is_array($scripts)) - { - $scripts = array($scripts); - } - - foreach ($scripts as $script) - { - $script = strtolower(str_replace(EXT, '', $script)); - - if (isset($this->_ci_scripts[$script])) - { - continue; - } - - if ( ! file_exists(APPPATH.'scripts/'.$script.EXT)) - { - show_error('Unable to load the requested script: scripts/'.$script.EXT); - } - - include_once(APPPATH.'scripts/'.$script.EXT); - } - - log_message('debug', 'Scripts loaded: '.implode(', ', $scripts)); - } // -------------------------------------------------------------------- @@ -822,8 +777,8 @@ function _ci_load_class($class, $params = NULL, $object_name = NULL) { return $this->_ci_init_class($class, config_item('subclass_prefix'), $params, $object_name); } - } - + } + $is_duplicate = TRUE; log_message('debug', $class." class already loaded. Second attempt ignored."); return; @@ -904,8 +859,6 @@ function _ci_load_class($class, $params = NULL, $object_name = NULL) */ function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NULL) { - $class = strtolower($class); - // Is there an associated config file for this class? if ($config === NULL) { @@ -916,16 +869,36 @@ function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NU } if ($prefix == '') - { - $name = (class_exists('CI_'.$class)) ? 'CI_'.$class : $class; + { + if (class_exists('CI_'.$class)) + { + $name = 'CI_'.$class; + } + elseif (class_exists(config_item('subclass_prefix').$class)) + { + $name = config_item('subclass_prefix').$class; + } + else + { + $name = $class; + } } else { $name = $prefix.$class; } + // Is the class name valid? + if ( ! class_exists($name)) + { + log_message('error', "Non-existant class: ".$name); + show_error("Non-existant class: ".$class); + } + // Set the variable name we will assign the class to // Was a custom class name supplied? If so we'll use it + $class = strtolower($class); + if (is_null($object_name)) { $classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class]; @@ -990,8 +963,6 @@ function _ci_autoloader() } } - - // A little tweak to remain backward compatible // The $autoload['core'] item was deprecated if ( ! isset($autoload['libraries'])) @@ -1101,7 +1072,7 @@ function _ci_is_instance() global $CI; return (is_object($CI)) ? TRUE : FALSE; } - + } /* End of file Loader.php */ From ec1b70f47e2161cf98bf0cad3d57368d2ca762dc Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 19:21:27 +0000 Subject: [PATCH 1296/2544] --- system/libraries/Form_validation.php | 1220 ++++++++++++++++++++++++++ 1 file changed, 1220 insertions(+) create mode 100644 system/libraries/Form_validation.php diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php new file mode 100644 index 00000000..fd0c22ec --- /dev/null +++ b/system/libraries/Form_validation.php @@ -0,0 +1,1220 @@ +'; + var $_error_suffix = '

      '; + var $error_string = ''; + var $_safe_form_data = FALSE; + + + /** + * Constructor + * + */ + function CI_Form_validation($rules = array()) + { + $this->CI =& get_instance(); + + // Validation rules can be stored in a config file. + $this->_config_rules = $rules; + + // Automatically load the form helper + $this->CI->load->helper('form'); + + log_message('debug', "Validation Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * Set Rules + * + * This function takes an array of field names and validation + * rules as input, validates the info, and stores it + * + * @access public + * @param mixed + * @param string + * @return void + */ + function set_rules($field, $label = '', $rules = '') + { + // No reason to set rules if we have no POST data + if (count($_POST) == 0) + { + return; + } + + // If an array was passed via the first parameter instead of indidual string + // values we cycle through it and recursively call this function. + if (is_array($field)) + { + foreach ($field as $row) + { + // Houston, we have a problem... + if ( ! isset($row['field']) OR ! isset($row['rules'])) + { + continue; + } + + // If the field label wasn't passed we use the field name + $label = ( ! isset($row['label'])) ? $row['field'] : $row['label']; + + // Here we go! + $this->set_rules($row['field'], $label, $row['rules']); + } + return; + } + + // No rules or fields? Nothing to do... + if ( ! is_string($field) OR ! is_string($rules) OR $field == '' OR $rules == '') + { + return; + } + + // If the field label wasn't passed we use the field name + $label = ($label == '') ? $field : $label; + + // Is the field name an array? We test for the existence of a bracket "[" in + // the field name to determine this. If it is an array, we break it apart + // into its components so that we can fetch the corresponding POST data later + if (strpos($field, '[') !== FALSE AND preg_match_all('/\[(.*?)\]/', $field, $matches)) + { + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + $x = explode('[', $field); + $indexes[] = current($x); + + for ($i = 0; $i < count($matches['0']); $i++) + { + if ($matches['1'][$i] != '') + { + $indexes[] = $matches['1'][$i]; + } + } + + $is_array = TRUE; + } + else + { + $indexes = array(); + $is_array = FALSE; + } + + // Build our master array + $this->_field_data[$field] = array( + 'field' => $field, + 'label' => $label, + 'rules' => $rules, + 'is_array' => $is_array, + 'keys' => $indexes, + 'postdata' => NULL, + 'error' => '' + ); + } + + // -------------------------------------------------------------------- + + /** + * Set Error Message + * + * Lets users set their own error messages on the fly. Note: The key + * name has to match the function name that it corresponds to. + * + * @access public + * @param string + * @param string + * @return string + */ + function set_message($lang, $val = '') + { + if ( ! is_array($lang)) + { + $lang = array($lang => $val); + } + + $this->_error_messages = array_merge($this->_error_messages, $lang); + } + + // -------------------------------------------------------------------- + + /** + * Set The Error Delimiter + * + * Permits a prefix/suffix to be added to each error message + * + * @access public + * @param string + * @param string + * @return void + */ + function set_error_delimiters($prefix = '

      ', $suffix = '

      ') + { + $this->_error_prefix = $prefix; + $this->_error_suffix = $suffix; + } + + // -------------------------------------------------------------------- + + /** + * Get Error Message + * + * Gets the error message associated with a particular field + * + * @access public + * @param string the field name + * @return void + */ + function error($field = '', $prefix = '', $suffix = '') + { + if ( ! isset($this->_field_data[$field]['error'])) + { + return ''; + } + + if ($prefix == '') + { + $prefix = $this->_error_prefix; + } + + if ($suffix == '') + { + $suffix = $this->_error_suffix; + } + + return $prefix.$this->_field_data[$field]['error'].$suffix; + } + + // -------------------------------------------------------------------- + + /** + * Error String + * + * Returns the error messages as a string, wrapped in the error delimiters + * + * @access public + * @param string + * @param string + * @return str + */ + function error_string($prefix = '', $suffix = '') + { + // No errrors, validation passes! + if (count($this->_error_array) === 0) + { + return ''; + } + + if ($prefix == '') + { + $prefix = $this->_error_prefix; + } + + if ($suffix == '') + { + $suffix = $this->_error_suffix; + } + + // Generate the error string + $str = ''; + foreach ($this->_error_array as $val) + { + $str .= $prefix.$val.$suffix."\n"; + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Run the Validator + * + * This function does all the work. + * + * @access public + * @return bool + */ + function run($group = '') + { + // Do we even have any data to process? Mm? + if (count($_POST) == 0) + { + return FALSE; + } + + // Does the _field_data array containing the validation rules exist? + // If not, we look to see if they were assigned via a config file + if (count($this->_field_data) == 0) + { + // No validation rules? We're done... + if (count($this->_config_rules) == 0) + { + return FALSE; + } + + // Is there a validation rule for the particular URI being accessed? + $uri = ($group == '') ? trim($this->CI->uri->ruri_string(), '/') : $group; + + if ($uri != '' AND isset($this->_config_rules[$uri])) + { + $this->set_rules($this->_config_rules[$uri]); + } + else + { + $this->set_rules($this->_config_rules); + } + + // We're we able to set the rules correctly? + if (count($this->_field_data) == 0) + { + log_message('debug', "Unable to find validation rules"); + return FALSE; + } + } + + // Load the language file containing error messages + $this->CI->lang->load('form_validation'); + + // Cycle through the rules for each field, match the + // corresponding $_POST item and test for errors + foreach ($this->_field_data as $field => $row) + { + // Fetch the data from the corresponding $_POST array and cache it in the _field_data array. + // Depending on whether the field name is an array or a string will determine where we get it from. + + if ($row['is_array'] == TRUE) + { + $this->_field_data[$field]['postdata'] = $this->_reduce_array($_POST, $row['keys']); + } + else + { + if (isset($_POST[$field])) + { + $this->_field_data[$field]['postdata'] = $_POST[$field]; + } + } + + $this->_execute($row, explode('|', $row['rules']), $this->_field_data[$field]['postdata']); + } + + // Did we end up with any errors? + $total_errors = count($this->_error_array); + + if ($total_errors > 0) + { + $this->_safe_form_data = TRUE; + } + + // Now we need to re-set the POST data with the new, processed data + $this->_reset_post_array(); + + // No errors, validation passes! + if ($total_errors == 0) + { + return TRUE; + } + + // Validation fails + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Traverse a multidimensional $_POST array index until the data is found + * + * @access private + * @param array + * @param array + * @param integer + * @return mixed + */ + function _reduce_array($array, $keys, $i = 0) + { + if (is_array($array)) + { + if (isset($keys[$i])) + { + if (isset($array[$keys[$i]])) + { + $array = $this->_reduce_array($array[$keys[$i]], $keys, ($i+1)); + } + else + { + return NULL; + } + } + else + { + return $array; + } + } + + return $array; + } + + // -------------------------------------------------------------------- + + /** + * Re-populate the _POST array with our finalized and processed data + * + * @access private + * @return null + */ + function _reset_post_array() + { + foreach ($this->_field_data as $field => $row) + { + if ( ! is_null($row['postdata'])) + { + if ($row['is_array'] == FALSE) + { + if (isset($_POST[$row['field']])) + { + $_POST[$row['field']] = $this->prep_for_form($row['postdata']); + } + } + else + { + $post = '$_POST["'; + + if (count($row['keys']) == 1) + { + $post .= current($row['keys']); + $post .= '"]'; + } + else + { + $i = 0; + foreach ($row['keys'] as $val) + { + if ($i == 0) + { + $post .= $val.'"]'; + $i++; + continue; + } + + $post .= '["'.$val.'"]'; + } + } + + if (is_array($row['postdata'])) + { + $array = array(); + foreach ($row['postdata'] as $k => $v) + { + $array[$k] = $this->prep_for_form($v); + } + + $post .= ' = $array;'; + } + else + { + $post .= ' = "'.$this->prep_for_form($row['postdata']).'";'; + } + + eval($post); + } + } + } + } + + // -------------------------------------------------------------------- + + /** + * Executes the Validation routines + * + * @access private + * @param array + * @param array + * @param mixed + * @param integer + * @return mixed + */ + function _execute($row, $rules, $postdata = NULL, $cycles = 0) + { + // If the $_POST data is an array we will run a recursive call + if (is_array($postdata)) + { + foreach ($postdata as $key => $val) + { + $this->_execute($row, $rules, $val, $cycles); + $cycles++; + } + + return; + } + + // -------------------------------------------------------------------- + + // If the field is blank, but NOT required, no further tests are necessary + if ( ! in_array('required', $rules, TRUE) AND is_null($postdata)) + { + return; + } + + // -------------------------------------------------------------------- + + // Isset Test. Typically this rule will only apply to checkboxes. + if (is_null($postdata)) + { + if (in_array('isset', $rules, TRUE) OR in_array('required', $rules)) + { + if ( ! isset($this->_error_messages['isset'])) + { + if (FALSE === ($line = $this->CI->lang->line('isset'))) + { + $line = 'The field was not set'; + } + } + else + { + $line = $this->_error_messages['isset']; + } + + // Build the error message + $message = sprintf($line, $row['label']); + + // Save the error message + $this->_field_data[$row['field']]['error'] = $message; + + if ( ! isset($this->_error_array[$row['field']])) + { + $this->_error_array[$row['field']] = $message; + } + } + + return; + } + + // -------------------------------------------------------------------- + + // Cycle through each rule and run it + foreach ($rules As $rule) + { + $_in_array = FALSE; + + // We set the $postdata variable with the current data in our master array so that + // each cycle of the loop is dealing with the processed data from the last cycle + if ($row['is_array'] == TRUE AND is_array($this->_field_data[$row['field']]['postdata'])) + { + // We shouldn't need this safety, but just in case there isn't an array index + // associated with this cycle we'll bail out + if ( ! isset($this->_field_data[$row['field']]['postdata'][$cycles])) + { + continue; + } + + $postdata = $this->_field_data[$row['field']]['postdata'][$cycles]; + $_in_array = TRUE; + } + else + { + $postdata = $this->_field_data[$row['field']]['postdata']; + } + + // -------------------------------------------------------------------- + + // Is the rule a callback? + $callback = FALSE; + if (substr($rule, 0, 9) == 'callback_') + { + $rule = substr($rule, 9); + $callback = TRUE; + } + + // Strip the parameter (if exists) from the rule + // Rules can contain a parameter: max_length[5] + $param = FALSE; + if (preg_match("/(.*?)\[(.*?)\]/", $rule, $match)) + { + $rule = $match[1]; + $param = $match[2]; + } + + // Call the function that corresponds to the rule + if ($callback === TRUE) + { + if ( ! method_exists($this->CI, $rule)) + { + continue; + } + + // Run the function and grab the result + $result = $this->CI->$rule($postdata, $param); + + // Re-assign the result to the master data array + if ($_in_array == TRUE) + { + $this->_field_data[$row['field']]['postdata'][$cycles] = (is_bool($result)) ? $postdata : $result; + } + else + { + $this->_field_data[$row['field']]['postdata'] = (is_bool($result)) ? $postdata : $result; + } + + // If the field isn't required and we just processed a callback we'll move on... + if ( ! in_array('required', $rules, TRUE) AND $result !== FALSE) + { + return; + } + } + else + { + if ( ! method_exists($this, $rule)) + { + /* + * Run the native PHP function if called for + * + * If our own wrapper function doesn't exist we see + * if a native PHP function does. Users can use + * any native PHP function call that has one param. + */ + if (function_exists($rule)) + { + $result = $rule($postdata); + + if ($_in_array == TRUE) + { + $this->_field_data[$row['field']]['postdata'][$cycles] = (is_bool($result)) ? $postdata : $result; + } + else + { + $this->_field_data[$row['field']]['postdata'] = (is_bool($result)) ? $postdata : $result; + } + } + + continue; + } + + $result = $this->$rule($postdata, $param); + + if ($_in_array == TRUE) + { + $this->_field_data[$row['field']]['postdata'][$cycles] = (is_bool($result)) ? $postdata : $result; + } + else + { + $this->_field_data[$row['field']]['postdata'] = (is_bool($result)) ? $postdata : $result; + } + } + + // Did the rule test negatively? If so, grab the error. + if ($result === FALSE) + { + if ( ! isset($this->_error_messages[$rule])) + { + if (FALSE === ($line = $this->CI->lang->line($rule))) + { + $line = 'Unable to access an error message corresponding to your field name.'; + } + } + else + { + $line = $this->_error_messages[$rule]; + } + + // Build the error message + $message = sprintf($line, $row['label'], $param); + + // Save the error message + $this->_field_data[$row['field']]['error'] = $message; + + if ( ! isset($this->_error_array[$row['field']])) + { + $this->_error_array[$row['field']] = $message; + } + + return; + } + } + } + + // -------------------------------------------------------------------- + + /** + * Get the value from a form + * + * Permits you to repopulate a form field with the value it was submitted + * with, or, if that value doesn't exist, with the default + * + * @access public + * @param string the field name + * @param string + * @return void + */ + function set_value($field = '', $default = '') + { + if ( ! isset($this->_field_data[$field])) + { + return $default; + } + + return $this->_field_data[$field]['postdata']; + } + + // -------------------------------------------------------------------- + + /** + * Set Select + * + * Enables pull-down lists to be set to the value the user + * selected in the event of an error + * + * @access public + * @param string + * @param string + * @return string + */ + function set_select($field = '', $value = '', $default = FALSE) + { + if ( ! isset($this->_field_data[$field]) OR ! isset($this->_field_data[$field]['postdata'])) + { + if ($default === TRUE AND count($this->_field_data) === 0) + { + return ' selected="selected"'; + } + return ''; + } + + $field = $this->_field_data[$field]['postdata']; + + if (is_array($field)) + { + if ( ! in_array($value, $field, TRUE)) + { + return ''; + } + } + else + { + if (($field == '' OR $value == '') OR ($field != $value)) + { + return ''; + } + } + + return ' selected="selected"'; + } + + // -------------------------------------------------------------------- + + /** + * Set Radio + * + * Enables radio buttons to be set to the value the user + * selected in the event of an error + * + * @access public + * @param string + * @param string + * @return string + */ + function set_radio($field = '', $value = '', $default = FALSE) + { + if ( ! isset($this->_field_data[$field]) OR ! isset($this->_field_data[$field]['postdata'])) + { + if ($default === TRUE AND count($this->_field_data) === 0) + { + return ' checked="checked"'; + } + return ''; + } + + $field = $this->_field_data[$field]['postdata']; + + if (is_array($field)) + { + if ( ! in_array($value, $field, TRUE)) + { + return ''; + } + } + else + { + if (($field == '' OR $value == '') OR ($field != $value)) + { + return ''; + } + } + + return ' checked="checked"'; + } + + // -------------------------------------------------------------------- + + /** + * Set Checkbox + * + * Enables checkboxes to be set to the value the user + * selected in the event of an error + * + * @access public + * @param string + * @param string + * @return string + */ + function set_checkbox($field = '', $value = '', $default = FALSE) + { + if ( ! isset($this->_field_data[$field]) OR ! isset($this->_field_data[$field]['postdata'])) + { + if ($default === TRUE AND count($this->_field_data) === 0) + { + return ' checked="checked"'; + } + return ''; + } + + $field = $this->_field_data[$field]['postdata']; + + if (is_array($field)) + { + if ( ! in_array($value, $field, TRUE)) + { + return ''; + } + } + else + { + if (($field == '' OR $value == '') OR ($field != $value)) + { + return ''; + } + } + + return ' checked="checked"'; + } + + // -------------------------------------------------------------------- + + /** + * Required + * + * @access public + * @param string + * @return bool + */ + function required($str) + { + if ( ! is_array($str)) + { + return (trim($str) == '') ? FALSE : TRUE; + } + else + { + return ( ! empty($str)); + } + } + + // -------------------------------------------------------------------- + + /** + * Match one field to another + * + * @access public + * @param string + * @param field + * @return bool + */ + function matches($str, $field) + { + if ( ! isset($_POST[$field])) + { + return FALSE; + } + + $field = $_POST[$field]; + + return ($str !== $field) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Minimum Length + * + * @access public + * @param string + * @param value + * @return bool + */ + function min_length($str, $val) + { + if (preg_match("/[^0-9]/", $val)) + { + return FALSE; + } + + return (strlen($str) < $val) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Max Length + * + * @access public + * @param string + * @param value + * @return bool + */ + function max_length($str, $val) + { + if (preg_match("/[^0-9]/", $val)) + { + return FALSE; + } + + return (strlen($str) > $val) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Exact Length + * + * @access public + * @param string + * @param value + * @return bool + */ + function exact_length($str, $val) + { + if (preg_match("/[^0-9]/", $val)) + { + return FALSE; + } + + return (strlen($str) != $val) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Valid Email + * + * @access public + * @param string + * @return bool + */ + function valid_email($str) + { + return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $str)) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Valid Emails + * + * @access public + * @param string + * @return bool + */ + function valid_emails($str) + { + if (strpos($str, ',') === FALSE) + { + return $this->valid_email(trim($str)); + } + + foreach(explode(',', $str) as $email) + { + if (trim($email) != '' && $this->valid_email(trim($email)) === FALSE) + { + return FALSE; + } + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Validate IP Address + * + * @access public + * @param string + * @return string + */ + function valid_ip($ip) + { + return $this->CI->input->valid_ip($ip); + } + + // -------------------------------------------------------------------- + + /** + * Alpha + * + * @access public + * @param string + * @return bool + */ + function alpha($str) + { + return ( ! preg_match("/^([a-z])+$/i", $str)) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Alpha-numeric + * + * @access public + * @param string + * @return bool + */ + function alpha_numeric($str) + { + return ( ! preg_match("/^([a-z0-9])+$/i", $str)) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Alpha-numeric with underscores and dashes + * + * @access public + * @param string + * @return bool + */ + function alpha_dash($str) + { + return ( ! preg_match("/^([-a-z0-9_-])+$/i", $str)) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Numeric + * + * @access public + * @param string + * @return bool + */ + function numeric($str) + { + return (bool)preg_match( '/^[\-+]?[0-9]*\.?[0-9]+$/', $str); + + } + + // -------------------------------------------------------------------- + + /** + * Is Numeric + * + * @access public + * @param string + * @return bool + */ + function is_numeric($str) + { + return ( ! is_numeric($str)) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Integer + * + * @access public + * @param string + * @return bool + */ + function integer($str) + { + return (bool)preg_match( '/^[\-+]?[0-9]+$/', $str); + } + + // -------------------------------------------------------------------- + + /** + * Is a Natural number (0,1,2,3, etc.) + * + * @access public + * @param string + * @return bool + */ + function is_natural($str) + { + return (bool)preg_match( '/^[0-9]+$/', $str); + } + + // -------------------------------------------------------------------- + + /** + * Is a Natural number, but not a zero (1,2,3, etc.) + * + * @access public + * @param string + * @return bool + */ + function is_natural_no_zero($str) + { + if ( ! preg_match( '/^[0-9]+$/', $str)) + { + return FALSE; + } + + if ($str == 0) + { + return FALSE; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Valid Base64 + * + * Tests a string for characters outside of the Base64 alphabet + * as defined by RFC 2045 http://www.faqs.org/rfcs/rfc2045 + * + * @access public + * @param string + * @return bool + */ + function valid_base64($str) + { + return (bool) ! preg_match('/[^a-zA-Z0-9\/\+=]/', $str); + } + + // -------------------------------------------------------------------- + + /** + * Prep data for form + * + * This function allows HTML to be safely shown in a form. + * Special characters are converted. + * + * @access public + * @param string + * @return string + */ + function prep_for_form($data = '') + { + if (is_array($data)) + { + foreach ($data as $key => $val) + { + $data[$key] = $this->prep_for_form($val); + } + + return $data; + } + + if ($this->_safe_form_data == FALSE OR $data === '') + { + return $data; + } + + return str_replace(array("'", '"', '<', '>'), array("'", """, '<', '>'), stripslashes($data)); + } + + // -------------------------------------------------------------------- + + /** + * Prep URL + * + * @access public + * @param string + * @return string + */ + function prep_url($str = '') + { + if ($str == 'http://' OR $str == '') + { + return ''; + } + + if (substr($str, 0, 7) != 'http://' && substr($str, 0, 8) != 'https://') + { + $str = 'http://'.$str; + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Strip Image Tags + * + * @access public + * @param string + * @return string + */ + function strip_image_tags($str) + { + return $this->CI->input->strip_image_tags($str); + } + + // -------------------------------------------------------------------- + + /** + * XSS Clean + * + * @access public + * @param string + * @return string + */ + function xss_clean($str) + { + return $this->CI->input->xss_clean($str); + } + + // -------------------------------------------------------------------- + + /** + * Convert PHP tags to entities + * + * @access public + * @param string + * @return string + */ + function encode_php_tags($str) + { + return str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); + } + +} +// END Form Validation Class + +/* End of file Form_validation.php */ +/* Location: ./system/libraries/Form_validation.php */ \ No newline at end of file From 43e0fbb650d05466cd2568b8a2cc1c38849a6b52 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 19:22:31 +0000 Subject: [PATCH 1297/2544] Added some new functions that work with the new form validation class --- system/helpers/form_helper.php | 335 +++++++++++++++++++++++++++++++-- 1 file changed, 321 insertions(+), 14 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 0c74ac0f..a96adb97 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -53,7 +53,7 @@ function form_open($action = '', $attributes = '', $hidden = array()) $form = ' 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - return ""; + return ""; } } @@ -214,17 +214,17 @@ function form_textarea($data = '', $value = '', $extra = '') { $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); - if ( ! is_array($data) OR ! isset($data['value'])) + if ( ! is_array($data) OR ! isset($data['value'])) { $val = $value; } - else + else { $val = $data['value']; unset($data['value']); // textareas don't use the value attribute } - return ""; + return ""; } } @@ -248,6 +248,16 @@ function form_dropdown($name = '', $options = array(), $selected = array(), $ext { $selected = array($selected); } + + // If no selected state was submitted we will attempt to set it automatically + if (count($selected) === 0) + { + // If the form name appears in the $_POST array we have a winner! + if (isset($_POST[$name])) + { + $selected = array($_POST[$name]); + } + } if ($extra != '') $extra = ' '.$extra; @@ -312,7 +322,7 @@ function form_checkbox($data = '', $value = '', $checked = FALSE, $extra = '') unset($defaults['checked']); } - return ""; + return ""; } } @@ -359,7 +369,7 @@ function form_submit($data = '', $value = '', $extra = '') { $defaults = array('type' => 'submit', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - return ""; + return ""; } } @@ -380,7 +390,7 @@ function form_reset($data = '', $value = '', $extra = '') { $defaults = array('type' => 'reset', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - return ""; + return ""; } } @@ -407,7 +417,7 @@ function form_button($data = '', $content = '', $extra = '') unset($data['content']); // content is not an attribute } - return ""; + return ""; } } @@ -466,7 +476,7 @@ function form_fieldset($legend_text = '', $attributes = array()) { $fieldset = " $val) + { + $str[$key] = form_prep($val); + } + + return $str; + } + if ($str === '') { return ''; @@ -552,7 +573,256 @@ function form_prep($str = '') return $str; } } + +// ------------------------------------------------------------------------ + +/** + * Form Value + * + * Grabs a value from the POST array for the specified field so you can + * re-populate an input field or textarea. If Form Validation + * is active it retrieves the info from the validation class + * + * @access public + * @param string + * @return mixed + */ +if ( ! function_exists('set_value')) +{ + function set_value($field = '', $default = '') + { + if (FALSE === ($OBJ =& _get_validation_object())) + { + if ( ! isset($_POST[$field])) + { + return $default; + } + + return $_POST[$field]; + } + + return $OBJ->set_value($field, $default); + } +} + +// ------------------------------------------------------------------------ + +/** + * Set Select + * + * Let's you set the selected value of a
      - +

      CodeIgniter User Guide Version 1.6.3

      CodeIgniter User Guide Version 1.7
      @@ -57,7 +57,7 @@

      Change Log

      -

      Version 1.6.4

      +

      Version 1.7

      Release Date: In development
      SVN Revision: XXXX

      @@ -65,15 +65,16 @@

      Version 1.6.4

      • Libraries
          +
        • Added a new Form Validation Class. It simplifies setting rules and field names, supports arrays as field names, allows groups of validation rules to be saved in a config file, and adds some helper functions for use in view files. Please note that the old Validation class is now deprecated. We will leave it in the library folder for some time so that existing applications that use it will not break, but you are encouraged to migrate to the new version.
        • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
        • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
        • Added the ability to assign library objects to your own variable names when you use this->load->library(). Please see the Loader class for more info.
        • Changed the output of the profiler to use style attribute rather then clear, and added the id "codeigniter_profiler" to the container div
          • -
        • Added is_natural() and is_natural_no_zero() to the Validation class.
      • Helpers
          +
        • Added several new "setting" functions to the Form helper that allow POST data to be retrieved and set into forms. These are intended to be used on their own, or with the new Form Validation Class.
        • Added current_url() and uri_segments() to URL helper.
        • Improved accuracy of calculations in Number helper.
        • Removed added newlines ("\n") from most form and html helper functions.
          • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 3b3dbf46..3a40dc2c 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 1034ee94..9016ffe0 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 1fa6d182..8ecccce2 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 4ae8f704..2c16f360 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index b59034fa..246aa4e6 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 966700c5..4182390f 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index bc5bf49b..ed8f63d6 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index 097d396b..3feb487d 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index e1dbef40..ac6ea11a 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 36e6ffd0..73f814c3 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index bad2df86..eb4d13e9 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 782cecc3..a6ca6219 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 4e6c97b9..7f8e461e 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 96570d34..7ff23ee6 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 4d04a1ca..e6847b37 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 3e44f304..1c0ca518 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 02774016..a8e86039 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 3014d3ff..9a1d6cd8 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 0f8a2d46..b4bfae50 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 4913ceab..0a6d9d65 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 9261600e..65058b9e 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 31ad8662..3b660d27 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index e748eb00..a8168239 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 0f759d7e..15dfcec1 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 482fb71c..be52fe83 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 8f4c09c0..07dc1b3d 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index e91d5a88..090456fc 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 6af6ee99..dcea24de 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/index.html b/user_guide/general/index.html index d94ec60b..f271b12b 100644 --- a/user_guide/general/index.html +++ b/user_guide/general/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 0d0c628e..29a2d62f 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index f3d69628..f1600d90 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 3c490874..b061d06c 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index f0a769d1..8471840a 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 804c9e0b..a9c2a646 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 86aa568f..edeced0a 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index ef238405..a6551970 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 58b0de2d..39e1a9f1 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 78da9c10..331161a4 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index c17118f4..f5925240 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/security.html b/user_guide/general/security.html index b24edb9d..301e24f9 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 7883528c..e0b130e4 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 7f987a5b..a5ffa08b 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index ffe796c7..2a6bad3e 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/compatibility_helper.html b/user_guide/helpers/compatibility_helper.html index d98332ae..7f32a557 100644 --- a/user_guide/helpers/compatibility_helper.html +++ b/user_guide/helpers/compatibility_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 456a95ea..f30528af 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 0e174ccc..41d65795 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 97444291..cbd743e3 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 42e8aba1..d9bf6938 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index d8e522a4..732e5154 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 05700ae8..e534f50d 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 76ded1ee..868cadb8 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          @@ -258,7 +258,7 @@

          form_fieldset()

          </fieldset>

          Similar to other functions, you can submit an associative array in the second parameter if you prefer to set additional attributes.

          $attributes = array('id' => 'address_info', 'class' => 'address_info');
          - echo form_fieldset('Address Information', $attributes);
          + echo form_fieldset('Address Information', $attributes);
          echo "<p>fieldset content here</p>\n";
          echo form_fieldset_close();

          @@ -269,7 +269,7 @@

          form_fieldset()

          </fieldset>

          form_fieldset_close()

          Produces a closing </fieldset> tag. The only advantage to using this function is it permits you to pass data to it - which will be added below the tag. For example:

          + which will be added below the tag. For example:

          $string = "</div></div>";

          echo fieldset_close($string);
          @@ -321,7 +321,7 @@

          form_submit()


          <input type="submit" name="mysubmit" value="Submit Post!" />

          Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. - The third parameter lets you add extra data to your form, like JavaScript.

          + The third parameter lets you add extra data to your form, like JavaScript.

          form_label()

          Lets you generate a <label>. Simple example:

          echo form_label('What is your Name', 'username');
          @@ -329,13 +329,13 @@

          form_label()

          // Would produce:
          <label for="username">What is your Name</label>           -

          Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

          +

          Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

          $attributes = array(
              'class' => 'mycustomclass',
              'style' => 'color: #000;',
          );
          - echo form_label('What is your Name', 'username', $attributes);
          -
          + echo form_label('What is your Name', 'username', $attributes);
          +
          // Would produce:
          <label for="username" class="mycustomclass" style="color: #000;">What is your Name</label>

          form_reset()

          @@ -411,6 +411,49 @@

          form_prep()

          creating your own form elements.

          +

          set_value()

          + +

          Permits you to set the value of an input form or textarea. You must supply the field name via the first parameter of the function. +The second (optional) parameter allows you to set a default value for the form. Example:

          + +<input type="text" name="quantity" value="<?php echo set_value('quantity', '0'); ?>" size="50" /> + +

          The above form will show "0" when loaded for the firs time.

          + +

          set_select()

          + +

          If you use a <select> menu, this function permits you to display the menu item that was selected. The first parameter +must contain the name of the select menu, the second parameter must contain the value of +each item, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE).

          + +

          Example:

          + + +<select name="myselect">
          +<option value="one" <?php echo set_select('myselect', 'one', TRUE); ?> >One</option>
          +<option value="two" <?php echo set_select('myselect', 'two'); ?> >Two</option>
          +<option value="three" <?php echo set_select('myselect', 'three'); ?> >Three</option>
          +</select> +           + + +

          set_checkbox()

          + +

          Permits you to display a checkbox in the state it was submitted. The first parameter +must contain the name of the checkbox, the second parameter must contain its value, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE). Example:

          + +<input type="checkbox" name="mycheck" value="1" <?php echo set_checkbox('mycheck', '1'); ?> />
          +<input type="checkbox" name="mycheck" value="2" <?php echo set_checkbox('mycheck', '2'); ?> />           + + +

          set_radio()

          + +

          Permits you to display radio buttons in the state they were submitted. This function is identical to the set_checkbox() function above.

          + +<input type="radio" name="myradio" value="1" <?php echo set_radio('myradio', '1', TRUE); ?> />
          +<input type="radio" name="myradio" value="2" <?php echo set_radio('myradio', '2'); ?> />           + +
          diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index aff896aa..ab26cbcc 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 4a78287e..b93a9c01 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 7bf10688..9c60759d 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index 8d20cca3..fea4cbf6 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index ceb509c4..42f4713d 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 627d9f98..588cafef 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index fd337c5d..05f536e9 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 2a754a97..67318e8c 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index fb58b837..65b82d8b 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 3116c36a..538784d6 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 95599a5d..e5e35dfd 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 2d3cd446..6971115e 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/index.html b/user_guide/index.html index 2d08fcc0..8a806842 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index f1ac5730..e0bf6129 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index a4a39f5c..701cdac7 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index c6d77585..abdf5194 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 0ed75c7e..e77d325e 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index db830e23..c2739777 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 2232e2fd..890e37dd 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index f5259efc..333d8ca9 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index f2bc4b89..41c131bc 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index c8c01418..1e593739 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 65b9c42d..c1b667a8 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 7bdcff0a..2a418087 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 725e7a18..789f21bf 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 26241ec4..66ca76e4 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index e10511aa..5e6dfb9c 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index d5f1cc99..a62ae57a 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index 14d51229..24d34fd7 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index fa50c621..258df2a5 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 31b309d1..784ada8b 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_164.html b/user_guide/installation/upgrade_164.html index e71a0ad9..ea878fc0 100644 --- a/user_guide/installation/upgrade_164.html +++ b/user_guide/installation/upgrade_164.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html new file mode 100644 index 00000000..d74afff2 --- /dev/null +++ b/user_guide/installation/upgrade_170.html @@ -0,0 +1,121 @@ + + + + + +Upgrading from 1.6.3 to 1.6.4 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
          + + + + + +

          CodeIgniter User Guide Version 1.7

          +
          + + + + + + + + + +
          + + +
          + + + +
          + +

          Upgrading from 1.6.3 to 1.7.0 - In Development!

          + +

          Before performing an update you should take your site offline by replacing the index.php file with a static one.

          + + + +

          Step 1: Update your CodeIgniter files

          + +

          Replace these files and directories in your "system" folder with the new versions:

          + +
            + +
          • system/codeigniter
            • +
          • system/database
            • +
          • system/helpers
            • +
          • system/language
            • +
          • system/libraries
            • +
          + +

          Note: If you have any custom developed files in these folders please make copies of them first.

          + + +

          Step 2: Update your Session Table

          + +

          If you are using the Session class in your application, AND if you are storing session data to a database, you must add a new column named user_data to your session table. +Here is an example of what this column might look like for MySQL: + +user_data text NOT NULL + +

          To add this column you will run a query similar to this:

          + +ALTER TABLE `ci_sessions` ADD `user_data` text NOT NULL + +

          You'll find more information regarding the new Session functionality in the Session class page.

          + + +

          Step 3: Update your Validation Syntax

          + +

          This is an optional, but recommended step, for people currently using the Validation class. CI 1.7 introduces a new Form Validation class, which +deprecates the old Validation library. We have left the old one in place so that existing applications that use it will not break, but you are encouraged to +migrate to the new version as soon as possible. Please read the user guide carefully as the new library works a little differently, and has several new features.

          + + + +

          Step 4: Update your user guide

          +

          Please replace your local copy of the user guide with the new version, including the image files.

          + +
          + + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index c81b6d48..8360a2b3 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 82215f3a..78b5433c 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          @@ -60,7 +60,7 @@

          Upgrading From a Previous Version

          Please read the upgrade notes corresponding to the version you are upgrading from.

            -
          • Upgrading from 1.6.3 to 1.6.4
            • +
          • Upgrading from 1.6.3 to 1.7.0
          • Upgrading from 1.6.2 to 1.6.3
          • Upgrading from 1.6.1 to 1.6.2
          • Upgrading from 1.6.0 to 1.6.1
            • diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index c57df73a..67c36135 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -28,7 +28,7 @@
            - +

            CodeIgniter User Guide Version 1.6.3

            CodeIgniter User Guide Version 1.7
            diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 15737f1a..1c849939 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -28,7 +28,7 @@
            - +

            CodeIgniter User Guide Version 1.6.3

            CodeIgniter User Guide Version 1.7
            diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 59bc7d77..41a89566 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -28,7 +28,7 @@
            - +

            CodeIgniter User Guide Version 1.6.3

            CodeIgniter User Guide Version 1.7
            diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index bd0fa569..64f56aca 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -28,7 +28,7 @@
            - +

            CodeIgniter User Guide Version 1.6.3

            CodeIgniter User Guide Version 1.7
            diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 372b1a34..092dad2a 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -28,7 +28,7 @@
            - +

            CodeIgniter User Guide Version 1.6.3

            CodeIgniter User Guide Version 1.7
            diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 24a7d394..baa179fb 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -28,7 +28,7 @@
            - +

            CodeIgniter User Guide Version 1.6.3

            CodeIgniter User Guide Version 1.7
            @@ -401,7 +401,7 @@

            Explanation

            image_width Image width. -image_height +image_heigth Image height image_type @@ -423,7 +423,7 @@

            Explanation

               ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  FTP Class +Next Topic:  Form Validation Class

            CodeIgniter  ·  Copyright © 2006-2008  ·  Ellislab, Inc.

            diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html new file mode 100644 index 00000000..1bdc3a41 --- /dev/null +++ b/user_guide/libraries/form_validation.html @@ -0,0 +1,1144 @@ + + + + + +Form Validation : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + +
            + + + + + +

            CodeIgniter User Guide Version 1.7

            +
            + + + + + + + + + +
            + + +
            + + + +
            + +

            Form Validation

            + +

            CodeIgniter provides a comprehensive form validation and data prepping class that helps minimize the amount of code you'll write.

            + +

            Note:  As of CodeIgniter 1.6.4, this Form Validation class supercedes the old Validation class, which is now deprecated. We +have left the old class in the library so applications currently using it will not break, but you are encouraged to migrate to this new version.

            + + + + + + + + +

             

            + + +

            Overview

            + + +

            Before explaining CodeIgniter's approach to data validation, let's describe the ideal scenario:

            + +
              +
            1. A form is displayed.
              2. +
            2. You fill it in and submit it.
              3. +
            3. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data +along with an error message describing the problem.
              4. +
            4. This process continues until you have submitted a valid form.
              5. +
            + +

            On the receiving end, the script must:

            + +
              +
            1. Check for required data.
              2. +
            2. Verify that the data is of the correct type, and meets the correct criteria. For example, if a username is submitted +it must be validated to contain only permitted characters. It must be of a minimum length, +and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.
              3. +
            3. Sanitize the data for security.
              4. +
            4. Pre-format the data if needed (Does the data need to be trimmed? HTML encoded? Etc.)
              5. +
            5. Prep the data for insertion in the database.
              6. +
            + + +

            Although there is nothing terribly complex about the above process, it usually requires a significant +amount of code, and to display error messages, various control structures are usually placed within the form HTML. +Form validation, while simple to create, is generally very messy and tedious to implement.

            + +

             

            + + + +

            Form Validation Tutorial

            + +

            What follows is a "hands on" tutorial for implementing CodeIgniters Form Validation.

            + + +

            In order to implement form validation you'll need three things:

            + +
              +
            1. A View file containing a form.
              2. +
            2. A View file containing a "success" message to be displayed upon successful submission.
              3. +
            3. A controller function to receive and process the submitted data.
              4. +
            + +

            Let's create those three things, using a member sign-up form as the example.

            + + + + + +

            The Form

            + +

            Using a text editor, create a form called myform.php. In it, place this code and save it to your applications/views/ +folder:

            + + + + + + + + +

            The Success Page

            + + +

            Using a text editor, create a form called formsuccess.php. In it, place this code and save it to your applications/views/ +folder:

            + + + + + + + +

            The Controller

            + +

            Using a text editor, create a controller called form.php. In it, place this code and save it to your applications/controllers/ +folder:

            + + + + + +

            Try it!

            + +

            To try your form, visit your site using a URL similar to this one:

            + +example.com/index.php/form/ + +

            If you submit the form you should simply see the form reload. That's because you haven't set up any validation +rules yet.

            + +

            Since you haven't told the Form Validation class to validate anything yet, it returns FALSE (boolean false) by default. The run() +function only returns TRUE if it has successfully applied your rules without any of them failing.

            + + +

            Explanation

            + +

            You'll notice several things about the above pages:

            + +

            The form (myform.php) is a standard web form with a couple exceptions:

            + +
              +
            1. It uses a form helper to create the form opening. +Technically, this isn't necessary. You could create the form using standard HTML. However, the benefit of using the helper +is that it generates the action URL for you, based on the URL in your config file. This makes your application more portable in the event your URLs change.
              2. + +
            2. At the top of the form you'll notice the following function call: +<?php echo validation_errors(); ?> + +

              This function will return any error messages sent back by the validator. If there are no messages it returns an empty string.

              +
              3. +
            + +

            The controller (form.php) has one function: index(). This function initializes the validation class and +loads the form helper and URL helper used by your view files. It also runs +the validation routine. Based on +whether the validation was successful it either presents the form or the success page.

            + + + + + + +

            Setting Validation Rules

            + +

            CodeIgniter lets you set as many validation rules as you need for a given field, cascading them in order, and it even lets you prep and pre-process the field data +at the same time. To set validation rules you will use the set_rules() function:

            + +$this->form_validation->set_rules(); + +

            The above function takes three parameters as input:

            + +
              +
            1. The field name - the exact name you've given the form field.
              2. +
            2. A "human" name for this field, which will be inserted into the error message. For example, if your field is named "user" you might give it a human name of "Username".
              3. +
            3. The validation rules for this form field.
              4. +
            + + +


            Here is an example. In your controller (form.php), add this code just below the validation initialization function:

            + + +$this->form_validation->set_rules('username', 'Username', 'required');
            +$this->form_validation->set_rules('password', 'Password', 'required');
            +$this->form_validation->set_rules('passconf', 'Password Confirmation', 'required');
            +$this->form_validation->set_rules('email', 'Email', 'required');
            +             + +

            Your controller should now look like this:

            + + + +

            Now submit the form with the fields blank and you should see the error messages. +If you submit the form with all the fields populated you'll see your success page.

            + +

            Note: The form fields are not yet being re-populated with the data when +there is an error. We'll get to that shortly.

            + + + + + +

            Setting Rules Using an Array

            + +

            Before moving on it should be noted that the rule setting function can be passed an array if you prefer to set all your rules in one action. +If you use this approach you must name your array keys as indicated:

            + + +$config = array(
            +               array(
            +                     'field'   => 'username',
            +                     'label'   => 'Username',
            +                     'rules'   => 'required'
            +                  ),
            +               array(
            +                     'field'   => 'password',
            +                     'label'   => 'Password',
            +                     'rules'   => 'required'
            +                  ),
            +               array(
            +                     'field'   => 'passconf',
            +                     'label'   => 'Password Confirmation',
            +                     'rules'   => 'required'
            +                  ),   
            +               array(
            +                     'field'   => 'email',
            +                     'label'   => 'Email',
            +                     'rules'   => 'required'
            +                  )
            +            );
            +
            +$this->form_validation->set_rules($config); +             + + + + + + + +

            Cascading Rules

            + +

            CodeIgniter lets you pipe multiple rules together. Let's try it. Change your rules in the third parameter of rule setting function, like this:

            + + +$this->form_validation->set_rules('username', 'Username', 'required|min_length[5]|max_length[12]');
            +$this->form_validation->set_rules('password', 'Password', 'required|matches[passconf]');
            +$this->form_validation->set_rules('passconf', 'Password Confirmation', 'required');
            +$this->form_validation->set_rules('email', 'Email', 'required|valid_email');
            +             + +

            The above code sets the following rules:

            + +
              +
            1. The username field be no shorter than 5 characters and no longer than 12.
              2. +
            2. The password field must match the password confirmation field.
              3. +
            3. The email field must contain a valid email address.
              4. +
            + +

            Give it a try! Submit your form without the proper data and you'll see new error messages that correspond to your new rules. +There are numerous rules available which you can read about in the validation reference.

            + + + + +

            Prepping Data

            + +

            In addition to the validation functions like the ones we used above, you can also prep your data in various ways. +For example, you can set up rules like this:

            + + +$this->form_validation->set_rules('username', 'Username', 'trim|required|min_length[5]|max_length[12]|xss_clean');
            +$this->form_validation->set_rules('password', 'Password', 'trim|required|matches[passconf]|md5');
            +$this->form_validation->set_rules('passconf', 'Password Confirmation', 'trim|required');
            +$this->form_validation->set_rules('email', 'Email', 'trim|required|valid_email');
            +             + + +

            In the above example, we are "trimming" the fields, converting the password to MD5, and running the username through +the "xss_clean" function, which removes malicious data.

            + +

            Any native PHP function that accepts one parameter can be used as a rule, like htmlspecialchars, +trim, MD5, etc.

            + +

            Note: You will generally want to use the prepping functions after +the validation rules so if there is an error, the original data will be shown in the form.

            + + + + + +

            Re-populating the form

            + +

            Thus far we have only been dealing with errors. It's time to repopulate the form field with the submitted data. CodeIgniter offers several helper functions +that permit you to do this. The one you will use most commonly is:

            + +set_value('field name') + + +

            Open your myform.php view file and update the value in each field using the set_value() function:

            + +

            Don't forget to include each. field name in the set_value() functions!

            + + + + + +

            Now reload your page and submit the form so that it triggers an error. Your form fields should now be re-populated

            + +

            Note: The Function Reference section below contains functions that +permit you to re-populate <select> menus, radio buttons, and checkboxes.

            + + +

            Important Note: If you use an array as the name of a form field, you must supply it as an array to the function. Example:

            + +<input type="text" name="colors[]" value="<?php echo set_value('colors[]'); ?>" size="50" /> + + + + + + +

            Callbacks: Your own Validation Functions

            + +

            The validation system supports callbacks to your own validation functions. This permits you to extend the validation class +to meet your needs. For example, if you need to run a database query to see if the user is choosing a unique username, you can +create a callback function that does that. Let's create a example of this.

            + +

            In your controller, change the "username" rule to this:

            + +$this->form_validation->set_rules('username', 'Username', 'callback_username_check'); + + +

            Then add a new function called username_check to your controller. Here's how your controller should now look:

            + + + + +

            Reload your form and submit it with the word "test" as the username. You can see that the form field data was passed to your +callback function for you to process.

            + +

            To invoke a callback just put the function name in a rule, with "callback_" as the rule prefix.

            + +

            You can also process the form data that is passed to your callback and return it. If your callback returns anything other then a boolean TRUE/FALSE +it is assumed that the data is your newly processed form data.

            + + + + + +

            Setting Error Messages

            + + +

            All of the native error messages are located in the following language file: language/english/form_validation_lang.php

            + +

            To set your own custom message you can either edit that file, or use the following function:

            + +$this->form_validation->set_message('rule', 'Error Message'); + +

            Where rule corresponds to the name of a particular rule, and Error Message is the text you would like displayed.

            + +

            If you include %s in your error string, it will be replaced with the "human" name you used for your field when you set your rules.

            + +

            In the "callback" example above, the error message was set by passing the name of the function:

            + +$this->form_validation->set_message('username_check') + +

            You can also override any error message found in the languge file. For example, to change the message for the "required" rule you will do this:

            + +$this->form_validation->set_message('required', 'Your custom message here'); + + + + +

            Changing the Error Delimiters

            + +

            By default, the Form Validation class adds a paragraph tag (<p>) around each error message shown. You can either change these delimiters globally or +individually.

            + +
              + +
            1. Changing delimiters Globally + +

              To globally change the error delimiters, in your controller function, just after loading the Form Validation class, add this:

              + +<?php echo $this->form_validation->set_error_delimiters('<div class="error">', '</div>'); + +

              In this example, we've switched to using div tags.

              + +
              2. + +
            2. Changing delimiters Individually

              + +

              Each of the two error generating functions shown in this tutorial can be supplied their own delimiters as follows:

              + +<?php echo form_error('field name', '<div class="error">', '</div>'); ?> + +

              Or:

              + +<?php echo validation_errors('<div class="error">', '</div>'); ?> + +
              3. +
            + + + + + +

            Showing Errors Individually

            + +

            If you prefer to show an error message next to each form field, rather than as a list, you can use the form_error() function.

            + +

            Try it! Change your form so that it looks like this:

            + + + +

            If there are no errors, nothing will be shown. If there is an error, the message will appear.

            + +

            Important Note: If you use an array as the name of a form field, you must supply it as an array to the function. Example:

            + +<?php echo form_error('options[size]'); ?>
            +<input type="text" name="options[size]" value="<?php echo set_value("options[size]"); ?>" size="50" /> +             + + + + + +

             

            + + + +

            Saving Sets of Validation Rules to a Config File

            + +

            A nice feature of the Form Validation class is that it permits you to store all your validation rules for your entire application in a config file. You +can organize these rules into "groups". These groups can either be loaded automatically when a matching controller/function is called, or +you can manually call each set as needed.

            + +

            How to save your rules

            + +

            To store your validation rules, simply create a file named form_validation.php in your application/config/ folder. +In that file you will place an array named $config with your rules. As shown earlier, the validation array will have this prototype:

            + + +$config = array(
            +               array(
            +                     'field'   => 'username',
            +                     'label'   => 'Username',
            +                     'rules'   => 'required'
            +                  ),
            +               array(
            +                     'field'   => 'password',
            +                     'label'   => 'Password',
            +                     'rules'   => 'required'
            +                  ),
            +               array(
            +                     'field'   => 'passconf',
            +                     'label'   => 'Password Confirmation',
            +                     'rules'   => 'required'
            +                  ),   
            +               array(
            +                     'field'   => 'email',
            +                     'label'   => 'Email',
            +                     'rules'   => 'required'
            +                  )
            +            );
            +             + +

            Your validation rule file will be loaded automatically and used when you call the run() function.

            + +

            Please note that you MUST name your array $config.

            + +

            Creating Sets of Rules

            + +

            In order to organize your rules into "sets" requires that you place them into "sub arrays". Consider the following example, showing two sets of rules. +We've arbitrarily called these two rules "signup" and "email". You can name your rules anything you want:

            + + +$config = array(
            +                 'signup' = array(
            +                                    array(
            +                                            'field' => 'username',
            +                                            'label' => 'Username',
            +                                            'rules' => 'required'
            +                                         ),
            +                                    array(
            +                                            'field' => 'password',
            +                                            'label' => 'Password',
            +                                            'rules' => 'required'
            +                                         ),
            +                                    array(
            +                                            'field' => 'passconf',
            +                                            'label' => 'PasswordConfirmation',
            +                                            'rules' => 'required'
            +                                         ),
            +                                    array(
            +                                            'field' => 'email',
            +                                            'label' => 'Email',
            +                                            'rules' => 'required'
            +                                         )
            +                                    ),
            +                 'email' = array(
            +                                    array(
            +                                            'field' => 'emailaddress',
            +                                            'label' => 'EmailAddress',
            +                                            'rules' => 'required|valid_email'
            +                                         ),
            +                                    array(
            +                                            'field' => 'name',
            +                                            'label' => 'Name',
            +                                            'rules' => 'required|alpha'
            +                                         ),
            +                                    array(
            +                                            'field' => 'title',
            +                                            'label' => 'Title',
            +                                            'rules' => 'required'
            +                                         ),
            +                                    array(
            +                                            'field' => 'message',
            +                                            'label' => 'MessageBody',
            +                                            'rules' => 'required'
            +                                         )
            +                                    )                          
            +               );
            +             + + +

            Calling a Specific Rule Group

            + +

            In order to call a specific group you will pass its name to the run() function. For example, to call the signup rule you will do this:

            + + +if ($this->form_validation->run('signup') == FALSE)
            +{
            +   $this->load->view('myform');
            +}
            +else
            +{
            +   $this->load->view('formsuccess');
            +}
            +             + + + +

            Associating a Controller Function with a Rule Group

            + +

            An alternate (and more automatic) method of calling a rule group is to name it according to the controller class/function you intend to use it with. For example, let's say you +have a controller named Member and a function named signup. Here's what your class might look like:

            + + +<?php

            +class Member extends Controller {
            +
            +   function signup()
            +   {      
            +      $this->load->library('form_validation');
            +            
            +      if ($this->form_validation->run() == FALSE)
            +      {
            +         $this->load->view('myform');
            +      }
            +      else
            +      {
            +         $this->load->view('formsuccess');
            +      }
            +   }
            +}
            +?>             + +

            In your validation config file, you will name your rule group member/signup: + + +$config = array(
            +           'member/signup' = array(
            +                                    array(
            +                                            'field' => 'username',
            +                                            'label' => 'Username',
            +                                            'rules' => 'required'
            +                                         ),
            +                                    array(
            +                                            'field' => 'password',
            +                                            'label' => 'Password',
            +                                            'rules' => 'required'
            +                                         ),
            +                                    array(
            +                                            'field' => 'passconf',
            +                                            'label' => 'PasswordConfirmation',
            +                                            'rules' => 'required'
            +                                         ),
            +                                    array(
            +                                            'field' => 'email',
            +                                            'label' => 'Email',
            +                                            'rules' => 'required'
            +                                         )
            +                                    )
            +               );
            +             + +

            When a rule group is named identically to a controller class/function it will be used automatically when the run() function is invoked from that class/function.

            + + + + + + + + +

             

            + + + +

            Rule Reference

            + +

            The following is a list of all the native rules that are available to use:

            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
            RuleParameterDescriptionExample
            requiredNoReturns FALSE if the form element is empty. 
            matchesYesReturns FALSE if the form element does not match the one in the parameter.matches[form_item]
            min_lengthYesReturns FALSE if the form element is shorter then the parameter value.min_length[6]
            max_lengthYesReturns FALSE if the form element is longer then the parameter value.max_length[12]
            exact_lengthYesReturns FALSE if the form element is not exactly the parameter value.exact_length[8]
            alphaNoReturns FALSE if the form element contains anything other than alphabetical characters. 
            alpha_numericNoReturns FALSE if the form element contains anything other than alpha-numeric characters. 
            alpha_dashNoReturns FALSE if the form element contains anything other than alpha-numeric characters, underscores or dashes. 
            numericNoReturns FALSE if the form element contains anything other than numeric characters. 
            integerNoReturns FALSE if the form element contains anything other than an integer. 
            is_naturalNoReturns FALSE if the form element contains anything other than a natural number: 0, 1, 2, 3, etc. 
            is_natural_no_zeroNoReturns FALSE if the form element contains anything other than a natural number, but not zero: 1, 2, 3, etc. 
            valid_emailNoReturns FALSE if the form element does not contain a valid email address. 
            valid_emailsNoReturns FALSE if any value provided in a comma separated list is not a valid email. 
            valid_ipNoReturns FALSE if the supplied IP is not valid. 
            valid_base64NoReturns FALSE if the supplied string contains anything other than valid Base64 characters. 
            + +

            Note: These rules can also be called as discrete functions. For example:

            + +$this->form_validation->required($string); + +

            Note: You can also use any native PHP functions that permit one parameter.

            + + + +

             

            + + +

            Prepping Reference

            + +

            The following is a list of all the prepping functions that are available to use:

            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
            NameParameterDescription
            xss_cleanNoRuns the data through the XSS filtering function, described in the Input Class page.
            prep_for_formNoConverts special characters so that HTML data can be shown in a form field without breaking it.
            prep_urlNoAdds "http://" to URLs if missing.
            strip_image_tagsNoStrips the HTML from image tags leaving the raw URL.
            encode_php_tagsNoConverts PHP tags to entities.
            + +

            Note: You can also use any native PHP functions that permit one parameter, +like trim, htmlspecialchars, urldecode, etc.

            + + + + + + + +

             

            + + +

            Function Reference

            + +

            $this->form_validation->set_rule();

            + +

            Permits you to set validation rules, as described in the tutorial sections above:

            + + + + +

            $this->form_validation->run();

            + +

            Runs the validation routines. Returns boolean TRUE on success and FALSE on failure. You can optionally pass the name of the validation +group via the function, as described in: Saving Groups of Validation Rules to a Config File.

            + + +

            $this->form_validation->set_message();

            + +

            Permits you to set custom error messages. See Setting Error Messages above.

            + + +

             

            + + +

            Helper Reference

            + +

            The following helper functions are available for use in the view files containing your forms. Note that these are procedural functions, so they +do not require you to prepend them with $this->form_validation.

            + +

            form_error()

            + +

            Shows an individual error message associated with the field name supplied to the function. Example:

            + +<?php echo form_error('username'); ?> + +

            The error delimiters can be optionally specified. See the Changing the Error Delimiters section above.

            + + + +

            validation_errors()

            +

            Shows all error messages as a string: Example:

            + +<?php echo validation_errors(); ?> + +

            The error delimiters can be optionally specified. See the Changing the Error Delimiters section above.

            + + + +

            set_value()

            + +

            Permits you to set the value of an input form or textarea. You must supply the field name via the first parameter of the function. +The second (optional) parameter allows you to set a default value for the form. Example:

            + +<input type="text" name="quantity" value="<?php echo set_value('quantity', '0'); ?>" size="50" /> + +

            The above form will show "0" when loaded for the firs time.

            + +

            set_select()

            + +

            If you use a <select> menu, this function permits you to display the menu item that was selected. The first parameter +must contain the name of the select menu, the second parameter must contain the value of +each item, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE).

            + +

            Example:

            + + +<select name="myselect">
            +<option value="one" <?php echo set_select('myselect', 'one', TRUE); ?> >One</option>
            +<option value="two" <?php echo set_select('myselect', 'two'); ?> >Two</option>
            +<option value="three" <?php echo set_select('myselect', 'three'); ?> >Three</option>
            +</select> +             + + +

            set_checkbox()

            + +

            Permits you to display a checkbox in the state it was submitted. The first parameter +must contain the name of the checkbox, the second parameter must contain its value, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE). Example:

            + +<input type="checkbox" name="mycheck" value="1" <?php echo set_checkbox('mycheck', '1'); ?> />
            +<input type="checkbox" name="mycheck" value="2" <?php echo set_checkbox('mycheck', '2'); ?> />             + + +

            set_radio()

            + +

            Permits you to display radio buttons in the state they were submitted. This function is identical to the set_checkbox() function above.

            + +<input type="radio" name="myradio" value="1" <?php echo set_radio('myradio', '1', TRUE); ?> />
            +<input type="radio" name="myradio" value="2" <?php echo set_radio('myradio', '2'); ?> />             + + + + + + + + + +
            + + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 41397d39..1d52a290 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -28,7 +28,7 @@
            - +

            CodeIgniter User Guide Version 1.6.3

            CodeIgniter User Guide Version 1.7
            @@ -290,7 +290,7 @@

            $this->ftp->close();

          ' + diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 5101f18a..8850b63e 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index bedb903a..51f4a29c 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index aa01ad31..31f0c305 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index ff125ecd..67c6cdc6 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 4dbb7908..9bb1e6b7 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 9d3373c5..9a6267f9 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          diff --git a/user_guide/toc.html b/user_guide/toc.html index 683106a2..45a5df41 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -29,7 +29,7 @@
          - +

          CodeIgniter User Guide Version 1.6.3

          CodeIgniter User Guide Version 1.7
          @@ -130,6 +130,7 @@

          Class Reference

        • Email Class
        • Encryption Class
        • File Uploading Class
          • +
        • Form Validation Class
        • FTP Class
        • HTML Table Class
        • Image Manipulation Class
          • @@ -144,7 +145,6 @@

          Class Reference

        • Unit Testing Class
        • URI Class
        • User Agent Class
          • -
        • Validation Class
        • XML-RPC Class
        • Zip Encoding Class
        From b4855089a0beb5dce5f109205dd4fc29cb009ef5 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 19:48:41 +0000 Subject: [PATCH 1299/2544] File not needed --- user_guide/installation/upgrade_164.html | 113 ----------------------- 1 file changed, 113 deletions(-) delete mode 100644 user_guide/installation/upgrade_164.html diff --git a/user_guide/installation/upgrade_164.html b/user_guide/installation/upgrade_164.html deleted file mode 100644 index ea878fc0..00000000 --- a/user_guide/installation/upgrade_164.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - -Upgrading from 1.6.3 to 1.6.4 : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
        - - - - - -

        CodeIgniter User Guide Version 1.7

        -
        - - - - - - - - - -
        - - -
        - - - -
        - -

        Upgrading from 1.6.3 to 1.6.4

        - -

        Before performing an update you should take your site offline by replacing the index.php file with a static one.

        - - - -

        Step 1: Update your CodeIgniter files

        - -

        Replace these files and directories in your "system" folder with the new versions:

        - -
          - -
        • system/codeigniter
          • -
        • system/database
          • -
        • system/helpers
          • -
        • system/language
          • -
        • system/libraries
          • -
        - -

        Note: If you have any custom developed files in these folders please make copies of them first.

        - - -

        Step 2: Update your Session Table

        - -

        If you are using the Session class in your application, AND if you are storing session data to a database, you must add a new column named user_data to your session table. -Here is an example of what this column might look like for MySQL: - -user_data text NOT NULL - -

        To add this column you will run a query similar to this:

        - -ALTER TABLE `ci_sessions` ADD `user_data` text NOT NULL - -

        You'll find more information regarding the new Session functionality in the Session class page.

        - - -

        Step 3: Update your user guide

        -

        Please also replace your local copy of the user guide with the new version.

        - -
        - - - - - - - \ No newline at end of file From b1eee3502b1541b2430e4ef0b07fcf98c4f41d20 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 19:56:48 +0000 Subject: [PATCH 1300/2544] --- user_guide/libraries/form_validation.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 1bdc3a41..6ed0b1de 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -1027,6 +1027,8 @@

        Prepping Reference

        Function Reference

        +

        The following functions are intended for use in your controller functions.

        +

        $this->form_validation->set_rule();

        Permits you to set validation rules, as described in the tutorial sections above:

        From 66bc2ad56cd7dcaab7f07d5357e25ea577460a8e Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 20:18:17 +0000 Subject: [PATCH 1301/2544] --- user_guide/libraries/form_validation.html | 59 ++++++++++++++++++++++- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 6ed0b1de..3da5c31f 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -79,6 +79,7 @@

        Form Validation

      • Changing the Error Delimiters
      • Showing Errors Individually
      • Saving Sets of Validation Rules to a Config File
        • +
      • Using Arrays as Field Names
    • Rule Reference
      • @@ -830,9 +831,63 @@

      Associating a Controller Function with a Rule Group

      When a rule group is named identically to a controller class/function it will be used automatically when the run() function is invoked from that class/function.

      +

       

      + + + +

      Using Arrays as Field Names

      + +

      The Form Validation class supports the use of arrays as field names. Consider this example:

      + +<input type="text" name="options[]" value="" size="50" /> + +

      If you do use an array as a field name, you must use the EXACT array name in the Helper Functions that require the field name, +and as your Validation Rule field name.

      + +

      For example, to set a rule for the above field you would use:

      + +$this->form_validation->set_rules('options[]', 'Options', 'required'); + +

      Or, to show an error for the above field you would use:

      + +<?php echo form_error('options[]'); ?> + +

      Or to re-populate the field you would use:

      + +<input type="text" name="options[]" value="<?php echo set_value('options[]'); ?>" size="50" /> + +

      You can use multidimensional arrays as field names as well. For example:

      +<input type="text" name="options[size]" value="" size="50" /> + +

      Or even:

      + +<input type="text" name="sports[nba][basketball]" value="" size="50" /> + +

      As with our first example, you must use the exact array name in the helper functions:

      + +<?php echo form_error('sports[nba][basketball]'); ?> + +

      If you are using checkboxes (or other fields) that have multiple options, don't forget to leave an empty bracket after each option, so that all selections will be added to the +POST array:

      + + +<input type="checkbox" name="options[]" value="red" />
      +<input type="checkbox" name="options[]" value="blue" />
      +<input type="checkbox" name="options[]" value="green" /> +       + +

      Or if you use a multidimensional array:

      + + +<input type="checkbox" name="options[color][]" value="red" />
      +<input type="checkbox" name="options[color][]" value="blue" />
      +<input type="checkbox" name="options[color][]" value="green" /> +       +

      When you use a helper function you'll include the bracket as well:

      +<?php echo form_error('options[color][]'); ?> @@ -1108,8 +1163,8 @@

      set_checkbox()

      Permits you to display a checkbox in the state it was submitted. The first parameter must contain the name of the checkbox, the second parameter must contain its value, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE). Example:

      -<input type="checkbox" name="mycheck" value="1" <?php echo set_checkbox('mycheck', '1'); ?> />
      -<input type="checkbox" name="mycheck" value="2" <?php echo set_checkbox('mycheck', '2'); ?> />       +<input type="checkbox" name="mycheck[]" value="1" <?php echo set_checkbox('mycheck[]', '1'); ?> />
      +<input type="checkbox" name="mycheck[]" value="2" <?php echo set_checkbox('mycheck[]', '2'); ?> />

      set_radio()

      From 1706f606aee70f6e07bdc533f362a69a16856bb6 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 20:19:55 +0000 Subject: [PATCH 1302/2544] --- user_guide/libraries/form_validation.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 3da5c31f..cd5bc2a8 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -493,6 +493,8 @@

      Re-populating the form

      <input type="text" name="colors[]" value="<?php echo set_value('colors[]'); ?>" size="50" /> +

      For more info please see the Using Arrays as Field Names section below.

      + @@ -655,6 +657,7 @@

      Showing Errors Individually

      <input type="text" name="options[size]" value="<?php echo set_value("options[size]"); ?>" size="50" /> +

      For more info please see the Using Arrays as Field Names section below.

      From 126ca8c341f5a1082178e578a875b8e1f7c9e0b3 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 20:54:30 +0000 Subject: [PATCH 1303/2544] --- system/application/config/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/application/config/config.php b/system/application/config/config.php index 16cf6202..71ebd30d 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -11,7 +11,7 @@ | http://example.com/ | */ -$config['base_url'] = "http://127.0.0.1/EllisLab/_Development/CodeIgniter/"; +$config['base_url'] = ""; /* |-------------------------------------------------------------------------- @@ -238,7 +238,7 @@ $config['sess_table_name'] = 'ci_sessions'; $config['sess_match_ip'] = FALSE; $config['sess_match_useragent'] = TRUE; -$config['sess_time_to_update'] = 300; +$config['sess_time_to_update'] = 300; /* |-------------------------------------------------------------------------- From c3907c629799c16d62c7fd1a72fb06cedba80d07 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 26 Aug 2008 20:55:47 +0000 Subject: [PATCH 1304/2544] Switched spaces to tabs --- system/helpers/form_helper.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index a96adb97..2f29f1a8 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -53,7 +53,7 @@ function form_open($action = '', $attributes = '', $hidden = array()) $form = '
      (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); - if ( ! is_array($data) OR ! isset($data['value'])) + if ( ! is_array($data) OR ! isset($data['value'])) { $val = $value; } - else + else { $val = $data['value']; unset($data['value']); // textareas don't use the value attribute @@ -476,7 +476,7 @@ function form_fieldset($legend_text = '', $attributes = array()) { $fieldset = " 0) From 7926943c3d70c0f87beccd3fad95c23364483bc4 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 27 Aug 2008 06:25:08 +0000 Subject: [PATCH 1305/2544] Fixed a variable that was set wrong --- system/libraries/Loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 55023573..e5ae3f38 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -909,7 +909,7 @@ function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NU } // Save the class name and object name - $this->_ci_classes[$class] = $object_name; + $this->_ci_classes[$class] = $classvar; // Instantiate the class $CI =& get_instance(); From 73589031c21a2d5eb05a5dfef0dca14d697ba2c5 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 27 Aug 2008 14:03:09 +0000 Subject: [PATCH 1306/2544] Fixed the spelling of "respberry" in config/smileys.php --- system/application/config/smileys.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/application/config/smileys.php b/system/application/config/smileys.php index 9f38d2ca..cddc881c 100644 --- a/system/application/config/smileys.php +++ b/system/application/config/smileys.php @@ -30,7 +30,7 @@ ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'), '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'), ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'), - ':P' => array('rasberry.gif', '19', '19', 'rasberry'), + ':P' => array('raspberry.gif', '19', '19', 'rasberry'), ':blank:' => array('blank.gif', '19', '19', 'blank stare'), ':long:' => array('longface.gif', '19', '19', 'long face'), ':ohh:' => array('ohh.gif', '19', '19', 'ohh'), diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3a19f7f9..afb83ff4 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -80,6 +80,7 @@

      Version 1.7

    • Removed added newlines ("\n") from most form and html helper functions.
    • Tightened up validation in Date Helper human_to_unix(), and eliminated the POSIX regex.
    • Updated Date Helper to match the world's current time zones and offsets.
      • +
    • Fixed the spelling of "respberry" in config/smileys.php
  • Other changes From 4f3e46129d4ed11c1a1d1570a6ec0580b0a10dc7 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 27 Aug 2008 14:03:47 +0000 Subject: [PATCH 1307/2544] "raspberry" no "respberry"... sheesh --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index afb83ff4..ee3ff253 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -80,7 +80,7 @@

    Version 1.7

  • Removed added newlines ("\n") from most form and html helper functions.
  • Tightened up validation in Date Helper human_to_unix(), and eliminated the POSIX regex.
  • Updated Date Helper to match the world's current time zones and offsets.
    • -
  • Fixed the spelling of "respberry" in config/smileys.php
    • +
  • Fixed the spelling of "raspberry" in config/smileys.php
  • Other changes From 9dee6ec7bf77e15a1227785292e507f1a6126a8f Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 27 Aug 2008 14:58:12 +0000 Subject: [PATCH 1308/2544] modified regex for image tag sanitization to retain trailing space and closing slash to remain valid XHTML --- system/libraries/Input.php | 2 +- user_guide/changelog.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index ff1dd9b1..dc5b5e5a 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -685,7 +685,7 @@ function xss_clean($str, $is_image = FALSE) if (preg_match("/]*?)(>|$)#si", array($this, '_js_img_removal'), $str); + $str = preg_replace_callback("#]*?)(\s?/?>|$)#si", array($this, '_js_img_removal'), $str); } if (preg_match("/script/i", $str) OR preg_match("/xss/i", $str)) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ee3ff253..b24b0810 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -91,13 +91,14 @@

    Version 1.7

    • -

    Bug fixes for 1.6.4

    +

    Bug fixes for 1.7.0

    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
    • Fixed assorted user guide typos or examples (#4840, #4862, #4864, #4899, #4930, #5006, #5071).
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • +
    • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.

    Version 1.6.3

    From 0c734b52b648fd1c26546306ad578a90ef6f0f72 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 27 Aug 2008 20:24:17 +0000 Subject: [PATCH 1309/2544] added isindex to the list of naughty never allowed tags in xss_clean() --- system/libraries/Input.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index dc5b5e5a..2682ce31 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -728,7 +728,7 @@ function xss_clean($str, $is_image = FALSE) * Becomes: <blink> * */ - $naughty = 'alert|applet|audio|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|layer|link|meta|object|plaintext|style|script|textarea|title|video|xml|xss'; + $naughty = 'alert|applet|audio|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|isindex|layer|link|meta|object|plaintext|style|script|textarea|title|video|xml|xss'; $str = preg_replace_callback('#<(/*\s*)('.$naughty.')([^><]*)([><]*)#is', array($this, '_sanitize_naughty_html'), $str); /* diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b24b0810..8675d71b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -87,6 +87,7 @@

    Version 1.7

    • Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.
    • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
      • +
    • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
    From a5acb737a35215fca563899a7ba49be210706e30 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 27 Aug 2008 21:43:13 +0000 Subject: [PATCH 1310/2544] Fixed an empty string error --- system/libraries/Form_validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index fd0c22ec..b658011b 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -319,7 +319,7 @@ function run($group = '') } else { - if (isset($_POST[$field])) + if (isset($_POST[$field]) AND $_POST[$field] != "") { $this->_field_data[$field]['postdata'] = $_POST[$field]; } From 7440273900619bee0acad36d20ba3dee22b3bfa3 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 27 Aug 2008 21:46:24 +0000 Subject: [PATCH 1311/2544] Clarified some of the lines of text --- system/language/english/form_validation_lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php index 7ca762d7..2d5e5048 100644 --- a/system/language/english/form_validation_lang.php +++ b/system/language/english/form_validation_lang.php @@ -12,11 +12,11 @@ $lang['alpha'] = "The %s field may only contain alphabetical characters."; $lang['alpha_numeric'] = "The %s field may only contain alpha-numeric characters."; $lang['alpha_dash'] = "The %s field may only contain alpha-numeric characters, underscores, and dashes."; -$lang['numeric'] = "The %s field must contain a number."; -$lang['is_numeric'] = "The %s field must contain a number."; +$lang['numeric'] = "The %s field must contain only numbers."; +$lang['is_numeric'] = "The %s field must contain only numeric characters."; $lang['integer'] = "The %s field must contain an integer."; $lang['matches'] = "The %s field does not match the %s field."; -$lang['is_natural'] = "The %s field must contain a number."; +$lang['is_natural'] = "The %s field must contain only positive numbers."; $lang['is_natural_no_zero'] = "The %s field must contain a number greater than zero."; From e9ebe1ca6a78c537025d2db3614385fda804a51a Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 29 Aug 2008 20:05:34 +0000 Subject: [PATCH 1312/2544] --- user_guide/doc_style/template.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/user_guide/doc_style/template.html b/user_guide/doc_style/template.html index b267effe..84f559d5 100644 --- a/user_guide/doc_style/template.html +++ b/user_guide/doc_style/template.html @@ -64,7 +64,11 @@

    Foo Class

    Usage Heading

    -

    Description of using Foo. Highlight variables and filenames in regular text with the <var> tag, and code using the <dfn> tag.

    +

    Within a text string, highlight variables using <var></var> tags, and highlight code using the <dfn></dfn> tags.

    + +

    Sub-heading

    + +

    Put code examples within <code></code> tags:

    $this->load->library('foo');
    From 92203d685183b1f26ea662e300b5c44b0ed572f2 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 31 Aug 2008 04:34:54 +0000 Subject: [PATCH 1313/2544] alt spelling fix --- system/application/config/smileys.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/application/config/smileys.php b/system/application/config/smileys.php index cddc881c..b1988cd4 100644 --- a/system/application/config/smileys.php +++ b/system/application/config/smileys.php @@ -30,7 +30,7 @@ ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'), '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'), ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'), - ':P' => array('raspberry.gif', '19', '19', 'rasberry'), + ':P' => array('raspberry.gif', '19', '19', 'raspberry'), ':blank:' => array('blank.gif', '19', '19', 'blank stare'), ':long:' => array('longface.gif', '19', '19', 'long face'), ':ohh:' => array('ohh.gif', '19', '19', 'ohh'), From 5a9fd7a7100535cf62fdffd9d86525d12f8ee09c Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 31 Aug 2008 05:58:32 +0000 Subject: [PATCH 1314/2544] --- user_guide/doc_style/index.html | 8 +- user_guide/general/security.html | 2 +- user_guide/general/styleguide.html | 684 +++++++++++++++++++++++++++++ user_guide/nav/nav.js | 4 +- user_guide/toc.html | 3 +- 5 files changed, 697 insertions(+), 4 deletions(-) create mode 100644 user_guide/general/styleguide.html diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 1c0ca518..42ebdd1b 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -71,8 +71,14 @@

    Files

    + diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 301e24f9..036eb103 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -144,7 +144,7 @@

    Best Practices

       ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  Benchmarking Class +Next Topic:  PHP Style Guide

    CodeIgniter  ·  Copyright © 2006-2008  ·  Ellislab, Inc.

    diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html new file mode 100644 index 00000000..9d49a9d0 --- /dev/null +++ b/user_guide/general/styleguide.html @@ -0,0 +1,684 @@ + + + + + +Security : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    General Style and Syntax

    + +

    The following page describes the coding rules use adhere to when developing CodeIgniter.

    + + +

    Table of Contents

    + + +

    PHP Closing Tag

    +
    +

    The PHP closing tag on a PHP document ?> is optional to the PHP parser. However, if used, any whitespace following the closing tag, whether introduced + by the developer, user, or an FTP application, can cause unwanted output, PHP errors, or if the latter are suppressed, blank pages. For this reason, all PHP files should + OMIT the closing PHP tag, and instead use a comment block to mark the end of file and it's location relative to the application root. + This allows you to still identify a file as being complete and not truncated.

    +INCORRECT: +<?php + +echo "Here's my code!"; + +?> + +CORRECT: +<?php + +echo "Here's my code!"; + +/* End of file myfile.php */ +/* Location: ./system/modules/mymodule/myfile.php */ + +
    + + +

    Class and Method Naming

    +
    +

    Class names should always have their first letter uppercase, and the constructor method should match identically. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.

    + + INCORRECT: +class superclass +class SuperClass + +CORRECT: +class Super_class + +

    Notice that the Class and constructor methods are identically named and cased:

    + + class Super_class { + + function Super_class() + { + + } +} + +

    Examples of improper and proper method naming:

    + + INCORRECT: +function fileproperties() // not descriptive and needs underscore separator +function fileProperties() // not descriptive and uses CamelCase +function getfileproperties() // Better! But still missing underscore separator +function getFileProperties() // uses CamelCase +function get_the_file_properties_from_the_file() // wordy + +CORRECT: +function get_file_properties() // descriptive, underscore separator, and all lowercase letters + +
    + + +

    Variable Names

    +
    +

    The guidelines for variable naming is very similar to that used for class methods. Namely, variables should contain only lowercase letters, use underscore separators, and be reasonably named to indicate their purpose and contents. Very short, non-word variables should only be used as iterators in for() loops.

    +INCORRECT: +$j = 'foo'; // single letter variables should only be used in for() loops +$Str // contains uppercase letters +$bufferedText // uses CamelCasing, and could be shortened without losing semantic meaning +$groupid // multiple words, needs underscore separator +$name_of_last_city_used // too long + +CORRECT: +for ($j = 0; $j < 10; $j++) +$str +$buffer +$group_id +$last_city + +
    + + +

    Commenting

    +
    +

    In general, code should be commented prolifically. It not only helps describe the flow and intent of the code for less experienced programmers, but can prove invaluable when returning to your own code months down the line. There is not a required format for comments, but the following are recommended.

    + +

    DocBlock style comments preceding class and method declarations so they can be picked up by IDEs:

    + +/** + * Super Class + * + * @package Package Name + * @subpackage Subpackage + * @category Category + * @author Author Name + * @link http://example.com + */ +class Super_class { + +/** + * Encodes string for use in XML + * + * @access public + * @param string + * @return string + */ +function xml_encode($str) + +

    Use single line comments within code, leaving a blank line between large comment blocks and code.

    + +// break up the string by newlines +$parts = explode("\n", $str); + +// A longer comment that needs to give greater detail on what is +// occurring and why can use multiple single-line comments. Try to +// keep the width reasonable, around 70 characters is the easiest to +// read. Don't hesitate to link to permanent external resources +// that may provide greater detail: +// +// http://example.com/information_about_something/in_particular/ + +$parts = $this->foo($parts); + +
    + + +

    Constants

    +
    +

    Constants follow the same guidelines as do variables, except constants should always be fully uppercase. Always use ExpressionEngine constants when appropriate, i.e. SLASH, LD, RD, PATH_CACHE, etc.

    +INCORRECT: +myConstant // missing underscore separator and not fully uppercase +N // no single-letter constants +S_C_VER // not descriptive +$str = str_replace('{foo}', 'bar', $str); // should use LD and RD constants + +CORRECT: +MY_CONSTANT +NEWLINE +SUPER_CLASS_VERSION +$str = str_replace(LD.'foo'.RD, 'bar', $str); + +
    + + +

    TRUE, FALSE, and NULL

    +
    +

    TRUE, FALSE, and NULL keywords should always be fully uppercase.

    +INCORRECT: +if ($foo == true) +$bar = false; +function foo($bar = null) + +CORRECT: +if ($foo == TRUE) +$bar = FALSE; +function foo($bar = NULL) +
    + + + +

    Logical Operators

    +
    +

    Use of || is discouraged as its clarity on some output devices is low (looking like the number 11 for instance). + && is preferred over AND but either are acceptable, and a space should always precede and follow !.

    +INCORRECT: +if ($foo || $bar) +if ($foo AND $bar) // okay but not recommended for common syntax highlighting applications +if (!$foo) +if (! is_array($foo)) + +CORRECT: +if ($foo OR $bar) +if ($foo && $bar) // recommended +if ( ! $foo) +if ( ! is_array($foo)) + +
    + + + +

    Comparing Return Values and Typecasting

    +
    +

    Some PHP functions return FALSE on failure, but may also have a valid return value of "" or 0, which would evaluate to FALSE in loose comparisons. Be explicit by comparing the variable type when using these return values in conditionals to ensure the return value is indeed what you expect, and not a value that has an equivalent loose-type evaluation.

    +

    Use the same stringency in returning and checking your own variables. Use === and !== as necessary. + +INCORRECT: +// If 'foo' is at the beginning of the string, strpos will return a 0, +// resulting in this conditional evaluating as TRUE +if (strpos($str, 'foo') == FALSE) + +CORRECT: +if (strpos($str, 'foo') === FALSE) + + +INCORRECT: +function build_string($str = "") +{ + if ($str == "") // uh-oh! What if FALSE or the integer 0 is passed as an argument? + { + + } +} + +CORRECT: +function build_string($str = "") +{ + if ($str === "") + { + + } +} + +

    See also information regarding typecasting, which can be quite useful. Typecasting has a slightly different effect which may be desirable. When casting a variable as a string, for instance, NULL and boolean FALSE variables become empty strings, 0 (and other numbers) become strings of digits, and boolean TRUE becomes "1":

    + +$str = (string) $str; // cast $str as a string + +
    + + +

    Debugging Code

    +
    +

    No debugging code can be left in place for submitted add-ons unless it is commented out, i.e. no var_dump(), print_r(), die(), and exit() calls that were used while creating the add-on, unless they are commented out.

    + +// print_r($foo); +
    + + + +

    Whitespace in Files

    +
    +

    No whitespace can precede the opening PHP tag or follow the closing PHP tag. ExpressionEngine output is buffered, so whitespace in your files can cause output to begin before ExpressionEngine outputs its content, leading to errors and an inability for ExpressionEngine to send proper headers. In the examples below, select the text with your mouse to reveal the incorrect whitespace.

    + +

    INCORRECT:

    + +<?php + // ...there is whitespace and a linebreak above the opening PHP tag + // as well as whitespace after the closing PHP tag +?> + +

    CORRECT:

    +<?php + // this sample has no whitespace before or after the opening and closing PHP tags +?> + +
    + + +

    Compatibility

    +
    +

    Unless specifically mentioned in your add-on's documentation, all code must be compatible with PHP version 4.3+. Additionally, do not use PHP functions that require non-default libraries to be installed unless your code contains an alternative method when the function is not available, or you implicitly document that your add-on requires said PHP libraries.

    +
    + + +

    Use of $SESS->cache

    +
    +

    $SESS->cache is an array provided for you to use for "flash" content, i.e. values that you would like to persist during a page load, helping you eliminate redundant queries and PHP processing. To avoid conflicts with other first and third-party use of this array, always access it as a multi-dimensional array, using your class name as the primary array name, and your variables within. Naming conventions should follow that of other variables: lowercase letters, underscores for separators between words, and meaningful names.

    + +INCORRECT: +$SESS->cache['admins'] +$SESS->cache['Super_class']['admins'] + +CORRECT: +$SESS->cache['super_class']['admins'] + +

    Here is an example of how one might utilize the $SESS->cache array. This way, no matter how many times this method is called on a given page load (for instance, a tag being used twice on a template, or within a tag that might loop, such as a plugin within the Weblog entries tag), the query and loading of the array occurs only once.

    + +if ( ! isset($SESS->cache['super_class']['admins'])) +{ + $query = $DB->query("SELECT member_id FROM exp_super_class_admins"); + + if ($query->num_rows > 0) + { + foreach ($query->result as $row) + { + $SESS->cache['super_class']['admins'][] = $row['member_id']; + } + } +} + +// set a local variable from the cached global so it's easy to use in the code +$admins = $SESS->cache['super_class']['admins']; + +

    You can see an example of real-world usage of $SESS->cache in the Weblog module's fetch_custom_weblog_fields() and next_prev_entry() methods, and the IP to Nation module's get_country() method.

    + +
    + + + +

    Class and File Names using Common Words

    +
    +

    When your class or filename is a common word, or might quite likely be identically named in another PHP script, provide a unique prefix to help prevent collision. Always realize that your end users may be running other add-ons or third party PHP scripts. Choose a prefix that is unique to your identity as a developer or company.

    + +INCORRECT: +class Email pi.email.php +class Xml ext.xml.php +class Import mod.import.php + +CORRECT: +class Pre_email pi.pre_email.php +class Pre_xml ext.pre_xml.php +class Pre_import mod.pre_import.php + +
    + + +

    Database Table Names

    +
    +

    Any tables that your add-on might use must use the 'exp_' prefix, followed by a prefix uniquely identifying you as the developer or company, and then a short descriptive table name. You do not need to be concerned about the database prefix being used on the user's installation, as ExpressionEngine's database class will automatically convert 'exp_' to what is actually being used.

    + +INCORRECT: +email_addresses // missing both prefixes +pre_email_addresses // missing exp_ prefix +exp_email_addresses // missing unique prefix + +CORRECT: +exp_pre_email_addresses + + +

    NOTE: Be mindful that MySQL has a limit of 64 characters for table names. This should not be an issue as table names that would exceed this would likely have unreasonable names. For instance, the following table name exceeds this limitation by one character. Silly, no? exp_pre_email_addresses_of_registered_users_in_seattle_washington +

    + + + +

    One File per Class

    +
    +

    Use separate files for each class your add-on uses, unless the classes are closely related. An example of ExpressionEngine files that contains multiple classes is the Database class file, which contains both the DB class and the DB_Cache class, and the Magpie plugin, which contains both the Magpie and Snoopy classes.

    +
    + + + +

    Whitespace

    +
    +

    Use tabs for whitespace in your code, not spaces. This may seem like a small thing, but using tabs instead of whitespace allows the developer looking at your code to have indentation at levels that they prefer and customize in whatever application they use. And as a side benefit, it results in (slightly) more compact files, storing one tab character versus, say, four space characters.

    +
    + + + +

    Line Breaks

    +
    +

    Files must be saved with Unix line breaks. This is more of an issue for developers who work in Windows, but in any case ensure that your text editor is setup to save files with Unix line breaks.

    +
    + + + +

    Code Indenting

    +
    +

    Use Allman style indenting. With the exception of Class declarations, braces are always placed on a line by themselves, and indented at the same level as the control statement that "owns" them.

    + +INCORRECT: +function foo($bar) { + // ... +} + +foreach ($arr as $key => $val) { + // ... +} + +if ($foo == $bar) { + // ... +} else { + // ... +} + +for ($i = 0; $i < 10; $i++) + { + for ($j = 0; $j < 10; $j++) + { + // ... + } + } + +CORRECT: +function foo($bar) +{ + // ... +} + +foreach ($arr as $key => $val) +{ + // ... +} + +if ($foo == $bar) +{ + // ... +} +else +{ + // ... +} + +for ($i = 0; $i < 10; $i++) +{ + for ($j = 0; $j < 10; $j++) + { + // ... + } +} +
    + + +

    Bracket and Parenthetic Spacing

    +
    +

    In general, parenthesis and brackets should not use any additional spaces. The exception is that a space should always follow PHP control structures that accept arguments with parenthesis (declare, do-while, elseif, for, foreach, if, switch, while), to help distinguish them from functions and increase readability.

    + +INCORRECT: +$arr[ $foo ] = 'foo'; + +CORRECT: +$arr[$foo] = 'foo'; // no spaces around array keys + + +INCORRECT: +function foo ( $bar ) +{ + +} + +CORRECT: +function foo($bar) // no spaces around parenthesis in function declarations +{ + +} + + +INCORRECT: +foreach( $query->result as $row ) + +CORRECT: +foreach ($query->result as $row) // single space following PHP control structures, but not in interior parenthesis + +
    + + + +

    Localized Text in Control Panel

    +
    +

    Any text that is output in the control panel should use language variables in your module's lang file to allow localization.

    + +INCORRECT: +return "Invalid Selection"; + +CORRECT: +return $LANG->line('invalid_selection'); +
    + + + +

    Private Methods and Variables

    +
    +

    Methods and variables that are only accessed internally by your class, such as utility and helper functions that your public methods use for code abstraction, should be prefixed with an underscore.

    + +convert_text() // public method +_convert_text() // private method +
    + + + +

    PHP Errors

    +
    +

    Code must run error free and not rely on warnings and notices to be hidden to meet this requirement. For instance, never access a variable that you did not set yourself (such as $_POST array keys) without first checking to see that it isset().

    + +

    Make sure that while developing your add-on, error reporting is enabled for ALL users, and that display_errors is enabled in the PHP environment. You can check this setting with:

    + +if (ini_get('display_errors') == 1) +{ + exit "Enabled"; +} + +

    On some servers where display_errors is disabled, and you do not have the ability to change this in the php.ini, you can often enable it with:

    + +ini_set('display_errors', 1); + +

    NOTE: Setting the display_errors setting with ini_set() at runtime is not identical to having it enabled in the PHP environment. Namely, it will not have any effect if the script has fatal errors

    +
    + + + +

    Short Open Tags

    +
    +

    Always use full PHP opening tags, in case a server does not have short_open_tag enabled.

    + +INCORRECT: +<? echo $foo; ?> + +<?=$foo?> + +CORRECT: +<?php echo $foo; ?> +
    + + + +

    One Statement Per Line

    +
    +

    Never combine statements on one line.

    + +INCORRECT: +$foo = 'this'; $bar = 'that'; $bat = str_replace($foo, $bar, $bag); + +CORRECT: +$foo = 'this'; +$bar = 'that'; +$bat = str_replace($foo, $bar, $bag); + +
    + + + +

    Strings

    +
    +

    Always use single quoted strings unless you need variables parsed, and in cases where you do need variables parsed, use braces to prevent greedy token parsing. You may also use double-quoted strings if the string contains single quotes, so you do not have to use escape characters.

    + +INCORRECT: +"My String" // no variable parsing, so no use for double quotes +"My string $foo" // needs braces +'SELECT foo FROM bar WHERE baz = \'bag\'' // ugly + +CORRECT: +'My String' +"My string {$foo}" +"SELECT foo FROM bar WHERE baz = 'bag'" +
    + + + +

    SQL Queries

    +
    +

    MySQL keywords are always capitalized: SELECT, INSERT, UPDATE, WHERE, AS, JOIN, ON, IN, etc.

    + +

    Break up long queries into multiple lines for legibility, preferably breaking for each clause.

    + +INCORRECT: +// keywords are lowercase and query is too long for +// a single line (... indicates continuation of line) +$query = $DB->query("select foo, bar, baz, foofoo, foobar as raboof, foobaz from exp_pre_email_addresses +...where foo != 'oof' and baz != 'zab' order by foobaz limit 5, 100"); + +CORRECT: +$query = $DB->query("SELECT foo, bar, baz, foofoo, foobar AS raboof, foobaz + FROM exp_pre_email_addresses + WHERE foo != 'oof' + AND baz != 'zab' + ORDER BY foobaz + LIMIT 5, 100"); +
    + + + +

    Default Function Arguments

    +
    +

    Whenever appropriate, provide function argument defaults, which helps prevent PHP errors with mistaken calls and provides common fallback values which can save a few lines of code. Example:

    + +function foo($bar = '', $baz = FALSE) +
    + + + +

    Overlapping Tag Parameters

    +
    +

    Avoid multiple tag parameters that have effect on the same thing. For instance, instead of include= and exclude=, perhaps allow include= to handle the parameter alone, with the addition of "not", e.g. include="not bar". This will prevent problems of parameters overlapping or having to worry about which parameter has priority over another.

    +
    + + +
    + + + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index 06f99168..ffcb4d15 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -35,6 +35,7 @@ function create_menu(basepath) '
  • Model-View-Controller
    • ' + '
  • Architectural Goals
    • ' + '' + + '' + @@ -62,6 +63,8 @@ function create_menu(basepath) '
  • Managing Applications
    • ' + '
  • Alternative PHP Syntax
    • ' + '
  • Security
    • ' + + '
  • PHP Style Guide
    • ' + + '
  • Writing Documentation
    • ' + '' + '' + @@ -128,7 +131,6 @@ function create_menu(basepath) '
  • Quick Reference Chart
    • ' + '
  • Community Forums
    • ' + '
  • Community Wiki
    • ' + - '
  • Writing Documentation
    • ' + '' + ''); diff --git a/user_guide/toc.html b/user_guide/toc.html index 45a5df41..9714ad89 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -115,6 +115,8 @@

    General Topics

  • Managing Applications
  • Alternative PHP Syntax
  • Security
    • +
  • PHP Style Guide
    • +
  • Writing Documentation
    • @@ -184,7 +186,6 @@

    Additional Resources

  • Quick Reference Chart
  • Community Forums
  • Community Wiki
    • -
  • Writing Documentation
    • From e08e63dc2e9159f674ab819281a5d03a9aca7d37 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 31 Aug 2008 06:00:09 +0000 Subject: [PATCH 1315/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8675d71b..5e9fc88c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -88,6 +88,7 @@

    Version 1.7

  • Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.
  • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
  • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
    • +
  • Added PHP Style Guide to docs.
    • From 36bf96b4b9fd0703236cd7cdd1f6027d1391a1fb Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 31 Aug 2008 14:08:25 +0000 Subject: [PATCH 1316/2544] updated CI_VERSION --- system/codeigniter/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 39b593d8..32b4017a 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -28,7 +28,7 @@ */ // CI Version -define('CI_VERSION', '1.6.3'); +define('CI_VERSION', '1.7.0'); /* * ------------------------------------------------------ From 53653931de20b3cd41587d02659022e67d1a2d75 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 31 Aug 2008 14:21:46 +0000 Subject: [PATCH 1317/2544] typo fix --- user_guide/helpers/text_helper.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 65b82d8b..28855f4d 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -97,7 +97,7 @@

    character_limiter()

    // Returns: Here is a nice text string…     -

    The third parameter is an optional suffix added to the string. By default it add an ellipsis.

    +

    The third parameter is an optional suffix added to the string. By default it adds an ellipsis.

    From cb36e34719bf60904bc7fa39dfbcb0fa86310e66 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 31 Aug 2008 14:24:56 +0000 Subject: [PATCH 1318/2544] grammar changes --- system/libraries/URI.php | 2 +- system/libraries/Unit_test.php | 2 +- user_guide/changelog.html | 6 +++--- user_guide/database/queries.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/libraries/input.html | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/system/libraries/URI.php b/system/libraries/URI.php index c3dfef1d..668b1ee0 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -237,7 +237,7 @@ function _explode_segments() * Re-index Segments * * This function re-indexes the $this->segment array so that it - * starts at 1 rather then 0. Doing so makes it simpler to + * starts at 1 rather than 0. Doing so makes it simpler to * use functions like $this->uri->segment(n) since there is * a 1:1 relationship between the segment array and the actual segments. * diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php index e53e04c1..de2ab730 100644 --- a/system/libraries/Unit_test.php +++ b/system/libraries/Unit_test.php @@ -150,7 +150,7 @@ function report($result = array()) /** * Use strict comparison * - * Causes the evaluation to use === rather then == + * Causes the evaluation to use === rather than == * * @access public * @param bool diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5e9fc88c..50a3bc78 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,7 +69,7 @@

    Version 1.7

  • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
  • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
  • Added the ability to assign library objects to your own variable names when you use this->load->library(). Please see the Loader class for more info.
    • -
  • Changed the output of the profiler to use style attribute rather then clear, and added the id "codeigniter_profiler" to the container div
    • +
  • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div
  • Helpers @@ -96,7 +96,7 @@

    Version 1.7

    Bug fixes for 1.7.0

    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • -
    • Fixed assorted user guide typos or examples (#4840, #4862, #4864, #4899, #4930, #5006, #5071).
      • +
    • Fixed assorted user guide typos or examples (#4807, #4840, #4862, #4864, #4899, #4930, #5006, #5071).
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • @@ -545,7 +545,7 @@

      Version 1.5.2

      • Added subversion information to the downloads page.
      • Added support for captions in the Table Library
        • -
      • Fixed a bug in the download_helper that was causing Internet Explorer to load rather then download
        • +
      • Fixed a bug in the download_helper that was causing Internet Explorer to load rather than download
      • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
      • Removed unescaped variables in error messages of Input and Router classes
      • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
        • diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index eb4d13e9..1411e65d 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -98,7 +98,7 @@

        Escaping Queries

        $sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";
      • $this->db->escape_str() This function escapes the data passed to it, regardless of type. -Most of the time you'll use the above function rather then this one. Use the function like this: +Most of the time you'll use the above function rather than this one. Use the function like this: $sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')";
        • diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 7ff23ee6..8652aad1 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -62,7 +62,7 @@

        Transactions

        CodeIgniter's database abstraction allows you to use transactions with databases that support transaction-safe table types. In MySQL, you'll need -to be running InnoDB or BDB table types rather then the more common MyISAM. Most other database platforms support transactions natively.

        +to be running InnoDB or BDB table types rather than the more common MyISAM. Most other database platforms support transactions natively.

        If you are not familiar with transactions we recommend you find a good online resource to learn about them for your particular database. The information below assumes you diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 331161a4..80c8ab0d 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -130,7 +130,7 @@

        Regular Expressions

        If you prefer you can use regular expressions to define your routing rules. Any valid regular expression is allowed, as are back-references.

        -

        Note:  If you use back-references you must use the dollar syntax rather then the double backslash syntax.

        +

        Note:  If you use back-references you must use the dollar syntax rather than the double backslash syntax.

        A typical RegEx route might look something like this:

        diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index eae3a4d1..ad73dffb 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -120,7 +120,7 @@

        $this->input->xss_clean()

        Using POST, COOKIE, or SERVER Data

        CodeIgniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided -functions rather then fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and +functions rather than fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first. In other words, normally you might do something like this:

        From 0134ca4d6be32009c7fb7d40cfdbd31e19b970c3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 31 Aug 2008 14:31:08 +0000 Subject: [PATCH 1319/2544] fixed incorrect example SQL output example --- user_guide/changelog.html | 2 +- user_guide/database/active_record.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 50a3bc78..a54548ed 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -96,7 +96,7 @@

        Version 1.7

        Bug fixes for 1.7.0

        • Fixed bug in xss_clean() that could remove some desirable tag attributes.
          • -
        • Fixed assorted user guide typos or examples (#4807, #4840, #4862, #4864, #4899, #4930, #5006, #5071).
          • +
        • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071).
        • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
        • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
        • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
          • diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 3a40dc2c..04e81d8c 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -228,7 +228,7 @@

          $this->db->where();

          $this->db->where('name', $name);
          $this->db->where('title', $title);
          $this->db->where('status', $status); -

          // WHERE = name 'Joe' AND title = 'boss' AND status = 'active'           +

          // WHERE name 'Joe' AND title = 'boss' AND status = 'active'
        • Custom key/value method: From e0fc57bffe1220b149b3f4f9ed800c8dd356bd57 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 4 Sep 2008 19:29:17 +0000 Subject: [PATCH 1320/2544] removed random invisible character (ASCII 194) from HTML and PHP files --- system/libraries/Input.php | 6 ++--- user_guide/database/active_record.html | 2 +- user_guide/general/common_functions.html | 4 +-- user_guide/helpers/path_helper.html | 6 ++--- user_guide/installation/upgrade_160.html | 4 +-- user_guide/libraries/xmlrpc.html | 32 ++++++++++++------------ 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 2682ce31..8d68f699 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -489,14 +489,14 @@ function filename_security($str) * XSS Clean * * Sanitizes data so that Cross Site Scripting Hacks can be - * prevented.  This function does a fair amount of work but + * prevented. This function does a fair amount of work but * it is extremely thorough, designed to prevent even the - * most obscure XSS attempts.  Nothing is ever 100% foolproof, + * most obscure XSS attempts. Nothing is ever 100% foolproof, * of course, but I haven't been able to get anything passed * the filter. * * Note: This function should only be used to deal with data - * upon submission.  It's not something that should + * upon submission. It's not something that should * be used for general runtime processing. * * This function was based in part on some code and ideas I diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 04e81d8c..77a168fd 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -699,7 +699,7 @@

           Method Chaining

           Active Record Caching

          While not "true" caching, Active Record enables you to save (or "cache") certain parts of your queries for reuse later. Normally, when an Active Record call is completed, all stored information is reset for the next call. With caching, you can prevent this reset, and reuse information easily.

          -

          Cached calls are cumulative.  If you make 2 cached select() calls, and then 2 uncached select() calls, this will result in 4 select() calls. There are three Caching functions available:

          +

          Cached calls are cumulative. If you make 2 cached select() calls, and then 2 uncached select() calls, this will result in 4 select() calls. There are three Caching functions available:

          $this->db->start_cache()

          This function must be called to begin caching. All Active Record queries of the correct type (see below for supported queries) are stored for later use.

          $this->db->stop_cache()

          diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 65058b9e..432ba02c 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -62,11 +62,11 @@

          is_really_writable('path/to/file')

          is_writable() returns TRUE on Windows servers when you really can't write to the file as the OS reports to PHP as FALSE only if the read-only attribute is marked. This function determines if a file is actually writable by attempting to write to it first. Generally only recommended on platforms where this information may be unreliable.

          if (is_really_writable('file.txt'))
          {
          -      echo "I could write to this if I wanted to";
          +    echo "I could write to this if I wanted to";
          }
          else
          {
          -      echo "File is not writable";
          +    echo "File is not writable";
          }

          config_item('item_key')

          The Config library is the preferred way of accessing configuration information, however config_item() can be used to retrieve single keys. See Config library documentation for more information.

          diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 42f4713d..78815a25 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -73,14 +73,14 @@

          set_realpath()

          Checks to see if the path exists. This function will return a server path without symbolic links or relative directory structures. An optional second argument will cause an error to be triggered if the path cannot be resolved.

          $directory = './../../etc/passwd';
          -echo set_realpath($directory);
          +echo set_realpath($directory);
          // returns "/etc/passwd"

          $non_existent_directory = './../../path/not/found';
          -echo set_realpath($non_existent_directory, TRUE);
          +echo set_realpath($non_existent_directory, TRUE);
          // returns "/path/not/found"

          -echo set_realpath($non_existent_directory, FALSE);
          +echo set_realpath($non_existent_directory, FALSE);
          // returns an error, as the path could not be resolved

           

    • diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index a62ae57a..f9b4c3b9 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -84,11 +84,11 @@

    Step 3: Add $autoload['model']

    Add the following to system/application/autoload.php

    /*
    | -------------------------------------------------------------------
    - |  Auto-load Model files
    + | Auto-load Model files
    | -------------------------------------------------------------------
    | Prototype:
    |
    - |    $autoload['model'] = array('my_model');
    + | $autoload['model'] = array('my_model');
    |
    */

    diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 7e57b551..9c1b7145 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -403,22 +403,22 @@

    Using Associative Arrays In a Request Parameter

    If you wish to use an associative array in your method parameters you will need to use a struct datatype:

    $request = array(
    -                  array(
    -                        // Param 0
    -                        array(
    -                              'name'=>'John'
    -                              ),
    -                              'struct'
    -                        ),
    -                        array(
    -                              // Param 1
    -                              array(
    -                                    'size'=>'large',
    -                                    'shape'=>'round'
    -                                    ),
    -                              'struct'
    -                        )
    -                  );
    +                  array(
    +                        // Param 0
    +                        array(
    +                              'name'=>'John'
    +                              ),
    +                              'struct'
    +                        ),
    +                        array(
    +                              // Param 1
    +                              array(
    +                                    'size'=>'large',
    +                                    'shape'=>'round'
    +                                    ),
    +                              'struct'
    +                        )
    +                  );
    $this->xmlrpc->request($request);

    You can retrieve the associative array when processing the request in the Server.

    From 088e42cbb9835b44aa0c55c858dadd58e1361c2a Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 4 Sep 2008 22:15:04 +0000 Subject: [PATCH 1321/2544] removed superfluous "the" --- user_guide/libraries/pagination.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 3e50084c..452a4d21 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -100,7 +100,7 @@

    Notes:

    Setting preferences in a config file

    If you prefer not to set preferences using the above method, you can instead put them into a config file. -Simply create a new file called the pagination.php, add the $config +Simply create a new file called pagination.php, add the $config array in that file. Then save the file in: config/pagination.php and it will be used automatically. You will NOT need to use the $this->pagination->initialize function if you save your preferences in a config file.

    From 1e50dca196e2fcadaf730b2b4e33d12fdc8e8d63 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 9 Sep 2008 20:28:57 +0000 Subject: [PATCH 1322/2544] --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a54548ed..0f2d3ccc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -68,7 +68,7 @@

    Version 1.7

  • Added a new Form Validation Class. It simplifies setting rules and field names, supports arrays as field names, allows groups of validation rules to be saved in a config file, and adds some helper functions for use in view files. Please note that the old Validation class is now deprecated. We will leave it in the library folder for some time so that existing applications that use it will not break, but you are encouraged to migrate to the new version.
  • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
  • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
    • -
  • Added the ability to assign library objects to your own variable names when you use this->load->library(). Please see the Loader class for more info.
    • +
  • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
  • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div
    • From f06446e2d3d9def2e176260f68ce051c62ef7f87 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 9 Sep 2008 20:36:27 +0000 Subject: [PATCH 1323/2544] --- user_guide/general/styleguide.html | 57 ++++++------------------------ 1 file changed, 11 insertions(+), 46 deletions(-) diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 9d49a9d0..e3c41371 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -80,7 +80,6 @@

    Table of Contents

  • Debugging Code
  • Whitespace in Files
  • Compatibility
    • -
  • Use of $SESS->cache
  • Class and File Names using Common Words
  • Database Table Names
  • One File per Class
    • @@ -348,41 +347,7 @@

    Compatibility

    Unless specifically mentioned in your add-on's documentation, all code must be compatible with PHP version 4.3+. Additionally, do not use PHP functions that require non-default libraries to be installed unless your code contains an alternative method when the function is not available, or you implicitly document that your add-on requires said PHP libraries.

    - - -

    Use of $SESS->cache

    -
    -

    $SESS->cache is an array provided for you to use for "flash" content, i.e. values that you would like to persist during a page load, helping you eliminate redundant queries and PHP processing. To avoid conflicts with other first and third-party use of this array, always access it as a multi-dimensional array, using your class name as the primary array name, and your variables within. Naming conventions should follow that of other variables: lowercase letters, underscores for separators between words, and meaningful names.

    - -INCORRECT: -$SESS->cache['admins'] -$SESS->cache['Super_class']['admins'] - -CORRECT: -$SESS->cache['super_class']['admins'] - -

    Here is an example of how one might utilize the $SESS->cache array. This way, no matter how many times this method is called on a given page load (for instance, a tag being used twice on a template, or within a tag that might loop, such as a plugin within the Weblog entries tag), the query and loading of the array occurs only once.

    - -if ( ! isset($SESS->cache['super_class']['admins'])) -{ - $query = $DB->query("SELECT member_id FROM exp_super_class_admins"); - - if ($query->num_rows > 0) - { - foreach ($query->result as $row) - { - $SESS->cache['super_class']['admins'][] = $row['member_id']; - } - } -} - -// set a local variable from the cached global so it's easy to use in the code -$admins = $SESS->cache['super_class']['admins']; - -

    You can see an example of real-world usage of $SESS->cache in the Weblog module's fetch_custom_weblog_fields() and next_prev_entry() methods, and the IP to Nation module's get_country() method.

    -
    -

    Class and File Names using Common Words

    @@ -506,7 +471,7 @@

    Bracket and Parenthetic Spacing

    $arr[ $foo ] = 'foo'; CORRECT: -$arr[$foo] = 'foo'; // no spaces around array keys +$arr[$foo] = 'foo'; // no spaces around array keys INCORRECT: @@ -516,17 +481,17 @@

    Bracket and Parenthetic Spacing

    } CORRECT: -function foo($bar) // no spaces around parenthesis in function declarations +function foo($bar) // no spaces around parenthesis in function declarations { } INCORRECT: -foreach( $query->result as $row ) +foreach( $query->result() as $row ) CORRECT: -foreach ($query->result as $row) // single space following PHP control structures, but not in interior parenthesis +foreach ($query->result() as $row) // single space following PHP control structures, but not in interior parenthesis
    @@ -632,16 +597,16 @@

    SQL Queries

    INCORRECT: // keywords are lowercase and query is too long for // a single line (... indicates continuation of line) -$query = $DB->query("select foo, bar, baz, foofoo, foobar as raboof, foobaz from exp_pre_email_addresses +$query = $this->db->query("select foo, bar, baz, foofoo, foobar as raboof, foobaz from exp_pre_email_addresses ...where foo != 'oof' and baz != 'zab' order by foobaz limit 5, 100"); CORRECT: -$query = $DB->query("SELECT foo, bar, baz, foofoo, foobar AS raboof, foobaz - FROM exp_pre_email_addresses - WHERE foo != 'oof' - AND baz != 'zab' - ORDER BY foobaz - LIMIT 5, 100"); +$query = $this->db->query("SELECT foo, bar, baz, foofoo, foobar AS raboof, foobaz + FROM exp_pre_email_addresses + WHERE foo != 'oof' + AND baz != 'zab' + ORDER BY foobaz + LIMIT 5, 100");
    From 1b9ff10a6cfff72a69ebae1135987fd519b3335a Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 9 Sep 2008 20:38:33 +0000 Subject: [PATCH 1324/2544] Removed quick reference from table of contents, as it's from version 1.3. Much has changed since then. --- user_guide/nav/nav.js | 1 - 1 file changed, 1 deletion(-) diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index ffcb4d15..99cc954b 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -128,7 +128,6 @@ function create_menu(basepath) '

    Additional Resources

    ' + '' + From 80228e3ac50d804b67f6664ecbcd73dd58452bc5 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 9 Sep 2008 20:38:55 +0000 Subject: [PATCH 1325/2544] Removed quick reference from table of contents, as it's from version 1.3. Much has changed since then. --- user_guide/toc.html | 1 - 1 file changed, 1 deletion(-) diff --git a/user_guide/toc.html b/user_guide/toc.html index 9714ad89..5e2637ee 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -183,7 +183,6 @@

    Helper Reference

    Additional Resources

    From 9056b564b6c02e8e5246d94685e84d333641a009 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 9 Sep 2008 20:42:33 +0000 Subject: [PATCH 1326/2544] Allowed empty rules to be set, and fixed a bug that allows blank error messages to output the delimiters. --- system/libraries/Form_validation.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index b658011b..e8ba4e0d 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -96,8 +96,8 @@ function set_rules($field, $label = '', $rules = '') return; } - // No rules or fields? Nothing to do... - if ( ! is_string($field) OR ! is_string($rules) OR $field == '' OR $rules == '') + // No fields? Nothing to do... + if ( ! is_string($field) OR ! is_string($rules) OR $field == '') { return; } @@ -197,7 +197,7 @@ function set_error_delimiters($prefix = '

    ', $suffix = '

    ') */ function error($field = '', $prefix = '', $suffix = '') { - if ( ! isset($this->_field_data[$field]['error'])) + if ( ! isset($this->_field_data[$field]['error']) OR $this->_field_data[$field]['error'] == '') { return ''; } @@ -249,7 +249,10 @@ function error_string($prefix = '', $suffix = '') $str = ''; foreach ($this->_error_array as $val) { - $str .= $prefix.$val.$suffix."\n"; + if ($val != '') + { + $str .= $prefix.$val.$suffix."\n"; + } } return $str; From f5c7a6f44a46ab979dbf4e0b7eb336e32f26f93d Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 10 Sep 2008 22:12:51 +0000 Subject: [PATCH 1327/2544] Did some reorganizing --- user_guide/general/controllers.html | 4 +- user_guide/general/index.html | 94 -------------------------- user_guide/general/reserved_names.html | 4 +- user_guide/general/urls.html | 4 +- user_guide/general/views.html | 2 +- user_guide/nav/nav.js | 4 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/toc.html | 4 +- 8 files changed, 11 insertions(+), 107 deletions(-) delete mode 100644 user_guide/general/index.html diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 3b660d27..cb7f80ea 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -373,11 +373,11 @@

    That's it!

    diff --git a/user_guide/general/index.html b/user_guide/general/index.html deleted file mode 100644 index f271b12b..00000000 --- a/user_guide/general/index.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - - -Getting Started With CodeIgniter : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Getting Started With CodeIgniter

    - -

    Any software application requires some effort to learn. We've done our best to minimize the learning -curve while making the process as enjoyable as possible. -

    - -

    The first step is to install CodeIgniter, then read -all the topics in the Introduction section of the Table of Contents.

    - -

    Next, read each of the General Topics pages in order. -Each topic builds on the previous one, and includes code examples that you are encouraged to try.

    - -

    Once you understand the basics you'll be ready to explore the Class Reference and -Helper Reference pages to learn to utilize the native libraries and helper files.

    - -

    Feel free to take advantage of our Community Forums -if you have questions or problems, and -our Wiki to see code examples posted by other users.

    - - -
    - - - - - - - \ No newline at end of file diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 39e1a9f1..10c44747 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -143,11 +143,11 @@

    Constants

    diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index e0b130e4..36e19d6c 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -141,11 +141,9 @@

    Enabling Query Strings

    diff --git a/user_guide/general/views.html b/user_guide/general/views.html index a5ffa08b..e422c7eb 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -253,7 +253,7 @@

    Creating Loops

    From 277451a42c8fac9c4dfc8f4d4c54e0e7a19e0dc1 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 20 Sep 2008 03:42:20 +0000 Subject: [PATCH 1357/2544] Added the ability to set translatable field names --- system/libraries/Form_validation.php | 34 +++++++++++++++++++---- user_guide/libraries/form_validation.html | 25 ++++++++++++++++- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index c2749a0c..1ba98bef 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -504,11 +504,11 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) } else { - $line = $this->_error_messages['isset']; + $line = $this->_translate_fieldname('isset'); } // Build the error message - $message = sprintf($line, $row['label']); + $message = sprintf($line, $this->_translate_fieldname($row['label'])); // Save the error message $this->_field_data[$row['field']]['error'] = $message; @@ -646,11 +646,11 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) } else { - $line = $this->_error_messages[$rule]; + $line = $this->_translate_fieldname($rule); } // Build the error message - $message = sprintf($line, $row['label'], $param); + $message = sprintf($line, $this->_translate_fieldname($row['label']), $param); // Save the error message $this->_field_data[$row['field']]['error'] = $message; @@ -663,7 +663,31 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) return; } } - } + } + + // -------------------------------------------------------------------- + + /** + * Translate a field name + * + * @access private + * @param string the field name + * @return string + */ + function _translate_fieldname($fieldname) + { + // Do we need to translate the field name? + // We look for the prefix lang: to determine this + if (substr($fieldname, 0, 5) == 'lang:') + { + $label = $this->CI->lang->line(substr($fieldname, 5)); + + // Were we able to translate the field name? + $fieldname = ($label === FALSE) ? substr($fieldname, 5) : $label; + } + + return $fieldname; + } // -------------------------------------------------------------------- diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index cd5bc2a8..f7fede67 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -77,6 +77,7 @@

    Form Validation

  • Callbacks
  • Setting Error Messages
  • Changing the Error Delimiters
    • +
  • Translating Field Names
  • Showing Errors Individually
  • Saving Sets of Validation Rules to a Config File
  • Using Arrays as Field Names
    • @@ -296,7 +297,7 @@

    Setting Validation Rules

    1. The field name - the exact name you've given the form field.
      2. -
    2. A "human" name for this field, which will be inserted into the error message. For example, if your field is named "user" you might give it a human name of "Username".
      3. +
    3. A "human" name for this field, which will be inserted into the error message. For example, if your field is named "user" you might give it a human name of "Username". Note: If you would like the field name to be stored in a language file, please see Translating Field Names.
    4. The validation rules for this form field.
    @@ -590,6 +591,28 @@

    Setting Error Messages

    + +

    Translating Field Names

    + +

    If you would like to store the "human" name you passed to the set_rules() function in a language file, and therefore make the name able to be translated, here's how:

    + +

    First, prefix your "human" name with lang:, as in this example:

    + + +$this->form_validation->set_rules('first_name', 'lang:first_name', 'required');
    +     + +

    Then, store the name in one of your language file arrays (without the prefix):

    + +$lang['first_name'] = 'First Name'; + +

    Note: If you store your array item in a language file that is not loaded automatically by CI, you'll need to remember to load it in your controller using:

    + +$this->lang->load('file_name'); + +

    See the Language Class page for more info regarding language files.

    + +

    Changing the Error Delimiters

    From 32f84f1a60a8db1d923f28c3a6afc54fa11edb6f Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 20 Sep 2008 04:21:27 +0000 Subject: [PATCH 1358/2544] Removed the strict param from in_array in some of the tests as this was causing problems --- system/libraries/Form_validation.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 1ba98bef..fe750277 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -740,7 +740,7 @@ function set_select($field = '', $value = '', $default = FALSE) if (is_array($field)) { - if ( ! in_array($value, $field, TRUE)) + if ( ! in_array($value, $field)) { return ''; } @@ -784,7 +784,7 @@ function set_radio($field = '', $value = '', $default = FALSE) if (is_array($field)) { - if ( ! in_array($value, $field, TRUE)) + if ( ! in_array($value, $field)) { return ''; } @@ -828,7 +828,7 @@ function set_checkbox($field = '', $value = '', $default = FALSE) if (is_array($field)) { - if ( ! in_array($value, $field, TRUE)) + if ( ! in_array($value, $field)) { return ''; } From 7129d4565a0a4e7b4899deb0aee1fb1d683a7bed Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 20 Sep 2008 04:22:25 +0000 Subject: [PATCH 1359/2544] Removed the strict param from in_array() as this was causing some trouble with numeric field names --- system/helpers/form_helper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 9bec8116..81331cda 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -640,7 +640,7 @@ function set_select($field = '', $value = '', $default = FALSE) if (is_array($field)) { - if ( ! in_array($value, $field, TRUE)) + if ( ! in_array($value, $field)) { return ''; } @@ -681,7 +681,7 @@ function set_checkbox($field = '', $value = '', $default = FALSE) $OBJ =& _get_validation_object(); if ($OBJ === FALSE) - { + { if ( ! isset($_POST[$field])) { if (count($_POST) === 0) @@ -695,7 +695,7 @@ function set_checkbox($field = '', $value = '', $default = FALSE) if (is_array($field)) { - if ( ! in_array($value, $field, TRUE)) + if ( ! in_array($value, $field)) { return ''; } @@ -750,7 +750,7 @@ function set_radio($field = '', $value = '', $default = FALSE) if (is_array($field)) { - if ( ! in_array($value, $field, TRUE)) + if ( ! in_array($value, $field)) { return ''; } From 53b70e19ae8685a95a5d6b7651746279d350407e Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 20 Sep 2008 04:48:14 +0000 Subject: [PATCH 1360/2544] Added the ability to use callbacks even when a field has no data --- system/libraries/Form_validation.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index fe750277..6ef11e34 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -479,19 +479,29 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) return; } - + // -------------------------------------------------------------------- // If the field is blank, but NOT required, no further tests are necessary - if ( ! in_array('required', $rules, TRUE) AND is_null($postdata)) + $callback = FALSE; + if ( ! in_array('required', $rules) AND is_null($postdata)) { - return; + // Before we bail out, does the rule contain a callback? + if (preg_match("/(callback_\w+)/", implode(' ', $rules), $match)) + { + $callback = TRUE; + $rules = (array('1' => $match[1])); + } + else + { + return; + } } // -------------------------------------------------------------------- // Isset Test. Typically this rule will only apply to checkboxes. - if (is_null($postdata)) + if (is_null($postdata) AND $callback == FALSE) { if (in_array('isset', $rules, TRUE) OR in_array('required', $rules)) { From 3204f1f9c5dc0fe687e824fa4ff1816484b8a18f Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 21 Sep 2008 19:06:53 +0000 Subject: [PATCH 1361/2544] removed a call to the validation class, as it's overkill for a simple preg_match --- system/libraries/Encrypt.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 6d0735a0..aabf90d0 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -141,9 +141,7 @@ function decode($string, $key = '') { $key = $this->get_key($key); - $this->CI->load->library('validation'); - - if ($this->CI->validation->valid_base64($string) === FALSE) + if ( ! preg_match('/[^a-zA-Z0-9\/\+=]/', $string)) { return FALSE; } From d81eb9513bd983351024f1719455a32c5328bfb0 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 21 Sep 2008 19:33:43 +0000 Subject: [PATCH 1362/2544] Added line of text for new profiler block --- system/language/english/profiler_lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php index e60304bb..ea6e4144 100644 --- a/system/language/english/profiler_lang.php +++ b/system/language/english/profiler_lang.php @@ -1,5 +1,6 @@ Date: Sun, 21 Sep 2008 19:34:01 +0000 Subject: [PATCH 1363/2544] Added controller class/method info to profiler --- system/libraries/Profiler.php | 43 +++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 94eef39a..55ad1e3c 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008, EllisLab, Inc. + * @copyright Copyright (c) 2006, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 @@ -230,7 +230,6 @@ function _compile_post() $key = "'".$key."'"; } -// $output .= "$_POST[".$key."]  ".htmlspecialchars(stripslashes($val))."\n"; $output .= "$_POST[".$key."]   "; if (is_array($val)) { @@ -282,6 +281,29 @@ function _compile_uri_string() // -------------------------------------------------------------------- + /** + * Show the controller and function that were called + * + * @access private + * @return string + */ + function _compile_controller_info() + { + $output = "\n\n"; + $output .= '
    '; + $output .= "\n"; + $output .= '  '.$this->CI->lang->line('profiler_controller_info').'  '; + $output .= "\n"; + + $output .= "
    ".$this->CI->router->fetch_class()."/".$this->CI->router->fetch_method()."
    "; + + + $output .= "
    "; + + return $output; + } + // -------------------------------------------------------------------- + /** * Compile memory usage * @@ -293,18 +315,18 @@ function _compile_uri_string() function _compile_memory_usage() { $output = "\n\n"; - $output .= '
    '; + $output .= '
    '; $output .= "\n"; - $output .= '  '.$this->CI->lang->line('profiler_memory_usage').'  '; + $output .= '  '.$this->CI->lang->line('profiler_memory_usage').'  '; $output .= "\n"; if (function_exists('memory_get_usage') && ($usage = memory_get_usage()) != '') { - $output .= "
    ".number_format($usage).' bytes
    '; + $output .= "
    ".number_format($usage).' bytes
    '; } else { - $output .= "
    ".$this->CI->lang->line('profiler_no_memory_usage')."
    "; + $output .= "
    ".$this->CI->lang->line('profiler_no_memory_usage')."
    "; } $output .= "
    "; @@ -322,12 +344,13 @@ function _compile_memory_usage() */ function run() { - $output = '
    '; - $output .= "
    "; - + $output = '
    '; + $output .= "
    "; + + $output .= $this->_compile_uri_string(); + $output .= $this->_compile_controller_info(); $output .= $this->_compile_memory_usage(); $output .= $this->_compile_benchmarks(); - $output .= $this->_compile_uri_string(); $output .= $this->_compile_get(); $output .= $this->_compile_post(); $output .= $this->_compile_queries(); From beecd3221a5adb3f24fe7f06c0607091f75d0a5a Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sun, 21 Sep 2008 19:36:30 +0000 Subject: [PATCH 1364/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3e9eb74f..9cae52f6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,6 +69,7 @@

    Version 1.7

  • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
  • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
  • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
    • +
  • Added controller class/method info to Profiler class.
  • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
  • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div
    • From aef13d9f7b6bd118cbf26cf27d98b18587572e2f Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 22 Sep 2008 13:31:05 +0000 Subject: [PATCH 1365/2544] fix up file path reference in comment --- system/language/english/form_validation_lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php index 2d5e5048..c157fe4e 100644 --- a/system/language/english/form_validation_lang.php +++ b/system/language/english/form_validation_lang.php @@ -20,5 +20,5 @@ $lang['is_natural_no_zero'] = "The %s field must contain a number greater than zero."; -/* End of file validation_lang.php */ -/* Location: ./system/language/english/validation_lang.php */ \ No newline at end of file +/* End of file form_validation_lang.php */ +/* Location: ./system/language/english/form_validation_lang.php */ \ No newline at end of file From 968b6160fc214219e9f15fe8e47acbe066f41a35 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 22 Sep 2008 13:49:46 +0000 Subject: [PATCH 1366/2544] typos, html validation --- user_guide/libraries/form_validation.html | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index f7fede67..04074bfb 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -293,7 +293,7 @@

    Setting Validation Rules

    $this->form_validation->set_rules(); -

    The above function takes three parameters as input:

    +

    The above function takes three parameters as input:

    1. The field name - the exact name you've given the form field.
      2. @@ -625,19 +625,19 @@

      Changing the Error Delimiters

      To globally change the error delimiters, in your controller function, just after loading the Form Validation class, add this:

      -<?php echo $this->form_validation->set_error_delimiters('<div class="error">', '</div>'); +$this->form_validation->set_error_delimiters('<div class="error">', '</div>');

      In this example, we've switched to using div tags.

      -
    2. Changing delimiters Individually

      +
    3. Changing delimiters Individually

      Each of the two error generating functions shown in this tutorial can be supplied their own delimiters as follows:

      <?php echo form_error('field name', '<div class="error">', '</div>'); ?> -

      Or:

      +

      Or:

      <?php echo validation_errors('<div class="error">', '</div>'); ?> @@ -826,7 +826,7 @@

      Associating a Controller Function with a Rule Group

      }
      ?> -

      In your validation config file, you will name your rule group member/signup: +

      In your validation config file, you will name your rule group member/signup:

      $config = array(
      @@ -1202,12 +1202,6 @@

      set_radio()

      - - - - - -
    From 39f6f5a7eafe05b6388833149c23cad809de53f6 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 22 Sep 2008 16:06:06 +0000 Subject: [PATCH 1367/2544] minor whitespace cleanup --- system/helpers/form_helper.php | 237 +++++++++++++++++---------------- 1 file changed, 119 insertions(+), 118 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 81331cda..fc259224 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -61,11 +61,11 @@ function form_open($action = '', $attributes = '', $hidden = array()) { $form .= form_hidden($hidden); } - + return $form; } } - + // ------------------------------------------------------------------------ /** @@ -78,7 +78,7 @@ function form_open($action = '', $attributes = '', $hidden = array()) * @param array a key/value pair of attributes * @param array a key/value pair hidden data * @return string - */ + */ if ( ! function_exists('form_open_multipart')) { function form_open_multipart($action, $attributes = array(), $hidden = array()) @@ -87,7 +87,7 @@ function form_open_multipart($action, $attributes = array(), $hidden = array()) return form_open($action, $attributes, $hidden); } } - + // ------------------------------------------------------------------------ /** @@ -100,7 +100,7 @@ function form_open_multipart($action, $attributes = array(), $hidden = array()) * @param mixed * @param string * @return string - */ + */ if ( ! function_exists('form_hidden')) { function form_hidden($name, $value = '') @@ -111,17 +111,17 @@ function form_hidden($name, $value = '') } $form = ''; - + foreach ($name as $name => $value) { $form .= "\n"; $form .= ''; } - + return $form; } } - + // ------------------------------------------------------------------------ /** @@ -132,7 +132,7 @@ function form_hidden($name, $value = '') * @param string * @param string * @return string - */ + */ if ( ! function_exists('form_input')) { function form_input($data = '', $value = '', $extra = '') @@ -142,7 +142,7 @@ function form_input($data = '', $value = '', $extra = '') return ""; } } - + // ------------------------------------------------------------------------ /** @@ -155,7 +155,7 @@ function form_input($data = '', $value = '', $extra = '') * @param string * @param string * @return string - */ + */ if ( ! function_exists('form_password')) { function form_password($data = '', $value = '', $extra = '') @@ -169,7 +169,7 @@ function form_password($data = '', $value = '', $extra = '') return form_input($data, $value, $extra); } } - + // ------------------------------------------------------------------------ /** @@ -182,7 +182,7 @@ function form_password($data = '', $value = '', $extra = '') * @param string * @param string * @return string - */ + */ if ( ! function_exists('form_upload')) { function form_upload($data = '', $value = '', $extra = '') @@ -196,7 +196,7 @@ function form_upload($data = '', $value = '', $extra = '') return form_input($data, $value, $extra); } } - + // ------------------------------------------------------------------------ /** @@ -207,13 +207,13 @@ function form_upload($data = '', $value = '', $extra = '') * @param string * @param string * @return string - */ + */ if ( ! function_exists('form_textarea')) { function form_textarea($data = '', $value = '', $extra = '') { $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); - + if ( ! is_array($data) OR ! isset($data['value'])) { $val = $value; @@ -223,11 +223,11 @@ function form_textarea($data = '', $value = '', $extra = '') $val = $data['value']; unset($data['value']); // textareas don't use the value attribute } - + return ""; } } - + // ------------------------------------------------------------------------ /** @@ -239,7 +239,7 @@ function form_textarea($data = '', $value = '', $extra = '') * @param string * @param string * @return string - */ + */ if ( ! function_exists('form_dropdown')) { function form_dropdown($name = '', $options = array(), $selected = array(), $extra = '') @@ -248,7 +248,7 @@ function form_dropdown($name = '', $options = array(), $selected = array(), $ext { $selected = array($selected); } - + // If no selected state was submitted we will attempt to set it automatically if (count($selected) === 0) { @@ -269,18 +269,18 @@ function form_dropdown($name = '', $options = array(), $selected = array(), $ext { $key = (string) $key; $val = (string) $val; - + $sel = (in_array($key, $selected))?' selected="selected"':''; - + $form .= '\n"; } $form .= ''; - + return $form; } } - + // ------------------------------------------------------------------------ /** @@ -292,17 +292,17 @@ function form_dropdown($name = '', $options = array(), $selected = array(), $ext * @param bool * @param string * @return string - */ + */ if ( ! function_exists('form_checkbox')) { function form_checkbox($data = '', $value = '', $checked = FALSE, $extra = '') { $defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - + if (is_array($data) AND array_key_exists('checked', $data)) { $checked = $data['checked']; - + if ($checked == FALSE) { unset($data['checked']); @@ -312,7 +312,7 @@ function form_checkbox($data = '', $value = '', $checked = FALSE, $extra = '') $data['checked'] = 'checked'; } } - + if ($checked == TRUE) { $defaults['checked'] = 'checked'; @@ -325,7 +325,7 @@ function form_checkbox($data = '', $value = '', $checked = FALSE, $extra = '') return ""; } } - + // ------------------------------------------------------------------------ /** @@ -337,7 +337,7 @@ function form_checkbox($data = '', $value = '', $checked = FALSE, $extra = '') * @param bool * @param string * @return string - */ + */ if ( ! function_exists('form_radio')) { function form_radio($data = '', $value = '', $checked = FALSE, $extra = '') @@ -351,7 +351,7 @@ function form_radio($data = '', $value = '', $checked = FALSE, $extra = '') return form_checkbox($data, $value, $checked, $extra); } } - + // ------------------------------------------------------------------------ /** @@ -383,7 +383,7 @@ function form_submit($data = '', $value = '', $extra = '') * @param string * @param string * @return string - */ + */ if ( ! function_exists('form_reset')) { function form_reset($data = '', $value = '', $extra = '') @@ -404,19 +404,19 @@ function form_reset($data = '', $value = '', $extra = '') * @param string * @param string * @return string - */ + */ if ( ! function_exists('form_button')) { function form_button($data = '', $content = '', $extra = '') { $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'type' => 'submit'); - + if ( is_array($data) AND isset($data['content'])) { $content = $data['content']; unset($data['content']); // content is not an attribute } - + return ""; } } @@ -431,19 +431,19 @@ function form_button($data = '', $content = '', $extra = '') * @param string The id the label applies to * @param string Additional attributes * @return string - */ + */ if ( ! function_exists('form_label')) { function form_label($label_text = '', $id = '', $attributes = array()) { $label = ' 0) { foreach ($attributes as $key => $val) @@ -469,7 +469,7 @@ function form_label($label_text = '', $id = '', $attributes = array()) * @param string The legend text * @param string Additional attributes * @return string - */ + */ if ( ! function_exists('form_fieldset')) { function form_fieldset($legend_text = '', $attributes = array()) @@ -477,9 +477,9 @@ function form_fieldset($legend_text = '', $attributes = array()) $fieldset = "".$extra; } } - + // ------------------------------------------------------------------------ /** @@ -514,7 +514,7 @@ function form_fieldset_close($extra = '') * @access public * @param string * @return string - */ + */ if ( ! function_exists('form_close')) { function form_close($extra = '') @@ -522,7 +522,7 @@ function form_close($extra = '') return "".$extra; } } - + // ------------------------------------------------------------------------ /** @@ -533,7 +533,7 @@ function form_close($extra = '') * @access public * @param string * @return string - */ + */ if ( ! function_exists('form_prep')) { function form_prep($str = '') @@ -545,17 +545,17 @@ function form_prep($str = '') { $str[$key] = form_prep($val); } - + return $str; } - + if ($str === '') { return ''; } $temp = '__TEMP_AMPERSANDS__'; - + // Replace entities to temporary markers so that // htmlspecialchars won't mess them up $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); @@ -564,13 +564,13 @@ function form_prep($str = '') $str = htmlspecialchars($str); // In case htmlspecialchars misses these. - $str = str_replace(array("'", '"'), array("'", """), $str); - + $str = str_replace(array("'", '"'), array("'", """), $str); + // Decode the temp markers back to entities $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); - $str = preg_replace("/$temp(\w+);/","&\\1;",$str); - - return $str; + $str = preg_replace("/$temp(\w+);/","&\\1;",$str); + + return $str; } } @@ -586,7 +586,7 @@ function form_prep($str = '') * @access public * @param string * @return mixed - */ + */ if ( ! function_exists('set_value')) { function set_value($field = '', $default = '') @@ -597,10 +597,10 @@ function set_value($field = '', $default = '') { return $default; } - + return $_POST[$field]; } - + return $OBJ->set_value($field, $default); } } @@ -618,7 +618,7 @@ function set_value($field = '', $default = '') * @param string * @param bool * @return string - */ + */ if ( ! function_exists('set_select')) { function set_select($field = '', $value = '', $default = FALSE) @@ -635,9 +635,9 @@ function set_select($field = '', $value = '', $default = FALSE) } return ''; } - + $field = $_POST[$field]; - + if (is_array($field)) { if ( ! in_array($value, $field)) @@ -652,10 +652,10 @@ function set_select($field = '', $value = '', $default = FALSE) return ''; } } - + return ' selected="selected"'; } - + return $OBJ->set_select($field, $value, $default); } } @@ -673,7 +673,7 @@ function set_select($field = '', $value = '', $default = FALSE) * @param string * @param bool * @return string - */ + */ if ( ! function_exists('set_checkbox')) { function set_checkbox($field = '', $value = '', $default = FALSE) @@ -690,7 +690,7 @@ function set_checkbox($field = '', $value = '', $default = FALSE) } return ''; } - + $field = $_POST[$field]; if (is_array($field)) @@ -707,10 +707,10 @@ function set_checkbox($field = '', $value = '', $default = FALSE) return ''; } } - + return ' checked="checked"'; } - + return $OBJ->set_checkbox($field, $value, $default); } } @@ -728,7 +728,7 @@ function set_checkbox($field = '', $value = '', $default = FALSE) * @param string * @param bool * @return string - */ + */ if ( ! function_exists('set_radio')) { function set_radio($field = '', $value = '', $default = FALSE) @@ -745,7 +745,7 @@ function set_radio($field = '', $value = '', $default = FALSE) } return ''; } - + $field = $_POST[$field]; if (is_array($field)) @@ -762,10 +762,10 @@ function set_radio($field = '', $value = '', $default = FALSE) return ''; } } - + return ' checked="checked"'; } - + return $OBJ->set_radio($field, $value, $default); } } @@ -783,7 +783,7 @@ function set_radio($field = '', $value = '', $default = FALSE) * @param string * @param string * @return string - */ + */ if ( ! function_exists('form_error')) { function form_error($field = '', $prefix = '', $suffix = '') @@ -792,7 +792,7 @@ function form_error($field = '', $prefix = '', $suffix = '') { return ''; } - + return $OBJ->error($field, $prefix, $suffix); } } @@ -809,7 +809,7 @@ function form_error($field = '', $prefix = '', $suffix = '') * @param string * @param string * @return string - */ + */ if ( ! function_exists('validation_errors')) { function validation_errors($prefix = '', $suffix = '') @@ -818,7 +818,7 @@ function validation_errors($prefix = '', $suffix = '') { return ''; } - + return $OBJ->error_string($prefix, $suffix); } } @@ -834,7 +834,7 @@ function validation_errors($prefix = '', $suffix = '') * @param array * @param array * @return string - */ + */ if ( ! function_exists('_parse_form_attributes')) { function _parse_form_attributes($attributes, $default) @@ -849,21 +849,22 @@ function _parse_form_attributes($attributes, $default) unset($attributes[$key]); } } - + if (count($attributes) > 0) - { + { $default = array_merge($default, $attributes); } } - + $att = ''; + foreach ($default as $key => $val) { if ($key == 'value') { $val = form_prep($val); } - + $att .= $key . '="' . $val . '" '; } @@ -882,43 +883,43 @@ function _parse_form_attributes($attributes, $default) * @param mixed * @param bool * @return string - */ + */ if ( ! function_exists('_attributes_to_string')) { function _attributes_to_string($attributes, $formtag = FALSE) { - if (is_string($attributes) AND strlen($attributes) > 0) - { - if ($formtag == TRUE AND strpos($attributes, 'method=') === FALSE) - { - $attributes .= ' method="post"'; - } - - return ' '.$attributes; - } - - if (is_object($attributes) AND count($attributes) > 0) - { - $attributes = (array)$attributes; - } - - if (is_array($attributes) AND count($attributes) > 0) - { - $atts = ''; - - if ( ! isset($attributes['method']) AND $formtag === TRUE) - { - $atts .= ' method="post"'; - } + if (is_string($attributes) AND strlen($attributes) > 0) + { + if ($formtag == TRUE AND strpos($attributes, 'method=') === FALSE) + { + $attributes .= ' method="post"'; + } + + return ' '.$attributes; + } - foreach ($attributes as $key => $val) - { - $atts .= ' '.$key.'="'.$val.'"'; - } - - return $atts; - } - } + if (is_object($attributes) AND count($attributes) > 0) + { + $attributes = (array)$attributes; + } + + if (is_array($attributes) AND count($attributes) > 0) + { + $atts = ''; + + if ( ! isset($attributes['method']) AND $formtag === TRUE) + { + $atts .= ' method="post"'; + } + + foreach ($attributes as $key => $val) + { + $atts .= ' '.$key.'="'.$val.'"'; + } + + return $atts; + } + } } // ------------------------------------------------------------------------ @@ -931,28 +932,28 @@ function _attributes_to_string($attributes, $formtag = FALSE) * * @access private * @return mixed - */ + */ if ( ! function_exists('_get_validation_object')) -{ +{ function &_get_validation_object() { $CI =& get_instance(); - + // We set this as a variable since we're returning by reference $return = FALSE; - + if ( ! isset($CI->load->_ci_classes) OR ! isset($CI->load->_ci_classes['form_validation'])) { return $return; } - + $object = $CI->load->_ci_classes['form_validation']; - + if ( ! isset($CI->$object) OR ! is_object($CI->$object)) { return $return; } - + return $CI->$object; } } From fe61d63138f4534125e2250cc2f6809613fe9e90 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 22 Sep 2008 21:55:12 +0000 Subject: [PATCH 1368/2544] Fixed a language bug when setting errors manually --- system/libraries/Form_validation.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 6ef11e34..42ce433c 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -690,13 +690,22 @@ function _translate_fieldname($fieldname) // We look for the prefix lang: to determine this if (substr($fieldname, 0, 5) == 'lang:') { - $label = $this->CI->lang->line(substr($fieldname, 5)); + $line = substr($fieldname, 5); + + $fieldname = $this->CI->lang->line($line); // Were we able to translate the field name? - $fieldname = ($label === FALSE) ? substr($fieldname, 5) : $label; + if ($fieldname === FALSE) + { + return $this->CI->lang->line($line); + } + else + { + return $label; + } } - return $fieldname; + return $this->CI->lang->line($fieldname); } // -------------------------------------------------------------------- From 193743a4a65cee93941022896be6791cbadb979a Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 22 Sep 2008 21:55:41 +0000 Subject: [PATCH 1369/2544] Oops... fixed the fix I just fixed... --- system/libraries/Form_validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 42ce433c..427e62f7 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -701,7 +701,7 @@ function _translate_fieldname($fieldname) } else { - return $label; + return $fieldname; } } From 066954088c74cc4eaa1d46a6193b2ed45dcf13ff Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 22 Sep 2008 21:58:10 +0000 Subject: [PATCH 1370/2544] One more tweak... --- system/libraries/Form_validation.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 427e62f7..643aecbc 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -690,14 +690,16 @@ function _translate_fieldname($fieldname) // We look for the prefix lang: to determine this if (substr($fieldname, 0, 5) == 'lang:') { + // Grab the variable $line = substr($fieldname, 5); - + + // Translate it $fieldname = $this->CI->lang->line($line); // Were we able to translate the field name? if ($fieldname === FALSE) { - return $this->CI->lang->line($line); + return $line; } else { From 96fabe576f4caf78d3c3af759d2d03bab64801f9 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 23 Sep 2008 01:18:36 +0000 Subject: [PATCH 1371/2544] Fixed a boneheaded mistake I made... --- system/libraries/Form_validation.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 643aecbc..f0c1500d 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -514,7 +514,7 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) } else { - $line = $this->_translate_fieldname('isset'); + $line = $this->_error_messages[$rule]; } // Build the error message @@ -646,7 +646,7 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) // Did the rule test negatively? If so, grab the error. if ($result === FALSE) - { + { if ( ! isset($this->_error_messages[$rule])) { if (FALSE === ($line = $this->CI->lang->line($rule))) @@ -656,8 +656,8 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) } else { - $line = $this->_translate_fieldname($rule); - } + $line = $this->_error_messages[$rule]; + } // Build the error message $message = sprintf($line, $this->_translate_fieldname($row['label']), $param); @@ -707,7 +707,7 @@ function _translate_fieldname($fieldname) } } - return $this->CI->lang->line($fieldname); + return $fieldname; } // -------------------------------------------------------------------- From 9b8bc35dbaf3aa0f37885122dccb24d1d7811f1e Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 23 Sep 2008 01:21:23 +0000 Subject: [PATCH 1372/2544] --- system/libraries/Form_validation.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index f0c1500d..df57f80f 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -691,20 +691,13 @@ function _translate_fieldname($fieldname) if (substr($fieldname, 0, 5) == 'lang:') { // Grab the variable - $line = substr($fieldname, 5); - - // Translate it - $fieldname = $this->CI->lang->line($line); + $line = substr($fieldname, 5); - // Were we able to translate the field name? - if ($fieldname === FALSE) + // Were we able to translate the field name? If not we use $line + if (FALSE === ($fieldname = $this->CI->lang->line($line))) { return $line; } - else - { - return $fieldname; - } } return $fieldname; From e5ad2c797162091fade9a809ccc4578d835027bd Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 23 Sep 2008 06:01:26 +0000 Subject: [PATCH 1373/2544] change of a false test --- system/libraries/Encrypt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index aabf90d0..16c9efe6 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -141,7 +141,7 @@ function decode($string, $key = '') { $key = $this->get_key($key); - if ( ! preg_match('/[^a-zA-Z0-9\/\+=]/', $string)) + if (preg_match('/[^a-zA-Z0-9\/\+=]/', $string) === FALSE) { return FALSE; } From 0c9e2700ee0950ada00205d60151224505203dd7 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 23 Sep 2008 06:06:21 +0000 Subject: [PATCH 1374/2544] mostly trivial whitespace adjustments --- system/libraries/Encrypt.php | 100 +++++++++++++++++------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 16c9efe6..bd74592d 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -27,14 +27,14 @@ * @link http://codeigniter.com/user_guide/libraries/encryption.html */ class CI_Encrypt { - + var $CI; var $encryption_key = ''; var $_hash_type = 'sha1'; var $_mcrypt_exists = FALSE; var $_mcrypt_cipher; var $_mcrypt_mode; - + /** * Constructor * @@ -47,7 +47,7 @@ function CI_Encrypt() $this->_mcrypt_exists = ( ! function_exists('mcrypt_encrypt')) ? FALSE : TRUE; log_message('debug', "Encrypt Class Initialized"); } - + // -------------------------------------------------------------------- /** @@ -63,12 +63,12 @@ function CI_Encrypt() function get_key($key = '') { if ($key == '') - { + { if ($this->encryption_key != '') { return $this->encryption_key; } - + $CI =& get_instance(); $key = $CI->config->item('encryption_key'); @@ -77,7 +77,7 @@ function get_key($key = '') show_error('In order to use the encryption class requires that you set an encryption key in your config file.'); } } - + return md5($key); } @@ -94,7 +94,7 @@ function set_key($key = '') { $this->encryption_key = $key; } - + // -------------------------------------------------------------------- /** @@ -122,9 +122,9 @@ function encode($string, $key = '') { $enc = $this->mcrypt_encode($enc, $key); } - return base64_encode($enc); + return base64_encode($enc); } - + // -------------------------------------------------------------------- /** @@ -155,10 +155,10 @@ function decode($string, $key = '') return FALSE; } } - + return $this->_xor_decode($dec, $key); } - + // -------------------------------------------------------------------- /** @@ -171,7 +171,7 @@ function decode($string, $key = '') * @param string * @param string * @return string - */ + */ function _xor_encode($string, $key) { $rand = ''; @@ -179,18 +179,18 @@ function _xor_encode($string, $key) { $rand .= mt_rand(0, mt_getrandmax()); } - + $rand = $this->hash($rand); - + $enc = ''; for ($i = 0; $i < strlen($string); $i++) { $enc .= substr($rand, ($i % strlen($rand)), 1).(substr($rand, ($i % strlen($rand)), 1) ^ substr($string, $i, 1)); } - + return $this->_xor_merge($enc, $key); } - + // -------------------------------------------------------------------- /** @@ -203,20 +203,20 @@ function _xor_encode($string, $key) * @param string * @param string * @return string - */ + */ function _xor_decode($string, $key) { $string = $this->_xor_merge($string, $key); - + $dec = ''; for ($i = 0; $i < strlen($string); $i++) { $dec .= (substr($string, $i++, 1) ^ substr($string, $i, 1)); } - + return $dec; } - + // -------------------------------------------------------------------- /** @@ -228,7 +228,7 @@ function _xor_decode($string, $key) * @param string * @param string * @return string - */ + */ function _xor_merge($string, $key) { $hash = $this->hash($key); @@ -237,10 +237,10 @@ function _xor_merge($string, $key) { $str .= substr($string, $i, 1) ^ substr($hash, ($i % strlen($hash)), 1); } - + return $str; } - + // -------------------------------------------------------------------- /** @@ -252,12 +252,12 @@ function _xor_merge($string, $key) * @return string */ function mcrypt_encode($data, $key) - { + { $init_size = mcrypt_get_iv_size($this->_get_cipher(), $this->_get_mode()); $init_vect = mcrypt_create_iv($init_size, MCRYPT_RAND); return $this->_add_cipher_noise($init_vect.mcrypt_encrypt($this->_get_cipher(), $key, $data, $this->_get_mode(), $init_vect), $key); } - + // -------------------------------------------------------------------- /** @@ -267,22 +267,22 @@ function mcrypt_encode($data, $key) * @param string * @param string * @return string - */ + */ function mcrypt_decode($data, $key) { $data = $this->_remove_cipher_noise($data, $key); $init_size = mcrypt_get_iv_size($this->_get_cipher(), $this->_get_mode()); - + if ($init_size > strlen($data)) { return FALSE; } - + $init_vect = substr($data, 0, $init_size); $data = substr($data, $init_size); return rtrim(mcrypt_decrypt($this->_get_cipher(), $key, $data, $this->_get_mode(), $init_vect), "\0"); } - + // -------------------------------------------------------------------- /** @@ -302,22 +302,22 @@ function _add_cipher_noise($data, $key) $keyhash = $this->hash($key); $keylen = strlen($keyhash); $str = ''; - + for ($i = 0, $j = 0, $len = strlen($data); $i < $len; ++$i, ++$j) - { + { if ($j >= $keylen) { $j = 0; } - + $str .= chr((ord($data[$i]) + ord($keyhash[$j])) % 256); } - + return $str; } // -------------------------------------------------------------------- - + /** * Removes permuted noise from the IV + encrypted data, reversing * _add_cipher_noise() @@ -340,9 +340,9 @@ function _remove_cipher_noise($data, $key) { $j = 0; } - + $temp = ord($data[$i]) - ord($keyhash[$j]); - + if ($temp < 0) { $temp = $temp + 256; @@ -350,7 +350,7 @@ function _remove_cipher_noise($data, $key) $str .= chr($temp); } - + return $str; } @@ -367,7 +367,7 @@ function set_cipher($cipher) { $this->_mcrypt_cipher = $cipher; } - + // -------------------------------------------------------------------- /** @@ -381,7 +381,7 @@ function set_mode($mode) { $this->_mcrypt_mode = $mode; } - + // -------------------------------------------------------------------- /** @@ -389,7 +389,7 @@ function set_mode($mode) * * @access private * @return string - */ + */ function _get_cipher() { if ($this->_mcrypt_cipher == '') @@ -407,7 +407,7 @@ function _get_cipher() * * @access private * @return string - */ + */ function _get_mode() { if ($this->_mcrypt_mode == '') @@ -417,7 +417,7 @@ function _get_mode() return $this->_mcrypt_mode; } - + // -------------------------------------------------------------------- /** @@ -426,12 +426,12 @@ function _get_mode() * @access public * @param string * @return string - */ + */ function set_hash($type = 'sha1') { $this->_hash_type = ($type != 'sha1' AND $type != 'md5') ? 'sha1' : $type; } - + // -------------------------------------------------------------------- /** @@ -440,12 +440,12 @@ function set_hash($type = 'sha1') * @access public * @param string * @return string - */ + */ function hash($str) { return ($this->_hash_type == 'sha1') ? $this->sha1($str) : md5($str); } - + // -------------------------------------------------------------------- /** @@ -454,13 +454,13 @@ function hash($str) * @access public * @param string * @return string - */ + */ function sha1($str) { if ( ! function_exists('sha1')) { if ( ! function_exists('mhash')) - { + { require_once(BASEPATH.'libraries/Sha1'.EXT); $SH = new CI_SHA; return $SH->generate($str); @@ -473,9 +473,9 @@ function sha1($str) else { return sha1($str); - } + } } - + } // END CI_Encrypt class From faa6d09ad2347e31189134ab8e4cde7d0e84e81b Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 23 Sep 2008 20:01:33 +0000 Subject: [PATCH 1375/2544] Cleaned up a comment --- system/libraries/Form_validation.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index df57f80f..4bbb6f2d 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -608,13 +608,8 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) { if ( ! method_exists($this, $rule)) { - /* - * Run the native PHP function if called for - * - * If our own wrapper function doesn't exist we see - * if a native PHP function does. Users can use - * any native PHP function call that has one param. - */ + // If our own wrapper function doesn't exist we see if a native PHP function does. + // Users can use any native PHP function call that has one param. if (function_exists($rule)) { $result = $rule($postdata); From 9da2ee9155eb8694f06a125ac1bec166e9071ac8 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 23 Sep 2008 20:39:50 +0000 Subject: [PATCH 1376/2544] Fixed a bug that was adding too many blank paragraph tags under certain conditions --- system/libraries/Typography.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 13b36dd6..76160bfe 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -27,10 +27,10 @@ class CI_Typography { // Block level elements that should not be wrapped inside

    tags - var $block_elements = 'p|div|blockquote|pre|code|h\d|script|ol|ul'; + var $block_elements = 'p|div|blockquote|pre|code|h\d|script|ol|ul|dl|dt|dd'; // Elements that should not have

    and
    tags within them. - var $skip_elements = 'p|pre|ol|ul'; + var $skip_elements = 'p|pre|ol|ul|dl'; // Tags we want the parser to completely ignore when splitting the string. var $ignore_elements = 'a|b|i|em|strong|span|img|li'; @@ -154,7 +154,7 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea '/()

    /' => '$1', // )+#' => '

    ', + '#(

    )+#' => '

    ', '/(

    )+/' => '

    ', // Clean up stray paragraph tags that appear before block level elements @@ -260,11 +260,21 @@ function _format_newlines($str) { return $str; } - - $str = str_replace("\n\n", "

    \n\n

    ", $str); + + // Convert two consecutive newlines to paragraphs + $str = str_replace("\n\n", "

    \n\n

    ", $str); + + // Convert single spaces to
    tags $str = preg_replace("/([^\n])(\n)([^\n])/", "\\1
    \\2\\3", $str); - return '

    '.$str.'

    '; + // Wrap the whole enchilada in enclosing paragraphs + $str = '

    '.$str.'

    '; + + // Remove empty paragraphs if they are on the first line, as this + // is a potential unintended consequence of the previous code + $str = preg_replace("/

    <\/p>(.*)/", "\\1", $str, 1); + + return $str; } // ------------------------------------------------------------------------ From 57f9f39ca6edd4c9cea0f68b86da0ec7a9098f0b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 23 Sep 2008 20:59:14 +0000 Subject: [PATCH 1377/2544] change of a false test (yes, again) --- system/libraries/Encrypt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index bd74592d..656d51b4 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -141,7 +141,7 @@ function decode($string, $key = '') { $key = $this->get_key($key); - if (preg_match('/[^a-zA-Z0-9\/\+=]/', $string) === FALSE) + if ( ! preg_match('/[a-zA-Z0-9\/\+=]/', $string)) { return FALSE; } From 4585159f8b39e58b22fa409a1e33e404cfe33777 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 23 Sep 2008 22:42:23 +0000 Subject: [PATCH 1378/2544] Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie. Also rewrote a bit of the cookie handling code to be a bit more efficient and understandable --- system/libraries/Session.php | 31 ++++++++++++++++++------------- user_guide/changelog.html | 1 + 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 7e50dce2..4fe44972 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -252,16 +252,17 @@ function sess_write() return; } - // We need two copies of the session data array. One will contain any custom data - // that might have been set. The other will contain the data that will be saved to the cookie - $cookie_userdata = $this->userdata; + // set the custom userdata, the session data we will set in a second $custom_userdata = $this->userdata; - + $cookie_userdata = array(); + // Before continuing, we need to determine if there is any custom data to deal with. // Let's determine this by removing the default indexes to see if there's anything left in the array + // and set the session data while we're at it foreach (array('session_id','ip_address','user_agent','last_activity') as $val) { unset($custom_userdata[$val]); + $cookie_userdata[$val] = $this->userdata[$val]; } // Did we find any custom data? If not, we turn the empty array into a string @@ -271,14 +272,7 @@ function sess_write() $custom_userdata = ''; } else - { - // Before we serialize the custom data array, let's remove that data from the - // main session array since we do not want to save that info to the cookie - foreach (array_keys($custom_userdata) as $val) - { - unset($cookie_userdata[$val]); - } - + { // Serialize the custom data array so we can store it $custom_userdata = serialize($custom_userdata); } @@ -365,14 +359,25 @@ function sess_update() $this->userdata['session_id'] = $new_sessid; $this->userdata['last_activity'] = $this->now; + // _set_cookie() will handle this for us if we aren't using database sessions + // by pushing all userdata to the cookie. + $cookie_data = NULL; + // Update the session ID and last_activity field in the DB if needed if ($this->sess_use_database === TRUE) { + // set cookie explicitly to only have our session data + $cookie_data = array(); + foreach (array('session_id','ip_address','user_agent','last_activity') as $val) + { + $cookie_data[$val] = $this->userdata[$val]; + } + $this->CI->db->query($this->CI->db->update_string($this->sess_table_name, array('last_activity' => $this->now, 'session_id' => $new_sessid), array('session_id' => $old_sessid))); } // Write the cookie - $this->_set_cookie(); + $this->_set_cookie($cookie_data); } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9cae52f6..bad3d089 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -103,6 +103,7 @@

    Bug fixes for 1.7.0

  • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
  • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
  • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.
    • +
  • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.

    • Version 1.6.3

    From 9976587c01b21e96b0b98b4155d72287f8033118 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 24 Sep 2008 17:19:44 +0000 Subject: [PATCH 1379/2544] put all valid block level elements into $block_elements array, added table to tags with which

    should not be directly contained within --- system/libraries/Typography.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 76160bfe..eeb507d3 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -27,10 +27,10 @@ class CI_Typography { // Block level elements that should not be wrapped inside

    tags - var $block_elements = 'p|div|blockquote|pre|code|h\d|script|ol|ul|dl|dt|dd'; + var $block_elements = 'address|blockquote|del|div|dl|fieldset|form|h\d|hr|ins|noscript|ol|p|pre|script|table|ul'; // Elements that should not have

    and
    tags within them. - var $skip_elements = 'p|pre|ol|ul|dl'; + var $skip_elements = 'p|pre|ol|ul|dl|table'; // Tags we want the parser to completely ignore when splitting the string. var $ignore_elements = 'a|b|i|em|strong|span|img|li'; @@ -126,7 +126,7 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea { if (preg_match("#".$this->skip_elements."#", $match[2])) { - $process = ($match[1] == '/') ? TRUE : FALSE; + $process = ($match[1] == '/') ? TRUE : FALSE; } $str .= $chunk; From c184b3beda28be9c5815fdfc1be7aa79c8b84b16 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 24 Sep 2008 17:54:50 +0000 Subject: [PATCH 1380/2544] renamed $ignore_elements to $inline_elements, and made more robust by including all valid inline HTML elements --- system/libraries/Typography.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index eeb507d3..da100dc1 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -27,13 +27,13 @@ class CI_Typography { // Block level elements that should not be wrapped inside

    tags - var $block_elements = 'address|blockquote|del|div|dl|fieldset|form|h\d|hr|ins|noscript|ol|p|pre|script|table|ul'; + var $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|ol|p|pre|script|table|ul'; // Elements that should not have

    and
    tags within them. var $skip_elements = 'p|pre|ol|ul|dl|table'; // Tags we want the parser to completely ignore when splitting the string. - var $ignore_elements = 'a|b|i|em|strong|span|img|li'; + var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|object|samp|select|span|strong|sub|sup|textarea|var'; /** * Nothing to do here... @@ -101,7 +101,7 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea // Convert "ignore" tags to temporary marker. The parser splits out the string at every tag // it encounters. Certain inline tags, like image tags, links, span tags, etc. will be // adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG} - $str = preg_replace("#<(/*)(".$this->ignore_elements.")#i", "{@TAG}\\1\\2", $str); + $str = preg_replace("#<(/*)(".$this->inline_elements.")#i", "{@TAG}\\1\\2", $str); // Split the string at every tag. This expression creates an array with this prototype: // From d16bab12339fe2746e1ead72ba96351c3423c27c Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 24 Sep 2008 18:22:03 +0000 Subject: [PATCH 1381/2544] added removal of non-printing characters to escape_str() of drivers that do not have native PHP escaping mechanisms --- system/database/drivers/mssql/mssql_driver.php | 2 +- system/database/drivers/oci8/oci8_driver.php | 2 +- system/database/drivers/odbc/odbc_driver.php | 2 +- user_guide/changelog.html | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 98c03c56..5ac90b45 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -214,7 +214,7 @@ function trans_rollback() function escape_str($str) { // Escape single quotes - return str_replace("'", "''", $str); + return str_replace("'", "''", $this->input->_remove_invisible_characters($str)); } // -------------------------------------------------------------------- diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index d6bc512b..765c3f6c 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -366,7 +366,7 @@ function trans_rollback() */ function escape_str($str) { - return $str; + return $this->input->_remove_invisible_characters($str); } // -------------------------------------------------------------------- diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 64717169..f89000d8 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -235,7 +235,7 @@ function trans_rollback() function escape_str($str) { // ODBC doesn't require escaping - return $str; + return $this->input->_remove_invisible_characters($str); } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index bad3d089..94e41a89 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -74,6 +74,12 @@

    Version 1.7

  • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div
    • +
  • Database +
      +
    • Added removal of non-printing control characters in escape_str() of DB drivers that do not have native PHP escaping mechanisms (mssql, oci8, odbc), to avoid + potential SQL errors, and possible sources of SQL injection.
      • +
    +
  • Helpers
    • Added several new "setting" functions to the Form helper that allow POST data to be retrieved and set into forms. These are intended to be used on their own, or with the new Form Validation Class.
      • From 92490684ef1b2a1b1417727c392ee28288fd41a9 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 24 Sep 2008 20:44:34 +0000 Subject: [PATCH 1382/2544] fixed an issue where the last character before convert ... to an ellipsis was being dropped --- system/libraries/Typography.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index da100dc1..6b18a2df 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -225,7 +225,7 @@ function format_characters($str) // Em dash and ellipses dots '/\s?\-\-\s?/' => '—', - '/\w\.{3}/' => '…', + '/(\w)\.{3}/' => '$1…', // double space after sentences '/(\W) /' => '$1  ', From a7cf027235c92103118cf415d244447a6ea82b3a Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 25 Sep 2008 12:56:02 +0000 Subject: [PATCH 1383/2544] postgre to postgres in a few documentation pages --- user_guide/changelog.html | 12 ++++++------ user_guide/database/configuration.html | 6 +++--- user_guide/database/helpers.html | 2 +- user_guide/general/requirements.html | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 94e41a89..7a59eaf6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -449,7 +449,7 @@

      Bug fixes for Version 1.6.0

    • Fixed a bug (#2732) in the SQLite driver for PHP 4.
    • Fixed a bug (#2754) in Pagination to scan for non-positive num_links.
    • Fixed a bug (#2762) in the Session library where user agent matching would fail on user agents ending with a space.
      • -
    • Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgre and sqlite drivers.
      • +
    • Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgres and sqlite drivers.
    • Fixed a bug (#2810) in the typography helper causing extraneous paragraph tags when string contains tags.
    • Fixed a bug (#2849) where arguments passed to a subfolder controller method would be incorrectly shifted, dropping the 3rd segment value.
    • Fixed a bug (#2858) which referenced a wrong variable in the Image class.
      • @@ -545,7 +545,7 @@

      Version 1.5.3

    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
    • Fixed a bug in the redirect function of the url helper.
    • Fixed an undefined variable in Loader
      • -
    • Fixed a version bug in the Postgre driver
      • +
    • Fixed a version bug in the Postgres driver
    • Fixed a bug in the textarea function of the form helper for use with strings
    • Fixed doc typos.
    @@ -683,7 +683,7 @@

    Version 1.4.0

  • Added support for % character in URL.
  • Added the ability to supply full URLs using the anchor() helper function.
  • Added mode parameter to file_write() helper.
    • -
  • Added support for changing the port number in the Postgre driver.
    • +
  • Added support for changing the port number in the Postgres driver.
  • Moved the list of "allowed URI characters" out of the Router class and into the config file.
  • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
  • Updated the Upload class to allow the upload field name to be set when calling do_upload().
    • @@ -694,10 +694,10 @@

    Version 1.4.0

  • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
  • Updated the Models loader function to allow multiple loads of the same model.
  • Updated the MS SQL driver so that single quotes are escaped.
    • -
  • Updated the Postgre and ODBC drivers for better compatibility.
    • +
  • Updated the Postgres and ODBC drivers for better compatibility.
  • Removed a strtolower() call that was changing URL segments to lower case.
  • Removed some references that were interfering with PHP 4.4.1 compatibility.
    • -
  • Removed backticks from Postgre class since these are not needed.
    • +
  • Removed backticks from Postgres class since these are not needed.
  • Renamed display() to _display() in the Output class to make it clear that it's a private function.
  • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
  • Fixed an bug that was preventing the input class from unsetting GET variables.
    • @@ -790,7 +790,7 @@

    Version 1.3

    • Added support for Models.
      • -
    • Redesigned the database libraries to support additional RDBMs (Postgre, MySQLi, etc.).
      • +
    • Redesigned the database libraries to support additional RDBMs (Postgres, MySQLi, etc.).
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
    • Added a feature to the database class that lets you run custom function calls.
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
      • diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 2c16f360..26bbe75e 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -121,7 +121,7 @@

      Explanation of Values:

    • 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, postgre, odcc, etc. Must be specified in lower case.
      • +
    • dbdriver - The database type. ie: mysql, postgres, odcc, etc. Must be specified in lower case.
    • dbprefix - An optional table prefix which will added to the table name when running Active Record queries. This permits multiple CodeIgniter installations to share one database.
    • pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
    • db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
      • @@ -129,10 +129,10 @@

      Explanation of Values:

    • cachedir - The absolute server path to your database query cache directory.
    • char_set - The character set used in communicating with the database.
    • dbcollat - The character collation used in communicating with the database.
      • -
    • port - The database port number. Currently only used with the Postgre driver. To use this value you have to add a line to the database config array.$db['default']['port'] = 5432;
      • +
    • port - The database port number. Currently only used with the Postgres driver. To use this value you have to add a line to the database config array.$db['default']['port'] = 5432;
    -

    Note: Depending on what database platform you are using (MySQL, Postgre, etc.) +

    Note: Depending on what database platform you are using (MySQL, Postgres, etc.) not all values will be needed. For example, when using SQLite you will not need to supply a username or password, and the database name will be the path to your database file. The information above assumes you are using MySQL.

    diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index ac6ea11a..0647e2a8 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -80,7 +80,7 @@

    $this->db->count_all();

    $this->db->platform()

    -

    Outputs the database platform you are running (MySQL, MS SQL, Postgre, etc...):

    +

    Outputs the database platform you are running (MySQL, MS SQL, Postgres, etc...):

    echo $this->db->platform(); diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index a6551970..742cd193 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -59,7 +59,7 @@

    Server Requirements

    • PHP version 4.3.2 or newer.
      • -
    • A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgre, Oracle, SQLite, and ODBC.
      • +
    • A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, and ODBC.
    From 69db8efaffadfc93ff0eec3a9733793e8b358dfb Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 25 Sep 2008 13:04:12 +0000 Subject: [PATCH 1384/2544] Fixed incorrect parenthesis in form_open() function. (#5135) A few doc typo fixes --- system/helpers/form_helper.php | 2 +- user_guide/changelog.html | 13 +++++++------ user_guide/installation/upgrade_170.html | 2 +- user_guide/libraries/form_validation.html | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index fc259224..a45faf63 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -57,7 +57,7 @@ function form_open($action = '', $attributes = '', $hidden = array()) $form .= '>'; - if (is_array($hidden) AND count($hidden > 0)) + if (is_array($hidden) AND count($hidden) > 0) { $form .= form_hidden($hidden); } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7a59eaf6..f95afe30 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -67,11 +67,11 @@

    Version 1.7

    • Added a new Form Validation Class. It simplifies setting rules and field names, supports arrays as field names, allows groups of validation rules to be saved in a config file, and adds some helper functions for use in view files. Please note that the old Validation class is now deprecated. We will leave it in the library folder for some time so that existing applications that use it will not break, but you are encouraged to migrate to the new version.
    • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
      • -
    • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
      • -
    • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
      • +
    • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
      • +
    • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
    • Added controller class/method info to Profiler class.
    • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
      • -
    • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div
      • +
    • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div.
  • Database @@ -83,12 +83,13 @@

    Version 1.7

  • Helpers
    • Added several new "setting" functions to the Form helper that allow POST data to be retrieved and set into forms. These are intended to be used on their own, or with the new Form Validation Class.
      • -
    • Added current_url() and uri_segments() to URL helper.
      • -
    • Improved accuracy of calculations in Number helper.
      • +
    • Added current_url() and uri_segments() to URL helper..
      • +
    • Improved accuracy of calculations in Number helper..
    • Removed added newlines ("\n") from most form and html helper functions.
    • Tightened up validation in Date Helper human_to_unix(), and eliminated the POSIX regex.
    • Updated Date Helper to match the world's current time zones and offsets.
    • Fixed the spelling of "raspberry" in config/smileys.php
      • +
    • Fixed incorrect parenthesis in form_open() function. (#5135)
  • Other changes @@ -104,7 +105,7 @@

    Version 1.7

    Bug fixes for 1.7.0

    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • -
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071).
      • +
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158).
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index d74afff2..33897d5d 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -3,7 +3,7 @@ -Upgrading from 1.6.3 to 1.6.4 : CodeIgniter User Guide +Upgrading from 1.6.3 to 1.7.0 : CodeIgniter User Guide diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 04074bfb..0f89fb81 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -58,7 +58,7 @@

      Form Validation

      CodeIgniter provides a comprehensive form validation and data prepping class that helps minimize the amount of code you'll write.

      -

      Note:  As of CodeIgniter 1.6.4, this Form Validation class supercedes the old Validation class, which is now deprecated. We +

      Note:  As of CodeIgniter 1.7.0, this Form Validation class supercedes the old Validation class, which is now deprecated. We have left the old class in the library so applications currently using it will not break, but you are encouraged to migrate to this new version.

        @@ -585,7 +585,7 @@

        Setting Error Messages

        $this->form_validation->set_message('username_check') -

        You can also override any error message found in the languge file. For example, to change the message for the "required" rule you will do this:

        +

        You can also override any error message found in the language file. For example, to change the message for the "required" rule you will do this:

        $this->form_validation->set_message('required', 'Your custom message here'); From bc2bfa86bf7125608b7fc190993fafc654cb0da3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 25 Sep 2008 13:22:15 +0000 Subject: [PATCH 1385/2544] Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper. Added a missing quote in an example on the index page --- index.php | 2 +- user_guide/changelog.html | 3 ++- user_guide/helpers/date_helper.html | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 970f2922..39aeda5c 100644 --- a/index.php +++ b/index.php @@ -80,7 +80,7 @@ | | EXT - The file extension. Typically ".php" | FCPATH - The full server path to THIS file -| SELF - The name of THIS file (typically "index.php) +| SELF - The name of THIS file (typically "index.php") | BASEPATH - The full server path to the "system" folder | APPPATH - The full server path to the "application" folder | diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f95afe30..a1afab1c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -88,6 +88,7 @@

        Version 1.7

      • Removed added newlines ("\n") from most form and html helper functions.
      • Tightened up validation in Date Helper human_to_unix(), and eliminated the POSIX regex.
      • Updated Date Helper to match the world's current time zones and offsets.
        • +
      • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
      • Fixed the spelling of "raspberry" in config/smileys.php
      • Fixed incorrect parenthesis in form_open() function. (#5135)
      @@ -105,7 +106,7 @@

      Version 1.7

      Bug fixes for 1.7.0

      • Fixed bug in xss_clean() that could remove some desirable tag attributes.
        • -
      • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158).
        • +
      • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229).
      • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
      • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
      • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
        • diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 41d65795..7a7b4d70 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -291,7 +291,7 @@

        timezone_menu()

        - + @@ -370,7 +370,7 @@

        Timezone Reference

        UP45(UTC + 5:30) Bombay, Calcutta, Madras, New Delhi -UP6(UTC + 6:00) Almaty, Colomba, Dhakra +UP6(UTC + 6:00) Almaty, Colomba, Dhaka UP7(UTC + 7:00) Bangkok, Hanoi, Jakarta From cce31591f865bcf0130945fcfb44335bfd964018 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 25 Sep 2008 13:34:30 +0000 Subject: [PATCH 1386/2544] clarification --- user_guide/helpers/text_helper.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 28855f4d..71047981 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -97,7 +97,7 @@

        character_limiter()

        // Returns: Here is a nice text string…         -

        The third parameter is an optional suffix added to the string. By default it adds an ellipsis.

        +

        The third parameter is an optional suffix added to the string, if undeclared this helper uses an ellipsis.

        From e07ba013ad4ee70ff26ce6ee081cc0d5396a7e03 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 25 Sep 2008 22:14:01 +0000 Subject: [PATCH 1387/2544] added check that content is surrounded by a valid block level element, and if not, wrapped in paragraph tags --- system/libraries/Typography.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 6b18a2df..94c9de01 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -143,6 +143,12 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea $str .= $this->_format_newlines($chunk); } + // is the whole of the content inside a block level element? + if ( ! preg_match("/^<(?:".$this->block_elements.")/i", $str, $match)) + { + $str = "

        {$str}

        "; + } + // Convert quotes, elipsis, and em-dashes $str = $this->format_characters($str); From af03e056ce1a479dc9f1d6b0a88a6bcb06a31d3c Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 26 Sep 2008 15:59:28 +0000 Subject: [PATCH 1388/2544] fixed decode()'s validation of the string... --- system/libraries/Encrypt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 656d51b4..035ce8f6 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -141,7 +141,7 @@ function decode($string, $key = '') { $key = $this->get_key($key); - if ( ! preg_match('/[a-zA-Z0-9\/\+=]/', $string)) + if (preg_match('/[^a-zA-Z0-9\/\+=]/', $string)) { return FALSE; } From b3a3bf342903b32a79e8799860a61b93d7f28581 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 26 Sep 2008 17:20:53 +0000 Subject: [PATCH 1389/2544] removed some legacy escaping code from _backup() in the MySQL utility, fixing bug 4536 http://codeigniter.com/bug_tracker/bug/4536/ --- system/database/drivers/mysql/mysql_utility.php | 9 --------- user_guide/changelog.html | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php index 6fb1ab4b..e035e0cf 100644 --- a/system/database/drivers/mysql/mysql_utility.php +++ b/system/database/drivers/mysql/mysql_utility.php @@ -176,15 +176,6 @@ function _backup($params = array()) } else { - // Do a little formatting... - $v = str_replace(array("\x00", "\x0a", "\x0d", "\x1a"), array('\0', '\n', '\r', '\Z'), $v); - $v = str_replace(array("\n", "\r", "\t"), array('\n', '\r', '\t'), $v); - $v = str_replace('\\', '\\\\', $v); - $v = str_replace('\'', '\\\'', $v); - $v = str_replace('\\\n', '\n', $v); - $v = str_replace('\\\r', '\r', $v); - $v = str_replace('\\\t', '\t', $v); - // Escape the data if it's not an integer if ($is_int[$i] == FALSE) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a1afab1c..7a0a251b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -112,6 +112,7 @@

        Bug fixes for 1.7.0

      • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.
      • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.
        • +
      • Fixed a bug (#4536) in backups with the MySQL driver where some legacy code was causing certain characters to be double escaped.

      Version 1.6.3

      From ba5c4ce31b0b2cbd3a5737a8a887a906bdc80b6d Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 26 Sep 2008 19:12:50 +0000 Subject: [PATCH 1390/2544] typo fix --- user_guide/general/views.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 34b75c87..ff600602 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -90,7 +90,7 @@

      Loading a View

      $this->load->view('name'); -

      Where name is the name of your view file. Note: The .php file extension does not need to be specified unless you use something other then .php.

      +

      Where name is the name of your view file. Note: The .php file extension does not need to be specified unless you use something other than .php.

      Now, open the controller file you made earlier called blog.php, and replace the echo statement with the view loading function:

      From 07fa5664978b333f6fd84f4248c50cdbdfe9dc6b Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sat, 27 Sep 2008 00:06:19 +0000 Subject: [PATCH 1391/2544] tweak of inline_element regex so that it doesn't hit partial matches, i.e. viewing
      inline_elements.")#i", "{@TAG}\\1\\2", $str); + $str = preg_replace("#<(/*)(".$this->inline_elements.")[ >]#i", "{@TAG}\\1\\2", $str); // Split the string at every tag. This expression creates an array with this prototype: // @@ -132,7 +132,7 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea $str .= $chunk; continue; } - + if ($process == FALSE) { $str .= $chunk; From f2b7f62f79791cae890a84a4f7b0eeb46449a5d1 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sat, 27 Sep 2008 00:10:37 +0000 Subject: [PATCH 1392/2544] tweak tweak... --- system/libraries/Typography.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 57cb97c7..7eaa4057 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -101,7 +101,7 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea // Convert "ignore" tags to temporary marker. The parser splits out the string at every tag // it encounters. Certain inline tags, like image tags, links, span tags, etc. will be // adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG} - $str = preg_replace("#<(/*)(".$this->inline_elements.")[ >]#i", "{@TAG}\\1\\2", $str); + $str = preg_replace("#<(/*)(".$this->inline_elements.")([ >])#i", "{@TAG}\\1\\2\\3", $str); // Split the string at every tag. This expression creates an array with this prototype: // From fa5c4101d4dc171824e222d4650e0ad15409fce0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 30 Sep 2008 00:47:54 +0000 Subject: [PATCH 1393/2544] moved object out of inline elements to the block elements and skip elements variables. Yes, I know it's technically an inline element, but it's common usage is as a block element, and the typography parser needs to know not to smash a bunch of paragraph tags and
      s inside of it, regardless of how it's used --- system/libraries/Typography.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 7eaa4057..7cdf7ddd 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -27,13 +27,13 @@ class CI_Typography { // Block level elements that should not be wrapped inside

      tags - var $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|ol|p|pre|script|table|ul'; + var $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul'; // Elements that should not have

      and
      tags within them. - var $skip_elements = 'p|pre|ol|ul|dl|table'; + var $skip_elements = 'p|pre|ol|ul|dl|object|table'; // Tags we want the parser to completely ignore when splitting the string. - var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|object|samp|select|span|strong|sub|sup|textarea|var'; + var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|samp|select|span|strong|sub|sup|textarea|var'; /** * Nothing to do here... From 52dc8ca4372eb36e9186cef0e34bf0cafe5b1cd8 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 19:53:52 +0000 Subject: [PATCH 1394/2544] Added backticks to column names when using insert_string and update_string. Relates to this bug report: http://codeigniter.com/bug_tracker/bug/4509/ --- system/database/DB_driver.php | 5 ++-- .../database/drivers/mssql/mssql_driver.php | 29 ++++++++++++------- .../database/drivers/mysql/mysql_driver.php | 16 ++++++++++ .../database/drivers/mysqli/mysqli_driver.php | 16 ++++++++++ system/database/drivers/oci8/oci8_driver.php | 17 +++++++++++ system/database/drivers/odbc/odbc_driver.php | 22 ++++++++++++-- .../drivers/postgre/postgre_driver.php | 18 +++++++++++- .../database/drivers/sqlite/sqlite_driver.php | 20 +++++++++++-- 8 files changed, 124 insertions(+), 19 deletions(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 1450a064..b937ffd6 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -911,11 +911,10 @@ function insert_string($table, $data) foreach($data as $key => $val) { - $fields[] = $key; + $fields[] = $this->_escape_column($key); $values[] = $this->escape($val); } - return $this->_insert($this->prep_tablename($table), $fields, $values); } @@ -940,7 +939,7 @@ function update_string($table, $data, $where) $fields = array(); foreach($data as $key => $val) { - $fields[$key] = $this->escape($val); + $fields[$this->_escape_column($key)] = $this->escape($val); } if ( ! is_array($where)) diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 5ac90b45..9a912a32 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -390,7 +390,24 @@ function _error_number() // Are error numbers supported? return ''; } - + + // -------------------------------------------------------------------- + + /** + * Escape Column Name + * + * This function adds backticks around supplied column name + * + * @access private + * @param string the column name + * @return string + */ + function _escape_column($column) + { + // Not necessary with MS SQL so we simply return the value + return $column; + } + // -------------------------------------------------------------------- /** @@ -405,15 +422,7 @@ function _error_number() */ function _escape_table($table) { - // I don't believe this is necessary with MS SQL. Not sure, though. - Rick - - /* - if (strpos($table, '.') !== FALSE) - { - $table = '"' . str_replace('.', '"."', $table) . '"'; - } - */ - + // Not necessary with MS SQL so we simply return the value return $table; } diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 9d9b6512..de372e66 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -398,6 +398,22 @@ function _error_number() { return mysql_errno($this->conn_id); } + + // -------------------------------------------------------------------- + + /** + * Escape Column Name + * + * This function adds backticks around supplied column name + * + * @access private + * @param string the column name + * @return string + */ + function _escape_column($column) + { + return '`' .$column. '`'; + } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index cd683dfe..35a7fc07 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -394,6 +394,22 @@ function _error_number() { return mysqli_errno($this->conn_id); } + + // -------------------------------------------------------------------- + + /** + * Escape Column Name + * + * This function adds backticks around supplied column name + * + * @access private + * @param string the column name + * @return string + */ + function _escape_column($column) + { + return '`' .$column. '`'; + } // -------------------------------------------------------------------- diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 765c3f6c..b45b0032 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -506,6 +506,23 @@ function _error_number() $error = ocierror($this->conn_id); return $error['code']; } + + // -------------------------------------------------------------------- + + /** + * Escape Column Name + * + * This function adds backticks around supplied column name + * + * @access private + * @param string the column name + * @return string + */ + function _escape_column($column) + { + // Probably not necessary with Oracle so we simply return the value + return $column; + } // -------------------------------------------------------------------- diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index f89000d8..ed8f81cb 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -371,7 +371,23 @@ function _error_number() { return odbc_error($this->conn_id); } - + // -------------------------------------------------------------------- + + /** + * Escape Column Name + * + * This function adds backticks around supplied column name + * + * @access private + * @param string the column name + * @return string + */ + function _escape_column($column) + { + // Not necessary with ODBC so we simply return the value + return $column; + } + // -------------------------------------------------------------------- /** @@ -386,9 +402,9 @@ function _error_number() */ function _escape_table($table) { - // used to add backticks in other db drivers + // Not necessary with ODBC so we simply return the value return $table; - } + } // -------------------------------------------------------------------- diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 7574ded1..3d006d3d 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -391,7 +391,23 @@ function _error_number() { return ''; } - + // -------------------------------------------------------------------- + + /** + * Escape Column Name + * + * This function adds backticks around supplied column name + * + * @access private + * @param string the column name + * @return string + */ + function _escape_column($column) + { + // Probably not necessary with Postgres so we simply return the value + return $column; + } + // -------------------------------------------------------------------- /** diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 5cac04df..46e0fae4 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -387,7 +387,24 @@ function _error_number() { return sqlite_last_error($this->conn_id); } - + + // -------------------------------------------------------------------- + + /** + * Escape Column Name + * + * This function adds backticks around supplied column name + * + * @access private + * @param string the column name + * @return string + */ + function _escape_column($column) + { + // Not necessary with SQLite so we simply return the value + return $column; + } + // -------------------------------------------------------------------- /** @@ -402,7 +419,6 @@ function _error_number() */ function _escape_table($table) { - // other database drivers use this to add backticks, hence this // function is simply going to return the tablename for sqlite return $table; From 8f99224e6c6d3ac51cb0f356e2e0feb10fa93f31 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 20:13:53 +0000 Subject: [PATCH 1395/2544] Added a case-sensitivity check to called controller methods, as per this bug report: http://codeigniter.com/bug_tracker/bug/4560/ --- system/codeigniter/CodeIgniter.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 692d84a3..27094d24 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -169,11 +169,10 @@ $class = $RTR->fetch_class(); $method = $RTR->fetch_method(); - if ( ! class_exists($class) OR $method == 'controller' OR strncmp($method, '_', 1) == 0 - OR in_array($method, get_class_methods('Controller'), TRUE) + OR in_array(strtolower($method), array_map('strtolower', get_class_methods('Controller'))) ) { show_404("{$class}/{$method}"); From ff73401cdef0136c15c6dab95d4d722123668e7a Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 20:38:12 +0000 Subject: [PATCH 1396/2544] Did a little clean up. Nothing that affected functionality --- system/database/DB_active_rec.php | 3 +-- system/database/DB_forge.php | 10 +++++++++ .../database/drivers/mssql/mssql_driver.php | 2 +- .../database/drivers/mysql/mysql_driver.php | 3 +++ system/database/drivers/oci8/oci8_driver.php | 2 +- system/database/drivers/odbc/odbc_driver.php | 2 +- .../drivers/postgre/postgre_driver.php | 2 +- .../database/drivers/sqlite/sqlite_driver.php | 20 +---------------- .../database/drivers/sqlite/sqlite_forge.php | 22 +++++++++++++++++-- 9 files changed, 39 insertions(+), 27 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index fccf1b0a..35586838 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -821,11 +821,10 @@ function or_having($key, $value = '', $escape = TRUE) /** * Sets the HAVING values * - * Called by having() or orhaving() + * Called by having() or or_having() * * @access private * @param string - * @param string * @return object */ diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index cc88c32f..d48165e2 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -97,6 +97,16 @@ function drop_database($db_name) */ function add_key($key = '', $primary = FALSE) { + if (is_array($key)) + { + foreach($key as $one) + { + $this->add_key($one, $primary); + } + + return; + } + if ($key == '') { show_error('Key information is required for that operation.'); diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 9a912a32..fd3f9638 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -87,7 +87,7 @@ function db_select() */ function db_set_charset($charset, $collation) { - // TODO - add support if needed + // @todo - add support if needed return TRUE; } diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index de372e66..52df1e59 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -314,6 +314,9 @@ function count_all($table = '') $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table)); + if ($query->num_rows() == 0) + return '0'; + $row = $query->row(); return (int)$row->numrows; } diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index b45b0032..9d919325 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -111,7 +111,7 @@ function db_select() */ function db_set_charset($charset, $collation) { - // TODO - add support if needed + // @todo - add support if needed return TRUE; } diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index ed8f81cb..06282e55 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -94,7 +94,7 @@ function db_select() */ function db_set_charset($charset, $collation) { - // TODO - add support if needed + // @todo - add support if needed return TRUE; } diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 3d006d3d..55f65028 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -92,7 +92,7 @@ function db_select() */ function db_set_charset($charset, $collation) { - // TODO - add support if needed + // @todo - add support if needed return TRUE; } diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 46e0fae4..78215694 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -113,7 +113,7 @@ function db_select() */ function db_set_charset($charset, $collation) { - // TODO - add support if needed + // @todo - add support if needed return TRUE; } @@ -651,24 +651,6 @@ function _close($conn_id) @sqlite_close($conn_id); } - // -------------------------------------------------------------------- - - /** - * Rename a table - * - * Generates a platform-specific query so that a table can be renamed - * - * @access private - * @param string the old table name - * @param string the new table name - * @return string - */ - function _rename_table($table_name, $new_table_name) - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); - return $sql; - } - } diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php index 05f366a6..631c9c77 100644 --- a/system/database/drivers/sqlite/sqlite_forge.php +++ b/system/database/drivers/sqlite/sqlite_forge.php @@ -144,7 +144,7 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) $primary_keys = $this->db->_protect_identifiers($primary_keys); $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; } - + if (is_array($keys) && count($keys) > 0) { foreach ($keys as $key) @@ -161,7 +161,7 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) $sql .= ",\n\tUNIQUE (" . implode(', ', $key) . ")"; } } - + $sql .= "\n)"; return $sql; @@ -241,6 +241,24 @@ function _alter_table($alter_type, $table, $column_name, $column_definition = '' return $sql; } + + // -------------------------------------------------------------------- + + /** + * Rename a table + * + * Generates a platform-specific query so that a table can be renamed + * + * @access private + * @param string the old table name + * @param string the new table name + * @return string + */ + function _rename_table($table_name, $new_table_name) + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); + return $sql; + } } /* End of file sqlite_forge.php */ From 1346aac56e4c5effee5a66780095ea9d4ea8cf52 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 20:46:58 +0000 Subject: [PATCH 1397/2544] Removed some spaces --- system/database/DB.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/database/DB.php b/system/database/DB.php index 27eb336f..2b3ff3dc 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -73,7 +73,7 @@ function &DB($params = '', $active_record_override = FALSE) if (isset($dns['query'])) { parse_str($dns['query'], $extra); - + foreach($extra as $key => $val) { // booleans please @@ -85,12 +85,12 @@ function &DB($params = '', $active_record_override = FALSE) { $val = FALSE; } - + $params[$key] = $val; } } } - + // No DB specified yet? Beat them senseless... if ( ! isset($params['dbdriver']) OR $params['dbdriver'] == '') { From b2675159482af40004e32ec30fbf6f52cfe62a51 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 21:07:22 +0000 Subject: [PATCH 1398/2544] Fixed a routing bug that occurred when the default route pointed to a subfolder. Bug report: http://codeigniter.com/bug_tracker/bug/4661/ --- system/libraries/Router.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/system/libraries/Router.php b/system/libraries/Router.php index 4b90b4bd..f1923794 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -63,7 +63,7 @@ function CI_Router() * @return void */ function _set_routing() - { + { // Are query strings enabled in the config file? // If so, we're done since segment based URIs are not used with query strings. if ($this->config->item('enable_query_strings') === TRUE AND isset($_GET[$this->config->item('controller_trigger')])) @@ -97,16 +97,8 @@ function _set_routing() { show_error("Unable to determine what should be displayed. A default route has not been specified in the routing file."); } - - $this->set_class($this->default_controller); - $this->set_method('index'); - $this->_set_request(array($this->default_controller, 'index')); - - // re-index the routed segments array so it starts with 1 rather than 0 - $this->uri->_reindex_segments(); - - log_message('debug', "No URI present. Default controller set."); - return; + + $this->uri->uri_string = $this->default_controller; } unset($this->routes['default_controller']); From 46c23637dcbdff4fab3f90ca81187729e606397f Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 21:10:58 +0000 Subject: [PATCH 1399/2544] --- user_guide/changelog.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7a0a251b..6763bf24 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -88,9 +88,6 @@

      Version 1.7

    • Removed added newlines ("\n") from most form and html helper functions.
    • Tightened up validation in Date Helper human_to_unix(), and eliminated the POSIX regex.
    • Updated Date Helper to match the world's current time zones and offsets.
      • -
    • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
      • -
    • Fixed the spelling of "raspberry" in config/smileys.php
      • -
    • Fixed incorrect parenthesis in form_open() function. (#5135)
  • Other changes @@ -99,6 +96,7 @@

    Version 1.7

  • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
  • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
  • Added PHP Style Guide to docs.
    • +
  • Added backticks around column names in MySQL when using insert_string and update_string functions.
    • @@ -113,6 +111,11 @@

    Bug fixes for 1.7.0

  • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.
  • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.
  • Fixed a bug (#4536) in backups with the MySQL driver where some legacy code was causing certain characters to be double escaped.
    • +
  • Fixed a routing bug (#4661) that occurred when the default route pointed to a subfolder.
    • +
  • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
    • +
  • Fixed the spelling of "raspberry" in config/smileys.php
    • +
  • Fixed incorrect parenthesis in form_open() function. (#5135)
    • +
  • Fixed a bug that was ignoring case when comparing controller methods (#4560)

    • Version 1.6.3

    From f08f655d4f3f63f66f8db3dbce6045939f304f03 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 21:16:03 +0000 Subject: [PATCH 1400/2544] Added smtp authorization settings to initialize function, as per this bug report: http://codeigniter.com/bug_tracker/bug/4615/ --- system/libraries/Email.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 592ead3d..8c56ccca 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -88,10 +88,12 @@ function CI_Email($config = array()) { $this->initialize($config); } - - $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE; - $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE; - + else + { + $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE; + $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE; + } + log_message('debug', "Email Class Initialized"); } @@ -123,6 +125,9 @@ function initialize($config = array()) } } } + + $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE; + $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE; } // -------------------------------------------------------------------- From f54d2100a4f154796a47f3216dc340fb26cd7a49 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 21:17:19 +0000 Subject: [PATCH 1401/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 6763bf24..b6bd8998 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -116,6 +116,7 @@

    Bug fixes for 1.7.0

  • Fixed the spelling of "raspberry" in config/smileys.php
  • Fixed incorrect parenthesis in form_open() function. (#5135)
  • Fixed a bug that was ignoring case when comparing controller methods (#4560)
    • +
  • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function

    • Version 1.6.3

    From 2aa5a18635a8982b7318d0976ae5d00832fa71ca Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 21:23:58 +0000 Subject: [PATCH 1402/2544] Did a little cleanup for better readability --- system/libraries/Email.php | 42 +++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 8c56ccca..e9a5344f 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -59,7 +59,7 @@ class CI_Email { var $_atc_boundary = ""; var $_header_str = ""; var $_smtp_connect = ""; - var $_encoding = "8bit"; + var $_encoding = "8bit"; var $_IP = FALSE; var $_smtp_auth = FALSE; var $_replyto_flag = FALSE; @@ -74,16 +74,16 @@ class CI_Email { var $_protocols = array('mail', 'sendmail', 'smtp'); var $_base_charsets = array('us-ascii', 'iso-2022-'); // 7-bit charsets (excluding language suffix) var $_bit_depths = array('7bit', '8bit'); - var $_priorities = array('1 (Highest)', '2 (High)', '3 (Normal)', '4 (Low)', '5 (Lowest)'); + var $_priorities = array('1 (Highest)', '2 (High)', '3 (Normal)', '4 (Low)', '5 (Lowest)'); /** * Constructor - Sets Email Preferences * * The constructor can be passed an array of config values - */ + */ function CI_Email($config = array()) - { + { if (count($config) > 0) { $this->initialize($config); @@ -105,7 +105,7 @@ function CI_Email($config = array()) * @access public * @param array * @return void - */ + */ function initialize($config = array()) { $this->clear(); @@ -277,7 +277,9 @@ function cc($cc) $cc = $this->clean_email($cc); if ($this->validate) + { $this->validate_email($cc); + } $this->_set_header('Cc', implode(", ", $cc)); @@ -630,15 +632,15 @@ function _get_content_type() { if ($this->mailtype == 'html' && count($this->_attach_name) == 0) { - return 'html'; + return 'html'; } elseif ($this->mailtype == 'html' && count($this->_attach_name) > 0) { - return 'html-attach'; + return 'html-attach'; } elseif ($this->mailtype == 'text' && count($this->_attach_name) > 0) { - return 'plain-attach'; + return 'plain-attach'; } else { @@ -950,7 +952,9 @@ function _write_headers() } if ($this->_get_protocol() == 'mail') + { $this->_header_str = substr($this->_header_str, 0, -1); + } } // -------------------------------------------------------------------- @@ -1167,14 +1171,14 @@ function _prep_quoted_printable($str, $charlim = '') // Reduce multiple spaces $str = preg_replace("| +|", " ", $str); - + // kill nulls $str = preg_replace('/\x00+/', '', $str); // Standardize newlines if (strpos($str, "\r") !== FALSE) { - $str = str_replace(array("\r\n", "\r"), "\n", $str); + $str = str_replace(array("\r\n", "\r"), "\n", $str); } // We are intentionally wrapping so mail servers will encode characters @@ -1425,18 +1429,26 @@ function _send_with_mail() if ($this->_safe_mode == TRUE) { if ( ! mail($this->_recipients, $this->_subject, $this->_finalbody, $this->_header_str)) + { return FALSE; + } else + { return TRUE; + } } else { // most documentation of sendmail using the "-f" flag lacks a space after it, however // we've encountered servers that seem to require it to be in place. if ( ! mail($this->_recipients, $this->_subject, $this->_finalbody, $this->_header_str, "-f ".$this->clean_email($this->_headers['From']))) + { return FALSE; + } else + { return TRUE; + } } } @@ -1487,14 +1499,18 @@ function _send_with_smtp() $this->_send_command('from', $this->clean_email($this->_headers['From'])); foreach($this->_recipients as $val) + { $this->_send_command('to', $val); + } if (count($this->_cc_array) > 0) { foreach($this->_cc_array as $val) { if ($val != "") - $this->_send_command('to', $val); + { + $this->_send_command('to', $val); + } } } @@ -1503,7 +1519,9 @@ function _send_with_smtp() foreach($this->_bcc_array as $val) { if ($val != "") - $this->_send_command('to', $val); + { + $this->_send_command('to', $val); + } } } From 9f02e3c852a38b4e17ac1ade26144d0b9d554693 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 21:51:01 +0000 Subject: [PATCH 1403/2544] Added backticks around column names in where clause. Bug report number: 4668 --- system/database/DB_active_rec.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 35586838..cd616336 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -440,7 +440,7 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = TRUE) // exception for "field<=" keys if ($this->_has_operator($k)) { - $k = preg_replace("/([A-Za-z_0-9]+)/", $this->_protect_identifiers('$1'), $k); + $k = preg_replace("/([A-Za-z_0-9]+)/", $this->_escape_column($this->_protect_identifiers('$1')), $k); } else { From 02d2a9cb400287e54c09f51b9027a99c779d7131 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 21:51:49 +0000 Subject: [PATCH 1404/2544] --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b6bd8998..2dcde946 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -96,7 +96,7 @@

    Version 1.7

  • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
  • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
  • Added PHP Style Guide to docs.
    • -
  • Added backticks around column names in MySQL when using insert_string and update_string functions.
    • +
  • Added backticks around column names in MySQL when using insert_string and update_string functions, and in where() function.
    • From 852160a27ba330f9e47f4fb16d8042c6074f435c Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 30 Sep 2008 21:55:34 +0000 Subject: [PATCH 1405/2544] Swiched to escape() rather then escape_str(), as per bug report #4680 --- system/database/DB_active_rec.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index cd616336..e7920d08 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -701,7 +701,7 @@ function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '') $prefix = (count($this->ar_like) == 0) ? '' : $type; - $v = $this->escape_str($v); + $v = $this->escape($v); if ($side == 'before') { @@ -851,7 +851,7 @@ function _having($key, $value = '', $type = 'AND ', $escape = TRUE) if ($v != '') { - $v = ' '.$this->escape_str($v); + $v = ' '.$this->escape($v); } $this->ar_having[] = $prefix.$k.$v; From 91a091abc17714e00b870b36e5f1d2bb8f009fb2 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 1 Oct 2008 01:07:23 +0000 Subject: [PATCH 1406/2544] Removed some stray tabs --- system/libraries/Benchmark.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/libraries/Benchmark.php b/system/libraries/Benchmark.php index b5a9a652..4984bb15 100644 --- a/system/libraries/Benchmark.php +++ b/system/libraries/Benchmark.php @@ -47,7 +47,7 @@ function mark($name) { $this->marker[$name] = microtime(); } - + // -------------------------------------------------------------------- /** @@ -80,13 +80,13 @@ function elapsed_time($point1 = '', $point2 = '', $decimals = 4) { $this->marker[$point2] = microtime(); } - + list($sm, $ss) = explode(' ', $this->marker[$point1]); list($em, $es) = explode(' ', $this->marker[$point2]); return number_format(($em + $es) - ($sm + $ss), $decimals); } - + // -------------------------------------------------------------------- /** From ed339bc99ba2e7b26b3153cbf350a307fb4367c6 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 1 Oct 2008 01:11:29 +0000 Subject: [PATCH 1407/2544] Removed some stray tabs --- system/libraries/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Config.php b/system/libraries/Config.php index ca12fde7..a9cf9f4e 100644 --- a/system/libraries/Config.php +++ b/system/libraries/Config.php @@ -46,7 +46,7 @@ function CI_Config() { $this->config =& get_config(); log_message('debug', "Config Class Initialized"); - } + } // -------------------------------------------------------------------- From 8d9b44ddb371846d458cef241c35ea5c196a5424 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 1 Oct 2008 01:18:43 +0000 Subject: [PATCH 1408/2544] Made a small error trapping change to the delete_directory function --- system/libraries/Ftp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 6a957a18..0e3dd5ef 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -379,7 +379,7 @@ function delete_dir($filepath) $list = $this->list_files($filepath); - if ($list !== FALSE) + if ($list !== FALSE AND count($list) > 0) { foreach ($list as $item) { From b5c93ce3c63af4c4130d5b55a0f16cd022014e57 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 1 Oct 2008 01:21:54 +0000 Subject: [PATCH 1409/2544] removed an errant tab --- system/libraries/Image_lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index c734c306..6b1e7e70 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -943,7 +943,7 @@ function overlay_watermark() { @imagealphablending($src_img, TRUE); } - + // Set RGB values for text and shadow $rgba = imagecolorat($wm_img, $this->wm_x_transp, $this->wm_y_transp); $alpha = ($rgba & 0x7F000000) >> 24; From c3b33befcbcc7846a638c8af8f08e1eafc7b79c2 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 1 Oct 2008 01:31:36 +0000 Subject: [PATCH 1410/2544] Added set_staus_header --- system/libraries/Output.php | 60 ++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/system/libraries/Output.php b/system/libraries/Output.php index 88a30469..2263fdfb 100644 --- a/system/libraries/Output.php +++ b/system/libraries/Output.php @@ -94,7 +94,7 @@ function append_output($output) } // -------------------------------------------------------------------- - + /** * Set Header * @@ -107,9 +107,55 @@ function append_output($output) * @param string * @return void */ - function set_header($header) + function set_header($header, $replace = TRUE) { - $this->headers[] = $header; + $this->headers[] = array($header, $replace); + } + + // -------------------------------------------------------------------- + + /** + * Set HTTP Status Header + * + * @access public + * @param int the status code + * @param string + * @return void + */ + function set_status_header($code, $text='') + { + if ( ! in_array($code, array(200, 304, 401, 404)) AND $text == '') + { + show_error('You must submit a status message and a status code'); + } + + if ($text == '') + { + switch($code) + { + case 200: $text = 'OK'; + break; + case 304: $text = 'Not Modified'; + break; + case 401: $text = 'Unauthorized'; + break; + case 404: $text = 'Not Found'; + break; + } + } + + if (substr(php_sapi_name(), 0, 3) == 'cgi') + { + @header("Status: {$code} {$text}", TRUE); + } + elseif ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1' OR $_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.0') + { + @header($_SERVER['SERVER_PROTOCOL']." {$code} {$text}", TRUE, $code); + } + else + { + @header("HTTP/1.1 {$code} {$text}", TRUE, $code); + } } // -------------------------------------------------------------------- @@ -183,7 +229,7 @@ function _display($output = '') // Parse out the elapsed time and memory usage, // then swap the pseudo-variables with the data - + $elapsed = $BM->elapsed_time('total_execution_time_start', 'total_execution_time_end'); $output = str_replace('{elapsed_time}', $elapsed, $output); @@ -211,7 +257,7 @@ function _display($output = '') { foreach ($this->headers as $header) { - @header($header); + @header($header[0], $header[1]); } } @@ -296,7 +342,7 @@ function _write_cache($output) $cache_path .= md5($uri); - if ( ! $fp = @fopen($cache_path, 'wb')) + if ( ! $fp = @fopen($cache_path, FOPEN_WRITE_CREATE_DESTRUCTIVE)) { log_message('error', "Unable to write cache file: ".$cache_path); return; @@ -342,7 +388,7 @@ function _display_cache(&$CFG, &$URI) return FALSE; } - if ( ! $fp = @fopen($filepath, 'rb')) + if ( ! $fp = @fopen($filepath, FOPEN_READ)) { return FALSE; } From a42f38709d4628ba7e93d62a26d405bfbc0eeb69 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 1 Oct 2008 01:33:52 +0000 Subject: [PATCH 1411/2544] Removed some errant spaces --- system/libraries/Pagination.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 58a70650..95799448 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -88,7 +88,7 @@ function initialize($params = array()) { $this->$key = $val; } - } + } } } @@ -118,7 +118,7 @@ function create_links() } // Determine the current page number. - $CI =& get_instance(); + $CI =& get_instance(); if ($CI->config->item('enable_query_strings') === TRUE OR $this->page_query_string === TRUE) { From 4ebfb43dfebbcb59aac2b463dcc9561d1008fd0d Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 1 Oct 2008 01:34:07 +0000 Subject: [PATCH 1412/2544] Fixed extra text in img() function description of the userguide --- user_guide/changelog.html | 2 +- user_guide/helpers/html_helper.html | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 2dcde946..b98d9d5b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -104,7 +104,7 @@

    Version 1.7

    Bug fixes for 1.7.0

    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • -
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229).
      • +
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229, #5254).
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index ab26cbcc..e63a449b 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -79,8 +79,7 @@

      heading()

      echo heading('Welcome!', 3);

      The above would produce: <h3>Welcome!</h3>

      img()

      -

      Lets you create HTML <img /> tags. The first parameter contains the image source. There is data, the - second the size of the heading. Example:

      +

      Lets you create HTML <img /> tags. The first parameter contains the image source. Example:

      echo img('images/picture.jpg');
      // gives <img src="http://site.com/images/picture.jpg" />

      There is an optional second parameter that is a TRUE/FALSE value that specifics if the src should have the page specified by $config['index_page'] added to the address it creates. Presumably, this would be if you were using a media controller.

      From d6778fb261dedd1163d947295fd59970256a1f48 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 1 Oct 2008 01:34:52 +0000 Subject: [PATCH 1413/2544] Updated copyright --- system/libraries/Profiler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 55ad1e3c..13cb1cca 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2006, EllisLab, Inc. + * @copyright Copyright (c) 2008, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 From 8ca943f0c550c9b2e7f0deabe2f3fdd269db544d Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 1 Oct 2008 01:37:59 +0000 Subject: [PATCH 1414/2544] Removed some errant spaces and tabs --- system/libraries/Typography.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 7cdf7ddd..59a96dfd 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -84,7 +84,7 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea if ($strip_js_event_handlers === TRUE) { $str = preg_replace("#<([^><]+?)([^a-z_\-]on\w*|xmlns)(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); - } + } // Convert quotes within tags to temporary markers. We don't want quotes converted // within tags so we'll temporarily convert them to {@DQ} and {@SQ} @@ -132,7 +132,7 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea $str .= $chunk; continue; } - + if ($process == FALSE) { $str .= $chunk; From 8e3869a90ae46c477ba1059a65fc480abea1cc03 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 1 Oct 2008 02:01:53 +0000 Subject: [PATCH 1415/2544] Tweaked the filter_uri function for better security --- system/libraries/URI.php | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/system/libraries/URI.php b/system/libraries/URI.php index ce64f3c7..0e4ff50c 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -58,23 +58,23 @@ function CI_URI() * @return string */ function _fetch_uri_string() - { + { if (strtoupper($this->config->item('uri_protocol')) == 'AUTO') { // If the URL has a question mark then it's simplest to just // build the URI string from the zero index of the $_GET array. // This avoids having to deal with $_SERVER variables, which // can be unreliable in some environments - if (is_array($_GET) AND count($_GET) == 1 AND trim(key($_GET), '/') != '') + if (is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '') { - $this->uri_string = key($_GET); + $this->uri_string = key($_GET); return; } // Is there a PATH_INFO variable? // Note: some servers seem to have trouble with getenv() so we'll test it two ways $path = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO'); - if (trim($path, '/') != '' AND $path != "/".SELF) + if (trim($path, '/') != '' && $path != "/".SELF) { $this->uri_string = $path; return; @@ -90,7 +90,7 @@ function _fetch_uri_string() // No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists? $path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO'); - if (trim($path, '/') != '' AND $path != "/".SELF) + if (trim($path, '/') != '' && $path != "/".SELF) { // remove path and script information so we have good URI data $this->uri_string = str_replace($_SERVER['SCRIPT_NAME'], '', $path); @@ -119,7 +119,7 @@ function _fetch_uri_string() $this->uri_string = ''; } } - + // -------------------------------------------------------------------- /** @@ -157,7 +157,7 @@ function _parse_request_uri() $i = 0; foreach(explode("/", $fc_path) as $segment) { - if (isset($parsed_uri[$i]) AND $segment == $parsed_uri[$i]) + if (isset($parsed_uri[$i]) && $segment == $parsed_uri[$i]) { $i++; } @@ -184,15 +184,19 @@ function _parse_request_uri() */ function _filter_uri($str) { - if ($str != '' AND $this->config->item('permitted_uri_chars') != '') + if ($str != '' && $this->config->item('permitted_uri_chars') != '' && $this->config->item('enable_query_strings') == FALSE) { if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str)) { exit('The URI you submitted has disallowed characters.'); } - } - - return $str; + } + + // Convert programatic characters to entities + $bad = array('$', '(', ')', '%28', '%29'); + $good = array('$', '(', ')', '(', ')'); + + return str_replace($bad, $good, $str); } // -------------------------------------------------------------------- @@ -228,7 +232,9 @@ function _explode_segments() $val = trim($this->_filter_uri($val)); if ($val != '') + { $this->segments[] = $val; + } } } From d95ebca78e200cb325dcf934492c83090cf2b462 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 1 Oct 2008 23:57:38 +0000 Subject: [PATCH 1416/2544] added $protect_braced_quotes to Typography class, to prevent curly-quoting single and double quoted string within {curly "braces"} --- system/libraries/Typography.php | 18 +++++++++++++++++- user_guide/libraries/typography.html | 10 ++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 59a96dfd..2393e164 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -35,6 +35,9 @@ class CI_Typography { // Tags we want the parser to completely ignore when splitting the string. var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|samp|select|span|strong|sub|sup|textarea|var'; + // whether or not to protect quotes within { curly braces } + var $protect_braced_quotes = FALSE; + /** * Nothing to do here... * @@ -97,7 +100,20 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea $str); } } - + + if ($this->protect_braced_quotes === TRUE) + { + if (preg_match_all("#\{.+?}#si", $str, $matches)) + { + for ($i = 0; $i < count($matches['0']); $i++) + { + $str = str_replace($matches['0'][$i], + str_replace(array("'",'"'), array('{@SQ}', '{@DQ}'), $matches['0'][$i]), + $str); + } + } + } + // Convert "ignore" tags to temporary marker. The parser splits out the string at every tag // it encounters. Certain inline tags, like image tags, links, span tags, etc. will be // adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG} diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 359c590c..29219059 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -135,6 +135,16 @@

      nl2br_except_pre()

      $string = $this->typography->nl2br_except_pre($string); +

      protect_braced_quotes

      + +

      When using the Typography library in conjunction with the Template Parser library it can often be desirable to protect single + and double quotes within curly braces. To enable this, set the protect_braced_quotes class property to TRUE. + +

      Usage example:

      + +$this->load->library('typography');
      +$this->typography->protect_braced_quotes = TRUE; +
    From 0dc925f7f30c008c50f8fa801e90203b82cf0542 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Thu, 2 Oct 2008 01:03:21 +0000 Subject: [PATCH 1417/2544] Added set_status_header function --- system/libraries/Output.php | 79 +++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 20 deletions(-) diff --git a/system/libraries/Output.php b/system/libraries/Output.php index 2263fdfb..781e368c 100644 --- a/system/libraries/Output.php +++ b/system/libraries/Output.php @@ -122,39 +122,78 @@ function set_header($header, $replace = TRUE) * @param string * @return void */ - function set_status_header($code, $text='') - { - if ( ! in_array($code, array(200, 304, 401, 404)) AND $text == '') + function set_status_header($code = '200', $text = '') + { + $stati = array( + '200' => 'OK', + '201' => 'Created', + '202' => 'Accepted', + '203' => 'Non-Authoritative Information', + '204' => 'No Content', + '205' => 'Reset Content', + '206' => 'Partial Content', + + '300' => 'Multiple Choices', + '301' => 'Moved Permanently', + '302' => 'Found', + '304' => 'Not Modified', + '305' => 'Use Proxy', + '307' => 'Temporary Redirect', + + '400' => 'Bad Request', + '401' => 'Unauthorized', + '403' => 'Forbidden', + '404' => 'Not Found', + '405' => 'Method Not Allowed', + '406' => 'Not Acceptable', + '407' => 'Proxy Authentication Required', + '408' => 'Request Timeout', + '409' => 'Conflict', + '410' => 'Gone', + '411' => 'Length Required', + '412' => 'Precondition Failed', + '413' => 'Request Entity Too Large', + '414' => 'Request-URI Too Long', + '415' => 'Unsupported Media Type', + '416' => 'Requested Range Not Satisfiable', + '417' => 'Expectation Failed', + + '500' => 'Internal Server Error', + '501' => 'Not Implemented', + '502' => 'Bad Gateway', + '503' => 'Service Unavailable', + '504' => 'Gateway Timeout', + '505' => 'HTTP Version Not Supported' + ); + + if ($code == '' OR ! is_numeric($code)) { - show_error('You must submit a status message and a status code'); + show_error('Status codes must be numeric'); } - + + if (isset($stati[$code]) AND $text == '') + { + $text = $stati[$code]; + } + if ($text == '') { - switch($code) - { - case 200: $text = 'OK'; - break; - case 304: $text = 'Not Modified'; - break; - case 401: $text = 'Unauthorized'; - break; - case 404: $text = 'Not Found'; - break; - } + show_error('No status text available. Please check your status code number or supply your own message text.'); } + + $server_protocol = (isset($_SERVER['SERVER_PROTOCOL'])) ? $_SERVER['SERVER_PROTOCOL'] : FALSE; if (substr(php_sapi_name(), 0, 3) == 'cgi') { - @header("Status: {$code} {$text}", TRUE); + header("Status: {$code} {$text}", TRUE); } - elseif ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1' OR $_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.0') + elseif ($server_protocol == 'HTTP/1.1' OR $server_protocol == 'HTTP/1.0') { - @header($_SERVER['SERVER_PROTOCOL']." {$code} {$text}", TRUE, $code); + header($server_protocol." {$code} {$text}", TRUE, $code); } else { - @header("HTTP/1.1 {$code} {$text}", TRUE, $code); + header("HTTP/1.1 {$code} {$text}", TRUE, $code); } } From 02b0c399244435f0aeaa710b1992c75964fac88b Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 2 Oct 2008 21:54:24 +0000 Subject: [PATCH 1418/2544] changed if ($this->cur_page > $this->num_links) to if ($this->cur_page > ($this-> num_links + 1)) so the "First" link only renders when the link for page 1 is now shown --- system/libraries/Pagination.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 95799448..4206f4e7 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -183,7 +183,7 @@ function create_links() $output = ''; // Render the "First" link - if ($this->cur_page > $this->num_links) + if ($this->cur_page > ($this->num_links + 1)) { $output .= $this->first_tag_open.''.$this->first_link.''.$this->first_tag_close; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b98d9d5b..39303bdd 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -97,6 +97,7 @@

    Version 1.7

  • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
  • Added PHP Style Guide to docs.
  • Added backticks around column names in MySQL when using insert_string and update_string functions, and in where() function.
    • +
  • Modified Pagination library to only output the "First" link when the link for page one would not be shown.
    • From 26bde91ef36cacd22772102d3083277bd937a60d Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 3 Oct 2008 02:29:56 +0000 Subject: [PATCH 1419/2544] When I fixed a bug that did not permit the default route to be in a sub-folder, I introducted a different bug (#5285), which this should fix --- system/libraries/Router.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/system/libraries/Router.php b/system/libraries/Router.php index f1923794..cf425163 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -98,7 +98,22 @@ function _set_routing() show_error("Unable to determine what should be displayed. A default route has not been specified in the routing file."); } - $this->uri->uri_string = $this->default_controller; + // Turn the default route into an array. We explode it in the event that + // the controller is located in a subfolder + $segments = $this->_validate_request(explode('/', $this->default_controller)); + + // Set the class and method + $this->set_class($segments[0]); + $this->set_method('index'); + + // Assign the segments to the URI class + $this->uri->rsegments = $segments; + + // re-index the routed segments array so it starts with 1 rather than 0 + $this->uri->_reindex_segments(); + + log_message('debug', "No URI present. Default controller set."); + return; } unset($this->routes['default_controller']); From c0e72b0609827484dc822ded7fcd0a312ed4eb98 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 3 Oct 2008 18:56:06 +0000 Subject: [PATCH 1420/2544] modified how we're performing text highlighting to prevent extra or missing span tags. Namely, removed the start and ending markers, as if the code being highlighted would be styled the same, PHP would put it all in the same , so when we removed our own additions, it would remove the needed opening span style --- system/helpers/text_helper.php | 30 +++++++++++++++--------------- user_guide/changelog.html | 1 + 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 954eb797..54ef1b58 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -274,27 +274,27 @@ function highlight_code($str) array('phptagopen', 'phptagclose', 'asptagopen', 'asptagclose', 'backslashtmp', 'scriptclose'), $str); // The highlight_string function requires that the text be surrounded - // by PHP tags. Since we don't know if A) the submitted text has PHP tags, - // or B) whether the PHP tags enclose the entire string, we will add our - // own PHP tags around the string along with some markers to make replacement easier later - - $str = ''; - - // All the magic happens here, baby! + // by PHP tags, which we will remove later + $str = ''; // tags + // so we'll replace them with tags. + + if (abs(PHP_VERSION) < 5) { $str = str_replace(array(''), array(''), $str); $str = preg_replace('#color="(.*?)"#', 'style="color: \\1"', $str); + $str = str_replace('<?php ', '', $str); } - - // Remove our artificially added PHP - $str = preg_replace("#\.+?tempstart\
    (?:\)?#is", "\n", $str); - $str = preg_replace("#tempend.+#is", "    \n", $str); - + + // Remove our artificially added PHP, and the syntax highlighting that came with it + $str = str_replace('<?php ', '', $str); + $str = preg_replace('/(.*?)\?><\/span>\n<\/span>\n<\/code>/is', "$1\n\n", $str); + $str = preg_replace('/<\/span>/i', '', $str); + // Replace our markers back to PHP tags. $str = str_replace(array('phptagopen', 'phptagclose', 'asptagopen', 'asptagclose', 'backslashtmp', 'scriptclose'), array('<?', '?>', '<%', '%>', '\\', '</script>'), $str); diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 39303bdd..f08c94e8 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -118,6 +118,7 @@

    Bug fixes for 1.7.0

  • Fixed incorrect parenthesis in form_open() function. (#5135)
  • Fixed a bug that was ignoring case when comparing controller methods (#4560)
  • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function
    • +
  • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.

    • Version 1.6.3

    From 337c74ab2af0dec69659f8c68c82b12c878c1b88 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 3 Oct 2008 19:09:53 +0000 Subject: [PATCH 1421/2544] tweak of temp tag and highlighting replacement to accommodate environments with different colors specified for highlight_string() --- system/helpers/text_helper.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 54ef1b58..9f13896a 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -287,12 +287,11 @@ function highlight_code($str) { $str = str_replace(array(''), array(''), $str); $str = preg_replace('#color="(.*?)"#', 'style="color: \\1"', $str); - $str = str_replace('<?php ', '', $str); } - + // Remove our artificially added PHP, and the syntax highlighting that came with it - $str = str_replace('<?php ', '', $str); - $str = preg_replace('/(.*?)\?><\/span>\n<\/span>\n<\/code>/is', "$1\n\n", $str); + $str = preg_replace('/<\?php( | )/i', '', $str); + $str = preg_replace('/(.*?)\?><\/span>\n<\/span>\n<\/code>/is', "$1\n\n", $str); $str = preg_replace('/<\/span>/i', '', $str); // Replace our markers back to PHP tags. From 2f26ba98c2ccda07fe2177d0b48b117ca8fddafe Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 4 Oct 2008 01:38:01 +0000 Subject: [PATCH 1422/2544] Added function to optionally limit the length of the file name --- system/libraries/Upload.php | 57 +++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 13026bca..a2437d07 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -29,6 +29,7 @@ class CI_Upload { var $max_size = 0; var $max_width = 0; var $max_height = 0; + var $max_filename = 0; var $allowed_types = ""; var $file_temp = ""; var $file_name = ""; @@ -147,7 +148,7 @@ function do_upload($field = 'userfile') // errors will already be set by validate_upload_path() so just return FALSE return FALSE; } - + // Was the file able to be uploaded? If not, determine the reason why. if ( ! is_uploaded_file($_FILES[$field]['tmp_name'])) { @@ -221,6 +222,12 @@ function do_upload($field = 'userfile') // Sanitize the file name for security $this->file_name = $this->clean_file_name($this->file_name); + + // Truncate the file name if it's too long + if ($this->max_filename > 0) + { + $this->file_name = $this->limit_filename_length($this->file_name, $this->max_filename); + } // Remove white spaces in the name if ($this->remove_spaces == TRUE) @@ -325,7 +332,8 @@ function data() */ function set_upload_path($path) { - $this->upload_path = $path; + // Make sure it has a trailing slash + $this->upload_path = rtrim($path, '/').'/'; } // -------------------------------------------------------------------- @@ -347,7 +355,7 @@ function set_filename($path, $filename) if ($this->encrypt_name == TRUE) { mt_srand(); - $filename = md5(uniqid(mt_rand())).$this->file_ext; + $filename = md5(uniqid(mt_rand())).$this->file_ext; } if ( ! file_exists($path.$filename)) @@ -394,6 +402,20 @@ function set_max_filesize($n) // -------------------------------------------------------------------- + /** + * Set Maximum File Name Length + * + * @access public + * @param integer + * @return void + */ + function set_max_filename($n) + { + $this->max_filename = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; + } + + // -------------------------------------------------------------------- + /** * Set Maximum Image Width * @@ -711,7 +733,34 @@ function clean_file_name($filename) return stripslashes($filename); } + + // -------------------------------------------------------------------- + /** + * Limit the File Name Length + * + * @access public + * @param string + * @return string + */ + function limit_filename_length($filename, $length) + { + if (strlen($filename) < $length) + { + return $filename; + } + + $ext = ''; + if (strpos($filename, '.') !== FALSE) + { + $parts = explode('.', $filename); + $ext = '.'.array_pop($parts); + $filename = implode('.', $parts); + } + + return substr($filename, 0, ($length - strlen($ext))).$ext; + } + // -------------------------------------------------------------------- /** @@ -832,6 +881,8 @@ function mimes_types($mime) return ( ! isset($this->mimes[$mime])) ? FALSE : $this->mimes[$mime]; } + // -------------------------------------------------------------------- + /** * Prep Filename * From 0aac08e4a24b3fdad3af7f608f6861c18547a42b Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 4 Oct 2008 01:39:44 +0000 Subject: [PATCH 1423/2544] Tweaked the last feature added to limit file name length --- system/libraries/Upload.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index a2437d07..42d02d94 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -81,6 +81,7 @@ function initialize($config = array()) 'max_size' => 0, 'max_width' => 0, 'max_height' => 0, + 'max_filename' => 0, 'allowed_types' => "", 'file_temp' => "", 'file_name' => "", From c9e14da82b2c0467912d841ce72099927a3e6881 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 4 Oct 2008 01:42:12 +0000 Subject: [PATCH 1424/2544] Added description of the max_filename parameter --- user_guide/libraries/file_uploading.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index baa179fb..fb976975 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -288,6 +288,12 @@

    Preferences

    The maximum height (in pixels) that the file can be. Set to zero for no limit. + +max_filename +0 +None +The maximum length that a file name can be. Set to zero for no limit. + encrypt_name From 694f2c6474f924b2f22a1330d0c0b51757862274 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 4 Oct 2008 01:43:45 +0000 Subject: [PATCH 1425/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f08c94e8..3bf065e2 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,6 +71,7 @@

    Version 1.7

  • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
  • Added controller class/method info to Profiler class.
  • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
    • +
  • Added max_filename option to set a file name length limit in the File Upload Class.
  • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div.
    • From 9af2ec4d32deb49282587b45d2a02446a6400b19 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Sat, 4 Oct 2008 01:47:48 +0000 Subject: [PATCH 1426/2544] removed some ereg() calls for better performance --- system/libraries/Upload.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 42d02d94..3832dab0 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -398,7 +398,7 @@ function set_filename($path, $filename) */ function set_max_filesize($n) { - $this->max_size = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; + $this->max_size = ((int) $n < 0) ? 0: (int) $n; } // -------------------------------------------------------------------- @@ -412,7 +412,7 @@ function set_max_filesize($n) */ function set_max_filename($n) { - $this->max_filename = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; + $this->max_filename = ((int) $n < 0) ? 0: (int) $n; } // -------------------------------------------------------------------- @@ -426,7 +426,7 @@ function set_max_filename($n) */ function set_max_width($n) { - $this->max_width = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; + $this->max_width = ((int) $n < 0) ? 0: (int) $n; } // -------------------------------------------------------------------- @@ -440,7 +440,7 @@ function set_max_width($n) */ function set_max_height($n) { - $this->max_height = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; + $this->max_height = ((int) $n < 0) ? 0: (int) $n; } // -------------------------------------------------------------------- From dbc9e15c814ad2fc8a3fb10fbd1350d42b1f7f9c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 6 Oct 2008 14:41:47 +0000 Subject: [PATCH 1427/2544] Altered auto_link() in the URL helper so that email addresses with "+" included will be linked. --- system/helpers/url_helper.php | 2 +- user_guide/changelog.html | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 121b36b9..acf88900 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -400,7 +400,7 @@ function auto_link($str, $type = 'both', $popup = FALSE) if ($type != 'url') { - if (preg_match_all("/([a-zA-Z0-9_\.\-]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)/i", $str, $matches)) + if (preg_match_all("/([a-zA-Z0-9_\.\-\+Ã…]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)/i", $str, $matches)) { for ($i = 0; $i < sizeof($matches['0']); $i++) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3bf065e2..dfb11fbf 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -77,27 +77,28 @@

    Version 1.7

  • Database
      -
    • Added removal of non-printing control characters in escape_str() of DB drivers that do not have native PHP escaping mechanisms (mssql, oci8, odbc), to avoid +
    • Added removal of non-printing control characters in escape_str() of DB drivers that do not have native PHP escaping mechanisms (mssql, oci8, odbc), to avoid potential SQL errors, and possible sources of SQL injection.
  • Helpers
    • Added several new "setting" functions to the Form helper that allow POST data to be retrieved and set into forms. These are intended to be used on their own, or with the new Form Validation Class.
      • -
    • Added current_url() and uri_segments() to URL helper..
      • -
    • Improved accuracy of calculations in Number helper..
      • +
    • Added current_url() and uri_segments() to URL helper.
      • +
    • Altered auto_link() in the URL helper so that email addresses with "+" included will be linked.
      • +
    • Improved accuracy of calculations in Number helper.
    • Removed added newlines ("\n") from most form and html helper functions.
      • -
    • Tightened up validation in Date Helper human_to_unix(), and eliminated the POSIX regex.
      • -
    • Updated Date Helper to match the world's current time zones and offsets.
      • +
    • Tightened up validation in the Date helper function human_to_unix(), and eliminated the POSIX regex.
      • +
    • Updated Date helper to match the world's current time zones and offsets.
  • Other changes
      -
    • Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.
      • +
    • Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.
      • +
    • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
    • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
      • -
    • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
    • Added PHP Style Guide to docs.
      • -
    • Added backticks around column names in MySQL when using insert_string and update_string functions, and in where() function.
      • +
    • Added backticks around column names in MySQL when using insert_string and update_string functions, and in where() function.
    • Modified Pagination library to only output the "First" link when the link for page one would not be shown.
    • @@ -105,7 +106,7 @@

    Version 1.7

    Bug fixes for 1.7.0

      -
    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • +
    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229, #5254).
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
      • @@ -114,12 +115,12 @@

      Bug fixes for 1.7.0

    • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.
    • Fixed a bug (#4536) in backups with the MySQL driver where some legacy code was causing certain characters to be double escaped.
    • Fixed a routing bug (#4661) that occurred when the default route pointed to a subfolder.
      • -
    • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
      • +
    • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
    • Fixed the spelling of "raspberry" in config/smileys.php
      • -
    • Fixed incorrect parenthesis in form_open() function. (#5135)
      • +
    • Fixed incorrect parenthesis in form_open() function. (#5135)
    • Fixed a bug that was ignoring case when comparing controller methods (#4560)
    • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function
      • -
    • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
      • +
    • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.

    Version 1.6.3

    From 3386c849e67ec9820ee1aef4bbfbb61da137b9b1 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 6 Oct 2008 18:10:59 +0000 Subject: [PATCH 1428/2544] Added set_status_header() function to docs --- user_guide/libraries/output.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 304cd0a2..efb3346c 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -99,6 +99,16 @@

    $this->output->set_header();

    $this->output->set_header("Cache-Control: post-check=0, pre-check=0", false);
    $this->output->set_header("Pragma: no-cache"); + +

    $this->output->set_status_header();

    + +

    Permits you to manually set a server status header. Example:

    + +$this->output->set_status_header('401');
    +// Sets the header as: Unauthorized     + +

    See here for a full list of headers.

    +

    $this->output->enable_profiler();

    Permits you to enable/disable the Profiler, which will display benchmark and other data From 7f528c34ba7599aa495139be64da78037af155bc Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 6 Oct 2008 18:12:01 +0000 Subject: [PATCH 1429/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index dfb11fbf..4d90f6fd 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -72,6 +72,7 @@

    Version 1.7

  • Added controller class/method info to Profiler class.
  • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
  • Added max_filename option to set a file name length limit in the File Upload Class.
    • +
  • Added set_status_header() function to Output class
  • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div.
    • From b4a6cf35fe8c637cec5be811f109f6f841456283 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 6 Oct 2008 18:39:36 +0000 Subject: [PATCH 1430/2544] Added some code to ignore empty folders when deleting directories --- system/helpers/file_helper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 58951823..6378784f 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -132,7 +132,11 @@ function delete_files($path, $del_dir = FALSE, $level = 0) { if (is_dir($path.'/'.$filename)) { - delete_files($path.'/'.$filename, $del_dir, $level + 1); + // Ignore empty folders + if (substr($filename, 0, 1) != '.') + { + delete_files($path.'/'.$filename, $del_dir, $level + 1); + } } else { From 2cad6e9da8b94833503d0d2f545bcaa29d50bd5d Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 00:19:34 +0000 Subject: [PATCH 1431/2544] There was a call to $this->input->_remove_invisible_characters($str); It should have been: $this->input->CI->_remove_invisible_characters($str); --- system/database/DB_forge.php | 2 +- system/database/drivers/mssql/mssql_driver.php | 2 +- system/database/drivers/oci8/oci8_driver.php | 2 +- system/database/drivers/odbc/odbc_driver.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index d48165e2..64f95d63 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -191,7 +191,7 @@ function create_table($table = '', $if_not_exists = FALSE) } $sql = $this->_create_table($this->db->dbprefix.$table, $this->fields, $this->primary_keys, $this->keys, $if_not_exists); - + $this->_reset(); return $this->db->query($sql); } diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index fd3f9638..9d7e072a 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -214,7 +214,7 @@ function trans_rollback() function escape_str($str) { // Escape single quotes - return str_replace("'", "''", $this->input->_remove_invisible_characters($str)); + return str_replace("'", "''", $this->CI->input->_remove_invisible_characters($str)); } // -------------------------------------------------------------------- diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 9d919325..98c99329 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -366,7 +366,7 @@ function trans_rollback() */ function escape_str($str) { - return $this->input->_remove_invisible_characters($str); + return $this->input->CI->_remove_invisible_characters($str); } // -------------------------------------------------------------------- diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 06282e55..a64eb56b 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -235,7 +235,7 @@ function trans_rollback() function escape_str($str) { // ODBC doesn't require escaping - return $this->input->_remove_invisible_characters($str); + return $this->input->CI->_remove_invisible_characters($str); } // -------------------------------------------------------------------- From b6ba6a3a8ef3d594ff3f32f2d128a8211f1d2db3 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 00:44:41 +0000 Subject: [PATCH 1432/2544] Added support for empty connection strings, based on bug # 3135 --- .../drivers/postgre/postgre_driver.php | 39 +++++++++++++++---- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 55f65028..aada164d 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -38,6 +38,35 @@ class CI_DB_postgre_driver extends CI_DB { var $_count_string = "SELECT COUNT(*) AS "; var $_random_keyword = ' RANDOM()'; // database specific random keyword + /** + * Connection String + * + * @access private + * @return string + */ + function _connect_string() + { + $components = array( + 'hostname' => 'host', + 'port' => 'port', + 'database' => 'dbname', + 'username' => 'user', + 'password' => 'password' + ); + + $connect_string = ""; + foreach ($components as $key => $val) + { + if (isset($this->$key) && $this->$key != '') + { + $connect_string .= " $val=".$this->$key; + } + } + return trim($connect_string); + } + + // -------------------------------------------------------------------- + /** * Non-persistent database connection * @@ -45,10 +74,8 @@ class CI_DB_postgre_driver extends CI_DB { * @return resource */ function db_connect() - { - $port = ($this->port == '') ? '' : " port=".$this->port; - - return @pg_connect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password); + { + return @pg_connect($this->_connect_string()); } // -------------------------------------------------------------------- @@ -61,9 +88,7 @@ function db_connect() */ function db_pconnect() { - $port = ($this->port == '') ? '' : " port=".$this->port; - - return @pg_pconnect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password); + return @pg_pconnect($this->_connect_string()); } // -------------------------------------------------------------------- From ceb6f0bfdeaad23bad419ff4e62519342cc03d05 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 00:48:19 +0000 Subject: [PATCH 1433/2544] Added $params to ODBC constructor, based on bug report #3374 --- system/database/drivers/odbc/odbc_driver.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index a64eb56b..7c59c306 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -39,8 +39,16 @@ class CI_DB_odbc_driver extends CI_DB { var $_random_keyword; - function CI_DB_odbc_driver() + function CI_DB_odbc_driver($params) { + if (is_array($params)) + { + foreach ($params as $key => $val) + { + $this->$key = $val; + } + } + $this->_random_keyword = ' RND('.time().')'; // database specific random keyword } From a2a240a87baa0cf6a425837158880f5235e3bca6 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 00:55:41 +0000 Subject: [PATCH 1434/2544] Fixed a bug (#2985) in which multiple queries using a single request were not being honored --- system/database/DB_driver.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index b937ffd6..257f1ee9 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -382,6 +382,7 @@ function query($sql, $binds = FALSE, $return_object = TRUE) $RES->stmt_id = $this->stmt_id; $RES->curs_id = NULL; $RES->limit_used = $this->limit_used; + $this->stmt_id = FALSE; } // Is query caching enabled? If so, we'll serialize the From 482ee4325894bb05b4f97bb9e9ded14e5fce93ba Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 00:59:08 +0000 Subject: [PATCH 1435/2544] Fixed Oracle bug (#3306) that was preventing multiple queries in one action --- system/database/drivers/oci8/oci8_driver.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 98c99329..362da58f 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -141,6 +141,7 @@ function _execute($sql) { // oracle must parse the query before it is run. All of the actions with // the query are based on the statement id returned by ociparse + $this->stmt_id = FALSE; $this->_set_stmt_id($sql); ocisetprefetch($this->stmt_id, 1000); return @ociexecute($this->stmt_id, $this->_commit); From 69f23c1964c8e7352c5a75702fce30de9d4bd227 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 01:00:23 +0000 Subject: [PATCH 1436/2544] --- user_guide/changelog.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4d90f6fd..d77ed089 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -122,6 +122,8 @@

    Bug fixes for 1.7.0

  • Fixed a bug that was ignoring case when comparing controller methods (#4560)
  • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function
  • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
    • +
  • Fixed Oracle bug (#3306) that was preventing multiple queries in one action.
    • +
  • Fixed ODBC bug that was ignoring connection params due to its use of a constructor.

    • Version 1.6.3

    From 06a2e74e8834e88e4639d17dc756403985ca00f8 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 01:04:15 +0000 Subject: [PATCH 1437/2544] Oops! Didn't realize that the CI super object was not being used by the main Driver. Fixed... --- system/database/drivers/mssql/mssql_driver.php | 7 +++++-- system/database/drivers/oci8/oci8_driver.php | 5 ++++- system/database/drivers/odbc/odbc_driver.php | 5 ++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 9d7e072a..1c6249ae 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -212,9 +212,12 @@ function trans_rollback() * @return string */ function escape_str($str) - { + { + // Access the CI object + $CI->get_instance(); + // Escape single quotes - return str_replace("'", "''", $this->CI->input->_remove_invisible_characters($str)); + return str_replace("'", "''", $CI->input->_remove_invisible_characters($str)); } // -------------------------------------------------------------------- diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 362da58f..82bc51bf 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -367,7 +367,10 @@ function trans_rollback() */ function escape_str($str) { - return $this->input->CI->_remove_invisible_characters($str); + // Access the CI object + $CI->get_instance(); + + return $CI->_remove_invisible_characters($str); } // -------------------------------------------------------------------- diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 7c59c306..985c975c 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -242,8 +242,11 @@ function trans_rollback() */ function escape_str($str) { + // Access the CI object + $CI->get_instance(); + // ODBC doesn't require escaping - return $this->input->CI->_remove_invisible_characters($str); + return $CI->_remove_invisible_characters($str); } // -------------------------------------------------------------------- From 9f0de7967cc2c5fe8140a3042bb900c43ab8336c Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 01:09:40 +0000 Subject: [PATCH 1438/2544] Added a file lock check during cache writing, as per suggestion at bug #3466 --- system/libraries/Output.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/system/libraries/Output.php b/system/libraries/Output.php index 781e368c..98a941af 100644 --- a/system/libraries/Output.php +++ b/system/libraries/Output.php @@ -389,9 +389,16 @@ function _write_cache($output) $expire = time() + ($this->cache_expiration * 60); - flock($fp, LOCK_EX); - fwrite($fp, $expire.'TS--->'.$output); - flock($fp, LOCK_UN); + if (flock($fp, LOCK_EX)) + { + fwrite($fp, $expire.'TS--->'.$output); + flock($fp, LOCK_UN); + } + else + { + log_message('error', "Unable to secure a file lock for file at: ".$cache_path); + return; + } fclose($fp); @chmod($cache_path, DIR_WRITE_MODE); From a94264a4e1c0d5b56be22fa6355b761d5c455371 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 01:10:52 +0000 Subject: [PATCH 1439/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d77ed089..4cb6266e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -101,6 +101,7 @@

    Version 1.7

  • Added PHP Style Guide to docs.
  • Added backticks around column names in MySQL when using insert_string and update_string functions, and in where() function.
  • Modified Pagination library to only output the "First" link when the link for page one would not be shown.
    • +
  • Added a file lock check during caching, before trying to write to the file.
    • From 218839a7f4910834e4e991c6650da05b1bd7f743 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 01:15:48 +0000 Subject: [PATCH 1440/2544] Fixed bug (#3472) that was adding quotes incorrectly. --- system/database/drivers/mssql/mssql_driver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 1c6249ae..d0e1092e 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -470,11 +470,11 @@ function _protect_identifiers($item, $first_word_only = FALSE) // This function may get "field >= 1", and need it to return ""field" >= 1" $lbound = ($first_word_only === TRUE) ? '' : '|\s|\('; - $item = preg_replace('/(^'.$lbound.')([\w\d\-\_]+?)(\s|\)|$)/iS', '$1"$2"$3', $item); + $item = preg_replace('/(^'.$lbound.')([\w\d\-\_]+?)(\s|\)|$)/iS', '$1$2$3', $item); } else { - return "\"{$item}\""; + return $item; } $exceptions = array('AS', '/', '-', '%', '+', '*', 'OR', 'IS'); From ca86a7cf108fe13b89ba22b727a10ab3ac58db19 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 01:16:57 +0000 Subject: [PATCH 1441/2544] --- system/database/drivers/mssql/mssql_driver.php | 2 +- system/database/drivers/oci8/oci8_driver.php | 2 +- system/database/drivers/odbc/odbc_driver.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index d0e1092e..ed6eadbf 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -214,7 +214,7 @@ function trans_rollback() function escape_str($str) { // Access the CI object - $CI->get_instance(); + $CI =& get_instance(); // Escape single quotes return str_replace("'", "''", $CI->input->_remove_invisible_characters($str)); diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 82bc51bf..96a6a135 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -368,7 +368,7 @@ function trans_rollback() function escape_str($str) { // Access the CI object - $CI->get_instance(); + $CI =& get_instance(); return $CI->_remove_invisible_characters($str); } diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 985c975c..29928807 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -243,7 +243,7 @@ function trans_rollback() function escape_str($str) { // Access the CI object - $CI->get_instance(); + $CI =& get_instance(); // ODBC doesn't require escaping return $CI->_remove_invisible_characters($str); From 5aa8c60392a89140448691b838a90b7d1c644774 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 01:24:07 +0000 Subject: [PATCH 1442/2544] Explicitly added driver name variable in each DB driver, based on this bug report: #4436 --- system/database/drivers/mssql/mssql_driver.php | 3 ++- system/database/drivers/mysql/mysql_driver.php | 2 ++ system/database/drivers/mysqli/mysqli_driver.php | 2 ++ system/database/drivers/oci8/oci8_driver.php | 2 ++ system/database/drivers/odbc/odbc_driver.php | 2 ++ system/database/drivers/postgre/postgre_driver.php | 2 ++ system/database/drivers/sqlite/sqlite_driver.php | 2 ++ 7 files changed, 14 insertions(+), 1 deletion(-) diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index ed6eadbf..02b975ad 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -37,7 +37,8 @@ class CI_DB_mssql_driver extends CI_DB { */ var $_count_string = "SELECT COUNT(*) AS "; var $_random_keyword = ' ASC'; // not currently supported - + var $dbdriver = 'mssql'; + /** * Non-persistent database connection * diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 52df1e59..db04c6de 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -30,6 +30,8 @@ */ class CI_DB_mysql_driver extends CI_DB { + var $dbdriver = 'mysql'; + /** * Whether to use the MySQL "delete hack" which allows the number * of affected rows to be shown. Uses a preg_replace when enabled, diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 35a7fc07..a5d104cc 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -30,6 +30,8 @@ */ class CI_DB_mysqli_driver extends CI_DB { + var $dbdriver = 'mysqli'; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 96a6a135..006e6ef1 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -43,6 +43,8 @@ class CI_DB_oci8_driver extends CI_DB { + var $dbdriver = 'oci8'; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 29928807..cc8d3347 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -30,6 +30,8 @@ */ class CI_DB_odbc_driver extends CI_DB { + var $dbdriver = 'odbc'; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index aada164d..c5c70a73 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -30,6 +30,8 @@ */ class CI_DB_postgre_driver extends CI_DB { + var $dbdriver = 'postgre'; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 78215694..df19dba7 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -32,6 +32,8 @@ */ class CI_DB_sqlite_driver extends CI_DB { + var $dbdriver = 'sqlite'; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is From 920b422881cd983c1e519852741ac324933437c2 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 7 Oct 2008 01:25:11 +0000 Subject: [PATCH 1443/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4cb6266e..a822b6c4 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -102,6 +102,7 @@

    Version 1.7

  • Added backticks around column names in MySQL when using insert_string and update_string functions, and in where() function.
  • Modified Pagination library to only output the "First" link when the link for page one would not be shown.
  • Added a file lock check during caching, before trying to write to the file.
    • +
  • Added driver name variable in each DB driver, based on this bug report: #4436
    • From 98e2532e5bd31dc8ec7c88e60b463436157ca011 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 7 Oct 2008 02:03:16 +0000 Subject: [PATCH 1444/2544] unset $Version, $Path, and $Domain cookie keys, to prevent Disallowed Key Characters from halting app execution on environments which improperly set these as keys --- system/libraries/Input.php | 8 ++++++++ user_guide/changelog.html | 2 ++ 2 files changed, 10 insertions(+) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 853b06d7..f840c433 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -140,6 +140,14 @@ function _sanitize_globals() $_POST = $this->_clean_input_data($_POST); // Clean $_COOKIE Data + // Also get rid of specially treated cookies that might be set by a server + // or silly application, that are of no use to a CI application anyway + // but that when present will trip our 'Disallowed Key Characters' alarm + // http://www.ietf.org/rfc/rfc2109.txt + // note that the key names below are single quoted strings, and are not PHP variables + unset($_COOKIE['$Version']); + unset($_COOKIE['$Path']); + unset($_COOKIE['$Domain']) $_COOKIE = $this->_clean_input_data($_COOKIE); log_message('debug', "Global POST and COOKIE data sanitized"); diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a822b6c4..6595807b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -103,6 +103,8 @@

    Version 1.7

  • Modified Pagination library to only output the "First" link when the link for page one would not be shown.
  • Added a file lock check during caching, before trying to write to the file.
  • Added driver name variable in each DB driver, based on this bug report: #4436
    • +
  • Modified Cookie key cleaning to unset a few troublesome key names that can be present in certain environments, + preventing CI from halting execution.
    • From bfbe73500060cf1e3b5dd7901e78ca7c1474b84e Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 7 Oct 2008 02:40:47 +0000 Subject: [PATCH 1445/2544] syntax error --- system/libraries/Input.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index f840c433..4e312c7a 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -147,7 +147,7 @@ function _sanitize_globals() // note that the key names below are single quoted strings, and are not PHP variables unset($_COOKIE['$Version']); unset($_COOKIE['$Path']); - unset($_COOKIE['$Domain']) + unset($_COOKIE['$Domain']); $_COOKIE = $this->_clean_input_data($_COOKIE); log_message('debug', "Global POST and COOKIE data sanitized"); From d8ee6c86e4a3bbaf392679773e69f4791e3a3239 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 7 Oct 2008 13:32:40 +0000 Subject: [PATCH 1446/2544] minor formatting --- user_guide/changelog.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 6595807b..ce940059 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -72,7 +72,7 @@

    Version 1.7

  • Added controller class/method info to Profiler class.
  • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
  • Added max_filename option to set a file name length limit in the File Upload Class.
    • -
  • Added set_status_header() function to Output class
    • +
  • Added set_status_header() function to Output class.
  • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div.
    • @@ -102,7 +102,7 @@

    Version 1.7

  • Added backticks around column names in MySQL when using insert_string and update_string functions, and in where() function.
  • Modified Pagination library to only output the "First" link when the link for page one would not be shown.
  • Added a file lock check during caching, before trying to write to the file.
    • -
  • Added driver name variable in each DB driver, based on this bug report: #4436
    • +
  • Added driver name variable in each DB driver, based on bug report #4436.
  • Modified Cookie key cleaning to unset a few troublesome key names that can be present in certain environments, preventing CI from halting execution.
    • @@ -114,18 +114,18 @@

    Bug fixes for 1.7.0

  • Fixed bug in xss_clean() that could remove some desirable tag attributes.
  • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229, #5254).
  • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
    • -
  • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
    • +
  • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
  • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
  • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.
  • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.
  • Fixed a bug (#4536) in backups with the MySQL driver where some legacy code was causing certain characters to be double escaped.
  • Fixed a routing bug (#4661) that occurred when the default route pointed to a subfolder.
  • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
    • -
  • Fixed the spelling of "raspberry" in config/smileys.php
    • -
  • Fixed incorrect parenthesis in form_open() function. (#5135)
    • -
  • Fixed a bug that was ignoring case when comparing controller methods (#4560)
    • -
  • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function
    • -
  • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
    • +
  • Fixed the spelling of "raspberry" in config/smileys.php.
    • +
  • Fixed incorrect parenthesis in form_open() function (#5135).
    • +
  • Fixed a bug that was ignoring case when comparing controller methods (#4560).
    • +
  • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function.
    • +
  • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
  • Fixed Oracle bug (#3306) that was preventing multiple queries in one action.
  • Fixed ODBC bug that was ignoring connection params due to its use of a constructor.
    • From a8664295b31968aa29556b93b13bb6a6080be19e Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 8 Oct 2008 22:38:31 +0000 Subject: [PATCH 1447/2544] moved call to $RES->num_rows() further down in code so that oracle-specific class variables would be set properly as needed before executing --- system/database/DB_driver.php | 4 +++- user_guide/changelog.html | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 257f1ee9..572595f4 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -375,7 +375,6 @@ function query($sql, $binds = FALSE, $return_object = TRUE) $RES = new $driver(); $RES->conn_id = $this->conn_id; $RES->result_id = $this->result_id; - $RES->num_rows = $RES->num_rows(); if ($this->dbdriver == 'oci8') { @@ -385,6 +384,9 @@ function query($sql, $binds = FALSE, $return_object = TRUE) $this->stmt_id = FALSE; } + // oci8 vars must be set before calling this + $RES->num_rows = $RES->num_rows(); + // Is query caching enabled? If so, we'll serialize the // result object and save it to a cache file. if ($this->cache_on == TRUE AND $this->_cache_init()) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ce940059..c6154f08 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -128,6 +128,7 @@

    Bug fixes for 1.7.0

  • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
  • Fixed Oracle bug (#3306) that was preventing multiple queries in one action.
  • Fixed ODBC bug that was ignoring connection params due to its use of a constructor.
    • +
  • Fixed a DB driver bug with num_rows() that would cause an error with the Oracle driver.

    • Version 1.6.3

    From ccfe9139d574f37163c81d8c7d2c73d6a53d3ab1 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 9 Oct 2008 18:46:13 +0000 Subject: [PATCH 1448/2544] fixed spelling of existant to existent --- system/libraries/Loader.php | 4 ++-- user_guide/changelog.html | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 37cab318..b30798f6 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -891,8 +891,8 @@ function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NU // Is the class name valid? if ( ! class_exists($name)) { - log_message('error', "Non-existant class: ".$name); - show_error("Non-existant class: ".$class); + log_message('error', "Non-existent class: ".$name); + show_error("Non-existent class: ".$class); } // Set the variable name we will assign the class to diff --git a/user_guide/changelog.html b/user_guide/changelog.html index c6154f08..10c35e75 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -129,6 +129,7 @@

    Bug fixes for 1.7.0

  • Fixed Oracle bug (#3306) that was preventing multiple queries in one action.
  • Fixed ODBC bug that was ignoring connection params due to its use of a constructor.
  • Fixed a DB driver bug with num_rows() that would cause an error with the Oracle driver.
    • +
  • Fixed a spelling error in a Loader error message.

    • Version 1.6.3

    From fd275707f6c1a5a63feb8708731d7c97683df765 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 10 Oct 2008 22:37:06 +0000 Subject: [PATCH 1449/2544] modifications to url_title() --- system/helpers/url_helper.php | 19 ++++++++++--------- user_guide/changelog.html | 2 ++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index acf88900..002090df 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -479,19 +479,20 @@ function url_title($str, $separator = 'dash') } $trans = array( - $search => $replace, - "\s+" => $replace, - "[^a-z0-9".$replace."]" => '', - $replace."+" => $replace, - $replace."$" => '', - "^".$replace => '' - ); + '&\#\d+?;' => '', + '&\S+?;' => '', + '\s+' => $replace, + '[^a-z0-9\-\._]' => '', + $replace.'+' => $replace, + $replace.'$' => $replace, + '^'.$replace => $replace + ); - $str = strip_tags(strtolower($str)); + $str = strip_tags($str); foreach ($trans as $key => $val) { - $str = preg_replace("#".$key."#", $val, $str); + $str = preg_replace("#".$key."#i", $val, $str); } return trim(stripslashes($str)); diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 10c35e75..75cb819b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -91,6 +91,8 @@

    Version 1.7

  • Removed added newlines ("\n") from most form and html helper functions.
  • Tightened up validation in the Date helper function human_to_unix(), and eliminated the POSIX regex.
  • Updated Date helper to match the world's current time zones and offsets.
    • +
  • Modified url_title() in the URL helper to remove characters and digits that are part of + character entities, to allow dashes, underscores, and periods regardless of the $separator, and to allow uppercase characters.
  • Other changes From 42597a107d799fa86ebc706bf8cbac4f9471d08c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 15 Oct 2008 14:10:44 +0000 Subject: [PATCH 1450/2544] Added support for arbitrary attributes in anchor_popup() of the URL helper. --- system/helpers/url_helper.php | 112 ++++++++++++++++++---------------- user_guide/changelog.html | 1 + 2 files changed, 60 insertions(+), 53 deletions(-) diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 002090df..744295f4 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -36,7 +36,7 @@ * @access public * @param string * @return string - */ + */ if ( ! function_exists('site_url')) { function site_url($uri = '') @@ -55,7 +55,7 @@ function site_url($uri = '') * * @access public * @return string - */ + */ if ( ! function_exists('base_url')) { function base_url() @@ -75,7 +75,7 @@ function base_url() * * @access public * @return string - */ + */ if ( ! function_exists('current_url')) { function current_url() @@ -89,11 +89,11 @@ function current_url() /** * URL String * - * Returns the URI segments. + * Returns the URI segments. * * @access public * @return string - */ + */ if ( ! function_exists('uri_string')) { function uri_string() @@ -112,7 +112,7 @@ function uri_string() * * @access public * @return string - */ + */ if ( ! function_exists('index_page')) { function index_page() @@ -121,7 +121,7 @@ function index_page() return $CI->config->item('index_page'); } } - + // ------------------------------------------------------------------------ /** @@ -134,13 +134,13 @@ function index_page() * @param string the link title * @param mixed any attributes * @return string - */ + */ if ( ! function_exists('anchor')) { function anchor($uri = '', $title = '', $attributes = '') { $title = (string) $title; - + if ( ! is_array($uri)) { $site_url = ( ! preg_match('!^\w+://! i', $uri)) ? site_url($uri) : $uri; @@ -149,7 +149,7 @@ function anchor($uri = '', $title = '', $attributes = '') { $site_url = site_url($uri); } - + if ($title == '') { $title = $site_url; @@ -163,7 +163,7 @@ function anchor($uri = '', $title = '', $attributes = '') return ''.$title.''; } } - + // ------------------------------------------------------------------------ /** @@ -181,35 +181,41 @@ function anchor($uri = '', $title = '', $attributes = '') if ( ! function_exists('anchor_popup')) { function anchor_popup($uri = '', $title = '', $attributes = FALSE) - { + { $title = (string) $title; - + $site_url = ( ! preg_match('!^\w+://! i', $uri)) ? site_url($uri) : $uri; - + if ($title == '') { $title = $site_url; } - + if ($attributes === FALSE) { return "".$title.""; } - + if ( ! is_array($attributes)) { $attributes = array(); } - + foreach (array('width' => '800', 'height' => '600', 'scrollbars' => 'yes', 'status' => 'yes', 'resizable' => 'yes', 'screenx' => '0', 'screeny' => '0', ) as $key => $val) { $atts[$key] = ( ! isset($attributes[$key])) ? $val : $attributes[$key]; + unset($attributes[$key]); + } + + if ($attributes != '') + { + $attributes = _parse_attributes($attributes); } - return "".$title.""; + return "".$title.""; } } - + // ------------------------------------------------------------------------ /** @@ -226,18 +232,18 @@ function anchor_popup($uri = '', $title = '', $attributes = FALSE) function mailto($email, $title = '', $attributes = '') { $title = (string) $title; - + if ($title == "") { $title = $email; } - + $attributes = _parse_attributes($attributes); - + return ''.$title.''; } } - + // ------------------------------------------------------------------------ /** @@ -256,17 +262,17 @@ function mailto($email, $title = '', $attributes = '') function safe_mailto($email, $title = '', $attributes = '') { $title = (string) $title; - + if ($title == "") { $title = $email; } - + for ($i = 0; $i < 16; $i++) { $x[] = substr(' - - - - - - - - - - - -Change Log : CodeIgniter User Guide - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Change Log

    - -

    Version 1.7.1

    -

    Release Date: not yet released
    -SVN Revision:

    - -
      -
    • Libraries -
        -
      • Changed default current page indicator in the Pagination library to use <strong> instead of <b>
        • -
      -
      • -
    - -

    Bug fixes for 1.7.1

    -
      -
    • Fixed a bug in the MySQLi driver when no port is specified
      • -
    • Fixed a bug (#5702), in which the field label was not being fetched properly, when "matching" one field to another.
      • -
    • Fixed a bug in which identifers were not being escaped properly when reserved characters were used.
      • -
    • Fixed a bug with the regular expression used to protect submitted paragraph tags in auto typography.

      -
    • Fixed a bug where double dashes within tag attributes were being converted to em dash entities.
      • -
    - - -

    Version 1.7

    -

    Release Date: October 23, 2008
    -SVN Revision: 1541

    - -
      -
    • Libraries -
        -
      • Added a new Form Validation Class. It simplifies setting rules and field names, supports arrays as field names, allows groups of validation rules to be saved in a config file, and adds some helper functions for use in view files. Please note that the old Validation class is now deprecated. We will leave it in the library folder for some time so that existing applications that use it will not break, but you are encouraged to migrate to the new version.
        • -
      • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
        • -
      • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
        • -
      • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
        • -
      • Added controller class/method info to Profiler class and support for multiple database connections.
        • -
      • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
        • -
      • Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.
        • -
      • Improved Parser class to allow multiple calls to the parse() function. The output of each is appended in the output.
        • -
      • Added max_filename option to set a file name length limit in the File Upload Class.
        • -
      • Added set_status_header() function to Output class.
        • -
      • Modified Pagination class to only output the "First" link when the link for page one would not be shown.
        • -
      • Added support for mb_strlen in the Form Validation class so that multi-byte languages will calculate string lengths properly.
        • -
      -
      • -
    • Database -
        -
      • Improved Active Record class to allow full path column and table names: hostname.database.table.column. Also improved the alias handling.
        • -
      • Improved how table and column names are escaped and prefixed. It now honors full path names when adding prefixes and escaping.
        • -
      • Added Active Record caching feature to "update" and "delete" functions.
        • -
      • Added removal of non-printing control characters in escape_str() of DB drivers that do not have native PHP escaping mechanisms (mssql, oci8, odbc), to avoid potential SQL errors, and possible sources of SQL injection.
        • -
      • Added port support to MySQL, MySQLi, and MS SQL database drivers.
        • -
      • Added driver name variable in each DB driver, based on bug report #4436.
        • -
      -
      • -
    • Helpers -
        -
      • Added several new "setting" functions to the Form helper that allow POST data to be retrieved and set into forms. These are intended to be used on their own, or with the new Form Validation Class.
        • -
      • Added current_url() and uri_segments() to URL helper.
        • -
      • Altered auto_link() in the URL helper so that email addresses with "+" included will be linked.
        • -
      • Added meta() function to HTML helper.
        • -
      • Improved accuracy of calculations in Number helper.
        • -
      • Removed added newlines ("\n") from most form and html helper functions.
        • -
      • Tightened up validation in the Date helper function human_to_unix(), and eliminated the POSIX regex.
        • -
      • Updated Date helper to match the world's current time zones and offsets.
        • -
      • Modified url_title() in the URL helper to remove characters and digits that are part of - character entities, to allow dashes, underscores, and periods regardless of the $separator, and to allow uppercase characters.
        • -
      • Added support for arbitrary attributes in anchor_popup() of the URL helper.
        • -
      -
      • -
    • Other Changes -
        -
      • Added PHP Style Guide to docs.
        • -
      • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
        • -
      • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
        • -
      • Added a file lock check during caching, before trying to write to the file.
        • -
      • Modified Cookie key cleaning to unset a few troublesome key names that can be present in certain environments, preventing CI from halting execution.
        • -
      • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div.
        • -
      -
      • -
    - -

    Bug fixes for 1.7.0

    -
      -
    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • -
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229, #5254, #5351).
      • -
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
      • -
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
      • -
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • -
    • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.
      • -
    • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.
      • -
    • Fixed a bug (#4536) in backups with the MySQL driver where some legacy code was causing certain characters to be double escaped.
      • -
    • Fixed a routing bug (#4661) that occurred when the default route pointed to a subfolder.
      • -
    • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
      • -
    • Fixed the spelling of "raspberry" in config/smileys.php.
      • -
    • Fixed incorrect parenthesis in form_open() function (#5135).
      • -
    • Fixed a bug that was ignoring case when comparing controller methods (#4560).
      • -
    • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function.
      • -
    • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
      • -
    • Fixed Oracle bug (#3306) that was preventing multiple queries in one action.
      • -
    • Fixed ODBC bug that was ignoring connection params due to its use of a constructor.
      • -
    • Fixed a DB driver bug with num_rows() that would cause an error with the Oracle driver.
      • -
    • Fixed MS SQL bug (#4915). Added brackets around database name in MS SQL driver when selecting the database, in the event that reserved characters are used in the name.
      • -
    • Fixed a DB caching bug (4718) in which the path was incorrect when no URI segments were present.
      • -
    • Fixed Image_lib class bug #4562. A path was not defined for NetPBM.
      • -
    • Fixed Image_lib class bug #4532. When cropping an image with identical height/width settings on output, a copy is made.
      • -
    • Fixed DB_driver bug (4900), in which a database error was not being logged correctly.
      • -
    • Fixed DB backup bug in which field names were not being escaped.
      • -
    • Fixed a DB Active Record caching bug in which multiple calls to cached data were not being honored.
      • -
    • Fixed a bug in the Session class that was disallowing slashes in the serialized array.
      • -
    • Fixed a Form Validation bug in which the "isset" error message was being trigged by the "required" rule.
      • -
    • Fixed a spelling error in a Loader error message.
      • -
    • Fixed a bug (5050) with IP validation with empty segments.
      • -
    • Fixed a bug in which the parser was being greedy if multiple identical sets of tags were enountered.
      • -
    - -

    Version 1.6.3

    -

    Release Date: June 26, 2008
    -SVN Revision: 1238

    -

    Version 1.6.3 is a security and maintenance release and is recommended for all users.

    -
      -
    • Database -
        -
      • Modified MySQL/MySQLi Forge class to give explicit names to keys
        • -
      • Added ability to set multiple column non-primary keys to the Forge class
        • -
      • Added ability to set additional database config values in DSN connections via the query string.
        • -
      -
      • -
    • Libraries -
        -
      • Set the mime type check in the Upload class to reference the global mimes variable.
        • -
      • Added support for query strings to the Pagination class, automatically detected or explicitly declared.
        • -
      • Added get_post() to the Input class.
        • -
      • Documented get() in the Input class.
        • -
      • Added the ability to automatically output language items as form labels in the Language class.
        • -
      -
      • -
    • Helpers - -
      • -
    • Other changes -
        -
      • Improved security in xss_clean().
        • -
      • Removed an unused Router reference in _display_cache().
        • -
      • Added ability to use xss_clean() to test images for XSS, useful for upload security.
        • -
      • Considerably expanded list of mobile user-agents in config/user_agents.php.
        • -
      • Charset information in the userguide has been moved above title for internationalization purposes (#4614).
        • -
      • Added "Using Associative Arrays In a Request Parameter" example to the XMLRPC userguide page.
        • -
      • Removed maxlength and size as automatically added attributes of form_input() in the form helper.
        • -
      • Documented the language file use of byte_format() in the number helper.
        • -
      -
      • -
    - - -

    Bug fixes for 1.6.3

    - -
      -
    • Added a language key for valid_emails in validation_lang.php.
      • -
    • Amended fixes for bug (#3419) with parsing DSN database connections.
      • -
    • Moved the _has_operators() function (#4535) into DB_driver from DB_active_rec.
      • -
    • Fixed a syntax error in upload_lang.php.
      • -
    • Fixed a bug (#4542) with a regular expression in the Image library.
      • -
    • Fixed a bug (#4561) where orhaving() wasn't properly passing values.
      • -
    • Removed some unused variables from the code (#4563).
      • -
    • Fixed a bug where having() was not adding an = into the statement (#4568).
      • -
    • Fixed assorted user guide typos or examples (#4574, #4706).
      • -
    • Added quoted-printable headers to Email class when the multi-part override is used.
      • -
    • Fixed a double opening <p> tag in the index pages of each system directory.
      • -
    - -

    Version 1.6.2

    -

    Release Date: May 13, 2008
    -SVN Revision: 1155

    -
      -
    • Active Record -
        -
      • Added the ability to prevent escaping in having() clauses.
        • -
      • Added rename_table() into DBForge.
        • -
      • Fixed a bug that wasn't allowing escaping to be turned off if the value of a query was NULL.
        • -
      • DB Forge is now assigned to any models that exist after loading (#3457).
        • -
      -
      • -
    • Database -
        -
      • Added Strict Mode to database transactions.
        • -
      • Escape behaviour in where() clauses has changed; values in those with the "FALSE" argument are no longer escaped (ie: quoted).
        • -
      -
      • -
    • Config -
        -
      • Added 'application/vnd.ms-powerpoint' to list of mime types.
        • -
      • Added 'audio/mpg' to list of mime types.
        • -
      • Added new user-modifiable file constants.php containing file mode and fopen constants.
        • -
      • Added the ability to set CRLF settings via config in the Email class.
        • -
      -
      • -
    • Libraries -
        -
      • Added increased security for filename handling in the Upload library.
        • -
      • Added increased security for sessions for client-side data tampering.
        • -
      • The MySQLi forge class is now in sync with MySQL forge.
        • -
      • Added the ability to set CRLF settings via config in the Email class.
        • -
      • Unit Testing results are now colour coded, and a change was made to the default template of results.
        • -
      • Added a valid_emails rule to the Validation class.
        • -
      • The Zip class now exits within download().
        • -
      • The Zip class has undergone a substantial re-write for speed and clarity (thanks stanleyxu for the hard work and code contribution in bug report #3425!)
        • -
      -
      • -
    • Helpers -
        -
      • Added a Compatibility Helper for using some common PHP 5 functions safely in applications that might run on PHP 4 servers (thanks Seppo for the hard work and code contribution!)
        • -
      • Added form_button() in the Form helper.
        • -
      • Changed the radio() and checkbox() functions to default to not checked by default.
        • -
      • Added the ability to include an optional HTTP Response Code in the redirect() function of the URL Helper.
        • -
      • Modified img() in the HTML Helper to remove an unneeded space (#4208).
        • -
      • Modified anchor() in the URL helper to no longer add a default title= attribute (#4209).
        • -
      • The Download helper now exits within force_download().
        • -
      • Added get_dir_file_info(), get_file_info(), and get_mime_by_extension() to the File Helper.
        • -
      • Added symbolic_permissions() and octal_permissions() to the File helper.
        • -
      -
      • -
    • Plugins -
        -
      • Modified captcha generation to first look for the function imagecreatetruecolor, and fallback to imagecreate if it isn't available (#4226).
        • -
      -
      • -
    • Other - Changes -
        -
      • Added ability for xss_clean() to accept arrays.
        • -
      • Removed closing PHP tags from all PHP files to avoid accidental output and potential 'cannot modify headers' errors.
        • -
      • Removed "scripts" from the auto-load search path. Scripts were deprecated - in Version 1.4.1 (September 21, 2006). If you still need to use them for legacy reasons, they must now be manually loaded in each Controller.
        • -
      • Added a Reserved Names page to the userguide, and migrated reserved controller names into it.
        • -
      • Added a Common Functions page to the userguide for globally available functions.
        • -
      • Improved security and performance of xss_clean().
        • -
      -
      • -
    - -

    Bugfixes for 1.6.2

    -
      -
    • Fixed a bug where SET queries were not being handled as "write" queries.
      • -
    • Fixed a bug (#3191) with ORIG_PATH_INFO URI parsing.
      • -
    • Fixed a bug in DB Forge, when inserting an id field (#3456).
      • -
    • Fixed a bug in the table library that could cause identically constructed rows to be dropped (#3459).
      • -
    • Fixed DB Driver and MySQLi result driver checking for resources instead of objects (#3461).
      • -
    • Fixed an AR_caching error where it wasn't tracking table aliases (#3463).
      • -
    • Fixed a bug in AR compiling, where select statements with arguments got incorrectly escaped (#3478).
      • -
    • Fixed an incorrect documentation of $this->load->language (#3520).
      • -
    • Fixed bugs (#3523, #4350) in get_filenames() with recursion and problems with Windows when $include_path is used.
      • -
    • Fixed a bug (#4153) in the XML-RPC class preventing dateTime.iso8601 from being used.
      • -
    • Fixed an AR bug with or_where_not_in() (#4171).
      • -
    • Fixed a bug with xss_clean() that would add semicolons to GET URI variable strings.
      • -
    • Fixed a bug (#4206) in the Directory Helper where the directory resource was not being closed, and minor improvements.
      • -
    • Fixed a bug in the FTP library where delete_dir() was not working recursively (#4215).
      • -
    • Fixed a Validation bug when set_rules() is used with a non-array field name and rule (#4220).
      • -
    • Fixed a bug (#4223) where DB caching would not work for returned DB objects or multiple DB connections.
      • -
    • Fixed a bug in the Upload library that might output the same error twice (#4390).
      • -
    • Fixed an AR bug when joining with a table alias and table prefix (#4400).
      • -
    • Fixed a bug in the DB class testing the $params argument.
      • -
    • Fixed a bug in the Table library where the integer 0 in cell data would be displayed as a blank cell.
      • -
    • Fixed a bug in link_tag() of the URL helper where a key was passed instead of a value.
      • -
    • Fixed a bug in DB_result::row() that prevented it from returning individual fields with MySQL NULL values.
      • -
    • Fixed a bug where SMTP emails were not having dot transformation performed on lines that begin with a dot.
      • -
    • Fixed a bug in display_error() in the DB driver that was instantiating new Language and Exception objects, and not using the error heading.
      • -
    • Fixed a bug (#4413) where a URI containing slashes only e.g. 'http://example.com/index.php?//' would result in PHP errors
      • -
    • Fixed an array to string conversion error in the Validation library (#4425)
      • -
    • Fixed bug (#4451, #4299, #4339) where failed transactions will not rollback when debug mode is enabled.
      • -
    • Fixed a bug (#4506) with overlay_watermark() in the Image library preventing support for PNG-24s with alpha transparency
      • -
    • Fixed assorted user guide typos (#3453, #4364, #4379, #4399, #4408, #4412, #4448, #4488).
      • -
    - -

    Version 1.6.1

    -

    Release Date: February 12, 2008
    - SVN Revision: 984

    -
      -
    • Active Record - -
      • -
    • Database drivers -
        -
      • Added support for setting client character set and collation for MySQLi.
        • -
      -
      • -
    • Core Changes -
        -
      • Modified xss_clean() to be more intelligent with its handling of URL encoded strings.
        • -
      • Added $_SERVER, $_FILES, $_ENV, and $_SESSION to sanitization of globals.
        • -
      • Added a Path Helper.
        • -
      • Simplified _reindex_segments() in the URI class.
        • -
      • Escaped the '-' in the default 'permitted_uri_chars' config item, to prevent errors if developers just try to add additional characters to the end of the default expression.
        • -
      • Modified method calling to controllers to show a 404 when a private or protected method is accessed via a URL.
        • -
      • Modified framework initiated 404s to log the controller and method for invalid requests.
        • -
      -
      • -
    • Helpers -
        -
      • Modified get_filenames() in the File Helper to return FALSE if the $source_dir is not readable.
        • -
      -
      • -
    - - -

    Bugfixes for 1.6.1

    -
      -
    • Deprecated is_numeric as a validation rule. Use of numeric and integer are preferred.
      • -
    • Fixed bug (#3379) in DBForge with SQLite for table creation.
      • -
    • Made Active Record fully database prefix aware (#3384).
      • -
    • Fixed a bug where DBForge was outputting invalid SQL in Postgres by adding brackets around the tables in FROM.
      • -
    • Changed the behaviour of Active Record's update() to make the WHERE clause optional (#3395).
      • -
    • Fixed a bug (#3396) where certain POST variables would cause a PHP warning.
      • -
    • Fixed a bug in query binding (#3402).
      • -
    • Changed order of SQL keywords in the Profiler $highlight array so OR would not be highlighted before ORDER BY.
      • -
    • Fixed a bug (#3404) where the MySQLi driver was testing if $this->conn_id was a resource instead of an object.
      • -
    • Fixed a bug (#3419) connecting to a database via a DSN string.
      • -
    • Fixed a bug (#3445) where the routed segment array was not re-indexed to begin with 1 when the default controller is used.
      • -
    • Fixed assorted user guide typos.
      • -
    - - - -

    Version 1.6.0

    -

    Release Date: January 30, 2008

    -
      -
    • DBForge -
        -
      • Added DBForge to the database tools.
        • -
      • Moved create_database() and drop_database() into DBForge.
        • -
      • Added add_field(), add_key(), create_table(), drop_table(), add_column(), drop_column(), modify_column() into DBForge.
        • -
      -
      • - -
    • Active Record -
        -
      • Added protect_identifiers() in Active Record.
        • -
      • All AR queries are backticked if appropriate to the database.
        • -
      • Added where_in(), or_where_in(), where_not_in(), or_where_not_in(), not_like() and or_not_like() to Active Record.
        • -
      • Added support for limit() into update() and delete() statements in Active Record.
        • -
      • Added empty_table() and truncate_table() to Active Record.
        • -
      • Added the ability to pass an array of tables to the delete() statement in Active Record.
        • -
      • Added count_all_results() function to Active Record.
        • -
      • Added select_max(), select_min(), select_avg() and select_sum() to Active Record.
        • -
      • Added the ability to use aliases with joins in Active Record.
        • -
      • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
        • -
      • Added a third parameter to set() in Active Record that withholds escaping data.
        • -
      • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
        • -
      -
      • - -
    • Other Database Related -
        -
      • MySQL driver now requires MySQL 4.1+
        • -
      • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or not. Previously they were always saved.
        • -
      • Added $this->db->dbprefix() to manually add database prefixes.
        • -
      • Added 'random' as an order_by() option , and removed "rand()" as a listed option as it was MySQL only.
        • -
      • Added a check for NULL fields in the MySQL database backup utility.
        • -
      • Added "constrain_by_prefix" parameter to db->list_table() function. If set to TRUE it will limit the result to only table names with the current prefix.
        • -
      • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); havingor() for having_or(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
        • -
      • Modified csv_from_result() to output CSV data more in the spirit of basic rules of RFC 4180.
        • -
      • Added 'char_set' and 'dbcollat' database configuration settings, to explicitly set the client communication properly.
        • -
      • Removed 'active_r' configuration setting and replaced with a global $active_record setting, which is more - in harmony with the global nature of the behavior (#1834).
        • -
      -
      • - -
    • Core changes -
        -
      • Added ability to load multiple views, whose content will be appended to the output in the order loaded.
        • -
      • Added the ability to auto-load Models.
        • -
      • Reorganized the URI and Routes classes for better clarity.
        • -
      • Added Compat.php to allow function overrides for older versions of PHP or PHP environments missing certain extensions / libraries
        • -
      • Added memory usage, GET, URI string data, and individual query execution time to Profiler output.
        • -
      • Deprecated Scaffolding.
        • -
      • Added is_really_writable() to Common.php to provide a cross-platform reliable method of testing file/folder writability.
        • -
      -
      • - -
    • Libraries -
        -
      • Changed the load protocol of Models to allow for extension.
        • -
      • Strengthened the Encryption library to help protect against man in the middle attacks when MCRYPT_MODE_CBC mode is used.
        • -
      • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
        • -
      • Removed 'last_visit' from the Session class.
        • -
      • Added a language entry for valid_ip validation error.
        • -
      • Modified prep_for_form() in the Validation class to accept arrays, adding support for POST array validation (via callbacks only)
        • -
      • Added an "integer" rule into the Validation library.
        • -
      • Added valid_base64() to the Validation library.
        • -
      • Documented clear() in the Image Processing library.
        • -
      • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
        • -
      • Modified Upload class $_FILES error messages to be more precise.
        • -
      • Moved the safe mode and auth checks for the Email library into the constructor.
        • -
      • Modified variable names in _ci_load() method of Loader class to avoid conflicts with view variables.
        • -
      • Added a few additional mime type variations for CSV.
        • -
      • Enabled the 'system' methods for the XML-RPC Server library, except for 'system.multicall' which is still disabled.
        • -
      -
      • - -
    • Helpers & Plugins -
        -
      • Added link_tag() to the HTML helper.
        • -
      • Added img() to the HTML helper.
        • -
      • Added ability to "extend" Helpers.
        • -
      • Added an email helper into core helpers.
        • -
      • Added strip_quotes() function to string helper.
        • -
      • Added reduce_multiples() function to string helper.
        • -
      • Added quotes_to_entities() function to string helper.
        • -
      • Added form_fieldset(), form_fieldset_close(), form_label(), and form_reset() function to form helper.
        • -
      • Added support for external urls in form_open().
        • -
      • Removed support for db_backup in MySQLi due to incompatible functions.
        • -
      • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
        • -
      -
      • - - -
    • Documentation Changes -
        -
      • Added Writing Documentation section for the community to use in writing their own documentation.
        • -
      • Added titles to all user manual pages.
        • -
      • Added attributes into <html> of userguide for valid html.
        • -
      • Added Zip Encoding Class to the table of contents of the userguide.
        • -
      • Moved part of the userguide menu javascript to an external file.
        • -
      • Documented distinct() in Active Record.
        • -
      • Documented the timezones() function in the Date Helper.
        • -
      • Documented unset_userdata in the Session class.
        • -
      • Documented 2 config options to the Database configuration page.
        • -
      -
      • -
    - -

    Bug fixes for Version 1.6.0

    - -
      -
    • Fixed a bug (#1813) preventing using $CI->db in the same application with returned database objects.
      • -
    • Fixed a bug (#1842) where the $this->uri->rsegments array would not include the 'index' method if routed to the controller without an implicit method.
      • -
    • Fixed a bug (#1872) where word_limiter() was not retaining whitespace.
      • -
    • Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.
      • -
    • Fixed a bug (#2542)in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
      • -
    • Fixed a bug (#2545) in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
      • -
    • Fixed a bug (#2668) in the parser class where numeric data was ignored.
      • -
    • Fixed a bug (#2679) where the "previous" pagination link would get drawn on the first page.
      • -
    • Fixed a bug (#2702) in _object_to_array that broke some types of inserts and updates.
      • -
    • Fixed a bug (#2732) in the SQLite driver for PHP 4.
      • -
    • Fixed a bug (#2754) in Pagination to scan for non-positive num_links.
      • -
    • Fixed a bug (#2762) in the Session library where user agent matching would fail on user agents ending with a space.
      • -
    • Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgres and sqlite drivers.
      • -
    • Fixed a bug (#2810) in the typography helper causing extraneous paragraph tags when string contains tags.
      • -
    • Fixed a bug (#2849) where arguments passed to a subfolder controller method would be incorrectly shifted, dropping the 3rd segment value.
      • -
    • Fixed a bug (#2858) which referenced a wrong variable in the Image class.
      • -
    • Fixed a bug (#2875)when loading plugin files as _plugin. and not _pi.
      • -
    • Fixed a bug (#2912) in get_filenames() in the File Helper where the array wasn't cleared after each call.
      • -
    • Fixed a bug (#2974) in highlight_phrase() that caused an error with slashes.
      • -
    • Fixed a bug (#3003) in the Encryption Library to support modes other than MCRYPT_MODE_ECB
      • -
    • Fixed a bug (#3015) in the User Agent library where more then 2 languages where not reported with languages().
      • -
    • Fixed a bug (#3017) in the Email library where some timezones were calculated incorrectly.
      • -
    • Fixed a bug (#3024) in which master_dim wasn't getting reset by clear() in the Image library.
      • -
    • Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.
      • -
    • Fixed a bug (#3166) that prevented num_rows from working in Oracle.
      • -
    • Fixed a bug (#3175) preventing certain libraries from working properly when autoloaded in PHP 4.
      • -
    • Fixed a bug (#3267) in the Typography Helper where unordered list was listed "un.
      • -
    • Fixed a bug (#3268) where the Router could leave '/' as the path.
      • -
    • Fixed a bug (#3279) where the Email class was sending the wrong Content-Transfer-Encoding for some character sets.
      • -
    • Fixed a bug (#3284) where the rsegment array would not be set properly if the requested URI contained more segments than the routed URI.
      • -
    • Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).
      • -
    • Removed an extraneous call to loading models (#3286).
      • -
    • Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.
      • -
    • Fixed a bug (#3314) which would cause the top level path to be deleted in delete_files() of the File helper.
      • -
    • Fixed a bug (#3328) where the smiley helper might return an undefined variable.
      • -
    • Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.
      • -
    • Removed an unused parameter from Profiler (#3332).
      • -
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
      • -
    • Fixed a bug in the upload library when allowed_files wasn't defined.
      • -
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
      • -
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
      • -
    • Fixed a bug in Validation where individual error messages for checkboxes wasn't supported.
      • -
    • Fixed a bug in captcha calling an invalid PHP function.
      • -
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
      • -
    • Fixed a bug that was making validation callbacks required even when not set as such.
      • -
    • Fixed a bug in the XML-RPC library so if a type is specified, a more intelligent decision is made as to the default type.
      • -
    • Fixed an example of comma-separated emails in the email library documentation.
      • -
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
      • -
    • Fixed a typo in the database language file.
      • -
    • Fixed a typo in the image language file "suppor" to "support".
      • -
    • Fixed an example for XML RPC.
      • -
    • Fixed an example of accept_charset() in the User Agent Library.
      • -
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
      • -
    • Fixed a typo in the String Helper (uniquid changed to uniqid).
      • -
    • Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login), and FTP Class (ftp_unable_to_remame).
      • -
    • Added a stripslashes() into the Upload Library.
      • -
    • Fixed a series of grammatical and spelling errors in the language files.
      • -
    • Fixed assorted user guide typos.
      • -
    -

    Version 1.5.4

    -

    Release Date: July 12, 2007

    -
      -
    • Added custom Language files to the autoload options.
      • -
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
      • -
    • Added array to string into the profiler.
      • -
    • Added some additional mime types in application/config/mimes.php.
      • -
    • Added filename_security() method to Input library.
      • -
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
      • -
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
      • -
    • Fixed MSSQL insert_id().
      • -
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
      • -
    • Fixed a bug that was allowing multiple load attempts on extended classes.
      • -
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
      • -
    • Fixed a bug in the escape_str() function in the MySQL driver.
      • -
    • Fixed a typo in the Calendar library
      • -
    • Fixed a typo in rpcs.php library
      • -
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
      • -
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
      • -
    • Fixed an IP validation bug.
      • -
    • Fixed a bug in display of POST keys in the Profiler output
      • -
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
      • -
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
      • -
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
      • -
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
      • -
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
      • -
    • Fixed various doc typos.
      • -
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
      • -
    • Docs now validate to XHTML 1 transitional
      • -
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
      • -
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
      • -
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
      • -
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
      • -
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
      • -
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
      • -
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
      • -
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.
      • -
    -

    Version 1.5.3

    -

    Release Date: April 15, 2007

    -
      -
    • Added array to string into the profiler
      • -
    • Code Igniter references updated to CodeIgniter
      • -
    • pMachine references updated to EllisLab
      • -
    • Fixed a bug in the repeater function of string helper.
      • -
    • Fixed a bug in ODBC driver
      • -
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
      • -
    • Fixed a bug in the redirect function of the url helper.
      • -
    • Fixed an undefined variable in Loader
      • -
    • Fixed a version bug in the Postgres driver
      • -
    • Fixed a bug in the textarea function of the form helper for use with strings
      • -
    • Fixed doc typos.
      • -
    -

    Version 1.5.2

    -

    Release Date: February 13, 2007

    -
      -
    • Added subversion information to the downloads page.
      • -
    • Added support for captions in the Table Library
      • -
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather than download
      • -
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
      • -
    • Removed unescaped variables in error messages of Input and Router classes
      • -
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
      • -
    • Fixed a bug in the form helper that gave textarea a value attribute
      • -
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
      • -
    • Fixed some doc typos.
      • -
    - - -

    Version 1.5.1

    -

    Release Date: November 23, 2006

    -
      -
    • Added support for submitting arrays of libraries in the $this->load->library function.
      • -
    • Added support for naming custom library files in lower or uppercase.
      • -
    • Fixed a bug related to output buffering.
      • -
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
      • -
    • Fixed a bug that was suppressing errors in controllers.
      • -
    • Fixed a problem that can cause a loop to occur when the config file is missing.
      • -
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
      • -
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
      • -
    • Fixed some bugs in the Oracle DB driver.
      • -
    • Fixed an incorrectly named variable in the MySQLi result driver.
      • -
    • Fixed some doc typos.
      • -
    -

    Version 1.5.0.1

    -

    Release Date: October 31, 2006

    -
      -
    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
      • -
    • Fixed a bug in the word_wrap() helper function.
      • -
    • Fixed an invalid color Hex number in the Profiler class.
      • -
    • Fixed a corrupted image in the user guide.
      • -
    - - - -

    Version 1.5.0

    -

    Release Date: October 30, 2006

    - -
      -
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • -
    • Added Database Caching Class.
      • -
    • Added transaction support to the database classes.
      • -
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
      • -
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
      • -
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
      • -
    • Added Zip Encoding Library.
      • -
    • Added FTP Library.
      • -
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
      • -
    • Added support for storing models within sub-folders.
      • -
    • Added Download Helper.
      • -
    • Added simple_query() function to the database classes
      • -
    • Added standard_date() function to the Date Helper.
      • -
    • Added $query->free_result() to database class.
      • -
    • Added $query->list_fields() function to database class
      • -
    • Added $this->db->platform() function
      • -
    • Added new File Helper: get_filenames()
      • -
    • Added new helper: Smiley Helper
      • -
    • Added support for <ul> and <ol> lists in the HTML Helper
      • -
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
      • -
    • Added the ability to rename or relocate the "application" folder.
      • -
    • Added more thorough initialization in the upload class so that all class variables are reset.
      • -
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
      • -
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
      • -
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
      • -
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
      • -
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
      • -
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
      • -
    • Fixed a bug in the Email class related to SMTP Helo data.
      • -
    • Fixed a bug in the word wrapping helper and function in the email class.
      • -
    • Fixed a bug in the validation class.
      • -
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
      • -
    • Fixed a problem in the form_prep() function that was double encoding entities.
      • -
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
      • -
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
      • -
    • Fixed a pagination bug that was permitting negative values in the URL.
      • -
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
      • -
    • Changed _get_config() to get_config() since the function is not a private one.
      • -
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
      • -
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
      • -
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
      • -
    - - - - -

    Version 1.4.1

    -

    Release Date: September 21, 2006

    - -
      -
    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
      • -
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
      • -
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
      • -
    • Added $this->output->set_header() function, which allows you to set server headers.
      • -
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
      • -
    • Added Inflector helper.
      • -
    • Added element() function in the array helper.
      • -
    • Added RAND() to active record orderby() function.
      • -
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
      • -
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
      • -
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
      • -
    • Added output compression option to the config file.
      • -
    • Removed the is_numeric test from the db->escape() function.
      • -
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
      • -
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
      • -
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
      • -
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
      • -
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
      • -
    • Added some code to allow email attachments to be reset when sending batches of email.
      • -
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own -libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
      • -
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
      • -
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().
      • -
    - - - -

    Version 1.4.0

    -

    Release Date: September 17, 2006

    - -
      -
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • -
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
      • -
    • Added regular expressions support for routing rules.
      • -
    • Added the ability to remap function calls within your controllers.
      • -
    • Added the ability to replace core system classes with your own classes.
      • -
    • Added support for % character in URL.
      • -
    • Added the ability to supply full URLs using the anchor() helper function.
      • -
    • Added mode parameter to file_write() helper.
      • -
    • Added support for changing the port number in the Postgres driver.
      • -
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
      • -
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
      • -
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
      • -
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
      • -
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • -
    • Updated the form_open() helper to allow the GET method to be used.
      • -
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • -
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
      • -
    • Updated the Models loader function to allow multiple loads of the same model.
      • -
    • Updated the MS SQL driver so that single quotes are escaped.
      • -
    • Updated the Postgres and ODBC drivers for better compatibility.
      • -
    • Removed a strtolower() call that was changing URL segments to lower case.
      • -
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
      • -
    • Removed backticks from Postgres class since these are not needed.
      • -
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
      • -
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
      • -
    • Fixed an bug that was preventing the input class from unsetting GET variables.
      • -
    • Fixed a router bug that was making it too greedy when matching end segments.
      • -
    • Fixed a bug that was preventing multiple discrete database calls.
      • -
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
      • -
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
      • -
    • Fixed some missing prefixes when using the database prefix feature.
      • -
    • Fixed a typo in the Calendar class (cal_november).
      • -
    • Fixed a bug in the form_checkbox() helper.
      • -
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
      • -
    • Fixed an evaluation bug in the database initialization function.
      • -
    • Fixed a minor bug in one of the error messages in the language class.
      • -
    • Fixed a bug in the date helper timespan function.
      • -
    • Fixed an undefined variable in the DB Driver class.
      • -
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
      • -
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
      • -
    • Fixed a couple bugs in the Unit Testing class.
      • -
    • Fixed an incorrectly named variable in the Validation class.
      • -
    • Fixed an incorrectly named variable in the URI class.
      • -
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
      • -
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
      • -
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
      • -
    • Fixed some MS SQL bugs.
      • -
    • Fixed some doc typos.
      • -
    - - - -

    Version 1.3.3

    -

    Release Date: June 1, 2006

    - -
      - -
    • Models do not connect automatically to the database as of this version. More info here.
      • -
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
      • -
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
      • -
    • Fixed a bug in the active record "having" function.
      • -
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
      • -
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
      • -
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
      • -
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
      • -
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
      • -
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
      • -
    • Fixed a bug in the hash() security helper.
      • -
    • Fixed some typos.
      • -
    - - - - -

    Version 1.3.2

    -

    Release Date: April 17, 2006

    - -
      -
    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
      • -
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
      • -
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
      • -
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
      • -
    • Fixed a couple bugs in the Model class.
      • -
    • Fixed some documentation typos and errata.
      • -
    - - - -

    Version 1.3.1

    -

    Release Date: April 11, 2006

    - -
      -
    • Added a Unit Testing Library.
      • -
    • Added the ability to pass objects to the insert() and update() database functions. -This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
      • -
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
      • -
    • Added getwhere function to Active Record class.
      • -
    • Added count_all function to Active Record class.
      • -
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
      • -
    • Added $this->db->last_query(), which allows you to view your last query that was run.
      • -
    • Added a new mime type to the upload class for better compatibility.
      • -
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
      • -
    • Fixed a bug in a couple of the active record functions (where and orderby).
      • -
    • Fixed a bug in the image library when realpath() returns false.
      • -
    • Fixed a bug in the Models that was preventing libraries from being used within them.
      • -
    • Fixed a bug in the "exact_length" function of the validation class.
      • -
    • Fixed some typos in the user guide
      • -
    - - -

    Version 1.3

    -

    Release Date: April 3, 2006

    - -
      -
    • Added support for Models.
      • -
    • Redesigned the database libraries to support additional RDBMs (Postgres, MySQLi, etc.).
      • -
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
      • -
    • Added a feature to the database class that lets you run custom function calls.
      • -
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
      • -
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
      • -
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
      • -
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
      • -
    • Added a new error template for use with native PHP errors.
      • -
    • Added "alternator" function in the string helpers.
      • -
    • Removed slashing from the input class. After much debate we decided to kill this feature.
      • -
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
      • -
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and -all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
      • -
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
      • -
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
      • -
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
      • -
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
      • -
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
      • -
    • Fixed some typos in the default calendar template
      • -
    • Fixed some typos in the user guide
      • -
    - - - - - - - - -

    Version 1.2

    -

    Release Date: March 21, 2006

    - -
      -
    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
      • -
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
      • -
    • Added new File Helper: delete_files()
      • -
    • Added new URL Helpers: base_url(), index_page()
      • -
    • Added the ability to create your own core libraries and store them in your local application directory.
      • -
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
      • -
    • Added Javascript Calendar plugin.
      • -
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
      • -
    • Updated the parser class so that it allows tag pars within other tag pairs.
      • -
    • Fixed a bug in the DB "where" function.
      • -
    • Fixed a bug that was preventing custom config files to be auto-loaded.
      • -
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
      • -
    • Fixed some bugs in the xss_clean function
      • -
    - - - - - -

    Version Beta 1.1

    -

    Release Date: March 10, 2006

    - -
      -
    • Added a Calendaring class.
      • -
    • Added support for running multiple applications that share a common CodeIgniter backend.
      • -
    • Moved the "uri protocol" variable from the index.php file into the config.php file
      • -
    • Fixed a problem that was preventing certain function calls from working within constructors.
      • -
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
      • -
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
      • -
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
      • -
    • Fixed a data type error in the form_radio function (form helper)
      • -
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
      • -
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
      • -
    • Fixed a pagination problem in the scaffolding.
      • -
    • Fixed a bug in the mysql class "where" function.
      • -
    • Fixed a regex problem in some code that trimmed duplicate slashes.
      • -
    • Fixed a bug in the br() function in the HTML helper
      • -
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
      • -
    • Removed the "style" attributes form the form helpers.
      • -
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.
      • -
    - -

    Version Beta 1.0

    -

    Release Date: February 28, 2006

    -

    First publicly released version.

    - -
    - - - - - - - + + + + + + + + + + + + + + + + + + + +Change Log : CodeIgniter User Guide + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Change Log

    + +

    Version 1.7.1

    +

    Release Date: not yet released
    +SVN Revision:

    + +
      +
    • Libraries +
        +
      • Changed default current page indicator in the Pagination library to use <strong> instead of <b>
        • +
      +
      • +
    • Helpers + +
      • +
    + +

    Bug fixes for 1.7.1

    +
      +
    • Fixed a bug in the MySQLi driver when no port is specified
      • +
    • Fixed a bug (#5702), in which the field label was not being fetched properly, when "matching" one field to another.
      • +
    • Fixed a bug in which identifers were not being escaped properly when reserved characters were used.
      • +
    • Fixed a bug with the regular expression used to protect submitted paragraph tags in auto typography.

      +
    • Fixed a bug where double dashes within tag attributes were being converted to em dash entities.
      • +
    + + +

    Version 1.7

    +

    Release Date: October 23, 2008
    +SVN Revision: 1541

    + +
      +
    • Libraries +
        +
      • Added a new Form Validation Class. It simplifies setting rules and field names, supports arrays as field names, allows groups of validation rules to be saved in a config file, and adds some helper functions for use in view files. Please note that the old Validation class is now deprecated. We will leave it in the library folder for some time so that existing applications that use it will not break, but you are encouraged to migrate to the new version.
        • +
      • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
        • +
      • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
        • +
      • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
        • +
      • Added controller class/method info to Profiler class and support for multiple database connections.
        • +
      • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
        • +
      • Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.
        • +
      • Improved Parser class to allow multiple calls to the parse() function. The output of each is appended in the output.
        • +
      • Added max_filename option to set a file name length limit in the File Upload Class.
        • +
      • Added set_status_header() function to Output class.
        • +
      • Modified Pagination class to only output the "First" link when the link for page one would not be shown.
        • +
      • Added support for mb_strlen in the Form Validation class so that multi-byte languages will calculate string lengths properly.
        • +
      +
      • +
    • Database +
        +
      • Improved Active Record class to allow full path column and table names: hostname.database.table.column. Also improved the alias handling.
        • +
      • Improved how table and column names are escaped and prefixed. It now honors full path names when adding prefixes and escaping.
        • +
      • Added Active Record caching feature to "update" and "delete" functions.
        • +
      • Added removal of non-printing control characters in escape_str() of DB drivers that do not have native PHP escaping mechanisms (mssql, oci8, odbc), to avoid potential SQL errors, and possible sources of SQL injection.
        • +
      • Added port support to MySQL, MySQLi, and MS SQL database drivers.
        • +
      • Added driver name variable in each DB driver, based on bug report #4436.
        • +
      +
      • +
    • Helpers +
        +
      • Added several new "setting" functions to the Form helper that allow POST data to be retrieved and set into forms. These are intended to be used on their own, or with the new Form Validation Class.
        • +
      • Added current_url() and uri_segments() to URL helper.
        • +
      • Altered auto_link() in the URL helper so that email addresses with "+" included will be linked.
        • +
      • Added meta() function to HTML helper.
        • +
      • Improved accuracy of calculations in Number helper.
        • +
      • Removed added newlines ("\n") from most form and html helper functions.
        • +
      • Tightened up validation in the Date helper function human_to_unix(), and eliminated the POSIX regex.
        • +
      • Updated Date helper to match the world's current time zones and offsets.
        • +
      • Modified url_title() in the URL helper to remove characters and digits that are part of + character entities, to allow dashes, underscores, and periods regardless of the $separator, and to allow uppercase characters.
        • +
      • Added support for arbitrary attributes in anchor_popup() of the URL helper.
        • +
      +
      • +
    • Other Changes +
        +
      • Added PHP Style Guide to docs.
        • +
      • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
        • +
      • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
        • +
      • Added a file lock check during caching, before trying to write to the file.
        • +
      • Modified Cookie key cleaning to unset a few troublesome key names that can be present in certain environments, preventing CI from halting execution.
        • +
      • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div.
        • +
      +
      • +
    + +

    Bug fixes for 1.7.0

    +
      +
    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • +
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229, #5254, #5351).
      • +
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
      • +
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
      • +
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • +
    • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.
      • +
    • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.
      • +
    • Fixed a bug (#4536) in backups with the MySQL driver where some legacy code was causing certain characters to be double escaped.
      • +
    • Fixed a routing bug (#4661) that occurred when the default route pointed to a subfolder.
      • +
    • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
      • +
    • Fixed the spelling of "raspberry" in config/smileys.php.
      • +
    • Fixed incorrect parenthesis in form_open() function (#5135).
      • +
    • Fixed a bug that was ignoring case when comparing controller methods (#4560).
      • +
    • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function.
      • +
    • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
      • +
    • Fixed Oracle bug (#3306) that was preventing multiple queries in one action.
      • +
    • Fixed ODBC bug that was ignoring connection params due to its use of a constructor.
      • +
    • Fixed a DB driver bug with num_rows() that would cause an error with the Oracle driver.
      • +
    • Fixed MS SQL bug (#4915). Added brackets around database name in MS SQL driver when selecting the database, in the event that reserved characters are used in the name.
      • +
    • Fixed a DB caching bug (4718) in which the path was incorrect when no URI segments were present.
      • +
    • Fixed Image_lib class bug #4562. A path was not defined for NetPBM.
      • +
    • Fixed Image_lib class bug #4532. When cropping an image with identical height/width settings on output, a copy is made.
      • +
    • Fixed DB_driver bug (4900), in which a database error was not being logged correctly.
      • +
    • Fixed DB backup bug in which field names were not being escaped.
      • +
    • Fixed a DB Active Record caching bug in which multiple calls to cached data were not being honored.
      • +
    • Fixed a bug in the Session class that was disallowing slashes in the serialized array.
      • +
    • Fixed a Form Validation bug in which the "isset" error message was being trigged by the "required" rule.
      • +
    • Fixed a spelling error in a Loader error message.
      • +
    • Fixed a bug (5050) with IP validation with empty segments.
      • +
    • Fixed a bug in which the parser was being greedy if multiple identical sets of tags were enountered.
      • +
    + +

    Version 1.6.3

    +

    Release Date: June 26, 2008
    +SVN Revision: 1238

    +

    Version 1.6.3 is a security and maintenance release and is recommended for all users.

    +
      +
    • Database +
        +
      • Modified MySQL/MySQLi Forge class to give explicit names to keys
        • +
      • Added ability to set multiple column non-primary keys to the Forge class
        • +
      • Added ability to set additional database config values in DSN connections via the query string.
        • +
      +
      • +
    • Libraries +
        +
      • Set the mime type check in the Upload class to reference the global mimes variable.
        • +
      • Added support for query strings to the Pagination class, automatically detected or explicitly declared.
        • +
      • Added get_post() to the Input class.
        • +
      • Documented get() in the Input class.
        • +
      • Added the ability to automatically output language items as form labels in the Language class.
        • +
      +
      • +
    • Helpers + +
      • +
    • Other changes +
        +
      • Improved security in xss_clean().
        • +
      • Removed an unused Router reference in _display_cache().
        • +
      • Added ability to use xss_clean() to test images for XSS, useful for upload security.
        • +
      • Considerably expanded list of mobile user-agents in config/user_agents.php.
        • +
      • Charset information in the userguide has been moved above title for internationalization purposes (#4614).
        • +
      • Added "Using Associative Arrays In a Request Parameter" example to the XMLRPC userguide page.
        • +
      • Removed maxlength and size as automatically added attributes of form_input() in the form helper.
        • +
      • Documented the language file use of byte_format() in the number helper.
        • +
      +
      • +
    + + +

    Bug fixes for 1.6.3

    + +
      +
    • Added a language key for valid_emails in validation_lang.php.
      • +
    • Amended fixes for bug (#3419) with parsing DSN database connections.
      • +
    • Moved the _has_operators() function (#4535) into DB_driver from DB_active_rec.
      • +
    • Fixed a syntax error in upload_lang.php.
      • +
    • Fixed a bug (#4542) with a regular expression in the Image library.
      • +
    • Fixed a bug (#4561) where orhaving() wasn't properly passing values.
      • +
    • Removed some unused variables from the code (#4563).
      • +
    • Fixed a bug where having() was not adding an = into the statement (#4568).
      • +
    • Fixed assorted user guide typos or examples (#4574, #4706).
      • +
    • Added quoted-printable headers to Email class when the multi-part override is used.
      • +
    • Fixed a double opening <p> tag in the index pages of each system directory.
      • +
    + +

    Version 1.6.2

    +

    Release Date: May 13, 2008
    +SVN Revision: 1155

    +
      +
    • Active Record +
        +
      • Added the ability to prevent escaping in having() clauses.
        • +
      • Added rename_table() into DBForge.
        • +
      • Fixed a bug that wasn't allowing escaping to be turned off if the value of a query was NULL.
        • +
      • DB Forge is now assigned to any models that exist after loading (#3457).
        • +
      +
      • +
    • Database +
        +
      • Added Strict Mode to database transactions.
        • +
      • Escape behaviour in where() clauses has changed; values in those with the "FALSE" argument are no longer escaped (ie: quoted).
        • +
      +
      • +
    • Config +
        +
      • Added 'application/vnd.ms-powerpoint' to list of mime types.
        • +
      • Added 'audio/mpg' to list of mime types.
        • +
      • Added new user-modifiable file constants.php containing file mode and fopen constants.
        • +
      • Added the ability to set CRLF settings via config in the Email class.
        • +
      +
      • +
    • Libraries +
        +
      • Added increased security for filename handling in the Upload library.
        • +
      • Added increased security for sessions for client-side data tampering.
        • +
      • The MySQLi forge class is now in sync with MySQL forge.
        • +
      • Added the ability to set CRLF settings via config in the Email class.
        • +
      • Unit Testing results are now colour coded, and a change was made to the default template of results.
        • +
      • Added a valid_emails rule to the Validation class.
        • +
      • The Zip class now exits within download().
        • +
      • The Zip class has undergone a substantial re-write for speed and clarity (thanks stanleyxu for the hard work and code contribution in bug report #3425!)
        • +
      +
      • +
    • Helpers +
        +
      • Added a Compatibility Helper for using some common PHP 5 functions safely in applications that might run on PHP 4 servers (thanks Seppo for the hard work and code contribution!)
        • +
      • Added form_button() in the Form helper.
        • +
      • Changed the radio() and checkbox() functions to default to not checked by default.
        • +
      • Added the ability to include an optional HTTP Response Code in the redirect() function of the URL Helper.
        • +
      • Modified img() in the HTML Helper to remove an unneeded space (#4208).
        • +
      • Modified anchor() in the URL helper to no longer add a default title= attribute (#4209).
        • +
      • The Download helper now exits within force_download().
        • +
      • Added get_dir_file_info(), get_file_info(), and get_mime_by_extension() to the File Helper.
        • +
      • Added symbolic_permissions() and octal_permissions() to the File helper.
        • +
      +
      • +
    • Plugins +
        +
      • Modified captcha generation to first look for the function imagecreatetruecolor, and fallback to imagecreate if it isn't available (#4226).
        • +
      +
      • +
    • Other + Changes +
        +
      • Added ability for xss_clean() to accept arrays.
        • +
      • Removed closing PHP tags from all PHP files to avoid accidental output and potential 'cannot modify headers' errors.
        • +
      • Removed "scripts" from the auto-load search path. Scripts were deprecated + in Version 1.4.1 (September 21, 2006). If you still need to use them for legacy reasons, they must now be manually loaded in each Controller.
        • +
      • Added a Reserved Names page to the userguide, and migrated reserved controller names into it.
        • +
      • Added a Common Functions page to the userguide for globally available functions.
        • +
      • Improved security and performance of xss_clean().
        • +
      +
      • +
    + +

    Bugfixes for 1.6.2

    +
      +
    • Fixed a bug where SET queries were not being handled as "write" queries.
      • +
    • Fixed a bug (#3191) with ORIG_PATH_INFO URI parsing.
      • +
    • Fixed a bug in DB Forge, when inserting an id field (#3456).
      • +
    • Fixed a bug in the table library that could cause identically constructed rows to be dropped (#3459).
      • +
    • Fixed DB Driver and MySQLi result driver checking for resources instead of objects (#3461).
      • +
    • Fixed an AR_caching error where it wasn't tracking table aliases (#3463).
      • +
    • Fixed a bug in AR compiling, where select statements with arguments got incorrectly escaped (#3478).
      • +
    • Fixed an incorrect documentation of $this->load->language (#3520).
      • +
    • Fixed bugs (#3523, #4350) in get_filenames() with recursion and problems with Windows when $include_path is used.
      • +
    • Fixed a bug (#4153) in the XML-RPC class preventing dateTime.iso8601 from being used.
      • +
    • Fixed an AR bug with or_where_not_in() (#4171).
      • +
    • Fixed a bug with xss_clean() that would add semicolons to GET URI variable strings.
      • +
    • Fixed a bug (#4206) in the Directory Helper where the directory resource was not being closed, and minor improvements.
      • +
    • Fixed a bug in the FTP library where delete_dir() was not working recursively (#4215).
      • +
    • Fixed a Validation bug when set_rules() is used with a non-array field name and rule (#4220).
      • +
    • Fixed a bug (#4223) where DB caching would not work for returned DB objects or multiple DB connections.
      • +
    • Fixed a bug in the Upload library that might output the same error twice (#4390).
      • +
    • Fixed an AR bug when joining with a table alias and table prefix (#4400).
      • +
    • Fixed a bug in the DB class testing the $params argument.
      • +
    • Fixed a bug in the Table library where the integer 0 in cell data would be displayed as a blank cell.
      • +
    • Fixed a bug in link_tag() of the URL helper where a key was passed instead of a value.
      • +
    • Fixed a bug in DB_result::row() that prevented it from returning individual fields with MySQL NULL values.
      • +
    • Fixed a bug where SMTP emails were not having dot transformation performed on lines that begin with a dot.
      • +
    • Fixed a bug in display_error() in the DB driver that was instantiating new Language and Exception objects, and not using the error heading.
      • +
    • Fixed a bug (#4413) where a URI containing slashes only e.g. 'http://example.com/index.php?//' would result in PHP errors
      • +
    • Fixed an array to string conversion error in the Validation library (#4425)
      • +
    • Fixed bug (#4451, #4299, #4339) where failed transactions will not rollback when debug mode is enabled.
      • +
    • Fixed a bug (#4506) with overlay_watermark() in the Image library preventing support for PNG-24s with alpha transparency
      • +
    • Fixed assorted user guide typos (#3453, #4364, #4379, #4399, #4408, #4412, #4448, #4488).
      • +
    + +

    Version 1.6.1

    +

    Release Date: February 12, 2008
    + SVN Revision: 984

    +
      +
    • Active Record + +
      • +
    • Database drivers +
        +
      • Added support for setting client character set and collation for MySQLi.
        • +
      +
      • +
    • Core Changes +
        +
      • Modified xss_clean() to be more intelligent with its handling of URL encoded strings.
        • +
      • Added $_SERVER, $_FILES, $_ENV, and $_SESSION to sanitization of globals.
        • +
      • Added a Path Helper.
        • +
      • Simplified _reindex_segments() in the URI class.
        • +
      • Escaped the '-' in the default 'permitted_uri_chars' config item, to prevent errors if developers just try to add additional characters to the end of the default expression.
        • +
      • Modified method calling to controllers to show a 404 when a private or protected method is accessed via a URL.
        • +
      • Modified framework initiated 404s to log the controller and method for invalid requests.
        • +
      +
      • +
    • Helpers +
        +
      • Modified get_filenames() in the File Helper to return FALSE if the $source_dir is not readable.
        • +
      +
      • +
    + + +

    Bugfixes for 1.6.1

    +
      +
    • Deprecated is_numeric as a validation rule. Use of numeric and integer are preferred.
      • +
    • Fixed bug (#3379) in DBForge with SQLite for table creation.
      • +
    • Made Active Record fully database prefix aware (#3384).
      • +
    • Fixed a bug where DBForge was outputting invalid SQL in Postgres by adding brackets around the tables in FROM.
      • +
    • Changed the behaviour of Active Record's update() to make the WHERE clause optional (#3395).
      • +
    • Fixed a bug (#3396) where certain POST variables would cause a PHP warning.
      • +
    • Fixed a bug in query binding (#3402).
      • +
    • Changed order of SQL keywords in the Profiler $highlight array so OR would not be highlighted before ORDER BY.
      • +
    • Fixed a bug (#3404) where the MySQLi driver was testing if $this->conn_id was a resource instead of an object.
      • +
    • Fixed a bug (#3419) connecting to a database via a DSN string.
      • +
    • Fixed a bug (#3445) where the routed segment array was not re-indexed to begin with 1 when the default controller is used.
      • +
    • Fixed assorted user guide typos.
      • +
    + + + +

    Version 1.6.0

    +

    Release Date: January 30, 2008

    +
      +
    • DBForge +
        +
      • Added DBForge to the database tools.
        • +
      • Moved create_database() and drop_database() into DBForge.
        • +
      • Added add_field(), add_key(), create_table(), drop_table(), add_column(), drop_column(), modify_column() into DBForge.
        • +
      +
      • + +
    • Active Record +
        +
      • Added protect_identifiers() in Active Record.
        • +
      • All AR queries are backticked if appropriate to the database.
        • +
      • Added where_in(), or_where_in(), where_not_in(), or_where_not_in(), not_like() and or_not_like() to Active Record.
        • +
      • Added support for limit() into update() and delete() statements in Active Record.
        • +
      • Added empty_table() and truncate_table() to Active Record.
        • +
      • Added the ability to pass an array of tables to the delete() statement in Active Record.
        • +
      • Added count_all_results() function to Active Record.
        • +
      • Added select_max(), select_min(), select_avg() and select_sum() to Active Record.
        • +
      • Added the ability to use aliases with joins in Active Record.
        • +
      • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
        • +
      • Added a third parameter to set() in Active Record that withholds escaping data.
        • +
      • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
        • +
      +
      • + +
    • Other Database Related +
        +
      • MySQL driver now requires MySQL 4.1+
        • +
      • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or not. Previously they were always saved.
        • +
      • Added $this->db->dbprefix() to manually add database prefixes.
        • +
      • Added 'random' as an order_by() option , and removed "rand()" as a listed option as it was MySQL only.
        • +
      • Added a check for NULL fields in the MySQL database backup utility.
        • +
      • Added "constrain_by_prefix" parameter to db->list_table() function. If set to TRUE it will limit the result to only table names with the current prefix.
        • +
      • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); havingor() for having_or(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
        • +
      • Modified csv_from_result() to output CSV data more in the spirit of basic rules of RFC 4180.
        • +
      • Added 'char_set' and 'dbcollat' database configuration settings, to explicitly set the client communication properly.
        • +
      • Removed 'active_r' configuration setting and replaced with a global $active_record setting, which is more + in harmony with the global nature of the behavior (#1834).
        • +
      +
      • + +
    • Core changes +
        +
      • Added ability to load multiple views, whose content will be appended to the output in the order loaded.
        • +
      • Added the ability to auto-load Models.
        • +
      • Reorganized the URI and Routes classes for better clarity.
        • +
      • Added Compat.php to allow function overrides for older versions of PHP or PHP environments missing certain extensions / libraries
        • +
      • Added memory usage, GET, URI string data, and individual query execution time to Profiler output.
        • +
      • Deprecated Scaffolding.
        • +
      • Added is_really_writable() to Common.php to provide a cross-platform reliable method of testing file/folder writability.
        • +
      +
      • + +
    • Libraries +
        +
      • Changed the load protocol of Models to allow for extension.
        • +
      • Strengthened the Encryption library to help protect against man in the middle attacks when MCRYPT_MODE_CBC mode is used.
        • +
      • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
        • +
      • Removed 'last_visit' from the Session class.
        • +
      • Added a language entry for valid_ip validation error.
        • +
      • Modified prep_for_form() in the Validation class to accept arrays, adding support for POST array validation (via callbacks only)
        • +
      • Added an "integer" rule into the Validation library.
        • +
      • Added valid_base64() to the Validation library.
        • +
      • Documented clear() in the Image Processing library.
        • +
      • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
        • +
      • Modified Upload class $_FILES error messages to be more precise.
        • +
      • Moved the safe mode and auth checks for the Email library into the constructor.
        • +
      • Modified variable names in _ci_load() method of Loader class to avoid conflicts with view variables.
        • +
      • Added a few additional mime type variations for CSV.
        • +
      • Enabled the 'system' methods for the XML-RPC Server library, except for 'system.multicall' which is still disabled.
        • +
      +
      • + +
    • Helpers & Plugins +
        +
      • Added link_tag() to the HTML helper.
        • +
      • Added img() to the HTML helper.
        • +
      • Added ability to "extend" Helpers.
        • +
      • Added an email helper into core helpers.
        • +
      • Added strip_quotes() function to string helper.
        • +
      • Added reduce_multiples() function to string helper.
        • +
      • Added quotes_to_entities() function to string helper.
        • +
      • Added form_fieldset(), form_fieldset_close(), form_label(), and form_reset() function to form helper.
        • +
      • Added support for external urls in form_open().
        • +
      • Removed support for db_backup in MySQLi due to incompatible functions.
        • +
      • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
        • +
      +
      • + + +
    • Documentation Changes +
        +
      • Added Writing Documentation section for the community to use in writing their own documentation.
        • +
      • Added titles to all user manual pages.
        • +
      • Added attributes into <html> of userguide for valid html.
        • +
      • Added Zip Encoding Class to the table of contents of the userguide.
        • +
      • Moved part of the userguide menu javascript to an external file.
        • +
      • Documented distinct() in Active Record.
        • +
      • Documented the timezones() function in the Date Helper.
        • +
      • Documented unset_userdata in the Session class.
        • +
      • Documented 2 config options to the Database configuration page.
        • +
      +
      • +
    + +

    Bug fixes for Version 1.6.0

    + +
      +
    • Fixed a bug (#1813) preventing using $CI->db in the same application with returned database objects.
      • +
    • Fixed a bug (#1842) where the $this->uri->rsegments array would not include the 'index' method if routed to the controller without an implicit method.
      • +
    • Fixed a bug (#1872) where word_limiter() was not retaining whitespace.
      • +
    • Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.
      • +
    • Fixed a bug (#2542)in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
      • +
    • Fixed a bug (#2545) in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
      • +
    • Fixed a bug (#2668) in the parser class where numeric data was ignored.
      • +
    • Fixed a bug (#2679) where the "previous" pagination link would get drawn on the first page.
      • +
    • Fixed a bug (#2702) in _object_to_array that broke some types of inserts and updates.
      • +
    • Fixed a bug (#2732) in the SQLite driver for PHP 4.
      • +
    • Fixed a bug (#2754) in Pagination to scan for non-positive num_links.
      • +
    • Fixed a bug (#2762) in the Session library where user agent matching would fail on user agents ending with a space.
      • +
    • Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgres and sqlite drivers.
      • +
    • Fixed a bug (#2810) in the typography helper causing extraneous paragraph tags when string contains tags.
      • +
    • Fixed a bug (#2849) where arguments passed to a subfolder controller method would be incorrectly shifted, dropping the 3rd segment value.
      • +
    • Fixed a bug (#2858) which referenced a wrong variable in the Image class.
      • +
    • Fixed a bug (#2875)when loading plugin files as _plugin. and not _pi.
      • +
    • Fixed a bug (#2912) in get_filenames() in the File Helper where the array wasn't cleared after each call.
      • +
    • Fixed a bug (#2974) in highlight_phrase() that caused an error with slashes.
      • +
    • Fixed a bug (#3003) in the Encryption Library to support modes other than MCRYPT_MODE_ECB
      • +
    • Fixed a bug (#3015) in the User Agent library where more then 2 languages where not reported with languages().
      • +
    • Fixed a bug (#3017) in the Email library where some timezones were calculated incorrectly.
      • +
    • Fixed a bug (#3024) in which master_dim wasn't getting reset by clear() in the Image library.
      • +
    • Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.
      • +
    • Fixed a bug (#3166) that prevented num_rows from working in Oracle.
      • +
    • Fixed a bug (#3175) preventing certain libraries from working properly when autoloaded in PHP 4.
      • +
    • Fixed a bug (#3267) in the Typography Helper where unordered list was listed "un.
      • +
    • Fixed a bug (#3268) where the Router could leave '/' as the path.
      • +
    • Fixed a bug (#3279) where the Email class was sending the wrong Content-Transfer-Encoding for some character sets.
      • +
    • Fixed a bug (#3284) where the rsegment array would not be set properly if the requested URI contained more segments than the routed URI.
      • +
    • Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).
      • +
    • Removed an extraneous call to loading models (#3286).
      • +
    • Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.
      • +
    • Fixed a bug (#3314) which would cause the top level path to be deleted in delete_files() of the File helper.
      • +
    • Fixed a bug (#3328) where the smiley helper might return an undefined variable.
      • +
    • Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.
      • +
    • Removed an unused parameter from Profiler (#3332).
      • +
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
      • +
    • Fixed a bug in the upload library when allowed_files wasn't defined.
      • +
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
      • +
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
      • +
    • Fixed a bug in Validation where individual error messages for checkboxes wasn't supported.
      • +
    • Fixed a bug in captcha calling an invalid PHP function.
      • +
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
      • +
    • Fixed a bug that was making validation callbacks required even when not set as such.
      • +
    • Fixed a bug in the XML-RPC library so if a type is specified, a more intelligent decision is made as to the default type.
      • +
    • Fixed an example of comma-separated emails in the email library documentation.
      • +
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
      • +
    • Fixed a typo in the database language file.
      • +
    • Fixed a typo in the image language file "suppor" to "support".
      • +
    • Fixed an example for XML RPC.
      • +
    • Fixed an example of accept_charset() in the User Agent Library.
      • +
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
      • +
    • Fixed a typo in the String Helper (uniquid changed to uniqid).
      • +
    • Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login), and FTP Class (ftp_unable_to_remame).
      • +
    • Added a stripslashes() into the Upload Library.
      • +
    • Fixed a series of grammatical and spelling errors in the language files.
      • +
    • Fixed assorted user guide typos.
      • +
    +

    Version 1.5.4

    +

    Release Date: July 12, 2007

    +
      +
    • Added custom Language files to the autoload options.
      • +
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
      • +
    • Added array to string into the profiler.
      • +
    • Added some additional mime types in application/config/mimes.php.
      • +
    • Added filename_security() method to Input library.
      • +
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
      • +
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
      • +
    • Fixed MSSQL insert_id().
      • +
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
      • +
    • Fixed a bug that was allowing multiple load attempts on extended classes.
      • +
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
      • +
    • Fixed a bug in the escape_str() function in the MySQL driver.
      • +
    • Fixed a typo in the Calendar library
      • +
    • Fixed a typo in rpcs.php library
      • +
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
      • +
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
      • +
    • Fixed an IP validation bug.
      • +
    • Fixed a bug in display of POST keys in the Profiler output
      • +
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
      • +
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
      • +
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
      • +
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
      • +
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
      • +
    • Fixed various doc typos.
      • +
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
      • +
    • Docs now validate to XHTML 1 transitional
      • +
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
      • +
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
      • +
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
      • +
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
      • +
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
      • +
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
      • +
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
      • +
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.
      • +
    +

    Version 1.5.3

    +

    Release Date: April 15, 2007

    +
      +
    • Added array to string into the profiler
      • +
    • Code Igniter references updated to CodeIgniter
      • +
    • pMachine references updated to EllisLab
      • +
    • Fixed a bug in the repeater function of string helper.
      • +
    • Fixed a bug in ODBC driver
      • +
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
      • +
    • Fixed a bug in the redirect function of the url helper.
      • +
    • Fixed an undefined variable in Loader
      • +
    • Fixed a version bug in the Postgres driver
      • +
    • Fixed a bug in the textarea function of the form helper for use with strings
      • +
    • Fixed doc typos.
      • +
    +

    Version 1.5.2

    +

    Release Date: February 13, 2007

    +
      +
    • Added subversion information to the downloads page.
      • +
    • Added support for captions in the Table Library
      • +
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather than download
      • +
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
      • +
    • Removed unescaped variables in error messages of Input and Router classes
      • +
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
      • +
    • Fixed a bug in the form helper that gave textarea a value attribute
      • +
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
      • +
    • Fixed some doc typos.
      • +
    + + +

    Version 1.5.1

    +

    Release Date: November 23, 2006

    +
      +
    • Added support for submitting arrays of libraries in the $this->load->library function.
      • +
    • Added support for naming custom library files in lower or uppercase.
      • +
    • Fixed a bug related to output buffering.
      • +
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
      • +
    • Fixed a bug that was suppressing errors in controllers.
      • +
    • Fixed a problem that can cause a loop to occur when the config file is missing.
      • +
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
      • +
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
      • +
    • Fixed some bugs in the Oracle DB driver.
      • +
    • Fixed an incorrectly named variable in the MySQLi result driver.
      • +
    • Fixed some doc typos.
      • +
    +

    Version 1.5.0.1

    +

    Release Date: October 31, 2006

    +
      +
    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
      • +
    • Fixed a bug in the word_wrap() helper function.
      • +
    • Fixed an invalid color Hex number in the Profiler class.
      • +
    • Fixed a corrupted image in the user guide.
      • +
    + + + +

    Version 1.5.0

    +

    Release Date: October 30, 2006

    + +
      +
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • +
    • Added Database Caching Class.
      • +
    • Added transaction support to the database classes.
      • +
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
      • +
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
      • +
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
      • +
    • Added Zip Encoding Library.
      • +
    • Added FTP Library.
      • +
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
      • +
    • Added support for storing models within sub-folders.
      • +
    • Added Download Helper.
      • +
    • Added simple_query() function to the database classes
      • +
    • Added standard_date() function to the Date Helper.
      • +
    • Added $query->free_result() to database class.
      • +
    • Added $query->list_fields() function to database class
      • +
    • Added $this->db->platform() function
      • +
    • Added new File Helper: get_filenames()
      • +
    • Added new helper: Smiley Helper
      • +
    • Added support for <ul> and <ol> lists in the HTML Helper
      • +
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
      • +
    • Added the ability to rename or relocate the "application" folder.
      • +
    • Added more thorough initialization in the upload class so that all class variables are reset.
      • +
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
      • +
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
      • +
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
      • +
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
      • +
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
      • +
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
      • +
    • Fixed a bug in the Email class related to SMTP Helo data.
      • +
    • Fixed a bug in the word wrapping helper and function in the email class.
      • +
    • Fixed a bug in the validation class.
      • +
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
      • +
    • Fixed a problem in the form_prep() function that was double encoding entities.
      • +
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
      • +
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
      • +
    • Fixed a pagination bug that was permitting negative values in the URL.
      • +
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
      • +
    • Changed _get_config() to get_config() since the function is not a private one.
      • +
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
      • +
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
      • +
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
      • +
    + + + + +

    Version 1.4.1

    +

    Release Date: September 21, 2006

    + +
      +
    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
      • +
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
      • +
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
      • +
    • Added $this->output->set_header() function, which allows you to set server headers.
      • +
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
      • +
    • Added Inflector helper.
      • +
    • Added element() function in the array helper.
      • +
    • Added RAND() to active record orderby() function.
      • +
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
      • +
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
      • +
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
      • +
    • Added output compression option to the config file.
      • +
    • Removed the is_numeric test from the db->escape() function.
      • +
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
      • +
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
      • +
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
      • +
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
      • +
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
      • +
    • Added some code to allow email attachments to be reset when sending batches of email.
      • +
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own +libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
      • +
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
      • +
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().
      • +
    + + + +

    Version 1.4.0

    +

    Release Date: September 17, 2006

    + +
      +
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • +
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
      • +
    • Added regular expressions support for routing rules.
      • +
    • Added the ability to remap function calls within your controllers.
      • +
    • Added the ability to replace core system classes with your own classes.
      • +
    • Added support for % character in URL.
      • +
    • Added the ability to supply full URLs using the anchor() helper function.
      • +
    • Added mode parameter to file_write() helper.
      • +
    • Added support for changing the port number in the Postgres driver.
      • +
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
      • +
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
      • +
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
      • +
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
      • +
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • +
    • Updated the form_open() helper to allow the GET method to be used.
      • +
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • +
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
      • +
    • Updated the Models loader function to allow multiple loads of the same model.
      • +
    • Updated the MS SQL driver so that single quotes are escaped.
      • +
    • Updated the Postgres and ODBC drivers for better compatibility.
      • +
    • Removed a strtolower() call that was changing URL segments to lower case.
      • +
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
      • +
    • Removed backticks from Postgres class since these are not needed.
      • +
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
      • +
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
      • +
    • Fixed an bug that was preventing the input class from unsetting GET variables.
      • +
    • Fixed a router bug that was making it too greedy when matching end segments.
      • +
    • Fixed a bug that was preventing multiple discrete database calls.
      • +
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
      • +
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
      • +
    • Fixed some missing prefixes when using the database prefix feature.
      • +
    • Fixed a typo in the Calendar class (cal_november).
      • +
    • Fixed a bug in the form_checkbox() helper.
      • +
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
      • +
    • Fixed an evaluation bug in the database initialization function.
      • +
    • Fixed a minor bug in one of the error messages in the language class.
      • +
    • Fixed a bug in the date helper timespan function.
      • +
    • Fixed an undefined variable in the DB Driver class.
      • +
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
      • +
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
      • +
    • Fixed a couple bugs in the Unit Testing class.
      • +
    • Fixed an incorrectly named variable in the Validation class.
      • +
    • Fixed an incorrectly named variable in the URI class.
      • +
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
      • +
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
      • +
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
      • +
    • Fixed some MS SQL bugs.
      • +
    • Fixed some doc typos.
      • +
    + + + +

    Version 1.3.3

    +

    Release Date: June 1, 2006

    + +
      + +
    • Models do not connect automatically to the database as of this version. More info here.
      • +
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
      • +
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
      • +
    • Fixed a bug in the active record "having" function.
      • +
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
      • +
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
      • +
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
      • +
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
      • +
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
      • +
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
      • +
    • Fixed a bug in the hash() security helper.
      • +
    • Fixed some typos.
      • +
    + + + + +

    Version 1.3.2

    +

    Release Date: April 17, 2006

    + +
      +
    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
      • +
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
      • +
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
      • +
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
      • +
    • Fixed a couple bugs in the Model class.
      • +
    • Fixed some documentation typos and errata.
      • +
    + + + +

    Version 1.3.1

    +

    Release Date: April 11, 2006

    + +
      +
    • Added a Unit Testing Library.
      • +
    • Added the ability to pass objects to the insert() and update() database functions. +This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
      • +
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
      • +
    • Added getwhere function to Active Record class.
      • +
    • Added count_all function to Active Record class.
      • +
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
      • +
    • Added $this->db->last_query(), which allows you to view your last query that was run.
      • +
    • Added a new mime type to the upload class for better compatibility.
      • +
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
      • +
    • Fixed a bug in a couple of the active record functions (where and orderby).
      • +
    • Fixed a bug in the image library when realpath() returns false.
      • +
    • Fixed a bug in the Models that was preventing libraries from being used within them.
      • +
    • Fixed a bug in the "exact_length" function of the validation class.
      • +
    • Fixed some typos in the user guide
      • +
    + + +

    Version 1.3

    +

    Release Date: April 3, 2006

    + +
      +
    • Added support for Models.
      • +
    • Redesigned the database libraries to support additional RDBMs (Postgres, MySQLi, etc.).
      • +
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
      • +
    • Added a feature to the database class that lets you run custom function calls.
      • +
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
      • +
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
      • +
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
      • +
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
      • +
    • Added a new error template for use with native PHP errors.
      • +
    • Added "alternator" function in the string helpers.
      • +
    • Removed slashing from the input class. After much debate we decided to kill this feature.
      • +
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
      • +
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and +all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
      • +
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
      • +
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
      • +
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
      • +
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
      • +
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
      • +
    • Fixed some typos in the default calendar template
      • +
    • Fixed some typos in the user guide
      • +
    + + + + + + + + +

    Version 1.2

    +

    Release Date: March 21, 2006

    + +
      +
    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
      • +
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
      • +
    • Added new File Helper: delete_files()
      • +
    • Added new URL Helpers: base_url(), index_page()
      • +
    • Added the ability to create your own core libraries and store them in your local application directory.
      • +
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
      • +
    • Added Javascript Calendar plugin.
      • +
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
      • +
    • Updated the parser class so that it allows tag pars within other tag pairs.
      • +
    • Fixed a bug in the DB "where" function.
      • +
    • Fixed a bug that was preventing custom config files to be auto-loaded.
      • +
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
      • +
    • Fixed some bugs in the xss_clean function
      • +
    + + + + + +

    Version Beta 1.1

    +

    Release Date: March 10, 2006

    + +
      +
    • Added a Calendaring class.
      • +
    • Added support for running multiple applications that share a common CodeIgniter backend.
      • +
    • Moved the "uri protocol" variable from the index.php file into the config.php file
      • +
    • Fixed a problem that was preventing certain function calls from working within constructors.
      • +
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
      • +
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
      • +
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
      • +
    • Fixed a data type error in the form_radio function (form helper)
      • +
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
      • +
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
      • +
    • Fixed a pagination problem in the scaffolding.
      • +
    • Fixed a bug in the mysql class "where" function.
      • +
    • Fixed a regex problem in some code that trimmed duplicate slashes.
      • +
    • Fixed a bug in the br() function in the HTML helper
      • +
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
      • +
    • Removed the "style" attributes form the form helpers.
      • +
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.
      • +
    + +

    Version Beta 1.0

    +

    Release Date: February 28, 2006

    +

    First publicly released version.

    + +
    + + + + + + + diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 99041ed7..3b4ffb13 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -1,313 +1,368 @@ - - - - - -HTML Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    HTML Helper

    - -

    The HTML Helper file contains functions that assist in working with HTML.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('html'); - -

    The following functions are available:

    - -

    br()

    -

    Generates line break tags (<br />) based on the number you submit. Example:

    -echo br(3); -

    The above would produce: <br /><br /><br />

    - -

    heading()

    -

    Lets you create HTML <h1> tags. The first parameter will contain the data, the -second the size of the heading. Example:

    -echo heading('Welcome!', 3); -

    The above would produce: <h3>Welcome!</h3>

    -

    img()

    -

    Lets you create HTML <img /> tags. The first parameter contains the image source. Example:

    -echo img('images/picture.jpg');
    -// gives <img src="http://site.com/images/picture.jpg" />     -

    There is an optional second parameter that is a TRUE/FALSE value that specifics if the src should have the page specified by $config['index_page'] added to the address it creates. Presumably, this would be if you were using a media controller.

    -

    echo img('images/picture.jpg', TRUE);
    -// gives <img src="http://site.com/index.php/images/picture.jpg" />

    -

    Additionally, an associative array can be passed to the img() function for complete control over all attributes and values.

    -

    $image_properties = array(
    -           'src' => 'images/picture.jpg',
    -           'alt' => 'Me, demonstrating how to eat 4 slices of pizza at one time',
    -           'class' => 'post_images',
    -           'width' => '200',
    -           'height' => '200',
    -           'title' => 'That was quite a night',
    -           'rel' => 'lightbox',
    - );
    -
    - img($image_properties);
    - // <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />

    -

    link_tag()

    -

    Lets you create HTML <link /> tags. This is useful for stylesheet links, as well as other links. The parameters are href, with optional rel, type, title, media and index_page. index_page is a TRUE/FALSE value that specifics if the href should have the page specified by $config['index_page'] added to the address it creates. -echo link_tag('css/mystyles.css');
    -// gives <link href="http://site.com/css/mystyles.css" rel="stylesheet" type="text/css" />

    -

    Further examples:

    - - - echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
    - // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" /> -
    -
    - echo link('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
    - // <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />     -

    Additionally, an associative array can be passed to the link() function for complete control over all attributes and values.

    -

    - $link = array(
    -           'href' => 'css/printer.css',
    -           'rel' => 'stylesheet',
    -           'type' => 'text/css',
    -           'media' => 'print'
    - );
    -
    - echo link_tag($link);
    - // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />

    - -

    nbs()

    -

    Generates non-breaking spaces (&nbsp;) based on the number you submit. Example:

    -echo nbs(3); -

    The above would produce: &nbsp;&nbsp;&nbsp;

    - -

    ol()  and  ul()

    - -

    Permits you to generate ordered or unordered HTML lists from simple or multi-dimensional arrays. Example:

    - - -$this->load->helper('html');
    -
    -$list = array(
    -            'red',
    -            'blue',
    -            'green',
    -            'yellow'
    -            );
    -
    -$attributes = array(
    -                    'class' => 'boldlist',
    -                    'id'    => 'mylist'
    -                    );
    -
    -echo ul($list, $attributes);
    -     - -

    The above code will produce this:

    - - -<ul class="boldlist" id="mylist">
    -  <li>red</li>
    -  <li>blue</li>
    -  <li>green</li>
    -  <li>yellow</li>
    -</ul> -     - -

    Here is a more complex example, using a multi-dimensional array:

    - - -$this->load->helper('html');
    -
    -$list = array(
    -            'colors' => array(
    -                                'red',
    -                                'blue',
    -                                'green'
    -                            ),
    -            'shapes' => array(
    -                                'round',
    -                                'square',
    -                                'circles' => array(
    -                                                    'ellipse',
    -                                                    'oval',
    -                                                    'sphere'
    -                                                    )
    -                            ),
    -            'moods'    => array(
    -                                'happy',
    -                                'upset' => array(
    -                                                    'defeated' => array(
    -                                                                        'dejected',
    -                                                                        'disheartened',
    -                                                                        'depressed'
    -                                                                        ),
    -                                                    'annoyed',
    -                                                    'cross',
    -                                                    'angry'
    -                                                )
    -                            )
    -            );
    -
    -
    -echo ul($list);     - -

    The above code will produce this:

    - - -<ul class="boldlist" id="mylist">
    -  <li>colors
    -    <ul>
    -      <li>red</li>
    -      <li>blue</li>
    -      <li>green</li>
    -    </ul>
    -  </li>
    -  <li>shapes
    -    <ul>
    -      <li>round</li>
    -      <li>suare</li>
    -      <li>circles
    -        <ul>
    -          <li>elipse</li>
    -          <li>oval</li>
    -          <li>sphere</li>
    -        </ul>
    -      </li>
    -    </ul>
    -  </li>
    -  <li>moods
    -    <ul>
    -      <li>happy</li>
    -      <li>upset
    -        <ul>
    -          <li>defeated
    -            <ul>
    -              <li>dejected</li>
    -              <li>disheartened</li>
    -              <li>depressed</li>
    -            </ul>
    -          </li>
    -          <li>annoyed</li>
    -          <li>cross</li>
    -          <li>angry</li>
    -        </ul>
    -      </li>
    -    </ul>
    -  </li>
    -</ul> -     - - - -

    meta()

    - -

    Helps you generate meta tags. You can pass strings to the function, or simple arrays, or multidimensional ones. Examples:

    - - -echo meta('description', 'My Great site');
    -// Generates: <meta name="description" content="My Great Site" />
    -

    - -echo meta('Content-type', 'text/html; charset=utf-8', 'equiv'); // Note the third parameter. Can be "equiv" or "name"
    -// Generates: <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
    - -

    - -echo meta(array('name' => 'robots', 'content' => 'no-cache'));
    -// Generates: <meta name="robots" content="no-cache" />
    - -

    - -$meta = array(
    -        array('name' => 'robots', 'content' => 'no-cache'),
    -        array('name' => 'description', 'content' => 'My Great Site'),
    -        array('name' => 'keywords', 'content' => 'love, passion, intrigue, deception'),
    -        array('name' => 'robots', 'content' => 'no-cache'),
    -        array('name' => 'Content-type', 'content' => 'text/html; charset=utf-8', 'type' => 'equiv')
    -    );
    -
    -echo meta($meta); -
    -// Generates:
    -// <meta name="robots" content="no-cache" />
    -// <meta name="description" content="My Great Site" />
    -// <meta name="keywords" content="love, passion, intrigue, deception" />
    -// <meta name="robots" content="no-cache" />
    -// <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> -     - - - - - - - - - - - - -
    - - - - - - + + + + + +HTML Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    HTML Helper

    + +

    The HTML Helper file contains functions that assist in working with HTML.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('html'); + +

    The following functions are available:

    + +

    br()

    +

    Generates line break tags (<br />) based on the number you submit. Example:

    +echo br(3); +

    The above would produce: <br /><br /><br />

    + +

    heading()

    +

    Lets you create HTML <h1> tags. The first parameter will contain the data, the +second the size of the heading. Example:

    +echo heading('Welcome!', 3); +

    The above would produce: <h3>Welcome!</h3>

    +

    img()

    +

    Lets you create HTML <img /> tags. The first parameter contains the image source. Example:

    +echo img('images/picture.jpg');
    +// gives <img src="http://site.com/images/picture.jpg" />     +

    There is an optional second parameter that is a TRUE/FALSE value that specifics if the src should have the page specified by $config['index_page'] added to the address it creates. Presumably, this would be if you were using a media controller.

    +

    echo img('images/picture.jpg', TRUE);
    +// gives <img src="http://site.com/index.php/images/picture.jpg" />

    +

    Additionally, an associative array can be passed to the img() function for complete control over all attributes and values.

    +

    $image_properties = array(
    +           'src' => 'images/picture.jpg',
    +           'alt' => 'Me, demonstrating how to eat 4 slices of pizza at one time',
    +           'class' => 'post_images',
    +           'width' => '200',
    +           'height' => '200',
    +           'title' => 'That was quite a night',
    +           'rel' => 'lightbox',
    + );
    +
    + img($image_properties);
    + // <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />

    +

    link_tag()

    +

    Lets you create HTML <link /> tags. This is useful for stylesheet links, as well as other links. The parameters are href, with optional rel, type, title, media and index_page. index_page is a TRUE/FALSE value that specifics if the href should have the page specified by $config['index_page'] added to the address it creates. +echo link_tag('css/mystyles.css');
    +// gives <link href="http://site.com/css/mystyles.css" rel="stylesheet" type="text/css" />

    +

    Further examples:

    + + + echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
    + // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" /> +
    +
    + echo link('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
    + // <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />     +

    Additionally, an associative array can be passed to the link() function for complete control over all attributes and values.

    +

    + $link = array(
    +           'href' => 'css/printer.css',
    +           'rel' => 'stylesheet',
    +           'type' => 'text/css',
    +           'media' => 'print'
    + );
    +
    + echo link_tag($link);
    + // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />

    + +

    nbs()

    +

    Generates non-breaking spaces (&nbsp;) based on the number you submit. Example:

    +echo nbs(3); +

    The above would produce: &nbsp;&nbsp;&nbsp;

    + +

    ol()  and  ul()

    + +

    Permits you to generate ordered or unordered HTML lists from simple or multi-dimensional arrays. Example:

    + + +$this->load->helper('html');
    +
    +$list = array(
    +            'red',
    +            'blue',
    +            'green',
    +            'yellow'
    +            );
    +
    +$attributes = array(
    +                    'class' => 'boldlist',
    +                    'id'    => 'mylist'
    +                    );
    +
    +echo ul($list, $attributes);
    +     + +

    The above code will produce this:

    + + +<ul class="boldlist" id="mylist">
    +  <li>red</li>
    +  <li>blue</li>
    +  <li>green</li>
    +  <li>yellow</li>
    +</ul> +     + +

    Here is a more complex example, using a multi-dimensional array:

    + + +$this->load->helper('html');
    +
    +$list = array(
    +            'colors' => array(
    +                                'red',
    +                                'blue',
    +                                'green'
    +                            ),
    +            'shapes' => array(
    +                                'round',
    +                                'square',
    +                                'circles' => array(
    +                                                    'ellipse',
    +                                                    'oval',
    +                                                    'sphere'
    +                                                    )
    +                            ),
    +            'moods'    => array(
    +                                'happy',
    +                                'upset' => array(
    +                                                    'defeated' => array(
    +                                                                        'dejected',
    +                                                                        'disheartened',
    +                                                                        'depressed'
    +                                                                        ),
    +                                                    'annoyed',
    +                                                    'cross',
    +                                                    'angry'
    +                                                )
    +                            )
    +            );
    +
    +
    +echo ul($list);     + +

    The above code will produce this:

    + + +<ul class="boldlist" id="mylist">
    +  <li>colors
    +    <ul>
    +      <li>red</li>
    +      <li>blue</li>
    +      <li>green</li>
    +    </ul>
    +  </li>
    +  <li>shapes
    +    <ul>
    +      <li>round</li>
    +      <li>suare</li>
    +      <li>circles
    +        <ul>
    +          <li>elipse</li>
    +          <li>oval</li>
    +          <li>sphere</li>
    +        </ul>
    +      </li>
    +    </ul>
    +  </li>
    +  <li>moods
    +    <ul>
    +      <li>happy</li>
    +      <li>upset
    +        <ul>
    +          <li>defeated
    +            <ul>
    +              <li>dejected</li>
    +              <li>disheartened</li>
    +              <li>depressed</li>
    +            </ul>
    +          </li>
    +          <li>annoyed</li>
    +          <li>cross</li>
    +          <li>angry</li>
    +        </ul>
    +      </li>
    +    </ul>
    +  </li>
    +</ul> +     + + + +

    meta()

    + +

    Helps you generate meta tags. You can pass strings to the function, or simple arrays, or multidimensional ones. Examples:

    + + +echo meta('description', 'My Great site');
    +// Generates: <meta name="description" content="My Great Site" />
    +

    + +echo meta('Content-type', 'text/html; charset=utf-8', 'equiv'); // Note the third parameter. Can be "equiv" or "name"
    +// Generates: <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
    + +

    + +echo meta(array('name' => 'robots', 'content' => 'no-cache'));
    +// Generates: <meta name="robots" content="no-cache" />
    + +

    + +$meta = array(
    +        array('name' => 'robots', 'content' => 'no-cache'),
    +        array('name' => 'description', 'content' => 'My Great Site'),
    +        array('name' => 'keywords', 'content' => 'love, passion, intrigue, deception'),
    +        array('name' => 'robots', 'content' => 'no-cache'),
    +        array('name' => 'Content-type', 'content' => 'text/html; charset=utf-8', 'type' => 'equiv')
    +    );
    +
    +echo meta($meta); +
    +// Generates:
    +// <meta name="robots" content="no-cache" />
    +// <meta name="description" content="My Great Site" />
    +// <meta name="keywords" content="love, passion, intrigue, deception" />
    +// <meta name="robots" content="no-cache" />
    +// <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> +     + + +

    doctype()

    + +

    Helps you generate document type declarations, or DTD's. XHTML 1.0 Strict is used by default, but many doctypes are available.

    + + +echo docytype();
    +// <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    +
    +echo doctype('html4-trans');
    +// <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +     + +

    The following is a list of doctype choices. These are configurable, and pulled from application/config/doctypes.php

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    DoctypeOptionResult
    XHTML 1.1doctype('xhtml11')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
    XHTML 1.0 Strictdoctype('xhtml1-strict')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    XHTML 1.0 Transitionaldoctype('xhtml1-trans')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    XHTML 1.0 Framesetdoctype('xhtml1-frame')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    HTML 5doctype('html5')<!DOCTYPE html>
    HTML 4 Strictdoctype('html4-strict')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    HTML 4 Transitionaldoctype('html4-trans')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
    HTML 4 Framesetdoctype('html4-frame')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
    + + + + +
    + + + + + + \ No newline at end of file From 1bf63e459baf22ab9fc3bade9697577a09054b80 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 3 Nov 2008 15:33:28 +0000 Subject: [PATCH 1545/2544] A "HTTP/1.1 400 Bad Request" header is now sent when disallowed characters are encountered. --- system/libraries/URI.php | 1167 +++++++++++++++++++------------------ user_guide/changelog.html | 1 + 2 files changed, 585 insertions(+), 583 deletions(-) diff --git a/system/libraries/URI.php b/system/libraries/URI.php index 0e4ff50c..aa2d71e8 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -1,584 +1,585 @@ -config =& load_class('Config'); - log_message('debug', "URI Class Initialized"); - } - - - // -------------------------------------------------------------------- - - /** - * Get the URI String - * - * @access private - * @return string - */ - function _fetch_uri_string() - { - if (strtoupper($this->config->item('uri_protocol')) == 'AUTO') - { - // If the URL has a question mark then it's simplest to just - // build the URI string from the zero index of the $_GET array. - // This avoids having to deal with $_SERVER variables, which - // can be unreliable in some environments - if (is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '') - { - $this->uri_string = key($_GET); - return; - } - - // Is there a PATH_INFO variable? - // Note: some servers seem to have trouble with getenv() so we'll test it two ways - $path = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO'); - if (trim($path, '/') != '' && $path != "/".SELF) - { - $this->uri_string = $path; - return; - } - - // No PATH_INFO?... What about QUERY_STRING? - $path = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING'); - if (trim($path, '/') != '') - { - $this->uri_string = $path; - return; - } - - // No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists? - $path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO'); - if (trim($path, '/') != '' && $path != "/".SELF) - { - // remove path and script information so we have good URI data - $this->uri_string = str_replace($_SERVER['SCRIPT_NAME'], '', $path); - return; - } - - // We've exhausted all our options... - $this->uri_string = ''; - } - else - { - $uri = strtoupper($this->config->item('uri_protocol')); - - if ($uri == 'REQUEST_URI') - { - $this->uri_string = $this->_parse_request_uri(); - return; - } - - $this->uri_string = (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri); - } - - // If the URI contains only a slash we'll kill it - if ($this->uri_string == '/') - { - $this->uri_string = ''; - } - } - - // -------------------------------------------------------------------- - - /** - * Parse the REQUEST_URI - * - * Due to the way REQUEST_URI works it usually contains path info - * that makes it unusable as URI data. We'll trim off the unnecessary - * data, hopefully arriving at a valid URI that we can use. - * - * @access private - * @return string - */ - function _parse_request_uri() - { - if ( ! isset($_SERVER['REQUEST_URI']) OR $_SERVER['REQUEST_URI'] == '') - { - return ''; - } - - $request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI'])); - - if ($request_uri == '' OR $request_uri == SELF) - { - return ''; - } - - $fc_path = FCPATH; - if (strpos($request_uri, '?') !== FALSE) - { - $fc_path .= '?'; - } - - $parsed_uri = explode("/", $request_uri); - - $i = 0; - foreach(explode("/", $fc_path) as $segment) - { - if (isset($parsed_uri[$i]) && $segment == $parsed_uri[$i]) - { - $i++; - } - } - - $parsed_uri = implode("/", array_slice($parsed_uri, $i)); - - if ($parsed_uri != '') - { - $parsed_uri = '/'.$parsed_uri; - } - - return $parsed_uri; - } - - // -------------------------------------------------------------------- - - /** - * Filter segments for malicious characters - * - * @access private - * @param string - * @return string - */ - function _filter_uri($str) - { - if ($str != '' && $this->config->item('permitted_uri_chars') != '' && $this->config->item('enable_query_strings') == FALSE) - { - if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str)) - { - exit('The URI you submitted has disallowed characters.'); - } - } - - // Convert programatic characters to entities - $bad = array('$', '(', ')', '%28', '%29'); - $good = array('$', '(', ')', '(', ')'); - - return str_replace($bad, $good, $str); - } - - // -------------------------------------------------------------------- - - /** - * Remove the suffix from the URL if needed - * - * @access private - * @return void - */ - function _remove_url_suffix() - { - if ($this->config->item('url_suffix') != "") - { - $this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string); - } - } - - // -------------------------------------------------------------------- - - /** - * Explode the URI Segments. The individual segments will - * be stored in the $this->segments array. - * - * @access private - * @return void - */ - function _explode_segments() - { - foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) - { - // Filter segments for security - $val = trim($this->_filter_uri($val)); - - if ($val != '') - { - $this->segments[] = $val; - } - } - } - - // -------------------------------------------------------------------- - /** - * Re-index Segments - * - * This function re-indexes the $this->segment array so that it - * starts at 1 rather than 0. Doing so makes it simpler to - * use functions like $this->uri->segment(n) since there is - * a 1:1 relationship between the segment array and the actual segments. - * - * @access private - * @return void - */ - function _reindex_segments() - { - array_unshift($this->segments, NULL); - array_unshift($this->rsegments, NULL); - unset($this->segments[0]); - unset($this->rsegments[0]); - } - - // -------------------------------------------------------------------- - - /** - * Fetch a URI Segment - * - * This function returns the URI segment based on the number provided. - * - * @access public - * @param integer - * @param bool - * @return string - */ - function segment($n, $no_result = FALSE) - { - return ( ! isset($this->segments[$n])) ? $no_result : $this->segments[$n]; - } - - // -------------------------------------------------------------------- - - /** - * Fetch a URI "routed" Segment - * - * This function returns the re-routed URI segment (assuming routing rules are used) - * based on the number provided. If there is no routing this function returns the - * same result as $this->segment() - * - * @access public - * @param integer - * @param bool - * @return string - */ - function rsegment($n, $no_result = FALSE) - { - return ( ! isset($this->rsegments[$n])) ? $no_result : $this->rsegments[$n]; - } - - // -------------------------------------------------------------------- - - /** - * Generate a key value pair from the URI string - * - * This function generates and associative array of URI data starting - * at the supplied segment. For example, if this is your URI: - * - * example.com/user/search/name/joe/location/UK/gender/male - * - * You can use this function to generate an array with this prototype: - * - * array ( - * name => joe - * location => UK - * gender => male - * ) - * - * @access public - * @param integer the starting segment number - * @param array an array of default values - * @return array - */ - function uri_to_assoc($n = 3, $default = array()) - { - return $this->_uri_to_assoc($n, $default, 'segment'); - } - /** - * Identical to above only it uses the re-routed segment array - * - */ - function ruri_to_assoc($n = 3, $default = array()) - { - return $this->_uri_to_assoc($n, $default, 'rsegment'); - } - - // -------------------------------------------------------------------- - - /** - * Generate a key value pair from the URI string or Re-routed URI string - * - * @access private - * @param integer the starting segment number - * @param array an array of default values - * @param string which array we should use - * @return array - */ - function _uri_to_assoc($n = 3, $default = array(), $which = 'segment') - { - if ($which == 'segment') - { - $total_segments = 'total_segments'; - $segment_array = 'segment_array'; - } - else - { - $total_segments = 'total_rsegments'; - $segment_array = 'rsegment_array'; - } - - if ( ! is_numeric($n)) - { - return $default; - } - - if (isset($this->keyval[$n])) - { - return $this->keyval[$n]; - } - - if ($this->$total_segments() < $n) - { - if (count($default) == 0) - { - return array(); - } - - $retval = array(); - foreach ($default as $val) - { - $retval[$val] = FALSE; - } - return $retval; - } - - $segments = array_slice($this->$segment_array(), ($n - 1)); - - $i = 0; - $lastval = ''; - $retval = array(); - foreach ($segments as $seg) - { - if ($i % 2) - { - $retval[$lastval] = $seg; - } - else - { - $retval[$seg] = FALSE; - $lastval = $seg; - } - - $i++; - } - - if (count($default) > 0) - { - foreach ($default as $val) - { - if ( ! array_key_exists($val, $retval)) - { - $retval[$val] = FALSE; - } - } - } - - // Cache the array for reuse - $this->keyval[$n] = $retval; - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Generate a URI string from an associative array - * - * - * @access public - * @param array an associative array of key/values - * @return array - */ - function assoc_to_uri($array) - { - $temp = array(); - foreach ((array)$array as $key => $val) - { - $temp[] = $key; - $temp[] = $val; - } - - return implode('/', $temp); - } - - // -------------------------------------------------------------------- - - /** - * Fetch a URI Segment and add a trailing slash - * - * @access public - * @param integer - * @param string - * @return string - */ - function slash_segment($n, $where = 'trailing') - { - return $this->_slash_segment($n, $where, 'segment'); - } - - // -------------------------------------------------------------------- - - /** - * Fetch a URI Segment and add a trailing slash - * - * @access public - * @param integer - * @param string - * @return string - */ - function slash_rsegment($n, $where = 'trailing') - { - return $this->_slash_segment($n, $where, 'rsegment'); - } - - // -------------------------------------------------------------------- - - /** - * Fetch a URI Segment and add a trailing slash - helper function - * - * @access private - * @param integer - * @param string - * @param string - * @return string - */ - function _slash_segment($n, $where = 'trailing', $which = 'segment') - { - if ($where == 'trailing') - { - $trailing = '/'; - $leading = ''; - } - elseif ($where == 'leading') - { - $leading = '/'; - $trailing = ''; - } - else - { - $leading = '/'; - $trailing = '/'; - } - return $leading.$this->$which($n).$trailing; - } - - // -------------------------------------------------------------------- - - /** - * Segment Array - * - * @access public - * @return array - */ - function segment_array() - { - return $this->segments; - } - - // -------------------------------------------------------------------- - - /** - * Routed Segment Array - * - * @access public - * @return array - */ - function rsegment_array() - { - return $this->rsegments; - } - - // -------------------------------------------------------------------- - - /** - * Total number of segments - * - * @access public - * @return integer - */ - function total_segments() - { - return count($this->segments); - } - - // -------------------------------------------------------------------- - - /** - * Total number of routed segments - * - * @access public - * @return integer - */ - function total_rsegments() - { - return count($this->rsegments); - } - - // -------------------------------------------------------------------- - - /** - * Fetch the entire URI string - * - * @access public - * @return string - */ - function uri_string() - { - return $this->uri_string; - } - - - // -------------------------------------------------------------------- - - /** - * Fetch the entire Re-routed URI string - * - * @access public - * @return string - */ - function ruri_string() - { - return '/'.implode('/', $this->rsegment_array()).'/'; - } - -} -// END URI Class - -/* End of file URI.php */ +config =& load_class('Config'); + log_message('debug', "URI Class Initialized"); + } + + + // -------------------------------------------------------------------- + + /** + * Get the URI String + * + * @access private + * @return string + */ + function _fetch_uri_string() + { + if (strtoupper($this->config->item('uri_protocol')) == 'AUTO') + { + // If the URL has a question mark then it's simplest to just + // build the URI string from the zero index of the $_GET array. + // This avoids having to deal with $_SERVER variables, which + // can be unreliable in some environments + if (is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '') + { + $this->uri_string = key($_GET); + return; + } + + // Is there a PATH_INFO variable? + // Note: some servers seem to have trouble with getenv() so we'll test it two ways + $path = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO'); + if (trim($path, '/') != '' && $path != "/".SELF) + { + $this->uri_string = $path; + return; + } + + // No PATH_INFO?... What about QUERY_STRING? + $path = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING'); + if (trim($path, '/') != '') + { + $this->uri_string = $path; + return; + } + + // No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists? + $path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO'); + if (trim($path, '/') != '' && $path != "/".SELF) + { + // remove path and script information so we have good URI data + $this->uri_string = str_replace($_SERVER['SCRIPT_NAME'], '', $path); + return; + } + + // We've exhausted all our options... + $this->uri_string = ''; + } + else + { + $uri = strtoupper($this->config->item('uri_protocol')); + + if ($uri == 'REQUEST_URI') + { + $this->uri_string = $this->_parse_request_uri(); + return; + } + + $this->uri_string = (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri); + } + + // If the URI contains only a slash we'll kill it + if ($this->uri_string == '/') + { + $this->uri_string = ''; + } + } + + // -------------------------------------------------------------------- + + /** + * Parse the REQUEST_URI + * + * Due to the way REQUEST_URI works it usually contains path info + * that makes it unusable as URI data. We'll trim off the unnecessary + * data, hopefully arriving at a valid URI that we can use. + * + * @access private + * @return string + */ + function _parse_request_uri() + { + if ( ! isset($_SERVER['REQUEST_URI']) OR $_SERVER['REQUEST_URI'] == '') + { + return ''; + } + + $request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI'])); + + if ($request_uri == '' OR $request_uri == SELF) + { + return ''; + } + + $fc_path = FCPATH; + if (strpos($request_uri, '?') !== FALSE) + { + $fc_path .= '?'; + } + + $parsed_uri = explode("/", $request_uri); + + $i = 0; + foreach(explode("/", $fc_path) as $segment) + { + if (isset($parsed_uri[$i]) && $segment == $parsed_uri[$i]) + { + $i++; + } + } + + $parsed_uri = implode("/", array_slice($parsed_uri, $i)); + + if ($parsed_uri != '') + { + $parsed_uri = '/'.$parsed_uri; + } + + return $parsed_uri; + } + + // -------------------------------------------------------------------- + + /** + * Filter segments for malicious characters + * + * @access private + * @param string + * @return string + */ + function _filter_uri($str) + { + if ($str != '' && $this->config->item('permitted_uri_chars') != '' && $this->config->item('enable_query_strings') == FALSE) + { + if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str)) + { + header('HTTP/1.1 400 Bad Request'); + exit('The URI you submitted has disallowed characters.'); + } + } + + // Convert programatic characters to entities + $bad = array('$', '(', ')', '%28', '%29'); + $good = array('$', '(', ')', '(', ')'); + + return str_replace($bad, $good, $str); + } + + // -------------------------------------------------------------------- + + /** + * Remove the suffix from the URL if needed + * + * @access private + * @return void + */ + function _remove_url_suffix() + { + if ($this->config->item('url_suffix') != "") + { + $this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string); + } + } + + // -------------------------------------------------------------------- + + /** + * Explode the URI Segments. The individual segments will + * be stored in the $this->segments array. + * + * @access private + * @return void + */ + function _explode_segments() + { + foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) + { + // Filter segments for security + $val = trim($this->_filter_uri($val)); + + if ($val != '') + { + $this->segments[] = $val; + } + } + } + + // -------------------------------------------------------------------- + /** + * Re-index Segments + * + * This function re-indexes the $this->segment array so that it + * starts at 1 rather than 0. Doing so makes it simpler to + * use functions like $this->uri->segment(n) since there is + * a 1:1 relationship between the segment array and the actual segments. + * + * @access private + * @return void + */ + function _reindex_segments() + { + array_unshift($this->segments, NULL); + array_unshift($this->rsegments, NULL); + unset($this->segments[0]); + unset($this->rsegments[0]); + } + + // -------------------------------------------------------------------- + + /** + * Fetch a URI Segment + * + * This function returns the URI segment based on the number provided. + * + * @access public + * @param integer + * @param bool + * @return string + */ + function segment($n, $no_result = FALSE) + { + return ( ! isset($this->segments[$n])) ? $no_result : $this->segments[$n]; + } + + // -------------------------------------------------------------------- + + /** + * Fetch a URI "routed" Segment + * + * This function returns the re-routed URI segment (assuming routing rules are used) + * based on the number provided. If there is no routing this function returns the + * same result as $this->segment() + * + * @access public + * @param integer + * @param bool + * @return string + */ + function rsegment($n, $no_result = FALSE) + { + return ( ! isset($this->rsegments[$n])) ? $no_result : $this->rsegments[$n]; + } + + // -------------------------------------------------------------------- + + /** + * Generate a key value pair from the URI string + * + * This function generates and associative array of URI data starting + * at the supplied segment. For example, if this is your URI: + * + * example.com/user/search/name/joe/location/UK/gender/male + * + * You can use this function to generate an array with this prototype: + * + * array ( + * name => joe + * location => UK + * gender => male + * ) + * + * @access public + * @param integer the starting segment number + * @param array an array of default values + * @return array + */ + function uri_to_assoc($n = 3, $default = array()) + { + return $this->_uri_to_assoc($n, $default, 'segment'); + } + /** + * Identical to above only it uses the re-routed segment array + * + */ + function ruri_to_assoc($n = 3, $default = array()) + { + return $this->_uri_to_assoc($n, $default, 'rsegment'); + } + + // -------------------------------------------------------------------- + + /** + * Generate a key value pair from the URI string or Re-routed URI string + * + * @access private + * @param integer the starting segment number + * @param array an array of default values + * @param string which array we should use + * @return array + */ + function _uri_to_assoc($n = 3, $default = array(), $which = 'segment') + { + if ($which == 'segment') + { + $total_segments = 'total_segments'; + $segment_array = 'segment_array'; + } + else + { + $total_segments = 'total_rsegments'; + $segment_array = 'rsegment_array'; + } + + if ( ! is_numeric($n)) + { + return $default; + } + + if (isset($this->keyval[$n])) + { + return $this->keyval[$n]; + } + + if ($this->$total_segments() < $n) + { + if (count($default) == 0) + { + return array(); + } + + $retval = array(); + foreach ($default as $val) + { + $retval[$val] = FALSE; + } + return $retval; + } + + $segments = array_slice($this->$segment_array(), ($n - 1)); + + $i = 0; + $lastval = ''; + $retval = array(); + foreach ($segments as $seg) + { + if ($i % 2) + { + $retval[$lastval] = $seg; + } + else + { + $retval[$seg] = FALSE; + $lastval = $seg; + } + + $i++; + } + + if (count($default) > 0) + { + foreach ($default as $val) + { + if ( ! array_key_exists($val, $retval)) + { + $retval[$val] = FALSE; + } + } + } + + // Cache the array for reuse + $this->keyval[$n] = $retval; + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Generate a URI string from an associative array + * + * + * @access public + * @param array an associative array of key/values + * @return array + */ + function assoc_to_uri($array) + { + $temp = array(); + foreach ((array)$array as $key => $val) + { + $temp[] = $key; + $temp[] = $val; + } + + return implode('/', $temp); + } + + // -------------------------------------------------------------------- + + /** + * Fetch a URI Segment and add a trailing slash + * + * @access public + * @param integer + * @param string + * @return string + */ + function slash_segment($n, $where = 'trailing') + { + return $this->_slash_segment($n, $where, 'segment'); + } + + // -------------------------------------------------------------------- + + /** + * Fetch a URI Segment and add a trailing slash + * + * @access public + * @param integer + * @param string + * @return string + */ + function slash_rsegment($n, $where = 'trailing') + { + return $this->_slash_segment($n, $where, 'rsegment'); + } + + // -------------------------------------------------------------------- + + /** + * Fetch a URI Segment and add a trailing slash - helper function + * + * @access private + * @param integer + * @param string + * @param string + * @return string + */ + function _slash_segment($n, $where = 'trailing', $which = 'segment') + { + if ($where == 'trailing') + { + $trailing = '/'; + $leading = ''; + } + elseif ($where == 'leading') + { + $leading = '/'; + $trailing = ''; + } + else + { + $leading = '/'; + $trailing = '/'; + } + return $leading.$this->$which($n).$trailing; + } + + // -------------------------------------------------------------------- + + /** + * Segment Array + * + * @access public + * @return array + */ + function segment_array() + { + return $this->segments; + } + + // -------------------------------------------------------------------- + + /** + * Routed Segment Array + * + * @access public + * @return array + */ + function rsegment_array() + { + return $this->rsegments; + } + + // -------------------------------------------------------------------- + + /** + * Total number of segments + * + * @access public + * @return integer + */ + function total_segments() + { + return count($this->segments); + } + + // -------------------------------------------------------------------- + + /** + * Total number of routed segments + * + * @access public + * @return integer + */ + function total_rsegments() + { + return count($this->rsegments); + } + + // -------------------------------------------------------------------- + + /** + * Fetch the entire URI string + * + * @access public + * @return string + */ + function uri_string() + { + return $this->uri_string; + } + + + // -------------------------------------------------------------------- + + /** + * Fetch the entire Re-routed URI string + * + * @access public + * @return string + */ + function ruri_string() + { + return '/'.implode('/', $this->rsegment_array()).'/'; + } + +} +// END URI Class + +/* End of file URI.php */ /* Location: ./system/libraries/URI.php */ \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3e207e2b..55bcbf03 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -65,6 +65,7 @@

    Version 1.7.1

  • Libraries
    • Changed default current page indicator in the Pagination library to use <strong> instead of <b>
      • +
    • A "HTTP/1.1 400 Bad Request" header is now sent when disallowed characters are encountered.
  • Helpers From cc13d49e83757cf540082eaddf0483153c027c83 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 4 Nov 2008 19:20:36 +0000 Subject: [PATCH 1546/2544] added protection against non-breaking spaces within tags --- system/libraries/Typography.php | 6 ++++-- user_guide/changelog.html | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 317208f2..8ae47a1b 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -85,12 +85,13 @@ function auto_typography($str, $reduce_linebreaks = FALSE) // Convert quotes within tags to temporary markers. We don't want quotes converted // within tags so we'll temporarily convert them to {@DQ} and {@SQ} // and we don't want double dashes converted to emdash entities, so they are marked with {@DD} + // likewise double spaces are converted to {@NBS} to prevent entity conversion if (preg_match_all("#\<.+?>#si", $str, $matches)) { for ($i = 0, $total = count($matches[0]); $i < $total; $i++) { $str = str_replace($matches[0][$i], - str_replace(array("'",'"','--'), array('{@SQ}', '{@DQ}', '{@DD}'), $matches[0][$i]), + str_replace(array("'",'"','--',' '), array('{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'), $matches[0][$i]), $str); } } @@ -180,7 +181,8 @@ function auto_typography($str, $reduce_linebreaks = FALSE) '/\{@TAG\}/' => '<', '/\{@DQ\}/' => '"', '/\{@SQ\}/' => "'", - '/\{@DD\}/' => '--' + '/\{@DD\}/' => '--', + '/\{@NBS\}/' => ' ' ); diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 55bcbf03..8fafcc76 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -82,6 +82,7 @@

    Bug fixes for 1.7.1

  • Fixed a bug in which identifers were not being escaped properly when reserved characters were used.
  • Fixed a bug with the regular expression used to protect submitted paragraph tags in auto typography.

  • Fixed a bug where double dashes within tag attributes were being converted to em dash entities.
    • +
  • Fixed a bug where double spaces within tag attributes were being converted to non-breaking space entities.
    • From 4b84a42cabee34d8daddf096881a04afc1240371 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 5 Nov 2008 01:21:21 +0000 Subject: [PATCH 1547/2544] Finessed the code in a few places for better accuracy --- system/libraries/Typography.php | 59 +++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 8ae47a1b..0fa7d661 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -33,7 +33,7 @@ class CI_Typography { var $skip_elements = 'p|pre|ol|ul|dl|object|table'; // Tags we want the parser to completely ignore when splitting the string. - var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|samp|select|span|strong|sub|sup|textarea|var'; + var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|samp|select|span|strong|sub|sup|textarea|var|big|small|q'; // whether or not to protect quotes within { curly braces } var $protect_braced_quotes = FALSE; @@ -143,6 +143,18 @@ function auto_typography($str, $reduce_linebreaks = FALSE) $str .= $chunk; continue; } + elseif (preg_match('/<(\/?)([a-z]*).*?>/s', $chunk, $tagmatch)) + { + if ($tagmatch[1] == '/' && $tagmatch[2] == $this->last_tag) + { + $process = FALSE; + } + else + { + $process = TRUE; + $this->last_tag = $tagmatch[2]; + } + } if ($process == FALSE) { @@ -151,7 +163,7 @@ function auto_typography($str, $reduce_linebreaks = FALSE) } // Convert Newlines into

    and
    tags - $str .= $this->_format_newlines($chunk); + $str .= $this->format_characters($this->_format_newlines($chunk)); } // is the whole of the content inside a block level element? @@ -160,22 +172,33 @@ function auto_typography($str, $reduce_linebreaks = FALSE) $str = "

    {$str}

    "; } - // Convert quotes, elipsis, and em-dashes - $str = $this->format_characters($str); + // some special linebreak cleanup + $str = preg_replace_callback('#<(?!/|'.$this->block_elements.')([^>]*)>

    (.*?)

    <(\w*)#si', array($this, '_linebreak_cleanup'), $str); + + // and cleanup empty paragraph tags sitting between two closing tags + $str = preg_replace('#()

    (\s*)

    ()#si', '$1$2$3', $str); + // Final clean up $table = array( // If the user submitted their own paragraph tags within the text // we will retain them instead of using our tags. - '/(*?]>)

    /' => '$1', // *?]>)

    /' => '$1', // )+#' => '

    ', '/(

    )+/' => '

    ', + '/(

    \W+

    )+/' => '

    ', // Clean up stray paragraph tags that appear before block level elements '#

    <('.$this->block_elements.')#' => '<$1', + + // Clean up open paragraph tags that appear before block level elements + '#

    (\W)<('.$this->block_elements.')#' => '

    $1<$2', + + // Clean up stray non-breaking spaces preceeding block elements + '#[  ]+<('.$this->block_elements.')#' => ' <$1', // Replace the temporary markers we added earlier '/\{@TAG\}/' => '<', @@ -185,7 +208,7 @@ function auto_typography($str, $reduce_linebreaks = FALSE) '/\{@NBS\}/' => ' ' ); - + // Do we need to reduce empty lines? if ($reduce_linebreaks === TRUE) { @@ -203,7 +226,31 @@ function auto_typography($str, $reduce_linebreaks = FALSE) } // -------------------------------------------------------------------- + + /** + * Linebreak Cleanup + * + * Removes paragraph and line break tags inserted inbetween + * inline content and a new opening block level element + * + * @access private + * @param array + * @return string + */ + function _linebreak_cleanup($match) + { + if (in_array($match[3], explode('|', $this->block_elements))) + { + return "<{$match[1]}>".str_replace('
    ', '', $match[2])."<{$match[3]}"; + } + else + { + return $match[0]; + } + } + // -------------------------------------------------------------------- + /** * Format Characters * From 9b42253effd4f9e87774cacd9eb710a936bfe3df Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Wed, 5 Nov 2008 01:21:51 +0000 Subject: [PATCH 1548/2544] Oops... forgot to add "tt" as in inline element --- system/libraries/Typography.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 0fa7d661..fad018fd 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -33,7 +33,7 @@ class CI_Typography { var $skip_elements = 'p|pre|ol|ul|dl|object|table'; // Tags we want the parser to completely ignore when splitting the string. - var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|samp|select|span|strong|sub|sup|textarea|var|big|small|q'; + var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|samp|select|span|strong|sub|sup|textarea|var|big|small|q|tt'; // whether or not to protect quotes within { curly braces } var $protect_braced_quotes = FALSE; From 396a2a62006fd58d385d53e6b8cadd9d152abe76 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 5 Nov 2008 16:11:30 +0000 Subject: [PATCH 1549/2544] moved the newly added inline elements so the list would remain in alphabetical order, added corresponding changelog note --- system/libraries/Typography.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index fad018fd..6a0f2ec3 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -33,7 +33,7 @@ class CI_Typography { var $skip_elements = 'p|pre|ol|ul|dl|object|table'; // Tags we want the parser to completely ignore when splitting the string. - var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|samp|select|span|strong|sub|sup|textarea|var|big|small|q|tt'; + var $inline_elements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var'; // whether or not to protect quotes within { curly braces } var $protect_braced_quotes = FALSE; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8fafcc76..f690c919 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,6 +66,7 @@

    Version 1.7.1

    • Changed default current page indicator in the Pagination library to use <strong> instead of <b>
    • A "HTTP/1.1 400 Bad Request" header is now sent when disallowed characters are encountered.
      • +
    • Added <big>, <small>, <q>, and <tt> to the Typography parser's inline elements.
  • Helpers From 5f02da0fccd2123b82dc79053e6c86c2918cf37b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 5 Nov 2008 16:20:01 +0000 Subject: [PATCH 1550/2544] whitespace --- system/libraries/Input.php | 2116 ++++++++++++++++++------------------ 1 file changed, 1058 insertions(+), 1058 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index e66d4814..f26df755 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -1,1059 +1,1059 @@ - '[removed]', - 'document.write' => '[removed]', - '.parentNode' => '[removed]', - '.innerHTML' => '[removed]', - 'window.location' => '[removed]', - '-moz-binding' => '[removed]', - '' => '-->', - ' '<![CDATA[' - ); - /* never allowed, regex replacement */ - var $never_allowed_regex = array( - "javascript\s*:" => '[removed]', - "expression\s*\(" => '[removed]', // CSS and IE - "Redirect\s+302" => '[removed]' - ); - - /** - * Constructor - * - * Sets whether to globally enable the XSS processing - * and whether to allow the $_GET array - * - * @access public - */ - function CI_Input() - { - log_message('debug', "Input Class Initialized"); - - $CFG =& load_class('Config'); - $this->use_xss_clean = ($CFG->item('global_xss_filtering') === TRUE) ? TRUE : FALSE; - $this->allow_get_array = ($CFG->item('enable_query_strings') === TRUE) ? TRUE : FALSE; - $this->_sanitize_globals(); - } - - // -------------------------------------------------------------------- - - /** - * Sanitize Globals - * - * This function does the following: - * - * Unsets $_GET data (if query strings are not enabled) - * - * Unsets all globals if register_globals is enabled - * - * Standardizes newline characters to \n - * - * @access private - * @return void - */ - function _sanitize_globals() - { - // Would kind of be "wrong" to unset any of these GLOBALS - $protected = array('_SERVER', '_GET', '_POST', '_FILES', '_REQUEST', '_SESSION', '_ENV', 'GLOBALS', 'HTTP_RAW_POST_DATA', - 'system_folder', 'application_folder', 'BM', 'EXT', 'CFG', 'URI', 'RTR', 'OUT', 'IN'); - - // Unset globals for security. - // This is effectively the same as register_globals = off - foreach (array($_GET, $_POST, $_COOKIE, $_SERVER, $_FILES, $_ENV, (isset($_SESSION) && is_array($_SESSION)) ? $_SESSION : array()) as $global) - { - if ( ! is_array($global)) - { - if ( ! in_array($global, $protected)) - { - unset($GLOBALS[$global]); - } - } - else - { - foreach ($global as $key => $val) - { - if ( ! in_array($key, $protected)) - { - unset($GLOBALS[$key]); - } - - if (is_array($val)) - { - foreach($val as $k => $v) - { - if ( ! in_array($k, $protected)) - { - unset($GLOBALS[$k]); - } - } - } - } - } - } - - // Is $_GET data allowed? If not we'll set the $_GET to an empty array - if ($this->allow_get_array == FALSE) - { - $_GET = array(); - } - else - { - $_GET = $this->_clean_input_data($_GET); - } - - // Clean $_POST Data - $_POST = $this->_clean_input_data($_POST); - - // Clean $_COOKIE Data - // Also get rid of specially treated cookies that might be set by a server - // or silly application, that are of no use to a CI application anyway - // but that when present will trip our 'Disallowed Key Characters' alarm - // http://www.ietf.org/rfc/rfc2109.txt - // note that the key names below are single quoted strings, and are not PHP variables - unset($_COOKIE['$Version']); - unset($_COOKIE['$Path']); - unset($_COOKIE['$Domain']); - $_COOKIE = $this->_clean_input_data($_COOKIE); - - log_message('debug', "Global POST and COOKIE data sanitized"); - } - - // -------------------------------------------------------------------- - - /** - * Clean Input Data - * - * This is a helper function. It escapes data and - * standardizes newline characters to \n - * - * @access private - * @param string - * @return string - */ - function _clean_input_data($str) - { - if (is_array($str)) - { - $new_array = array(); - foreach ($str as $key => $val) - { - $new_array[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); - } - return $new_array; - } - - // We strip slashes if magic quotes is on to keep things consistent - if (get_magic_quotes_gpc()) - { - $str = stripslashes($str); - } - - // Should we filter the input data? - if ($this->use_xss_clean === TRUE) - { - $str = $this->xss_clean($str); - } - - // Standardize newlines - if (strpos($str, "\r") !== FALSE) - { - $str = str_replace(array("\r\n", "\r"), "\n", $str); - } - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Clean Keys - * - * This is a helper function. To prevent malicious users - * from trying to exploit keys we make sure that keys are - * only named with alpha-numeric text and a few other items. - * - * @access private - * @param string - * @return string - */ - function _clean_input_keys($str) - { - if ( ! preg_match("/^[a-z0-9:_\/-]+$/i", $str)) - { - exit('Disallowed Key Characters.'); - } - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Fetch from array - * - * This is a helper function to retrieve values from global arrays - * - * @access private - * @param array - * @param string - * @param bool - * @return string - */ - function _fetch_from_array(&$array, $index = '', $xss_clean = FALSE) - { - if ( ! isset($array[$index])) - { - return FALSE; - } - - if ($xss_clean === TRUE) - { - return $this->xss_clean($array[$index]); - } - - return $array[$index]; - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the GET array - * - * @access public - * @param string - * @param bool - * @return string - */ - function get($index = '', $xss_clean = FALSE) - { - return $this->_fetch_from_array($_GET, $index, $xss_clean); - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the POST array - * - * @access public - * @param string - * @param bool - * @return string - */ - function post($index = '', $xss_clean = FALSE) - { - return $this->_fetch_from_array($_POST, $index, $xss_clean); - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from either the GET array or the POST - * - * @access public - * @param string The index key - * @param bool XSS cleaning - * @return string - */ - function get_post($index = '', $xss_clean = FALSE) - { - if ( ! isset($_POST[$index]) ) - { - return $this->get($index, $xss_clean); - } - else - { - return $this->post($index, $xss_clean); - } - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the COOKIE array - * - * @access public - * @param string - * @param bool - * @return string - */ - function cookie($index = '', $xss_clean = FALSE) - { - return $this->_fetch_from_array($_COOKIE, $index, $xss_clean); - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the SERVER array - * - * @access public - * @param string - * @param bool - * @return string - */ - function server($index = '', $xss_clean = FALSE) - { - return $this->_fetch_from_array($_SERVER, $index, $xss_clean); - } - - // -------------------------------------------------------------------- - - /** - * Fetch the IP Address - * - * @access public - * @return string - */ - function ip_address() - { - if ($this->ip_address !== FALSE) - { - return $this->ip_address; - } - - if ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP')) - { - $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; - } - elseif ($this->server('REMOTE_ADDR')) - { - $this->ip_address = $_SERVER['REMOTE_ADDR']; - } - elseif ($this->server('HTTP_CLIENT_IP')) - { - $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; - } - elseif ($this->server('HTTP_X_FORWARDED_FOR')) - { - $this->ip_address = $_SERVER['HTTP_X_FORWARDED_FOR']; - } - - if ($this->ip_address === FALSE) - { - $this->ip_address = '0.0.0.0'; - return $this->ip_address; - } - - if (strstr($this->ip_address, ',')) - { - $x = explode(',', $this->ip_address); - $this->ip_address = end($x); - } - - if ( ! $this->valid_ip($this->ip_address)) - { - $this->ip_address = '0.0.0.0'; - } - - return $this->ip_address; - } - - // -------------------------------------------------------------------- - - /** - * Validate IP Address - * - * Updated version suggested by Geert De Deckere - * - * @access public - * @param string - * @return string - */ - function valid_ip($ip) - { - $ip_segments = explode('.', $ip); - - // Always 4 segments needed - if (count($ip_segments) != 4) - { - return FALSE; - } - // IP can not start with 0 - if ($ip_segments[0][0] == '0') - { - return FALSE; - } - // Check each segment - foreach ($ip_segments as $segment) - { - // IP segments must be digits and can not be - // longer than 3 digits or greater then 255 - if ($segment == '' OR preg_match("/[^0-9]/", $segment) OR $segment > 255 OR strlen($segment) > 3) - { - return FALSE; - } - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * User Agent - * - * @access public - * @return string - */ - function user_agent() - { - if ($this->user_agent !== FALSE) - { - return $this->user_agent; - } - - $this->user_agent = ( ! isset($_SERVER['HTTP_USER_AGENT'])) ? FALSE : $_SERVER['HTTP_USER_AGENT']; - - return $this->user_agent; - } - - // -------------------------------------------------------------------- - - /** - * Filename Security - * - * @access public - * @param string - * @return string - */ - function filename_security($str) - { - $bad = array( - "../", - "./", - "", - "<", - ">", - "'", - '"', - '&', - '$', - '#', - '{', - '}', - '[', - ']', - '=', - ';', - '?', - "%20", - "%22", - "%3c", // < - "%253c", // < - "%3e", // > - "%0e", // > - "%28", // ( - "%29", // ) - "%2528", // ( - "%26", // & - "%24", // $ - "%3f", // ? - "%3b", // ; - "%3d" // = - ); - - return stripslashes(str_replace($bad, '', $str)); - } - - // -------------------------------------------------------------------- - - /** - * XSS Clean - * - * Sanitizes data so that Cross Site Scripting Hacks can be - * prevented. This function does a fair amount of work but - * it is extremely thorough, designed to prevent even the - * most obscure XSS attempts. Nothing is ever 100% foolproof, - * of course, but I haven't been able to get anything passed - * the filter. - * - * Note: This function should only be used to deal with data - * upon submission. It's not something that should - * be used for general runtime processing. - * - * This function was based in part on some code and ideas I - * got from Bitflux: http://blog.bitflux.ch/wiki/XSS_Prevention - * - * To help develop this script I used this great list of - * vulnerabilities along with a few other hacks I've - * harvested from examining vulnerabilities in other programs: - * http://ha.ckers.org/xss.html - * - * @access public - * @param string - * @return string - */ - function xss_clean($str, $is_image = FALSE) - { - /* - * Is the string an array? - * - */ - if (is_array($str)) - { - while (list($key) = each($str)) - { - $str[$key] = $this->xss_clean($str[$key]); - } - - return $str; - } - - /* - * Remove Invisible Characters - */ - $str = $this->_remove_invisible_characters($str); - - /* - * Protect GET variables in URLs - */ - - // 901119URL5918AMP18930PROTECT8198 - - $str = preg_replace('|\&([a-z\_0-9]+)\=([a-z\_0-9]+)|i', $this->xss_hash()."\\1=\\2", $str); - - /* - * Validate standard character entities - * - * Add a semicolon if missing. We do this to enable - * the conversion of entities to ASCII later. - * - */ - $str = preg_replace('#(&\#?[0-9a-z]{2,})[\x00-\x20]*;?#i', "\\1;", $str); - - /* - * Validate UTF16 two byte encoding (x00) - * - * Just as above, adds a semicolon if missing. - * - */ - $str = preg_replace('#(&\#x?)([0-9A-F]+);?#i',"\\1\\2;",$str); - - /* - * Un-Protect GET variables in URLs - */ - $str = str_replace($this->xss_hash(), '&', $str); - - /* - * URL Decode - * - * Just in case stuff like this is submitted: - * - * Google - * - * Note: Use rawurldecode() so it does not remove plus signs - * - */ - $str = rawurldecode($str); - - /* - * Convert character entities to ASCII - * - * This permits our tests below to work reliably. - * We only convert entities that are within tags since - * these are the ones that will pose security problems. - * - */ - - $str = preg_replace_callback("/[a-z]+=([\'\"]).*?\\1/si", array($this, '_convert_attribute'), $str); - - $str = preg_replace_callback("/<\w+.*?(?=>|<|$)/si", array($this, '_html_entity_decode_callback'), $str); - - /* - * Remove Invisible Characters Again! - */ - $str = $this->_remove_invisible_characters($str); - - /* - * Convert all tabs to spaces - * - * This prevents strings like this: ja vascript - * NOTE: we deal with spaces between characters later. - * NOTE: preg_replace was found to be amazingly slow here on large blocks of data, - * so we use str_replace. - * - */ - - if (strpos($str, "\t") !== FALSE) - { - $str = str_replace("\t", ' ', $str); - } - - /* - * Capture converted string for later comparison - */ - $converted_string = $str; - - /* - * Not Allowed Under Any Conditions - */ - - foreach ($this->never_allowed_str as $key => $val) - { - $str = str_replace($key, $val, $str); - } - - foreach ($this->never_allowed_regex as $key => $val) - { - $str = preg_replace("#".$key."#i", $val, $str); - } - - /* - * Makes PHP tags safe - * - * Note: XML tags are inadvertently replaced too: - * - * '), array('<?php', '<?PHP', '<?', '?>'), $str); - } - - /* - * Compact any exploded words - * - * This corrects words like: j a v a s c r i p t - * These words are compacted back to their correct state. - * - */ - $words = array('javascript', 'expression', 'vbscript', 'script', 'applet', 'alert', 'document', 'write', 'cookie', 'window'); - foreach ($words as $word) - { - $temp = ''; - - for ($i = 0, $wordlen = strlen($word); $i < $wordlen; $i++) - { - $temp .= substr($word, $i, 1)."\s*"; - } - - // We only want to do this when it is followed by a non-word character - // That way valid stuff like "dealer to" does not become "dealerto" - $str = preg_replace_callback('#('.substr($temp, 0, -3).')(\W)#is', array($this, '_compact_exploded_words'), $str); - } - - /* - * Remove disallowed Javascript in links or img tags - * We used to do some version comparisons and use of stripos for PHP5, but it is dog slow compared - * to these simplified non-capturing preg_match(), especially if the pattern exists in the string - */ - do - { - $original = $str; - - if (preg_match("/]*?)(>|$)#si", array($this, '_js_link_removal'), $str); - } - - if (preg_match("/]*?)(\s?/?>|$)#si", array($this, '_js_img_removal'), $str); - } - - if (preg_match("/script/i", $str) OR preg_match("/xss/i", $str)) - { - $str = preg_replace("#<(/*)(script|xss)(.*?)\>#si", '[removed]', $str); - } - } - while($original != $str); - - unset($original); - - /* - * Remove JavaScript Event Handlers - * - * Note: This code is a little blunt. It removes - * the event handler and anything up to the closing >, - * but it's unlikely to be a problem. - * - */ - $event_handlers = array('[^a-z_\-]on\w*','xmlns'); - - if ($is_image === TRUE) - { - /* - * Adobe Photoshop puts XML metadata into JFIF images, including namespacing, - * so we have to allow this for images. -Paul - */ - unset($event_handlers[array_search('xmlns', $event_handlers)]); - } - - $str = preg_replace("#<([^><]+?)(".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); - - /* - * Sanitize naughty HTML elements - * - * If a tag containing any of the words in the list - * below is found, the tag gets converted to entities. - * - * So this: - * Becomes: <blink> - * - */ - $naughty = 'alert|applet|audio|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|isindex|layer|link|meta|object|plaintext|style|script|textarea|title|video|xml|xss'; - $str = preg_replace_callback('#<(/*\s*)('.$naughty.')([^><]*)([><]*)#is', array($this, '_sanitize_naughty_html'), $str); - - /* - * Sanitize naughty scripting elements - * - * Similar to above, only instead of looking for - * tags it looks for PHP and JavaScript commands - * that are disallowed. Rather than removing the - * code, it simply converts the parenthesis to entities - * rendering the code un-executable. - * - * For example: eval('some code') - * Becomes: eval('some code') - * - */ - $str = preg_replace('#(alert|cmd|passthru|eval|exec|expression|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str); - - /* - * Final clean up - * - * This adds a bit of extra precaution in case - * something got through the above filters - * - */ - foreach ($this->never_allowed_str as $key => $val) - { - $str = str_replace($key, $val, $str); - } - - foreach ($this->never_allowed_regex as $key => $val) - { - $str = preg_replace("#".$key."#i", $val, $str); - } - - /* - * Images are Handled in a Special Way - * - Essentially, we want to know that after all of the character conversion is done whether - * any unwanted, likely XSS, code was found. If not, we return TRUE, as the image is clean. - * However, if the string post-conversion does not matched the string post-removal of XSS, - * then it fails, as there was unwanted XSS code found and removed/changed during processing. - */ - - if ($is_image === TRUE) - { - if ($str == $converted_string) - { - return TRUE; - } - else - { - return FALSE; - } - } - - log_message('debug', "XSS Filtering completed"); - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Random Hash for protecting URLs - * - * @access public - * @return string - */ - function xss_hash() - { - if ($this->xss_hash == '') - { - if (phpversion() >= 4.2) - mt_srand(); - else - mt_srand(hexdec(substr(md5(microtime()), -8)) & 0x7fffffff); - - $this->xss_hash = md5(time() + mt_rand(0, 1999999999)); - } - - return $this->xss_hash; - } - - // -------------------------------------------------------------------- - - /** - * Remove Invisible Characters - * - * This prevents sandwiching null characters - * between ascii characters, like Java\0script. - * - * @access public - * @param string - * @return string - */ - function _remove_invisible_characters($str) - { - static $non_displayables; - - if ( ! isset($non_displayables)) - { - // every control character except newline (dec 10), carriage return (dec 13), and horizontal tab (dec 09), - $non_displayables = array( - '/%0[0-8bcef]/', // url encoded 00-08, 11, 12, 14, 15 - '/%1[0-9a-f]/', // url encoded 16-31 - '/[\x00-\x08]/', // 00-08 - '/\x0b/', '/\x0c/', // 11, 12 - '/[\x0e-\x1f]/' // 14-31 - ); - } - - do - { - $cleaned = $str; - $str = preg_replace($non_displayables, '', $str); - } - while ($cleaned != $str); - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Compact Exploded Words - * - * Callback function for xss_clean() to remove whitespace from - * things like j a v a s c r i p t - * - * @access public - * @param type - * @return type - */ - function _compact_exploded_words($matches) - { - return preg_replace('/\s+/s', '', $matches[1]).$matches[2]; - } - - // -------------------------------------------------------------------- - - /** - * Sanitize Naughty HTML - * - * Callback function for xss_clean() to remove naughty HTML elements - * - * @access private - * @param array - * @return string - */ - function _sanitize_naughty_html($matches) - { - // encode opening brace - $str = '<'.$matches[1].$matches[2].$matches[3]; - - // encode captured opening or closing brace to prevent recursive vectors - $str .= str_replace(array('>', '<'), array('>', '<'), $matches[4]); - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * JS Link Removal - * - * Callback function for xss_clean() to sanitize links - * This limits the PCRE backtracks, making it more performance friendly - * and prevents PREG_BACKTRACK_LIMIT_ERROR from being triggered in - * PHP 5.2+ on link-heavy strings - * - * @access private - * @param array - * @return string - */ - function _js_link_removal($match) - { - $attributes = $this->_filter_attributes(str_replace(array('<', '>'), '', $match[1])); - return str_replace($match[1], preg_replace("#href=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|_filter_attributes(str_replace(array('<', '>'), '', $match[1])); - return str_replace($match[1], preg_replace("#src=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|', '<'), array('>', '<'), $match[0]); - } - - // -------------------------------------------------------------------- - - /** - * HTML Entity Decode Callback - * - * Used as a callback for XSS Clean - * - * @access public - * @param array - * @return string - */ - function _html_entity_decode_callback($match) - { - $CFG =& load_class('Config'); - $charset = $CFG->item('charset'); - - return $this->_html_entity_decode($match[0], strtoupper($charset)); - } - - // -------------------------------------------------------------------- - - /** - * HTML Entities Decode - * - * This function is a replacement for html_entity_decode() - * - * In some versions of PHP the native function does not work - * when UTF-8 is the specified character set, so this gives us - * a work-around. More info here: - * http://bugs.php.net/bug.php?id=25670 - * - * @access private - * @param string - * @param string - * @return string - */ - /* ------------------------------------------------- - /* Replacement for html_entity_decode() - /* -------------------------------------------------*/ - - /* - NOTE: html_entity_decode() has a bug in some PHP versions when UTF-8 is the - character set, and the PHP developers said they were not back porting the - fix to versions other than PHP 5.x. - */ - function _html_entity_decode($str, $charset='UTF-8') - { - if (stristr($str, '&') === FALSE) return $str; - - // The reason we are not using html_entity_decode() by itself is because - // while it is not technically correct to leave out the semicolon - // at the end of an entity most browsers will still interpret the entity - // correctly. html_entity_decode() does not convert entities without - // semicolons, so we are left with our own little solution here. Bummer. - - if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR version_compare(phpversion(), '5.0.0', '>='))) - { - $str = html_entity_decode($str, ENT_COMPAT, $charset); - $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str); - return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str); - } - - // Numeric Entities - $str = preg_replace('~&#x(0*[0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str); - $str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str); - - // Literal Entities - Slightly slow so we do another check - if (stristr($str, '&') === FALSE) - { - $str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES))); - } - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Filter Attributes - * - * Filters tag attributes for consistency and safety - * - * @access public - * @param string - * @return string - */ - function _filter_attributes($str) - { - $out = ''; - - if (preg_match_all('#\s*[a-z\-]+\s*=\s*(\042|\047)([^\\1]*?)\\1#is', $str, $matches)) - { - foreach ($matches[0] as $match) - { - $out .= "{$match}"; - } - } - - return $out; - } - - // -------------------------------------------------------------------- - -} -// END Input class - -/* End of file Input.php */ + '[removed]', + 'document.write' => '[removed]', + '.parentNode' => '[removed]', + '.innerHTML' => '[removed]', + 'window.location' => '[removed]', + '-moz-binding' => '[removed]', + '' => '-->', + ' '<![CDATA[' + ); + /* never allowed, regex replacement */ + var $never_allowed_regex = array( + "javascript\s*:" => '[removed]', + "expression\s*\(" => '[removed]', // CSS and IE + "Redirect\s+302" => '[removed]' + ); + + /** + * Constructor + * + * Sets whether to globally enable the XSS processing + * and whether to allow the $_GET array + * + * @access public + */ + function CI_Input() + { + log_message('debug', "Input Class Initialized"); + + $CFG =& load_class('Config'); + $this->use_xss_clean = ($CFG->item('global_xss_filtering') === TRUE) ? TRUE : FALSE; + $this->allow_get_array = ($CFG->item('enable_query_strings') === TRUE) ? TRUE : FALSE; + $this->_sanitize_globals(); + } + + // -------------------------------------------------------------------- + + /** + * Sanitize Globals + * + * This function does the following: + * + * Unsets $_GET data (if query strings are not enabled) + * + * Unsets all globals if register_globals is enabled + * + * Standardizes newline characters to \n + * + * @access private + * @return void + */ + function _sanitize_globals() + { + // Would kind of be "wrong" to unset any of these GLOBALS + $protected = array('_SERVER', '_GET', '_POST', '_FILES', '_REQUEST', '_SESSION', '_ENV', 'GLOBALS', 'HTTP_RAW_POST_DATA', + 'system_folder', 'application_folder', 'BM', 'EXT', 'CFG', 'URI', 'RTR', 'OUT', 'IN'); + + // Unset globals for security. + // This is effectively the same as register_globals = off + foreach (array($_GET, $_POST, $_COOKIE, $_SERVER, $_FILES, $_ENV, (isset($_SESSION) && is_array($_SESSION)) ? $_SESSION : array()) as $global) + { + if ( ! is_array($global)) + { + if ( ! in_array($global, $protected)) + { + unset($GLOBALS[$global]); + } + } + else + { + foreach ($global as $key => $val) + { + if ( ! in_array($key, $protected)) + { + unset($GLOBALS[$key]); + } + + if (is_array($val)) + { + foreach($val as $k => $v) + { + if ( ! in_array($k, $protected)) + { + unset($GLOBALS[$k]); + } + } + } + } + } + } + + // Is $_GET data allowed? If not we'll set the $_GET to an empty array + if ($this->allow_get_array == FALSE) + { + $_GET = array(); + } + else + { + $_GET = $this->_clean_input_data($_GET); + } + + // Clean $_POST Data + $_POST = $this->_clean_input_data($_POST); + + // Clean $_COOKIE Data + // Also get rid of specially treated cookies that might be set by a server + // or silly application, that are of no use to a CI application anyway + // but that when present will trip our 'Disallowed Key Characters' alarm + // http://www.ietf.org/rfc/rfc2109.txt + // note that the key names below are single quoted strings, and are not PHP variables + unset($_COOKIE['$Version']); + unset($_COOKIE['$Path']); + unset($_COOKIE['$Domain']); + $_COOKIE = $this->_clean_input_data($_COOKIE); + + log_message('debug', "Global POST and COOKIE data sanitized"); + } + + // -------------------------------------------------------------------- + + /** + * Clean Input Data + * + * This is a helper function. It escapes data and + * standardizes newline characters to \n + * + * @access private + * @param string + * @return string + */ + function _clean_input_data($str) + { + if (is_array($str)) + { + $new_array = array(); + foreach ($str as $key => $val) + { + $new_array[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); + } + return $new_array; + } + + // We strip slashes if magic quotes is on to keep things consistent + if (get_magic_quotes_gpc()) + { + $str = stripslashes($str); + } + + // Should we filter the input data? + if ($this->use_xss_clean === TRUE) + { + $str = $this->xss_clean($str); + } + + // Standardize newlines + if (strpos($str, "\r") !== FALSE) + { + $str = str_replace(array("\r\n", "\r"), "\n", $str); + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Clean Keys + * + * This is a helper function. To prevent malicious users + * from trying to exploit keys we make sure that keys are + * only named with alpha-numeric text and a few other items. + * + * @access private + * @param string + * @return string + */ + function _clean_input_keys($str) + { + if ( ! preg_match("/^[a-z0-9:_\/-]+$/i", $str)) + { + exit('Disallowed Key Characters.'); + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Fetch from array + * + * This is a helper function to retrieve values from global arrays + * + * @access private + * @param array + * @param string + * @param bool + * @return string + */ + function _fetch_from_array(&$array, $index = '', $xss_clean = FALSE) + { + if ( ! isset($array[$index])) + { + return FALSE; + } + + if ($xss_clean === TRUE) + { + return $this->xss_clean($array[$index]); + } + + return $array[$index]; + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the GET array + * + * @access public + * @param string + * @param bool + * @return string + */ + function get($index = '', $xss_clean = FALSE) + { + return $this->_fetch_from_array($_GET, $index, $xss_clean); + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the POST array + * + * @access public + * @param string + * @param bool + * @return string + */ + function post($index = '', $xss_clean = FALSE) + { + return $this->_fetch_from_array($_POST, $index, $xss_clean); + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from either the GET array or the POST + * + * @access public + * @param string The index key + * @param bool XSS cleaning + * @return string + */ + function get_post($index = '', $xss_clean = FALSE) + { + if ( ! isset($_POST[$index]) ) + { + return $this->get($index, $xss_clean); + } + else + { + return $this->post($index, $xss_clean); + } + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the COOKIE array + * + * @access public + * @param string + * @param bool + * @return string + */ + function cookie($index = '', $xss_clean = FALSE) + { + return $this->_fetch_from_array($_COOKIE, $index, $xss_clean); + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the SERVER array + * + * @access public + * @param string + * @param bool + * @return string + */ + function server($index = '', $xss_clean = FALSE) + { + return $this->_fetch_from_array($_SERVER, $index, $xss_clean); + } + + // -------------------------------------------------------------------- + + /** + * Fetch the IP Address + * + * @access public + * @return string + */ + function ip_address() + { + if ($this->ip_address !== FALSE) + { + return $this->ip_address; + } + + if ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP')) + { + $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; + } + elseif ($this->server('REMOTE_ADDR')) + { + $this->ip_address = $_SERVER['REMOTE_ADDR']; + } + elseif ($this->server('HTTP_CLIENT_IP')) + { + $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; + } + elseif ($this->server('HTTP_X_FORWARDED_FOR')) + { + $this->ip_address = $_SERVER['HTTP_X_FORWARDED_FOR']; + } + + if ($this->ip_address === FALSE) + { + $this->ip_address = '0.0.0.0'; + return $this->ip_address; + } + + if (strstr($this->ip_address, ',')) + { + $x = explode(',', $this->ip_address); + $this->ip_address = end($x); + } + + if ( ! $this->valid_ip($this->ip_address)) + { + $this->ip_address = '0.0.0.0'; + } + + return $this->ip_address; + } + + // -------------------------------------------------------------------- + + /** + * Validate IP Address + * + * Updated version suggested by Geert De Deckere + * + * @access public + * @param string + * @return string + */ + function valid_ip($ip) + { + $ip_segments = explode('.', $ip); + + // Always 4 segments needed + if (count($ip_segments) != 4) + { + return FALSE; + } + // IP can not start with 0 + if ($ip_segments[0][0] == '0') + { + return FALSE; + } + // Check each segment + foreach ($ip_segments as $segment) + { + // IP segments must be digits and can not be + // longer than 3 digits or greater then 255 + if ($segment == '' OR preg_match("/[^0-9]/", $segment) OR $segment > 255 OR strlen($segment) > 3) + { + return FALSE; + } + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * User Agent + * + * @access public + * @return string + */ + function user_agent() + { + if ($this->user_agent !== FALSE) + { + return $this->user_agent; + } + + $this->user_agent = ( ! isset($_SERVER['HTTP_USER_AGENT'])) ? FALSE : $_SERVER['HTTP_USER_AGENT']; + + return $this->user_agent; + } + + // -------------------------------------------------------------------- + + /** + * Filename Security + * + * @access public + * @param string + * @return string + */ + function filename_security($str) + { + $bad = array( + "../", + "./", + "", + "<", + ">", + "'", + '"', + '&', + '$', + '#', + '{', + '}', + '[', + ']', + '=', + ';', + '?', + "%20", + "%22", + "%3c", // < + "%253c", // < + "%3e", // > + "%0e", // > + "%28", // ( + "%29", // ) + "%2528", // ( + "%26", // & + "%24", // $ + "%3f", // ? + "%3b", // ; + "%3d" // = + ); + + return stripslashes(str_replace($bad, '', $str)); + } + + // -------------------------------------------------------------------- + + /** + * XSS Clean + * + * Sanitizes data so that Cross Site Scripting Hacks can be + * prevented. This function does a fair amount of work but + * it is extremely thorough, designed to prevent even the + * most obscure XSS attempts. Nothing is ever 100% foolproof, + * of course, but I haven't been able to get anything passed + * the filter. + * + * Note: This function should only be used to deal with data + * upon submission. It's not something that should + * be used for general runtime processing. + * + * This function was based in part on some code and ideas I + * got from Bitflux: http://blog.bitflux.ch/wiki/XSS_Prevention + * + * To help develop this script I used this great list of + * vulnerabilities along with a few other hacks I've + * harvested from examining vulnerabilities in other programs: + * http://ha.ckers.org/xss.html + * + * @access public + * @param string + * @return string + */ + function xss_clean($str, $is_image = FALSE) + { + /* + * Is the string an array? + * + */ + if (is_array($str)) + { + while (list($key) = each($str)) + { + $str[$key] = $this->xss_clean($str[$key]); + } + + return $str; + } + + /* + * Remove Invisible Characters + */ + $str = $this->_remove_invisible_characters($str); + + /* + * Protect GET variables in URLs + */ + + // 901119URL5918AMP18930PROTECT8198 + + $str = preg_replace('|\&([a-z\_0-9]+)\=([a-z\_0-9]+)|i', $this->xss_hash()."\\1=\\2", $str); + + /* + * Validate standard character entities + * + * Add a semicolon if missing. We do this to enable + * the conversion of entities to ASCII later. + * + */ + $str = preg_replace('#(&\#?[0-9a-z]{2,})[\x00-\x20]*;?#i', "\\1;", $str); + + /* + * Validate UTF16 two byte encoding (x00) + * + * Just as above, adds a semicolon if missing. + * + */ + $str = preg_replace('#(&\#x?)([0-9A-F]+);?#i',"\\1\\2;",$str); + + /* + * Un-Protect GET variables in URLs + */ + $str = str_replace($this->xss_hash(), '&', $str); + + /* + * URL Decode + * + * Just in case stuff like this is submitted: + * + * Google + * + * Note: Use rawurldecode() so it does not remove plus signs + * + */ + $str = rawurldecode($str); + + /* + * Convert character entities to ASCII + * + * This permits our tests below to work reliably. + * We only convert entities that are within tags since + * these are the ones that will pose security problems. + * + */ + + $str = preg_replace_callback("/[a-z]+=([\'\"]).*?\\1/si", array($this, '_convert_attribute'), $str); + + $str = preg_replace_callback("/<\w+.*?(?=>|<|$)/si", array($this, '_html_entity_decode_callback'), $str); + + /* + * Remove Invisible Characters Again! + */ + $str = $this->_remove_invisible_characters($str); + + /* + * Convert all tabs to spaces + * + * This prevents strings like this: ja vascript + * NOTE: we deal with spaces between characters later. + * NOTE: preg_replace was found to be amazingly slow here on large blocks of data, + * so we use str_replace. + * + */ + + if (strpos($str, "\t") !== FALSE) + { + $str = str_replace("\t", ' ', $str); + } + + /* + * Capture converted string for later comparison + */ + $converted_string = $str; + + /* + * Not Allowed Under Any Conditions + */ + + foreach ($this->never_allowed_str as $key => $val) + { + $str = str_replace($key, $val, $str); + } + + foreach ($this->never_allowed_regex as $key => $val) + { + $str = preg_replace("#".$key."#i", $val, $str); + } + + /* + * Makes PHP tags safe + * + * Note: XML tags are inadvertently replaced too: + * + * '), array('<?php', '<?PHP', '<?', '?>'), $str); + } + + /* + * Compact any exploded words + * + * This corrects words like: j a v a s c r i p t + * These words are compacted back to their correct state. + * + */ + $words = array('javascript', 'expression', 'vbscript', 'script', 'applet', 'alert', 'document', 'write', 'cookie', 'window'); + foreach ($words as $word) + { + $temp = ''; + + for ($i = 0, $wordlen = strlen($word); $i < $wordlen; $i++) + { + $temp .= substr($word, $i, 1)."\s*"; + } + + // We only want to do this when it is followed by a non-word character + // That way valid stuff like "dealer to" does not become "dealerto" + $str = preg_replace_callback('#('.substr($temp, 0, -3).')(\W)#is', array($this, '_compact_exploded_words'), $str); + } + + /* + * Remove disallowed Javascript in links or img tags + * We used to do some version comparisons and use of stripos for PHP5, but it is dog slow compared + * to these simplified non-capturing preg_match(), especially if the pattern exists in the string + */ + do + { + $original = $str; + + if (preg_match("/]*?)(>|$)#si", array($this, '_js_link_removal'), $str); + } + + if (preg_match("/]*?)(\s?/?>|$)#si", array($this, '_js_img_removal'), $str); + } + + if (preg_match("/script/i", $str) OR preg_match("/xss/i", $str)) + { + $str = preg_replace("#<(/*)(script|xss)(.*?)\>#si", '[removed]', $str); + } + } + while($original != $str); + + unset($original); + + /* + * Remove JavaScript Event Handlers + * + * Note: This code is a little blunt. It removes + * the event handler and anything up to the closing >, + * but it's unlikely to be a problem. + * + */ + $event_handlers = array('[^a-z_\-]on\w*','xmlns'); + + if ($is_image === TRUE) + { + /* + * Adobe Photoshop puts XML metadata into JFIF images, including namespacing, + * so we have to allow this for images. -Paul + */ + unset($event_handlers[array_search('xmlns', $event_handlers)]); + } + + $str = preg_replace("#<([^><]+?)(".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); + + /* + * Sanitize naughty HTML elements + * + * If a tag containing any of the words in the list + * below is found, the tag gets converted to entities. + * + * So this: + * Becomes: <blink> + * + */ + $naughty = 'alert|applet|audio|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|isindex|layer|link|meta|object|plaintext|style|script|textarea|title|video|xml|xss'; + $str = preg_replace_callback('#<(/*\s*)('.$naughty.')([^><]*)([><]*)#is', array($this, '_sanitize_naughty_html'), $str); + + /* + * Sanitize naughty scripting elements + * + * Similar to above, only instead of looking for + * tags it looks for PHP and JavaScript commands + * that are disallowed. Rather than removing the + * code, it simply converts the parenthesis to entities + * rendering the code un-executable. + * + * For example: eval('some code') + * Becomes: eval('some code') + * + */ + $str = preg_replace('#(alert|cmd|passthru|eval|exec|expression|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str); + + /* + * Final clean up + * + * This adds a bit of extra precaution in case + * something got through the above filters + * + */ + foreach ($this->never_allowed_str as $key => $val) + { + $str = str_replace($key, $val, $str); + } + + foreach ($this->never_allowed_regex as $key => $val) + { + $str = preg_replace("#".$key."#i", $val, $str); + } + + /* + * Images are Handled in a Special Way + * - Essentially, we want to know that after all of the character conversion is done whether + * any unwanted, likely XSS, code was found. If not, we return TRUE, as the image is clean. + * However, if the string post-conversion does not matched the string post-removal of XSS, + * then it fails, as there was unwanted XSS code found and removed/changed during processing. + */ + + if ($is_image === TRUE) + { + if ($str == $converted_string) + { + return TRUE; + } + else + { + return FALSE; + } + } + + log_message('debug', "XSS Filtering completed"); + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Random Hash for protecting URLs + * + * @access public + * @return string + */ + function xss_hash() + { + if ($this->xss_hash == '') + { + if (phpversion() >= 4.2) + mt_srand(); + else + mt_srand(hexdec(substr(md5(microtime()), -8)) & 0x7fffffff); + + $this->xss_hash = md5(time() + mt_rand(0, 1999999999)); + } + + return $this->xss_hash; + } + + // -------------------------------------------------------------------- + + /** + * Remove Invisible Characters + * + * This prevents sandwiching null characters + * between ascii characters, like Java\0script. + * + * @access public + * @param string + * @return string + */ + function _remove_invisible_characters($str) + { + static $non_displayables; + + if ( ! isset($non_displayables)) + { + // every control character except newline (dec 10), carriage return (dec 13), and horizontal tab (dec 09), + $non_displayables = array( + '/%0[0-8bcef]/', // url encoded 00-08, 11, 12, 14, 15 + '/%1[0-9a-f]/', // url encoded 16-31 + '/[\x00-\x08]/', // 00-08 + '/\x0b/', '/\x0c/', // 11, 12 + '/[\x0e-\x1f]/' // 14-31 + ); + } + + do + { + $cleaned = $str; + $str = preg_replace($non_displayables, '', $str); + } + while ($cleaned != $str); + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Compact Exploded Words + * + * Callback function for xss_clean() to remove whitespace from + * things like j a v a s c r i p t + * + * @access public + * @param type + * @return type + */ + function _compact_exploded_words($matches) + { + return preg_replace('/\s+/s', '', $matches[1]).$matches[2]; + } + + // -------------------------------------------------------------------- + + /** + * Sanitize Naughty HTML + * + * Callback function for xss_clean() to remove naughty HTML elements + * + * @access private + * @param array + * @return string + */ + function _sanitize_naughty_html($matches) + { + // encode opening brace + $str = '<'.$matches[1].$matches[2].$matches[3]; + + // encode captured opening or closing brace to prevent recursive vectors + $str .= str_replace(array('>', '<'), array('>', '<'), $matches[4]); + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * JS Link Removal + * + * Callback function for xss_clean() to sanitize links + * This limits the PCRE backtracks, making it more performance friendly + * and prevents PREG_BACKTRACK_LIMIT_ERROR from being triggered in + * PHP 5.2+ on link-heavy strings + * + * @access private + * @param array + * @return string + */ + function _js_link_removal($match) + { + $attributes = $this->_filter_attributes(str_replace(array('<', '>'), '', $match[1])); + return str_replace($match[1], preg_replace("#href=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|_filter_attributes(str_replace(array('<', '>'), '', $match[1])); + return str_replace($match[1], preg_replace("#src=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|', '<'), array('>', '<'), $match[0]); + } + + // -------------------------------------------------------------------- + + /** + * HTML Entity Decode Callback + * + * Used as a callback for XSS Clean + * + * @access public + * @param array + * @return string + */ + function _html_entity_decode_callback($match) + { + $CFG =& load_class('Config'); + $charset = $CFG->item('charset'); + + return $this->_html_entity_decode($match[0], strtoupper($charset)); + } + + // -------------------------------------------------------------------- + + /** + * HTML Entities Decode + * + * This function is a replacement for html_entity_decode() + * + * In some versions of PHP the native function does not work + * when UTF-8 is the specified character set, so this gives us + * a work-around. More info here: + * http://bugs.php.net/bug.php?id=25670 + * + * @access private + * @param string + * @param string + * @return string + */ + /* ------------------------------------------------- + /* Replacement for html_entity_decode() + /* -------------------------------------------------*/ + + /* + NOTE: html_entity_decode() has a bug in some PHP versions when UTF-8 is the + character set, and the PHP developers said they were not back porting the + fix to versions other than PHP 5.x. + */ + function _html_entity_decode($str, $charset='UTF-8') + { + if (stristr($str, '&') === FALSE) return $str; + + // The reason we are not using html_entity_decode() by itself is because + // while it is not technically correct to leave out the semicolon + // at the end of an entity most browsers will still interpret the entity + // correctly. html_entity_decode() does not convert entities without + // semicolons, so we are left with our own little solution here. Bummer. + + if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR version_compare(phpversion(), '5.0.0', '>='))) + { + $str = html_entity_decode($str, ENT_COMPAT, $charset); + $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str); + return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str); + } + + // Numeric Entities + $str = preg_replace('~&#x(0*[0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str); + $str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str); + + // Literal Entities - Slightly slow so we do another check + if (stristr($str, '&') === FALSE) + { + $str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES))); + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Filter Attributes + * + * Filters tag attributes for consistency and safety + * + * @access public + * @param string + * @return string + */ + function _filter_attributes($str) + { + $out = ''; + + if (preg_match_all('#\s*[a-z\-]+\s*=\s*(\042|\047)([^\\1]*?)\\1#is', $str, $matches)) + { + foreach ($matches[0] as $match) + { + $out .= "{$match}"; + } + } + + return $out; + } + + // -------------------------------------------------------------------- + +} +// END Input class + +/* End of file Input.php */ /* Location: ./system/libraries/Input.php */ \ No newline at end of file From b5ce5aa366937163da47074ac1da430953d34660 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 6 Nov 2008 13:36:44 +0000 Subject: [PATCH 1551/2544] corrected a few docblock comments to accurately reflect return values removed some unneeded whitespace --- system/libraries/Email.php | 3906 ++++++++++++++++---------------- system/libraries/Ftp.php | 1234 +++++----- system/libraries/Hooks.php | 450 ++-- system/libraries/Image_lib.php | 3092 ++++++++++++------------- system/libraries/Language.php | 245 +- system/libraries/Session.php | 1514 ++++++------- user_guide/changelog.html | 3 +- 7 files changed, 5224 insertions(+), 5220 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index e9a5344f..ac968824 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1,1953 +1,1955 @@ - 0) - { - $this->initialize($config); - } - else - { - $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE; - $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE; - } - - log_message('debug', "Email Class Initialized"); - } - - // -------------------------------------------------------------------- - - /** - * Initialize preferences - * - * @access public - * @param array - * @return void - */ - function initialize($config = array()) - { - $this->clear(); - foreach ($config as $key => $val) - { - if (isset($this->$key)) - { - $method = 'set_'.$key; - - if (method_exists($this, $method)) - { - $this->$method($val); - } - else - { - $this->$key = $val; - } - } - } - - $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE; - $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Initialize the Email Data - * - * @access public - * @return void - */ - function clear($clear_attachments = FALSE) - { - $this->_subject = ""; - $this->_body = ""; - $this->_finalbody = ""; - $this->_header_str = ""; - $this->_replyto_flag = FALSE; - $this->_recipients = array(); - $this->_headers = array(); - $this->_debug_msg = array(); - - $this->_set_header('User-Agent', $this->useragent); - $this->_set_header('Date', $this->_set_date()); - - if ($clear_attachments !== FALSE) - { - $this->_attach_name = array(); - $this->_attach_type = array(); - $this->_attach_disp = array(); - } - } - - // -------------------------------------------------------------------- - - /** - * Set FROM - * - * @access public - * @param string - * @param string - * @return void - */ - function from($from, $name = '') - { - if (preg_match( '/\<(.*)\>/', $from, $match)) - { - $from = $match['1']; - } - - if ($this->validate) - { - $this->validate_email($this->_str_to_array($from)); - } - - if ($name != '' && strncmp($name, '"', 1) != 0) - { - $name = '"'.$name.'"'; - } - - $this->_set_header('From', $name.' <'.$from.'>'); - $this->_set_header('Return-Path', '<'.$from.'>'); - } - - // -------------------------------------------------------------------- - - /** - * Set Reply-to - * - * @access public - * @param string - * @param string - * @return void - */ - function reply_to($replyto, $name = '') - { - if (preg_match( '/\<(.*)\>/', $replyto, $match)) - { - $replyto = $match['1']; - } - - if ($this->validate) - { - $this->validate_email($this->_str_to_array($replyto)); - } - - if ($name == '') - { - $name = $replyto; - } - - if (strncmp($name, '"', 1) != 0) - { - $name = '"'.$name.'"'; - } - - $this->_set_header('Reply-To', $name.' <'.$replyto.'>'); - $this->_replyto_flag = TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Set Recipients - * - * @access public - * @param string - * @return void - */ - function to($to) - { - $to = $this->_str_to_array($to); - $to = $this->clean_email($to); - - if ($this->validate) - { - $this->validate_email($to); - } - - if ($this->_get_protocol() != 'mail') - { - $this->_set_header('To', implode(", ", $to)); - } - - switch ($this->_get_protocol()) - { - case 'smtp' : $this->_recipients = $to; - break; - case 'sendmail' : $this->_recipients = implode(", ", $to); - break; - case 'mail' : $this->_recipients = implode(", ", $to); - break; - } - } - - // -------------------------------------------------------------------- - - /** - * Set CC - * - * @access public - * @param string - * @return void - */ - function cc($cc) - { - $cc = $this->_str_to_array($cc); - $cc = $this->clean_email($cc); - - if ($this->validate) - { - $this->validate_email($cc); - } - - $this->_set_header('Cc', implode(", ", $cc)); - - if ($this->_get_protocol() == "smtp") - { - $this->_cc_array = $cc; - } - } - - // -------------------------------------------------------------------- - - /** - * Set BCC - * - * @access public - * @param string - * @param string - * @return void - */ - function bcc($bcc, $limit = '') - { - if ($limit != '' && is_numeric($limit)) - { - $this->bcc_batch_mode = TRUE; - $this->bcc_batch_size = $limit; - } - - $bcc = $this->_str_to_array($bcc); - $bcc = $this->clean_email($bcc); - - if ($this->validate) - { - $this->validate_email($bcc); - } - - if (($this->_get_protocol() == "smtp") OR ($this->bcc_batch_mode && count($bcc) > $this->bcc_batch_size)) - { - $this->_bcc_array = $bcc; - } - else - { - $this->_set_header('Bcc', implode(", ", $bcc)); - } - } - - // -------------------------------------------------------------------- - - /** - * Set Email Subject - * - * @access public - * @param string - * @return void - */ - function subject($subject) - { - if (strpos($subject, "\r") !== FALSE OR strpos($subject, "\n") !== FALSE) - { - $subject = str_replace(array("\r\n", "\r", "\n"), '', $subject); - } - - if (strpos($subject, "\t")) - { - $subject = str_replace("\t", ' ', $subject); - } - - $this->_set_header('Subject', trim($subject)); - } - - // -------------------------------------------------------------------- - - /** - * Set Body - * - * @access public - * @param string - * @return void - */ - function message($body) - { - $this->_body = stripslashes(rtrim(str_replace("\r", "", $body))); - } - - // -------------------------------------------------------------------- - - /** - * Assign file attachments - * - * @access public - * @param string - * @return string - */ - function attach($filename, $disposition = 'attachment') - { - $this->_attach_name[] = $filename; - $this->_attach_type[] = $this->_mime_types(next(explode('.', basename($filename)))); - $this->_attach_disp[] = $disposition; // Can also be 'inline' Not sure if it matters - } - - // -------------------------------------------------------------------- - - /** - * Add a Header Item - * - * @access private - * @param string - * @param string - * @return void - */ - function _set_header($header, $value) - { - $this->_headers[$header] = $value; - } - - // -------------------------------------------------------------------- - - /** - * Convert a String to an Array - * - * @access private - * @param string - * @return array - */ - function _str_to_array($email) - { - if ( ! is_array($email)) - { - if (strpos($email, ',') !== FALSE) - { - $email = preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY); - } - else - { - $email = trim($email); - settype($email, "array"); - } - } - return $email; - } - - // -------------------------------------------------------------------- - - /** - * Set Multipart Value - * - * @access public - * @param string - * @return void - */ - function set_alt_message($str = '') - { - $this->alt_message = ($str == '') ? '' : $str; - } - - // -------------------------------------------------------------------- - - /** - * Set Mailtype - * - * @access public - * @param string - * @return void - */ - function set_mailtype($type = 'text') - { - $this->mailtype = ($type == 'html') ? 'html' : 'text'; - } - - // -------------------------------------------------------------------- - - /** - * Set Wordwrap - * - * @access public - * @param string - * @return void - */ - function set_wordwrap($wordwrap = TRUE) - { - $this->wordwrap = ($wordwrap === FALSE) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Set Protocol - * - * @access public - * @param string - * @return void - */ - function set_protocol($protocol = 'mail') - { - $this->protocol = ( ! in_array($protocol, $this->_protocols, TRUE)) ? 'mail' : strtolower($protocol); - } - - // -------------------------------------------------------------------- - - /** - * Set Priority - * - * @access public - * @param integer - * @return void - */ - function set_priority($n = 3) - { - if ( ! is_numeric($n)) - { - $this->priority = 3; - return; - } - - if ($n < 1 OR $n > 5) - { - $this->priority = 3; - return; - } - - $this->priority = $n; - } - - // -------------------------------------------------------------------- - - /** - * Set Newline Character - * - * @access public - * @param string - * @return void - */ - function set_newline($newline = "\n") - { - if ($newline != "\n" AND $newline != "\r\n" AND $newline != "\r") - { - $this->newline = "\n"; - return; - } - - $this->newline = $newline; - } - - // -------------------------------------------------------------------- - - /** - * Set CRLF - * - * @access public - * @param string - * @return void - */ - function set_crlf($crlf = "\n") - { - if ($crlf != "\n" AND $crlf != "\r\n" AND $crlf != "\r") - { - $this->crlf = "\n"; - return; - } - - $this->crlf = $crlf; - } - - // -------------------------------------------------------------------- - - /** - * Set Message Boundary - * - * @access private - * @return void - */ - function _set_boundaries() - { - $this->_alt_boundary = "B_ALT_".uniqid(''); // multipart/alternative - $this->_atc_boundary = "B_ATC_".uniqid(''); // attachment boundary - } - - // -------------------------------------------------------------------- - - /** - * Get the Message ID - * - * @access private - * @return string - */ - function _get_message_id() - { - $from = $this->_headers['Return-Path']; - $from = str_replace(">", "", $from); - $from = str_replace("<", "", $from); - - return "<".uniqid('').strstr($from, '@').">"; - } - - // -------------------------------------------------------------------- - - /** - * Get Mail Protocol - * - * @access private - * @param bool - * @return string - */ - function _get_protocol($return = TRUE) - { - $this->protocol = strtolower($this->protocol); - $this->protocol = ( ! in_array($this->protocol, $this->_protocols, TRUE)) ? 'mail' : $this->protocol; - - if ($return == TRUE) - { - return $this->protocol; - } - } - - // -------------------------------------------------------------------- - - /** - * Get Mail Encoding - * - * @access private - * @param bool - * @return string - */ - function _get_encoding($return = TRUE) - { - $this->_encoding = ( ! in_array($this->_encoding, $this->_bit_depths)) ? '8bit' : $this->_encoding; - - foreach ($this->_base_charsets as $charset) - { - if (strncmp($charset, $this->charset, strlen($charset)) == 0) - { - $this->_encoding = '7bit'; - } - } - - if ($return == TRUE) - { - return $this->_encoding; - } - } - - // -------------------------------------------------------------------- - - /** - * Get content type (text/html/attachment) - * - * @access private - * @return string - */ - function _get_content_type() - { - if ($this->mailtype == 'html' && count($this->_attach_name) == 0) - { - return 'html'; - } - elseif ($this->mailtype == 'html' && count($this->_attach_name) > 0) - { - return 'html-attach'; - } - elseif ($this->mailtype == 'text' && count($this->_attach_name) > 0) - { - return 'plain-attach'; - } - else - { - return 'plain'; - } - } - - // -------------------------------------------------------------------- - - /** - * Set RFC 822 Date - * - * @access private - * @return string - */ - function _set_date() - { - $timezone = date("Z"); - $operator = (strncmp($timezone, '-', 1) == 0) ? '-' : '+'; - $timezone = abs($timezone); - $timezone = floor($timezone/3600) * 100 + ($timezone % 3600 ) / 60; - - return sprintf("%s %s%04d", date("D, j M Y H:i:s"), $operator, $timezone); - } - - // -------------------------------------------------------------------- - - /** - * Mime message - * - * @access private - * @return string - */ - function _get_mime_message() - { - return "This is a multi-part message in MIME format.".$this->newline."Your email application may not support this format."; - } - - // -------------------------------------------------------------------- - - /** - * Validate Email Address - * - * @access public - * @param string - * @return bool - */ - function validate_email($email) - { - if ( ! is_array($email)) - { - $this->_set_error_message('email_must_be_array'); - return FALSE; - } - - foreach ($email as $val) - { - if ( ! $this->valid_email($val)) - { - $this->_set_error_message('email_invalid_address', $val); - return FALSE; - } - } - } - - // -------------------------------------------------------------------- - - /** - * Email Validation - * - * @access public - * @param string - * @return bool - */ - function valid_email($address) - { - return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $address)) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Clean Extended Email Address: Joe Smith - * - * @access public - * @param string - * @return string - */ - function clean_email($email) - { - if ( ! is_array($email)) - { - if (preg_match('/\<(.*)\>/', $email, $match)) - { - return $match['1']; - } - else - { - return $email; - } - } - - $clean_email = array(); - - foreach ($email as $addy) - { - if (preg_match( '/\<(.*)\>/', $addy, $match)) - { - $clean_email[] = $match['1']; - } - else - { - $clean_email[] = $addy; - } - } - - return $clean_email; - } - - // -------------------------------------------------------------------- - - /** - * Build alternative plain text message - * - * This function provides the raw message for use - * in plain-text headers of HTML-formatted emails. - * If the user hasn't specified his own alternative message - * it creates one by stripping the HTML - * - * @access private - * @return string - */ - function _get_alt_message() - { - if ($this->alt_message != "") - { - return $this->word_wrap($this->alt_message, '76'); - } - - if (preg_match('/\(.*)\<\/body\>/si', $this->_body, $match)) - { - $body = $match['1']; - } - else - { - $body = $this->_body; - } - - $body = trim(strip_tags($body)); - $body = preg_replace( '#' => '-->', - ' '<![CDATA[' - ); - /* never allowed, regex replacement */ - var $never_allowed_regex = array( - "javascript\s*:" => '[removed]', - "expression\s*\(" => '[removed]', // CSS and IE - "Redirect\s+302" => '[removed]' - ); - - /** - * Constructor - * - * Sets whether to globally enable the XSS processing - * and whether to allow the $_GET array - * - * @access public - */ - function CI_Input() - { - log_message('debug', "Input Class Initialized"); - - $CFG =& load_class('Config'); - $this->use_xss_clean = ($CFG->item('global_xss_filtering') === TRUE) ? TRUE : FALSE; - $this->allow_get_array = ($CFG->item('enable_query_strings') === TRUE) ? TRUE : FALSE; - $this->_sanitize_globals(); - } - - // -------------------------------------------------------------------- - - /** - * Sanitize Globals - * - * This function does the following: - * - * Unsets $_GET data (if query strings are not enabled) - * - * Unsets all globals if register_globals is enabled - * - * Standardizes newline characters to \n - * - * @access private - * @return void - */ - function _sanitize_globals() - { - // Would kind of be "wrong" to unset any of these GLOBALS - $protected = array('_SERVER', '_GET', '_POST', '_FILES', '_REQUEST', '_SESSION', '_ENV', 'GLOBALS', 'HTTP_RAW_POST_DATA', - 'system_folder', 'application_folder', 'BM', 'EXT', 'CFG', 'URI', 'RTR', 'OUT', 'IN'); - - // Unset globals for security. - // This is effectively the same as register_globals = off - foreach (array($_GET, $_POST, $_COOKIE, $_SERVER, $_FILES, $_ENV, (isset($_SESSION) && is_array($_SESSION)) ? $_SESSION : array()) as $global) - { - if ( ! is_array($global)) - { - if ( ! in_array($global, $protected)) - { - unset($GLOBALS[$global]); - } - } - else - { - foreach ($global as $key => $val) - { - if ( ! in_array($key, $protected)) - { - unset($GLOBALS[$key]); - } - - if (is_array($val)) - { - foreach($val as $k => $v) - { - if ( ! in_array($k, $protected)) - { - unset($GLOBALS[$k]); - } - } - } - } - } - } - - // Is $_GET data allowed? If not we'll set the $_GET to an empty array - if ($this->allow_get_array == FALSE) - { - $_GET = array(); - } - else - { - $_GET = $this->_clean_input_data($_GET); - } - - // Clean $_POST Data - $_POST = $this->_clean_input_data($_POST); - - // Clean $_COOKIE Data - // Also get rid of specially treated cookies that might be set by a server - // or silly application, that are of no use to a CI application anyway - // but that when present will trip our 'Disallowed Key Characters' alarm - // http://www.ietf.org/rfc/rfc2109.txt - // note that the key names below are single quoted strings, and are not PHP variables - unset($_COOKIE['$Version']); - unset($_COOKIE['$Path']); - unset($_COOKIE['$Domain']); - $_COOKIE = $this->_clean_input_data($_COOKIE); - - log_message('debug', "Global POST and COOKIE data sanitized"); - } - - // -------------------------------------------------------------------- - - /** - * Clean Input Data - * - * This is a helper function. It escapes data and - * standardizes newline characters to \n - * - * @access private - * @param string - * @return string - */ - function _clean_input_data($str) - { - if (is_array($str)) - { - $new_array = array(); - foreach ($str as $key => $val) - { - $new_array[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); - } - return $new_array; - } - - // We strip slashes if magic quotes is on to keep things consistent - if (get_magic_quotes_gpc()) - { - $str = stripslashes($str); - } - - // Should we filter the input data? - if ($this->use_xss_clean === TRUE) - { - $str = $this->xss_clean($str); - } - - // Standardize newlines - if (strpos($str, "\r") !== FALSE) - { - $str = str_replace(array("\r\n", "\r"), "\n", $str); - } - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Clean Keys - * - * This is a helper function. To prevent malicious users - * from trying to exploit keys we make sure that keys are - * only named with alpha-numeric text and a few other items. - * - * @access private - * @param string - * @return string - */ - function _clean_input_keys($str) - { - if ( ! preg_match("/^[a-z0-9:_\/-]+$/i", $str)) - { - exit('Disallowed Key Characters.'); - } - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Fetch from array - * - * This is a helper function to retrieve values from global arrays - * - * @access private - * @param array - * @param string - * @param bool - * @return string - */ - function _fetch_from_array(&$array, $index = '', $xss_clean = FALSE) - { - if ( ! isset($array[$index])) - { - return FALSE; - } - - if ($xss_clean === TRUE) - { - return $this->xss_clean($array[$index]); - } - - return $array[$index]; - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the GET array - * - * @access public - * @param string - * @param bool - * @return string - */ - function get($index = '', $xss_clean = FALSE) - { - return $this->_fetch_from_array($_GET, $index, $xss_clean); - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the POST array - * - * @access public - * @param string - * @param bool - * @return string - */ - function post($index = '', $xss_clean = FALSE) - { - return $this->_fetch_from_array($_POST, $index, $xss_clean); - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from either the GET array or the POST - * - * @access public - * @param string The index key - * @param bool XSS cleaning - * @return string - */ - function get_post($index = '', $xss_clean = FALSE) - { - if ( ! isset($_POST[$index]) ) - { - return $this->get($index, $xss_clean); - } - else - { - return $this->post($index, $xss_clean); - } - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the COOKIE array - * - * @access public - * @param string - * @param bool - * @return string - */ - function cookie($index = '', $xss_clean = FALSE) - { - return $this->_fetch_from_array($_COOKIE, $index, $xss_clean); - } - - // -------------------------------------------------------------------- - - /** - * Fetch an item from the SERVER array - * - * @access public - * @param string - * @param bool - * @return string - */ - function server($index = '', $xss_clean = FALSE) - { - return $this->_fetch_from_array($_SERVER, $index, $xss_clean); - } - - // -------------------------------------------------------------------- - - /** - * Fetch the IP Address - * - * @access public - * @return string - */ - function ip_address() - { - if ($this->ip_address !== FALSE) - { - return $this->ip_address; - } - - if ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP')) - { - $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; - } - elseif ($this->server('REMOTE_ADDR')) - { - $this->ip_address = $_SERVER['REMOTE_ADDR']; - } - elseif ($this->server('HTTP_CLIENT_IP')) - { - $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; - } - elseif ($this->server('HTTP_X_FORWARDED_FOR')) - { - $this->ip_address = $_SERVER['HTTP_X_FORWARDED_FOR']; - } - - if ($this->ip_address === FALSE) - { - $this->ip_address = '0.0.0.0'; - return $this->ip_address; - } - - if (strstr($this->ip_address, ',')) - { - $x = explode(',', $this->ip_address); - $this->ip_address = end($x); - } - - if ( ! $this->valid_ip($this->ip_address)) - { - $this->ip_address = '0.0.0.0'; - } - - return $this->ip_address; - } - - // -------------------------------------------------------------------- - - /** - * Validate IP Address - * - * Updated version suggested by Geert De Deckere - * - * @access public - * @param string - * @return string - */ - function valid_ip($ip) - { - $ip_segments = explode('.', $ip); - - // Always 4 segments needed - if (count($ip_segments) != 4) - { - return FALSE; - } - // IP can not start with 0 - if ($ip_segments[0][0] == '0') - { - return FALSE; - } - // Check each segment - foreach ($ip_segments as $segment) - { - // IP segments must be digits and can not be - // longer than 3 digits or greater then 255 - if ($segment == '' OR preg_match("/[^0-9]/", $segment) OR $segment > 255 OR strlen($segment) > 3) - { - return FALSE; - } - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * User Agent - * - * @access public - * @return string - */ - function user_agent() - { - if ($this->user_agent !== FALSE) - { - return $this->user_agent; - } - - $this->user_agent = ( ! isset($_SERVER['HTTP_USER_AGENT'])) ? FALSE : $_SERVER['HTTP_USER_AGENT']; - - return $this->user_agent; - } - - // -------------------------------------------------------------------- - - /** - * Filename Security - * - * @access public - * @param string - * @return string - */ - function filename_security($str) - { - $bad = array( - "../", - "./", - "", - "<", - ">", - "'", - '"', - '&', - '$', - '#', - '{', - '}', - '[', - ']', - '=', - ';', - '?', - "%20", - "%22", - "%3c", // < - "%253c", // < - "%3e", // > - "%0e", // > - "%28", // ( - "%29", // ) - "%2528", // ( - "%26", // & - "%24", // $ - "%3f", // ? - "%3b", // ; - "%3d" // = - ); - - return stripslashes(str_replace($bad, '', $str)); - } - - // -------------------------------------------------------------------- - - /** - * XSS Clean - * - * Sanitizes data so that Cross Site Scripting Hacks can be - * prevented. This function does a fair amount of work but - * it is extremely thorough, designed to prevent even the - * most obscure XSS attempts. Nothing is ever 100% foolproof, - * of course, but I haven't been able to get anything passed - * the filter. - * - * Note: This function should only be used to deal with data - * upon submission. It's not something that should - * be used for general runtime processing. - * - * This function was based in part on some code and ideas I - * got from Bitflux: http://blog.bitflux.ch/wiki/XSS_Prevention - * - * To help develop this script I used this great list of - * vulnerabilities along with a few other hacks I've - * harvested from examining vulnerabilities in other programs: - * http://ha.ckers.org/xss.html - * - * @access public - * @param string - * @return string - */ - function xss_clean($str, $is_image = FALSE) - { - /* - * Is the string an array? - * - */ - if (is_array($str)) - { - while (list($key) = each($str)) - { - $str[$key] = $this->xss_clean($str[$key]); - } - - return $str; - } - - /* - * Remove Invisible Characters - */ - $str = $this->_remove_invisible_characters($str); - - /* - * Protect GET variables in URLs - */ - - // 901119URL5918AMP18930PROTECT8198 - - $str = preg_replace('|\&([a-z\_0-9]+)\=([a-z\_0-9]+)|i', $this->xss_hash()."\\1=\\2", $str); - - /* - * Validate standard character entities - * - * Add a semicolon if missing. We do this to enable - * the conversion of entities to ASCII later. - * - */ - $str = preg_replace('#(&\#?[0-9a-z]{2,})[\x00-\x20]*;?#i', "\\1;", $str); - - /* - * Validate UTF16 two byte encoding (x00) - * - * Just as above, adds a semicolon if missing. - * - */ - $str = preg_replace('#(&\#x?)([0-9A-F]+);?#i',"\\1\\2;",$str); - - /* - * Un-Protect GET variables in URLs - */ - $str = str_replace($this->xss_hash(), '&', $str); - - /* - * URL Decode - * - * Just in case stuff like this is submitted: - * - * Google - * - * Note: Use rawurldecode() so it does not remove plus signs - * - */ - $str = rawurldecode($str); - - /* - * Convert character entities to ASCII - * - * This permits our tests below to work reliably. - * We only convert entities that are within tags since - * these are the ones that will pose security problems. - * - */ - - $str = preg_replace_callback("/[a-z]+=([\'\"]).*?\\1/si", array($this, '_convert_attribute'), $str); - - $str = preg_replace_callback("/<\w+.*?(?=>|<|$)/si", array($this, '_html_entity_decode_callback'), $str); - - /* - * Remove Invisible Characters Again! - */ - $str = $this->_remove_invisible_characters($str); - - /* - * Convert all tabs to spaces - * - * This prevents strings like this: ja vascript - * NOTE: we deal with spaces between characters later. - * NOTE: preg_replace was found to be amazingly slow here on large blocks of data, - * so we use str_replace. - * - */ - - if (strpos($str, "\t") !== FALSE) - { - $str = str_replace("\t", ' ', $str); - } - - /* - * Capture converted string for later comparison - */ - $converted_string = $str; - - /* - * Not Allowed Under Any Conditions - */ - - foreach ($this->never_allowed_str as $key => $val) - { - $str = str_replace($key, $val, $str); - } - - foreach ($this->never_allowed_regex as $key => $val) - { - $str = preg_replace("#".$key."#i", $val, $str); - } - - /* - * Makes PHP tags safe - * - * Note: XML tags are inadvertently replaced too: - * - * '), array('<?php', '<?PHP', '<?', '?>'), $str); - } - - /* - * Compact any exploded words - * - * This corrects words like: j a v a s c r i p t - * These words are compacted back to their correct state. - * - */ - $words = array('javascript', 'expression', 'vbscript', 'script', 'applet', 'alert', 'document', 'write', 'cookie', 'window'); - foreach ($words as $word) - { - $temp = ''; - - for ($i = 0, $wordlen = strlen($word); $i < $wordlen; $i++) - { - $temp .= substr($word, $i, 1)."\s*"; - } - - // We only want to do this when it is followed by a non-word character - // That way valid stuff like "dealer to" does not become "dealerto" - $str = preg_replace_callback('#('.substr($temp, 0, -3).')(\W)#is', array($this, '_compact_exploded_words'), $str); - } - - /* - * Remove disallowed Javascript in links or img tags - * We used to do some version comparisons and use of stripos for PHP5, but it is dog slow compared - * to these simplified non-capturing preg_match(), especially if the pattern exists in the string - */ - do - { - $original = $str; - - if (preg_match("/]*?)(>|$)#si", array($this, '_js_link_removal'), $str); - } - - if (preg_match("/]*?)(\s?/?>|$)#si", array($this, '_js_img_removal'), $str); - } - - if (preg_match("/script/i", $str) OR preg_match("/xss/i", $str)) - { - $str = preg_replace("#<(/*)(script|xss)(.*?)\>#si", '[removed]', $str); - } - } - while($original != $str); - - unset($original); - - /* - * Remove JavaScript Event Handlers - * - * Note: This code is a little blunt. It removes - * the event handler and anything up to the closing >, - * but it's unlikely to be a problem. - * - */ - $event_handlers = array('[^a-z_\-]on\w*','xmlns'); - - if ($is_image === TRUE) - { - /* - * Adobe Photoshop puts XML metadata into JFIF images, including namespacing, - * so we have to allow this for images. -Paul - */ - unset($event_handlers[array_search('xmlns', $event_handlers)]); - } - - $str = preg_replace("#<([^><]+?)(".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); - - /* - * Sanitize naughty HTML elements - * - * If a tag containing any of the words in the list - * below is found, the tag gets converted to entities. - * - * So this: - * Becomes: <blink> - * - */ - $naughty = 'alert|applet|audio|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|isindex|layer|link|meta|object|plaintext|style|script|textarea|title|video|xml|xss'; - $str = preg_replace_callback('#<(/*\s*)('.$naughty.')([^><]*)([><]*)#is', array($this, '_sanitize_naughty_html'), $str); - - /* - * Sanitize naughty scripting elements - * - * Similar to above, only instead of looking for - * tags it looks for PHP and JavaScript commands - * that are disallowed. Rather than removing the - * code, it simply converts the parenthesis to entities - * rendering the code un-executable. - * - * For example: eval('some code') - * Becomes: eval('some code') - * - */ - $str = preg_replace('#(alert|cmd|passthru|eval|exec|expression|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str); - - /* - * Final clean up - * - * This adds a bit of extra precaution in case - * something got through the above filters - * - */ - foreach ($this->never_allowed_str as $key => $val) - { - $str = str_replace($key, $val, $str); - } - - foreach ($this->never_allowed_regex as $key => $val) - { - $str = preg_replace("#".$key."#i", $val, $str); - } - - /* - * Images are Handled in a Special Way - * - Essentially, we want to know that after all of the character conversion is done whether - * any unwanted, likely XSS, code was found. If not, we return TRUE, as the image is clean. - * However, if the string post-conversion does not matched the string post-removal of XSS, - * then it fails, as there was unwanted XSS code found and removed/changed during processing. - */ - - if ($is_image === TRUE) - { - if ($str == $converted_string) - { - return TRUE; - } - else - { - return FALSE; - } - } - - log_message('debug', "XSS Filtering completed"); - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Random Hash for protecting URLs - * - * @access public - * @return string - */ - function xss_hash() - { - if ($this->xss_hash == '') - { - if (phpversion() >= 4.2) - mt_srand(); - else - mt_srand(hexdec(substr(md5(microtime()), -8)) & 0x7fffffff); - - $this->xss_hash = md5(time() + mt_rand(0, 1999999999)); - } - - return $this->xss_hash; - } - - // -------------------------------------------------------------------- - - /** - * Remove Invisible Characters - * - * This prevents sandwiching null characters - * between ascii characters, like Java\0script. - * - * @access public - * @param string - * @return string - */ - function _remove_invisible_characters($str) - { - static $non_displayables; - - if ( ! isset($non_displayables)) - { - // every control character except newline (dec 10), carriage return (dec 13), and horizontal tab (dec 09), - $non_displayables = array( - '/%0[0-8bcef]/', // url encoded 00-08, 11, 12, 14, 15 - '/%1[0-9a-f]/', // url encoded 16-31 - '/[\x00-\x08]/', // 00-08 - '/\x0b/', '/\x0c/', // 11, 12 - '/[\x0e-\x1f]/' // 14-31 - ); - } - - do - { - $cleaned = $str; - $str = preg_replace($non_displayables, '', $str); - } - while ($cleaned != $str); - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Compact Exploded Words - * - * Callback function for xss_clean() to remove whitespace from - * things like j a v a s c r i p t - * - * @access public - * @param type - * @return type - */ - function _compact_exploded_words($matches) - { - return preg_replace('/\s+/s', '', $matches[1]).$matches[2]; - } - - // -------------------------------------------------------------------- - - /** - * Sanitize Naughty HTML - * - * Callback function for xss_clean() to remove naughty HTML elements - * - * @access private - * @param array - * @return string - */ - function _sanitize_naughty_html($matches) - { - // encode opening brace - $str = '<'.$matches[1].$matches[2].$matches[3]; - - // encode captured opening or closing brace to prevent recursive vectors - $str .= str_replace(array('>', '<'), array('>', '<'), $matches[4]); - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * JS Link Removal - * - * Callback function for xss_clean() to sanitize links - * This limits the PCRE backtracks, making it more performance friendly - * and prevents PREG_BACKTRACK_LIMIT_ERROR from being triggered in - * PHP 5.2+ on link-heavy strings - * - * @access private - * @param array - * @return string - */ - function _js_link_removal($match) - { - $attributes = $this->_filter_attributes(str_replace(array('<', '>'), '', $match[1])); - return str_replace($match[1], preg_replace("#href=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|_filter_attributes(str_replace(array('<', '>'), '', $match[1])); - return str_replace($match[1], preg_replace("#src=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|', '<'), array('>', '<'), $match[0]); - } - - // -------------------------------------------------------------------- - - /** - * HTML Entity Decode Callback - * - * Used as a callback for XSS Clean - * - * @access public - * @param array - * @return string - */ - function _html_entity_decode_callback($match) - { - $CFG =& load_class('Config'); - $charset = $CFG->item('charset'); - - return $this->_html_entity_decode($match[0], strtoupper($charset)); - } - - // -------------------------------------------------------------------- - - /** - * HTML Entities Decode - * - * This function is a replacement for html_entity_decode() - * - * In some versions of PHP the native function does not work - * when UTF-8 is the specified character set, so this gives us - * a work-around. More info here: - * http://bugs.php.net/bug.php?id=25670 - * - * @access private - * @param string - * @param string - * @return string - */ - /* ------------------------------------------------- - /* Replacement for html_entity_decode() - /* -------------------------------------------------*/ - - /* - NOTE: html_entity_decode() has a bug in some PHP versions when UTF-8 is the - character set, and the PHP developers said they were not back porting the - fix to versions other than PHP 5.x. - */ - function _html_entity_decode($str, $charset='UTF-8') - { - if (stristr($str, '&') === FALSE) return $str; - - // The reason we are not using html_entity_decode() by itself is because - // while it is not technically correct to leave out the semicolon - // at the end of an entity most browsers will still interpret the entity - // correctly. html_entity_decode() does not convert entities without - // semicolons, so we are left with our own little solution here. Bummer. - - if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR version_compare(phpversion(), '5.0.0', '>='))) - { - $str = html_entity_decode($str, ENT_COMPAT, $charset); - $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str); - return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str); - } - - // Numeric Entities - $str = preg_replace('~&#x(0*[0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str); - $str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str); - - // Literal Entities - Slightly slow so we do another check - if (stristr($str, '&') === FALSE) - { - $str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES))); - } - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Filter Attributes - * - * Filters tag attributes for consistency and safety - * - * @access public - * @param string - * @return string - */ - function _filter_attributes($str) - { - $out = ''; - - if (preg_match_all('#\s*[a-z\-]+\s*=\s*(\042|\047)([^\\1]*?)\\1#is', $str, $matches)) - { - foreach ($matches[0] as $match) - { - $out .= "{$match}"; - } - } - - return $out; - } - - // -------------------------------------------------------------------- - -} -// END Input class - -/* End of file Input.php */ + '[removed]', + 'document.write' => '[removed]', + '.parentNode' => '[removed]', + '.innerHTML' => '[removed]', + 'window.location' => '[removed]', + '-moz-binding' => '[removed]', + '' => '-->', + ' '<![CDATA[' + ); + /* never allowed, regex replacement */ + var $never_allowed_regex = array( + "javascript\s*:" => '[removed]', + "expression\s*\(" => '[removed]', // CSS and IE + "Redirect\s+302" => '[removed]' + ); + + /** + * Constructor + * + * Sets whether to globally enable the XSS processing + * and whether to allow the $_GET array + * + * @access public + */ + function CI_Input() + { + log_message('debug', "Input Class Initialized"); + + $CFG =& load_class('Config'); + $this->use_xss_clean = ($CFG->item('global_xss_filtering') === TRUE) ? TRUE : FALSE; + $this->allow_get_array = ($CFG->item('enable_query_strings') === TRUE) ? TRUE : FALSE; + $this->_sanitize_globals(); + } + + // -------------------------------------------------------------------- + + /** + * Sanitize Globals + * + * This function does the following: + * + * Unsets $_GET data (if query strings are not enabled) + * + * Unsets all globals if register_globals is enabled + * + * Standardizes newline characters to \n + * + * @access private + * @return void + */ + function _sanitize_globals() + { + // Would kind of be "wrong" to unset any of these GLOBALS + $protected = array('_SERVER', '_GET', '_POST', '_FILES', '_REQUEST', '_SESSION', '_ENV', 'GLOBALS', 'HTTP_RAW_POST_DATA', + 'system_folder', 'application_folder', 'BM', 'EXT', 'CFG', 'URI', 'RTR', 'OUT', 'IN'); + + // Unset globals for security. + // This is effectively the same as register_globals = off + foreach (array($_GET, $_POST, $_COOKIE, $_SERVER, $_FILES, $_ENV, (isset($_SESSION) && is_array($_SESSION)) ? $_SESSION : array()) as $global) + { + if ( ! is_array($global)) + { + if ( ! in_array($global, $protected)) + { + unset($GLOBALS[$global]); + } + } + else + { + foreach ($global as $key => $val) + { + if ( ! in_array($key, $protected)) + { + unset($GLOBALS[$key]); + } + + if (is_array($val)) + { + foreach($val as $k => $v) + { + if ( ! in_array($k, $protected)) + { + unset($GLOBALS[$k]); + } + } + } + } + } + } + + // Is $_GET data allowed? If not we'll set the $_GET to an empty array + if ($this->allow_get_array == FALSE) + { + $_GET = array(); + } + else + { + $_GET = $this->_clean_input_data($_GET); + } + + // Clean $_POST Data + $_POST = $this->_clean_input_data($_POST); + + // Clean $_COOKIE Data + // Also get rid of specially treated cookies that might be set by a server + // or silly application, that are of no use to a CI application anyway + // but that when present will trip our 'Disallowed Key Characters' alarm + // http://www.ietf.org/rfc/rfc2109.txt + // note that the key names below are single quoted strings, and are not PHP variables + unset($_COOKIE['$Version']); + unset($_COOKIE['$Path']); + unset($_COOKIE['$Domain']); + $_COOKIE = $this->_clean_input_data($_COOKIE); + + log_message('debug', "Global POST and COOKIE data sanitized"); + } + + // -------------------------------------------------------------------- + + /** + * Clean Input Data + * + * This is a helper function. It escapes data and + * standardizes newline characters to \n + * + * @access private + * @param string + * @return string + */ + function _clean_input_data($str) + { + if (is_array($str)) + { + $new_array = array(); + foreach ($str as $key => $val) + { + $new_array[$this->_clean_input_keys($key)] = $this->_clean_input_data($val); + } + return $new_array; + } + + // We strip slashes if magic quotes is on to keep things consistent + if (get_magic_quotes_gpc()) + { + $str = stripslashes($str); + } + + // Should we filter the input data? + if ($this->use_xss_clean === TRUE) + { + $str = $this->xss_clean($str); + } + + // Standardize newlines + if (strpos($str, "\r") !== FALSE) + { + $str = str_replace(array("\r\n", "\r"), "\n", $str); + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Clean Keys + * + * This is a helper function. To prevent malicious users + * from trying to exploit keys we make sure that keys are + * only named with alpha-numeric text and a few other items. + * + * @access private + * @param string + * @return string + */ + function _clean_input_keys($str) + { + if ( ! preg_match("/^[a-z0-9:_\/-]+$/i", $str)) + { + exit('Disallowed Key Characters.'); + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Fetch from array + * + * This is a helper function to retrieve values from global arrays + * + * @access private + * @param array + * @param string + * @param bool + * @return string + */ + function _fetch_from_array(&$array, $index = '', $xss_clean = FALSE) + { + if ( ! isset($array[$index])) + { + return FALSE; + } + + if ($xss_clean === TRUE) + { + return $this->xss_clean($array[$index]); + } + + return $array[$index]; + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the GET array + * + * @access public + * @param string + * @param bool + * @return string + */ + function get($index = '', $xss_clean = FALSE) + { + return $this->_fetch_from_array($_GET, $index, $xss_clean); + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the POST array + * + * @access public + * @param string + * @param bool + * @return string + */ + function post($index = '', $xss_clean = FALSE) + { + return $this->_fetch_from_array($_POST, $index, $xss_clean); + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from either the GET array or the POST + * + * @access public + * @param string The index key + * @param bool XSS cleaning + * @return string + */ + function get_post($index = '', $xss_clean = FALSE) + { + if ( ! isset($_POST[$index]) ) + { + return $this->get($index, $xss_clean); + } + else + { + return $this->post($index, $xss_clean); + } + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the COOKIE array + * + * @access public + * @param string + * @param bool + * @return string + */ + function cookie($index = '', $xss_clean = FALSE) + { + return $this->_fetch_from_array($_COOKIE, $index, $xss_clean); + } + + // -------------------------------------------------------------------- + + /** + * Fetch an item from the SERVER array + * + * @access public + * @param string + * @param bool + * @return string + */ + function server($index = '', $xss_clean = FALSE) + { + return $this->_fetch_from_array($_SERVER, $index, $xss_clean); + } + + // -------------------------------------------------------------------- + + /** + * Fetch the IP Address + * + * @access public + * @return string + */ + function ip_address() + { + if ($this->ip_address !== FALSE) + { + return $this->ip_address; + } + + if ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP')) + { + $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; + } + elseif ($this->server('REMOTE_ADDR')) + { + $this->ip_address = $_SERVER['REMOTE_ADDR']; + } + elseif ($this->server('HTTP_CLIENT_IP')) + { + $this->ip_address = $_SERVER['HTTP_CLIENT_IP']; + } + elseif ($this->server('HTTP_X_FORWARDED_FOR')) + { + $this->ip_address = $_SERVER['HTTP_X_FORWARDED_FOR']; + } + + if ($this->ip_address === FALSE) + { + $this->ip_address = '0.0.0.0'; + return $this->ip_address; + } + + if (strstr($this->ip_address, ',')) + { + $x = explode(',', $this->ip_address); + $this->ip_address = end($x); + } + + if ( ! $this->valid_ip($this->ip_address)) + { + $this->ip_address = '0.0.0.0'; + } + + return $this->ip_address; + } + + // -------------------------------------------------------------------- + + /** + * Validate IP Address + * + * Updated version suggested by Geert De Deckere + * + * @access public + * @param string + * @return string + */ + function valid_ip($ip) + { + $ip_segments = explode('.', $ip); + + // Always 4 segments needed + if (count($ip_segments) != 4) + { + return FALSE; + } + // IP can not start with 0 + if ($ip_segments[0][0] == '0') + { + return FALSE; + } + // Check each segment + foreach ($ip_segments as $segment) + { + // IP segments must be digits and can not be + // longer than 3 digits or greater then 255 + if ($segment == '' OR preg_match("/[^0-9]/", $segment) OR $segment > 255 OR strlen($segment) > 3) + { + return FALSE; + } + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * User Agent + * + * @access public + * @return string + */ + function user_agent() + { + if ($this->user_agent !== FALSE) + { + return $this->user_agent; + } + + $this->user_agent = ( ! isset($_SERVER['HTTP_USER_AGENT'])) ? FALSE : $_SERVER['HTTP_USER_AGENT']; + + return $this->user_agent; + } + + // -------------------------------------------------------------------- + + /** + * Filename Security + * + * @access public + * @param string + * @return string + */ + function filename_security($str) + { + $bad = array( + "../", + "./", + "", + "<", + ">", + "'", + '"', + '&', + '$', + '#', + '{', + '}', + '[', + ']', + '=', + ';', + '?', + "%20", + "%22", + "%3c", // < + "%253c", // < + "%3e", // > + "%0e", // > + "%28", // ( + "%29", // ) + "%2528", // ( + "%26", // & + "%24", // $ + "%3f", // ? + "%3b", // ; + "%3d" // = + ); + + return stripslashes(str_replace($bad, '', $str)); + } + + // -------------------------------------------------------------------- + + /** + * XSS Clean + * + * Sanitizes data so that Cross Site Scripting Hacks can be + * prevented. This function does a fair amount of work but + * it is extremely thorough, designed to prevent even the + * most obscure XSS attempts. Nothing is ever 100% foolproof, + * of course, but I haven't been able to get anything passed + * the filter. + * + * Note: This function should only be used to deal with data + * upon submission. It's not something that should + * be used for general runtime processing. + * + * This function was based in part on some code and ideas I + * got from Bitflux: http://blog.bitflux.ch/wiki/XSS_Prevention + * + * To help develop this script I used this great list of + * vulnerabilities along with a few other hacks I've + * harvested from examining vulnerabilities in other programs: + * http://ha.ckers.org/xss.html + * + * @access public + * @param string + * @return string + */ + function xss_clean($str, $is_image = FALSE) + { + /* + * Is the string an array? + * + */ + if (is_array($str)) + { + while (list($key) = each($str)) + { + $str[$key] = $this->xss_clean($str[$key]); + } + + return $str; + } + + /* + * Remove Invisible Characters + */ + $str = $this->_remove_invisible_characters($str); + + /* + * Protect GET variables in URLs + */ + + // 901119URL5918AMP18930PROTECT8198 + + $str = preg_replace('|\&([a-z\_0-9]+)\=([a-z\_0-9]+)|i', $this->xss_hash()."\\1=\\2", $str); + + /* + * Validate standard character entities + * + * Add a semicolon if missing. We do this to enable + * the conversion of entities to ASCII later. + * + */ + $str = preg_replace('#(&\#?[0-9a-z]{2,})[\x00-\x20]*;?#i', "\\1;", $str); + + /* + * Validate UTF16 two byte encoding (x00) + * + * Just as above, adds a semicolon if missing. + * + */ + $str = preg_replace('#(&\#x?)([0-9A-F]+);?#i',"\\1\\2;",$str); + + /* + * Un-Protect GET variables in URLs + */ + $str = str_replace($this->xss_hash(), '&', $str); + + /* + * URL Decode + * + * Just in case stuff like this is submitted: + * + * Google + * + * Note: Use rawurldecode() so it does not remove plus signs + * + */ + $str = rawurldecode($str); + + /* + * Convert character entities to ASCII + * + * This permits our tests below to work reliably. + * We only convert entities that are within tags since + * these are the ones that will pose security problems. + * + */ + + $str = preg_replace_callback("/[a-z]+=([\'\"]).*?\\1/si", array($this, '_convert_attribute'), $str); + + $str = preg_replace_callback("/<\w+.*?(?=>|<|$)/si", array($this, '_html_entity_decode_callback'), $str); + + /* + * Remove Invisible Characters Again! + */ + $str = $this->_remove_invisible_characters($str); + + /* + * Convert all tabs to spaces + * + * This prevents strings like this: ja vascript + * NOTE: we deal with spaces between characters later. + * NOTE: preg_replace was found to be amazingly slow here on large blocks of data, + * so we use str_replace. + * + */ + + if (strpos($str, "\t") !== FALSE) + { + $str = str_replace("\t", ' ', $str); + } + + /* + * Capture converted string for later comparison + */ + $converted_string = $str; + + /* + * Not Allowed Under Any Conditions + */ + + foreach ($this->never_allowed_str as $key => $val) + { + $str = str_replace($key, $val, $str); + } + + foreach ($this->never_allowed_regex as $key => $val) + { + $str = preg_replace("#".$key."#i", $val, $str); + } + + /* + * Makes PHP tags safe + * + * Note: XML tags are inadvertently replaced too: + * + * '), array('<?php', '<?PHP', '<?', '?>'), $str); + } + + /* + * Compact any exploded words + * + * This corrects words like: j a v a s c r i p t + * These words are compacted back to their correct state. + * + */ + $words = array('javascript', 'expression', 'vbscript', 'script', 'applet', 'alert', 'document', 'write', 'cookie', 'window'); + foreach ($words as $word) + { + $temp = ''; + + for ($i = 0, $wordlen = strlen($word); $i < $wordlen; $i++) + { + $temp .= substr($word, $i, 1)."\s*"; + } + + // We only want to do this when it is followed by a non-word character + // That way valid stuff like "dealer to" does not become "dealerto" + $str = preg_replace_callback('#('.substr($temp, 0, -3).')(\W)#is', array($this, '_compact_exploded_words'), $str); + } + + /* + * Remove disallowed Javascript in links or img tags + * We used to do some version comparisons and use of stripos for PHP5, but it is dog slow compared + * to these simplified non-capturing preg_match(), especially if the pattern exists in the string + */ + do + { + $original = $str; + + if (preg_match("/]*?)(>|$)#si", array($this, '_js_link_removal'), $str); + } + + if (preg_match("/]*?)(\s?/?>|$)#si", array($this, '_js_img_removal'), $str); + } + + if (preg_match("/script/i", $str) OR preg_match("/xss/i", $str)) + { + $str = preg_replace("#<(/*)(script|xss)(.*?)\>#si", '[removed]', $str); + } + } + while($original != $str); + + unset($original); + + /* + * Remove JavaScript Event Handlers + * + * Note: This code is a little blunt. It removes + * the event handler and anything up to the closing >, + * but it's unlikely to be a problem. + * + */ + $event_handlers = array('[^a-z_\-]on\w*','xmlns'); + + if ($is_image === TRUE) + { + /* + * Adobe Photoshop puts XML metadata into JFIF images, including namespacing, + * so we have to allow this for images. -Paul + */ + unset($event_handlers[array_search('xmlns', $event_handlers)]); + } + + $str = preg_replace("#<([^><]+?)(".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); + + /* + * Sanitize naughty HTML elements + * + * If a tag containing any of the words in the list + * below is found, the tag gets converted to entities. + * + * So this: + * Becomes: <blink> + * + */ + $naughty = 'alert|applet|audio|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|isindex|layer|link|meta|object|plaintext|style|script|textarea|title|video|xml|xss'; + $str = preg_replace_callback('#<(/*\s*)('.$naughty.')([^><]*)([><]*)#is', array($this, '_sanitize_naughty_html'), $str); + + /* + * Sanitize naughty scripting elements + * + * Similar to above, only instead of looking for + * tags it looks for PHP and JavaScript commands + * that are disallowed. Rather than removing the + * code, it simply converts the parenthesis to entities + * rendering the code un-executable. + * + * For example: eval('some code') + * Becomes: eval('some code') + * + */ + $str = preg_replace('#(alert|cmd|passthru|eval|exec|expression|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str); + + /* + * Final clean up + * + * This adds a bit of extra precaution in case + * something got through the above filters + * + */ + foreach ($this->never_allowed_str as $key => $val) + { + $str = str_replace($key, $val, $str); + } + + foreach ($this->never_allowed_regex as $key => $val) + { + $str = preg_replace("#".$key."#i", $val, $str); + } + + /* + * Images are Handled in a Special Way + * - Essentially, we want to know that after all of the character conversion is done whether + * any unwanted, likely XSS, code was found. If not, we return TRUE, as the image is clean. + * However, if the string post-conversion does not matched the string post-removal of XSS, + * then it fails, as there was unwanted XSS code found and removed/changed during processing. + */ + + if ($is_image === TRUE) + { + if ($str == $converted_string) + { + return TRUE; + } + else + { + return FALSE; + } + } + + log_message('debug', "XSS Filtering completed"); + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Random Hash for protecting URLs + * + * @access public + * @return string + */ + function xss_hash() + { + if ($this->xss_hash == '') + { + if (phpversion() >= 4.2) + mt_srand(); + else + mt_srand(hexdec(substr(md5(microtime()), -8)) & 0x7fffffff); + + $this->xss_hash = md5(time() + mt_rand(0, 1999999999)); + } + + return $this->xss_hash; + } + + // -------------------------------------------------------------------- + + /** + * Remove Invisible Characters + * + * This prevents sandwiching null characters + * between ascii characters, like Java\0script. + * + * @access public + * @param string + * @return string + */ + function _remove_invisible_characters($str) + { + static $non_displayables; + + if ( ! isset($non_displayables)) + { + // every control character except newline (dec 10), carriage return (dec 13), and horizontal tab (dec 09), + $non_displayables = array( + '/%0[0-8bcef]/', // url encoded 00-08, 11, 12, 14, 15 + '/%1[0-9a-f]/', // url encoded 16-31 + '/[\x00-\x08]/', // 00-08 + '/\x0b/', '/\x0c/', // 11, 12 + '/[\x0e-\x1f]/' // 14-31 + ); + } + + do + { + $cleaned = $str; + $str = preg_replace($non_displayables, '', $str); + } + while ($cleaned != $str); + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Compact Exploded Words + * + * Callback function for xss_clean() to remove whitespace from + * things like j a v a s c r i p t + * + * @access public + * @param type + * @return type + */ + function _compact_exploded_words($matches) + { + return preg_replace('/\s+/s', '', $matches[1]).$matches[2]; + } + + // -------------------------------------------------------------------- + + /** + * Sanitize Naughty HTML + * + * Callback function for xss_clean() to remove naughty HTML elements + * + * @access private + * @param array + * @return string + */ + function _sanitize_naughty_html($matches) + { + // encode opening brace + $str = '<'.$matches[1].$matches[2].$matches[3]; + + // encode captured opening or closing brace to prevent recursive vectors + $str .= str_replace(array('>', '<'), array('>', '<'), $matches[4]); + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * JS Link Removal + * + * Callback function for xss_clean() to sanitize links + * This limits the PCRE backtracks, making it more performance friendly + * and prevents PREG_BACKTRACK_LIMIT_ERROR from being triggered in + * PHP 5.2+ on link-heavy strings + * + * @access private + * @param array + * @return string + */ + function _js_link_removal($match) + { + $attributes = $this->_filter_attributes(str_replace(array('<', '>'), '', $match[1])); + return str_replace($match[1], preg_replace("#href=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|_filter_attributes(str_replace(array('<', '>'), '', $match[1])); + return str_replace($match[1], preg_replace("#src=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|', '<'), array('>', '<'), $match[0]); + } + + // -------------------------------------------------------------------- + + /** + * HTML Entity Decode Callback + * + * Used as a callback for XSS Clean + * + * @access public + * @param array + * @return string + */ + function _html_entity_decode_callback($match) + { + $CFG =& load_class('Config'); + $charset = $CFG->item('charset'); + + return $this->_html_entity_decode($match[0], strtoupper($charset)); + } + + // -------------------------------------------------------------------- + + /** + * HTML Entities Decode + * + * This function is a replacement for html_entity_decode() + * + * In some versions of PHP the native function does not work + * when UTF-8 is the specified character set, so this gives us + * a work-around. More info here: + * http://bugs.php.net/bug.php?id=25670 + * + * @access private + * @param string + * @param string + * @return string + */ + /* ------------------------------------------------- + /* Replacement for html_entity_decode() + /* -------------------------------------------------*/ + + /* + NOTE: html_entity_decode() has a bug in some PHP versions when UTF-8 is the + character set, and the PHP developers said they were not back porting the + fix to versions other than PHP 5.x. + */ + function _html_entity_decode($str, $charset='UTF-8') + { + if (stristr($str, '&') === FALSE) return $str; + + // The reason we are not using html_entity_decode() by itself is because + // while it is not technically correct to leave out the semicolon + // at the end of an entity most browsers will still interpret the entity + // correctly. html_entity_decode() does not convert entities without + // semicolons, so we are left with our own little solution here. Bummer. + + if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR version_compare(phpversion(), '5.0.0', '>='))) + { + $str = html_entity_decode($str, ENT_COMPAT, $charset); + $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str); + return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str); + } + + // Numeric Entities + $str = preg_replace('~&#x(0*[0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str); + $str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str); + + // Literal Entities - Slightly slow so we do another check + if (stristr($str, '&') === FALSE) + { + $str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES))); + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Filter Attributes + * + * Filters tag attributes for consistency and safety + * + * @access public + * @param string + * @return string + */ + function _filter_attributes($str) + { + $out = ''; + + if (preg_match_all('#\s*[a-z\-]+\s*=\s*(\042|\047)([^\\1]*?)\\1#is', $str, $matches)) + { + foreach ($matches[0] as $match) + { + $out .= "{$match}"; + } + } + + return $out; + } + + // -------------------------------------------------------------------- + +} +// END Input class + +/* End of file Input.php */ /* Location: ./system/libraries/Input.php */ \ No newline at end of file diff --git a/system/libraries/Language.php b/system/libraries/Language.php index 78f4143a..bc237e75 100644 --- a/system/libraries/Language.php +++ b/system/libraries/Language.php @@ -1,123 +1,123 @@ -is_loaded, TRUE)) - { - return; - } - - if ($idiom == '') - { - $CI =& get_instance(); - $deft_lang = $CI->config->item('language'); - $idiom = ($deft_lang == '') ? 'english' : $deft_lang; - } - - // Determine where the language file is and load it - if (file_exists(APPPATH.'language/'.$idiom.'/'.$langfile)) - { - include(APPPATH.'language/'.$idiom.'/'.$langfile); - } - else - { - if (file_exists(BASEPATH.'language/'.$idiom.'/'.$langfile)) - { - include(BASEPATH.'language/'.$idiom.'/'.$langfile); - } - else - { - show_error('Unable to load the requested language file: language/'.$langfile); - } - } - - if ( ! isset($lang)) - { - log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile); - return; - } - - if ($return == TRUE) - { - return $lang; - } - - $this->is_loaded[] = $langfile; - $this->language = array_merge($this->language, $lang); - unset($lang); - - log_message('debug', 'Language file loaded: language/'.$idiom.'/'.$langfile); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Fetch a single line of text from the language array - * - * @access public - * @param string $line the language line - * @return string - */ - function line($line = '') - { - $line = ($line == '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line]; - return $line; - } - -} -// END Language Class - -/* End of file Language.php */ +is_loaded, TRUE)) + { + return; + } + + if ($idiom == '') + { + $CI =& get_instance(); + $deft_lang = $CI->config->item('language'); + $idiom = ($deft_lang == '') ? 'english' : $deft_lang; + } + + // Determine where the language file is and load it + if (file_exists(APPPATH.'language/'.$idiom.'/'.$langfile)) + { + include(APPPATH.'language/'.$idiom.'/'.$langfile); + } + else + { + if (file_exists(BASEPATH.'language/'.$idiom.'/'.$langfile)) + { + include(BASEPATH.'language/'.$idiom.'/'.$langfile); + } + else + { + show_error('Unable to load the requested language file: language/'.$langfile); + } + } + + if ( ! isset($lang)) + { + log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile); + return; + } + + if ($return == TRUE) + { + return $lang; + } + + $this->is_loaded[] = $langfile; + $this->language = array_merge($this->language, $lang); + unset($lang); + + log_message('debug', 'Language file loaded: language/'.$idiom.'/'.$langfile); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Fetch a single line of text from the language array + * + * @access public + * @param string $line the language line + * @return string + */ + function line($line = '') + { + $line = ($line == '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line]; + return $line; + } + +} +// END Language Class + +/* End of file Language.php */ /* Location: ./system/libraries/Language.php */ \ No newline at end of file diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 660ce8f1..25bf21fb 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -1,758 +1,758 @@ -CI =& get_instance(); - - // Set all the session preferences, which can either be set - // manually via the $params array above or via the config file - foreach (array('sess_encrypt_cookie', 'sess_use_database', 'sess_table_name', 'sess_expiration', 'sess_match_ip', 'sess_match_useragent', 'sess_cookie_name', 'cookie_path', 'cookie_domain', 'sess_time_to_update', 'time_reference', 'cookie_prefix', 'encryption_key') as $key) - { - $this->$key = (isset($params[$key])) ? $params[$key] : $this->CI->config->item($key); - } - - // Load the string helper so we can use the strip_slashes() function - $this->CI->load->helper('string'); - - // Do we need encryption? If so, load the encryption class - if ($this->sess_encrypt_cookie == TRUE) - { - $this->CI->load->library('encrypt'); - } - - // Are we using a database? If so, load it - if ($this->sess_use_database === TRUE AND $this->sess_table_name != '') - { - $this->CI->load->database(); - } - - // Set the "now" time. Can either be GMT or server time, based on the - // config prefs. We use this to set the "last activity" time - $this->now = $this->_get_time(); - - // Set the session length. If the session expiration is - // set to zero we'll set the expiration two years from now. - if ($this->sess_expiration == 0) - { - $this->sess_expiration = (60*60*24*365*2); - } - - // Set the cookie name - $this->sess_cookie_name = $this->cookie_prefix.$this->sess_cookie_name; - - // Run the Session routine. If a session doesn't exist we'll - // create a new one. If it does, we'll update it. - if ( ! $this->sess_read()) - { - $this->sess_create(); - } - else - { - $this->sess_update(); - } - - // Delete 'old' flashdata (from last request) - $this->_flashdata_sweep(); - - // Mark all new flashdata as old (data will be deleted before next request) - $this->_flashdata_mark(); - - // Delete expired sessions if necessary - $this->_sess_gc(); - - log_message('debug', "Session routines successfully run"); - } - - // -------------------------------------------------------------------- - - /** - * Fetch the current session data if it exists - * - * @access public - * @return bool - */ - function sess_read() - { - // Fetch the cookie - $session = $this->CI->input->cookie($this->sess_cookie_name); - - // No cookie? Goodbye cruel world!... - if ($session === FALSE) - { - log_message('debug', 'A session cookie was not found.'); - return FALSE; - } - - // Decrypt the cookie data - if ($this->sess_encrypt_cookie == TRUE) - { - $session = $this->CI->encrypt->decode($session); - } - else - { - // encryption was not used, so we need to check the md5 hash - $hash = substr($session, strlen($session)-32); // get last 32 chars - $session = substr($session, 0, strlen($session)-32); - - // Does the md5 hash match? This is to prevent manipulation of session data in userspace - if ($hash !== md5($session.$this->encryption_key)) - { - log_message('error', 'The session cookie data did not match what was expected. This could be a possible hacking attempt.'); - $this->sess_destroy(); - return FALSE; - } - } - - // Unserialize the session array - $session = $this->_unserialize($session); - - // Is the session data we unserialized an array with the correct format? - if ( ! is_array($session) OR ! isset($session['session_id']) OR ! isset($session['ip_address']) OR ! isset($session['user_agent']) OR ! isset($session['last_activity'])) - { - $this->sess_destroy(); - return FALSE; - } - - // Is the session current? - if (($session['last_activity'] + $this->sess_expiration) < $this->now) - { - $this->sess_destroy(); - return FALSE; - } - - // Does the IP Match? - if ($this->sess_match_ip == TRUE AND $session['ip_address'] != $this->CI->input->ip_address()) - { - $this->sess_destroy(); - return FALSE; - } - - // Does the User Agent Match? - if ($this->sess_match_useragent == TRUE AND trim($session['user_agent']) != trim(substr($this->CI->input->user_agent(), 0, 50))) - { - $this->sess_destroy(); - return FALSE; - } - - // Is there a corresponding session in the DB? - if ($this->sess_use_database === TRUE) - { - $this->CI->db->where('session_id', $session['session_id']); - - if ($this->sess_match_ip == TRUE) - { - $this->CI->db->where('ip_address', $session['ip_address']); - } - - if ($this->sess_match_useragent == TRUE) - { - $this->CI->db->where('user_agent', $session['user_agent']); - } - - $query = $this->CI->db->get($this->sess_table_name); - - // No result? Kill it! - if ($query->num_rows() == 0) - { - $this->sess_destroy(); - return FALSE; - } - - // Is there custom data? If so, add it to the main session array - $row = $query->row(); - if (isset($row->user_data) AND $row->user_data != '') - { - $custom_data = $this->_unserialize($row->user_data); - - if (is_array($custom_data)) - { - foreach ($custom_data as $key => $val) - { - $session[$key] = $val; - } - } - } - } - - // Session is valid! - $this->userdata = $session; - unset($session); - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Write the session data - * - * @access public - * @return void - */ - function sess_write() - { - // Are we saving custom data to the DB? If not, all we do is update the cookie - if ($this->sess_use_database === FALSE) - { - $this->_set_cookie(); - return; - } - - // set the custom userdata, the session data we will set in a second - $custom_userdata = $this->userdata; - $cookie_userdata = array(); - - // Before continuing, we need to determine if there is any custom data to deal with. - // Let's determine this by removing the default indexes to see if there's anything left in the array - // and set the session data while we're at it - foreach (array('session_id','ip_address','user_agent','last_activity') as $val) - { - unset($custom_userdata[$val]); - $cookie_userdata[$val] = $this->userdata[$val]; - } - - // Did we find any custom data? If not, we turn the empty array into a string - // since there's no reason to serialize and store an empty array in the DB - if (count($custom_userdata) === 0) - { - $custom_userdata = ''; - } - else - { - // Serialize the custom data array so we can store it - $custom_userdata = $this->_serialize($custom_userdata); - } - - // Run the update query - $this->CI->db->where('session_id', $this->userdata['session_id']); - $this->CI->db->update($this->sess_table_name, array('last_activity' => $this->userdata['last_activity'], 'user_data' => $custom_userdata)); - - // Write the cookie. Notice that we manually pass the cookie data array to the - // _set_cookie() function. Normally that function will store $this->userdata, but - // in this case that array contains custom data, which we do not want in the cookie. - $this->_set_cookie($cookie_userdata); - } - - // -------------------------------------------------------------------- - - /** - * Create a new session - * - * @access public - * @return void - */ - function sess_create() - { - $sessid = ''; - while (strlen($sessid) < 32) - { - $sessid .= mt_rand(0, mt_getrandmax()); - } - - // To make the session ID even more secure we'll combine it with the user's IP - $sessid .= $this->CI->input->ip_address(); - - $this->userdata = array( - 'session_id' => md5(uniqid($sessid, TRUE)), - 'ip_address' => $this->CI->input->ip_address(), - 'user_agent' => substr($this->CI->input->user_agent(), 0, 50), - 'last_activity' => $this->now - ); - - - // Save the data to the DB if needed - if ($this->sess_use_database === TRUE) - { - $this->CI->db->query($this->CI->db->insert_string($this->sess_table_name, $this->userdata)); - } - - // Write the cookie - $this->_set_cookie(); - } - - // -------------------------------------------------------------------- - - /** - * Update an existing session - * - * @access public - * @return void - */ - function sess_update() - { - // We only update the session every five minutes by default - if (($this->userdata['last_activity'] + $this->sess_time_to_update) >= $this->now) - { - return; - } - - // Save the old session id so we know which record to - // update in the database if we need it - $old_sessid = $this->userdata['session_id']; - $new_sessid = ''; - while (strlen($new_sessid) < 32) - { - $new_sessid .= mt_rand(0, mt_getrandmax()); - } - - // To make the session ID even more secure we'll combine it with the user's IP - $new_sessid .= $this->CI->input->ip_address(); - - // Turn it into a hash - $new_sessid = md5(uniqid($new_sessid, TRUE)); - - // Update the session data in the session data array - $this->userdata['session_id'] = $new_sessid; - $this->userdata['last_activity'] = $this->now; - - // _set_cookie() will handle this for us if we aren't using database sessions - // by pushing all userdata to the cookie. - $cookie_data = NULL; - - // Update the session ID and last_activity field in the DB if needed - if ($this->sess_use_database === TRUE) - { - // set cookie explicitly to only have our session data - $cookie_data = array(); - foreach (array('session_id','ip_address','user_agent','last_activity') as $val) - { - $cookie_data[$val] = $this->userdata[$val]; - } - - $this->CI->db->query($this->CI->db->update_string($this->sess_table_name, array('last_activity' => $this->now, 'session_id' => $new_sessid), array('session_id' => $old_sessid))); - } - - // Write the cookie - $this->_set_cookie($cookie_data); - } - - // -------------------------------------------------------------------- - - /** - * Destroy the current session - * - * @access public - * @return void - */ - function sess_destroy() - { - // Kill the session DB row - if ($this->sess_use_database === TRUE AND isset($this->userdata['session_id'])) - { - $this->CI->db->where('session_id', $this->userdata['session_id']); - $this->CI->db->delete($this->sess_table_name); - } - - // Kill the cookie - setcookie( - $this->sess_cookie_name, - addslashes(serialize(array())), - ($this->now - 31500000), - $this->cookie_path, - $this->cookie_domain, - 0 - ); - } - - // -------------------------------------------------------------------- - - /** - * Fetch a specific item from the session array - * - * @access public - * @param string - * @return string - */ - function userdata($item) - { - return ( ! isset($this->userdata[$item])) ? FALSE : $this->userdata[$item]; - } - - // -------------------------------------------------------------------- - - /** - * Fetch all session data - * - * @access public - * @return mixed - */ - function all_userdata() - { - return ( ! isset($this->userdata)) ? FALSE : $this->userdata; - } - - // -------------------------------------------------------------------- - - /** - * Add or change data in the "userdata" array - * - * @access public - * @param mixed - * @param string - * @return void - */ - function set_userdata($newdata = array(), $newval = '') - { - if (is_string($newdata)) - { - $newdata = array($newdata => $newval); - } - - if (count($newdata) > 0) - { - foreach ($newdata as $key => $val) - { - $this->userdata[$key] = $val; - } - } - - $this->sess_write(); - } - - // -------------------------------------------------------------------- - - /** - * Delete a session variable from the "userdata" array - * - * @access array - * @return void - */ - function unset_userdata($newdata = array()) - { - if (is_string($newdata)) - { - $newdata = array($newdata => ''); - } - - if (count($newdata) > 0) - { - foreach ($newdata as $key => $val) - { - unset($this->userdata[$key]); - } - } - - $this->sess_write(); - } - - // ------------------------------------------------------------------------ - - /** - * Add or change flashdata, only available - * until the next request - * - * @access public - * @param mixed - * @param string - * @return void - */ - function set_flashdata($newdata = array(), $newval = '') - { - if (is_string($newdata)) - { - $newdata = array($newdata => $newval); - } - - if (count($newdata) > 0) - { - foreach ($newdata as $key => $val) - { - $flashdata_key = $this->flashdata_key.':new:'.$key; - $this->set_userdata($flashdata_key, $val); - } - } - } - - // ------------------------------------------------------------------------ - - /** - * Keeps existing flashdata available to next request. - * - * @access public - * @param string - * @return void - */ - function keep_flashdata($key) - { - // 'old' flashdata gets removed. Here we mark all - // flashdata as 'new' to preserve it from _flashdata_sweep() - // Note the function will return FALSE if the $key - // provided cannot be found - $old_flashdata_key = $this->flashdata_key.':old:'.$key; - $value = $this->userdata($old_flashdata_key); - - $new_flashdata_key = $this->flashdata_key.':new:'.$key; - $this->set_userdata($new_flashdata_key, $value); - } - - // ------------------------------------------------------------------------ - - /** - * Fetch a specific flashdata item from the session array - * - * @access public - * @param string - * @return string - */ - function flashdata($key) - { - $flashdata_key = $this->flashdata_key.':old:'.$key; - return $this->userdata($flashdata_key); - } - - // ------------------------------------------------------------------------ - - /** - * Identifies flashdata as 'old' for removal - * when _flashdata_sweep() runs. - * - * @access private - * @return void - */ - function _flashdata_mark() - { - $userdata = $this->all_userdata(); - foreach ($userdata as $name => $value) - { - $parts = explode(':new:', $name); - if (is_array($parts) && count($parts) === 2) - { - $new_name = $this->flashdata_key.':old:'.$parts[1]; - $this->set_userdata($new_name, $value); - $this->unset_userdata($name); - } - } - } - - // ------------------------------------------------------------------------ - - /** - * Removes all flashdata marked as 'old' - * - * @access private - * @return void - */ - - function _flashdata_sweep() - { - $userdata = $this->all_userdata(); - foreach ($userdata as $key => $value) - { - if (strpos($key, ':old:')) - { - $this->unset_userdata($key); - } - } - - } - - // -------------------------------------------------------------------- - - /** - * Get the "now" time - * - * @access private - * @return string - */ - function _get_time() - { - if (strtolower($this->time_reference) == 'gmt') - { - $now = time(); - $time = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now)); - } - else - { - $time = time(); - } - - return $time; - } - - // -------------------------------------------------------------------- - - /** - * Write the session cookie - * - * @access public - * @return void - */ - function _set_cookie($cookie_data = NULL) - { - if (is_null($cookie_data)) - { - $cookie_data = $this->userdata; - } - - // Serialize the userdata for the cookie - $cookie_data = $this->_serialize($cookie_data); - - if ($this->sess_encrypt_cookie == TRUE) - { - $cookie_data = $this->CI->encrypt->encode($cookie_data); - } - else - { - // if encryption is not used, we provide an md5 hash to prevent userside tampering - $cookie_data = $cookie_data.md5($cookie_data.$this->encryption_key); - } - - // Set the cookie - setcookie( - $this->sess_cookie_name, - $cookie_data, - $this->sess_expiration + time(), - $this->cookie_path, - $this->cookie_domain, - 0 - ); - } - - // -------------------------------------------------------------------- - - /** - * Serialize an array - * - * This function first converts any slashes found in the array to a temporary - * marker, so when it gets unserialized the slashes will be preserved - * - * @access private - * @param array - * @return string - */ - function _serialize($data) - { - if (is_array($data)) - { - foreach ($data as $key => $val) - { - $data[$key] = str_replace('\\', '{{slash}}', $val); - } - } - else - { - $data = str_replace('\\', '{{slash}}', $data); - } - - return serialize($data); - } - - // -------------------------------------------------------------------- - - /** - * Unserialize - * - * This function unserializes a data string, then converts any - * temporary slash markers back to actual slashes - * - * @access private - * @param array - * @return string - */ - function _unserialize($data) - { - $data = @unserialize(strip_slashes($data)); - - if (is_array($data)) - { - foreach ($data as $key => $val) - { - $data[$key] = str_replace('{{slash}}', '\\', $val); - } - - return $data; - } - - return str_replace('{{slash}}', '\\', $data); - } - - // -------------------------------------------------------------------- - - /** - * Garbage collection - * - * This deletes expired session rows from database - * if the probability percentage is met - * - * @access public - * @return void - */ - function _sess_gc() - { - if ($this->sess_use_database != TRUE) - { - return; - } - - srand(time()); - if ((rand() % 100) < $this->gc_probability) - { - $expire = $this->now - $this->sess_expiration; - - $this->CI->db->where("last_activity < {$expire}"); - $this->CI->db->delete($this->sess_table_name); - - log_message('debug', 'Session garbage collection performed.'); - } - } - - -} -// END Session Class - -/* End of file Session.php */ +CI =& get_instance(); + + // Set all the session preferences, which can either be set + // manually via the $params array above or via the config file + foreach (array('sess_encrypt_cookie', 'sess_use_database', 'sess_table_name', 'sess_expiration', 'sess_match_ip', 'sess_match_useragent', 'sess_cookie_name', 'cookie_path', 'cookie_domain', 'sess_time_to_update', 'time_reference', 'cookie_prefix', 'encryption_key') as $key) + { + $this->$key = (isset($params[$key])) ? $params[$key] : $this->CI->config->item($key); + } + + // Load the string helper so we can use the strip_slashes() function + $this->CI->load->helper('string'); + + // Do we need encryption? If so, load the encryption class + if ($this->sess_encrypt_cookie == TRUE) + { + $this->CI->load->library('encrypt'); + } + + // Are we using a database? If so, load it + if ($this->sess_use_database === TRUE AND $this->sess_table_name != '') + { + $this->CI->load->database(); + } + + // Set the "now" time. Can either be GMT or server time, based on the + // config prefs. We use this to set the "last activity" time + $this->now = $this->_get_time(); + + // Set the session length. If the session expiration is + // set to zero we'll set the expiration two years from now. + if ($this->sess_expiration == 0) + { + $this->sess_expiration = (60*60*24*365*2); + } + + // Set the cookie name + $this->sess_cookie_name = $this->cookie_prefix.$this->sess_cookie_name; + + // Run the Session routine. If a session doesn't exist we'll + // create a new one. If it does, we'll update it. + if ( ! $this->sess_read()) + { + $this->sess_create(); + } + else + { + $this->sess_update(); + } + + // Delete 'old' flashdata (from last request) + $this->_flashdata_sweep(); + + // Mark all new flashdata as old (data will be deleted before next request) + $this->_flashdata_mark(); + + // Delete expired sessions if necessary + $this->_sess_gc(); + + log_message('debug', "Session routines successfully run"); + } + + // -------------------------------------------------------------------- + + /** + * Fetch the current session data if it exists + * + * @access public + * @return bool + */ + function sess_read() + { + // Fetch the cookie + $session = $this->CI->input->cookie($this->sess_cookie_name); + + // No cookie? Goodbye cruel world!... + if ($session === FALSE) + { + log_message('debug', 'A session cookie was not found.'); + return FALSE; + } + + // Decrypt the cookie data + if ($this->sess_encrypt_cookie == TRUE) + { + $session = $this->CI->encrypt->decode($session); + } + else + { + // encryption was not used, so we need to check the md5 hash + $hash = substr($session, strlen($session)-32); // get last 32 chars + $session = substr($session, 0, strlen($session)-32); + + // Does the md5 hash match? This is to prevent manipulation of session data in userspace + if ($hash !== md5($session.$this->encryption_key)) + { + log_message('error', 'The session cookie data did not match what was expected. This could be a possible hacking attempt.'); + $this->sess_destroy(); + return FALSE; + } + } + + // Unserialize the session array + $session = $this->_unserialize($session); + + // Is the session data we unserialized an array with the correct format? + if ( ! is_array($session) OR ! isset($session['session_id']) OR ! isset($session['ip_address']) OR ! isset($session['user_agent']) OR ! isset($session['last_activity'])) + { + $this->sess_destroy(); + return FALSE; + } + + // Is the session current? + if (($session['last_activity'] + $this->sess_expiration) < $this->now) + { + $this->sess_destroy(); + return FALSE; + } + + // Does the IP Match? + if ($this->sess_match_ip == TRUE AND $session['ip_address'] != $this->CI->input->ip_address()) + { + $this->sess_destroy(); + return FALSE; + } + + // Does the User Agent Match? + if ($this->sess_match_useragent == TRUE AND trim($session['user_agent']) != trim(substr($this->CI->input->user_agent(), 0, 50))) + { + $this->sess_destroy(); + return FALSE; + } + + // Is there a corresponding session in the DB? + if ($this->sess_use_database === TRUE) + { + $this->CI->db->where('session_id', $session['session_id']); + + if ($this->sess_match_ip == TRUE) + { + $this->CI->db->where('ip_address', $session['ip_address']); + } + + if ($this->sess_match_useragent == TRUE) + { + $this->CI->db->where('user_agent', $session['user_agent']); + } + + $query = $this->CI->db->get($this->sess_table_name); + + // No result? Kill it! + if ($query->num_rows() == 0) + { + $this->sess_destroy(); + return FALSE; + } + + // Is there custom data? If so, add it to the main session array + $row = $query->row(); + if (isset($row->user_data) AND $row->user_data != '') + { + $custom_data = $this->_unserialize($row->user_data); + + if (is_array($custom_data)) + { + foreach ($custom_data as $key => $val) + { + $session[$key] = $val; + } + } + } + } + + // Session is valid! + $this->userdata = $session; + unset($session); + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Write the session data + * + * @access public + * @return void + */ + function sess_write() + { + // Are we saving custom data to the DB? If not, all we do is update the cookie + if ($this->sess_use_database === FALSE) + { + $this->_set_cookie(); + return; + } + + // set the custom userdata, the session data we will set in a second + $custom_userdata = $this->userdata; + $cookie_userdata = array(); + + // Before continuing, we need to determine if there is any custom data to deal with. + // Let's determine this by removing the default indexes to see if there's anything left in the array + // and set the session data while we're at it + foreach (array('session_id','ip_address','user_agent','last_activity') as $val) + { + unset($custom_userdata[$val]); + $cookie_userdata[$val] = $this->userdata[$val]; + } + + // Did we find any custom data? If not, we turn the empty array into a string + // since there's no reason to serialize and store an empty array in the DB + if (count($custom_userdata) === 0) + { + $custom_userdata = ''; + } + else + { + // Serialize the custom data array so we can store it + $custom_userdata = $this->_serialize($custom_userdata); + } + + // Run the update query + $this->CI->db->where('session_id', $this->userdata['session_id']); + $this->CI->db->update($this->sess_table_name, array('last_activity' => $this->userdata['last_activity'], 'user_data' => $custom_userdata)); + + // Write the cookie. Notice that we manually pass the cookie data array to the + // _set_cookie() function. Normally that function will store $this->userdata, but + // in this case that array contains custom data, which we do not want in the cookie. + $this->_set_cookie($cookie_userdata); + } + + // -------------------------------------------------------------------- + + /** + * Create a new session + * + * @access public + * @return void + */ + function sess_create() + { + $sessid = ''; + while (strlen($sessid) < 32) + { + $sessid .= mt_rand(0, mt_getrandmax()); + } + + // To make the session ID even more secure we'll combine it with the user's IP + $sessid .= $this->CI->input->ip_address(); + + $this->userdata = array( + 'session_id' => md5(uniqid($sessid, TRUE)), + 'ip_address' => $this->CI->input->ip_address(), + 'user_agent' => substr($this->CI->input->user_agent(), 0, 50), + 'last_activity' => $this->now + ); + + + // Save the data to the DB if needed + if ($this->sess_use_database === TRUE) + { + $this->CI->db->query($this->CI->db->insert_string($this->sess_table_name, $this->userdata)); + } + + // Write the cookie + $this->_set_cookie(); + } + + // -------------------------------------------------------------------- + + /** + * Update an existing session + * + * @access public + * @return void + */ + function sess_update() + { + // We only update the session every five minutes by default + if (($this->userdata['last_activity'] + $this->sess_time_to_update) >= $this->now) + { + return; + } + + // Save the old session id so we know which record to + // update in the database if we need it + $old_sessid = $this->userdata['session_id']; + $new_sessid = ''; + while (strlen($new_sessid) < 32) + { + $new_sessid .= mt_rand(0, mt_getrandmax()); + } + + // To make the session ID even more secure we'll combine it with the user's IP + $new_sessid .= $this->CI->input->ip_address(); + + // Turn it into a hash + $new_sessid = md5(uniqid($new_sessid, TRUE)); + + // Update the session data in the session data array + $this->userdata['session_id'] = $new_sessid; + $this->userdata['last_activity'] = $this->now; + + // _set_cookie() will handle this for us if we aren't using database sessions + // by pushing all userdata to the cookie. + $cookie_data = NULL; + + // Update the session ID and last_activity field in the DB if needed + if ($this->sess_use_database === TRUE) + { + // set cookie explicitly to only have our session data + $cookie_data = array(); + foreach (array('session_id','ip_address','user_agent','last_activity') as $val) + { + $cookie_data[$val] = $this->userdata[$val]; + } + + $this->CI->db->query($this->CI->db->update_string($this->sess_table_name, array('last_activity' => $this->now, 'session_id' => $new_sessid), array('session_id' => $old_sessid))); + } + + // Write the cookie + $this->_set_cookie($cookie_data); + } + + // -------------------------------------------------------------------- + + /** + * Destroy the current session + * + * @access public + * @return void + */ + function sess_destroy() + { + // Kill the session DB row + if ($this->sess_use_database === TRUE AND isset($this->userdata['session_id'])) + { + $this->CI->db->where('session_id', $this->userdata['session_id']); + $this->CI->db->delete($this->sess_table_name); + } + + // Kill the cookie + setcookie( + $this->sess_cookie_name, + addslashes(serialize(array())), + ($this->now - 31500000), + $this->cookie_path, + $this->cookie_domain, + 0 + ); + } + + // -------------------------------------------------------------------- + + /** + * Fetch a specific item from the session array + * + * @access public + * @param string + * @return string + */ + function userdata($item) + { + return ( ! isset($this->userdata[$item])) ? FALSE : $this->userdata[$item]; + } + + // -------------------------------------------------------------------- + + /** + * Fetch all session data + * + * @access public + * @return mixed + */ + function all_userdata() + { + return ( ! isset($this->userdata)) ? FALSE : $this->userdata; + } + + // -------------------------------------------------------------------- + + /** + * Add or change data in the "userdata" array + * + * @access public + * @param mixed + * @param string + * @return void + */ + function set_userdata($newdata = array(), $newval = '') + { + if (is_string($newdata)) + { + $newdata = array($newdata => $newval); + } + + if (count($newdata) > 0) + { + foreach ($newdata as $key => $val) + { + $this->userdata[$key] = $val; + } + } + + $this->sess_write(); + } + + // -------------------------------------------------------------------- + + /** + * Delete a session variable from the "userdata" array + * + * @access array + * @return void + */ + function unset_userdata($newdata = array()) + { + if (is_string($newdata)) + { + $newdata = array($newdata => ''); + } + + if (count($newdata) > 0) + { + foreach ($newdata as $key => $val) + { + unset($this->userdata[$key]); + } + } + + $this->sess_write(); + } + + // ------------------------------------------------------------------------ + + /** + * Add or change flashdata, only available + * until the next request + * + * @access public + * @param mixed + * @param string + * @return void + */ + function set_flashdata($newdata = array(), $newval = '') + { + if (is_string($newdata)) + { + $newdata = array($newdata => $newval); + } + + if (count($newdata) > 0) + { + foreach ($newdata as $key => $val) + { + $flashdata_key = $this->flashdata_key.':new:'.$key; + $this->set_userdata($flashdata_key, $val); + } + } + } + + // ------------------------------------------------------------------------ + + /** + * Keeps existing flashdata available to next request. + * + * @access public + * @param string + * @return void + */ + function keep_flashdata($key) + { + // 'old' flashdata gets removed. Here we mark all + // flashdata as 'new' to preserve it from _flashdata_sweep() + // Note the function will return FALSE if the $key + // provided cannot be found + $old_flashdata_key = $this->flashdata_key.':old:'.$key; + $value = $this->userdata($old_flashdata_key); + + $new_flashdata_key = $this->flashdata_key.':new:'.$key; + $this->set_userdata($new_flashdata_key, $value); + } + + // ------------------------------------------------------------------------ + + /** + * Fetch a specific flashdata item from the session array + * + * @access public + * @param string + * @return string + */ + function flashdata($key) + { + $flashdata_key = $this->flashdata_key.':old:'.$key; + return $this->userdata($flashdata_key); + } + + // ------------------------------------------------------------------------ + + /** + * Identifies flashdata as 'old' for removal + * when _flashdata_sweep() runs. + * + * @access private + * @return void + */ + function _flashdata_mark() + { + $userdata = $this->all_userdata(); + foreach ($userdata as $name => $value) + { + $parts = explode(':new:', $name); + if (is_array($parts) && count($parts) === 2) + { + $new_name = $this->flashdata_key.':old:'.$parts[1]; + $this->set_userdata($new_name, $value); + $this->unset_userdata($name); + } + } + } + + // ------------------------------------------------------------------------ + + /** + * Removes all flashdata marked as 'old' + * + * @access private + * @return void + */ + + function _flashdata_sweep() + { + $userdata = $this->all_userdata(); + foreach ($userdata as $key => $value) + { + if (strpos($key, ':old:')) + { + $this->unset_userdata($key); + } + } + + } + + // -------------------------------------------------------------------- + + /** + * Get the "now" time + * + * @access private + * @return string + */ + function _get_time() + { + if (strtolower($this->time_reference) == 'gmt') + { + $now = time(); + $time = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now)); + } + else + { + $time = time(); + } + + return $time; + } + + // -------------------------------------------------------------------- + + /** + * Write the session cookie + * + * @access public + * @return void + */ + function _set_cookie($cookie_data = NULL) + { + if (is_null($cookie_data)) + { + $cookie_data = $this->userdata; + } + + // Serialize the userdata for the cookie + $cookie_data = $this->_serialize($cookie_data); + + if ($this->sess_encrypt_cookie == TRUE) + { + $cookie_data = $this->CI->encrypt->encode($cookie_data); + } + else + { + // if encryption is not used, we provide an md5 hash to prevent userside tampering + $cookie_data = $cookie_data.md5($cookie_data.$this->encryption_key); + } + + // Set the cookie + setcookie( + $this->sess_cookie_name, + $cookie_data, + $this->sess_expiration + time(), + $this->cookie_path, + $this->cookie_domain, + 0 + ); + } + + // -------------------------------------------------------------------- + + /** + * Serialize an array + * + * This function first converts any slashes found in the array to a temporary + * marker, so when it gets unserialized the slashes will be preserved + * + * @access private + * @param array + * @return string + */ + function _serialize($data) + { + if (is_array($data)) + { + foreach ($data as $key => $val) + { + $data[$key] = str_replace('\\', '{{slash}}', $val); + } + } + else + { + $data = str_replace('\\', '{{slash}}', $data); + } + + return serialize($data); + } + + // -------------------------------------------------------------------- + + /** + * Unserialize + * + * This function unserializes a data string, then converts any + * temporary slash markers back to actual slashes + * + * @access private + * @param array + * @return string + */ + function _unserialize($data) + { + $data = @unserialize(strip_slashes($data)); + + if (is_array($data)) + { + foreach ($data as $key => $val) + { + $data[$key] = str_replace('{{slash}}', '\\', $val); + } + + return $data; + } + + return str_replace('{{slash}}', '\\', $data); + } + + // -------------------------------------------------------------------- + + /** + * Garbage collection + * + * This deletes expired session rows from database + * if the probability percentage is met + * + * @access public + * @return void + */ + function _sess_gc() + { + if ($this->sess_use_database != TRUE) + { + return; + } + + srand(time()); + if ((rand() % 100) < $this->gc_probability) + { + $expire = $this->now - $this->sess_expiration; + + $this->CI->db->where("last_activity < {$expire}"); + $this->CI->db->delete($this->sess_table_name); + + log_message('debug', 'Session garbage collection performed.'); + } + } + + +} +// END Session Class + +/* End of file Session.php */ /* Location: ./system/libraries/Session.php */ \ No newline at end of file diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 6a0f2ec3..3ff0d2f5 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -1,386 +1,385 @@ - tags - var $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul'; - - // Elements that should not have

    and
    tags within them. - var $skip_elements = 'p|pre|ol|ul|dl|object|table'; - - // Tags we want the parser to completely ignore when splitting the string. - var $inline_elements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var'; - - // whether or not to protect quotes within { curly braces } - var $protect_braced_quotes = FALSE; - - /** - * Nothing to do here... - * - */ - function CI_Typography() - { - } - - /** - * Auto Typography - * - * This function converts text, making it typographically correct: - * - Converts double spaces into paragraphs. - * - Converts single line breaks into
    tags - * - Converts single and double quotes into correctly facing curly quote entities. - * - Converts three dots into ellipsis. - * - Converts double dashes into em-dashes. - * - Converts two spaces into entities - * - * @access public - * @param string - * @param bool whether to reduce more then two consecutive newlines to two - * @return string - */ - function auto_typography($str, $reduce_linebreaks = FALSE) - { - if ($str == '') - { - return ''; - } - - // Standardize Newlines to make matching easier - if (strpos($str, "\r") !== FALSE) - { - $str = str_replace(array("\r\n", "\r"), "\n", $str); - } - - // Reduce line breaks. If there are more than two consecutive linebreaks - // we'll compress them down to a maximum of two since there's no benefit to more. - if ($reduce_linebreaks === TRUE) - { - $str = preg_replace("/\n\n+/", "\n\n", $str); - } - - // Convert quotes within tags to temporary markers. We don't want quotes converted - // within tags so we'll temporarily convert them to {@DQ} and {@SQ} - // and we don't want double dashes converted to emdash entities, so they are marked with {@DD} - // likewise double spaces are converted to {@NBS} to prevent entity conversion - if (preg_match_all("#\<.+?>#si", $str, $matches)) - { - for ($i = 0, $total = count($matches[0]); $i < $total; $i++) - { - $str = str_replace($matches[0][$i], - str_replace(array("'",'"','--',' '), array('{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'), $matches[0][$i]), - $str); - } - } - - if ($this->protect_braced_quotes === TRUE) - { - if (preg_match_all("#\{.+?}#si", $str, $matches)) - { - for ($i = 0, $total = count($matches[0]); $i < $total; $i++) - { - $str = str_replace($matches[0][$i], - str_replace(array("'",'"'), array('{@SQ}', '{@DQ}'), $matches[0][$i]), - $str); - } - } - } - - // Convert "ignore" tags to temporary marker. The parser splits out the string at every tag - // it encounters. Certain inline tags, like image tags, links, span tags, etc. will be - // adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG} - $str = preg_replace("#<(/*)(".$this->inline_elements.")([ >])#i", "{@TAG}\\1\\2\\3", $str); - - // Split the string at every tag. This expression creates an array with this prototype: - // - // [array] - // { - // [0] = - // [1] = Content... - // [2] = - // Etc... - // } - $chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY); - - // Build our finalized string. We cycle through the array, skipping tags, and processing the contained text - $str = ''; - $process = TRUE; - $paragraph = FALSE; - foreach ($chunks as $chunk) - { - // Are we dealing with a tag? If so, we'll skip the processing for this cycle. - // Well also set the "process" flag which allows us to skip 

     tags and a few other things.
-			if (preg_match("#<(/*)(".$this->block_elements.").*?\>#", $chunk, $match))
-			{
-				if (preg_match("#".$this->skip_elements."#", $match[2]))
-				{
-					$process =  ($match[1] == '/') ? TRUE : FALSE;
-				}
-				
-				$str .= $chunk;
-				continue;
-			}
-			elseif (preg_match('/<(\/?)([a-z]*).*?>/s', $chunk, $tagmatch))
-			{
-				if ($tagmatch[1] == '/' && $tagmatch[2] == $this->last_tag)
-				{
-					$process = FALSE;
-				}
-				else
-				{
-					$process = TRUE;
-					$this->last_tag = $tagmatch[2];					
-				}
-			}
-
-			if ($process == FALSE)
-			{
-				$str .= $chunk;
-				continue;
-			}
-			
-			//  Convert Newlines into 
     and 
     tags
-			$str .= $this->format_characters($this->_format_newlines($chunk));			
-		}
-
-		// is the whole of the content inside a block level element?
-		if ( ! preg_match("/^<(?:".$this->block_elements.")/i", $str, $match))
-		{
-			$str = "
    {$str}
    ";
-		}
-
-
-		// some special linebreak cleanup
-		$str = preg_replace_callback('#<(?!/|'.$this->block_elements.')([^>]*)>
    (.*?)
    <(\w*)#si', array($this, '_linebreak_cleanup'), $str);
-		
-		// and cleanup empty paragraph tags sitting between two closing tags
-		$str = preg_replace('#()
    (\s*)
    ()#si', '$1$2$3', $str);
-		
-		// Final clean up
-		$table = array(
-		
-						// If the user submitted their own paragraph tags within the text
-						// we will retain them instead of using our tags.
-						'/(*?]>)
    /'	=> '$1', // )+#'			=> '
    ',
-						'/(
    )+/'		=> '
    ',
-						'/(
    \W+
    )+/'	=> '
    ',
-						
-						// Clean up stray paragraph tags that appear before block level elements
-						'#
    <('.$this->block_elements.')#'	=> '<$1',
-						
-						// Clean up open paragraph tags that appear before block level elements
-						'#
    (\W)<('.$this->block_elements.')#'	=> '
    $1<$2',
-
-						// Clean up stray non-breaking spaces preceeding block elements
-						'#[  ]+<('.$this->block_elements.')#'	=> '  <$1',
-			
-						// Replace the temporary markers we added earlier
-						'/\{@TAG\}/'		=> '<',
-						'/\{@DQ\}/'			=> '"',
-						'/\{@SQ\}/'			=> "'",
-						'/\{@DD\}/'			=> '--',
-						'/\{@NBS\}/'		=> '  '
-
-						);
-
-		// Do we need to reduce empty lines?
-		if ($reduce_linebreaks === TRUE)
-		{
-			$table['#
    \n*
    #'] = '';
-		}
-		else
-		{
-			// If we have empty paragraph tags we add a non-breaking space
-			// otherwise most browsers won't treat them as true paragraphs
-			$table['#
    #'] = '
     
    ';
-		}
-	
-		return preg_replace(array_keys($table), $table, $str);
-
-	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Linebreak Cleanup
-	 *
-	 * Removes paragraph and line break tags inserted inbetween
-	 * inline content and a new opening block level element
-	 *
-	 * @access	private
-	 * @param	array
-	 * @return	string
-	 */
-	function _linebreak_cleanup($match)
-	{
-		if (in_array($match[3], explode('|', $this->block_elements)))
-		{
-			return "<{$match[1]}>".str_replace('
    ', '', $match[2])."<{$match[3]}";
-		}
-		else
-		{
-			return $match[0];
-		}
-	}
-
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Format Characters
-	 *
-	 * This function mainly converts double and single quotes
-	 * to curly entities, but it also converts em-dashes,
-	 * double spaces, and ampersands
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */
-	function format_characters($str)
-	{
-		static $table;
-		
-		if ( ! isset($table))
-		{
-	        $table = array(					
-							// nested smart quotes, opening and closing
-							// note that rules for grammar (English) allow only for two levels deep
-							// and that single quotes are _supposed_ to always be on the outside
-							// but we'll accommodate both
-							'/(^|\W|\s)\'"/'				=> '$1‘“',
-							'/\'"(\s|\W|$)/'				=> '’”$1',
-							'/(^|\W|\s)"\'/'				=> '$1“‘',
-							'/"\'(\s|\W|$)/'				=> '”’$1',
-
-							// single quote smart quotes
-							'/\'(\s|\W|$)/'					=> '’$1',
-							'/(^|\W|\s)\'/'					=> '$1‘',
-
-							// double quote smart quotes
-							'/"(\s|\W|$)/'					=> '”$1',
-							'/(^|\W|\s)"/'					=> '$1“',
-
-							// apostrophes
-							"/(\w)'(\w)/"       	    	=> '$1’$2',
-
-							// Em dash and ellipses dots
-							'/\s?\-\-\s?/'					=> '—',
-							'/(\w)\.{3}/'					=> '$1…',
-
-							// double space after sentences
-							'/(\W)  /'						=> '$1  ',
-
-							// ampersands, if not a character entity
-							'/&(?!#?[a-zA-Z0-9]{2,};)/'		=> '&'
-	        			);			
-		}	
-
-		return preg_replace(array_keys($table), $table, $str);
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Format Newlines
-	 *
-	 * Converts newline characters into either 
     tags or 
    
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */	
-	function _format_newlines($str)
-	{
-		if ($str == '')
-		{
-			return $str;
-		}
-
-		if (strpos($str, "\n") === FALSE)
-		{
-			return $str;
-		}
-		
-		// Convert two consecutive newlines to paragraphs
-		$str = str_replace("\n\n", "
    \n\n
    ", $str);
-		
-		// Convert single spaces to 
     tags
-		$str = preg_replace("/([^\n])(\n)([^\n])/", "\\1
    \\2\\3", $str);
-		
-		// Wrap the whole enchilada in enclosing paragraphs
-		if ($str != "\n")
-		{
-			$str =  '
    '.$str.'
    ';
-		}
-
-		// Remove empty paragraphs if they are on the first line, as this
-		// is a potential unintended consequence of the previous code
-		$str = preg_replace("/
    <\/p>(.*)/", "\\1", $str, 1);
-		
-		return $str;
-	}
-	
-	// ------------------------------------------------------------------------
-	
-	/**
-	 * Convert newlines to HTML line breaks except within PRE tags
-	 *
-	 * @access	public
-	 * @param	string
-	 * @return	string
-	 */		
-	function nl2br_except_pre($str)
-	{
-		$ex = explode("pre>",$str);
-		$ct = count($ex);
-	
-		$newstr = "";
-		for ($i = 0; $i < $ct; $i++)
-		{
-			if (($i % 2) == 0)
-			{
-				$newstr .= nl2br($ex[$i]);
-			}
-			else
-			{
-				$newstr .= $ex[$i];
-			}
-		
-			if ($ct - 1 != $i)
-				$newstr .= "pre>";
-		}
-	
-		return $newstr;
-	}
-	
-}
-// END Typography Class
-
-/* End of file Typography.php */
+ tags
+	var $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul';
+	
+	// Elements that should not have 
     and 
     tags within them.
+	var $skip_elements	= 'p|pre|ol|ul|dl|object|table';
+	
+	// Tags we want the parser to completely ignore when splitting the string.
+	var $inline_elements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var';
+
+	// whether or not to protect quotes within { curly braces }
+	var $protect_braced_quotes = FALSE;
+	
+	/**
+	 * Nothing to do here...
+	 *
+	 */
+	function CI_Typography()
+	{
+	}
+
+	/**
+	 * Auto Typography
+	 *
+	 * This function converts text, making it typographically correct:
+	 * 	- Converts double spaces into paragraphs.
+	 * 	- Converts single line breaks into 
     tags
+	 * 	- Converts single and double quotes into correctly facing curly quote entities.
+	 * 	- Converts three dots into ellipsis.
+	 * 	- Converts double dashes into em-dashes.
+	 *  - Converts two spaces into entities
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool	whether to reduce more then two consecutive newlines to two
+	 * @return	string
+	 */
+	function auto_typography($str, $reduce_linebreaks = FALSE)
+	{
+		if ($str == '')
+		{
+			return '';
+		}
+
+		// Standardize Newlines to make matching easier
+		if (strpos($str, "\r") !== FALSE)
+		{
+			$str = str_replace(array("\r\n", "\r"), "\n", $str);			
+		}
+			
+		// Reduce line breaks.  If there are more than two consecutive linebreaks
+		// we'll compress them down to a maximum of two since there's no benefit to more.
+		if ($reduce_linebreaks === TRUE)
+		{
+			$str = preg_replace("/\n\n+/", "\n\n", $str);
+		} 
+
+		// Convert quotes within tags to temporary markers. We don't want quotes converted 
+		// within tags so we'll temporarily convert them to {@DQ} and {@SQ}
+		// and we don't want double dashes converted to emdash entities, so they are marked with {@DD}
+		// likewise double spaces are converted to {@NBS} to prevent entity conversion
+		if (preg_match_all("#\<.+?>#si", $str, $matches))
+		{
+			for ($i = 0, $total = count($matches[0]); $i < $total; $i++)
+			{
+				$str = str_replace($matches[0][$i],
+									str_replace(array("'",'"','--','  '), array('{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'), $matches[0][$i]),
+									$str);
+			}
+		}
+		
+		if ($this->protect_braced_quotes === TRUE)
+		{
+			if (preg_match_all("#\{.+?}#si", $str, $matches))
+			{
+				for ($i = 0, $total = count($matches[0]); $i < $total; $i++)
+				{
+					$str = str_replace($matches[0][$i],
+										str_replace(array("'",'"'), array('{@SQ}', '{@DQ}'), $matches[0][$i]),
+										$str);
+				}
+			}			
+		}
+		
+		// Convert "ignore" tags to temporary marker.  The parser splits out the string at every tag 
+		// it encounters.  Certain inline tags, like image tags, links, span tags, etc. will be 
+		// adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG}
+		$str = preg_replace("#<(/*)(".$this->inline_elements.")([ >])#i", "{@TAG}\\1\\2\\3", $str);
+
+		// Split the string at every tag.  This expression creates an array with this prototype:
+		// 
+		// 	[array]
+		// 	{
+		// 		[0] = 
+		// 		[1] = Content...
+		// 		[2] = 
+		// 		Etc...
+		// 	}	
+		$chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+		
+		// Build our finalized string.  We cycle through the array, skipping tags, and processing the contained text	
+		$str = '';
+		$process = TRUE;
+		$paragraph = FALSE;
+		foreach ($chunks as $chunk)
+		{
+			// Are we dealing with a tag? If so, we'll skip the processing for this cycle.
+			// Well also set the "process" flag which allows us to skip 
     tags and a few other things.
+			if (preg_match("#<(/*)(".$this->block_elements.").*?>#", $chunk, $match))
+			{
+				if (preg_match("#".$this->skip_elements."#", $match[2]))
+				{
+					$process =  ($match[1] == '/') ? TRUE : FALSE;
+				}
+				
+				$str .= $chunk;
+				continue;
+			}
+			elseif (preg_match('/<(\/?)([a-z]*).*?>/s', $chunk, $tagmatch))
+			{
+				if ($tagmatch[1] == '/' && $tagmatch[2] == $this->last_tag)
+				{
+					$process = FALSE;
+				}
+				else
+				{
+					$process = TRUE;
+					$this->last_tag = $tagmatch[2];					
+				}
+			}
+
+			if ($process == FALSE)
+			{
+				$str .= $chunk;
+				continue;
+			}
+			
+			//  Convert Newlines into 
     and 
     tags
+			$str .= $this->format_characters($this->_format_newlines($chunk));			
+		}
+
+		// is the whole of the content inside a block level element?
+		if ( ! preg_match("/^<(?:".$this->block_elements.")/i", $str, $match))
+		{
+			$str = "
    {$str}
    ";
+		}
+
+
+		// some special linebreak cleanup
+		$str = preg_replace_callback('#<(?!/|'.$this->block_elements.')([^>]*)>
    (.*?)
    <(\w*)#si', array($this, '_linebreak_cleanup'), $str);
+		
+		// and cleanup empty paragraph tags sitting between two closing tags
+		$str = preg_replace('#()
    (\s*)
    ()#si', '$1$2$3', $str);
+		
+		// Final clean up
+		$table = array(
+		
+						// If the user submitted their own paragraph tags within the text
+						// we will retain them instead of using our tags.
+						'/(*?]>)
    /'	=> '$1', // )+#'			=> '
    ',
+						'/(
    \W*
    )+/'	=> '
    ',
+						
+						// Clean up stray paragraph tags that appear before block level elements
+						'#
    <('.$this->block_elements.')#'	=> '<$1',
+						
+						// Clean up open paragraph tags that appear before block level elements
+						'#
    (\W)<('.$this->block_elements.')#'	=> '
    $1<$2',
+
+						// Clean up stray non-breaking spaces preceeding block elements
+						'#[  ]+<('.$this->block_elements.')#'	=> '  <$1',
+			
+						// Replace the temporary markers we added earlier
+						'/\{@TAG\}/'		=> '<',
+						'/\{@DQ\}/'			=> '"',
+						'/\{@SQ\}/'			=> "'",
+						'/\{@DD\}/'			=> '--',
+						'/\{@NBS\}/'		=> '  '
+
+						);
+
+		// Do we need to reduce empty lines?
+		if ($reduce_linebreaks === TRUE)
+		{
+			$table['#
    \n*
    #'] = '';
+		}
+		else
+		{
+			// If we have empty paragraph tags we add a non-breaking space
+			// otherwise most browsers won't treat them as true paragraphs
+			$table['#
    #'] = '
     
    ';
+		}
+	
+		return preg_replace(array_keys($table), $table, $str);
+
+	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Linebreak Cleanup
+	 *
+	 * Removes paragraph and line break tags inserted inbetween
+	 * inline content and a new opening block level element
+	 *
+	 * @access	private
+	 * @param	array
+	 * @return	string
+	 */
+	function _linebreak_cleanup($match)
+	{
+		if (in_array($match[3], explode('|', $this->block_elements)))
+		{
+			return "<{$match[1]}>".str_replace('
    ', '', $match[2])."<{$match[3]}";
+		}
+		else
+		{
+			return $match[0];
+		}
+	}
+
+	// --------------------------------------------------------------------
+	
+	/**
+	 * Format Characters
+	 *
+	 * This function mainly converts double and single quotes
+	 * to curly entities, but it also converts em-dashes,
+	 * double spaces, and ampersands
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
+	function format_characters($str)
+	{
+		static $table;
+		
+		if ( ! isset($table))
+		{
+	        $table = array(					
+							// nested smart quotes, opening and closing
+							// note that rules for grammar (English) allow only for two levels deep
+							// and that single quotes are _supposed_ to always be on the outside
+							// but we'll accommodate both
+							'/(^|\W|\s)\'"/'				=> '$1‘“',
+							'/\'"(\s|\W|$)/'				=> '’”$1',
+							'/(^|\W|\s)"\'/'				=> '$1“‘',
+							'/"\'(\s|\W|$)/'				=> '”’$1',
+
+							// single quote smart quotes
+							'/\'(\s|\W|$)/'					=> '’$1',
+							'/(^|\W|\s)\'/'					=> '$1‘',
+
+							// double quote smart quotes
+							'/"(\s|\W|$)/'					=> '”$1',
+							'/(^|\W|\s)"/'					=> '$1“',
+
+							// apostrophes
+							"/(\w)'(\w)/"       	    	=> '$1’$2',
+
+							// Em dash and ellipses dots
+							'/\s?\-\-\s?/'					=> '—',
+							'/(\w)\.{3}/'					=> '$1…',
+
+							// double space after sentences
+							'/(\W)  /'						=> '$1  ',
+
+							// ampersands, if not a character entity
+							'/&(?!#?[a-zA-Z0-9]{2,};)/'		=> '&'
+	        			);			
+		}	
+
+		return preg_replace(array_keys($table), $table, $str);
+	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Format Newlines
+	 *
+	 * Converts newline characters into either 
     tags or 
    
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */	
+	function _format_newlines($str)
+	{
+		if ($str == '')
+		{
+			return $str;
+		}
+
+		if (strpos($str, "\n") === FALSE)
+		{
+			return $str;
+		}
+		
+		// Convert two consecutive newlines to paragraphs
+		$str = str_replace("\n\n", "
    \n\n
    ", $str);
+		
+		// Convert single spaces to 
     tags
+		$str = preg_replace("/([^\n])(\n)([^\n])/", "\\1
    \\2\\3", $str);
+		
+		// Wrap the whole enchilada in enclosing paragraphs
+		if ($str != "\n")
+		{
+			$str =  '
    '.$str.'
    ';
+		}
+
+		// Remove empty paragraphs if they are on the first line, as this
+		// is a potential unintended consequence of the previous code
+		$str = preg_replace("/
    <\/p>(.*)/", "\\1", $str, 1);
+		
+		return $str;
+	}
+	
+	// ------------------------------------------------------------------------
+	
+	/**
+	 * Convert newlines to HTML line breaks except within PRE tags
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */		
+	function nl2br_except_pre($str)
+	{
+		$ex = explode("pre>",$str);
+		$ct = count($ex);
+	
+		$newstr = "";
+		for ($i = 0; $i < $ct; $i++)
+		{
+			if (($i % 2) == 0)
+			{
+				$newstr .= nl2br($ex[$i]);
+			}
+			else
+			{
+				$newstr .= $ex[$i];
+			}
+		
+			if ($ct - 1 != $i)
+				$newstr .= "pre>";
+		}
+	
+		return $newstr;
+	}
+	
+}
+// END Typography Class
+
+/* End of file Typography.php */
 /* Location: ./system/libraries/Typography.php */
\ No newline at end of file
diff --git a/system/libraries/URI.php b/system/libraries/URI.php
index aa2d71e8..b27dfa3c 100644
--- a/system/libraries/URI.php
+++ b/system/libraries/URI.php
@@ -1,585 +1,585 @@
-config =& load_class('Config');
-		log_message('debug', "URI Class Initialized");
-	}
-
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get the URI String
-	 *
-	 * @access	private
-	 * @return	string
-	 */
-	function _fetch_uri_string()
-	{
-		if (strtoupper($this->config->item('uri_protocol')) == 'AUTO')
-		{
-			// If the URL has a question mark then it's simplest to just
-			// build the URI string from the zero index of the $_GET array.
-			// This avoids having to deal with $_SERVER variables, which
-			// can be unreliable in some environments
-			if (is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '')
-			{
-				$this->uri_string = key($_GET);
-				return;
-			}
-
-			// Is there a PATH_INFO variable?
-			// Note: some servers seem to have trouble with getenv() so we'll test it two ways
-			$path = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO');
-			if (trim($path, '/') != '' && $path != "/".SELF)
-			{
-				$this->uri_string = $path;
-				return;
-			}
-
-			// No PATH_INFO?... What about QUERY_STRING?
-			$path =  (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
-			if (trim($path, '/') != '')
-			{
-				$this->uri_string = $path;
-				return;
-			}
-
-			// No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists?
-			$path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO');
-			if (trim($path, '/') != '' && $path != "/".SELF)
-			{
-				// remove path and script information so we have good URI data
-				$this->uri_string = str_replace($_SERVER['SCRIPT_NAME'], '', $path);
-				return;
-			}
-
-			// We've exhausted all our options...
-			$this->uri_string = '';
-		}
-		else
-		{
-			$uri = strtoupper($this->config->item('uri_protocol'));
-
-			if ($uri == 'REQUEST_URI')
-			{
-				$this->uri_string = $this->_parse_request_uri();
-				return;
-			}
-
-			$this->uri_string = (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri);
-		}
-
-		// If the URI contains only a slash we'll kill it
-		if ($this->uri_string == '/')
-		{
-			$this->uri_string = '';
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Parse the REQUEST_URI
-	 *
-	 * Due to the way REQUEST_URI works it usually contains path info
-	 * that makes it unusable as URI data.  We'll trim off the unnecessary
-	 * data, hopefully arriving at a valid URI that we can use.
-	 *
-	 * @access	private
-	 * @return	string
-	 */
-	function _parse_request_uri()
-	{
-		if ( ! isset($_SERVER['REQUEST_URI']) OR $_SERVER['REQUEST_URI'] == '')
-		{
-			return '';
-		}
-
-		$request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI']));
-
-		if ($request_uri == '' OR $request_uri == SELF)
-		{
-			return '';
-		}
-
-		$fc_path = FCPATH;
-		if (strpos($request_uri, '?') !== FALSE)
-		{
-			$fc_path .= '?';
-		}
-
-		$parsed_uri = explode("/", $request_uri);
-
-		$i = 0;
-		foreach(explode("/", $fc_path) as $segment)
-		{
-			if (isset($parsed_uri[$i]) && $segment == $parsed_uri[$i])
-			{
-				$i++;
-			}
-		}
-
-		$parsed_uri = implode("/", array_slice($parsed_uri, $i));
-
-		if ($parsed_uri != '')
-		{
-			$parsed_uri = '/'.$parsed_uri;
-		}
-
-		return $parsed_uri;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Filter segments for malicious characters
-	 *
-	 * @access	private
-	 * @param	string
-	 * @return	string
-	 */
-	function _filter_uri($str)
-	{
-		if ($str != '' && $this->config->item('permitted_uri_chars') != '' && $this->config->item('enable_query_strings') == FALSE)
-		{
-			if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str))
-			{
-				header('HTTP/1.1 400 Bad Request');
-				exit('The URI you submitted has disallowed characters.');
-			}
-		}
-
-		// Convert programatic characters to entities
-		$bad	= array('$', 		'(', 		')',	 	'%28', 		'%29');
-		$good	= array('$',	'(',	')',	'(',	')');
-
-		return str_replace($bad, $good, $str);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Remove the suffix from the URL if needed
-	 *
-	 * @access	private
-	 * @return	void
-	 */
-	function _remove_url_suffix()
-	{
-		if  ($this->config->item('url_suffix') != "")
-		{
-			$this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string);
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Explode the URI Segments. The individual segments will
-	 * be stored in the $this->segments array.
-	 *
-	 * @access	private
-	 * @return	void
-	 */
-	function _explode_segments()
-	{
-		foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val)
-		{
-			// Filter segments for security
-			$val = trim($this->_filter_uri($val));
-
-			if ($val != '')
-			{
-				$this->segments[] = $val;
-			}
-		}
-	}
-
-	// --------------------------------------------------------------------
-	/**
-	 * Re-index Segments
-	 *
-	 * This function re-indexes the $this->segment array so that it
-	 * starts at 1 rather than 0.  Doing so makes it simpler to
-	 * use functions like $this->uri->segment(n) since there is
-	 * a 1:1 relationship between the segment array and the actual segments.
-	 *
-	 * @access	private
-	 * @return	void
-	 */
-	function _reindex_segments()
-	{
-		array_unshift($this->segments, NULL);
-		array_unshift($this->rsegments, NULL);
-		unset($this->segments[0]);
-		unset($this->rsegments[0]);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Fetch a URI Segment
-	 *
-	 * This function returns the URI segment based on the number provided.
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @param	bool
-	 * @return	string
-	 */
-	function segment($n, $no_result = FALSE)
-	{
-		return ( ! isset($this->segments[$n])) ? $no_result : $this->segments[$n];
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Fetch a URI "routed" Segment
-	 *
-	 * This function returns the re-routed URI segment (assuming routing rules are used)
-	 * based on the number provided.  If there is no routing this function returns the
-	 * same result as $this->segment()
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @param	bool
-	 * @return	string
-	 */
-	function rsegment($n, $no_result = FALSE)
-	{
-		return ( ! isset($this->rsegments[$n])) ? $no_result : $this->rsegments[$n];
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Generate a key value pair from the URI string
-	 *
-	 * This function generates and associative array of URI data starting
-	 * at the supplied segment. For example, if this is your URI:
-	 *
-	 *	example.com/user/search/name/joe/location/UK/gender/male
-	 *
-	 * You can use this function to generate an array with this prototype:
-	 *
-	 * array (
-	 *			name => joe
-	 *			location => UK
-	 *			gender => male
-	 *		 )
-	 *
-	 * @access	public
-	 * @param	integer	the starting segment number
-	 * @param	array	an array of default values
-	 * @return	array
-	 */
-	function uri_to_assoc($n = 3, $default = array())
-	{
-	 	return $this->_uri_to_assoc($n, $default, 'segment');
-	}
-	/**
-	 * Identical to above only it uses the re-routed segment array
-	 *
-	 */
-	function ruri_to_assoc($n = 3, $default = array())
-	{
-	 	return $this->_uri_to_assoc($n, $default, 'rsegment');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Generate a key value pair from the URI string or Re-routed URI string
-	 *
-	 * @access	private
-	 * @param	integer	the starting segment number
-	 * @param	array	an array of default values
-	 * @param	string	which array we should use
-	 * @return	array
-	 */
-	function _uri_to_assoc($n = 3, $default = array(), $which = 'segment')
-	{
-		if ($which == 'segment')
-		{
-			$total_segments = 'total_segments';
-			$segment_array = 'segment_array';
-		}
-		else
-		{
-			$total_segments = 'total_rsegments';
-			$segment_array = 'rsegment_array';
-		}
-
-		if ( ! is_numeric($n))
-		{
-			return $default;
-		}
-
-		if (isset($this->keyval[$n]))
-		{
-			return $this->keyval[$n];
-		}
-
-		if ($this->$total_segments() < $n)
-		{
-			if (count($default) == 0)
-			{
-				return array();
-			}
-
-			$retval = array();
-			foreach ($default as $val)
-			{
-				$retval[$val] = FALSE;
-			}
-			return $retval;
-		}
-
-		$segments = array_slice($this->$segment_array(), ($n - 1));
-
-		$i = 0;
-		$lastval = '';
-		$retval  = array();
-		foreach ($segments as $seg)
-		{
-			if ($i % 2)
-			{
-				$retval[$lastval] = $seg;
-			}
-			else
-			{
-				$retval[$seg] = FALSE;
-				$lastval = $seg;
-			}
-
-			$i++;
-		}
-
-		if (count($default) > 0)
-		{
-			foreach ($default as $val)
-			{
-				if ( ! array_key_exists($val, $retval))
-				{
-					$retval[$val] = FALSE;
-				}
-			}
-		}
-
-		// Cache the array for reuse
-		$this->keyval[$n] = $retval;
-		return $retval;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Generate a URI string from an associative array
-	 *
-	 *
-	 * @access	public
-	 * @param	array	an associative array of key/values
-	 * @return	array
-	 */
-	function assoc_to_uri($array)
-	{
-		$temp = array();
-		foreach ((array)$array as $key => $val)
-		{
-			$temp[] = $key;
-			$temp[] = $val;
-		}
-
-		return implode('/', $temp);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Fetch a URI Segment and add a trailing slash
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @param	string
-	 * @return	string
-	 */
-	function slash_segment($n, $where = 'trailing')
-	{
-		return $this->_slash_segment($n, $where, 'segment');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Fetch a URI Segment and add a trailing slash
-	 *
-	 * @access	public
-	 * @param	integer
-	 * @param	string
-	 * @return	string
-	 */
-	function slash_rsegment($n, $where = 'trailing')
-	{
-		return $this->_slash_segment($n, $where, 'rsegment');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Fetch a URI Segment and add a trailing slash - helper function
-	 *
-	 * @access	private
-	 * @param	integer
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */
-	function _slash_segment($n, $where = 'trailing', $which = 'segment')
-	{
-		if ($where == 'trailing')
-		{
-			$trailing	= '/';
-			$leading	= '';
-		}
-		elseif ($where == 'leading')
-		{
-			$leading	= '/';
-			$trailing	= '';
-		}
-		else
-		{
-			$leading	= '/';
-			$trailing	= '/';
-		}
-		return $leading.$this->$which($n).$trailing;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Segment Array
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	function segment_array()
-	{
-		return $this->segments;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Routed Segment Array
-	 *
-	 * @access	public
-	 * @return	array
-	 */
-	function rsegment_array()
-	{
-		return $this->rsegments;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Total number of segments
-	 *
-	 * @access	public
-	 * @return	integer
-	 */
-	function total_segments()
-	{
-		return count($this->segments);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Total number of routed segments
-	 *
-	 * @access	public
-	 * @return	integer
-	 */
-	function total_rsegments()
-	{
-		return count($this->rsegments);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Fetch the entire URI string
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	function uri_string()
-	{
-		return $this->uri_string;
-	}
-
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Fetch the entire Re-routed URI string
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	function ruri_string()
-	{
-		return '/'.implode('/', $this->rsegment_array()).'/';
-	}
-
-}
-// END URI Class
-
-/* End of file URI.php */
+config =& load_class('Config');
+		log_message('debug', "URI Class Initialized");
+	}
+
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Get the URI String
+	 *
+	 * @access	private
+	 * @return	string
+	 */
+	function _fetch_uri_string()
+	{
+		if (strtoupper($this->config->item('uri_protocol')) == 'AUTO')
+		{
+			// If the URL has a question mark then it's simplest to just
+			// build the URI string from the zero index of the $_GET array.
+			// This avoids having to deal with $_SERVER variables, which
+			// can be unreliable in some environments
+			if (is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '')
+			{
+				$this->uri_string = key($_GET);
+				return;
+			}
+
+			// Is there a PATH_INFO variable?
+			// Note: some servers seem to have trouble with getenv() so we'll test it two ways
+			$path = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO');
+			if (trim($path, '/') != '' && $path != "/".SELF)
+			{
+				$this->uri_string = $path;
+				return;
+			}
+
+			// No PATH_INFO?... What about QUERY_STRING?
+			$path =  (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
+			if (trim($path, '/') != '')
+			{
+				$this->uri_string = $path;
+				return;
+			}
+
+			// No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists?
+			$path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO');
+			if (trim($path, '/') != '' && $path != "/".SELF)
+			{
+				// remove path and script information so we have good URI data
+				$this->uri_string = str_replace($_SERVER['SCRIPT_NAME'], '', $path);
+				return;
+			}
+
+			// We've exhausted all our options...
+			$this->uri_string = '';
+		}
+		else
+		{
+			$uri = strtoupper($this->config->item('uri_protocol'));
+
+			if ($uri == 'REQUEST_URI')
+			{
+				$this->uri_string = $this->_parse_request_uri();
+				return;
+			}
+
+			$this->uri_string = (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri);
+		}
+
+		// If the URI contains only a slash we'll kill it
+		if ($this->uri_string == '/')
+		{
+			$this->uri_string = '';
+		}
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Parse the REQUEST_URI
+	 *
+	 * Due to the way REQUEST_URI works it usually contains path info
+	 * that makes it unusable as URI data.  We'll trim off the unnecessary
+	 * data, hopefully arriving at a valid URI that we can use.
+	 *
+	 * @access	private
+	 * @return	string
+	 */
+	function _parse_request_uri()
+	{
+		if ( ! isset($_SERVER['REQUEST_URI']) OR $_SERVER['REQUEST_URI'] == '')
+		{
+			return '';
+		}
+
+		$request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI']));
+
+		if ($request_uri == '' OR $request_uri == SELF)
+		{
+			return '';
+		}
+
+		$fc_path = FCPATH;
+		if (strpos($request_uri, '?') !== FALSE)
+		{
+			$fc_path .= '?';
+		}
+
+		$parsed_uri = explode("/", $request_uri);
+
+		$i = 0;
+		foreach(explode("/", $fc_path) as $segment)
+		{
+			if (isset($parsed_uri[$i]) && $segment == $parsed_uri[$i])
+			{
+				$i++;
+			}
+		}
+
+		$parsed_uri = implode("/", array_slice($parsed_uri, $i));
+
+		if ($parsed_uri != '')
+		{
+			$parsed_uri = '/'.$parsed_uri;
+		}
+
+		return $parsed_uri;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Filter segments for malicious characters
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */
+	function _filter_uri($str)
+	{
+		if ($str != '' && $this->config->item('permitted_uri_chars') != '' && $this->config->item('enable_query_strings') == FALSE)
+		{
+			if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str))
+			{
+				header('HTTP/1.1 400 Bad Request');
+				exit('The URI you submitted has disallowed characters.');
+			}
+		}
+
+		// Convert programatic characters to entities
+		$bad	= array('$', 		'(', 		')',	 	'%28', 		'%29');
+		$good	= array('$',	'(',	')',	'(',	')');
+
+		return str_replace($bad, $good, $str);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Remove the suffix from the URL if needed
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _remove_url_suffix()
+	{
+		if  ($this->config->item('url_suffix') != "")
+		{
+			$this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string);
+		}
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Explode the URI Segments. The individual segments will
+	 * be stored in the $this->segments array.
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _explode_segments()
+	{
+		foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val)
+		{
+			// Filter segments for security
+			$val = trim($this->_filter_uri($val));
+
+			if ($val != '')
+			{
+				$this->segments[] = $val;
+			}
+		}
+	}
+
+	// --------------------------------------------------------------------
+	/**
+	 * Re-index Segments
+	 *
+	 * This function re-indexes the $this->segment array so that it
+	 * starts at 1 rather than 0.  Doing so makes it simpler to
+	 * use functions like $this->uri->segment(n) since there is
+	 * a 1:1 relationship between the segment array and the actual segments.
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	function _reindex_segments()
+	{
+		array_unshift($this->segments, NULL);
+		array_unshift($this->rsegments, NULL);
+		unset($this->segments[0]);
+		unset($this->rsegments[0]);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch a URI Segment
+	 *
+	 * This function returns the URI segment based on the number provided.
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @param	bool
+	 * @return	string
+	 */
+	function segment($n, $no_result = FALSE)
+	{
+		return ( ! isset($this->segments[$n])) ? $no_result : $this->segments[$n];
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch a URI "routed" Segment
+	 *
+	 * This function returns the re-routed URI segment (assuming routing rules are used)
+	 * based on the number provided.  If there is no routing this function returns the
+	 * same result as $this->segment()
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @param	bool
+	 * @return	string
+	 */
+	function rsegment($n, $no_result = FALSE)
+	{
+		return ( ! isset($this->rsegments[$n])) ? $no_result : $this->rsegments[$n];
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Generate a key value pair from the URI string
+	 *
+	 * This function generates and associative array of URI data starting
+	 * at the supplied segment. For example, if this is your URI:
+	 *
+	 *	example.com/user/search/name/joe/location/UK/gender/male
+	 *
+	 * You can use this function to generate an array with this prototype:
+	 *
+	 * array (
+	 *			name => joe
+	 *			location => UK
+	 *			gender => male
+	 *		 )
+	 *
+	 * @access	public
+	 * @param	integer	the starting segment number
+	 * @param	array	an array of default values
+	 * @return	array
+	 */
+	function uri_to_assoc($n = 3, $default = array())
+	{
+	 	return $this->_uri_to_assoc($n, $default, 'segment');
+	}
+	/**
+	 * Identical to above only it uses the re-routed segment array
+	 *
+	 */
+	function ruri_to_assoc($n = 3, $default = array())
+	{
+	 	return $this->_uri_to_assoc($n, $default, 'rsegment');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Generate a key value pair from the URI string or Re-routed URI string
+	 *
+	 * @access	private
+	 * @param	integer	the starting segment number
+	 * @param	array	an array of default values
+	 * @param	string	which array we should use
+	 * @return	array
+	 */
+	function _uri_to_assoc($n = 3, $default = array(), $which = 'segment')
+	{
+		if ($which == 'segment')
+		{
+			$total_segments = 'total_segments';
+			$segment_array = 'segment_array';
+		}
+		else
+		{
+			$total_segments = 'total_rsegments';
+			$segment_array = 'rsegment_array';
+		}
+
+		if ( ! is_numeric($n))
+		{
+			return $default;
+		}
+
+		if (isset($this->keyval[$n]))
+		{
+			return $this->keyval[$n];
+		}
+
+		if ($this->$total_segments() < $n)
+		{
+			if (count($default) == 0)
+			{
+				return array();
+			}
+
+			$retval = array();
+			foreach ($default as $val)
+			{
+				$retval[$val] = FALSE;
+			}
+			return $retval;
+		}
+
+		$segments = array_slice($this->$segment_array(), ($n - 1));
+
+		$i = 0;
+		$lastval = '';
+		$retval  = array();
+		foreach ($segments as $seg)
+		{
+			if ($i % 2)
+			{
+				$retval[$lastval] = $seg;
+			}
+			else
+			{
+				$retval[$seg] = FALSE;
+				$lastval = $seg;
+			}
+
+			$i++;
+		}
+
+		if (count($default) > 0)
+		{
+			foreach ($default as $val)
+			{
+				if ( ! array_key_exists($val, $retval))
+				{
+					$retval[$val] = FALSE;
+				}
+			}
+		}
+
+		// Cache the array for reuse
+		$this->keyval[$n] = $retval;
+		return $retval;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Generate a URI string from an associative array
+	 *
+	 *
+	 * @access	public
+	 * @param	array	an associative array of key/values
+	 * @return	array
+	 */
+	function assoc_to_uri($array)
+	{
+		$temp = array();
+		foreach ((array)$array as $key => $val)
+		{
+			$temp[] = $key;
+			$temp[] = $val;
+		}
+
+		return implode('/', $temp);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch a URI Segment and add a trailing slash
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @param	string
+	 * @return	string
+	 */
+	function slash_segment($n, $where = 'trailing')
+	{
+		return $this->_slash_segment($n, $where, 'segment');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch a URI Segment and add a trailing slash
+	 *
+	 * @access	public
+	 * @param	integer
+	 * @param	string
+	 * @return	string
+	 */
+	function slash_rsegment($n, $where = 'trailing')
+	{
+		return $this->_slash_segment($n, $where, 'rsegment');
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch a URI Segment and add a trailing slash - helper function
+	 *
+	 * @access	private
+	 * @param	integer
+	 * @param	string
+	 * @param	string
+	 * @return	string
+	 */
+	function _slash_segment($n, $where = 'trailing', $which = 'segment')
+	{
+		if ($where == 'trailing')
+		{
+			$trailing	= '/';
+			$leading	= '';
+		}
+		elseif ($where == 'leading')
+		{
+			$leading	= '/';
+			$trailing	= '';
+		}
+		else
+		{
+			$leading	= '/';
+			$trailing	= '/';
+		}
+		return $leading.$this->$which($n).$trailing;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Segment Array
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	function segment_array()
+	{
+		return $this->segments;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Routed Segment Array
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	function rsegment_array()
+	{
+		return $this->rsegments;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Total number of segments
+	 *
+	 * @access	public
+	 * @return	integer
+	 */
+	function total_segments()
+	{
+		return count($this->segments);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Total number of routed segments
+	 *
+	 * @access	public
+	 * @return	integer
+	 */
+	function total_rsegments()
+	{
+		return count($this->rsegments);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch the entire URI string
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function uri_string()
+	{
+		return $this->uri_string;
+	}
+
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch the entire Re-routed URI string
+	 *
+	 * @access	public
+	 * @return	string
+	 */
+	function ruri_string()
+	{
+		return '/'.implode('/', $this->rsegment_array()).'/';
+	}
+
+}
+// END URI Class
+
+/* End of file URI.php */
 /* Location: ./system/libraries/URI.php */
\ No newline at end of file
diff --git a/system/scaffolding/views/add.php b/system/scaffolding/views/add.php
index cbb12f6f..cac255ac 100644
--- a/system/scaffolding/views/add.php
+++ b/system/scaffolding/views/add.php
@@ -1,32 +1,32 @@
-load->view('header');  ?>
-
-
    
-
-
-
-
-
-
-
-primary_key == 1) continue; ?>
-
-
-	
-	
-	type == 'blob'): ?>
-	
-	
-	
-	
-	
-
-
-
    name; echo ' '.$field->default; ?>
    
-
-
-
-
-
-load->view('footer'); 
-/* End of file add.php */
-/* Location: ./system/scaffolding/views/add.php */
+load->view('header');  ?>
+
+
    
+
+
+
+
+
+
+
+primary_key == 1) continue; ?>
+
+
+	
+	
+	type == 'blob'): ?>
+	
+	
+	
+	
+	
+
+
+
    name; echo ' '.$field->default; ?>
    
+
+
+
+
+
+load->view('footer'); 
+/* End of file add.php */
+/* Location: ./system/scaffolding/views/add.php */
diff --git a/system/scaffolding/views/delete.php b/system/scaffolding/views/delete.php
index d1954219..87b59bef 100644
--- a/system/scaffolding/views/delete.php
+++ b/system/scaffolding/views/delete.php
@@ -1,9 +1,9 @@
-load->view('header');  ?>
-
-
    
-
-
      |  
-
-load->view('footer'); 
-/* End of file delete.php */
-/* Location: ./system/scaffolding/views/delete.php */
+load->view('header');  ?>
+
+
    
+
+
      |  
+
+load->view('footer'); 
+/* End of file delete.php */
+/* Location: ./system/scaffolding/views/delete.php */
diff --git a/system/scaffolding/views/edit.php b/system/scaffolding/views/edit.php
index fe553e59..c66259d9 100644
--- a/system/scaffolding/views/edit.php
+++ b/system/scaffolding/views/edit.php
@@ -1,33 +1,33 @@
-load->view('header');  ?>
-
-
-
    
-
-
-
-
-
-
-
-primary_key == 1) continue; ?>
-
-
-	
-	
-	type == 'blob'): ?>
-	
-	
-	
-	
-	
-
-
-
    name; ?>
    
-
-
-
-
-
-load->view('footer'); 
-/* End of file edit.php */
+load->view('header');  ?>
+
+
+
    
+
+
+
+
+
+
+
+primary_key == 1) continue; ?>
+
+
+	
+	
+	type == 'blob'): ?>
+	
+	
+	
+	
+	
+
+
+
    name; ?>
    
+
+
+
+
+
+load->view('footer'); 
+/* End of file edit.php */
 /* Location: ./system/scaffolding/views/edit.php */
\ No newline at end of file
diff --git a/system/scaffolding/views/header.php b/system/scaffolding/views/header.php
index 50f234a4..a1621ff3 100644
--- a/system/scaffolding/views/header.php
+++ b/system/scaffolding/views/header.php
@@ -1,29 +1,29 @@
-
-
-
-
-<?php echo $title; ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
    
+
+
+
+
+<?php echo $title; ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
    
 
    
\ No newline at end of file
diff --git a/system/scaffolding/views/no_data.php b/system/scaffolding/views/no_data.php
index bc81e748..963341b7 100644
--- a/system/scaffolding/views/no_data.php
+++ b/system/scaffolding/views/no_data.php
@@ -1,8 +1,8 @@
-load->view('header');  ?>
-
-
    
-
    
-
-load->view('footer'); 
-/* End of file no_data.php */
+load->view('header');  ?>
+
+
    
+
    
+
+load->view('footer'); 
+/* End of file no_data.php */
 /* Location: ./system/scaffolding/views/no_data.php */
\ No newline at end of file
diff --git a/system/scaffolding/views/view.php b/system/scaffolding/views/view.php
index a81241d3..69c1f45d 100644
--- a/system/scaffolding/views/view.php
+++ b/system/scaffolding/views/view.php
@@ -1,27 +1,27 @@
-load->view('header');  ?>
-
-
- 
-	
-	
-	
-	
-	
-
-
-result() as $row): ?>
- 
-	
- 	
- 		
-	
-	
- 
-
-
    EditDelete
     $primary), $scaff_edit); ?> $primary), $scaff_delete); ?>$field);?>
    
-
-
-
-load->view('footer'); 
-/* End of file view.php */
+load->view('header');  ?>
+
+
+ 
+	
+	
+	
+	
+	
+
+
+result() as $row): ?>
+ 
+	
+ 	
+ 		
+	
+	
+ 
+
+
    EditDelete
     $primary), $scaff_edit); ?> $primary), $scaff_delete); ?>$field);?>
    
+
+
+
+load->view('footer'); 
+/* End of file view.php */
 /* Location: ./system/scaffolding/views/view.php */
\ No newline at end of file
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index cde5f436..89ec0ac5 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -1,956 +1,956 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Change Log : CodeIgniter User Guide
-
-
-
-
-
-
-    
-
    
-
-
-
-
-
-
    CodeIgniter User Guide Version 1.7
    
-
    
-
-
-
-
-
-
-
-
-
-
    
-
-
-
    
-
-
-
-
    
-
-
    Change Log
    
-
-
    Version 1.7.1
    
-
    Release Date: not yet released
    
-SVN Revision: 
    
-
-
      
-	
    • Libraries
-		
        
-			
      • Changed default current page indicator in the Pagination library to use <strong> instead of <b>
        • 
-			
      • A "HTTP/1.1 400 Bad Request" header is now sent when disallowed characters are encountered.
        • 
-			
      • Added <big>, <small>, <q>, and <tt> to the Typography parser's inline elements.
        • 
-		
      
-	
      • 
-	
    • Helpers
-		
-	
      • 
-
    
-
-
    Bug fixes for 1.7.1
    
-
      
-	
    • Fixed a bug in the MySQLi driver when no port is specified
      • 
-	
    • Fixed a bug (#5702), in which the field label was not being fetched properly, when "matching" one field to another.
      • 
-	
    • Fixed a bug in which identifers were not being escaped properly when reserved characters were used.
      • 
-	
    • Fixed a bug with the regular expression used to protect submitted paragraph tags in auto typography.
      • 
-	
    • Fixed a bug where double dashes within tag attributes were being converted to em dash entities.
      • 
-	
    • Fixed a bug where double spaces within tag attributes were being converted to non-breaking space entities.
      • 
-	
    • Changed a few docblock comments to reflect actual return values.
      • 
-
    
-
-
-
    Version 1.7
    
-
    Release Date: October 23, 2008
    
-SVN Revision: 1541
    
-
-
      
-	
    • Libraries
-		
        
-			
      • Added a new Form Validation Class.  It simplifies setting rules and field names, supports arrays as field names, allows groups of validation rules to be saved in a config file, and adds some helper functions for use in view files.  Please note that the old Validation class is now deprecated. We will leave it in the library folder for some time so that existing applications that use it will not break, but you are encouraged to migrate to the new version.
        • 
-			
      • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
        • 
-			
      • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
        • 
-			
      • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
        • 
-			
      • Added controller class/method info to Profiler class and support for multiple database connections.
        • 
-			
      • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
        • 
-			
      • Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.
        • 
-			
      • Improved Parser class to allow multiple calls to the parse() function.  The output of each is appended in the output.
        • 
-			
      • Added max_filename option to set a file name length limit in the  File Upload Class.
        • 
-			
      • Added set_status_header() function to Output class.
        • 
-			
      • Modified Pagination class to only output the "First" link when the link for page one would not be shown.
        • 
-			
      • Added support for mb_strlen in the Form Validation class so that multi-byte languages will calculate string lengths properly.
        • 
-		
      
-	
      • 
-	
    • Database
-		
        
-			
      • Improved Active Record class to allow full path column and table names:  hostname.database.table.column.  Also improved the alias handling.
        • 			
-			
      • Improved how table and column names are escaped and prefixed.  It now honors full path names when adding prefixes and escaping.
        • 
-			
      • Added Active Record caching feature to "update" and "delete" functions.
        • 
-			
      • Added removal of non-printing control characters in escape_str() of DB drivers that do not have native PHP escaping mechanisms (mssql, oci8, odbc), to avoid potential SQL errors, and possible sources of SQL injection.
        • 
-			
      • Added port support to MySQL, MySQLi, and MS SQL database drivers.
        • 
-			
      • Added driver name variable in each DB driver, based on bug report #4436.
        • 
-		
      
-	
      • 
-	
    • Helpers
-		
        
-			
      • Added several new "setting" functions to the Form helper that allow POST data to be retrieved and set into forms.  These are intended to be used on their own, or with the new Form Validation Class.
        • 
-			
      • Added current_url() and uri_segments() to  URL helper.
        • 
-			
      • Altered auto_link() in the URL helper so that email addresses with "+" included will be linked.
        • 
-			
      • Added meta() function to  HTML helper.
        • 
-			
      • Improved accuracy of calculations in Number helper.
        • 
-			
      • Removed added newlines ("\n") from most form and html helper functions.
        • 
-			
      • Tightened up validation in the Date helper function human_to_unix(), and eliminated the POSIX regex.
        • 
-			
      • Updated Date helper to match the world's current time zones and offsets.
        • 
-			
      • Modified url_title() in the URL helper to remove characters and digits that are part of
-				character entities, to allow dashes, underscores, and periods regardless of the $separator, and to allow uppercase characters.
        • 
-			
      • Added support for arbitrary attributes in anchor_popup() of the URL helper.
        • 
-		
      
-	
      • 
-	
    • Other Changes
-		
        
-			
      • Added PHP Style Guide to docs.
        • 
-			
      • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
        • 
-			
      • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
        • 
-			
      • Added a file lock check during caching, before trying to write to the file.
        • 
-			
      • Modified Cookie key cleaning to unset a few troublesome key names that can be present in certain environments, preventing CI from halting execution.
        • 
-			
      • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div.
        • 
-		
      
-	
      • 
-
    
-
-
    Bug fixes for 1.7.0
    
-
      
-	
    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • 
-	
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229, #5254, #5351).
      • 
-	
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
      • 
-	
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
      • 
-	
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • 
-	
    • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.
      • 
-	
    • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.
      • 
-	
    • Fixed a bug (#4536) in backups with the MySQL driver where some legacy code was causing certain characters to be double escaped.
      • 
-	
    • Fixed a routing bug (#4661) that occurred when the default route pointed to a subfolder.
      • 
-	
    • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
      • 
-	
    • Fixed the spelling of "raspberry" in config/smileys.php.
      • 
-	
    • Fixed incorrect parenthesis in form_open() function (#5135).
      • 
-	
    • Fixed a bug that was ignoring case when comparing controller methods (#4560).
      • 
-	
    • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function.
      • 
-	
    • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
      • 
-	
    • Fixed Oracle bug (#3306) that was preventing multiple queries in one action.
      • 
-	
    • Fixed ODBC bug that was ignoring connection params due to its use of a constructor.
      • 
-	
    • Fixed a DB driver bug with num_rows() that would cause an error with the Oracle driver.
      • 
-	
    • Fixed MS SQL bug (#4915).  Added brackets around database name in MS SQL driver when selecting the database, in the event that reserved characters are used in the name.
      • 
-	
    • Fixed a DB caching bug (4718) in which the path was incorrect when no URI segments were present.
      • 
-	
    • Fixed Image_lib class bug #4562.  A path was not defined for NetPBM.
      • 
-	
    • Fixed Image_lib class bug #4532.  When cropping an image with identical height/width settings on output, a copy is made.
      • 
-	
    • Fixed DB_driver bug (4900), in which a database error was not being logged correctly.
      • 
-	
    • Fixed DB backup bug in which field names were not being escaped.
      • 
-	
    • Fixed a DB Active Record caching bug in which multiple calls to cached data were not being honored.
      • 
-	
    • Fixed a bug in the Session class that was disallowing slashes in the serialized array.
      • 
-	
    • Fixed a Form Validation bug in which the "isset" error message was being trigged by the "required" rule.
      • 
-	
    • Fixed a spelling error in a Loader error message.
      • 
-	
    • Fixed a bug (5050) with IP validation with empty segments.
      • 
-	
    • Fixed a bug in which the parser was being greedy if multiple identical sets of tags were enountered.
      • 
-
    
-
-
    Version 1.6.3
    
-
    Release Date: June 26, 2008
    
-SVN Revision: 1238
    
-
    Version 1.6.3 is a security and maintenance release and is recommended for all users.
    
-
      
-	
    • Database
-		
        
-			
      • Modified MySQL/MySQLi Forge class to give explicit names to keys
        • 
-			
      • Added ability to set multiple column non-primary keys to the Forge class
        • 
-			
      • Added ability to set additional database config values in DSN connections via the query string.
        • 
-			
      
-	
      • 
-	
    • Libraries
-		
        
-			
      • Set the mime type check in the Upload class to reference the global mimes variable.
        • 
-			
      • Added support for query strings to the Pagination class, automatically detected or explicitly declared.
        • 
-			
      • Added get_post() to the Input class.
        • 
-			
      • Documented get() in the Input class.
        • 
-			
      • Added the ability to automatically output language items as form labels in the Language class.
        • 
-		
      
-	
      • 
-	
    • Helpers
-		
-	
      • 
-	
    • Other changes
-		
        
-			
      • Improved security in xss_clean().
        • 
-			
      • Removed an unused Router reference in _display_cache().
        • 
-			
      • Added ability to use xss_clean() to test images for XSS, useful for upload security.
        • 
-			
      • Considerably expanded list of mobile user-agents in config/user_agents.php.
        • 
-			
      • Charset information in the userguide has been moved above title for internationalization purposes (#4614).
        • 
-			
      • Added "Using Associative Arrays In a Request Parameter" example to the XMLRPC userguide page.
        • 
-			
      • Removed maxlength and size as automatically added attributes of form_input() in the form helper.
        • 
-			
      • Documented the language file use of byte_format() in the number helper.
        • 
-		
      
-	
      • 
-
    
-
-
-
    Bug fixes for 1.6.3
    
-
-
      
-	
    • Added a language key for valid_emails in validation_lang.php.
      • 
-	
    • Amended fixes for bug (#3419) with parsing DSN database connections.
      • 
-	
    • Moved the _has_operators() function (#4535) into DB_driver from DB_active_rec.
      • 
-	
    • Fixed a syntax error in upload_lang.php.
      • 
-	
    • Fixed a bug (#4542) with a regular expression in the Image library.
      • 
-	
    • Fixed a bug (#4561) where orhaving() wasn't properly passing values.
      • 
-	
    • Removed some unused variables from the code (#4563).
      • 
-	
    • Fixed a bug where having() was not adding an = into the statement (#4568).
      • 
-	
    • Fixed assorted user guide typos or examples (#4574, #4706).
      • 
-	
    • Added quoted-printable headers to Email class when the multi-part override is used.
      • 
-	
    • Fixed a double opening <p> tag in the index pages of each system directory.
      • 
-
    
-
-
    Version 1.6.2
    
-
    Release Date: May 13, 2008
    
-SVN Revision: 1155
    
-
      
-	
    • Active Record
-		
        
-			
      • Added the ability to prevent escaping in having() clauses.
        • 
-			
      • Added rename_table() into DBForge.
        • 
-			
      • Fixed a bug that wasn't allowing escaping to be turned off if the value of a query was NULL.
        • 
-			
      • DB Forge is now assigned to any models that exist after loading (#3457).
        • 
-			
      
-	
      • 
-	
    • Database
-		
        
-			
      • Added Strict Mode to database transactions.
        • 
-			
      • Escape behaviour in where() clauses has changed; values in those with the "FALSE" argument are no longer escaped (ie: quoted).
        • 
-		
      
-	
      • 
-	
    • Config
-		
        
-			
      • Added 'application/vnd.ms-powerpoint' to list of mime types.
        • 
-			
      • Added 'audio/mpg' to list of mime types.
        • 
-			
      • Added new user-modifiable file constants.php containing file mode and fopen constants.
        • 
-			
      • Added the ability to set CRLF settings via config in the Email class.
        • 
-		
      
-	
      • 
-	
    • Libraries
-		
        
-			
      • Added increased security for filename handling in the Upload library.
        • 
-			
      • Added increased security for sessions for client-side data tampering.
        • 
-			
      • The MySQLi forge class is now in sync with MySQL forge. 
        • 
-			
      • Added the ability to set CRLF settings via config in the Email class.
        • 
-			
      • Unit Testing results are now colour coded, and a change was made to the default template of results.
        • 
-			
      • Added a valid_emails rule to the Validation class.
        • 
-			
      • The Zip class now exits within download().
        • 
-			
      • The Zip class has undergone a substantial re-write for speed and clarity (thanks stanleyxu for the hard work and code contribution in bug report #3425!)
        • 
-		
      
-	
      • 
-	
    • Helpers
-		
        
-			
      • Added a Compatibility Helper for using some common PHP 5 functions safely in applications that might run on PHP 4 servers (thanks Seppo for the hard work and code contribution!)
        • 
-			
      • Added form_button() in the Form helper.
        • 
-			
      • Changed the radio() and checkbox() functions to default to not checked by default.
        • 
-			
      • Added the ability to include an optional HTTP Response Code in the redirect() function of the URL Helper.
        • 
-			
      • Modified img() in the HTML Helper to remove an unneeded space (#4208).
        • 
-			
      • Modified anchor() in the URL helper to no longer add a default title= attribute (#4209).
        • 
-			
      • The Download helper now exits within force_download().
        • 
-			
      • Added get_dir_file_info(), get_file_info(), and get_mime_by_extension() to the File Helper.
        • 
-			
      • Added symbolic_permissions() and octal_permissions() to the File helper.
        • 
-		
      
-	
      • 
-	
    • Plugins
-		
        
-			
      • Modified captcha generation to first look for the function imagecreatetruecolor, and fallback to imagecreate if it isn't available (#4226).
        • 
-		
      
-	
      • 
-	
    • Other
-		Changes
-		
        
-			
      • Added ability for xss_clean() to accept arrays.
        • 
-			
      • Removed closing PHP tags from all PHP files to avoid accidental output and potential 'cannot modify headers' errors.
        • 
-			
      • Removed "scripts" from the auto-load search path. Scripts were deprecated 
-				in Version 1.4.1 (September 21, 2006). If you still need to use them for legacy reasons, they must now be manually loaded in each Controller.
        • 
-			
      • Added a Reserved Names page to the userguide, and migrated reserved controller names into it.
        • 
-			
      • Added a Common Functions page to the userguide for globally available functions.
        • 
-			
      • Improved security and performance of xss_clean().
        • 
-		
      
-	
      • 
-	
    
-
-
    Bugfixes for 1.6.2
    
-
      
-	
    • Fixed a bug where SET queries were not being handled as "write" queries.
      • 
-	
    • Fixed a bug (#3191) with ORIG_PATH_INFO URI parsing.
      • 
-	
    • Fixed a bug in DB Forge, when inserting an id field (#3456).
      • 
-	
    • Fixed a bug in the table library that could cause identically constructed rows to be dropped (#3459).
      • 
-	
    • Fixed DB Driver and MySQLi result driver checking for resources instead of objects (#3461).
      • 
-	
    • Fixed an AR_caching error where it wasn't tracking table aliases (#3463).
      • 
-	
    • Fixed a bug in AR compiling, where select statements with arguments got incorrectly escaped (#3478).
      • 
-	
    • Fixed an incorrect documentation of $this->load->language (#3520).
      • 
-	
    • Fixed bugs (#3523, #4350) in get_filenames() with recursion and problems with Windows when $include_path is used.
      • 
-	
    • Fixed a bug (#4153) in the XML-RPC class preventing dateTime.iso8601 from being used.
      • 
-	
    • Fixed an AR bug with or_where_not_in() (#4171).
      • 
-	
    • Fixed a bug with xss_clean() that would add semicolons to GET URI variable strings.
      • 
-	
    • Fixed a bug (#4206) in the Directory Helper where the directory resource was not being closed, and minor improvements.
      • 
-	
    • Fixed a bug in the FTP library where delete_dir() was not working recursively (#4215).
      • 
-	
    • Fixed a Validation bug when set_rules() is used with a non-array field name and rule (#4220).
      • 
-	
    • Fixed a bug (#4223) where DB caching would not work for returned DB objects or multiple DB connections.
      • 
-	
    • Fixed a bug in the Upload library that might output the same error twice (#4390).
      • 
-	
    • Fixed an AR bug when joining with a table alias and table prefix (#4400).
      • 
-	
    • Fixed a bug in the DB class testing the $params argument.
      • 
-	
    • Fixed a bug in the Table library where the integer 0 in cell data would be displayed as a blank cell.
      • 
-	
    • Fixed a bug in link_tag() of the URL helper where a key was passed instead of a value.
      • 
-	
    • Fixed a bug in DB_result::row() that prevented it from returning individual fields with MySQL NULL values.
      • 
-	
    • Fixed a bug where SMTP emails were not having dot transformation performed on lines that begin with a dot.
      • 
-	
    • Fixed a bug in display_error() in the DB driver that was instantiating new Language and Exception objects, and not using the error heading.
      • 
-	
    • Fixed a bug (#4413) where a URI containing slashes only e.g. 'http://example.com/index.php?//' would result in PHP errors
      • 
-	
    • Fixed an array to string conversion error in the Validation library (#4425)
      • 
-	
    • Fixed bug (#4451, #4299, #4339) where failed transactions will not rollback when debug mode is enabled.
      • 
-	
    • Fixed a bug (#4506) with overlay_watermark() in the Image library preventing support for PNG-24s with alpha transparency
      • 
-	
    • Fixed assorted user guide typos (#3453, #4364, #4379, #4399, #4408, #4412, #4448, #4488).
      • 
-	
    
-
-
    Version 1.6.1
    
-
    Release Date: February 12, 2008
    
-	SVN Revision: 984
    
-
      
-	
    • Active Record 
-		
-	
      • 
-	
    • Database drivers
-		
        
-			
      • Added support for setting client character set and collation for MySQLi.
        • 
-		
      
-	
      • 
-	
    • Core Changes
-		
        
-			
      • Modified xss_clean() to be more intelligent with its handling of URL encoded strings.
        • 
-			
      • Added $_SERVER, $_FILES, $_ENV, and $_SESSION to sanitization of globals.
        • 
-			
      • Added a Path Helper.
        • 
-			
      • Simplified _reindex_segments() in the URI class.
        • 
-			
      • Escaped the '-' in the default 'permitted_uri_chars' config item, to prevent errors if developers just try to add additional characters to the end of the default expression.
        • 
-			
      • Modified method calling to controllers to show a 404 when a private or protected method is accessed via a URL.
        • 
-			
      • Modified framework initiated 404s to log the controller and method for invalid requests.
        • 
-		
      
-	
      • 
-	
    • Helpers
-		
        
-			
      • Modified get_filenames() in the File Helper to return FALSE if the $source_dir is not readable.
        • 
-		
      
-	
      • 
-
    
-
-
-
    Bugfixes for 1.6.1
    
-
      
-	
    • Deprecated is_numeric as a validation rule. Use of numeric and integer are preferred.
      • 
-	
    • Fixed bug (#3379) in DBForge with SQLite for table creation.
      • 
-	
    • Made Active Record fully database prefix aware (#3384).
      • 
-	
    • Fixed a bug where DBForge was outputting invalid SQL in Postgres by adding brackets around the tables in FROM.
      • 
-	
    • Changed the behaviour of Active Record's update() to make the WHERE clause optional (#3395).
      • 
-	
    • Fixed a bug (#3396) where certain POST variables would cause a PHP warning.
      • 
-	
    • Fixed a bug in query binding (#3402).
      • 
-	
    • Changed order of SQL keywords in the Profiler $highlight array so OR would not be highlighted before ORDER BY.
      • 
-	
    • Fixed a bug (#3404) where the MySQLi driver was testing if $this->conn_id was a resource instead of an object.
      • 
-	
    • Fixed a bug (#3419) connecting to a database via a DSN string.
      • 
-	
    • Fixed a bug (#3445) where the routed segment array was not re-indexed to begin with 1 when the default controller is used.
      • 
-	
    • Fixed assorted user guide typos.
      • 
-
    
-
-
-
-
    Version 1.6.0
    
-
    Release Date: January 30, 2008 
    
-
      
-	
    • DBForge
-		
        
-			
      • Added DBForge to the database tools.
        • 
-			
      • Moved create_database() and drop_database() into DBForge.
        • 
-			
      • Added add_field(), add_key(), create_table(), drop_table(), add_column(), drop_column(), modify_column() into DBForge.
        • 
-		
      
-	
      • 
-
-	
    • Active Record
-		
        
-			
      • Added protect_identifiers() in Active Record.
        • 
-			
      • All AR queries are backticked if appropriate to the database.
        • 
-			
      • Added where_in(), or_where_in(), where_not_in(),  or_where_not_in(), not_like() and or_not_like() to Active Record.
        • 
-			
      • Added support for limit()  into update() and delete() statements in  Active Record.
        • 
-			
      • Added empty_table() and truncate_table() to Active Record.
        • 
-			
      • Added the ability to pass an array of tables to the delete() statement in Active Record.
        • 
-			
      • Added count_all_results() function to Active Record.
        • 
-			
      • Added select_max(), select_min(), select_avg() and select_sum() to Active Record.
        • 
-			
      • Added the ability to use aliases with joins in Active Record.
        • 
-			
      • Added a third parameter to Active Record's like() clause to control where the wildcard goes. 
        • 
-			
      • Added a third parameter to set() in Active Record that withholds escaping data.
        • 
-			
      • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
        • 
-		
      
-	
      • 
-	
-	
    • Other Database Related
-		
        
-			
      • MySQL driver now requires MySQL 4.1+
        • 
-			
      • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or not. Previously they were always saved.
        • 
-			
      • Added $this->db->dbprefix() to manually add database prefixes.
        • 
-			
      • Added 'random' as an order_by() option , and removed "rand()" as a listed option as it was MySQL only.
        • 
-			
      • Added a check for NULL fields in the MySQL database backup utility.
        • 
-			
      • Added "constrain_by_prefix" parameter to db->list_table() function.  If set to TRUE it will limit the result to only table names with the current prefix.
        • 
-			
      • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); havingor() for having_or(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
        • 
-			
      • Modified csv_from_result() to output CSV data more in the spirit of basic rules of RFC 4180.
        • 
-			
      • Added 'char_set' and 'dbcollat' database configuration settings, to explicitly set the client communication properly.
        • 
-			
      • Removed 'active_r' configuration setting and replaced with a global $active_record setting, which is more
-				in harmony with the global nature of the behavior (#1834).
        • 
-		
      
-	
      • 
-	
-	
    • Core changes
-		
        
-			
      • Added ability to load multiple views, whose content will be appended to the output in the order loaded.
        • 
-			
      • Added the ability to auto-load Models.
        • 
-			
      • Reorganized the URI and Routes classes for better clarity.
        • 
-			
      • Added Compat.php to allow function overrides for older versions of PHP or PHP environments missing certain extensions / libraries
        •    
-			
      • Added memory usage, GET, URI string data, and individual query execution time to Profiler output.
        • 
-			
      • Deprecated Scaffolding.
        • 
-			
      • Added is_really_writable() to Common.php to provide a cross-platform reliable method of testing file/folder writability.
        • 
-		
      
-	
      • 
-	
-	
    • Libraries
-		
        
-			
      • Changed the load protocol of Models to allow for extension.
        • 
-			
      • Strengthened the Encryption library to help protect against man in the middle attacks when MCRYPT_MODE_CBC mode is used.
        • 
-			
      • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
        • 
-			
      • Removed 'last_visit' from the Session class.
        • 
-			
      • Added a language entry for valid_ip validation error.
        • 
-			
      • Modified prep_for_form() in the Validation class to accept arrays, adding support for POST array validation (via callbacks only)
        • 
-			
      • Added an "integer" rule into the Validation library.
        • 
-			
      • Added valid_base64() to the Validation library.
        • 
-			
      • Documented clear() in the Image Processing library.
        • 
-			
      • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule. 
        • 
-			
      • Modified Upload class $_FILES error messages to be more precise.
        • 
-			
      • Moved the safe mode and auth checks for the Email library into the constructor. 
        • 
-			
      • Modified variable names in _ci_load() method of Loader class to avoid conflicts with view variables.
        • 
-			
      • Added a few additional mime type variations for CSV.
        • 
-			
      • Enabled the 'system' methods for the XML-RPC Server library, except for 'system.multicall' which is still disabled.
        • 
-		
      
-	
      • 
-	
-	
    • Helpers & Plugins
-		
        
-			
      • Added link_tag() to the HTML helper.
        • 
-			
      • Added img() to the HTML helper.
        • 
-			
      • Added ability to "extend" Helpers.
        • 
-			
      • Added an email helper into core helpers.
        • 
-			
      • Added strip_quotes() function to string helper.
        • 
-			
      • Added reduce_multiples() function to string helper.
        • 
-			
      • Added quotes_to_entities() function to string helper.
        • 
-			
      • Added form_fieldset(), form_fieldset_close(), form_label(), and form_reset() function to form helper.
        • 
-			
      • Added support for external urls in form_open().
        • 
-			
      • Removed support for db_backup in MySQLi due to incompatible functions.
        • 
-			
      • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
        • 
-		
      
-	
      • 
-	
-	  
-	
    • Documentation Changes
-		
        
-			
      • Added Writing Documentation section for the community to use in writing their own documentation.
        • 
-			
      • Added titles to all user manual pages.
        • 
-			
      • Added attributes into <html> of userguide for valid html.
        • 
-			
      • Added Zip Encoding Class to the table of contents of the userguide.
        • 
-			
      • Moved part of the userguide menu javascript to an external file.
        • 
-			
      • Documented distinct() in Active Record. 
        • 
-			
      • Documented the timezones() function in the Date Helper.
        • 
-			
      • Documented unset_userdata in the Session class.
        • 
-			
      • Documented 2 config options to the Database configuration page.
        • 
-		
      
-	
      • 
-
    
-
-
    Bug fixes for Version 1.6.0
    
-	
-
      
-	
    • Fixed a bug (#1813) preventing using $CI->db in the same application with returned database objects.
      • 
-	
    • Fixed a bug (#1842) where the $this->uri->rsegments array would not include the 'index' method if routed to the controller without an implicit method.
      • 
-	
    • Fixed a bug (#1872) where word_limiter() was not retaining whitespace.
      • 
-	
    • Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.
      • 
-	
    • Fixed a bug (#2542)in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
      • 
-	
    • Fixed a bug (#2545) in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
      • 
-	
    • Fixed a bug (#2668) in the parser class where numeric data was ignored.
      • 
-	
    • Fixed a bug (#2679) where the "previous" pagination link would get drawn on the first page.
      • 
-	
    • Fixed a bug (#2702) in _object_to_array that broke some types of inserts and updates.
      • 
-	
    • Fixed a bug (#2732) in the SQLite driver for PHP 4.
      • 
-	
    • Fixed a bug (#2754) in Pagination to scan for non-positive num_links.
      • 
-	
    • Fixed a bug (#2762) in the Session library where user agent matching would fail on user agents ending with a space. 
      • 
-	
    • Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgres and sqlite drivers.
      • 
-	
    • Fixed a bug (#2810) in the typography helper causing extraneous paragraph tags when string contains tags.
      • 
-	
    • Fixed a bug (#2849) where arguments passed to a subfolder controller method would be incorrectly shifted, dropping the 3rd segment value.
      • 
-	
    • Fixed a bug (#2858) which referenced a wrong variable in the Image class.
      • 
-	
    • Fixed a bug (#2875)when loading plugin files as _plugin. and not _pi.
      • 
-	
    • Fixed a bug (#2912) in get_filenames() in the File Helper where the array wasn't cleared after each call.
      • 
-	
    • Fixed a bug (#2974) in highlight_phrase() that caused an error with slashes.
      • 
-	
    • Fixed a bug (#3003) in the Encryption Library to support modes other than MCRYPT_MODE_ECB
      • 
-	
    • Fixed a bug (#3015) in the User Agent library where more then 2 languages where not reported with languages().
      • 
-	
    • Fixed a bug (#3017) in the Email library where some timezones were calculated incorrectly. 
      • 
-	
    • Fixed a bug (#3024) in which master_dim wasn't getting reset by clear() in the Image library.
      • 
-	
    • Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.
      • 
-	
    • Fixed a bug (#3166) that prevented num_rows from working in Oracle.
      • 
-	
    • Fixed a bug (#3175) preventing certain libraries from working properly when autoloaded in PHP 4.
      • 
-	
    • Fixed a bug (#3267) in the Typography Helper where unordered list was listed "un.
      • 
-	
    • Fixed a bug (#3268) where the Router could leave '/' as the path.
      • 
-	
    • Fixed a bug (#3279) where the Email class was sending the wrong Content-Transfer-Encoding for some character sets.
      • 
-	
    • Fixed a bug (#3284) where the rsegment array would not be set properly if the requested URI contained more segments than the routed URI.
      • 
-	
    • Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).
      • 
-	
    • Removed an extraneous call to loading models (#3286).
      • 
-	
    • Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.
      • 
-	
    • Fixed a bug (#3314) which would cause the top level path to be deleted in delete_files() of the File helper.
      • 
-	
    • Fixed a bug (#3328) where the smiley helper might return an undefined variable.
      • 
-	
    • Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.
      • 
-	
    • Removed an unused parameter from Profiler (#3332).
      • 
-	
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
      • 
-	
    • Fixed a bug in the upload library when allowed_files wasn't defined.
      • 
-	
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object. 
      • 
-	
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
      • 
-	
    • Fixed a bug in Validation where individual error messages for checkboxes wasn't supported.
      • 
-	
    • Fixed a bug in captcha calling an invalid PHP function.
      • 
-	
    • Fixed a bug in the cookie helper "set_cookie" function.  It was not honoring the config settings.
      • 
-	
    • Fixed a bug that was making validation callbacks required even when not set as such.
      • 
-	
    • Fixed a bug in the XML-RPC library so if a type is specified, a more intelligent decision is made as to the default type.
      • 
-	
    • Fixed an example of comma-separated emails in the email library documentation.
      • 
-	
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
      • 
-	
    • Fixed a typo in the database language file.
      • 
-	
    • Fixed a typo in the image language file "suppor" to "support".
      • 
-	
    • Fixed an example for XML RPC.
      • 
-	
    • Fixed an example of accept_charset() in the User Agent Library.
      • 
-	
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
      • 
-	
    • Fixed a typo in the String Helper (uniquid changed to uniqid).
      • 
-	
    • Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login), and FTP Class (ftp_unable_to_remame).
      • 
-	
    • Added a stripslashes()  into the Upload Library.
      • 
-	
    • Fixed a series of grammatical and spelling errors in the language files.
      • 
-	
    • Fixed assorted user guide typos.
      • 
-
    
-
    Version 1.5.4
    
-
    Release Date: July 12, 2007 
    
-
      
-	
    • Added custom Language files to the autoload options. 
      • 
-	
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
      • 
-	
    • Added array to string into the profiler.
      • 
-	
    • Added some additional mime types in application/config/mimes.php.
      • 
-	
    • Added filename_security() method to Input library.
      • 
-	
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s".  Also added a force parameter to pluralize().
      • 
-	
    • Added $config['charset'] to the config file.  Default value is 'UTF-8', used in some string handling functions.
      • 
-	
    • Fixed MSSQL insert_id().
      • 
-	
    • Fixed a logic error in the DB trans_status() function.  It was incorrectly returning TRUE on failure and FALSE on success.
      • 
-	
    • Fixed a bug that was allowing multiple load attempts on extended classes.
      • 
-	
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
      • 
-	
    • Fixed a bug in the escape_str() function in the MySQL driver.
      • 
-	
    • Fixed a typo in the Calendar library  
      • 
-	
    • Fixed a typo in rpcs.php library
      • 
-	
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
      • 
-	
    • Fixed a bug in router that was ignoring the scaffolding route for optimization 
      • 
-	
    • Fixed an IP validation bug.
      • 
-	
    • Fixed a bug in display of POST keys in the Profiler output
      • 
-	
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
      • 
-	
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
      • 
-	
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
      • 
-	
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
      • 
-	
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
      • 
-	
    • Fixed various doc typos. 
      • 
-	
    • Documented two functions from the String helper  that were missing from the user guide:  trim_slashes() and reduce_double_slashes().
      • 
-	
    • Docs now validate to XHTML 1 transitional
      • 
-	
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
      • 
-	
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
      • 
-	
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
      • 
-	
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
      • 
-	
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
      • 
-	
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
      • 
-	
    • Deprecated the use if is_numeric() in various places since it allows periods.  Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead:  preg_match("/[^0-9]/", $n)
      • 
-	
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity. 
      • 
-
    
-
    Version 1.5.3
    
-
    Release Date: April 15, 2007 
    
-
      
-	
    • Added array to string into the profiler 
      • 
-	
    • Code Igniter references updated to CodeIgniter 
      • 
-	
    • pMachine references updated to EllisLab 
      • 
-	
    • Fixed a bug in the repeater function of string helper. 
      • 
-	
    • Fixed a bug in ODBC driver 
      • 
-	
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
      • 
-	
    • Fixed a bug in the redirect function of the url helper. 
      • 
-	
    • Fixed an undefined variable in Loader 
      • 
-	
    • Fixed a version bug in the Postgres driver 
      • 
-	
    • Fixed a bug in the textarea function of the form helper for use with strings
      • 
-	
    • Fixed doc typos. 
      • 
-
    
-
    Version 1.5.2
    
-
    Release Date: February 13, 2007 
    
-
      
-	
    • Added subversion information to the downloads page. 
      • 
-	
    • Added support for captions in the Table Library 
      • 
-	
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather than download 
      • 
-	
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
      • 
-	
    • Removed unescaped variables in error messages of Input and Router classes
      • 
-	
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.  
      • 
-	
    • Fixed a bug in the form helper that gave textarea a value attribute 
      • 
-	
    • Fixed a bug in the Image Library that was ignoring resizing the same size image 
      • 
-	
    • Fixed some doc typos.
      • 
-
    
-
-
-
    Version 1.5.1
    
-
    Release Date: November 23, 2006
    
-
      
-	
    • Added support for submitting arrays of libraries in the $this->load->library function.
      • 
-	
    • Added support for naming custom library files in lower or uppercase.
      • 
-	
    • Fixed a bug related to output buffering.
      • 
-	
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
      • 
-	
    • Fixed a bug that was suppressing errors in controllers.
      • 
-	
    • Fixed a problem that can cause a loop to occur when the config file is missing.
      • 
-	
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
      • 
-	
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
      • 
-	
    • Fixed some bugs in the Oracle DB driver.
      • 
-	
    • Fixed an incorrectly named variable in the MySQLi result driver.
      • 
-	
    • Fixed some doc typos.
      • 
-
    
-
    Version 1.5.0.1
    
-
    Release Date: October 31, 2006
    
-
      
-
    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
      • 
-
    • Fixed a bug in the word_wrap() helper function.
      • 
-
    • Fixed an invalid color Hex number in the Profiler class.
      • 
-
    • Fixed a corrupted image in the user guide.
      • 
-
    
-
-
-
-
    Version 1.5.0
    
-
    Release Date: October 30, 2006
    
-
-
      
-
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • 
-
    • Added Database Caching Class.
      • 
-
    • Added transaction support to the database classes.
      • 
-
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
      • 
-
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
      • 
-
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
      • 
-
    • Added Zip Encoding Library.
      • 
-
    • Added FTP Library.
      • 
-
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
      • 
-
    • Added support for storing models within sub-folders.
      • 
-
    • Added Download Helper.
      • 
-
    • Added simple_query() function to the database classes
      • 
-
    • Added standard_date() function to the Date Helper.
      • 
-
    • Added $query->free_result() to database class.
      • 
-
    • Added $query->list_fields() function to database class
      • 
-
    • Added $this->db->platform() function
      • 
-
    • Added new File Helper:  get_filenames()
      • 
-
    • Added new helper:  Smiley Helper
      • 
-
    • Added support for <ul> and <ol> lists in the  HTML Helper
      • 
-
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags.  This allows the cleaner syntax to be used regardless of whether it's supported by the server.
      • 
-
    • Added the ability to rename or relocate the "application" folder.
      • 
-
    • Added more thorough initialization in the upload class so that all class variables are reset.
      • 
-
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
      • 
-
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
      • 
-
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
      • 
-
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
      • 
-
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
      • 
-
    • Documented three functions from the Validation class that were missing from the user guide:  set_select(), set_radio(), and set_checkbox().
      • 
-
    • Fixed a bug in the Email class related to SMTP Helo data.
      • 
-
    • Fixed a bug in the word wrapping helper and function in the email class.
      • 
-
    • Fixed a bug in the validation class.
      • 
-
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
      • 
-
    • Fixed a problem in the form_prep() function that was double encoding entities.
      • 
-
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
      • 
-
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
      • 
-
    • Fixed a pagination bug that was permitting negative values in the URL.
      • 
-
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
      • 
-
    • Changed _get_config() to get_config() since the function is not a private one.
      • 
-
    • Deprecated "init" folder.  Initialization happens automatically now.  Please see documentation.
      • 
-
    • Deprecated $this->db->field_names()  USE  $this->db->list_fields()
      • 
-
    • Deprecated the $config['log_errors'] item from the config.php file.  Instead, $config['log_threshold'] can be set to "0" to turn it off.
      • 
-
    
-
-
-
-
-
    Version 1.4.1
    
-
    Release Date: September 21, 2006
    
-
-
      
-
    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
      • 
-
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class.  More info in the Controllers page.
      • 
-
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
      • 
-
    • Added $this->output->set_header() function, which allows you to set server headers.
      • 
-
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders.  Previously they were always treated as global for your entire installation.  If your application folder contains any of these resources they will be used instead the global ones.
      • 
-
    • Added Inflector helper.
      • 
-
    • Added element() function in the array helper.
      • 
-
    • Added RAND() to active record orderby() function.
      • 
-
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
      • 
-
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
      • 
-
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
      • 
-
    • Added output compression option to the config file.
      • 
-
    • Removed the is_numeric test from the db->escape() function.
      • 
-
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
      • 
-
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
      • 
-
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
      • 
-
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
      • 
-
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
      • 
-
    • Added some code to allow email attachments to be reset when sending batches of email.
      • 
-
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own
-libraries or models instead.  It was originally added before CI had user libraries or models, but it's not needed anymore.
      • 
-
    • Deprecated the $autoload['core'] item from the autoload.php file.  Instead, please now use: $autoload['libraries']
      • 
-
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().
      • 
-
    
-
-
-
-
    Version 1.4.0
    
-
    Release Date: September 17, 2006
    
-
-
      
-
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • 
-
    • Added the ability to organize controller files into sub-folders.  Kudos to Marco for suggesting this (and the next two) feature.
      • 
-
    • Added regular expressions support for routing rules.
      • 
-
    • Added the ability to remap function calls within your controllers.
      • 
-
    • Added the ability to replace core system classes with your own classes.
      • 
-
    • Added support for % character in URL.
      • 
-
    • Added the ability to supply full URLs using the anchor() helper function.
      • 
-
    • Added mode parameter to file_write() helper.
      • 
-
    • Added support for changing the port number in the Postgres driver.
      • 
-
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
      • 
-
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
      • 
-
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
      • 
-
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
      • 
-
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • 
-
    • Updated the form_open() helper to allow the GET method to be used.
      • 
-
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • 
-
    • Updated the SQLite Driver to check for object support before attempting to return results as objects.  If unsupported it returns an array.
      • 
-
    • Updated the Models loader function to allow multiple loads of the same model.
      • 
-
    • Updated the MS SQL driver so that single quotes are escaped.
      • 
-
    • Updated the Postgres and ODBC drivers for better compatibility.
      • 
-
    • Removed a strtolower() call that was changing URL segments to lower case.
      • 
-
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
      • 
-
    • Removed backticks from Postgres class since these are not needed.
      • 
-
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
      • 
-
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name.  Please use dohash() instead.
      • 
-
    • Fixed an bug that was preventing the input class from unsetting GET variables.
      • 
-
    • Fixed a router bug that was making it too greedy when matching end segments.
      • 
-
    • Fixed a bug that was preventing multiple discrete database calls.
      • 
-
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
      • 
-
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
      • 
-
    • Fixed some missing prefixes when using the database prefix feature.
      • 
-
    • Fixed a typo in the Calendar class (cal_november).
      • 
-
    • Fixed a bug in the form_checkbox() helper.
      • 
-
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
      • 
-
    • Fixed an evaluation bug in the database initialization function.
      • 
-
    • Fixed a minor bug in one of the error messages in the language class.
      • 
-
    • Fixed a bug in the date helper timespan function.
      • 
-
    • Fixed an undefined variable in the DB Driver class.
      • 
-
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
      • 
-
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
      • 
-
    • Fixed a couple bugs in the Unit Testing class.
      • 
-
    • Fixed an incorrectly named variable in the Validation class.
      • 
-
    • Fixed an incorrectly named variable in the URI class.
      • 
-
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
      • 
-
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
      • 
-
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
      • 
-
    • Fixed some MS SQL bugs.
      • 
-
    • Fixed some doc typos.
      • 
-
    
-
-
-
-
    Version 1.3.3
    
-
    Release Date: June 1, 2006
    
-
-
      
-
-
    • Models do not connect automatically to the database as of this version. More info here.
      • 
-
    • Updated the Sessions class to utilize the active record class when running session related queries.  Previously the queries assumed MySQL syntax.
      • 
-
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
      • 
-
    • Fixed a bug in the active record "having" function.
      • 
-
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
      • 
-
    • Fixed a bug in the word_limiter() helper function.  It was cutting off the fist word.
      • 
-
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
      • 
-
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
      • 
-
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
      • 
-
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
      • 
-
    • Fixed a bug in the hash() security helper.
      • 
-
    • Fixed some typos.
      • 
-
    
-
-
-
-
-
    Version 1.3.2
    
-
    Release Date: April 17, 2006
    
-
-
      
-
    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
      • 
-
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
      • 
-
    • Fixed a bug in the init_pagination file.  The $config item was not being set correctly.
      • 
-
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
      • 
-
    • Fixed a couple bugs in the Model class.
      • 
-
    • Fixed some documentation typos and errata.
      • 
-
    
-
-
-
-
    Version 1.3.1
    
-
    Release Date: April 11, 2006
    
-
-
      
-
    • Added a Unit Testing Library.
      • 
-
    • Added the ability to pass objects to the insert() and update()  database functions.
-This feature enables you to (among other things) use your  Model class variables to run queries with. See the Models page for details.
      • 
-
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
      • 
-
    • Added getwhere function to Active Record class.
      • 
-
    • Added count_all function to Active Record class.
      • 
-
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
      • 
-
    • Added $this->db->last_query(), which allows you to view your last query that was run.
      • 
-
    • Added a new mime type to the upload class for better compatibility.
      • 
-
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
      • 
-
    • Fixed a bug in a couple of the active record functions (where and orderby).
      • 
-
    • Fixed a bug in the image library when realpath() returns false.
      • 
-
    • Fixed a bug in the Models that was preventing libraries from being used within them.
      • 
-
    • Fixed a bug in the "exact_length" function of the validation class.
      • 
-
    • Fixed some typos in the user guide
      • 
-
    
-
-
-
    Version 1.3
    
-
    Release Date: April 3, 2006
    
-
-
      
-
    • Added support for Models.
      • 
-
    • Redesigned the database libraries to support additional RDBMs (Postgres, MySQLi, etc.).
      • 
-
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
      • 
-
    • Added a feature to the database class that lets you run custom function calls.
      • 
-
    • Added support for private functions in your controllers.  Any controller function name that starts with an underscore will not be served by a URI request.
      • 
-
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
      • 
-
    • Added support for running standard query string URLs.  These can be optionally enabled in your config file.
      • 
-
    • Added the ability to  specify a "suffix", which will be appended to your URLs.  For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
      • 
-
    • Added a new error template for use with native PHP errors.
      • 
-
    • Added "alternator" function in the string helpers.
      • 
-
    • Removed slashing from the input class. After much debate we decided to kill this feature.
      • 
-
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
      • 
-
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and
-all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
      • 
-
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
      • 
-
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
      • 
-
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
      • 
-
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
      • 
-
    • Fixed a typo in the URI class.  $this->total_segment() should be plural: $this->total_segments()
      • 
-
    • Fixed some typos in the default calendar template
      • 
-
    • Fixed some typos in the user guide
      • 
-
    
-
-
-
-
-
-
-
-
-
    Version 1.2
    
-
    Release Date: March 21, 2006
    
-
-
      
-
    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
      • 
-
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
      • 
-
    • Added new File Helper:  delete_files()
      • 
-
    • Added new URL Helpers:  base_url(), index_page()
      • 
-
    • Added the ability to create your own core libraries and store them in your local application directory.
      • 
-
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
      • 
-
    • Added Javascript Calendar plugin.
      • 
-
    • Added search feature to user guide.  Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
      • 
-
    • Updated the parser class so that it allows tag pars within other tag pairs.
      • 
-
    • Fixed a bug in the DB "where" function.
      • 
-
    • Fixed a bug that was preventing custom config files to be auto-loaded.
      • 
-
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
      • 
-
    • Fixed some bugs in the xss_clean function
      • 
-
    
-
-
-
-
-
-
    Version Beta 1.1
    
-
    Release Date: March 10, 2006
    
-
-
      
-
    • Added a Calendaring class.
      • 
-
    • Added support for running multiple applications that share a common CodeIgniter backend.
      • 
-
    • Moved the "uri protocol" variable from the index.php file into the config.php file
      • 
-
    • Fixed a problem that was preventing certain function calls from working within constructors.
      • 
-
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
      • 
-
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
      • 
-
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
      • 
-
    • Fixed a data type error in the form_radio function (form helper)
      • 
-
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
      • 
-
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
      • 
-
    • Fixed a pagination problem in the scaffolding.
      • 
-
    • Fixed a bug in the mysql class "where" function.
      • 
-
    • Fixed a regex problem in some code that trimmed duplicate slashes.
      • 
-
    • Fixed a bug in the br() function in the HTML helper
      • 
-
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
      • 
-
    • Removed the "style" attributes form the form helpers.
      • 
-
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.
      • 
-
    
-
-
    Version Beta 1.0 
    
-
    Release Date: February 28, 2006
    
-
    First publicly released version.
    
-
-
    
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Change Log : CodeIgniter User Guide
+
+
+
+
+
+
+
+
    
+
+
+
+
+
+
    CodeIgniter User Guide Version 1.7
    
+
    
+
+
+
+
+
+
+
+
+
+
    
+
+
+
    
+
+
+
+
    
+
+
    Change Log
    
+
+
    Version 1.7.1
    
+
    Release Date: not yet released
    
+SVN Revision: 
    
+
+
      
+	
    • Libraries
+		
        
+			
      • Changed default current page indicator in the Pagination library to use <strong> instead of <b>
        • 
+			
      • A "HTTP/1.1 400 Bad Request" header is now sent when disallowed characters are encountered.
        • 
+			
      • Added <big>, <small>, <q>, and <tt> to the Typography parser's inline elements.
        • 
+		
      
+	
      • 
+	
    • Helpers
+		
+	
      • 
+
    
+
+
    Bug fixes for 1.7.1
    
+
      
+	
    • Fixed a bug in the MySQLi driver when no port is specified
      • 
+	
    • Fixed a bug (#5702), in which the field label was not being fetched properly, when "matching" one field to another.
      • 
+	
    • Fixed a bug in which identifers were not being escaped properly when reserved characters were used.
      • 
+	
    • Fixed a bug with the regular expression used to protect submitted paragraph tags in auto typography.
      • 
+	
    • Fixed a bug where double dashes within tag attributes were being converted to em dash entities.
      • 
+	
    • Fixed a bug where double spaces within tag attributes were being converted to non-breaking space entities.
      • 
+	
    • Changed a few docblock comments to reflect actual return values.
      • 
+
    
+
+
+
    Version 1.7
    
+
    Release Date: October 23, 2008
    
+SVN Revision: 1541
    
+
+
      
+	
    • Libraries
+		
        
+			
      • Added a new Form Validation Class.  It simplifies setting rules and field names, supports arrays as field names, allows groups of validation rules to be saved in a config file, and adds some helper functions for use in view files.  Please note that the old Validation class is now deprecated. We will leave it in the library folder for some time so that existing applications that use it will not break, but you are encouraged to migrate to the new version.
        • 
+			
      • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
        • 
+			
      • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
        • 
+			
      • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
        • 
+			
      • Added controller class/method info to Profiler class and support for multiple database connections.
        • 
+			
      • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
        • 
+			
      • Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.
        • 
+			
      • Improved Parser class to allow multiple calls to the parse() function.  The output of each is appended in the output.
        • 
+			
      • Added max_filename option to set a file name length limit in the  File Upload Class.
        • 
+			
      • Added set_status_header() function to Output class.
        • 
+			
      • Modified Pagination class to only output the "First" link when the link for page one would not be shown.
        • 
+			
      • Added support for mb_strlen in the Form Validation class so that multi-byte languages will calculate string lengths properly.
        • 
+		
      
+	
      • 
+	
    • Database
+		
        
+			
      • Improved Active Record class to allow full path column and table names:  hostname.database.table.column.  Also improved the alias handling.
        • 			
+			
      • Improved how table and column names are escaped and prefixed.  It now honors full path names when adding prefixes and escaping.
        • 
+			
      • Added Active Record caching feature to "update" and "delete" functions.
        • 
+			
      • Added removal of non-printing control characters in escape_str() of DB drivers that do not have native PHP escaping mechanisms (mssql, oci8, odbc), to avoid potential SQL errors, and possible sources of SQL injection.
        • 
+			
      • Added port support to MySQL, MySQLi, and MS SQL database drivers.
        • 
+			
      • Added driver name variable in each DB driver, based on bug report #4436.
        • 
+		
      
+	
      • 
+	
    • Helpers
+		
        
+			
      • Added several new "setting" functions to the Form helper that allow POST data to be retrieved and set into forms.  These are intended to be used on their own, or with the new Form Validation Class.
        • 
+			
      • Added current_url() and uri_segments() to  URL helper.
        • 
+			
      • Altered auto_link() in the URL helper so that email addresses with "+" included will be linked.
        • 
+			
      • Added meta() function to  HTML helper.
        • 
+			
      • Improved accuracy of calculations in Number helper.
        • 
+			
      • Removed added newlines ("\n") from most form and html helper functions.
        • 
+			
      • Tightened up validation in the Date helper function human_to_unix(), and eliminated the POSIX regex.
        • 
+			
      • Updated Date helper to match the world's current time zones and offsets.
        • 
+			
      • Modified url_title() in the URL helper to remove characters and digits that are part of
+				character entities, to allow dashes, underscores, and periods regardless of the $separator, and to allow uppercase characters.
        • 
+			
      • Added support for arbitrary attributes in anchor_popup() of the URL helper.
        • 
+		
      
+	
      • 
+	
    • Other Changes
+		
        
+			
      • Added PHP Style Guide to docs.
        • 
+			
      • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
        • 
+			
      • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
        • 
+			
      • Added a file lock check during caching, before trying to write to the file.
        • 
+			
      • Modified Cookie key cleaning to unset a few troublesome key names that can be present in certain environments, preventing CI from halting execution.
        • 
+			
      • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div.
        • 
+		
      
+	
      • 
+
    
+
+
    Bug fixes for 1.7.0
    
+
      
+	
    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • 
+	
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229, #5254, #5351).
      • 
+	
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
      • 
+	
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
      • 
+	
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • 
+	
    • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.
      • 
+	
    • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.
      • 
+	
    • Fixed a bug (#4536) in backups with the MySQL driver where some legacy code was causing certain characters to be double escaped.
      • 
+	
    • Fixed a routing bug (#4661) that occurred when the default route pointed to a subfolder.
      • 
+	
    • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
      • 
+	
    • Fixed the spelling of "raspberry" in config/smileys.php.
      • 
+	
    • Fixed incorrect parenthesis in form_open() function (#5135).
      • 
+	
    • Fixed a bug that was ignoring case when comparing controller methods (#4560).
      • 
+	
    • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function.
      • 
+	
    • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
      • 
+	
    • Fixed Oracle bug (#3306) that was preventing multiple queries in one action.
      • 
+	
    • Fixed ODBC bug that was ignoring connection params due to its use of a constructor.
      • 
+	
    • Fixed a DB driver bug with num_rows() that would cause an error with the Oracle driver.
      • 
+	
    • Fixed MS SQL bug (#4915).  Added brackets around database name in MS SQL driver when selecting the database, in the event that reserved characters are used in the name.
      • 
+	
    • Fixed a DB caching bug (4718) in which the path was incorrect when no URI segments were present.
      • 
+	
    • Fixed Image_lib class bug #4562.  A path was not defined for NetPBM.
      • 
+	
    • Fixed Image_lib class bug #4532.  When cropping an image with identical height/width settings on output, a copy is made.
      • 
+	
    • Fixed DB_driver bug (4900), in which a database error was not being logged correctly.
      • 
+	
    • Fixed DB backup bug in which field names were not being escaped.
      • 
+	
    • Fixed a DB Active Record caching bug in which multiple calls to cached data were not being honored.
      • 
+	
    • Fixed a bug in the Session class that was disallowing slashes in the serialized array.
      • 
+	
    • Fixed a Form Validation bug in which the "isset" error message was being trigged by the "required" rule.
      • 
+	
    • Fixed a spelling error in a Loader error message.
      • 
+	
    • Fixed a bug (5050) with IP validation with empty segments.
      • 
+	
    • Fixed a bug in which the parser was being greedy if multiple identical sets of tags were enountered.
      • 
+
    
+
+
    Version 1.6.3
    
+
    Release Date: June 26, 2008
    
+SVN Revision: 1238
    
+
    Version 1.6.3 is a security and maintenance release and is recommended for all users.
    
+
      
+	
    • Database
+		
        
+			
      • Modified MySQL/MySQLi Forge class to give explicit names to keys
        • 
+			
      • Added ability to set multiple column non-primary keys to the Forge class
        • 
+			
      • Added ability to set additional database config values in DSN connections via the query string.
        • 
+			
      
+	
      • 
+	
    • Libraries
+		
        
+			
      • Set the mime type check in the Upload class to reference the global mimes variable.
        • 
+			
      • Added support for query strings to the Pagination class, automatically detected or explicitly declared.
        • 
+			
      • Added get_post() to the Input class.
        • 
+			
      • Documented get() in the Input class.
        • 
+			
      • Added the ability to automatically output language items as form labels in the Language class.
        • 
+		
      
+	
      • 
+	
    • Helpers
+		
+	
      • 
+	
    • Other changes
+		
        
+			
      • Improved security in xss_clean().
        • 
+			
      • Removed an unused Router reference in _display_cache().
        • 
+			
      • Added ability to use xss_clean() to test images for XSS, useful for upload security.
        • 
+			
      • Considerably expanded list of mobile user-agents in config/user_agents.php.
        • 
+			
      • Charset information in the userguide has been moved above title for internationalization purposes (#4614).
        • 
+			
      • Added "Using Associative Arrays In a Request Parameter" example to the XMLRPC userguide page.
        • 
+			
      • Removed maxlength and size as automatically added attributes of form_input() in the form helper.
        • 
+			
      • Documented the language file use of byte_format() in the number helper.
        • 
+		
      
+	
      • 
+
    
+
+
+
    Bug fixes for 1.6.3
    
+
+
      
+	
    • Added a language key for valid_emails in validation_lang.php.
      • 
+	
    • Amended fixes for bug (#3419) with parsing DSN database connections.
      • 
+	
    • Moved the _has_operators() function (#4535) into DB_driver from DB_active_rec.
      • 
+	
    • Fixed a syntax error in upload_lang.php.
      • 
+	
    • Fixed a bug (#4542) with a regular expression in the Image library.
      • 
+	
    • Fixed a bug (#4561) where orhaving() wasn't properly passing values.
      • 
+	
    • Removed some unused variables from the code (#4563).
      • 
+	
    • Fixed a bug where having() was not adding an = into the statement (#4568).
      • 
+	
    • Fixed assorted user guide typos or examples (#4574, #4706).
      • 
+	
    • Added quoted-printable headers to Email class when the multi-part override is used.
      • 
+	
    • Fixed a double opening <p> tag in the index pages of each system directory.
      • 
+
    
+
+
    Version 1.6.2
    
+
    Release Date: May 13, 2008
    
+SVN Revision: 1155
    
+
      
+	
    • Active Record
+		
        
+			
      • Added the ability to prevent escaping in having() clauses.
        • 
+			
      • Added rename_table() into DBForge.
        • 
+			
      • Fixed a bug that wasn't allowing escaping to be turned off if the value of a query was NULL.
        • 
+			
      • DB Forge is now assigned to any models that exist after loading (#3457).
        • 
+			
      
+	
      • 
+	
    • Database
+		
        
+			
      • Added Strict Mode to database transactions.
        • 
+			
      • Escape behaviour in where() clauses has changed; values in those with the "FALSE" argument are no longer escaped (ie: quoted).
        • 
+		
      
+	
      • 
+	
    • Config
+		
        
+			
      • Added 'application/vnd.ms-powerpoint' to list of mime types.
        • 
+			
      • Added 'audio/mpg' to list of mime types.
        • 
+			
      • Added new user-modifiable file constants.php containing file mode and fopen constants.
        • 
+			
      • Added the ability to set CRLF settings via config in the Email class.
        • 
+		
      
+	
      • 
+	
    • Libraries
+		
        
+			
      • Added increased security for filename handling in the Upload library.
        • 
+			
      • Added increased security for sessions for client-side data tampering.
        • 
+			
      • The MySQLi forge class is now in sync with MySQL forge. 
        • 
+			
      • Added the ability to set CRLF settings via config in the Email class.
        • 
+			
      • Unit Testing results are now colour coded, and a change was made to the default template of results.
        • 
+			
      • Added a valid_emails rule to the Validation class.
        • 
+			
      • The Zip class now exits within download().
        • 
+			
      • The Zip class has undergone a substantial re-write for speed and clarity (thanks stanleyxu for the hard work and code contribution in bug report #3425!)
        • 
+		
      
+	
      • 
+	
    • Helpers
+		
        
+			
      • Added a Compatibility Helper for using some common PHP 5 functions safely in applications that might run on PHP 4 servers (thanks Seppo for the hard work and code contribution!)
        • 
+			
      • Added form_button() in the Form helper.
        • 
+			
      • Changed the radio() and checkbox() functions to default to not checked by default.
        • 
+			
      • Added the ability to include an optional HTTP Response Code in the redirect() function of the URL Helper.
        • 
+			
      • Modified img() in the HTML Helper to remove an unneeded space (#4208).
        • 
+			
      • Modified anchor() in the URL helper to no longer add a default title= attribute (#4209).
        • 
+			
      • The Download helper now exits within force_download().
        • 
+			
      • Added get_dir_file_info(), get_file_info(), and get_mime_by_extension() to the File Helper.
        • 
+			
      • Added symbolic_permissions() and octal_permissions() to the File helper.
        • 
+		
      
+	
      • 
+	
    • Plugins
+		
        
+			
      • Modified captcha generation to first look for the function imagecreatetruecolor, and fallback to imagecreate if it isn't available (#4226).
        • 
+		
      
+	
      • 
+	
    • Other
+		Changes
+		
        
+			
      • Added ability for xss_clean() to accept arrays.
        • 
+			
      • Removed closing PHP tags from all PHP files to avoid accidental output and potential 'cannot modify headers' errors.
        • 
+			
      • Removed "scripts" from the auto-load search path. Scripts were deprecated 
+				in Version 1.4.1 (September 21, 2006). If you still need to use them for legacy reasons, they must now be manually loaded in each Controller.
        • 
+			
      • Added a Reserved Names page to the userguide, and migrated reserved controller names into it.
        • 
+			
      • Added a Common Functions page to the userguide for globally available functions.
        • 
+			
      • Improved security and performance of xss_clean().
        • 
+		
      
+	
      • 
+	
    
+
+
    Bugfixes for 1.6.2
    
+
      
+	
    • Fixed a bug where SET queries were not being handled as "write" queries.
      • 
+	
    • Fixed a bug (#3191) with ORIG_PATH_INFO URI parsing.
      • 
+	
    • Fixed a bug in DB Forge, when inserting an id field (#3456).
      • 
+	
    • Fixed a bug in the table library that could cause identically constructed rows to be dropped (#3459).
      • 
+	
    • Fixed DB Driver and MySQLi result driver checking for resources instead of objects (#3461).
      • 
+	
    • Fixed an AR_caching error where it wasn't tracking table aliases (#3463).
      • 
+	
    • Fixed a bug in AR compiling, where select statements with arguments got incorrectly escaped (#3478).
      • 
+	
    • Fixed an incorrect documentation of $this->load->language (#3520).
      • 
+	
    • Fixed bugs (#3523, #4350) in get_filenames() with recursion and problems with Windows when $include_path is used.
      • 
+	
    • Fixed a bug (#4153) in the XML-RPC class preventing dateTime.iso8601 from being used.
      • 
+	
    • Fixed an AR bug with or_where_not_in() (#4171).
      • 
+	
    • Fixed a bug with xss_clean() that would add semicolons to GET URI variable strings.
      • 
+	
    • Fixed a bug (#4206) in the Directory Helper where the directory resource was not being closed, and minor improvements.
      • 
+	
    • Fixed a bug in the FTP library where delete_dir() was not working recursively (#4215).
      • 
+	
    • Fixed a Validation bug when set_rules() is used with a non-array field name and rule (#4220).
      • 
+	
    • Fixed a bug (#4223) where DB caching would not work for returned DB objects or multiple DB connections.
      • 
+	
    • Fixed a bug in the Upload library that might output the same error twice (#4390).
      • 
+	
    • Fixed an AR bug when joining with a table alias and table prefix (#4400).
      • 
+	
    • Fixed a bug in the DB class testing the $params argument.
      • 
+	
    • Fixed a bug in the Table library where the integer 0 in cell data would be displayed as a blank cell.
      • 
+	
    • Fixed a bug in link_tag() of the URL helper where a key was passed instead of a value.
      • 
+	
    • Fixed a bug in DB_result::row() that prevented it from returning individual fields with MySQL NULL values.
      • 
+	
    • Fixed a bug where SMTP emails were not having dot transformation performed on lines that begin with a dot.
      • 
+	
    • Fixed a bug in display_error() in the DB driver that was instantiating new Language and Exception objects, and not using the error heading.
      • 
+	
    • Fixed a bug (#4413) where a URI containing slashes only e.g. 'http://example.com/index.php?//' would result in PHP errors
      • 
+	
    • Fixed an array to string conversion error in the Validation library (#4425)
      • 
+	
    • Fixed bug (#4451, #4299, #4339) where failed transactions will not rollback when debug mode is enabled.
      • 
+	
    • Fixed a bug (#4506) with overlay_watermark() in the Image library preventing support for PNG-24s with alpha transparency
      • 
+	
    • Fixed assorted user guide typos (#3453, #4364, #4379, #4399, #4408, #4412, #4448, #4488).
      • 
+	
    
+
+
    Version 1.6.1
    
+
    Release Date: February 12, 2008
    
+	SVN Revision: 984
    
+
      
+	
    • Active Record 
+		
+	
      • 
+	
    • Database drivers
+		
        
+			
      • Added support for setting client character set and collation for MySQLi.
        • 
+		
      
+	
      • 
+	
    • Core Changes
+		
        
+			
      • Modified xss_clean() to be more intelligent with its handling of URL encoded strings.
        • 
+			
      • Added $_SERVER, $_FILES, $_ENV, and $_SESSION to sanitization of globals.
        • 
+			
      • Added a Path Helper.
        • 
+			
      • Simplified _reindex_segments() in the URI class.
        • 
+			
      • Escaped the '-' in the default 'permitted_uri_chars' config item, to prevent errors if developers just try to add additional characters to the end of the default expression.
        • 
+			
      • Modified method calling to controllers to show a 404 when a private or protected method is accessed via a URL.
        • 
+			
      • Modified framework initiated 404s to log the controller and method for invalid requests.
        • 
+		
      
+	
      • 
+	
    • Helpers
+		
        
+			
      • Modified get_filenames() in the File Helper to return FALSE if the $source_dir is not readable.
        • 
+		
      
+	
      • 
+
    
+
+
+
    Bugfixes for 1.6.1
    
+
      
+	
    • Deprecated is_numeric as a validation rule. Use of numeric and integer are preferred.
      • 
+	
    • Fixed bug (#3379) in DBForge with SQLite for table creation.
      • 
+	
    • Made Active Record fully database prefix aware (#3384).
      • 
+	
    • Fixed a bug where DBForge was outputting invalid SQL in Postgres by adding brackets around the tables in FROM.
      • 
+	
    • Changed the behaviour of Active Record's update() to make the WHERE clause optional (#3395).
      • 
+	
    • Fixed a bug (#3396) where certain POST variables would cause a PHP warning.
      • 
+	
    • Fixed a bug in query binding (#3402).
      • 
+	
    • Changed order of SQL keywords in the Profiler $highlight array so OR would not be highlighted before ORDER BY.
      • 
+	
    • Fixed a bug (#3404) where the MySQLi driver was testing if $this->conn_id was a resource instead of an object.
      • 
+	
    • Fixed a bug (#3419) connecting to a database via a DSN string.
      • 
+	
    • Fixed a bug (#3445) where the routed segment array was not re-indexed to begin with 1 when the default controller is used.
      • 
+	
    • Fixed assorted user guide typos.
      • 
+
    
+
+
+
+
    Version 1.6.0
    
+
    Release Date: January 30, 2008 
    
+
      
+	
    • DBForge
+		
        
+			
      • Added DBForge to the database tools.
        • 
+			
      • Moved create_database() and drop_database() into DBForge.
        • 
+			
      • Added add_field(), add_key(), create_table(), drop_table(), add_column(), drop_column(), modify_column() into DBForge.
        • 
+		
      
+	
      • 
+
+	
    • Active Record
+		
        
+			
      • Added protect_identifiers() in Active Record.
        • 
+			
      • All AR queries are backticked if appropriate to the database.
        • 
+			
      • Added where_in(), or_where_in(), where_not_in(),  or_where_not_in(), not_like() and or_not_like() to Active Record.
        • 
+			
      • Added support for limit()  into update() and delete() statements in  Active Record.
        • 
+			
      • Added empty_table() and truncate_table() to Active Record.
        • 
+			
      • Added the ability to pass an array of tables to the delete() statement in Active Record.
        • 
+			
      • Added count_all_results() function to Active Record.
        • 
+			
      • Added select_max(), select_min(), select_avg() and select_sum() to Active Record.
        • 
+			
      • Added the ability to use aliases with joins in Active Record.
        • 
+			
      • Added a third parameter to Active Record's like() clause to control where the wildcard goes. 
        • 
+			
      • Added a third parameter to set() in Active Record that withholds escaping data.
        • 
+			
      • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
        • 
+		
      
+	
      • 
+	
+	
    • Other Database Related
+		
        
+			
      • MySQL driver now requires MySQL 4.1+
        • 
+			
      • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or not. Previously they were always saved.
        • 
+			
      • Added $this->db->dbprefix() to manually add database prefixes.
        • 
+			
      • Added 'random' as an order_by() option , and removed "rand()" as a listed option as it was MySQL only.
        • 
+			
      • Added a check for NULL fields in the MySQL database backup utility.
        • 
+			
      • Added "constrain_by_prefix" parameter to db->list_table() function.  If set to TRUE it will limit the result to only table names with the current prefix.
        • 
+			
      • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); havingor() for having_or(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
        • 
+			
      • Modified csv_from_result() to output CSV data more in the spirit of basic rules of RFC 4180.
        • 
+			
      • Added 'char_set' and 'dbcollat' database configuration settings, to explicitly set the client communication properly.
        • 
+			
      • Removed 'active_r' configuration setting and replaced with a global $active_record setting, which is more
+				in harmony with the global nature of the behavior (#1834).
        • 
+		
      
+	
      • 
+	
+	
    • Core changes
+		
        
+			
      • Added ability to load multiple views, whose content will be appended to the output in the order loaded.
        • 
+			
      • Added the ability to auto-load Models.
        • 
+			
      • Reorganized the URI and Routes classes for better clarity.
        • 
+			
      • Added Compat.php to allow function overrides for older versions of PHP or PHP environments missing certain extensions / libraries
        •    
+			
      • Added memory usage, GET, URI string data, and individual query execution time to Profiler output.
        • 
+			
      • Deprecated Scaffolding.
        • 
+			
      • Added is_really_writable() to Common.php to provide a cross-platform reliable method of testing file/folder writability.
        • 
+		
      
+	
      • 
+	
+	
    • Libraries
+		
        
+			
      • Changed the load protocol of Models to allow for extension.
        • 
+			
      • Strengthened the Encryption library to help protect against man in the middle attacks when MCRYPT_MODE_CBC mode is used.
        • 
+			
      • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
        • 
+			
      • Removed 'last_visit' from the Session class.
        • 
+			
      • Added a language entry for valid_ip validation error.
        • 
+			
      • Modified prep_for_form() in the Validation class to accept arrays, adding support for POST array validation (via callbacks only)
        • 
+			
      • Added an "integer" rule into the Validation library.
        • 
+			
      • Added valid_base64() to the Validation library.
        • 
+			
      • Documented clear() in the Image Processing library.
        • 
+			
      • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule. 
        • 
+			
      • Modified Upload class $_FILES error messages to be more precise.
        • 
+			
      • Moved the safe mode and auth checks for the Email library into the constructor. 
        • 
+			
      • Modified variable names in _ci_load() method of Loader class to avoid conflicts with view variables.
        • 
+			
      • Added a few additional mime type variations for CSV.
        • 
+			
      • Enabled the 'system' methods for the XML-RPC Server library, except for 'system.multicall' which is still disabled.
        • 
+		
      
+	
      • 
+	
+	
    • Helpers & Plugins
+		
        
+			
      • Added link_tag() to the HTML helper.
        • 
+			
      • Added img() to the HTML helper.
        • 
+			
      • Added ability to "extend" Helpers.
        • 
+			
      • Added an email helper into core helpers.
        • 
+			
      • Added strip_quotes() function to string helper.
        • 
+			
      • Added reduce_multiples() function to string helper.
        • 
+			
      • Added quotes_to_entities() function to string helper.
        • 
+			
      • Added form_fieldset(), form_fieldset_close(), form_label(), and form_reset() function to form helper.
        • 
+			
      • Added support for external urls in form_open().
        • 
+			
      • Removed support for db_backup in MySQLi due to incompatible functions.
        • 
+			
      • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
        • 
+		
      
+	
      • 
+	
+	  
+	
    • Documentation Changes
+		
        
+			
      • Added Writing Documentation section for the community to use in writing their own documentation.
        • 
+			
      • Added titles to all user manual pages.
        • 
+			
      • Added attributes into <html> of userguide for valid html.
        • 
+			
      • Added Zip Encoding Class to the table of contents of the userguide.
        • 
+			
      • Moved part of the userguide menu javascript to an external file.
        • 
+			
      • Documented distinct() in Active Record. 
        • 
+			
      • Documented the timezones() function in the Date Helper.
        • 
+			
      • Documented unset_userdata in the Session class.
        • 
+			
      • Documented 2 config options to the Database configuration page.
        • 
+		
      
+	
      • 
+
    
+
+
    Bug fixes for Version 1.6.0
    
+	
+
      
+	
    • Fixed a bug (#1813) preventing using $CI->db in the same application with returned database objects.
      • 
+	
    • Fixed a bug (#1842) where the $this->uri->rsegments array would not include the 'index' method if routed to the controller without an implicit method.
      • 
+	
    • Fixed a bug (#1872) where word_limiter() was not retaining whitespace.
      • 
+	
    • Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.
      • 
+	
    • Fixed a bug (#2542)in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
      • 
+	
    • Fixed a bug (#2545) in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
      • 
+	
    • Fixed a bug (#2668) in the parser class where numeric data was ignored.
      • 
+	
    • Fixed a bug (#2679) where the "previous" pagination link would get drawn on the first page.
      • 
+	
    • Fixed a bug (#2702) in _object_to_array that broke some types of inserts and updates.
      • 
+	
    • Fixed a bug (#2732) in the SQLite driver for PHP 4.
      • 
+	
    • Fixed a bug (#2754) in Pagination to scan for non-positive num_links.
      • 
+	
    • Fixed a bug (#2762) in the Session library where user agent matching would fail on user agents ending with a space. 
      • 
+	
    • Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgres and sqlite drivers.
      • 
+	
    • Fixed a bug (#2810) in the typography helper causing extraneous paragraph tags when string contains tags.
      • 
+	
    • Fixed a bug (#2849) where arguments passed to a subfolder controller method would be incorrectly shifted, dropping the 3rd segment value.
      • 
+	
    • Fixed a bug (#2858) which referenced a wrong variable in the Image class.
      • 
+	
    • Fixed a bug (#2875)when loading plugin files as _plugin. and not _pi.
      • 
+	
    • Fixed a bug (#2912) in get_filenames() in the File Helper where the array wasn't cleared after each call.
      • 
+	
    • Fixed a bug (#2974) in highlight_phrase() that caused an error with slashes.
      • 
+	
    • Fixed a bug (#3003) in the Encryption Library to support modes other than MCRYPT_MODE_ECB
      • 
+	
    • Fixed a bug (#3015) in the User Agent library where more then 2 languages where not reported with languages().
      • 
+	
    • Fixed a bug (#3017) in the Email library where some timezones were calculated incorrectly. 
      • 
+	
    • Fixed a bug (#3024) in which master_dim wasn't getting reset by clear() in the Image library.
      • 
+	
    • Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.
      • 
+	
    • Fixed a bug (#3166) that prevented num_rows from working in Oracle.
      • 
+	
    • Fixed a bug (#3175) preventing certain libraries from working properly when autoloaded in PHP 4.
      • 
+	
    • Fixed a bug (#3267) in the Typography Helper where unordered list was listed "un.
      • 
+	
    • Fixed a bug (#3268) where the Router could leave '/' as the path.
      • 
+	
    • Fixed a bug (#3279) where the Email class was sending the wrong Content-Transfer-Encoding for some character sets.
      • 
+	
    • Fixed a bug (#3284) where the rsegment array would not be set properly if the requested URI contained more segments than the routed URI.
      • 
+	
    • Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).
      • 
+	
    • Removed an extraneous call to loading models (#3286).
      • 
+	
    • Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.
      • 
+	
    • Fixed a bug (#3314) which would cause the top level path to be deleted in delete_files() of the File helper.
      • 
+	
    • Fixed a bug (#3328) where the smiley helper might return an undefined variable.
      • 
+	
    • Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.
      • 
+	
    • Removed an unused parameter from Profiler (#3332).
      • 
+	
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
      • 
+	
    • Fixed a bug in the upload library when allowed_files wasn't defined.
      • 
+	
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object. 
      • 
+	
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
      • 
+	
    • Fixed a bug in Validation where individual error messages for checkboxes wasn't supported.
      • 
+	
    • Fixed a bug in captcha calling an invalid PHP function.
      • 
+	
    • Fixed a bug in the cookie helper "set_cookie" function.  It was not honoring the config settings.
      • 
+	
    • Fixed a bug that was making validation callbacks required even when not set as such.
      • 
+	
    • Fixed a bug in the XML-RPC library so if a type is specified, a more intelligent decision is made as to the default type.
      • 
+	
    • Fixed an example of comma-separated emails in the email library documentation.
      • 
+	
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
      • 
+	
    • Fixed a typo in the database language file.
      • 
+	
    • Fixed a typo in the image language file "suppor" to "support".
      • 
+	
    • Fixed an example for XML RPC.
      • 
+	
    • Fixed an example of accept_charset() in the User Agent Library.
      • 
+	
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
      • 
+	
    • Fixed a typo in the String Helper (uniquid changed to uniqid).
      • 
+	
    • Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login), and FTP Class (ftp_unable_to_remame).
      • 
+	
    • Added a stripslashes()  into the Upload Library.
      • 
+	
    • Fixed a series of grammatical and spelling errors in the language files.
      • 
+	
    • Fixed assorted user guide typos.
      • 
+
    
+
    Version 1.5.4
    
+
    Release Date: July 12, 2007 
    
+
      
+	
    • Added custom Language files to the autoload options. 
      • 
+	
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
      • 
+	
    • Added array to string into the profiler.
      • 
+	
    • Added some additional mime types in application/config/mimes.php.
      • 
+	
    • Added filename_security() method to Input library.
      • 
+	
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s".  Also added a force parameter to pluralize().
      • 
+	
    • Added $config['charset'] to the config file.  Default value is 'UTF-8', used in some string handling functions.
      • 
+	
    • Fixed MSSQL insert_id().
      • 
+	
    • Fixed a logic error in the DB trans_status() function.  It was incorrectly returning TRUE on failure and FALSE on success.
      • 
+	
    • Fixed a bug that was allowing multiple load attempts on extended classes.
      • 
+	
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
      • 
+	
    • Fixed a bug in the escape_str() function in the MySQL driver.
      • 
+	
    • Fixed a typo in the Calendar library  
      • 
+	
    • Fixed a typo in rpcs.php library
      • 
+	
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
      • 
+	
    • Fixed a bug in router that was ignoring the scaffolding route for optimization 
      • 
+	
    • Fixed an IP validation bug.
      • 
+	
    • Fixed a bug in display of POST keys in the Profiler output
      • 
+	
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
      • 
+	
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
      • 
+	
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
      • 
+	
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
      • 
+	
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
      • 
+	
    • Fixed various doc typos. 
      • 
+	
    • Documented two functions from the String helper  that were missing from the user guide:  trim_slashes() and reduce_double_slashes().
      • 
+	
    • Docs now validate to XHTML 1 transitional
      • 
+	
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
      • 
+	
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
      • 
+	
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
      • 
+	
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
      • 
+	
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
      • 
+	
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
      • 
+	
    • Deprecated the use if is_numeric() in various places since it allows periods.  Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead:  preg_match("/[^0-9]/", $n)
      • 
+	
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity. 
      • 
+
    
+
    Version 1.5.3
    
+
    Release Date: April 15, 2007 
    
+
      
+	
    • Added array to string into the profiler 
      • 
+	
    • Code Igniter references updated to CodeIgniter 
      • 
+	
    • pMachine references updated to EllisLab 
      • 
+	
    • Fixed a bug in the repeater function of string helper. 
      • 
+	
    • Fixed a bug in ODBC driver 
      • 
+	
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
      • 
+	
    • Fixed a bug in the redirect function of the url helper. 
      • 
+	
    • Fixed an undefined variable in Loader 
      • 
+	
    • Fixed a version bug in the Postgres driver 
      • 
+	
    • Fixed a bug in the textarea function of the form helper for use with strings
      • 
+	
    • Fixed doc typos. 
      • 
+
    
+
    Version 1.5.2
    
+
    Release Date: February 13, 2007 
    
+
      
+	
    • Added subversion information to the downloads page. 
      • 
+	
    • Added support for captions in the Table Library 
      • 
+	
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather than download 
      • 
+	
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
      • 
+	
    • Removed unescaped variables in error messages of Input and Router classes
      • 
+	
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.  
      • 
+	
    • Fixed a bug in the form helper that gave textarea a value attribute 
      • 
+	
    • Fixed a bug in the Image Library that was ignoring resizing the same size image 
      • 
+	
    • Fixed some doc typos.
      • 
+
    
+
+
+
    Version 1.5.1
    
+
    Release Date: November 23, 2006
    
+
      
+	
    • Added support for submitting arrays of libraries in the $this->load->library function.
      • 
+	
    • Added support for naming custom library files in lower or uppercase.
      • 
+	
    • Fixed a bug related to output buffering.
      • 
+	
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
      • 
+	
    • Fixed a bug that was suppressing errors in controllers.
      • 
+	
    • Fixed a problem that can cause a loop to occur when the config file is missing.
      • 
+	
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
      • 
+	
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
      • 
+	
    • Fixed some bugs in the Oracle DB driver.
      • 
+	
    • Fixed an incorrectly named variable in the MySQLi result driver.
      • 
+	
    • Fixed some doc typos.
      • 
+
    
+
    Version 1.5.0.1
    
+
    Release Date: October 31, 2006
    
+
      
+
    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
      • 
+
    • Fixed a bug in the word_wrap() helper function.
      • 
+
    • Fixed an invalid color Hex number in the Profiler class.
      • 
+
    • Fixed a corrupted image in the user guide.
      • 
+
    
+
+
+
+
    Version 1.5.0
    
+
    Release Date: October 30, 2006
    
+
+
      
+
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • 
+
    • Added Database Caching Class.
      • 
+
    • Added transaction support to the database classes.
      • 
+
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
      • 
+
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
      • 
+
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
      • 
+
    • Added Zip Encoding Library.
      • 
+
    • Added FTP Library.
      • 
+
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
      • 
+
    • Added support for storing models within sub-folders.
      • 
+
    • Added Download Helper.
      • 
+
    • Added simple_query() function to the database classes
      • 
+
    • Added standard_date() function to the Date Helper.
      • 
+
    • Added $query->free_result() to database class.
      • 
+
    • Added $query->list_fields() function to database class
      • 
+
    • Added $this->db->platform() function
      • 
+
    • Added new File Helper:  get_filenames()
      • 
+
    • Added new helper:  Smiley Helper
      • 
+
    • Added support for <ul> and <ol> lists in the  HTML Helper
      • 
+
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags.  This allows the cleaner syntax to be used regardless of whether it's supported by the server.
      • 
+
    • Added the ability to rename or relocate the "application" folder.
      • 
+
    • Added more thorough initialization in the upload class so that all class variables are reset.
      • 
+
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
      • 
+
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
      • 
+
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
      • 
+
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
      • 
+
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
      • 
+
    • Documented three functions from the Validation class that were missing from the user guide:  set_select(), set_radio(), and set_checkbox().
      • 
+
    • Fixed a bug in the Email class related to SMTP Helo data.
      • 
+
    • Fixed a bug in the word wrapping helper and function in the email class.
      • 
+
    • Fixed a bug in the validation class.
      • 
+
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
      • 
+
    • Fixed a problem in the form_prep() function that was double encoding entities.
      • 
+
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
      • 
+
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
      • 
+
    • Fixed a pagination bug that was permitting negative values in the URL.
      • 
+
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
      • 
+
    • Changed _get_config() to get_config() since the function is not a private one.
      • 
+
    • Deprecated "init" folder.  Initialization happens automatically now.  Please see documentation.
      • 
+
    • Deprecated $this->db->field_names()  USE  $this->db->list_fields()
      • 
+
    • Deprecated the $config['log_errors'] item from the config.php file.  Instead, $config['log_threshold'] can be set to "0" to turn it off.
      • 
+
    
+
+
+
+
+
    Version 1.4.1
    
+
    Release Date: September 21, 2006
    
+
+
      
+
    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
      • 
+
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class.  More info in the Controllers page.
      • 
+
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
      • 
+
    • Added $this->output->set_header() function, which allows you to set server headers.
      • 
+
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders.  Previously they were always treated as global for your entire installation.  If your application folder contains any of these resources they will be used instead the global ones.
      • 
+
    • Added Inflector helper.
      • 
+
    • Added element() function in the array helper.
      • 
+
    • Added RAND() to active record orderby() function.
      • 
+
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
      • 
+
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
      • 
+
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
      • 
+
    • Added output compression option to the config file.
      • 
+
    • Removed the is_numeric test from the db->escape() function.
      • 
+
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
      • 
+
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
      • 
+
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
      • 
+
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
      • 
+
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
      • 
+
    • Added some code to allow email attachments to be reset when sending batches of email.
      • 
+
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own
+libraries or models instead.  It was originally added before CI had user libraries or models, but it's not needed anymore.
      • 
+
    • Deprecated the $autoload['core'] item from the autoload.php file.  Instead, please now use: $autoload['libraries']
      • 
+
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().
      • 
+
    
+
+
+
+
    Version 1.4.0
    
+
    Release Date: September 17, 2006
    
+
+
      
+
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • 
+
    • Added the ability to organize controller files into sub-folders.  Kudos to Marco for suggesting this (and the next two) feature.
      • 
+
    • Added regular expressions support for routing rules.
      • 
+
    • Added the ability to remap function calls within your controllers.
      • 
+
    • Added the ability to replace core system classes with your own classes.
      • 
+
    • Added support for % character in URL.
      • 
+
    • Added the ability to supply full URLs using the anchor() helper function.
      • 
+
    • Added mode parameter to file_write() helper.
      • 
+
    • Added support for changing the port number in the Postgres driver.
      • 
+
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
      • 
+
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
      • 
+
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
      • 
+
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
      • 
+
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • 
+
    • Updated the form_open() helper to allow the GET method to be used.
      • 
+
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • 
+
    • Updated the SQLite Driver to check for object support before attempting to return results as objects.  If unsupported it returns an array.
      • 
+
    • Updated the Models loader function to allow multiple loads of the same model.
      • 
+
    • Updated the MS SQL driver so that single quotes are escaped.
      • 
+
    • Updated the Postgres and ODBC drivers for better compatibility.
      • 
+
    • Removed a strtolower() call that was changing URL segments to lower case.
      • 
+
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
      • 
+
    • Removed backticks from Postgres class since these are not needed.
      • 
+
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
      • 
+
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name.  Please use dohash() instead.
      • 
+
    • Fixed an bug that was preventing the input class from unsetting GET variables.
      • 
+
    • Fixed a router bug that was making it too greedy when matching end segments.
      • 
+
    • Fixed a bug that was preventing multiple discrete database calls.
      • 
+
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
      • 
+
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
      • 
+
    • Fixed some missing prefixes when using the database prefix feature.
      • 
+
    • Fixed a typo in the Calendar class (cal_november).
      • 
+
    • Fixed a bug in the form_checkbox() helper.
      • 
+
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
      • 
+
    • Fixed an evaluation bug in the database initialization function.
      • 
+
    • Fixed a minor bug in one of the error messages in the language class.
      • 
+
    • Fixed a bug in the date helper timespan function.
      • 
+
    • Fixed an undefined variable in the DB Driver class.
      • 
+
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
      • 
+
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
      • 
+
    • Fixed a couple bugs in the Unit Testing class.
      • 
+
    • Fixed an incorrectly named variable in the Validation class.
      • 
+
    • Fixed an incorrectly named variable in the URI class.
      • 
+
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
      • 
+
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
      • 
+
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
      • 
+
    • Fixed some MS SQL bugs.
      • 
+
    • Fixed some doc typos.
      • 
+
    
+
+
+
+
    Version 1.3.3
    
+
    Release Date: June 1, 2006
    
+
+
      
+
+
    • Models do not connect automatically to the database as of this version. More info here.
      • 
+
    • Updated the Sessions class to utilize the active record class when running session related queries.  Previously the queries assumed MySQL syntax.
      • 
+
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
      • 
+
    • Fixed a bug in the active record "having" function.
      • 
+
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
      • 
+
    • Fixed a bug in the word_limiter() helper function.  It was cutting off the fist word.
      • 
+
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
      • 
+
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
      • 
+
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
      • 
+
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
      • 
+
    • Fixed a bug in the hash() security helper.
      • 
+
    • Fixed some typos.
      • 
+
    
+
+
+
+
+
    Version 1.3.2
    
+
    Release Date: April 17, 2006
    
+
+
      
+
    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
      • 
+
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
      • 
+
    • Fixed a bug in the init_pagination file.  The $config item was not being set correctly.
      • 
+
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
      • 
+
    • Fixed a couple bugs in the Model class.
      • 
+
    • Fixed some documentation typos and errata.
      • 
+
    
+
+
+
+
    Version 1.3.1
    
+
    Release Date: April 11, 2006
    
+
+
      
+
    • Added a Unit Testing Library.
      • 
+
    • Added the ability to pass objects to the insert() and update()  database functions.
+This feature enables you to (among other things) use your  Model class variables to run queries with. See the Models page for details.
      • 
+
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
      • 
+
    • Added getwhere function to Active Record class.
      • 
+
    • Added count_all function to Active Record class.
      • 
+
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
      • 
+
    • Added $this->db->last_query(), which allows you to view your last query that was run.
      • 
+
    • Added a new mime type to the upload class for better compatibility.
      • 
+
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
      • 
+
    • Fixed a bug in a couple of the active record functions (where and orderby).
      • 
+
    • Fixed a bug in the image library when realpath() returns false.
      • 
+
    • Fixed a bug in the Models that was preventing libraries from being used within them.
      • 
+
    • Fixed a bug in the "exact_length" function of the validation class.
      • 
+
    • Fixed some typos in the user guide
      • 
+
    
+
+
+
    Version 1.3
    
+
    Release Date: April 3, 2006
    
+
+
      
+
    • Added support for Models.
      • 
+
    • Redesigned the database libraries to support additional RDBMs (Postgres, MySQLi, etc.).
      • 
+
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
      • 
+
    • Added a feature to the database class that lets you run custom function calls.
      • 
+
    • Added support for private functions in your controllers.  Any controller function name that starts with an underscore will not be served by a URI request.
      • 
+
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
      • 
+
    • Added support for running standard query string URLs.  These can be optionally enabled in your config file.
      • 
+
    • Added the ability to  specify a "suffix", which will be appended to your URLs.  For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
      • 
+
    • Added a new error template for use with native PHP errors.
      • 
+
    • Added "alternator" function in the string helpers.
      • 
+
    • Removed slashing from the input class. After much debate we decided to kill this feature.
      • 
+
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
      • 
+
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and
+all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
      • 
+
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
      • 
+
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
      • 
+
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
      • 
+
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
      • 
+
    • Fixed a typo in the URI class.  $this->total_segment() should be plural: $this->total_segments()
      • 
+
    • Fixed some typos in the default calendar template
      • 
+
    • Fixed some typos in the user guide
      • 
+
    
+
+
+
+
+
+
+
+
+
    Version 1.2
    
+
    Release Date: March 21, 2006
    
+
+
      
+
    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
      • 
+
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
      • 
+
    • Added new File Helper:  delete_files()
      • 
+
    • Added new URL Helpers:  base_url(), index_page()
      • 
+
    • Added the ability to create your own core libraries and store them in your local application directory.
      • 
+
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
      • 
+
    • Added Javascript Calendar plugin.
      • 
+
    • Added search feature to user guide.  Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
      • 
+
    • Updated the parser class so that it allows tag pars within other tag pairs.
      • 
+
    • Fixed a bug in the DB "where" function.
      • 
+
    • Fixed a bug that was preventing custom config files to be auto-loaded.
      • 
+
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
      • 
+
    • Fixed some bugs in the xss_clean function
      • 
+
    
+
+
+
+
+
+
    Version Beta 1.1
    
+
    Release Date: March 10, 2006
    
+
+
      
+
    • Added a Calendaring class.
      • 
+
    • Added support for running multiple applications that share a common CodeIgniter backend.
      • 
+
    • Moved the "uri protocol" variable from the index.php file into the config.php file
      • 
+
    • Fixed a problem that was preventing certain function calls from working within constructors.
      • 
+
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
      • 
+
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
      • 
+
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
      • 
+
    • Fixed a data type error in the form_radio function (form helper)
      • 
+
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
      • 
+
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
      • 
+
    • Fixed a pagination problem in the scaffolding.
      • 
+
    • Fixed a bug in the mysql class "where" function.
      • 
+
    • Fixed a regex problem in some code that trimmed duplicate slashes.
      • 
+
    • Fixed a bug in the br() function in the HTML helper
      • 
+
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
      • 
+
    • Removed the "style" attributes form the form helpers.
      • 
+
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.
      • 
+
    
+
+
    Version Beta 1.0 
    
+
    Release Date: February 28, 2006
    
+
    First publicly released version.
    
+
+
    
+
+
+
+
+
+
+
diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html
index 43385d06..faa1a8ff 100644
--- a/user_guide/general/styleguide.html
+++ b/user_guide/general/styleguide.html
@@ -1,649 +1,649 @@
-
-
-
-
-
-Style Guide : CodeIgniter User Guide
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
-
-
-
-
-
    CodeIgniter User Guide Version 1.7
    
-
    
-
-
-
-
-
-
-
-
-
-
    
-
-
-
    
-
-
-
-
    
-
-
-
    General Style and Syntax
    
-
-
    The following page describes the coding rules use adhere to when developing CodeIgniter.
    
-
-
-
    Table of Contents
    
-
-
-		
    PHP Closing Tag
    
-		
    
-			
    The PHP closing tag on a PHP document ?> is optional to the PHP parser.  However, if used, any whitespace following the closing tag, whether introduced 
-				by the developer, user, or an FTP application, can cause unwanted output, PHP errors, or if the latter are suppressed, blank pages.  For this reason, all PHP files should
-				OMIT the closing PHP tag, and instead use a comment block to mark the end of file and it's location relative to the application root.
-				This allows you to still identify a file as being complete and not truncated.
    
-INCORRECT:
-<?php
-
-echo "Here's my code!";
-
-?>
-
-CORRECT:
-<?php
-
-echo "Here's my code!";
-
-/* End of file myfile.php */
-/* Location: ./system/modules/mymodule/myfile.php */
-
-		
    
-
-	
-		
    Class and Method Naming
    
-		
    
-			
    Class names should always have their first letter uppercase, and the constructor method should match identically.  Multiple words should be separated with an underscore, and not CamelCased.  All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb.  Try to avoid overly long and verbose names.
    
-
-	INCORRECT:
-class superclass
-class SuperClass
-
-CORRECT:
-class Super_class
-
-			
    Notice that the Class and constructor methods are identically named and cased:
    
-
-	class Super_class {
-
-	function Super_class()
-	{
-
-	}
-}
-
-			
    Examples of improper and proper method naming:
    
-
-	INCORRECT:
-function fileproperties()		// not descriptive and needs underscore separator
-function fileProperties()		// not descriptive and uses CamelCase
-function getfileproperties()		// Better!  But still missing underscore separator
-function getFileProperties()		// uses CamelCase
-function get_the_file_properties_from_the_file()	// wordy
-
-CORRECT:
-function get_file_properties()	// descriptive, underscore separator, and all lowercase letters
-
-		
    
-	
-	
-		
    Variable Names
    
-		
    
-			
    The guidelines for variable naming is very similar to that used for class methods.  Namely, variables should contain only lowercase letters, use underscore separators, and be reasonably named to indicate their purpose and contents. Very short, non-word variables should only be used as iterators in for() loops.
    
-INCORRECT:
-$j = 'foo';		// single letter variables should only be used in for() loops
-$Str			// contains uppercase letters
-$bufferedText		// uses CamelCasing, and could be shortened without losing semantic meaning
-$groupid		// multiple words, needs underscore separator
-$name_of_last_city_used	// too long
-
-CORRECT:
-for ($j = 0; $j < 10; $j++)
-$str
-$buffer
-$group_id
-$last_city
-
-		
    
-	
-	
-		
    Commenting
    
-		
    
-			
    In general, code should be commented prolifically.  It not only helps describe the flow and intent of the code for less experienced programmers, but can prove invaluable when returning to your own code months down the line.  There is not a required format for comments, but the following are recommended.
    
-
-			
    DocBlock style comments preceding class and method declarations so they can be picked up by IDEs:
    
-
-/**
- * Super Class
- *
- * @package	Package Name
- * @subpackage	Subpackage
- * @category	Category
- * @author	Author Name
- * @link	http://example.com
- */
-class Super_class {
-
-/**
- * Encodes string for use in XML
- *
- * @access	public
- * @param	string
- * @return	string
- */
-function xml_encode($str)
-
-			
    Use single line comments within code, leaving a blank line between large comment blocks and code.
    
-
-// break up the string by newlines
-$parts = explode("\n", $str);
-
-// A longer comment that needs to give greater detail on what is
-// occurring and why can use multiple single-line comments.  Try to
-// keep the width reasonable, around 70 characters is the easiest to
-// read.  Don't hesitate to link to permanent external resources
-// that may provide greater detail:
-//
-// http://example.com/information_about_something/in_particular/
-
-$parts = $this->foo($parts);
-
-		
    
-	
-	
-		
    Constants
    
-		
    
-			
    Constants follow the same guidelines as do variables, except constants should always be fully uppercase.  Always use ExpressionEngine constants when appropriate, i.e. SLASH, LD, RD, PATH_CACHE, etc.
    
-INCORRECT:
-myConstant	// missing underscore separator and not fully uppercase
-N		// no single-letter constants
-S_C_VER		// not descriptive
-$str = str_replace('{foo}', 'bar', $str);	// should use LD and RD constants
-
-CORRECT:
-MY_CONSTANT
-NEWLINE
-SUPER_CLASS_VERSION
-$str = str_replace(LD.'foo'.RD, 'bar', $str);
-
-		
    
-	
-	
-		
    TRUE, FALSE, and NULL
    
-		
    
-			
    TRUE, FALSE, and NULL keywords should always be fully uppercase.
    
-INCORRECT:
-if ($foo == true)
-$bar = false;
-function foo($bar = null)
-
-CORRECT:
-if ($foo == TRUE)
-$bar = FALSE;
-function foo($bar = NULL)
-		
    
-	
-
-	
-		
    Logical Operators
    
-		
    
-			
    Use of || is discouraged as its clarity on some output devices is low (looking like the number 11 for instance).
-				&& is preferred over AND but either are acceptable, and a space should always precede and follow !.
    
-INCORRECT:
-if ($foo || $bar)
-if ($foo AND $bar)  // okay but not recommended for common syntax highlighting applications
-if (!$foo)
-if (! is_array($foo))
-
-CORRECT:
-if ($foo OR $bar)
-if ($foo && $bar) // recommended
-if ( ! $foo)
-if ( ! is_array($foo))
-
-		
    
-	
-	
-	
-		
    Comparing Return Values and Typecasting
    
-		
    
-			
    Some PHP functions return FALSE on failure, but may also have a valid return value of "" or 0, which would evaluate to FALSE in loose comparisons.  Be explicit by comparing the variable type when using these return values in conditionals to ensure the return value is indeed what you expect, and not a value that has an equivalent loose-type evaluation.
    
-			
    Use the same stringency in returning and checking your own variables.  Use === and !== as necessary.
-
-INCORRECT:
-// If 'foo' is at the beginning of the string, strpos will return a 0,
-// resulting in this conditional evaluating as TRUE
-if (strpos($str, 'foo') == FALSE)
-
-CORRECT:
-if (strpos($str, 'foo') === FALSE)
-
-
-INCORRECT:
-function build_string($str = "")
-{
-	if ($str == "")	// uh-oh!  What if FALSE or the integer 0 is passed as an argument?
-	{
-
-	}
-}
-
-CORRECT:
-function build_string($str = "")
-{
-	if ($str === "")
-	{
-
-	}
-}
-
-		
    See also information regarding typecasting, which can be quite useful.  Typecasting has a slightly different effect which may be desirable.  When casting a variable as a string, for instance, NULL and boolean FALSE variables become empty strings, 0 (and other numbers) become strings of digits, and boolean TRUE becomes "1":
    
-
-$str = (string) $str;	// cast $str as a string
-
-		
    
-	
-	
-		
    Debugging Code
    
-		
    
-			
    No debugging code can be left in place for submitted add-ons unless it is commented out, i.e. no var_dump(), print_r(), die(), and exit() calls that were used while creating the add-on, unless they are commented out.
    
-
-// print_r($foo);
-		
    
-	
-
-	
-		
    Whitespace in Files
    
-		
    
-			
    No whitespace can precede the opening PHP tag or follow the closing PHP tag.  ExpressionEngine output is buffered, so whitespace in your files can cause output to begin before ExpressionEngine outputs its content, leading to errors and an inability for ExpressionEngine to send proper headers.  In the examples below, select the text with your mouse to reveal the incorrect whitespace.
    
-
-			
    INCORRECT:
    
-     
-<?php
-	// ...there is whitespace and a linebreak above the opening PHP tag
-	// as well as whitespace after the closing PHP tag
-?>    
-
-			
    CORRECT:
    
-<?php
-	// this sample has no whitespace before or after the opening and closing PHP tags
-?>
-
-		
    
-	
-	
-		
    Compatibility
    
-		
    
-			
    Unless specifically mentioned in your add-on's documentation, all code must be compatible with PHP version 4.3+.  Additionally, do not use PHP functions that require non-default libraries to be installed unless your code contains an alternative method when the function is not available, or you implicitly document that your add-on requires said PHP libraries.
    
-		
    
-		
-
-	
-		
    Class and File Names using Common Words
    
-		
    
-			
    When your class or filename is a common word, or might quite likely be identically named in another PHP script, provide a unique prefix to help prevent collision.  Always realize that your end users may be running other add-ons or third party PHP scripts.  Choose a prefix that is unique to your identity as a developer or company.
    
-
-INCORRECT:
-class Email		pi.email.php
-class Xml		ext.xml.php
-class Import		mod.import.php
-
-CORRECT:
-class Pre_email		pi.pre_email.php
-class Pre_xml		ext.pre_xml.php
-class Pre_import	mod.pre_import.php
-
-		
    
-	
-	
-		
    Database Table Names
    
-		
    
-			
    Any tables that your add-on might use must use the 'exp_' prefix, followed by a prefix uniquely identifying you as the developer or company, and then a short descriptive table name.  You do not need to be concerned about the database prefix being used on the user's installation, as ExpressionEngine's database class will automatically convert 'exp_' to what is actually being used.
    
-
-INCORRECT:
-email_addresses		// missing both prefixes
-pre_email_addresses	// missing exp_ prefix
-exp_email_addresses	// missing unique prefix
-
-CORRECT:
-exp_pre_email_addresses
-
-
-			
    NOTE: Be mindful that MySQL has a limit of 64 characters for table names.  This should not be an issue as table names that would exceed this would likely have unreasonable names.  For instance, the following table name exceeds this limitation by one character.  Silly, no? exp_pre_email_addresses_of_registered_users_in_seattle_washington
-		
    
-	
-
-	
-		
    One File per Class
    
-		
    
-			
    Use separate files for each class your add-on uses, unless the classes are closely related.  An example of ExpressionEngine files that contains multiple classes is the Database class file, which contains both the DB class and the DB_Cache class, and the Magpie plugin, which contains both the Magpie and Snoopy classes.
    
-		
    
-	
-
-	
-		
    Whitespace
    
-		
    
-			
    Use tabs for whitespace in your code, not spaces.  This may seem like a small thing, but using tabs instead of whitespace allows the developer looking at your code to have indentation at levels that they prefer and customize in whatever application they use.  And as a side benefit, it results in (slightly) more compact files, storing one tab character versus, say, four space characters.
    
-		
    
-	
-
-	
-		
    Line Breaks
    
-		
    
-			
    Files must be saved with Unix line breaks.  This is more of an issue for developers who work in Windows, but in any case ensure that your text editor is setup to save files with Unix line breaks.
    
-		
    
-	
-
-	
-		
    Code Indenting
    
-		
    
-			
    Use Allman style indenting.  With the exception of Class declarations, braces are always placed on a line by themselves, and indented at the same level as the control statement that "owns" them.
    
-
-INCORRECT:
-function foo($bar) {
-	// ...
-}
-
-foreach ($arr as $key => $val) {
-	// ...
-}
-
-if ($foo == $bar) {
-	// ...
-} else {
-	// ...
-}
-
-for ($i = 0; $i < 10; $i++)
-	{
-	for ($j = 0; $j < 10; $j++)
-		{
-		// ...
-		}
-	}
-
-CORRECT:
-function foo($bar)
-{
-	// ...
-}
-
-foreach ($arr as $key => $val)
-{
-	// ...
-}
-
-if ($foo == $bar)
-{
-	// ...
-}
-else
-{
-	// ...
-}
-
-for ($i = 0; $i < 10; $i++)
-{
-	for ($j = 0; $j < 10; $j++)
-	{
-		// ...
-	}
-}
-		
    
-	
-
-	
    Bracket and Parenthetic Spacing
    
-		
    
-			
    In general, parenthesis and brackets should not use any additional spaces.  The exception is that a space should always follow PHP control structures that accept arguments with parenthesis (declare, do-while, elseif, for, foreach, if, switch, while), to help distinguish them from functions and increase readability.
    
-			
-INCORRECT:
-$arr[ $foo ] = 'foo';
-
-CORRECT:
-$arr[$foo] = 'foo'; // no spaces around array keys
-
-
-INCORRECT:
-function foo ( $bar )
-{
-	
-}
-
-CORRECT:
-function foo($bar) // no spaces around parenthesis in function declarations
-{
-	
-}
-
-
-INCORRECT:
-foreach( $query->result() as $row )
-
-CORRECT:
-foreach ($query->result() as $row) // single space following PHP control structures, but not in interior parenthesis
-
-		
    
-	
-	
-	
-		
    Localized Text in Control Panel
    
-		
    
-			
    Any text that is output in the control panel should use language variables in your module's lang file to allow localization.
    
-
-INCORRECT:
-return "Invalid Selection";
-
-CORRECT:
-return $LANG->line('invalid_selection');
-		
    
-	
-
-	
-		
    Private Methods and Variables
    
-		
    
-			
    Methods and variables that are only accessed internally by your class, such as utility and helper functions that your public methods use for code abstraction, should be prefixed with an underscore.
    
-
-convert_text()		// public method
-_convert_text()		// private method
-		
    
-	
-
-	
-		
    PHP Errors
    
-		
    
-			
    Code must run error free and not rely on warnings and notices to be hidden to meet this requirement.  For instance, never access a variable that you did not set yourself (such as $_POST array keys) without first checking to see that it isset().
    
-
-			
    Make sure that while developing your add-on, error reporting is enabled for ALL users, and that display_errors is enabled in the PHP environment.  You can check this setting with:
    
-
-if (ini_get('display_errors') == 1)
-{
-	exit "Enabled";
-}
-
-			
    On some servers where display_errors is disabled, and you do not have the ability to change this in the php.ini, you can often enable it with:
    
-
-ini_set('display_errors', 1);
-
-			
    NOTE: Setting the display_errors setting with ini_set() at runtime is not identical to having it enabled in the PHP environment.  Namely, it will not have any effect if the script has fatal errors
    
-		
    
-	
-
-	
-		
    Short Open Tags
    
-		
    
-			
    Always use full PHP opening tags, in case a server does not have short_open_tag enabled.
    
-
-INCORRECT:
-<? echo $foo; ?>
-
-<?=$foo?>
-
-CORRECT:
-<?php echo $foo; ?>
-		
    
-	
-
-	
-		
    One Statement Per Line
    
-		
    
-			
    Never combine statements on one line.
    
-
-INCORRECT:
-$foo = 'this'; $bar = 'that'; $bat = str_replace($foo, $bar, $bag);
-
-CORRECT:
-$foo = 'this';
-$bar = 'that';
-$bat = str_replace($foo, $bar, $bag);
-
-		
    
-	
-
-	
-		
    Strings
    
-		
    
-			
    Always use single quoted strings unless you need variables parsed, and in cases where you do need variables parsed, use braces to prevent greedy token parsing.  You may also use double-quoted strings if the string contains single quotes, so you do not have to use escape characters.
    
-
-INCORRECT:
-"My String"					// no variable parsing, so no use for double quotes
-"My string $foo"				// needs braces
-'SELECT foo FROM bar WHERE baz = \'bag\''	// ugly
-
-CORRECT:
-'My String'
-"My string {$foo}"
-"SELECT foo FROM bar WHERE baz = 'bag'"
-		
    
-	
-
-	
-		
    SQL Queries
    
-		
    
-			
    MySQL keywords are always capitalized: SELECT, INSERT, UPDATE, WHERE, AS, JOIN, ON, IN, etc.
    
-
-			
    Break up long queries into multiple lines for legibility, preferably breaking for each clause.
    
-
-INCORRECT:
-// keywords are lowercase and query is too long for
-// a single line (... indicates continuation of line)
-$query = $this->db->query("select foo, bar, baz, foofoo, foobar as raboof, foobaz from exp_pre_email_addresses
-...where foo != 'oof' and baz != 'zab' order by foobaz limit 5, 100");
-
-CORRECT:
-$query = $this->db->query("SELECT foo, bar, baz, foofoo, foobar AS raboof, foobaz
-				FROM exp_pre_email_addresses
-				WHERE foo != 'oof'
-				AND baz != 'zab'
-				ORDER BY foobaz
-				LIMIT 5, 100");
-		
    
-	
-
-	
-		
    Default Function Arguments
    
-		
    
-			
    Whenever appropriate, provide function argument defaults, which helps prevent PHP errors with mistaken calls and provides common fallback values which can save a few lines of code. Example:
    
-
-function foo($bar = '', $baz = FALSE)
-		
    
-	
-
-	
-		
    Overlapping Tag Parameters
    
-		
    
-			
    Avoid multiple tag parameters that have effect on the same thing.  For instance, instead of include= and exclude=, perhaps allow include= to handle the parameter alone, with the addition of "not", e.g. include="not bar".  This will prevent problems of parameters overlapping or having to worry about which parameter has priority over another.
    
-		
    
-	
-
-
    
-
-
-
-
    
-
-
-
-
-
-
+
+
+
+
+
+Style Guide : CodeIgniter User Guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
+
+
+
+
+
    CodeIgniter User Guide Version 1.7
    
+
    
+
+
+
+
+
+
+
+
+
+
    
+
+
+
    
+
+
+
+
    
+
+
+
    General Style and Syntax
    
+
+
    The following page describes the coding rules use adhere to when developing CodeIgniter.
    
+
+
+
    Table of Contents
    
+
+
+		
    PHP Closing Tag
    
+		
    
+			
    The PHP closing tag on a PHP document ?> is optional to the PHP parser.  However, if used, any whitespace following the closing tag, whether introduced 
+				by the developer, user, or an FTP application, can cause unwanted output, PHP errors, or if the latter are suppressed, blank pages.  For this reason, all PHP files should
+				OMIT the closing PHP tag, and instead use a comment block to mark the end of file and it's location relative to the application root.
+				This allows you to still identify a file as being complete and not truncated.
    
+INCORRECT:
+<?php
+
+echo "Here's my code!";
+
+?>
+
+CORRECT:
+<?php
+
+echo "Here's my code!";
+
+/* End of file myfile.php */
+/* Location: ./system/modules/mymodule/myfile.php */
+
+		
    
+
+	
+		
    Class and Method Naming
    
+		
    
+			
    Class names should always have their first letter uppercase, and the constructor method should match identically.  Multiple words should be separated with an underscore, and not CamelCased.  All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb.  Try to avoid overly long and verbose names.
    
+
+	INCORRECT:
+class superclass
+class SuperClass
+
+CORRECT:
+class Super_class
+
+			
    Notice that the Class and constructor methods are identically named and cased:
    
+
+	class Super_class {
+
+	function Super_class()
+	{
+
+	}
+}
+
+			
    Examples of improper and proper method naming:
    
+
+	INCORRECT:
+function fileproperties()		// not descriptive and needs underscore separator
+function fileProperties()		// not descriptive and uses CamelCase
+function getfileproperties()		// Better!  But still missing underscore separator
+function getFileProperties()		// uses CamelCase
+function get_the_file_properties_from_the_file()	// wordy
+
+CORRECT:
+function get_file_properties()	// descriptive, underscore separator, and all lowercase letters
+
+		
    
+	
+	
+		
    Variable Names
    
+		
    
+			
    The guidelines for variable naming is very similar to that used for class methods.  Namely, variables should contain only lowercase letters, use underscore separators, and be reasonably named to indicate their purpose and contents. Very short, non-word variables should only be used as iterators in for() loops.
    
+INCORRECT:
+$j = 'foo';		// single letter variables should only be used in for() loops
+$Str			// contains uppercase letters
+$bufferedText		// uses CamelCasing, and could be shortened without losing semantic meaning
+$groupid		// multiple words, needs underscore separator
+$name_of_last_city_used	// too long
+
+CORRECT:
+for ($j = 0; $j < 10; $j++)
+$str
+$buffer
+$group_id
+$last_city
+
+		
    
+	
+	
+		
    Commenting
    
+		
    
+			
    In general, code should be commented prolifically.  It not only helps describe the flow and intent of the code for less experienced programmers, but can prove invaluable when returning to your own code months down the line.  There is not a required format for comments, but the following are recommended.
    
+
+			
    DocBlock style comments preceding class and method declarations so they can be picked up by IDEs:
    
+
+/**
+ * Super Class
+ *
+ * @package	Package Name
+ * @subpackage	Subpackage
+ * @category	Category
+ * @author	Author Name
+ * @link	http://example.com
+ */
+class Super_class {
+
+/**
+ * Encodes string for use in XML
+ *
+ * @access	public
+ * @param	string
+ * @return	string
+ */
+function xml_encode($str)
+
+			
    Use single line comments within code, leaving a blank line between large comment blocks and code.
    
+
+// break up the string by newlines
+$parts = explode("\n", $str);
+
+// A longer comment that needs to give greater detail on what is
+// occurring and why can use multiple single-line comments.  Try to
+// keep the width reasonable, around 70 characters is the easiest to
+// read.  Don't hesitate to link to permanent external resources
+// that may provide greater detail:
+//
+// http://example.com/information_about_something/in_particular/
+
+$parts = $this->foo($parts);
+
+		
    
+	
+	
+		
    Constants
    
+		
    
+			
    Constants follow the same guidelines as do variables, except constants should always be fully uppercase.  Always use ExpressionEngine constants when appropriate, i.e. SLASH, LD, RD, PATH_CACHE, etc.
    
+INCORRECT:
+myConstant	// missing underscore separator and not fully uppercase
+N		// no single-letter constants
+S_C_VER		// not descriptive
+$str = str_replace('{foo}', 'bar', $str);	// should use LD and RD constants
+
+CORRECT:
+MY_CONSTANT
+NEWLINE
+SUPER_CLASS_VERSION
+$str = str_replace(LD.'foo'.RD, 'bar', $str);
+
+		
    
+	
+	
+		
    TRUE, FALSE, and NULL
    
+		
    
+			
    TRUE, FALSE, and NULL keywords should always be fully uppercase.
    
+INCORRECT:
+if ($foo == true)
+$bar = false;
+function foo($bar = null)
+
+CORRECT:
+if ($foo == TRUE)
+$bar = FALSE;
+function foo($bar = NULL)
+		
    
+	
+
+	
+		
    Logical Operators
    
+		
    
+			
    Use of || is discouraged as its clarity on some output devices is low (looking like the number 11 for instance).
+				&& is preferred over AND but either are acceptable, and a space should always precede and follow !.
    
+INCORRECT:
+if ($foo || $bar)
+if ($foo AND $bar)  // okay but not recommended for common syntax highlighting applications
+if (!$foo)
+if (! is_array($foo))
+
+CORRECT:
+if ($foo OR $bar)
+if ($foo && $bar) // recommended
+if ( ! $foo)
+if ( ! is_array($foo))
+
+		
    
+	
+	
+	
+		
    Comparing Return Values and Typecasting
    
+		
    
+			
    Some PHP functions return FALSE on failure, but may also have a valid return value of "" or 0, which would evaluate to FALSE in loose comparisons.  Be explicit by comparing the variable type when using these return values in conditionals to ensure the return value is indeed what you expect, and not a value that has an equivalent loose-type evaluation.
    
+			
    Use the same stringency in returning and checking your own variables.  Use === and !== as necessary.
+
+INCORRECT:
+// If 'foo' is at the beginning of the string, strpos will return a 0,
+// resulting in this conditional evaluating as TRUE
+if (strpos($str, 'foo') == FALSE)
+
+CORRECT:
+if (strpos($str, 'foo') === FALSE)
+
+
+INCORRECT:
+function build_string($str = "")
+{
+	if ($str == "")	// uh-oh!  What if FALSE or the integer 0 is passed as an argument?
+	{
+
+	}
+}
+
+CORRECT:
+function build_string($str = "")
+{
+	if ($str === "")
+	{
+
+	}
+}
+
+		
    See also information regarding typecasting, which can be quite useful.  Typecasting has a slightly different effect which may be desirable.  When casting a variable as a string, for instance, NULL and boolean FALSE variables become empty strings, 0 (and other numbers) become strings of digits, and boolean TRUE becomes "1":
    
+
+$str = (string) $str;	// cast $str as a string
+
+		
    
+	
+	
+		
    Debugging Code
    
+		
    
+			
    No debugging code can be left in place for submitted add-ons unless it is commented out, i.e. no var_dump(), print_r(), die(), and exit() calls that were used while creating the add-on, unless they are commented out.
    
+
+// print_r($foo);
+		
    
+	
+
+	
+		
    Whitespace in Files
    
+		
    
+			
    No whitespace can precede the opening PHP tag or follow the closing PHP tag.  ExpressionEngine output is buffered, so whitespace in your files can cause output to begin before ExpressionEngine outputs its content, leading to errors and an inability for ExpressionEngine to send proper headers.  In the examples below, select the text with your mouse to reveal the incorrect whitespace.
    
+
+			
    INCORRECT:
    
+     
+<?php
+	// ...there is whitespace and a linebreak above the opening PHP tag
+	// as well as whitespace after the closing PHP tag
+?>    
+
+			
    CORRECT:
    
+<?php
+	// this sample has no whitespace before or after the opening and closing PHP tags
+?>
+
+		
    
+	
+	
+		
    Compatibility
    
+		
    
+			
    Unless specifically mentioned in your add-on's documentation, all code must be compatible with PHP version 4.3+.  Additionally, do not use PHP functions that require non-default libraries to be installed unless your code contains an alternative method when the function is not available, or you implicitly document that your add-on requires said PHP libraries.
    
+		
    
+		
+
+	
+		
    Class and File Names using Common Words
    
+		
    
+			
    When your class or filename is a common word, or might quite likely be identically named in another PHP script, provide a unique prefix to help prevent collision.  Always realize that your end users may be running other add-ons or third party PHP scripts.  Choose a prefix that is unique to your identity as a developer or company.
    
+
+INCORRECT:
+class Email		pi.email.php
+class Xml		ext.xml.php
+class Import		mod.import.php
+
+CORRECT:
+class Pre_email		pi.pre_email.php
+class Pre_xml		ext.pre_xml.php
+class Pre_import	mod.pre_import.php
+
+		
    
+	
+	
+		
    Database Table Names
    
+		
    
+			
    Any tables that your add-on might use must use the 'exp_' prefix, followed by a prefix uniquely identifying you as the developer or company, and then a short descriptive table name.  You do not need to be concerned about the database prefix being used on the user's installation, as ExpressionEngine's database class will automatically convert 'exp_' to what is actually being used.
    
+
+INCORRECT:
+email_addresses		// missing both prefixes
+pre_email_addresses	// missing exp_ prefix
+exp_email_addresses	// missing unique prefix
+
+CORRECT:
+exp_pre_email_addresses
+
+
+			
    NOTE: Be mindful that MySQL has a limit of 64 characters for table names.  This should not be an issue as table names that would exceed this would likely have unreasonable names.  For instance, the following table name exceeds this limitation by one character.  Silly, no? exp_pre_email_addresses_of_registered_users_in_seattle_washington
+		
    
+	
+
+	
+		
    One File per Class
    
+		
    
+			
    Use separate files for each class your add-on uses, unless the classes are closely related.  An example of ExpressionEngine files that contains multiple classes is the Database class file, which contains both the DB class and the DB_Cache class, and the Magpie plugin, which contains both the Magpie and Snoopy classes.
    
+		
    
+	
+
+	
+		
    Whitespace
    
+		
    
+			
    Use tabs for whitespace in your code, not spaces.  This may seem like a small thing, but using tabs instead of whitespace allows the developer looking at your code to have indentation at levels that they prefer and customize in whatever application they use.  And as a side benefit, it results in (slightly) more compact files, storing one tab character versus, say, four space characters.
    
+		
    
+	
+
+	
+		
    Line Breaks
    
+		
    
+			
    Files must be saved with Unix line breaks.  This is more of an issue for developers who work in Windows, but in any case ensure that your text editor is setup to save files with Unix line breaks.
    
+		
    
+	
+
+	
+		
    Code Indenting
    
+		
    
+			
    Use Allman style indenting.  With the exception of Class declarations, braces are always placed on a line by themselves, and indented at the same level as the control statement that "owns" them.
    
+
+INCORRECT:
+function foo($bar) {
+	// ...
+}
+
+foreach ($arr as $key => $val) {
+	// ...
+}
+
+if ($foo == $bar) {
+	// ...
+} else {
+	// ...
+}
+
+for ($i = 0; $i < 10; $i++)
+	{
+	for ($j = 0; $j < 10; $j++)
+		{
+		// ...
+		}
+	}
+
+CORRECT:
+function foo($bar)
+{
+	// ...
+}
+
+foreach ($arr as $key => $val)
+{
+	// ...
+}
+
+if ($foo == $bar)
+{
+	// ...
+}
+else
+{
+	// ...
+}
+
+for ($i = 0; $i < 10; $i++)
+{
+	for ($j = 0; $j < 10; $j++)
+	{
+		// ...
+	}
+}
+		
    
+	
+
+	
    Bracket and Parenthetic Spacing
    
+		
    
+			
    In general, parenthesis and brackets should not use any additional spaces.  The exception is that a space should always follow PHP control structures that accept arguments with parenthesis (declare, do-while, elseif, for, foreach, if, switch, while), to help distinguish them from functions and increase readability.
    
+			
+INCORRECT:
+$arr[ $foo ] = 'foo';
+
+CORRECT:
+$arr[$foo] = 'foo'; // no spaces around array keys
+
+
+INCORRECT:
+function foo ( $bar )
+{
+	
+}
+
+CORRECT:
+function foo($bar) // no spaces around parenthesis in function declarations
+{
+	
+}
+
+
+INCORRECT:
+foreach( $query->result() as $row )
+
+CORRECT:
+foreach ($query->result() as $row) // single space following PHP control structures, but not in interior parenthesis
+
+		
    
+	
+	
+	
+		
    Localized Text in Control Panel
    
+		
    
+			
    Any text that is output in the control panel should use language variables in your module's lang file to allow localization.
    
+
+INCORRECT:
+return "Invalid Selection";
+
+CORRECT:
+return $LANG->line('invalid_selection');
+		
    
+	
+
+	
+		
    Private Methods and Variables
    
+		
    
+			
    Methods and variables that are only accessed internally by your class, such as utility and helper functions that your public methods use for code abstraction, should be prefixed with an underscore.
    
+
+convert_text()		// public method
+_convert_text()		// private method
+		
    
+	
+
+	
+		
    PHP Errors
    
+		
    
+			
    Code must run error free and not rely on warnings and notices to be hidden to meet this requirement.  For instance, never access a variable that you did not set yourself (such as $_POST array keys) without first checking to see that it isset().
    
+
+			
    Make sure that while developing your add-on, error reporting is enabled for ALL users, and that display_errors is enabled in the PHP environment.  You can check this setting with:
    
+
+if (ini_get('display_errors') == 1)
+{
+	exit "Enabled";
+}
+
+			
    On some servers where display_errors is disabled, and you do not have the ability to change this in the php.ini, you can often enable it with:
    
+
+ini_set('display_errors', 1);
+
+			
    NOTE: Setting the display_errors setting with ini_set() at runtime is not identical to having it enabled in the PHP environment.  Namely, it will not have any effect if the script has fatal errors
    
+		
    
+	
+
+	
+		
    Short Open Tags
    
+		
    
+			
    Always use full PHP opening tags, in case a server does not have short_open_tag enabled.
    
+
+INCORRECT:
+<? echo $foo; ?>
+
+<?=$foo?>
+
+CORRECT:
+<?php echo $foo; ?>
+		
    
+	
+
+	
+		
    One Statement Per Line
    
+		
    
+			
    Never combine statements on one line.
    
+
+INCORRECT:
+$foo = 'this'; $bar = 'that'; $bat = str_replace($foo, $bar, $bag);
+
+CORRECT:
+$foo = 'this';
+$bar = 'that';
+$bat = str_replace($foo, $bar, $bag);
+
+		
    
+	
+
+	
+		
    Strings
    
+		
    
+			
    Always use single quoted strings unless you need variables parsed, and in cases where you do need variables parsed, use braces to prevent greedy token parsing.  You may also use double-quoted strings if the string contains single quotes, so you do not have to use escape characters.
    
+
+INCORRECT:
+"My String"					// no variable parsing, so no use for double quotes
+"My string $foo"				// needs braces
+'SELECT foo FROM bar WHERE baz = \'bag\''	// ugly
+
+CORRECT:
+'My String'
+"My string {$foo}"
+"SELECT foo FROM bar WHERE baz = 'bag'"
+		
    
+	
+
+	
+		
    SQL Queries
    
+		
    
+			
    MySQL keywords are always capitalized: SELECT, INSERT, UPDATE, WHERE, AS, JOIN, ON, IN, etc.
    
+
+			
    Break up long queries into multiple lines for legibility, preferably breaking for each clause.
    
+
+INCORRECT:
+// keywords are lowercase and query is too long for
+// a single line (... indicates continuation of line)
+$query = $this->db->query("select foo, bar, baz, foofoo, foobar as raboof, foobaz from exp_pre_email_addresses
+...where foo != 'oof' and baz != 'zab' order by foobaz limit 5, 100");
+
+CORRECT:
+$query = $this->db->query("SELECT foo, bar, baz, foofoo, foobar AS raboof, foobaz
+				FROM exp_pre_email_addresses
+				WHERE foo != 'oof'
+				AND baz != 'zab'
+				ORDER BY foobaz
+				LIMIT 5, 100");
+		
    
+	
+
+	
+		
    Default Function Arguments
    
+		
    
+			
    Whenever appropriate, provide function argument defaults, which helps prevent PHP errors with mistaken calls and provides common fallback values which can save a few lines of code. Example:
    
+
+function foo($bar = '', $baz = FALSE)
+		
    
+	
+
+	
+		
    Overlapping Tag Parameters
    
+		
    
+			
    Avoid multiple tag parameters that have effect on the same thing.  For instance, instead of include= and exclude=, perhaps allow include= to handle the parameter alone, with the addition of "not", e.g. include="not bar".  This will prevent problems of parameters overlapping or having to worry about which parameter has priority over another.
    
+		
    
+	
+
+
    
+
+
+
+
    • + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 3b4ffb13..98b2c255 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -1,368 +1,368 @@ - - - - - -HTML Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    HTML Helper

    - -

    The HTML Helper file contains functions that assist in working with HTML.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('html'); - -

    The following functions are available:

    - -

    br()

    -

    Generates line break tags (<br />) based on the number you submit. Example:

    -echo br(3); -

    The above would produce: <br /><br /><br />

    - -

    heading()

    -

    Lets you create HTML <h1> tags. The first parameter will contain the data, the -second the size of the heading. Example:

    -echo heading('Welcome!', 3); -

    The above would produce: <h3>Welcome!</h3>

    -

    img()

    -

    Lets you create HTML <img /> tags. The first parameter contains the image source. Example:

    -echo img('images/picture.jpg');
    -// gives <img src="http://site.com/images/picture.jpg" />     -

    There is an optional second parameter that is a TRUE/FALSE value that specifics if the src should have the page specified by $config['index_page'] added to the address it creates. Presumably, this would be if you were using a media controller.

    -

    echo img('images/picture.jpg', TRUE);
    -// gives <img src="http://site.com/index.php/images/picture.jpg" />

    -

    Additionally, an associative array can be passed to the img() function for complete control over all attributes and values.

    -

    $image_properties = array(
    -           'src' => 'images/picture.jpg',
    -           'alt' => 'Me, demonstrating how to eat 4 slices of pizza at one time',
    -           'class' => 'post_images',
    -           'width' => '200',
    -           'height' => '200',
    -           'title' => 'That was quite a night',
    -           'rel' => 'lightbox',
    - );
    -
    - img($image_properties);
    - // <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />

    -

    link_tag()

    -

    Lets you create HTML <link /> tags. This is useful for stylesheet links, as well as other links. The parameters are href, with optional rel, type, title, media and index_page. index_page is a TRUE/FALSE value that specifics if the href should have the page specified by $config['index_page'] added to the address it creates. -echo link_tag('css/mystyles.css');
    -// gives <link href="http://site.com/css/mystyles.css" rel="stylesheet" type="text/css" />

    -

    Further examples:

    - - - echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
    - // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" /> -
    -
    - echo link('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
    - // <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />     -

    Additionally, an associative array can be passed to the link() function for complete control over all attributes and values.

    -

    - $link = array(
    -           'href' => 'css/printer.css',
    -           'rel' => 'stylesheet',
    -           'type' => 'text/css',
    -           'media' => 'print'
    - );
    -
    - echo link_tag($link);
    - // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />

    - -

    nbs()

    -

    Generates non-breaking spaces (&nbsp;) based on the number you submit. Example:

    -echo nbs(3); -

    The above would produce: &nbsp;&nbsp;&nbsp;

    - -

    ol()  and  ul()

    - -

    Permits you to generate ordered or unordered HTML lists from simple or multi-dimensional arrays. Example:

    - - -$this->load->helper('html');
    -
    -$list = array(
    -            'red',
    -            'blue',
    -            'green',
    -            'yellow'
    -            );
    -
    -$attributes = array(
    -                    'class' => 'boldlist',
    -                    'id'    => 'mylist'
    -                    );
    -
    -echo ul($list, $attributes);
    -     - -

    The above code will produce this:

    - - -<ul class="boldlist" id="mylist">
    -  <li>red</li>
    -  <li>blue</li>
    -  <li>green</li>
    -  <li>yellow</li>
    -</ul> -     - -

    Here is a more complex example, using a multi-dimensional array:

    - - -$this->load->helper('html');
    -
    -$list = array(
    -            'colors' => array(
    -                                'red',
    -                                'blue',
    -                                'green'
    -                            ),
    -            'shapes' => array(
    -                                'round',
    -                                'square',
    -                                'circles' => array(
    -                                                    'ellipse',
    -                                                    'oval',
    -                                                    'sphere'
    -                                                    )
    -                            ),
    -            'moods'    => array(
    -                                'happy',
    -                                'upset' => array(
    -                                                    'defeated' => array(
    -                                                                        'dejected',
    -                                                                        'disheartened',
    -                                                                        'depressed'
    -                                                                        ),
    -                                                    'annoyed',
    -                                                    'cross',
    -                                                    'angry'
    -                                                )
    -                            )
    -            );
    -
    -
    -echo ul($list);     - -

    The above code will produce this:

    - - -<ul class="boldlist" id="mylist">
    -  <li>colors
    -    <ul>
    -      <li>red</li>
    -      <li>blue</li>
    -      <li>green</li>
    -    </ul>
    -  </li>
    -  <li>shapes
    -    <ul>
    -      <li>round</li>
    -      <li>suare</li>
    -      <li>circles
    -        <ul>
    -          <li>elipse</li>
    -          <li>oval</li>
    -          <li>sphere</li>
    -        </ul>
    -      </li>
    -    </ul>
    -  </li>
    -  <li>moods
    -    <ul>
    -      <li>happy</li>
    -      <li>upset
    -        <ul>
    -          <li>defeated
    -            <ul>
    -              <li>dejected</li>
    -              <li>disheartened</li>
    -              <li>depressed</li>
    -            </ul>
    -          </li>
    -          <li>annoyed</li>
    -          <li>cross</li>
    -          <li>angry</li>
    -        </ul>
    -      </li>
    -    </ul>
    -  </li>
    -</ul> -     - - - -

    meta()

    - -

    Helps you generate meta tags. You can pass strings to the function, or simple arrays, or multidimensional ones. Examples:

    - - -echo meta('description', 'My Great site');
    -// Generates: <meta name="description" content="My Great Site" />
    -

    - -echo meta('Content-type', 'text/html; charset=utf-8', 'equiv'); // Note the third parameter. Can be "equiv" or "name"
    -// Generates: <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
    - -

    - -echo meta(array('name' => 'robots', 'content' => 'no-cache'));
    -// Generates: <meta name="robots" content="no-cache" />
    - -

    - -$meta = array(
    -        array('name' => 'robots', 'content' => 'no-cache'),
    -        array('name' => 'description', 'content' => 'My Great Site'),
    -        array('name' => 'keywords', 'content' => 'love, passion, intrigue, deception'),
    -        array('name' => 'robots', 'content' => 'no-cache'),
    -        array('name' => 'Content-type', 'content' => 'text/html; charset=utf-8', 'type' => 'equiv')
    -    );
    -
    -echo meta($meta); -
    -// Generates:
    -// <meta name="robots" content="no-cache" />
    -// <meta name="description" content="My Great Site" />
    -// <meta name="keywords" content="love, passion, intrigue, deception" />
    -// <meta name="robots" content="no-cache" />
    -// <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> -     - - -

    doctype()

    - -

    Helps you generate document type declarations, or DTD's. XHTML 1.0 Strict is used by default, but many doctypes are available.

    - - -echo docytype();
    -// <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    -
    -echo doctype('html4-trans');
    -// <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -     - -

    The following is a list of doctype choices. These are configurable, and pulled from application/config/doctypes.php

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    DoctypeOptionResult
    XHTML 1.1doctype('xhtml11')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
    XHTML 1.0 Strictdoctype('xhtml1-strict')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    XHTML 1.0 Transitionaldoctype('xhtml1-trans')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    XHTML 1.0 Framesetdoctype('xhtml1-frame')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    HTML 5doctype('html5')<!DOCTYPE html>
    HTML 4 Strictdoctype('html4-strict')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    HTML 4 Transitionaldoctype('html4-trans')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
    HTML 4 Framesetdoctype('html4-frame')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
    - - - - -
    - - - - - - + + + + + +HTML Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    HTML Helper

    + +

    The HTML Helper file contains functions that assist in working with HTML.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('html'); + +

    The following functions are available:

    + +

    br()

    +

    Generates line break tags (<br />) based on the number you submit. Example:

    +echo br(3); +

    The above would produce: <br /><br /><br />

    + +

    heading()

    +

    Lets you create HTML <h1> tags. The first parameter will contain the data, the +second the size of the heading. Example:

    +echo heading('Welcome!', 3); +

    The above would produce: <h3>Welcome!</h3>

    +

    img()

    +

    Lets you create HTML <img /> tags. The first parameter contains the image source. Example:

    +echo img('images/picture.jpg');
    +// gives <img src="http://site.com/images/picture.jpg" />     +

    There is an optional second parameter that is a TRUE/FALSE value that specifics if the src should have the page specified by $config['index_page'] added to the address it creates. Presumably, this would be if you were using a media controller.

    +

    echo img('images/picture.jpg', TRUE);
    +// gives <img src="http://site.com/index.php/images/picture.jpg" />

    +

    Additionally, an associative array can be passed to the img() function for complete control over all attributes and values.

    +

    $image_properties = array(
    +           'src' => 'images/picture.jpg',
    +           'alt' => 'Me, demonstrating how to eat 4 slices of pizza at one time',
    +           'class' => 'post_images',
    +           'width' => '200',
    +           'height' => '200',
    +           'title' => 'That was quite a night',
    +           'rel' => 'lightbox',
    + );
    +
    + img($image_properties);
    + // <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />

    +

    link_tag()

    +

    Lets you create HTML <link /> tags. This is useful for stylesheet links, as well as other links. The parameters are href, with optional rel, type, title, media and index_page. index_page is a TRUE/FALSE value that specifics if the href should have the page specified by $config['index_page'] added to the address it creates. +echo link_tag('css/mystyles.css');
    +// gives <link href="http://site.com/css/mystyles.css" rel="stylesheet" type="text/css" />

    +

    Further examples:

    + + + echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
    + // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" /> +
    +
    + echo link('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
    + // <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />     +

    Additionally, an associative array can be passed to the link() function for complete control over all attributes and values.

    +

    + $link = array(
    +           'href' => 'css/printer.css',
    +           'rel' => 'stylesheet',
    +           'type' => 'text/css',
    +           'media' => 'print'
    + );
    +
    + echo link_tag($link);
    + // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />

    + +

    nbs()

    +

    Generates non-breaking spaces (&nbsp;) based on the number you submit. Example:

    +echo nbs(3); +

    The above would produce: &nbsp;&nbsp;&nbsp;

    + +

    ol()  and  ul()

    + +

    Permits you to generate ordered or unordered HTML lists from simple or multi-dimensional arrays. Example:

    + + +$this->load->helper('html');
    +
    +$list = array(
    +            'red',
    +            'blue',
    +            'green',
    +            'yellow'
    +            );
    +
    +$attributes = array(
    +                    'class' => 'boldlist',
    +                    'id'    => 'mylist'
    +                    );
    +
    +echo ul($list, $attributes);
    +     + +

    The above code will produce this:

    + + +<ul class="boldlist" id="mylist">
    +  <li>red</li>
    +  <li>blue</li>
    +  <li>green</li>
    +  <li>yellow</li>
    +</ul> +     + +

    Here is a more complex example, using a multi-dimensional array:

    + + +$this->load->helper('html');
    +
    +$list = array(
    +            'colors' => array(
    +                                'red',
    +                                'blue',
    +                                'green'
    +                            ),
    +            'shapes' => array(
    +                                'round',
    +                                'square',
    +                                'circles' => array(
    +                                                    'ellipse',
    +                                                    'oval',
    +                                                    'sphere'
    +                                                    )
    +                            ),
    +            'moods'    => array(
    +                                'happy',
    +                                'upset' => array(
    +                                                    'defeated' => array(
    +                                                                        'dejected',
    +                                                                        'disheartened',
    +                                                                        'depressed'
    +                                                                        ),
    +                                                    'annoyed',
    +                                                    'cross',
    +                                                    'angry'
    +                                                )
    +                            )
    +            );
    +
    +
    +echo ul($list);     + +

    The above code will produce this:

    + + +<ul class="boldlist" id="mylist">
    +  <li>colors
    +    <ul>
    +      <li>red</li>
    +      <li>blue</li>
    +      <li>green</li>
    +    </ul>
    +  </li>
    +  <li>shapes
    +    <ul>
    +      <li>round</li>
    +      <li>suare</li>
    +      <li>circles
    +        <ul>
    +          <li>elipse</li>
    +          <li>oval</li>
    +          <li>sphere</li>
    +        </ul>
    +      </li>
    +    </ul>
    +  </li>
    +  <li>moods
    +    <ul>
    +      <li>happy</li>
    +      <li>upset
    +        <ul>
    +          <li>defeated
    +            <ul>
    +              <li>dejected</li>
    +              <li>disheartened</li>
    +              <li>depressed</li>
    +            </ul>
    +          </li>
    +          <li>annoyed</li>
    +          <li>cross</li>
    +          <li>angry</li>
    +        </ul>
    +      </li>
    +    </ul>
    +  </li>
    +</ul> +     + + + +

    meta()

    + +

    Helps you generate meta tags. You can pass strings to the function, or simple arrays, or multidimensional ones. Examples:

    + + +echo meta('description', 'My Great site');
    +// Generates: <meta name="description" content="My Great Site" />
    +

    + +echo meta('Content-type', 'text/html; charset=utf-8', 'equiv'); // Note the third parameter. Can be "equiv" or "name"
    +// Generates: <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
    + +

    + +echo meta(array('name' => 'robots', 'content' => 'no-cache'));
    +// Generates: <meta name="robots" content="no-cache" />
    + +

    + +$meta = array(
    +        array('name' => 'robots', 'content' => 'no-cache'),
    +        array('name' => 'description', 'content' => 'My Great Site'),
    +        array('name' => 'keywords', 'content' => 'love, passion, intrigue, deception'),
    +        array('name' => 'robots', 'content' => 'no-cache'),
    +        array('name' => 'Content-type', 'content' => 'text/html; charset=utf-8', 'type' => 'equiv')
    +    );
    +
    +echo meta($meta); +
    +// Generates:
    +// <meta name="robots" content="no-cache" />
    +// <meta name="description" content="My Great Site" />
    +// <meta name="keywords" content="love, passion, intrigue, deception" />
    +// <meta name="robots" content="no-cache" />
    +// <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> +     + + +

    doctype()

    + +

    Helps you generate document type declarations, or DTD's. XHTML 1.0 Strict is used by default, but many doctypes are available.

    + + +echo docytype();
    +// <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    +
    +echo doctype('html4-trans');
    +// <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +     + +

    The following is a list of doctype choices. These are configurable, and pulled from application/config/doctypes.php

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    DoctypeOptionResult
    XHTML 1.1doctype('xhtml11')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
    XHTML 1.0 Strictdoctype('xhtml1-strict')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    XHTML 1.0 Transitionaldoctype('xhtml1-trans')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    XHTML 1.0 Framesetdoctype('xhtml1-frame')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    HTML 5doctype('html5')<!DOCTYPE html>
    HTML 4 Strictdoctype('html4-strict')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    HTML 4 Transitionaldoctype('html4-trans')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
    HTML 4 Framesetdoctype('html4-frame')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 9c60759d..cad1ef49 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -1,98 +1,98 @@ - - - - - -Language Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - - -
    - - -
    - - - -
    - - -

    Language Helper

    - -

    The Language Helper file contains functions that assist in working with language files.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('language'); - -

    The following functions are available:

    - -

    lang('language line', 'element id')

    - -

    This function returns a line of text from a loaded language file with simplified syntax - that may be more desirable for view files than calling $this->lang->line(). - The optional second parameter will also output a form label for you. Example:

    - -echo lang('language_key', 'form_item_id');
    -// becomes <label for="form_item_id">language_key</label>     - - -
    - - - - - - + + + + + +Language Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + + +
    + + +
    + + + +
    + + +

    Language Helper

    + +

    The Language Helper file contains functions that assist in working with language files.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('language'); + +

    The following functions are available:

    + +

    lang('language line', 'element id')

    + +

    This function returns a line of text from a loaded language file with simplified syntax + that may be more desirable for view files than calling $this->lang->line(). + The optional second parameter will also output a form label for you. Example:

    + +echo lang('language_key', 'form_item_id');
    +// becomes <label for="form_item_id">language_key</label>     + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/nav/hacks.txt b/user_guide/nav/hacks.txt index f29e5a77..081eecef 100644 --- a/user_guide/nav/hacks.txt +++ b/user_guide/nav/hacks.txt @@ -1,9 +1,9 @@ -I did the following hack in moo.fx.js: - -At line 79 in the toggle: function() function, I added: - -document.getElementById('nav').style.display = 'block'; - - - +I did the following hack in moo.fx.js: + +At line 79 in the toggle: function() function, I added: + +document.getElementById('nav').style.display = 'block'; + + + -- Rick Ellis \ No newline at end of file diff --git a/user_guide/nav/prototype.lite.js b/user_guide/nav/prototype.lite.js index e6c36227..d294fd7f 100755 --- a/user_guide/nav/prototype.lite.js +++ b/user_guide/nav/prototype.lite.js @@ -1,127 +1,127 @@ -/* Prototype JavaScript framework - * (c) 2005 Sam Stephenson - * - * Prototype is freely distributable under the terms of an MIT-style license. - * - * For details, see the Prototype web site: http://prototype.conio.net/ - * -/*--------------------------------------------------------------------------*/ - - -//note: this is a stripped down version of prototype, to be used with moo.fx by mad4milk (http://moofx.mad4milk.net). - -var Class = { - create: function() { - return function() { - this.initialize.apply(this, arguments); - } - } -} - -Object.extend = function(destination, source) { - for (property in source) { - destination[property] = source[property]; - } - return destination; -} - -Function.prototype.bind = function(object) { - var __method = this; - return function() { - return __method.apply(object, arguments); - } -} - -function $() { - var elements = new Array(); - - for (var i = 0; i < arguments.length; i++) { - var element = arguments[i]; - if (typeof element == 'string') - element = document.getElementById(element); - - if (arguments.length == 1) - return element; - - elements.push(element); - } - - return elements; -} - -//------------------------- - -document.getElementsByClassName = function(className) { - var children = document.getElementsByTagName('*') || document.all; - var elements = new Array(); - - for (var i = 0; i < children.length; i++) { - var child = children[i]; - var classNames = child.className.split(' '); - for (var j = 0; j < classNames.length; j++) { - if (classNames[j] == className) { - elements.push(child); - break; - } - } - } - - return elements; -} - -//------------------------- - -if (!window.Element) { - var Element = new Object(); -} - -Object.extend(Element, { - remove: function(element) { - element = $(element); - element.parentNode.removeChild(element); - }, - - hasClassName: function(element, className) { - element = $(element); - if (!element) - return; - var a = element.className.split(' '); - for (var i = 0; i < a.length; i++) { - if (a[i] == className) - return true; - } - return false; - }, - - addClassName: function(element, className) { - element = $(element); - Element.removeClassName(element, className); - element.className += ' ' + className; - }, - - removeClassName: function(element, className) { - element = $(element); - if (!element) - return; - var newClassName = ''; - var a = element.className.split(' '); - for (var i = 0; i < a.length; i++) { - if (a[i] != className) { - if (i > 0) - newClassName += ' '; - newClassName += a[i]; - } - } - element.className = newClassName; - }, - - // removes whitespace-only text node children - cleanWhitespace: function(element) { - element = $(element); - for (var i = 0; i < element.childNodes.length; i++) { - var node = element.childNodes[i]; - if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) - Element.remove(node); - } - } +/* Prototype JavaScript framework + * (c) 2005 Sam Stephenson + * + * Prototype is freely distributable under the terms of an MIT-style license. + * + * For details, see the Prototype web site: http://prototype.conio.net/ + * +/*--------------------------------------------------------------------------*/ + + +//note: this is a stripped down version of prototype, to be used with moo.fx by mad4milk (http://moofx.mad4milk.net). + +var Class = { + create: function() { + return function() { + this.initialize.apply(this, arguments); + } + } +} + +Object.extend = function(destination, source) { + for (property in source) { + destination[property] = source[property]; + } + return destination; +} + +Function.prototype.bind = function(object) { + var __method = this; + return function() { + return __method.apply(object, arguments); + } +} + +function $() { + var elements = new Array(); + + for (var i = 0; i < arguments.length; i++) { + var element = arguments[i]; + if (typeof element == 'string') + element = document.getElementById(element); + + if (arguments.length == 1) + return element; + + elements.push(element); + } + + return elements; +} + +//------------------------- + +document.getElementsByClassName = function(className) { + var children = document.getElementsByTagName('*') || document.all; + var elements = new Array(); + + for (var i = 0; i < children.length; i++) { + var child = children[i]; + var classNames = child.className.split(' '); + for (var j = 0; j < classNames.length; j++) { + if (classNames[j] == className) { + elements.push(child); + break; + } + } + } + + return elements; +} + +//------------------------- + +if (!window.Element) { + var Element = new Object(); +} + +Object.extend(Element, { + remove: function(element) { + element = $(element); + element.parentNode.removeChild(element); + }, + + hasClassName: function(element, className) { + element = $(element); + if (!element) + return; + var a = element.className.split(' '); + for (var i = 0; i < a.length; i++) { + if (a[i] == className) + return true; + } + return false; + }, + + addClassName: function(element, className) { + element = $(element); + Element.removeClassName(element, className); + element.className += ' ' + className; + }, + + removeClassName: function(element, className) { + element = $(element); + if (!element) + return; + var newClassName = ''; + var a = element.className.split(' '); + for (var i = 0; i < a.length; i++) { + if (a[i] != className) { + if (i > 0) + newClassName += ' '; + newClassName += a[i]; + } + } + element.className = newClassName; + }, + + // removes whitespace-only text node children + cleanWhitespace: function(element) { + element = $(element); + for (var i = 0; i < element.childNodes.length; i++) { + var node = element.childNodes[i]; + if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) + Element.remove(node); + } + } }); \ No newline at end of file From 0b6a5e9bc646f374a2f6f8aa1582f195cb7032e0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 13 Nov 2008 00:54:48 +0000 Subject: [PATCH 1554/2544] Added prep_q_encoding() and Q encoding of From: and Subject: headers --- system/libraries/Email.php | 99 +++++++++++++++++++++++++++++++++----- user_guide/changelog.html | 1 + 2 files changed, 87 insertions(+), 13 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index e414d84e..a0ede724 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -182,9 +182,19 @@ function from($from, $name = '') $this->validate_email($this->_str_to_array($from)); } - if ($name != '' && strncmp($name, '"', 1) != 0) + // prepare the display name + if ($name != '') { - $name = '"'.$name.'"'; + // only use Q encoding if there are characters that would require it + if ( ! preg_match('/[\200-\377]/', $name)) + { + // add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes + $name = '"'.addcslashes($name, '\0..\37\177"\\').'"'; + } + else + { + $name = $this->_prep_q_encoding($name, TRUE); + } } $this->_set_header('From', $name.' <'.$from.'>'); @@ -336,17 +346,8 @@ function bcc($bcc, $limit = '') */ function subject($subject) { - if (strpos($subject, "\r") !== FALSE OR strpos($subject, "\n") !== FALSE) - { - $subject = str_replace(array("\r\n", "\r", "\n"), '', $subject); - } - - if (strpos($subject, "\t")) - { - $subject = str_replace("\t", ' ', $subject); - } - - $this->_set_header('Subject', trim($subject)); + $subject = $this->_prep_q_encoding($subject); + $this->_set_header('Subject', $subject); } // -------------------------------------------------------------------- @@ -1242,7 +1243,79 @@ function _prep_quoted_printable($str, $charlim = '') } // -------------------------------------------------------------------- + + /** + * Prep Q Encoding + * + * Performs "Q Encoding" on a string for use in email headers. It's related + * but not identical to quoted-printable, so it has its own method + * + * @access public + * @param str + * @param bool // set to TRUE for processing From: headers + * @return str + */ + function _prep_q_encoding($str, $from = FALSE) + { + $str = str_replace(array("\r", "\n"), array('', ''), $str); + + // Line length must not exceed 76 characters, so we adjust for + // a space, 7 extra characters =??Q??=, and the charset that we will add to each line + $limit = 75 - 7 - strlen($this->charset); + + // these special characters must be converted too + $convert = array('_', '=', '?'); + if ($from === TRUE) + { + $convert[] = ','; + $convert[] = ';'; + } + + $output = ''; + $temp = ''; + + for ($i = 0, $length = strlen($str); $i < $length; $i++) + { + // Grab the next character + $char = substr($str, $i, 1); + $ascii = ord($char); + + // convert ALL non-printable ASCII characters and our specials + if ($ascii < 32 OR $ascii > 126 OR in_array($char, $convert)) + { + $char = '='.dechex($ascii); + } + + // handle regular spaces a bit more compactly than =20 + if ($ascii == 32) + { + $char = '_'; + } + + // If we're at the character limit, add the line to the output, + // reset our temp variable, and keep on chuggin' + if ((strlen($temp) + strlen($char)) >= $limit) + { + $output .= $temp.$this->crlf; + $temp = ''; + } + + // Add the character to our temporary line + $temp .= $char; + } + + $str = $output.$temp; + + // wrap each line with the shebang, charset, and transfer encoding + // the preceding space on successive lines is required for header "folding" + $str = trim(preg_replace('/^(.*)$/m', ' =?'.$this->charset.'?Q?$1?=', $str)); + + return $str; + } + + // -------------------------------------------------------------------- + /** * Send Email * diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 89ec0ac5..cdadea79 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -85,6 +85,7 @@

    Bug fixes for 1.7.1

  • Fixed a bug where double dashes within tag attributes were being converted to em dash entities.
  • Fixed a bug where double spaces within tag attributes were being converted to non-breaking space entities.
  • Changed a few docblock comments to reflect actual return values.
    • +
  • Fixed a bug with high ascii characters in subject and from email headers.
    • From 4f488dfe35e202d1e1949f03e4bcc52ec25a3941 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 13 Nov 2008 01:05:07 +0000 Subject: [PATCH 1555/2544] odcc to odbc --- user_guide/database/configuration.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 26bbe75e..f2da5808 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -121,7 +121,7 @@

    Explanation of Values:

  • 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, postgres, odcc, etc. Must be specified in lower case.
    • +
  • dbdriver - The database type. ie: mysql, postgres, odbc, etc. Must be specified in lower case.
  • dbprefix - An optional table prefix which will added to the table name when running Active Record queries. This permits multiple CodeIgniter installations to share one database.
  • pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
  • db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
    • From dd9f932556d3cd45a1d06cc478f40d06b7649a69 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 13 Nov 2008 01:06:57 +0000 Subject: [PATCH 1556/2544] "the" to "that" in a code comment --- system/libraries/Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 95c02085..b6e10a3a 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -18,7 +18,7 @@ /** * CodeIgniter Application Controller Class * - * This class object is the super class the every library in + * This class object is the super class that every library in * CodeIgniter will be assigned to. * * @package CodeIgniter From 2067d1a727e7eb5e5ffb40e967f3d1fc4c8a41b2 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 13 Nov 2008 22:59:24 +0000 Subject: [PATCH 1557/2544] Changing EOL style to LF --- index.php | 234 +- license.txt | 104 +- system/application/config/autoload.php | 230 +- system/application/config/config.php | 630 +-- system/application/config/constants.php | 80 +- system/application/config/database.php | 108 +- system/application/config/doctypes.php | 28 +- system/application/config/hooks.php | 30 +- system/application/config/index.html | 18 +- system/application/config/mimes.php | 208 +- system/application/config/routes.php | 94 +- system/application/config/smileys.php | 130 +- system/application/config/user_agents.php | 348 +- system/application/controllers/index.html | 18 +- system/application/controllers/welcome.php | 32 +- system/application/errors/error_404.php | 68 +- system/application/errors/error_db.php | 66 +- system/application/errors/error_general.php | 66 +- system/application/errors/error_php.php | 18 +- system/application/errors/index.html | 18 +- system/application/helpers/index.html | 18 +- system/application/hooks/index.html | 18 +- system/application/index.html | 18 +- .../application/language/english/index.html | 18 +- system/application/libraries/index.html | 18 +- system/application/models/index.html | 18 +- system/application/views/index.html | 18 +- system/application/views/welcome_message.php | 122 +- system/cache/index.html | 18 +- system/codeigniter/Base4.php | 136 +- system/codeigniter/Base5.php | 110 +- system/codeigniter/CodeIgniter.php | 550 +-- system/codeigniter/Common.php | 612 +-- system/codeigniter/Compat.php | 184 +- system/codeigniter/index.html | 18 +- system/database/DB.php | 290 +- system/database/DB_active_rec.php | 3626 +++++++-------- system/database/DB_cache.php | 388 +- system/database/DB_driver.php | 2636 +++++------ system/database/DB_forge.php | 708 +-- system/database/DB_result.php | 682 +-- system/database/DB_utility.php | 776 ++-- system/database/drivers/index.html | 18 +- system/database/drivers/mssql/index.html | 18 +- .../database/drivers/mssql/mssql_driver.php | 1242 ++--- system/database/drivers/mssql/mssql_forge.php | 494 +- .../database/drivers/mssql/mssql_result.php | 336 +- .../database/drivers/mssql/mssql_utility.php | 244 +- system/database/drivers/mysql/index.html | 18 +- .../database/drivers/mysql/mysql_driver.php | 1266 ++--- system/database/drivers/mysql/mysql_forge.php | 506 +- .../database/drivers/mysql/mysql_result.php | 336 +- .../database/drivers/mysql/mysql_utility.php | 488 +- system/database/drivers/mysqli/index.html | 18 +- .../database/drivers/mysqli/mysqli_driver.php | 1248 ++--- .../database/drivers/mysqli/mysqli_forge.php | 506 +- .../database/drivers/mysqli/mysqli_result.php | 336 +- .../drivers/mysqli/mysqli_utility.php | 244 +- system/database/drivers/oci8/index.html | 18 +- system/database/drivers/oci8/oci8_driver.php | 1472 +++--- system/database/drivers/oci8/oci8_forge.php | 494 +- system/database/drivers/oci8/oci8_result.php | 496 +- system/database/drivers/oci8/oci8_utility.php | 242 +- system/database/drivers/odbc/index.html | 18 +- system/database/drivers/odbc/odbc_driver.php | 1186 ++--- system/database/drivers/odbc/odbc_forge.php | 530 +-- system/database/drivers/odbc/odbc_result.php | 454 +- system/database/drivers/odbc/odbc_utility.php | 294 +- system/database/drivers/postgre/index.html | 18 +- .../drivers/postgre/postgre_driver.php | 1270 +++--- .../drivers/postgre/postgre_forge.php | 494 +- .../drivers/postgre/postgre_result.php | 336 +- .../drivers/postgre/postgre_utility.php | 246 +- system/database/drivers/sqlite/index.html | 18 +- .../database/drivers/sqlite/sqlite_driver.php | 1222 ++--- .../database/drivers/sqlite/sqlite_forge.php | 528 +-- .../database/drivers/sqlite/sqlite_result.php | 356 +- .../drivers/sqlite/sqlite_utility.php | 280 +- system/database/index.html | 18 +- system/fonts/index.html | 18 +- system/helpers/array_helper.php | 154 +- system/helpers/compatibility_helper.php | 994 ++-- system/helpers/cookie_helper.php | 270 +- system/helpers/date_helper.php | 1220 ++--- system/helpers/directory_helper.php | 158 +- system/helpers/download_helper.php | 198 +- system/helpers/email_helper.php | 122 +- system/helpers/file_helper.php | 928 ++-- system/helpers/form_helper.php | 1924 ++++---- system/helpers/html_helper.php | 830 ++-- system/helpers/index.html | 18 +- system/helpers/inflector_helper.php | 336 +- system/helpers/language_helper.php | 114 +- system/helpers/number_helper.php | 148 +- system/helpers/path_helper.php | 142 +- system/helpers/security_helper.php | 250 +- system/helpers/smiley_helper.php | 348 +- system/helpers/string_helper.php | 544 +-- system/helpers/text_helper.php | 884 ++-- system/helpers/typography_helper.php | 140 +- system/helpers/url_helper.php | 1162 ++--- system/helpers/xml_helper.php | 122 +- system/language/english/calendar_lang.php | 96 +- system/language/english/date_lang.php | 118 +- system/language/english/db_lang.php | 54 +- system/language/english/email_lang.php | 40 +- .../language/english/form_validation_lang.php | 46 +- system/language/english/ftp_lang.php | 28 +- system/language/english/imglib_lang.php | 40 +- system/language/english/index.html | 18 +- system/language/english/number_lang.php | 18 +- system/language/english/profiler_lang.php | 36 +- system/language/english/scaffolding_lang.php | 32 +- system/language/english/unit_test_lang.php | 46 +- system/language/english/upload_lang.php | 38 +- system/language/english/validation_lang.php | 46 +- system/language/index.html | 18 +- system/libraries/Benchmark.php | 224 +- system/libraries/Calendar.php | 952 ++-- system/libraries/Config.php | 486 +- system/libraries/Controller.php | 252 +- system/libraries/Email.php | 4054 ++++++++--------- system/libraries/Encrypt.php | 966 ++-- system/libraries/Exceptions.php | 342 +- system/libraries/Form_validation.php | 2572 +++++------ system/libraries/Ftp.php | 1234 ++--- system/libraries/Hooks.php | 450 +- system/libraries/Image_lib.php | 3094 ++++++------- system/libraries/Input.php | 2116 ++++----- system/libraries/Language.php | 244 +- system/libraries/Loader.php | 2174 ++++----- system/libraries/Log.php | 232 +- system/libraries/Model.php | 164 +- system/libraries/Output.php | 954 ++-- system/libraries/Pagination.php | 486 +- system/libraries/Parser.php | 344 +- system/libraries/Profiler.php | 782 ++-- system/libraries/Router.php | 768 ++-- system/libraries/Session.php | 1514 +++--- system/libraries/Sha1.php | 500 +- system/libraries/Table.php | 878 ++-- system/libraries/Trackback.php | 1098 ++--- system/libraries/Typography.php | 768 ++-- system/libraries/URI.php | 1168 ++--- system/libraries/Unit_test.php | 692 +-- system/libraries/Upload.php | 1860 ++++---- system/libraries/User_agent.php | 1002 ++-- system/libraries/Validation.php | 1748 +++---- system/libraries/Xmlrpc.php | 2840 ++++++------ system/libraries/Xmlrpcs.php | 1070 ++--- system/libraries/Zip.php | 716 +-- system/libraries/index.html | 18 +- system/logs/index.html | 18 +- system/plugins/captcha_pi.php | 710 +-- system/plugins/index.html | 18 +- system/plugins/js_calendar_pi.php | 1256 ++--- system/scaffolding/Scaffolding.php | 580 +-- system/scaffolding/images/index.html | 18 +- system/scaffolding/index.html | 18 +- system/scaffolding/views/add.php | 64 +- system/scaffolding/views/delete.php | 18 +- system/scaffolding/views/edit.php | 64 +- system/scaffolding/views/footer.php | 18 +- system/scaffolding/views/header.php | 56 +- system/scaffolding/views/index.html | 18 +- system/scaffolding/views/no_data.php | 14 +- system/scaffolding/views/stylesheet.css | 286 +- system/scaffolding/views/view.php | 52 +- user_guide/changelog.html | 1914 ++++---- user_guide/database/active_record.html | 1512 +++--- user_guide/database/caching.html | 438 +- user_guide/database/call_function.html | 234 +- user_guide/database/configuration.html | 312 +- user_guide/database/connecting.html | 360 +- user_guide/database/examples.html | 432 +- user_guide/database/fields.html | 324 +- user_guide/database/forge.html | 466 +- user_guide/database/helpers.html | 300 +- user_guide/database/index.html | 196 +- user_guide/database/queries.html | 290 +- user_guide/database/results.html | 474 +- user_guide/database/table_data.html | 224 +- user_guide/database/transactions.html | 398 +- user_guide/database/utilities.html | 588 +-- user_guide/doc_style/index.html | 170 +- user_guide/doc_style/template.html | 254 +- user_guide/general/alternative_php.html | 292 +- user_guide/general/ancillary_classes.html | 232 +- user_guide/general/autoloader.html | 200 +- user_guide/general/caching.html | 228 +- user_guide/general/common_functions.html | 178 +- user_guide/general/controllers.html | 768 ++-- user_guide/general/core_classes.html | 368 +- user_guide/general/creating_libraries.html | 594 +-- user_guide/general/credits.html | 170 +- user_guide/general/errors.html | 272 +- user_guide/general/helpers.html | 368 +- user_guide/general/hooks.html | 332 +- user_guide/general/libraries.html | 186 +- user_guide/general/managing_apps.html | 264 +- user_guide/general/models.html | 500 +- user_guide/general/plugins.html | 252 +- user_guide/general/profiling.html | 206 +- user_guide/general/quick_reference.html | 152 +- user_guide/general/requirements.html | 162 +- user_guide/general/reserved_names.html | 308 +- user_guide/general/routing.html | 350 +- user_guide/general/scaffolding.html | 290 +- user_guide/general/security.html | 304 +- user_guide/general/styleguide.html | 1296 +++--- user_guide/general/urls.html | 300 +- user_guide/general/views.html | 546 +-- user_guide/helpers/array_helper.html | 236 +- user_guide/helpers/compatibility_helper.html | 234 +- user_guide/helpers/cookie_helper.html | 294 +- user_guide/helpers/date_helper.html | 814 ++-- user_guide/helpers/directory_helper.html | 278 +- user_guide/helpers/download_helper.html | 222 +- user_guide/helpers/email_helper.html | 202 +- user_guide/helpers/file_helper.html | 354 +- user_guide/helpers/form_helper.html | 948 ++-- user_guide/helpers/html_helper.html | 734 +-- user_guide/helpers/inflector_helper.html | 300 +- user_guide/helpers/language_helper.html | 194 +- user_guide/helpers/number_helper.html | 212 +- user_guide/helpers/path_helper.html | 210 +- user_guide/helpers/security_helper.html | 248 +- user_guide/helpers/smiley_helper.html | 406 +- user_guide/helpers/string_helper.html | 350 +- user_guide/helpers/text_helper.html | 382 +- user_guide/helpers/typography_helper.html | 222 +- user_guide/helpers/url_helper.html | 560 +-- user_guide/helpers/xml_helper.html | 208 +- user_guide/index.html | 196 +- user_guide/installation/downloads.html | 204 +- user_guide/installation/index.html | 192 +- user_guide/installation/troubleshooting.html | 178 +- user_guide/installation/upgrade_120.html | 182 +- user_guide/installation/upgrade_130.html | 404 +- user_guide/installation/upgrade_131.html | 202 +- user_guide/installation/upgrade_132.html | 198 +- user_guide/installation/upgrade_133.html | 222 +- user_guide/installation/upgrade_140.html | 288 +- user_guide/installation/upgrade_141.html | 294 +- user_guide/installation/upgrade_150.html | 354 +- user_guide/installation/upgrade_152.html | 220 +- user_guide/installation/upgrade_153.html | 198 +- user_guide/installation/upgrade_154.html | 230 +- user_guide/installation/upgrade_160.html | 248 +- user_guide/installation/upgrade_161.html | 194 +- user_guide/installation/upgrade_162.html | 210 +- user_guide/installation/upgrade_163.html | 196 +- user_guide/installation/upgrade_170.html | 240 +- user_guide/installation/upgrade_b11.html | 286 +- user_guide/installation/upgrading.html | 196 +- user_guide/libraries/benchmark.html | 392 +- user_guide/libraries/calendar.html | 496 +- user_guide/libraries/config.html | 360 +- user_guide/libraries/email.html | 612 +-- user_guide/libraries/encryption.html | 362 +- user_guide/libraries/file_uploading.html | 874 ++-- user_guide/libraries/form_validation.html | 2440 +++++----- user_guide/libraries/ftp.html | 604 +-- user_guide/libraries/image_lib.html | 1330 +++--- user_guide/libraries/input.html | 460 +- user_guide/libraries/language.html | 272 +- user_guide/libraries/loader.html | 426 +- user_guide/libraries/output.html | 288 +- user_guide/libraries/pagination.html | 434 +- user_guide/libraries/parser.html | 414 +- user_guide/libraries/sessions.html | 620 +-- user_guide/libraries/table.html | 582 +-- user_guide/libraries/trackback.html | 490 +- user_guide/libraries/typography.html | 318 +- user_guide/libraries/unit_testing.html | 408 +- user_guide/libraries/uri.html | 502 +- user_guide/libraries/user_agent.html | 400 +- user_guide/libraries/validation.html | 1470 +++--- user_guide/libraries/xmlrpc.html | 1032 ++--- user_guide/libraries/zip.html | 554 +-- user_guide/license.html | 212 +- user_guide/nav/hacks.txt | 16 +- user_guide/nav/moo.fx.js | 236 +- user_guide/nav/moo.fx.pack.js | 480 +- user_guide/nav/nav.js | 272 +- user_guide/nav/prototype.lite.js | 252 +- user_guide/nav/user_guide_menu.js | 6 +- user_guide/overview/appflow.html | 188 +- user_guide/overview/at_a_glance.html | 342 +- user_guide/overview/features.html | 238 +- user_guide/overview/getting_started.html | 182 +- user_guide/overview/goals.html | 194 +- user_guide/overview/index.html | 166 +- user_guide/overview/mvc.html | 198 +- user_guide/toc.html | 412 +- user_guide/userguide.css | 810 ++-- 296 files changed, 67787 insertions(+), 67787 deletions(-) diff --git a/index.php b/index.php index de5fdef1..39aeda5c 100644 --- a/index.php +++ b/index.php @@ -1,118 +1,118 @@ - '', - 'xhtml1-strict' => '', - 'xhtml1-trans' => '', - 'xhtml1-frame' => '', - 'html5' => '', - 'html4-strict' => '', - 'html4-trans' => '', - 'html4-frame' => '' - ); - -/* End of file doctypes.php */ + '', + 'xhtml1-strict' => '', + 'xhtml1-trans' => '', + 'xhtml1-frame' => '', + 'html5' => '', + 'html4-strict' => '', + 'html4-trans' => '', + 'html4-frame' => '' + ); + +/* End of file doctypes.php */ /* Location: application/config/doctypes.php */ \ No newline at end of file diff --git a/system/application/config/hooks.php b/system/application/config/hooks.php index b94edb97..5e98a9b4 100644 --- a/system/application/config/hooks.php +++ b/system/application/config/hooks.php @@ -1,16 +1,16 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/application/config/mimes.php b/system/application/config/mimes.php index 51e444ee..10acfad9 100644 --- a/system/application/config/mimes.php +++ b/system/application/config/mimes.php @@ -1,105 +1,105 @@ - 'application/mac-binhex40', - 'cpt' => 'application/mac-compactpro', - 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), - 'bin' => 'application/macbinary', - 'dms' => 'application/octet-stream', - 'lha' => 'application/octet-stream', - 'lzh' => 'application/octet-stream', - 'exe' => 'application/octet-stream', - 'class' => 'application/octet-stream', - 'psd' => 'application/x-photoshop', - 'so' => 'application/octet-stream', - 'sea' => 'application/octet-stream', - 'dll' => 'application/octet-stream', - 'oda' => 'application/oda', - 'pdf' => array('application/pdf', 'application/x-download'), - 'ai' => 'application/postscript', - 'eps' => 'application/postscript', - 'ps' => 'application/postscript', - 'smi' => 'application/smil', - 'smil' => 'application/smil', - 'mif' => 'application/vnd.mif', - 'xls' => array('application/excel', 'application/vnd.ms-excel'), - 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'), - 'wbxml' => 'application/wbxml', - 'wmlc' => 'application/wmlc', - 'dcr' => 'application/x-director', - 'dir' => 'application/x-director', - 'dxr' => 'application/x-director', - 'dvi' => 'application/x-dvi', - 'gtar' => 'application/x-gtar', - 'gz' => 'application/x-gzip', - 'php' => 'application/x-httpd-php', - 'php4' => 'application/x-httpd-php', - 'php3' => 'application/x-httpd-php', - 'phtml' => 'application/x-httpd-php', - 'phps' => 'application/x-httpd-php-source', - 'js' => 'application/x-javascript', - 'swf' => 'application/x-shockwave-flash', - 'sit' => 'application/x-stuffit', - 'tar' => 'application/x-tar', - 'tgz' => 'application/x-tar', - 'xhtml' => 'application/xhtml+xml', - 'xht' => 'application/xhtml+xml', - 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'), - 'mid' => 'audio/midi', - 'midi' => 'audio/midi', - 'mpga' => 'audio/mpeg', - 'mp2' => 'audio/mpeg', - 'mp3' => array('audio/mpeg', 'audio/mpg'), - 'aif' => 'audio/x-aiff', - 'aiff' => 'audio/x-aiff', - 'aifc' => 'audio/x-aiff', - 'ram' => 'audio/x-pn-realaudio', - 'rm' => 'audio/x-pn-realaudio', - 'rpm' => 'audio/x-pn-realaudio-plugin', - 'ra' => 'audio/x-realaudio', - 'rv' => 'video/vnd.rn-realvideo', - 'wav' => 'audio/x-wav', - 'bmp' => 'image/bmp', - 'gif' => 'image/gif', - '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'), - 'tiff' => 'image/tiff', - 'tif' => 'image/tiff', - 'css' => 'text/css', - 'html' => 'text/html', - 'htm' => 'text/html', - 'shtml' => 'text/html', - 'txt' => 'text/plain', - 'text' => 'text/plain', - 'log' => array('text/plain', 'text/x-log'), - 'rtx' => 'text/richtext', - 'rtf' => 'text/rtf', - 'xml' => 'text/xml', - 'xsl' => 'text/xml', - 'mpeg' => 'video/mpeg', - 'mpg' => 'video/mpeg', - 'mpe' => 'video/mpeg', - 'qt' => 'video/quicktime', - 'mov' => 'video/quicktime', - 'avi' => 'video/x-msvideo', - 'movie' => 'video/x-sgi-movie', - 'doc' => 'application/msword', - 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - 'word' => array('application/msword', 'application/octet-stream'), - 'xl' => 'application/excel', - 'eml' => 'message/rfc822' - ); - - -/* End of file mimes.php */ + 'application/mac-binhex40', + 'cpt' => 'application/mac-compactpro', + 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), + 'bin' => 'application/macbinary', + 'dms' => 'application/octet-stream', + 'lha' => 'application/octet-stream', + 'lzh' => 'application/octet-stream', + 'exe' => 'application/octet-stream', + 'class' => 'application/octet-stream', + 'psd' => 'application/x-photoshop', + 'so' => 'application/octet-stream', + 'sea' => 'application/octet-stream', + 'dll' => 'application/octet-stream', + 'oda' => 'application/oda', + 'pdf' => array('application/pdf', 'application/x-download'), + 'ai' => 'application/postscript', + 'eps' => 'application/postscript', + 'ps' => 'application/postscript', + 'smi' => 'application/smil', + 'smil' => 'application/smil', + 'mif' => 'application/vnd.mif', + 'xls' => array('application/excel', 'application/vnd.ms-excel'), + 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'), + 'wbxml' => 'application/wbxml', + 'wmlc' => 'application/wmlc', + 'dcr' => 'application/x-director', + 'dir' => 'application/x-director', + 'dxr' => 'application/x-director', + 'dvi' => 'application/x-dvi', + 'gtar' => 'application/x-gtar', + 'gz' => 'application/x-gzip', + 'php' => 'application/x-httpd-php', + 'php4' => 'application/x-httpd-php', + 'php3' => 'application/x-httpd-php', + 'phtml' => 'application/x-httpd-php', + 'phps' => 'application/x-httpd-php-source', + 'js' => 'application/x-javascript', + 'swf' => 'application/x-shockwave-flash', + 'sit' => 'application/x-stuffit', + 'tar' => 'application/x-tar', + 'tgz' => 'application/x-tar', + 'xhtml' => 'application/xhtml+xml', + 'xht' => 'application/xhtml+xml', + 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'), + 'mid' => 'audio/midi', + 'midi' => 'audio/midi', + 'mpga' => 'audio/mpeg', + 'mp2' => 'audio/mpeg', + 'mp3' => array('audio/mpeg', 'audio/mpg'), + 'aif' => 'audio/x-aiff', + 'aiff' => 'audio/x-aiff', + 'aifc' => 'audio/x-aiff', + 'ram' => 'audio/x-pn-realaudio', + 'rm' => 'audio/x-pn-realaudio', + 'rpm' => 'audio/x-pn-realaudio-plugin', + 'ra' => 'audio/x-realaudio', + 'rv' => 'video/vnd.rn-realvideo', + 'wav' => 'audio/x-wav', + 'bmp' => 'image/bmp', + 'gif' => 'image/gif', + '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'), + 'tiff' => 'image/tiff', + 'tif' => 'image/tiff', + 'css' => 'text/css', + 'html' => 'text/html', + 'htm' => 'text/html', + 'shtml' => 'text/html', + 'txt' => 'text/plain', + 'text' => 'text/plain', + 'log' => array('text/plain', 'text/x-log'), + 'rtx' => 'text/richtext', + 'rtf' => 'text/rtf', + 'xml' => 'text/xml', + 'xsl' => 'text/xml', + 'mpeg' => 'video/mpeg', + 'mpg' => 'video/mpeg', + 'mpe' => 'video/mpeg', + 'qt' => 'video/quicktime', + 'mov' => 'video/quicktime', + 'avi' => 'video/x-msvideo', + 'movie' => 'video/x-sgi-movie', + 'doc' => 'application/msword', + 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'word' => array('application/msword', 'application/octet-stream'), + 'xl' => 'application/excel', + 'eml' => 'message/rfc822' + ); + + +/* End of file mimes.php */ /* Location: ./system/application/config/mimes.php */ \ No newline at end of file diff --git a/system/application/config/routes.php b/system/application/config/routes.php index c9592483..c2f1e99d 100644 --- a/system/application/config/routes.php +++ b/system/application/config/routes.php @@ -1,48 +1,48 @@ - array('grin.gif', '19', '19', 'grin'), - ':lol:' => array('lol.gif', '19', '19', 'LOL'), - ':cheese:' => array('cheese.gif', '19', '19', 'cheese'), - ':)' => array('smile.gif', '19', '19', 'smile'), - ';-)' => array('wink.gif', '19', '19', 'wink'), - ';)' => array('wink.gif', '19', '19', 'wink'), - ':smirk:' => array('smirk.gif', '19', '19', 'smirk'), - ':roll:' => array('rolleyes.gif', '19', '19', 'rolleyes'), - ':-S' => array('confused.gif', '19', '19', 'confused'), - ':wow:' => array('surprise.gif', '19', '19', 'surprised'), - ':bug:' => array('bigsurprise.gif', '19', '19', 'big surprise'), - ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'), - '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'), - ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'), - ':P' => array('raspberry.gif', '19', '19', 'raspberry'), - ':blank:' => array('blank.gif', '19', '19', 'blank stare'), - ':long:' => array('longface.gif', '19', '19', 'long face'), - ':ohh:' => array('ohh.gif', '19', '19', 'ohh'), - ':grrr:' => array('grrr.gif', '19', '19', 'grrr'), - ':gulp:' => array('gulp.gif', '19', '19', 'gulp'), - '8-/' => array('ohoh.gif', '19', '19', 'oh oh'), - ':down:' => array('downer.gif', '19', '19', 'downer'), - ':red:' => array('embarrassed.gif', '19', '19', 'red face'), - ':sick:' => array('sick.gif', '19', '19', 'sick'), - ':shut:' => array('shuteye.gif', '19', '19', 'shut eye'), - ':-/' => array('hmm.gif', '19', '19', 'hmmm'), - '>:(' => array('mad.gif', '19', '19', 'mad'), - ':mad:' => array('mad.gif', '19', '19', 'mad'), - '>:-(' => array('angry.gif', '19', '19', 'angry'), - ':angry:' => array('angry.gif', '19', '19', 'angry'), - ':zip:' => array('zip.gif', '19', '19', 'zipper'), - ':kiss:' => array('kiss.gif', '19', '19', 'kiss'), - ':ahhh:' => array('shock.gif', '19', '19', 'shock'), - ':coolsmile:' => array('shade_smile.gif', '19', '19', 'cool smile'), - ':coolsmirk:' => array('shade_smirk.gif', '19', '19', 'cool smirk'), - ':coolgrin:' => array('shade_grin.gif', '19', '19', 'cool grin'), - ':coolhmm:' => array('shade_hmm.gif', '19', '19', 'cool hmm'), - ':coolmad:' => array('shade_mad.gif', '19', '19', 'cool mad'), - ':coolcheese:' => array('shade_cheese.gif', '19', '19', 'cool cheese'), - ':vampire:' => array('vampire.gif', '19', '19', 'vampire'), - ':snake:' => array('snake.gif', '19', '19', 'snake'), - ':exclaim:' => array('exclaim.gif', '19', '19', 'excaim'), - ':question:' => array('question.gif', '19', '19', 'question') // no comma after last item - - ); - -/* End of file smileys.php */ + array('grin.gif', '19', '19', 'grin'), + ':lol:' => array('lol.gif', '19', '19', 'LOL'), + ':cheese:' => array('cheese.gif', '19', '19', 'cheese'), + ':)' => array('smile.gif', '19', '19', 'smile'), + ';-)' => array('wink.gif', '19', '19', 'wink'), + ';)' => array('wink.gif', '19', '19', 'wink'), + ':smirk:' => array('smirk.gif', '19', '19', 'smirk'), + ':roll:' => array('rolleyes.gif', '19', '19', 'rolleyes'), + ':-S' => array('confused.gif', '19', '19', 'confused'), + ':wow:' => array('surprise.gif', '19', '19', 'surprised'), + ':bug:' => array('bigsurprise.gif', '19', '19', 'big surprise'), + ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'), + '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'), + ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'), + ':P' => array('raspberry.gif', '19', '19', 'raspberry'), + ':blank:' => array('blank.gif', '19', '19', 'blank stare'), + ':long:' => array('longface.gif', '19', '19', 'long face'), + ':ohh:' => array('ohh.gif', '19', '19', 'ohh'), + ':grrr:' => array('grrr.gif', '19', '19', 'grrr'), + ':gulp:' => array('gulp.gif', '19', '19', 'gulp'), + '8-/' => array('ohoh.gif', '19', '19', 'oh oh'), + ':down:' => array('downer.gif', '19', '19', 'downer'), + ':red:' => array('embarrassed.gif', '19', '19', 'red face'), + ':sick:' => array('sick.gif', '19', '19', 'sick'), + ':shut:' => array('shuteye.gif', '19', '19', 'shut eye'), + ':-/' => array('hmm.gif', '19', '19', 'hmmm'), + '>:(' => array('mad.gif', '19', '19', 'mad'), + ':mad:' => array('mad.gif', '19', '19', 'mad'), + '>:-(' => array('angry.gif', '19', '19', 'angry'), + ':angry:' => array('angry.gif', '19', '19', 'angry'), + ':zip:' => array('zip.gif', '19', '19', 'zipper'), + ':kiss:' => array('kiss.gif', '19', '19', 'kiss'), + ':ahhh:' => array('shock.gif', '19', '19', 'shock'), + ':coolsmile:' => array('shade_smile.gif', '19', '19', 'cool smile'), + ':coolsmirk:' => array('shade_smirk.gif', '19', '19', 'cool smirk'), + ':coolgrin:' => array('shade_grin.gif', '19', '19', 'cool grin'), + ':coolhmm:' => array('shade_hmm.gif', '19', '19', 'cool hmm'), + ':coolmad:' => array('shade_mad.gif', '19', '19', 'cool mad'), + ':coolcheese:' => array('shade_cheese.gif', '19', '19', 'cool cheese'), + ':vampire:' => array('vampire.gif', '19', '19', 'vampire'), + ':snake:' => array('snake.gif', '19', '19', 'snake'), + ':exclaim:' => array('exclaim.gif', '19', '19', 'excaim'), + ':question:' => array('question.gif', '19', '19', 'question') // no comma after last item + + ); + +/* End of file smileys.php */ /* Location: ./system/application/config/smileys.php */ \ No newline at end of file diff --git a/system/application/config/user_agents.php b/system/application/config/user_agents.php index eabd762f..c01b2767 100644 --- a/system/application/config/user_agents.php +++ b/system/application/config/user_agents.php @@ -1,175 +1,175 @@ - 'Windows Longhorn', - 'windows nt 5.2' => 'Windows 2003', - 'windows nt 5.0' => 'Windows 2000', - 'windows nt 5.1' => 'Windows XP', - 'windows nt 4.0' => 'Windows NT 4.0', - 'winnt4.0' => 'Windows NT 4.0', - 'winnt 4.0' => 'Windows NT', - 'winnt' => 'Windows NT', - 'windows 98' => 'Windows 98', - 'win98' => 'Windows 98', - 'windows 95' => 'Windows 95', - 'win95' => 'Windows 95', - 'windows' => 'Unknown Windows OS', - 'os x' => 'Mac OS X', - 'ppc mac' => 'Power PC Mac', - 'freebsd' => 'FreeBSD', - 'ppc' => 'Macintosh', - 'linux' => 'Linux', - 'debian' => 'Debian', - 'sunos' => 'Sun Solaris', - 'beos' => 'BeOS', - 'apachebench' => 'ApacheBench', - 'aix' => 'AIX', - 'irix' => 'Irix', - 'osf' => 'DEC OSF', - 'hp-ux' => 'HP-UX', - 'netbsd' => 'NetBSD', - 'bsdi' => 'BSDi', - 'openbsd' => 'OpenBSD', - 'gnu' => 'GNU/Linux', - 'unix' => 'Unknown Unix OS' - ); - - -// The order of this array should NOT be changed. Many browsers return -// multiple browser types so we want to identify the sub-type first. -$browsers = array( - 'Opera' => 'Opera', - 'MSIE' => 'Internet Explorer', - 'Internet Explorer' => 'Internet Explorer', - 'Shiira' => 'Shiira', - 'Firefox' => 'Firefox', - 'Chimera' => 'Chimera', - 'Phoenix' => 'Phoenix', - 'Firebird' => 'Firebird', - 'Camino' => 'Camino', - 'Netscape' => 'Netscape', - 'OmniWeb' => 'OmniWeb', - 'Mozilla' => 'Mozilla', - 'Safari' => 'Safari', - 'Konqueror' => 'Konqueror', - 'icab' => 'iCab', - 'Lynx' => 'Lynx', - 'Links' => 'Links', - 'hotjava' => 'HotJava', - 'amaya' => 'Amaya', - 'IBrowse' => 'IBrowse' - ); - -$mobiles = array( - // legacy array, old values commented out - 'mobileexplorer' => 'Mobile Explorer', -// 'openwave' => 'Open Wave', -// 'opera mini' => 'Opera Mini', -// 'operamini' => 'Opera Mini', -// 'elaine' => 'Palm', - 'palmsource' => 'Palm', -// 'digital paths' => 'Palm', -// 'avantgo' => 'Avantgo', -// 'xiino' => 'Xiino', - 'palmscape' => 'Palmscape', -// 'nokia' => 'Nokia', -// 'ericsson' => 'Ericsson', -// 'blackberry' => 'BlackBerry', -// 'motorola' => 'Motorola' - - // Phones and Manufacturers - 'motorola' => "Motorola", - 'nokia' => "Nokia", - 'palm' => "Palm", - 'iphone' => "Apple iPhone", - 'ipod' => "Apple iPod Touch", - 'sony' => "Sony Ericsson", - 'ericsson' => "Sony Ericsson", - 'blackberry' => "BlackBerry", - 'cocoon' => "O2 Cocoon", - 'blazer' => "Treo", - 'lg' => "LG", - 'amoi' => "Amoi", - 'xda' => "XDA", - 'mda' => "MDA", - 'vario' => "Vario", - 'htc' => "HTC", - 'samsung' => "Samsung", - 'sharp' => "Sharp", - 'sie-' => "Siemens", - 'alcatel' => "Alcatel", - 'benq' => "BenQ", - 'ipaq' => "HP iPaq", - 'mot-' => "Motorola", - 'playstation portable' => "PlayStation Portable", - 'hiptop' => "Danger Hiptop", - 'nec-' => "NEC", - 'panasonic' => "Panasonic", - 'philips' => "Philips", - 'sagem' => "Sagem", - 'sanyo' => "Sanyo", - 'spv' => "SPV", - 'zte' => "ZTE", - 'sendo' => "Sendo", - - // Operating Systems - 'symbian' => "Symbian", - 'SymbianOS' => "SymbianOS", - 'elaine' => "Palm", - 'palm' => "Palm", - 'series60' => "Symbian S60", - 'windows ce' => "Windows CE", - - // Browsers - 'obigo' => "Obigo", - 'netfront' => "Netfront Browser", - 'openwave' => "Openwave Browser", - 'mobilexplorer' => "Mobile Explorer", - 'operamini' => "Opera Mini", - 'opera mini' => "Opera Mini", - - // Other - 'digital paths' => "Digital Paths", - 'avantgo' => "AvantGo", - 'xiino' => "Xiino", - 'novarra' => "Novarra Transcoder", - 'vodafone' => "Vodafone", - 'docomo' => "NTT DoCoMo", - 'o2' => "O2", - - // Fallback - 'mobile' => "Generic Mobile", - 'wireless' => "Generic Mobile", - 'j2me' => "Generic Mobile", - 'midp' => "Generic Mobile", - 'cldc' => "Generic Mobile", - 'up.link' => "Generic Mobile", - 'up.browser' => "Generic Mobile", - 'smartphone' => "Generic Mobile", - 'cellphone' => "Generic Mobile" - ); - -// There are hundreds of bots but these are the most common. -$robots = array( - 'googlebot' => 'Googlebot', - 'msnbot' => 'MSNBot', - 'slurp' => 'Inktomi Slurp', - 'yahoo' => 'Yahoo', - 'askjeeves' => 'AskJeeves', - 'fastcrawler' => 'FastCrawler', - 'infoseek' => 'InfoSeek Robot 1.0', - 'lycos' => 'Lycos' - ); - -/* End of file user_agents.php */ + 'Windows Longhorn', + 'windows nt 5.2' => 'Windows 2003', + 'windows nt 5.0' => 'Windows 2000', + 'windows nt 5.1' => 'Windows XP', + 'windows nt 4.0' => 'Windows NT 4.0', + 'winnt4.0' => 'Windows NT 4.0', + 'winnt 4.0' => 'Windows NT', + 'winnt' => 'Windows NT', + 'windows 98' => 'Windows 98', + 'win98' => 'Windows 98', + 'windows 95' => 'Windows 95', + 'win95' => 'Windows 95', + 'windows' => 'Unknown Windows OS', + 'os x' => 'Mac OS X', + 'ppc mac' => 'Power PC Mac', + 'freebsd' => 'FreeBSD', + 'ppc' => 'Macintosh', + 'linux' => 'Linux', + 'debian' => 'Debian', + 'sunos' => 'Sun Solaris', + 'beos' => 'BeOS', + 'apachebench' => 'ApacheBench', + 'aix' => 'AIX', + 'irix' => 'Irix', + 'osf' => 'DEC OSF', + 'hp-ux' => 'HP-UX', + 'netbsd' => 'NetBSD', + 'bsdi' => 'BSDi', + 'openbsd' => 'OpenBSD', + 'gnu' => 'GNU/Linux', + 'unix' => 'Unknown Unix OS' + ); + + +// The order of this array should NOT be changed. Many browsers return +// multiple browser types so we want to identify the sub-type first. +$browsers = array( + 'Opera' => 'Opera', + 'MSIE' => 'Internet Explorer', + 'Internet Explorer' => 'Internet Explorer', + 'Shiira' => 'Shiira', + 'Firefox' => 'Firefox', + 'Chimera' => 'Chimera', + 'Phoenix' => 'Phoenix', + 'Firebird' => 'Firebird', + 'Camino' => 'Camino', + 'Netscape' => 'Netscape', + 'OmniWeb' => 'OmniWeb', + 'Mozilla' => 'Mozilla', + 'Safari' => 'Safari', + 'Konqueror' => 'Konqueror', + 'icab' => 'iCab', + 'Lynx' => 'Lynx', + 'Links' => 'Links', + 'hotjava' => 'HotJava', + 'amaya' => 'Amaya', + 'IBrowse' => 'IBrowse' + ); + +$mobiles = array( + // legacy array, old values commented out + 'mobileexplorer' => 'Mobile Explorer', +// 'openwave' => 'Open Wave', +// 'opera mini' => 'Opera Mini', +// 'operamini' => 'Opera Mini', +// 'elaine' => 'Palm', + 'palmsource' => 'Palm', +// 'digital paths' => 'Palm', +// 'avantgo' => 'Avantgo', +// 'xiino' => 'Xiino', + 'palmscape' => 'Palmscape', +// 'nokia' => 'Nokia', +// 'ericsson' => 'Ericsson', +// 'blackberry' => 'BlackBerry', +// 'motorola' => 'Motorola' + + // Phones and Manufacturers + 'motorola' => "Motorola", + 'nokia' => "Nokia", + 'palm' => "Palm", + 'iphone' => "Apple iPhone", + 'ipod' => "Apple iPod Touch", + 'sony' => "Sony Ericsson", + 'ericsson' => "Sony Ericsson", + 'blackberry' => "BlackBerry", + 'cocoon' => "O2 Cocoon", + 'blazer' => "Treo", + 'lg' => "LG", + 'amoi' => "Amoi", + 'xda' => "XDA", + 'mda' => "MDA", + 'vario' => "Vario", + 'htc' => "HTC", + 'samsung' => "Samsung", + 'sharp' => "Sharp", + 'sie-' => "Siemens", + 'alcatel' => "Alcatel", + 'benq' => "BenQ", + 'ipaq' => "HP iPaq", + 'mot-' => "Motorola", + 'playstation portable' => "PlayStation Portable", + 'hiptop' => "Danger Hiptop", + 'nec-' => "NEC", + 'panasonic' => "Panasonic", + 'philips' => "Philips", + 'sagem' => "Sagem", + 'sanyo' => "Sanyo", + 'spv' => "SPV", + 'zte' => "ZTE", + 'sendo' => "Sendo", + + // Operating Systems + 'symbian' => "Symbian", + 'SymbianOS' => "SymbianOS", + 'elaine' => "Palm", + 'palm' => "Palm", + 'series60' => "Symbian S60", + 'windows ce' => "Windows CE", + + // Browsers + 'obigo' => "Obigo", + 'netfront' => "Netfront Browser", + 'openwave' => "Openwave Browser", + 'mobilexplorer' => "Mobile Explorer", + 'operamini' => "Opera Mini", + 'opera mini' => "Opera Mini", + + // Other + 'digital paths' => "Digital Paths", + 'avantgo' => "AvantGo", + 'xiino' => "Xiino", + 'novarra' => "Novarra Transcoder", + 'vodafone' => "Vodafone", + 'docomo' => "NTT DoCoMo", + 'o2' => "O2", + + // Fallback + 'mobile' => "Generic Mobile", + 'wireless' => "Generic Mobile", + 'j2me' => "Generic Mobile", + 'midp' => "Generic Mobile", + 'cldc' => "Generic Mobile", + 'up.link' => "Generic Mobile", + 'up.browser' => "Generic Mobile", + 'smartphone' => "Generic Mobile", + 'cellphone' => "Generic Mobile" + ); + +// There are hundreds of bots but these are the most common. +$robots = array( + 'googlebot' => 'Googlebot', + 'msnbot' => 'MSNBot', + 'slurp' => 'Inktomi Slurp', + 'yahoo' => 'Yahoo', + 'askjeeves' => 'AskJeeves', + 'fastcrawler' => 'FastCrawler', + 'infoseek' => 'InfoSeek Robot 1.0', + 'lycos' => 'Lycos' + ); + +/* End of file user_agents.php */ /* Location: ./system/application/config/user_agents.php */ \ No newline at end of file diff --git a/system/application/controllers/index.html b/system/application/controllers/index.html index 065d2da5..c942a79c 100644 --- a/system/application/controllers/index.html +++ b/system/application/controllers/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/application/controllers/welcome.php b/system/application/controllers/welcome.php index ec16000d..20d48855 100644 --- a/system/application/controllers/welcome.php +++ b/system/application/controllers/welcome.php @@ -1,17 +1,17 @@ -load->view('welcome_message'); - } -} - -/* End of file welcome.php */ +load->view('welcome_message'); + } +} + +/* End of file welcome.php */ /* Location: ./system/application/controllers/welcome.php */ \ No newline at end of file diff --git a/system/application/errors/error_404.php b/system/application/errors/error_404.php index cad73759..bfe9444b 100644 --- a/system/application/errors/error_404.php +++ b/system/application/errors/error_404.php @@ -1,35 +1,35 @@ - - - -404 Page Not Found - - - -
    -

    - -
    - + + + +404 Page Not Found + + + +
    +

    + +
    + \ No newline at end of file diff --git a/system/application/errors/error_db.php b/system/application/errors/error_db.php index 71a4b98d..1ce52dfc 100644 --- a/system/application/errors/error_db.php +++ b/system/application/errors/error_db.php @@ -1,34 +1,34 @@ - - -Database Error - - - -
    -

    - -
    - + + +Database Error + + + +
    +

    + +
    + \ No newline at end of file diff --git a/system/application/errors/error_general.php b/system/application/errors/error_general.php index 8545286f..d8610702 100644 --- a/system/application/errors/error_general.php +++ b/system/application/errors/error_general.php @@ -1,34 +1,34 @@ - - -Error - - - -
    -

    - -
    - + + +Error + + + +
    +

    + +
    + \ No newline at end of file diff --git a/system/application/errors/error_php.php b/system/application/errors/error_php.php index f5941c96..f085c203 100644 --- a/system/application/errors/error_php.php +++ b/system/application/errors/error_php.php @@ -1,10 +1,10 @@ -
    - -

    A PHP Error was encountered

    - -

    Severity:

    -

    Message:

    -

    Filename:

    -

    Line Number:

    - +
    + +

    A PHP Error was encountered

    + +

    Severity:

    +

    Message:

    +

    Filename:

    +

    Line Number:

    +
    \ No newline at end of file diff --git a/system/application/errors/index.html b/system/application/errors/index.html index 065d2da5..c942a79c 100644 --- a/system/application/errors/index.html +++ b/system/application/errors/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/application/helpers/index.html b/system/application/helpers/index.html index 065d2da5..c942a79c 100644 --- a/system/application/helpers/index.html +++ b/system/application/helpers/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/application/hooks/index.html b/system/application/hooks/index.html index 065d2da5..c942a79c 100644 --- a/system/application/hooks/index.html +++ b/system/application/hooks/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/application/index.html b/system/application/index.html index 065d2da5..c942a79c 100644 --- a/system/application/index.html +++ b/system/application/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/application/language/english/index.html b/system/application/language/english/index.html index 065d2da5..c942a79c 100644 --- a/system/application/language/english/index.html +++ b/system/application/language/english/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/application/libraries/index.html b/system/application/libraries/index.html index 065d2da5..c942a79c 100644 --- a/system/application/libraries/index.html +++ b/system/application/libraries/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/application/models/index.html b/system/application/models/index.html index 065d2da5..c942a79c 100644 --- a/system/application/models/index.html +++ b/system/application/models/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/application/views/index.html b/system/application/views/index.html index 065d2da5..c942a79c 100644 --- a/system/application/views/index.html +++ b/system/application/views/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/application/views/welcome_message.php b/system/application/views/welcome_message.php index 8313059e..653b62c7 100644 --- a/system/application/views/welcome_message.php +++ b/system/application/views/welcome_message.php @@ -1,62 +1,62 @@ - - -Welcome to CodeIgniter - - - - - -

    Welcome to CodeIgniter!

    - -

    The page you are looking at is being generated dynamically by CodeIgniter.

    - -

    If you would like to edit this page you'll find it located at:

    -system/application/views/welcome_message.php - -

    The corresponding controller for this page is found at:

    -system/application/controllers/welcome.php - -

    If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.

    - - -


    Page rendered in {elapsed_time} seconds

    - - + + +Welcome to CodeIgniter + + + + + +

    Welcome to CodeIgniter!

    + +

    The page you are looking at is being generated dynamically by CodeIgniter.

    + +

    If you would like to edit this page you'll find it located at:

    +system/application/views/welcome_message.php + +

    The corresponding controller for this page is found at:

    +system/application/controllers/welcome.php + +

    If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.

    + + +


    Page rendered in {elapsed_time} seconds

    + + \ No newline at end of file diff --git a/system/cache/index.html b/system/cache/index.html index 065d2da5..c942a79c 100644 --- a/system/cache/index.html +++ b/system/cache/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php index b242c00f..a95c2812 100644 --- a/system/codeigniter/Base4.php +++ b/system/codeigniter/Base4.php @@ -1,69 +1,69 @@ -load->library('email') to instantiate - * classes that can then be used within controllers as $this->email->send() - * - * PHP 4 also has trouble referencing the CI super object within application - * constructors since objects do not exist until the class is fully - * instantiated. Basically PHP 4 sucks... - * - * Since PHP 5 doesn't suffer from this problem so we load one of - * two files based on the version of PHP being run. - * - * @package CodeIgniter - * @subpackage codeigniter - * @category front-controller - * @author ExpressionEngine Dev Team - * @link http://codeigniter.com/user_guide/ - */ - class CI_Base extends CI_Loader { - - function CI_Base() - { - // This allows syntax like $this->load->foo() to work - parent::CI_Loader(); - $this->load =& $this; - - // This allows resources used within controller constructors to work - global $OBJ; - $OBJ = $this->load; // Do NOT use a reference. - } -} - -function &get_instance() -{ - global $CI, $OBJ; - - if (is_object($CI)) - { - return $CI; - } - - return $OBJ->load; -} - - -/* End of file Base4.php */ +load->library('email') to instantiate + * classes that can then be used within controllers as $this->email->send() + * + * PHP 4 also has trouble referencing the CI super object within application + * constructors since objects do not exist until the class is fully + * instantiated. Basically PHP 4 sucks... + * + * Since PHP 5 doesn't suffer from this problem so we load one of + * two files based on the version of PHP being run. + * + * @package CodeIgniter + * @subpackage codeigniter + * @category front-controller + * @author ExpressionEngine Dev Team + * @link http://codeigniter.com/user_guide/ + */ + class CI_Base extends CI_Loader { + + function CI_Base() + { + // This allows syntax like $this->load->foo() to work + parent::CI_Loader(); + $this->load =& $this; + + // This allows resources used within controller constructors to work + global $OBJ; + $OBJ = $this->load; // Do NOT use a reference. + } +} + +function &get_instance() +{ + global $CI, $OBJ; + + if (is_object($CI)) + { + return $CI; + } + + return $OBJ->load; +} + + +/* End of file Base4.php */ /* Location: ./system/codeigniter/Base4.php */ \ No newline at end of file diff --git a/system/codeigniter/Base5.php b/system/codeigniter/Base5.php index 8dd3ad04..aa903557 100644 --- a/system/codeigniter/Base5.php +++ b/system/codeigniter/Base5.php @@ -1,56 +1,56 @@ -mark('total_execution_time_start'); -$BM->mark('loading_time_base_classes_start'); - -/* - * ------------------------------------------------------ - * Instantiate the hooks class - * ------------------------------------------------------ - */ - -$EXT =& load_class('Hooks'); - -/* - * ------------------------------------------------------ - * Is there a "pre_system" hook? - * ------------------------------------------------------ - */ -$EXT->_call_hook('pre_system'); - -/* - * ------------------------------------------------------ - * Instantiate the base classes - * ------------------------------------------------------ - */ - -$CFG =& load_class('Config'); -$URI =& load_class('URI'); -$RTR =& load_class('Router'); -$OUT =& load_class('Output'); - -/* - * ------------------------------------------------------ - * Is there a valid cache file? If so, we're done... - * ------------------------------------------------------ - */ - -if ($EXT->_call_hook('cache_override') === FALSE) -{ - if ($OUT->_display_cache($CFG, $URI) == TRUE) - { - exit; - } -} - -/* - * ------------------------------------------------------ - * Load the remaining base classes - * ------------------------------------------------------ - */ - -$IN =& load_class('Input'); -$LANG =& load_class('Language'); - -/* - * ------------------------------------------------------ - * Load the app controller and local controller - * ------------------------------------------------------ - * - * Note: Due to the poor object handling in PHP 4 we'll - * conditionally load different versions of the base - * class. Retaining PHP 4 compatibility requires a bit of a hack. - * - * Note: The Loader class needs to be included first - * - */ -if (floor(phpversion()) < 5) -{ - load_class('Loader', FALSE); - require(BASEPATH.'codeigniter/Base4'.EXT); -} -else -{ - require(BASEPATH.'codeigniter/Base5'.EXT); -} - -// Load the base controller class -load_class('Controller', FALSE); - -// Load the local application controller -// Note: The Router class automatically validates the controller path. If this include fails it -// means that the default controller in the Routes.php file is not resolving to something valid. -if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) -{ - show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); -} - -include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT); - -// Set a mark point for benchmarking -$BM->mark('loading_time_base_classes_end'); - - -/* - * ------------------------------------------------------ - * 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 - */ -$class = $RTR->fetch_class(); -$method = $RTR->fetch_method(); - -if ( ! class_exists($class) - OR $method == 'controller' - OR strncmp($method, '_', 1) == 0 - OR in_array(strtolower($method), array_map('strtolower', get_class_methods('Controller'))) - ) -{ - show_404("{$class}/{$method}"); -} - -/* - * ------------------------------------------------------ - * Is there a "pre_controller" hook? - * ------------------------------------------------------ - */ -$EXT->_call_hook('pre_controller'); - -/* - * ------------------------------------------------------ - * Instantiate the controller and call requested method - * ------------------------------------------------------ - */ - -// Mark a start point so we can benchmark the controller -$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); - -$CI = new $class(); - -// Is this a scaffolding request? -if ($RTR->scaffolding_request === TRUE) -{ - if ($EXT->_call_hook('scaffolding_override') === FALSE) - { - $CI->_ci_scaffolding(); - } -} -else -{ - /* - * ------------------------------------------------------ - * Is there a "post_controller_constructor" hook? - * ------------------------------------------------------ - */ - $EXT->_call_hook('post_controller_constructor'); - - // Is there a "remap" function? - if (method_exists($CI, '_remap')) - { - $CI->_remap($method); - } - else - { - // is_callable() returns TRUE on some versions of PHP 5 for private and protected - // methods, so we'll use this workaround for consistent behavior - if ( ! in_array(strtolower($method), array_map('strtolower', get_class_methods($CI)))) - { - show_404("{$class}/{$method}"); - } - - // Call the requested method. - // Any URI segments present (besides the class/function) will be passed to the method for convenience - call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, 2)); - } -} - -// Mark a benchmark end point -$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end'); - -/* - * ------------------------------------------------------ - * Is there a "post_controller" hook? - * ------------------------------------------------------ - */ -$EXT->_call_hook('post_controller'); - -/* - * ------------------------------------------------------ - * Send the final rendered output to the browser - * ------------------------------------------------------ - */ - -if ($EXT->_call_hook('display_override') === FALSE) -{ - $OUT->_display(); -} - -/* - * ------------------------------------------------------ - * Is there a "post_system" hook? - * ------------------------------------------------------ - */ -$EXT->_call_hook('post_system'); - -/* - * ------------------------------------------------------ - * Close the DB connection if one exists - * ------------------------------------------------------ - */ -if (class_exists('CI_DB') AND isset($CI->db)) -{ - $CI->db->close(); -} - - -/* End of file CodeIgniter.php */ +mark('total_execution_time_start'); +$BM->mark('loading_time_base_classes_start'); + +/* + * ------------------------------------------------------ + * Instantiate the hooks class + * ------------------------------------------------------ + */ + +$EXT =& load_class('Hooks'); + +/* + * ------------------------------------------------------ + * Is there a "pre_system" hook? + * ------------------------------------------------------ + */ +$EXT->_call_hook('pre_system'); + +/* + * ------------------------------------------------------ + * Instantiate the base classes + * ------------------------------------------------------ + */ + +$CFG =& load_class('Config'); +$URI =& load_class('URI'); +$RTR =& load_class('Router'); +$OUT =& load_class('Output'); + +/* + * ------------------------------------------------------ + * Is there a valid cache file? If so, we're done... + * ------------------------------------------------------ + */ + +if ($EXT->_call_hook('cache_override') === FALSE) +{ + if ($OUT->_display_cache($CFG, $URI) == TRUE) + { + exit; + } +} + +/* + * ------------------------------------------------------ + * Load the remaining base classes + * ------------------------------------------------------ + */ + +$IN =& load_class('Input'); +$LANG =& load_class('Language'); + +/* + * ------------------------------------------------------ + * Load the app controller and local controller + * ------------------------------------------------------ + * + * Note: Due to the poor object handling in PHP 4 we'll + * conditionally load different versions of the base + * class. Retaining PHP 4 compatibility requires a bit of a hack. + * + * Note: The Loader class needs to be included first + * + */ +if (floor(phpversion()) < 5) +{ + load_class('Loader', FALSE); + require(BASEPATH.'codeigniter/Base4'.EXT); +} +else +{ + require(BASEPATH.'codeigniter/Base5'.EXT); +} + +// Load the base controller class +load_class('Controller', FALSE); + +// Load the local application controller +// Note: The Router class automatically validates the controller path. If this include fails it +// means that the default controller in the Routes.php file is not resolving to something valid. +if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) +{ + show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); +} + +include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT); + +// Set a mark point for benchmarking +$BM->mark('loading_time_base_classes_end'); + + +/* + * ------------------------------------------------------ + * 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 + */ +$class = $RTR->fetch_class(); +$method = $RTR->fetch_method(); + +if ( ! class_exists($class) + OR $method == 'controller' + OR strncmp($method, '_', 1) == 0 + OR in_array(strtolower($method), array_map('strtolower', get_class_methods('Controller'))) + ) +{ + show_404("{$class}/{$method}"); +} + +/* + * ------------------------------------------------------ + * Is there a "pre_controller" hook? + * ------------------------------------------------------ + */ +$EXT->_call_hook('pre_controller'); + +/* + * ------------------------------------------------------ + * Instantiate the controller and call requested method + * ------------------------------------------------------ + */ + +// Mark a start point so we can benchmark the controller +$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_start'); + +$CI = new $class(); + +// Is this a scaffolding request? +if ($RTR->scaffolding_request === TRUE) +{ + if ($EXT->_call_hook('scaffolding_override') === FALSE) + { + $CI->_ci_scaffolding(); + } +} +else +{ + /* + * ------------------------------------------------------ + * Is there a "post_controller_constructor" hook? + * ------------------------------------------------------ + */ + $EXT->_call_hook('post_controller_constructor'); + + // Is there a "remap" function? + if (method_exists($CI, '_remap')) + { + $CI->_remap($method); + } + else + { + // is_callable() returns TRUE on some versions of PHP 5 for private and protected + // methods, so we'll use this workaround for consistent behavior + if ( ! in_array(strtolower($method), array_map('strtolower', get_class_methods($CI)))) + { + show_404("{$class}/{$method}"); + } + + // Call the requested method. + // Any URI segments present (besides the class/function) will be passed to the method for convenience + call_user_func_array(array(&$CI, $method), array_slice($URI->rsegments, 2)); + } +} + +// Mark a benchmark end point +$BM->mark('controller_execution_time_( '.$class.' / '.$method.' )_end'); + +/* + * ------------------------------------------------------ + * Is there a "post_controller" hook? + * ------------------------------------------------------ + */ +$EXT->_call_hook('post_controller'); + +/* + * ------------------------------------------------------ + * Send the final rendered output to the browser + * ------------------------------------------------------ + */ + +if ($EXT->_call_hook('display_override') === FALSE) +{ + $OUT->_display(); +} + +/* + * ------------------------------------------------------ + * Is there a "post_system" hook? + * ------------------------------------------------------ + */ +$EXT->_call_hook('post_system'); + +/* + * ------------------------------------------------------ + * Close the DB connection if one exists + * ------------------------------------------------------ + */ +if (class_exists('CI_DB') AND isset($CI->db)) +{ + $CI->db->close(); +} + + +/* End of file CodeIgniter.php */ /* Location: ./system/codeigniter/CodeIgniter.php */ \ No newline at end of file diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index 9212f07a..3c75f5e6 100644 --- a/system/codeigniter/Common.php +++ b/system/codeigniter/Common.php @@ -1,307 +1,307 @@ -show_error('An Error Was Encountered', $message); - exit; -} - - -/** -* 404 Page Handler -* -* This function is similar to the show_error() function above -* However, instead of the standard error template it displays -* 404 errors. -* -* @access public -* @return void -*/ -function show_404($page = '') -{ - $error =& load_class('Exceptions'); - $error->show_404($page); - exit; -} - - -/** -* Error Logging Interface -* -* We use this as a simple mechanism to access the logging -* class and send messages to be logged. -* -* @access public -* @return void -*/ -function log_message($level = 'error', $message, $php_error = FALSE) -{ - static $LOG; - - $config =& get_config(); - if ($config['log_threshold'] == 0) - { - return; - } - - $LOG =& load_class('Log'); - $LOG->write_log($level, $message, $php_error); -} - -/** -* Exception Handler -* -* This is the custom exception handler that is declaired at the top -* of Codeigniter.php. The main reason we use this is permit -* PHP errors to be logged in our own log files since we may -* not have access to server logs. Since this function -* effectively intercepts PHP errors, however, we also need -* to display errors based on the current error_reporting level. -* We do that with the use of a PHP error template. -* -* @access private -* @return void -*/ -function _exception_handler($severity, $message, $filepath, $line) -{ - // We don't bother with "strict" notices since they will fill up - // the log file with information that isn't normally very - // helpful. For example, if you are running PHP 5 and you - // use version 4 style class functions (without prefixes - // like "public", "private", etc.) you'll get notices telling - // you that these have been deprecated. - - if ($severity == E_STRICT) - { - return; - } - - $error =& load_class('Exceptions'); - - // Should we display the error? - // We'll get the current error_reporting level and add its bits - // with the severity bits to find out. - - if (($severity & error_reporting()) == $severity) - { - $error->show_php_error($severity, $message, $filepath, $line); - } - - // Should we log the error? No? We're done... - $config =& get_config(); - if ($config['log_threshold'] == 0) - { - return; - } - - $error->log_exception($severity, $message, $filepath, $line); -} - - - -/* End of file Common.php */ +show_error('An Error Was Encountered', $message); + exit; +} + + +/** +* 404 Page Handler +* +* This function is similar to the show_error() function above +* However, instead of the standard error template it displays +* 404 errors. +* +* @access public +* @return void +*/ +function show_404($page = '') +{ + $error =& load_class('Exceptions'); + $error->show_404($page); + exit; +} + + +/** +* Error Logging Interface +* +* We use this as a simple mechanism to access the logging +* class and send messages to be logged. +* +* @access public +* @return void +*/ +function log_message($level = 'error', $message, $php_error = FALSE) +{ + static $LOG; + + $config =& get_config(); + if ($config['log_threshold'] == 0) + { + return; + } + + $LOG =& load_class('Log'); + $LOG->write_log($level, $message, $php_error); +} + +/** +* Exception Handler +* +* This is the custom exception handler that is declaired at the top +* of Codeigniter.php. The main reason we use this is permit +* PHP errors to be logged in our own log files since we may +* not have access to server logs. Since this function +* effectively intercepts PHP errors, however, we also need +* to display errors based on the current error_reporting level. +* We do that with the use of a PHP error template. +* +* @access private +* @return void +*/ +function _exception_handler($severity, $message, $filepath, $line) +{ + // We don't bother with "strict" notices since they will fill up + // the log file with information that isn't normally very + // helpful. For example, if you are running PHP 5 and you + // use version 4 style class functions (without prefixes + // like "public", "private", etc.) you'll get notices telling + // you that these have been deprecated. + + if ($severity == E_STRICT) + { + return; + } + + $error =& load_class('Exceptions'); + + // Should we display the error? + // We'll get the current error_reporting level and add its bits + // with the severity bits to find out. + + if (($severity & error_reporting()) == $severity) + { + $error->show_php_error($severity, $message, $filepath, $line); + } + + // Should we log the error? No? We're done... + $config =& get_config(); + if ($config['log_threshold'] == 0) + { + return; + } + + $error->log_exception($severity, $message, $filepath, $line); +} + + + +/* End of file Common.php */ /* Location: ./system/codeigniter/Common.php */ \ No newline at end of file diff --git a/system/codeigniter/Compat.php b/system/codeigniter/Compat.php index 291f01df..6100956a 100644 --- a/system/codeigniter/Compat.php +++ b/system/codeigniter/Compat.php @@ -1,93 +1,93 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/database/DB.php b/system/database/DB.php index 2b3ff3dc..ca0cfc2e 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -1,146 +1,146 @@ - $dns['scheme'], - 'hostname' => (isset($dns['host'])) ? rawurldecode($dns['host']) : '', - 'username' => (isset($dns['user'])) ? rawurldecode($dns['user']) : '', - 'password' => (isset($dns['pass'])) ? rawurldecode($dns['pass']) : '', - 'database' => (isset($dns['path'])) ? rawurldecode(substr($dns['path'], 1)) : '' - ); - - // were additional config items set? - if (isset($dns['query'])) - { - parse_str($dns['query'], $extra); - - foreach($extra as $key => $val) - { - // booleans please - if (strtoupper($val) == "TRUE") - { - $val = TRUE; - } - elseif (strtoupper($val) == "FALSE") - { - $val = FALSE; - } - - $params[$key] = $val; - } - } - } - - // No DB specified yet? Beat them senseless... - if ( ! isset($params['dbdriver']) OR $params['dbdriver'] == '') - { - show_error('You have not selected a database type to connect to.'); - } - - // Load the DB classes. Note: Since the active record class is optional - // we need to dynamically create a class that extends proper parent class - // based on whether we're using the active record class or not. - // Kudos to Paul for discovering this clever use of eval() - - if ($active_record_override == TRUE) - { - $active_record = TRUE; - } - - require_once(BASEPATH.'database/DB_driver'.EXT); - - if ( ! isset($active_record) OR $active_record == TRUE) - { - require_once(BASEPATH.'database/DB_active_rec'.EXT); - - if ( ! class_exists('CI_DB')) - { - eval('class CI_DB extends CI_DB_active_record { }'); - } - } - else - { - if ( ! class_exists('CI_DB')) - { - eval('class CI_DB extends CI_DB_driver { }'); - } - } - - require_once(BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].'_driver'.EXT); - - // Instantiate the DB adapter - $driver = 'CI_DB_'.$params['dbdriver'].'_driver'; - $DB =& new $driver($params); - - if ($DB->autoinit == TRUE) - { - $DB->initialize(); - } - - return $DB; -} - - - -/* End of file DB.php */ + $dns['scheme'], + 'hostname' => (isset($dns['host'])) ? rawurldecode($dns['host']) : '', + 'username' => (isset($dns['user'])) ? rawurldecode($dns['user']) : '', + 'password' => (isset($dns['pass'])) ? rawurldecode($dns['pass']) : '', + 'database' => (isset($dns['path'])) ? rawurldecode(substr($dns['path'], 1)) : '' + ); + + // were additional config items set? + if (isset($dns['query'])) + { + parse_str($dns['query'], $extra); + + foreach($extra as $key => $val) + { + // booleans please + if (strtoupper($val) == "TRUE") + { + $val = TRUE; + } + elseif (strtoupper($val) == "FALSE") + { + $val = FALSE; + } + + $params[$key] = $val; + } + } + } + + // No DB specified yet? Beat them senseless... + if ( ! isset($params['dbdriver']) OR $params['dbdriver'] == '') + { + show_error('You have not selected a database type to connect to.'); + } + + // Load the DB classes. Note: Since the active record class is optional + // we need to dynamically create a class that extends proper parent class + // based on whether we're using the active record class or not. + // Kudos to Paul for discovering this clever use of eval() + + if ($active_record_override == TRUE) + { + $active_record = TRUE; + } + + require_once(BASEPATH.'database/DB_driver'.EXT); + + if ( ! isset($active_record) OR $active_record == TRUE) + { + require_once(BASEPATH.'database/DB_active_rec'.EXT); + + if ( ! class_exists('CI_DB')) + { + eval('class CI_DB extends CI_DB_active_record { }'); + } + } + else + { + if ( ! class_exists('CI_DB')) + { + eval('class CI_DB extends CI_DB_driver { }'); + } + } + + require_once(BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].'_driver'.EXT); + + // Instantiate the DB adapter + $driver = 'CI_DB_'.$params['dbdriver'].'_driver'; + $DB =& new $driver($params); + + if ($DB->autoinit == TRUE) + { + $DB->initialize(); + } + + return $DB; +} + + + +/* End of file DB.php */ /* Location: ./system/database/DB.php */ \ No newline at end of file diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index b270b6fc..e8cefa2d 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1,1814 +1,1814 @@ -_protect_identifiers = $escape; - } - - if (is_string($select)) - { - $select = explode(',', $select); - } - - foreach ($select as $val) - { - $val = trim($val); - - if ($val != '') - { - $this->ar_select[] = $val; - - if ($this->ar_caching === TRUE) - { - $this->ar_cache_select[] = $val; - $this->ar_cache_exists[] = 'select'; - } - } - } - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Select Max - * - * Generates a SELECT MAX(field) portion of a query - * - * @access public - * @param string the field - * @param string an alias - * @return object - */ - function select_max($select = '', $alias = '') - { - return $this->_max_min_avg_sum($select, $alias, 'MAX'); - } - - // -------------------------------------------------------------------- - - /** - * Select Min - * - * Generates a SELECT MIN(field) portion of a query - * - * @access public - * @param string the field - * @param string an alias - * @return object - */ - function select_min($select = '', $alias = '') - { - return $this->_max_min_avg_sum($select, $alias, 'MIN'); - } - - // -------------------------------------------------------------------- - - /** - * Select Average - * - * Generates a SELECT AVG(field) portion of a query - * - * @access public - * @param string the field - * @param string an alias - * @return object - */ - function select_avg($select = '', $alias = '') - { - return $this->_max_min_avg_sum($select, $alias, 'AVG'); - } - - // -------------------------------------------------------------------- - - /** - * Select Sum - * - * Generates a SELECT SUM(field) portion of a query - * - * @access public - * @param string the field - * @param string an alias - * @return object - */ - function select_sum($select = '', $alias = '') - { - return $this->_max_min_avg_sum($select, $alias, 'SUM'); - } - - // -------------------------------------------------------------------- - - /** - * Processing Function for the four functions above: - * - * select_max() - * select_min() - * select_avg() - * select_sum() - * - * @access public - * @param string the field - * @param string an alias - * @return object - */ - function _max_min_avg_sum($select = '', $alias = '', $type = 'MAX') - { - if ( ! is_string($select) OR $select == '') - { - $this->display_error('db_invalid_query'); - } - - $type = strtoupper($type); - - if ( ! in_array($type, array('MAX', 'MIN', 'AVG', 'SUM'))) - { - show_error('Invalid function type: '.$type); - } - - if ($alias == '') - { - $alias = $this->_create_alias_from_table(trim($select)); - } - - $sql = $type.'('.$this->_protect_identifiers(trim($select)).') AS '.$alias; - - $this->ar_select[] = $sql; - - if ($this->ar_caching === TRUE) - { - $this->ar_cache_select[] = $sql; - $this->ar_cache_exists[] = 'select'; - } - - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Determines the alias name based on the table - * - * @access private - * @param string - * @return string - */ - function _create_alias_from_table($item) - { - if (strpos($item, '.') !== FALSE) - { - return end(explode('.', $item)); - } - - return $item; - } - - // -------------------------------------------------------------------- - - /** - * DISTINCT - * - * Sets a flag which tells the query string compiler to add DISTINCT - * - * @access public - * @param bool - * @return object - */ - function distinct($val = TRUE) - { - $this->ar_distinct = (is_bool($val)) ? $val : TRUE; - return $this; - } - - // -------------------------------------------------------------------- - - /** - * From - * - * Generates the FROM portion of the query - * - * @access public - * @param mixed can be a string or array - * @return object - */ - function from($from) - { - foreach ((array)$from as $val) - { - if (strpos($val, ',') !== FALSE) - { - foreach (explode(',', $val) as $v) - { - $v = trim($v); - $this->_track_aliases($v); - - $this->ar_from[] = $this->_protect_identifiers($v, TRUE, NULL, FALSE); - - if ($this->ar_caching === TRUE) - { - $this->ar_cache_from[] = $this->_protect_identifiers($v, TRUE, NULL, FALSE); - $this->ar_cache_exists[] = 'from'; - } - } - - } - else - { - $val = trim($val); - - // Extract any aliases that might exist. We use this information - // in the _protect_identifiers to know whether to add a table prefix - $this->_track_aliases($val); - - $this->ar_from[] = $this->_protect_identifiers($val, TRUE, NULL, FALSE); - - if ($this->ar_caching === TRUE) - { - $this->ar_cache_from[] = $this->_protect_identifiers($val, TRUE, NULL, FALSE); - $this->ar_cache_exists[] = 'from'; - } - } - } - - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Join - * - * Generates the JOIN portion of the query - * - * @access public - * @param string - * @param string the join condition - * @param string the type of join - * @return object - */ - function join($table, $cond, $type = '') - { - if ($type != '') - { - $type = strtoupper(trim($type)); - - if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER'))) - { - $type = ''; - } - else - { - $type .= ' '; - } - } - - // Extract any aliases that might exist. We use this information - // in the _protect_identifiers to know whether to add a table prefix - $this->_track_aliases($table); - - // Strip apart the condition and protect the identifiers - if (preg_match('/([\w\.]+)([\W\s]+)(.+)/', $cond, $match)) - { - $match[1] = $this->_protect_identifiers($match[1]); - $match[3] = $this->_protect_identifiers($match[3]); - - $cond = $match[1].$match[2].$match[3]; - } - - // Assemble the JOIN statement - $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE).' ON '.$cond; - - $this->ar_join[] = $join; - if ($this->ar_caching === TRUE) - { - $this->ar_cache_join[] = $join; - $this->ar_cache_exists[] = 'join'; - } - - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Where - * - * Generates the WHERE portion of the query. Separates - * multiple calls with AND - * - * @access public - * @param mixed - * @param mixed - * @return object - */ - function where($key, $value = NULL, $escape = TRUE) - { - return $this->_where($key, $value, 'AND ', $escape); - } - - // -------------------------------------------------------------------- - - /** - * OR Where - * - * Generates the WHERE portion of the query. Separates - * multiple calls with OR - * - * @access public - * @param mixed - * @param mixed - * @return object - */ - function or_where($key, $value = NULL, $escape = TRUE) - { - return $this->_where($key, $value, 'OR ', $escape); - } - - // -------------------------------------------------------------------- - - /** - * orwhere() is an alias of or_where() - * this function is here for backwards compatibility, as - * orwhere() has been deprecated - */ - function orwhere($key, $value = NULL, $escape = TRUE) - { - return $this->or_where($key, $value, $escape); - } - - // -------------------------------------------------------------------- - - /** - * Where - * - * Called by where() or orwhere() - * - * @access private - * @param mixed - * @param mixed - * @param string - * @return object - */ - function _where($key, $value = NULL, $type = 'AND ', $escape = NULL) - { - if ( ! is_array($key)) - { - $key = array($key => $value); - } - - // If the escape value was not set will will base it on the global setting - if ( ! is_bool($escape)) - { - $escape = $this->_protect_identifiers; - } - - foreach ($key as $k => $v) - { - $prefix = (count($this->ar_where) == 0 AND count($this->ar_cache_where) == 0) ? '' : $type; - - if (is_null($v) && ! $this->_has_operator($k)) - { - // value appears not to have been set, assign the test to IS NULL - $k .= ' IS NULL'; - } - - if ( ! is_null($v)) - { - if ($escape === TRUE) - { - $k = $this->_protect_identifiers($k, FALSE, $escape); - - $v = ' '.$this->escape($v); - } - - if ( ! $this->_has_operator($k)) - { - $k .= ' ='; - } - } - else - { - $k = $this->_protect_identifiers($k, FALSE, $escape); - } - - $this->ar_where[] = $prefix.$k.$v; - - if ($this->ar_caching === TRUE) - { - $this->ar_cache_where[] = $prefix.$k.$v; - $this->ar_cache_exists[] = 'where'; - } - - } - - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Where_in - * - * Generates a WHERE field IN ('item', 'item') SQL query joined with - * AND if appropriate - * - * @access public - * @param string The field to search - * @param array The values searched on - * @return object - */ - function where_in($key = NULL, $values = NULL) - { - return $this->_where_in($key, $values); - } - - // -------------------------------------------------------------------- - - /** - * Where_in_or - * - * Generates a WHERE field IN ('item', 'item') SQL query joined with - * OR if appropriate - * - * @access public - * @param string The field to search - * @param array The values searched on - * @return object - */ - function or_where_in($key = NULL, $values = NULL) - { - return $this->_where_in($key, $values, FALSE, 'OR '); - } - - // -------------------------------------------------------------------- - - /** - * Where_not_in - * - * Generates a WHERE field NOT IN ('item', 'item') SQL query joined - * with AND if appropriate - * - * @access public - * @param string The field to search - * @param array The values searched on - * @return object - */ - function where_not_in($key = NULL, $values = NULL) - { - return $this->_where_in($key, $values, TRUE); - } - - // -------------------------------------------------------------------- - - /** - * Where_not_in_or - * - * Generates a WHERE field NOT IN ('item', 'item') SQL query joined - * with OR if appropriate - * - * @access public - * @param string The field to search - * @param array The values searched on - * @return object - */ - function or_where_not_in($key = NULL, $values = NULL) - { - return $this->_where_in($key, $values, TRUE, 'OR '); - } - - // -------------------------------------------------------------------- - - /** - * Where_in - * - * Called by where_in, where_in_or, where_not_in, where_not_in_or - * - * @access public - * @param string The field to search - * @param array The values searched on - * @param boolean If the statement would be IN or NOT IN - * @param string - * @return object - */ - function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'AND ') - { - if ($key === NULL OR $values === NULL) - { - return; - } - - if ( ! is_array($values)) - { - $values = array($values); - } - - $not = ($not) ? ' NOT' : ''; - - foreach ($values as $value) - { - $this->ar_wherein[] = $this->escape($value); - } - - $prefix = (count($this->ar_where) == 0) ? '' : $type; - - $where_in = $prefix . $this->_protect_identifiers($key) . $not . " IN (" . implode(", ", $this->ar_wherein) . ") "; - - $this->ar_where[] = $where_in; - if ($this->ar_caching === TRUE) - { - $this->ar_cache_where[] = $where_in; - $this->ar_cache_exists[] = 'where'; - } - - // reset the array for multiple calls - $this->ar_wherein = array(); - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Like - * - * Generates a %LIKE% portion of the query. Separates - * multiple calls with AND - * - * @access public - * @param mixed - * @param mixed - * @return object - */ - function like($field, $match = '', $side = 'both') - { - return $this->_like($field, $match, 'AND ', $side); - } - - // -------------------------------------------------------------------- - - /** - * Not Like - * - * Generates a NOT LIKE portion of the query. Separates - * multiple calls with AND - * - * @access public - * @param mixed - * @param mixed - * @return object - */ - function not_like($field, $match = '', $side = 'both') - { - return $this->_like($field, $match, 'AND ', $side, 'NOT'); - } - - // -------------------------------------------------------------------- - - /** - * OR Like - * - * Generates a %LIKE% portion of the query. Separates - * multiple calls with OR - * - * @access public - * @param mixed - * @param mixed - * @return object - */ - function or_like($field, $match = '', $side = 'both') - { - return $this->_like($field, $match, 'OR ', $side); - } - - // -------------------------------------------------------------------- - - /** - * OR Not Like - * - * Generates a NOT LIKE portion of the query. Separates - * multiple calls with OR - * - * @access public - * @param mixed - * @param mixed - * @return object - */ - function or_not_like($field, $match = '', $side = 'both') - { - return $this->_like($field, $match, 'OR ', $side, 'NOT'); - } - - // -------------------------------------------------------------------- - - /** - * orlike() is an alias of or_like() - * this function is here for backwards compatibility, as - * orlike() has been deprecated - */ - function orlike($field, $match = '', $side = 'both') - { - return $this->or_like($field, $match, $side); - } - - // -------------------------------------------------------------------- - - /** - * Like - * - * Called by like() or orlike() - * - * @access private - * @param mixed - * @param mixed - * @param string - * @return object - */ - function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '') - { - if ( ! is_array($field)) - { - $field = array($field => $match); - } - - foreach ($field as $k => $v) - { - $k = $this->_protect_identifiers($k); - - $prefix = (count($this->ar_like) == 0) ? '' : $type; - - $v = $this->escape_str($v); - - if ($side == 'before') - { - $like_statement = $prefix." $k $not LIKE '%{$v}'"; - } - elseif ($side == 'after') - { - $like_statement = $prefix." $k $not LIKE '{$v}%'"; - } - else - { - $like_statement = $prefix." $k $not LIKE '%{$v}%'"; - } - - $this->ar_like[] = $like_statement; - if ($this->ar_caching === TRUE) - { - $this->ar_cache_like[] = $like_statement; - $this->ar_cache_exists[] = 'like'; - } - - } - return $this; - } - - // -------------------------------------------------------------------- - - /** - * GROUP BY - * - * @access public - * @param string - * @return object - */ - function group_by($by) - { - if (is_string($by)) - { - $by = explode(',', $by); - } - - foreach ($by as $val) - { - $val = trim($val); - - if ($val != '') - { - $this->ar_groupby[] = $this->_protect_identifiers($val); - - if ($this->ar_caching === TRUE) - { - $this->ar_cache_groupby[] = $this->_protect_identifiers($val); - $this->ar_cache_exists[] = 'groupby'; - } - } - } - return $this; - } - - // -------------------------------------------------------------------- - - /** - * groupby() is an alias of group_by() - * this function is here for backwards compatibility, as - * groupby() has been deprecated - */ - function groupby($by) - { - return $this->group_by($by); - } - - // -------------------------------------------------------------------- - - /** - * Sets the HAVING value - * - * Separates multiple calls with AND - * - * @access public - * @param string - * @param string - * @return object - */ - function having($key, $value = '', $escape = TRUE) - { - return $this->_having($key, $value, 'AND ', $escape); - } - - // -------------------------------------------------------------------- - - /** - * orhaving() is an alias of or_having() - * this function is here for backwards compatibility, as - * orhaving() has been deprecated - */ - - function orhaving($key, $value = '', $escape = TRUE) - { - return $this->or_having($key, $value, $escape); - } - // -------------------------------------------------------------------- - - /** - * Sets the OR HAVING value - * - * Separates multiple calls with OR - * - * @access public - * @param string - * @param string - * @return object - */ - function or_having($key, $value = '', $escape = TRUE) - { - return $this->_having($key, $value, 'OR ', $escape); - } - - // -------------------------------------------------------------------- - - /** - * Sets the HAVING values - * - * Called by having() or or_having() - * - * @access private - * @param string - * @param string - * @return object - */ - function _having($key, $value = '', $type = 'AND ', $escape = TRUE) - { - if ( ! is_array($key)) - { - $key = array($key => $value); - } - - foreach ($key as $k => $v) - { - $prefix = (count($this->ar_having) == 0) ? '' : $type; - - if ($escape === TRUE) - { - $k = $this->_protect_identifiers($k); - } - - if ( ! $this->_has_operator($k)) - { - $k .= ' = '; - } - - if ($v != '') - { - $v = ' '.$this->escape_str($v); - } - - $this->ar_having[] = $prefix.$k.$v; - if ($this->ar_caching === TRUE) - { - $this->ar_cache_having[] = $prefix.$k.$v; - $this->ar_cache_exists[] = 'having'; - } - } - - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Sets the ORDER BY value - * - * @access public - * @param string - * @param string direction: asc or desc - * @return object - */ - function order_by($orderby, $direction = '') - { - if (strtolower($direction) == 'random') - { - $orderby = ''; // Random results want or don't need a field name - $direction = $this->_random_keyword; - } - elseif (trim($direction) != '') - { - $direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC'), TRUE)) ? ' '.$direction : ' ASC'; - } - - - if (strpos($orderby, ',') !== FALSE) - { - $temp = array(); - foreach (explode(',', $orderby) as $part) - { - $part = trim($part); - if ( ! in_array($part, $this->ar_aliased_tables)) - { - $part = $this->_protect_identifiers(trim($part)); - } - - $temp[] = $part; - } - - $orderby = implode(', ', $temp); - } - else - { - $orderby = $this->_protect_identifiers($orderby); - } - - $orderby_statement = $orderby.$direction; - - $this->ar_orderby[] = $orderby_statement; - if ($this->ar_caching === TRUE) - { - $this->ar_cache_orderby[] = $orderby_statement; - $this->ar_cache_exists[] = 'orderby'; - } - - return $this; - } - - // -------------------------------------------------------------------- - - /** - * orderby() is an alias of order_by() - * this function is here for backwards compatibility, as - * orderby() has been deprecated - */ - function orderby($orderby, $direction = '') - { - return $this->order_by($orderby, $direction); - } - - // -------------------------------------------------------------------- - - /** - * Sets the LIMIT value - * - * @access public - * @param integer the limit value - * @param integer the offset value - * @return object - */ - function limit($value, $offset = '') - { - $this->ar_limit = $value; - - if ($offset != '') - { - $this->ar_offset = $offset; - } - - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Sets the OFFSET value - * - * @access public - * @param integer the offset value - * @return object - */ - function offset($offset) - { - $this->ar_offset = $offset; - return $this; - } - - // -------------------------------------------------------------------- - - /** - * The "set" function. Allows key/value pairs to be set for inserting or updating - * - * @access public - * @param mixed - * @param string - * @param boolean - * @return object - */ - function set($key, $value = '', $escape = TRUE) - { - $key = $this->_object_to_array($key); - - if ( ! is_array($key)) - { - $key = array($key => $value); - } - - foreach ($key as $k => $v) - { - if ($escape === FALSE) - { - $this->ar_set[$this->_protect_identifiers($k)] = $v; - } - else - { - $this->ar_set[$this->_protect_identifiers($k)] = $this->escape($v); - } - } - - return $this; - } - - // -------------------------------------------------------------------- - - /** - * Get - * - * Compiles the select statement based on the other functions called - * and runs the query - * - * @access public - * @param string the table - * @param string the limit clause - * @param string the offset clause - * @return object - */ - function get($table = '', $limit = null, $offset = null) - { - if ($table != '') - { - $this->_track_aliases($table); - $this->from($table); - } - - if ( ! is_null($limit)) - { - $this->limit($limit, $offset); - } - - $sql = $this->_compile_select(); - - $result = $this->query($sql); - $this->_reset_select(); - return $result; - } - - /** - * "Count All Results" query - * - * Generates a platform-specific query string that counts all records - * returned by an Active Record query. - * - * @access public - * @param string - * @return string - */ - function count_all_results($table = '') - { - if ($table != '') - { - $this->_track_aliases($table); - $this->from($table); - } - - $sql = $this->_compile_select($this->_count_string . $this->_protect_identifiers('numrows')); - - $query = $this->query($sql); - $this->_reset_select(); - - if ($query->num_rows() == 0) - { - return '0'; - } - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * Get_Where - * - * Allows the where clause, limit and offset to be added directly - * - * @access public - * @param string the where clause - * @param string the limit clause - * @param string the offset clause - * @return object - */ - function get_where($table = '', $where = null, $limit = null, $offset = null) - { - if ($table != '') - { - $this->from($table); - } - - if ( ! is_null($where)) - { - $this->where($where); - } - - if ( ! is_null($limit)) - { - $this->limit($limit, $offset); - } - - $sql = $this->_compile_select(); - - $result = $this->query($sql); - $this->_reset_select(); - return $result; - } - - // -------------------------------------------------------------------- - - /** - * getwhere() is an alias of get_where() - * this function is here for backwards compatibility, as - * getwhere() has been deprecated - */ - function getwhere($table = '', $where = null, $limit = null, $offset = null) - { - return $this->get_where($table, $where, $limit, $offset); - } - - // -------------------------------------------------------------------- - - /** - * Insert - * - * Compiles an insert string and runs the query - * - * @access public - * @param string the table to retrieve the results from - * @param array an associative array of insert values - * @return object - */ - function insert($table = '', $set = NULL) - { - if ( ! is_null($set)) - { - $this->set($set); - } - - if (count($this->ar_set) == 0) - { - if ($this->db_debug) - { - return $this->display_error('db_must_use_set'); - } - return FALSE; - } - - if ($table == '') - { - if ( ! isset($this->ar_from[0])) - { - if ($this->db_debug) - { - return $this->display_error('db_must_set_table'); - } - return FALSE; - } - - $table = $this->ar_from[0]; - } - - $sql = $this->_insert($this->_protect_identifiers($table, TRUE, NULL, FALSE), array_keys($this->ar_set), array_values($this->ar_set)); - - $this->_reset_write(); - return $this->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Update - * - * Compiles an update string and runs the query - * - * @access public - * @param string the table to retrieve the results from - * @param array an associative array of update values - * @param mixed the where clause - * @return object - */ - function update($table = '', $set = NULL, $where = NULL, $limit = NULL) - { - // Combine any cached components with the current statements - $this->_merge_cache(); - - if ( ! is_null($set)) - { - $this->set($set); - } - - if (count($this->ar_set) == 0) - { - if ($this->db_debug) - { - return $this->display_error('db_must_use_set'); - } - return FALSE; - } - - if ($table == '') - { - if ( ! isset($this->ar_from[0])) - { - if ($this->db_debug) - { - return $this->display_error('db_must_set_table'); - } - return FALSE; - } - - $table = $this->ar_from[0]; - } - - if ($where != NULL) - { - $this->where($where); - } - - if ($limit != NULL) - { - $this->limit($limit); - } - - $sql = $this->_update($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_set, $this->ar_where, $this->ar_orderby, $this->ar_limit); - - $this->_reset_write(); - return $this->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Empty Table - * - * Compiles a delete string and runs "DELETE FROM table" - * - * @access public - * @param string the table to empty - * @return object - */ - function empty_table($table = '') - { - if ($table == '') - { - if ( ! isset($this->ar_from[0])) - { - if ($this->db_debug) - { - return $this->display_error('db_must_set_table'); - } - return FALSE; - } - - $table = $this->ar_from[0]; - } - else - { - $table = $this->_protect_identifiers($table, TRUE, NULL, FALSE); - } - - $sql = $this->_delete($table); - - $this->_reset_write(); - - return $this->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Truncate - * - * Compiles a truncate string and runs the query - * If the database does not support the truncate() command - * This function maps to "DELETE FROM table" - * - * @access public - * @param string the table to truncate - * @return object - */ - function truncate($table = '') - { - if ($table == '') - { - if ( ! isset($this->ar_from[0])) - { - if ($this->db_debug) - { - return $this->display_error('db_must_set_table'); - } - return FALSE; - } - - $table = $this->ar_from[0]; - } - else - { - $table = $this->_protect_identifiers($table, TRUE, NULL, FALSE); - } - - $sql = $this->_truncate($table); - - $this->_reset_write(); - - return $this->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Delete - * - * Compiles a delete string and runs the query - * - * @access public - * @param mixed the table(s) to delete from. String or array - * @param mixed the where clause - * @param mixed the limit clause - * @param boolean - * @return object - */ - function delete($table = '', $where = '', $limit = NULL, $reset_data = TRUE) - { - // Combine any cached components with the current statements - $this->_merge_cache(); - - if ($table == '') - { - if ( ! isset($this->ar_from[0])) - { - if ($this->db_debug) - { - return $this->display_error('db_must_set_table'); - } - return FALSE; - } - - $table = $this->ar_from[0]; - } - elseif (is_array($table)) - { - foreach($table as $single_table) - { - $this->delete($single_table, $where, $limit, FALSE); - } - - $this->_reset_write(); - return; - } - else - { - $table = $this->_protect_identifiers($table, TRUE, NULL, FALSE); - } - - if ($where != '') - { - $this->where($where); - } - - if ($limit != NULL) - { - $this->limit($limit); - } - - if (count($this->ar_where) == 0 && count($this->ar_like) == 0) - { - if ($this->db_debug) - { - return $this->display_error('db_del_must_use_where'); - } - - return FALSE; - } - - $sql = $this->_delete($table, $this->ar_where, $this->ar_like, $this->ar_limit); - - if ($reset_data) - { - $this->_reset_write(); - } - - return $this->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * DB Prefix - * - * Prepends a database prefix if one exists in configuration - * - * @access public - * @param string the table - * @return string - */ - function dbprefix($table = '') - { - if ($table == '') - { - $this->display_error('db_table_name_required'); - } - - return $this->dbprefix.$table; - } - - // -------------------------------------------------------------------- - - /** - * Track Aliases - * - * Used to track SQL statements written with aliased tables. - * - * @access private - * @param string The table to inspect - * @return string - */ - function _track_aliases($table) - { - if (is_array($table)) - { - foreach ($table as $t) - { - $this->_track_aliases($t); - } - return; - } - - // Does the string contain a comma? If so, we need to separate - // the string into discreet statements - if (strpos($table, ',') !== FALSE) - { - return $this->_track_aliases(explode(',', $table)); - } - - // if a table alias is used we can recognize it by a space - if (strpos($table, " ") !== FALSE) - { - // if the alias is written with the AS keyword, remove it - $table = preg_replace('/ AS /i', ' ', $table); - - // Grab the alias - $table = trim(strrchr($table, " ")); - - // Store the alias, if it doesn't already exist - if ( ! in_array($table, $this->ar_aliased_tables)) - { - $this->ar_aliased_tables[] = $table; - } - } - } - - // -------------------------------------------------------------------- - - /** - * Compile the SELECT statement - * - * Generates a query string based on which functions were used. - * Should not be called directly. The get() function calls it. - * - * @access private - * @return string - */ - function _compile_select($select_override = FALSE) - { - // Combine any cached components with the current statements - $this->_merge_cache(); - - // ---------------------------------------------------------------- - - // Write the "select" portion of the query - - if ($select_override !== FALSE) - { - $sql = $select_override; - } - else - { - $sql = ( ! $this->ar_distinct) ? 'SELECT ' : 'SELECT DISTINCT '; - - if (count($this->ar_select) == 0) - { - $sql .= '*'; - } - else - { - // Cycle through the "select" portion of the query and prep each column name. - // The reason we protect identifiers here rather then in the select() function - // is because until the user calls the from() function we don't know if there are aliases - foreach ($this->ar_select as $key => $val) - { - $this->ar_select[$key] = $this->_protect_identifiers($val); - } - - $sql .= implode(', ', $this->ar_select); - } - } - - // ---------------------------------------------------------------- - - // Write the "FROM" portion of the query - - if (count($this->ar_from) > 0) - { - $sql .= "\nFROM "; - - $sql .= $this->_from_tables($this->ar_from); - } - - // ---------------------------------------------------------------- - - // Write the "JOIN" portion of the query - - if (count($this->ar_join) > 0) - { - $sql .= "\n"; - - $sql .= implode("\n", $this->ar_join); - } - - // ---------------------------------------------------------------- - - // Write the "WHERE" portion of the query - - if (count($this->ar_where) > 0 OR count($this->ar_like) > 0) - { - $sql .= "\n"; - - $sql .= "WHERE "; - } - - $sql .= implode("\n", $this->ar_where); - - // ---------------------------------------------------------------- - - // Write the "LIKE" portion of the query - - if (count($this->ar_like) > 0) - { - if (count($this->ar_where) > 0) - { - $sql .= "\nAND "; - } - - $sql .= implode("\n", $this->ar_like); - } - - // ---------------------------------------------------------------- - - // Write the "GROUP BY" portion of the query - - if (count($this->ar_groupby) > 0) - { - $sql .= "\nGROUP BY "; - - $sql .= implode(', ', $this->ar_groupby); - } - - // ---------------------------------------------------------------- - - // Write the "HAVING" portion of the query - - if (count($this->ar_having) > 0) - { - $sql .= "\nHAVING "; - $sql .= implode("\n", $this->ar_having); - } - - // ---------------------------------------------------------------- - - // Write the "ORDER BY" portion of the query - - if (count($this->ar_orderby) > 0) - { - $sql .= "\nORDER BY "; - $sql .= implode(', ', $this->ar_orderby); - - if ($this->ar_order !== FALSE) - { - $sql .= ($this->ar_order == 'desc') ? ' DESC' : ' ASC'; - } - } - - // ---------------------------------------------------------------- - - // Write the "LIMIT" portion of the query - - if (is_numeric($this->ar_limit)) - { - $sql .= "\n"; - $sql = $this->_limit($sql, $this->ar_limit, $this->ar_offset); - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Object to Array - * - * Takes an object as input and converts the class variables to array key/vals - * - * @access public - * @param object - * @return array - */ - function _object_to_array($object) - { - if ( ! is_object($object)) - { - return $object; - } - - $array = array(); - foreach (get_object_vars($object) as $key => $val) - { - // There are some built in keys we need to ignore for this conversion - if ( ! is_object($val) && ! is_array($val) && $key != '_parent_name' && $key != '_ci_scaffolding' && $key != '_ci_scaff_table') - { - $array[$key] = $val; - } - } - - return $array; - } - - // -------------------------------------------------------------------- - - /** - * Start Cache - * - * Starts AR caching - * - * @access public - * @return void - */ - function start_cache() - { - $this->ar_caching = TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Stop Cache - * - * Stops AR caching - * - * @access public - * @return void - */ - function stop_cache() - { - $this->ar_caching = FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Flush Cache - * - * Empties the AR cache - * - * @access public - * @return void - */ - function flush_cache() - { - $this->_reset_run( - array( - 'ar_cache_select' => array(), - 'ar_cache_from' => array(), - 'ar_cache_join' => array(), - 'ar_cache_where' => array(), - 'ar_cache_like' => array(), - 'ar_cache_groupby' => array(), - 'ar_cache_having' => array(), - 'ar_cache_orderby' => array(), - 'ar_cache_set' => array(), - 'ar_cache_exists' => array() - ) - ); - } - - // -------------------------------------------------------------------- - - /** - * Merge Cache - * - * When called, this function merges any cached AR arrays with - * locally called ones. - * - * @access private - * @return void - */ - function _merge_cache() - { - if (count($this->ar_cache_exists) == 0) - { - return; - } - - foreach ($this->ar_cache_exists as $val) - { - $ar_variable = 'ar_'.$val; - $ar_cache_var = 'ar_cache_'.$val; - - if (count($this->$ar_cache_var) == 0) - { - continue; - } - - $this->$ar_variable = array_unique(array_merge($this->$ar_cache_var, $this->$ar_variable)); - } - - // If we are "protecting identifiers" we need to examine the "from" - // portion of the query to determine if there are any aliases - if ($this->_protect_identifiers === TRUE AND count($this->ar_cache_from) > 0) - { - $this->_track_aliases($this->ar_from); - } - } - - // -------------------------------------------------------------------- - - /** - * Resets the active record values. Called by the get() function - * - * @access private - * @param array An array of fields to reset - * @return void - */ - function _reset_run($ar_reset_items) - { - foreach ($ar_reset_items as $item => $default_value) - { - if ( ! in_array($item, $this->ar_store_array)) - { - $this->$item = $default_value; - } - } - } - - // -------------------------------------------------------------------- - - /** - * Resets the active record values. Called by the get() function - * - * @access private - * @return void - */ - function _reset_select() - { - $ar_reset_items = array( - 'ar_select' => array(), - 'ar_from' => array(), - 'ar_join' => array(), - 'ar_where' => array(), - 'ar_like' => array(), - 'ar_groupby' => array(), - 'ar_having' => array(), - 'ar_orderby' => array(), - 'ar_wherein' => array(), - 'ar_aliased_tables' => array(), - 'ar_distinct' => FALSE, - 'ar_limit' => FALSE, - 'ar_offset' => FALSE, - 'ar_order' => FALSE, - ); - - $this->_reset_run($ar_reset_items); - } - - // -------------------------------------------------------------------- - - /** - * Resets the active record "write" values. - * - * Called by the insert() update() and delete() functions - * - * @access private - * @return void - */ - function _reset_write() - { - $ar_reset_items = array( - 'ar_set' => array(), - 'ar_from' => array(), - 'ar_where' => array(), - 'ar_like' => array(), - 'ar_orderby' => array(), - 'ar_limit' => FALSE, - 'ar_order' => FALSE - ); - - $this->_reset_run($ar_reset_items); - } - -} - -/* End of file DB_active_rec.php */ +_protect_identifiers = $escape; + } + + if (is_string($select)) + { + $select = explode(',', $select); + } + + foreach ($select as $val) + { + $val = trim($val); + + if ($val != '') + { + $this->ar_select[] = $val; + + if ($this->ar_caching === TRUE) + { + $this->ar_cache_select[] = $val; + $this->ar_cache_exists[] = 'select'; + } + } + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Select Max + * + * Generates a SELECT MAX(field) portion of a query + * + * @access public + * @param string the field + * @param string an alias + * @return object + */ + function select_max($select = '', $alias = '') + { + return $this->_max_min_avg_sum($select, $alias, 'MAX'); + } + + // -------------------------------------------------------------------- + + /** + * Select Min + * + * Generates a SELECT MIN(field) portion of a query + * + * @access public + * @param string the field + * @param string an alias + * @return object + */ + function select_min($select = '', $alias = '') + { + return $this->_max_min_avg_sum($select, $alias, 'MIN'); + } + + // -------------------------------------------------------------------- + + /** + * Select Average + * + * Generates a SELECT AVG(field) portion of a query + * + * @access public + * @param string the field + * @param string an alias + * @return object + */ + function select_avg($select = '', $alias = '') + { + return $this->_max_min_avg_sum($select, $alias, 'AVG'); + } + + // -------------------------------------------------------------------- + + /** + * Select Sum + * + * Generates a SELECT SUM(field) portion of a query + * + * @access public + * @param string the field + * @param string an alias + * @return object + */ + function select_sum($select = '', $alias = '') + { + return $this->_max_min_avg_sum($select, $alias, 'SUM'); + } + + // -------------------------------------------------------------------- + + /** + * Processing Function for the four functions above: + * + * select_max() + * select_min() + * select_avg() + * select_sum() + * + * @access public + * @param string the field + * @param string an alias + * @return object + */ + function _max_min_avg_sum($select = '', $alias = '', $type = 'MAX') + { + if ( ! is_string($select) OR $select == '') + { + $this->display_error('db_invalid_query'); + } + + $type = strtoupper($type); + + if ( ! in_array($type, array('MAX', 'MIN', 'AVG', 'SUM'))) + { + show_error('Invalid function type: '.$type); + } + + if ($alias == '') + { + $alias = $this->_create_alias_from_table(trim($select)); + } + + $sql = $type.'('.$this->_protect_identifiers(trim($select)).') AS '.$alias; + + $this->ar_select[] = $sql; + + if ($this->ar_caching === TRUE) + { + $this->ar_cache_select[] = $sql; + $this->ar_cache_exists[] = 'select'; + } + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Determines the alias name based on the table + * + * @access private + * @param string + * @return string + */ + function _create_alias_from_table($item) + { + if (strpos($item, '.') !== FALSE) + { + return end(explode('.', $item)); + } + + return $item; + } + + // -------------------------------------------------------------------- + + /** + * DISTINCT + * + * Sets a flag which tells the query string compiler to add DISTINCT + * + * @access public + * @param bool + * @return object + */ + function distinct($val = TRUE) + { + $this->ar_distinct = (is_bool($val)) ? $val : TRUE; + return $this; + } + + // -------------------------------------------------------------------- + + /** + * From + * + * Generates the FROM portion of the query + * + * @access public + * @param mixed can be a string or array + * @return object + */ + function from($from) + { + foreach ((array)$from as $val) + { + if (strpos($val, ',') !== FALSE) + { + foreach (explode(',', $val) as $v) + { + $v = trim($v); + $this->_track_aliases($v); + + $this->ar_from[] = $this->_protect_identifiers($v, TRUE, NULL, FALSE); + + if ($this->ar_caching === TRUE) + { + $this->ar_cache_from[] = $this->_protect_identifiers($v, TRUE, NULL, FALSE); + $this->ar_cache_exists[] = 'from'; + } + } + + } + else + { + $val = trim($val); + + // Extract any aliases that might exist. We use this information + // in the _protect_identifiers to know whether to add a table prefix + $this->_track_aliases($val); + + $this->ar_from[] = $this->_protect_identifiers($val, TRUE, NULL, FALSE); + + if ($this->ar_caching === TRUE) + { + $this->ar_cache_from[] = $this->_protect_identifiers($val, TRUE, NULL, FALSE); + $this->ar_cache_exists[] = 'from'; + } + } + } + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Join + * + * Generates the JOIN portion of the query + * + * @access public + * @param string + * @param string the join condition + * @param string the type of join + * @return object + */ + function join($table, $cond, $type = '') + { + if ($type != '') + { + $type = strtoupper(trim($type)); + + if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER'))) + { + $type = ''; + } + else + { + $type .= ' '; + } + } + + // Extract any aliases that might exist. We use this information + // in the _protect_identifiers to know whether to add a table prefix + $this->_track_aliases($table); + + // Strip apart the condition and protect the identifiers + if (preg_match('/([\w\.]+)([\W\s]+)(.+)/', $cond, $match)) + { + $match[1] = $this->_protect_identifiers($match[1]); + $match[3] = $this->_protect_identifiers($match[3]); + + $cond = $match[1].$match[2].$match[3]; + } + + // Assemble the JOIN statement + $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE).' ON '.$cond; + + $this->ar_join[] = $join; + if ($this->ar_caching === TRUE) + { + $this->ar_cache_join[] = $join; + $this->ar_cache_exists[] = 'join'; + } + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Where + * + * Generates the WHERE portion of the query. Separates + * multiple calls with AND + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function where($key, $value = NULL, $escape = TRUE) + { + return $this->_where($key, $value, 'AND ', $escape); + } + + // -------------------------------------------------------------------- + + /** + * OR Where + * + * Generates the WHERE portion of the query. Separates + * multiple calls with OR + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function or_where($key, $value = NULL, $escape = TRUE) + { + return $this->_where($key, $value, 'OR ', $escape); + } + + // -------------------------------------------------------------------- + + /** + * orwhere() is an alias of or_where() + * this function is here for backwards compatibility, as + * orwhere() has been deprecated + */ + function orwhere($key, $value = NULL, $escape = TRUE) + { + return $this->or_where($key, $value, $escape); + } + + // -------------------------------------------------------------------- + + /** + * Where + * + * Called by where() or orwhere() + * + * @access private + * @param mixed + * @param mixed + * @param string + * @return object + */ + function _where($key, $value = NULL, $type = 'AND ', $escape = NULL) + { + if ( ! is_array($key)) + { + $key = array($key => $value); + } + + // If the escape value was not set will will base it on the global setting + if ( ! is_bool($escape)) + { + $escape = $this->_protect_identifiers; + } + + foreach ($key as $k => $v) + { + $prefix = (count($this->ar_where) == 0 AND count($this->ar_cache_where) == 0) ? '' : $type; + + if (is_null($v) && ! $this->_has_operator($k)) + { + // value appears not to have been set, assign the test to IS NULL + $k .= ' IS NULL'; + } + + if ( ! is_null($v)) + { + if ($escape === TRUE) + { + $k = $this->_protect_identifiers($k, FALSE, $escape); + + $v = ' '.$this->escape($v); + } + + if ( ! $this->_has_operator($k)) + { + $k .= ' ='; + } + } + else + { + $k = $this->_protect_identifiers($k, FALSE, $escape); + } + + $this->ar_where[] = $prefix.$k.$v; + + if ($this->ar_caching === TRUE) + { + $this->ar_cache_where[] = $prefix.$k.$v; + $this->ar_cache_exists[] = 'where'; + } + + } + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Where_in + * + * Generates a WHERE field IN ('item', 'item') SQL query joined with + * AND if appropriate + * + * @access public + * @param string The field to search + * @param array The values searched on + * @return object + */ + function where_in($key = NULL, $values = NULL) + { + return $this->_where_in($key, $values); + } + + // -------------------------------------------------------------------- + + /** + * Where_in_or + * + * Generates a WHERE field IN ('item', 'item') SQL query joined with + * OR if appropriate + * + * @access public + * @param string The field to search + * @param array The values searched on + * @return object + */ + function or_where_in($key = NULL, $values = NULL) + { + return $this->_where_in($key, $values, FALSE, 'OR '); + } + + // -------------------------------------------------------------------- + + /** + * Where_not_in + * + * Generates a WHERE field NOT IN ('item', 'item') SQL query joined + * with AND if appropriate + * + * @access public + * @param string The field to search + * @param array The values searched on + * @return object + */ + function where_not_in($key = NULL, $values = NULL) + { + return $this->_where_in($key, $values, TRUE); + } + + // -------------------------------------------------------------------- + + /** + * Where_not_in_or + * + * Generates a WHERE field NOT IN ('item', 'item') SQL query joined + * with OR if appropriate + * + * @access public + * @param string The field to search + * @param array The values searched on + * @return object + */ + function or_where_not_in($key = NULL, $values = NULL) + { + return $this->_where_in($key, $values, TRUE, 'OR '); + } + + // -------------------------------------------------------------------- + + /** + * Where_in + * + * Called by where_in, where_in_or, where_not_in, where_not_in_or + * + * @access public + * @param string The field to search + * @param array The values searched on + * @param boolean If the statement would be IN or NOT IN + * @param string + * @return object + */ + function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'AND ') + { + if ($key === NULL OR $values === NULL) + { + return; + } + + if ( ! is_array($values)) + { + $values = array($values); + } + + $not = ($not) ? ' NOT' : ''; + + foreach ($values as $value) + { + $this->ar_wherein[] = $this->escape($value); + } + + $prefix = (count($this->ar_where) == 0) ? '' : $type; + + $where_in = $prefix . $this->_protect_identifiers($key) . $not . " IN (" . implode(", ", $this->ar_wherein) . ") "; + + $this->ar_where[] = $where_in; + if ($this->ar_caching === TRUE) + { + $this->ar_cache_where[] = $where_in; + $this->ar_cache_exists[] = 'where'; + } + + // reset the array for multiple calls + $this->ar_wherein = array(); + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Like + * + * Generates a %LIKE% portion of the query. Separates + * multiple calls with AND + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function like($field, $match = '', $side = 'both') + { + return $this->_like($field, $match, 'AND ', $side); + } + + // -------------------------------------------------------------------- + + /** + * Not Like + * + * Generates a NOT LIKE portion of the query. Separates + * multiple calls with AND + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function not_like($field, $match = '', $side = 'both') + { + return $this->_like($field, $match, 'AND ', $side, 'NOT'); + } + + // -------------------------------------------------------------------- + + /** + * OR Like + * + * Generates a %LIKE% portion of the query. Separates + * multiple calls with OR + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function or_like($field, $match = '', $side = 'both') + { + return $this->_like($field, $match, 'OR ', $side); + } + + // -------------------------------------------------------------------- + + /** + * OR Not Like + * + * Generates a NOT LIKE portion of the query. Separates + * multiple calls with OR + * + * @access public + * @param mixed + * @param mixed + * @return object + */ + function or_not_like($field, $match = '', $side = 'both') + { + return $this->_like($field, $match, 'OR ', $side, 'NOT'); + } + + // -------------------------------------------------------------------- + + /** + * orlike() is an alias of or_like() + * this function is here for backwards compatibility, as + * orlike() has been deprecated + */ + function orlike($field, $match = '', $side = 'both') + { + return $this->or_like($field, $match, $side); + } + + // -------------------------------------------------------------------- + + /** + * Like + * + * Called by like() or orlike() + * + * @access private + * @param mixed + * @param mixed + * @param string + * @return object + */ + function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '') + { + if ( ! is_array($field)) + { + $field = array($field => $match); + } + + foreach ($field as $k => $v) + { + $k = $this->_protect_identifiers($k); + + $prefix = (count($this->ar_like) == 0) ? '' : $type; + + $v = $this->escape_str($v); + + if ($side == 'before') + { + $like_statement = $prefix." $k $not LIKE '%{$v}'"; + } + elseif ($side == 'after') + { + $like_statement = $prefix." $k $not LIKE '{$v}%'"; + } + else + { + $like_statement = $prefix." $k $not LIKE '%{$v}%'"; + } + + $this->ar_like[] = $like_statement; + if ($this->ar_caching === TRUE) + { + $this->ar_cache_like[] = $like_statement; + $this->ar_cache_exists[] = 'like'; + } + + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * GROUP BY + * + * @access public + * @param string + * @return object + */ + function group_by($by) + { + if (is_string($by)) + { + $by = explode(',', $by); + } + + foreach ($by as $val) + { + $val = trim($val); + + if ($val != '') + { + $this->ar_groupby[] = $this->_protect_identifiers($val); + + if ($this->ar_caching === TRUE) + { + $this->ar_cache_groupby[] = $this->_protect_identifiers($val); + $this->ar_cache_exists[] = 'groupby'; + } + } + } + return $this; + } + + // -------------------------------------------------------------------- + + /** + * groupby() is an alias of group_by() + * this function is here for backwards compatibility, as + * groupby() has been deprecated + */ + function groupby($by) + { + return $this->group_by($by); + } + + // -------------------------------------------------------------------- + + /** + * Sets the HAVING value + * + * Separates multiple calls with AND + * + * @access public + * @param string + * @param string + * @return object + */ + function having($key, $value = '', $escape = TRUE) + { + return $this->_having($key, $value, 'AND ', $escape); + } + + // -------------------------------------------------------------------- + + /** + * orhaving() is an alias of or_having() + * this function is here for backwards compatibility, as + * orhaving() has been deprecated + */ + + function orhaving($key, $value = '', $escape = TRUE) + { + return $this->or_having($key, $value, $escape); + } + // -------------------------------------------------------------------- + + /** + * Sets the OR HAVING value + * + * Separates multiple calls with OR + * + * @access public + * @param string + * @param string + * @return object + */ + function or_having($key, $value = '', $escape = TRUE) + { + return $this->_having($key, $value, 'OR ', $escape); + } + + // -------------------------------------------------------------------- + + /** + * Sets the HAVING values + * + * Called by having() or or_having() + * + * @access private + * @param string + * @param string + * @return object + */ + function _having($key, $value = '', $type = 'AND ', $escape = TRUE) + { + if ( ! is_array($key)) + { + $key = array($key => $value); + } + + foreach ($key as $k => $v) + { + $prefix = (count($this->ar_having) == 0) ? '' : $type; + + if ($escape === TRUE) + { + $k = $this->_protect_identifiers($k); + } + + if ( ! $this->_has_operator($k)) + { + $k .= ' = '; + } + + if ($v != '') + { + $v = ' '.$this->escape_str($v); + } + + $this->ar_having[] = $prefix.$k.$v; + if ($this->ar_caching === TRUE) + { + $this->ar_cache_having[] = $prefix.$k.$v; + $this->ar_cache_exists[] = 'having'; + } + } + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Sets the ORDER BY value + * + * @access public + * @param string + * @param string direction: asc or desc + * @return object + */ + function order_by($orderby, $direction = '') + { + if (strtolower($direction) == 'random') + { + $orderby = ''; // Random results want or don't need a field name + $direction = $this->_random_keyword; + } + elseif (trim($direction) != '') + { + $direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC'), TRUE)) ? ' '.$direction : ' ASC'; + } + + + if (strpos($orderby, ',') !== FALSE) + { + $temp = array(); + foreach (explode(',', $orderby) as $part) + { + $part = trim($part); + if ( ! in_array($part, $this->ar_aliased_tables)) + { + $part = $this->_protect_identifiers(trim($part)); + } + + $temp[] = $part; + } + + $orderby = implode(', ', $temp); + } + else + { + $orderby = $this->_protect_identifiers($orderby); + } + + $orderby_statement = $orderby.$direction; + + $this->ar_orderby[] = $orderby_statement; + if ($this->ar_caching === TRUE) + { + $this->ar_cache_orderby[] = $orderby_statement; + $this->ar_cache_exists[] = 'orderby'; + } + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * orderby() is an alias of order_by() + * this function is here for backwards compatibility, as + * orderby() has been deprecated + */ + function orderby($orderby, $direction = '') + { + return $this->order_by($orderby, $direction); + } + + // -------------------------------------------------------------------- + + /** + * Sets the LIMIT value + * + * @access public + * @param integer the limit value + * @param integer the offset value + * @return object + */ + function limit($value, $offset = '') + { + $this->ar_limit = $value; + + if ($offset != '') + { + $this->ar_offset = $offset; + } + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Sets the OFFSET value + * + * @access public + * @param integer the offset value + * @return object + */ + function offset($offset) + { + $this->ar_offset = $offset; + return $this; + } + + // -------------------------------------------------------------------- + + /** + * The "set" function. Allows key/value pairs to be set for inserting or updating + * + * @access public + * @param mixed + * @param string + * @param boolean + * @return object + */ + function set($key, $value = '', $escape = TRUE) + { + $key = $this->_object_to_array($key); + + if ( ! is_array($key)) + { + $key = array($key => $value); + } + + foreach ($key as $k => $v) + { + if ($escape === FALSE) + { + $this->ar_set[$this->_protect_identifiers($k)] = $v; + } + else + { + $this->ar_set[$this->_protect_identifiers($k)] = $this->escape($v); + } + } + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Get + * + * Compiles the select statement based on the other functions called + * and runs the query + * + * @access public + * @param string the table + * @param string the limit clause + * @param string the offset clause + * @return object + */ + function get($table = '', $limit = null, $offset = null) + { + if ($table != '') + { + $this->_track_aliases($table); + $this->from($table); + } + + if ( ! is_null($limit)) + { + $this->limit($limit, $offset); + } + + $sql = $this->_compile_select(); + + $result = $this->query($sql); + $this->_reset_select(); + return $result; + } + + /** + * "Count All Results" query + * + * Generates a platform-specific query string that counts all records + * returned by an Active Record query. + * + * @access public + * @param string + * @return string + */ + function count_all_results($table = '') + { + if ($table != '') + { + $this->_track_aliases($table); + $this->from($table); + } + + $sql = $this->_compile_select($this->_count_string . $this->_protect_identifiers('numrows')); + + $query = $this->query($sql); + $this->_reset_select(); + + if ($query->num_rows() == 0) + { + return '0'; + } + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * Get_Where + * + * Allows the where clause, limit and offset to be added directly + * + * @access public + * @param string the where clause + * @param string the limit clause + * @param string the offset clause + * @return object + */ + function get_where($table = '', $where = null, $limit = null, $offset = null) + { + if ($table != '') + { + $this->from($table); + } + + if ( ! is_null($where)) + { + $this->where($where); + } + + if ( ! is_null($limit)) + { + $this->limit($limit, $offset); + } + + $sql = $this->_compile_select(); + + $result = $this->query($sql); + $this->_reset_select(); + return $result; + } + + // -------------------------------------------------------------------- + + /** + * getwhere() is an alias of get_where() + * this function is here for backwards compatibility, as + * getwhere() has been deprecated + */ + function getwhere($table = '', $where = null, $limit = null, $offset = null) + { + return $this->get_where($table, $where, $limit, $offset); + } + + // -------------------------------------------------------------------- + + /** + * Insert + * + * Compiles an insert string and runs the query + * + * @access public + * @param string the table to retrieve the results from + * @param array an associative array of insert values + * @return object + */ + function insert($table = '', $set = NULL) + { + if ( ! is_null($set)) + { + $this->set($set); + } + + if (count($this->ar_set) == 0) + { + if ($this->db_debug) + { + return $this->display_error('db_must_use_set'); + } + return FALSE; + } + + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + $sql = $this->_insert($this->_protect_identifiers($table, TRUE, NULL, FALSE), array_keys($this->ar_set), array_values($this->ar_set)); + + $this->_reset_write(); + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Update + * + * Compiles an update string and runs the query + * + * @access public + * @param string the table to retrieve the results from + * @param array an associative array of update values + * @param mixed the where clause + * @return object + */ + function update($table = '', $set = NULL, $where = NULL, $limit = NULL) + { + // Combine any cached components with the current statements + $this->_merge_cache(); + + if ( ! is_null($set)) + { + $this->set($set); + } + + if (count($this->ar_set) == 0) + { + if ($this->db_debug) + { + return $this->display_error('db_must_use_set'); + } + return FALSE; + } + + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + if ($where != NULL) + { + $this->where($where); + } + + if ($limit != NULL) + { + $this->limit($limit); + } + + $sql = $this->_update($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_set, $this->ar_where, $this->ar_orderby, $this->ar_limit); + + $this->_reset_write(); + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Empty Table + * + * Compiles a delete string and runs "DELETE FROM table" + * + * @access public + * @param string the table to empty + * @return object + */ + function empty_table($table = '') + { + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + else + { + $table = $this->_protect_identifiers($table, TRUE, NULL, FALSE); + } + + $sql = $this->_delete($table); + + $this->_reset_write(); + + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Truncate + * + * Compiles a truncate string and runs the query + * If the database does not support the truncate() command + * This function maps to "DELETE FROM table" + * + * @access public + * @param string the table to truncate + * @return object + */ + function truncate($table = '') + { + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + else + { + $table = $this->_protect_identifiers($table, TRUE, NULL, FALSE); + } + + $sql = $this->_truncate($table); + + $this->_reset_write(); + + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Delete + * + * Compiles a delete string and runs the query + * + * @access public + * @param mixed the table(s) to delete from. String or array + * @param mixed the where clause + * @param mixed the limit clause + * @param boolean + * @return object + */ + function delete($table = '', $where = '', $limit = NULL, $reset_data = TRUE) + { + // Combine any cached components with the current statements + $this->_merge_cache(); + + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + elseif (is_array($table)) + { + foreach($table as $single_table) + { + $this->delete($single_table, $where, $limit, FALSE); + } + + $this->_reset_write(); + return; + } + else + { + $table = $this->_protect_identifiers($table, TRUE, NULL, FALSE); + } + + if ($where != '') + { + $this->where($where); + } + + if ($limit != NULL) + { + $this->limit($limit); + } + + if (count($this->ar_where) == 0 && count($this->ar_like) == 0) + { + if ($this->db_debug) + { + return $this->display_error('db_del_must_use_where'); + } + + return FALSE; + } + + $sql = $this->_delete($table, $this->ar_where, $this->ar_like, $this->ar_limit); + + if ($reset_data) + { + $this->_reset_write(); + } + + return $this->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * DB Prefix + * + * Prepends a database prefix if one exists in configuration + * + * @access public + * @param string the table + * @return string + */ + function dbprefix($table = '') + { + if ($table == '') + { + $this->display_error('db_table_name_required'); + } + + return $this->dbprefix.$table; + } + + // -------------------------------------------------------------------- + + /** + * Track Aliases + * + * Used to track SQL statements written with aliased tables. + * + * @access private + * @param string The table to inspect + * @return string + */ + function _track_aliases($table) + { + if (is_array($table)) + { + foreach ($table as $t) + { + $this->_track_aliases($t); + } + return; + } + + // Does the string contain a comma? If so, we need to separate + // the string into discreet statements + if (strpos($table, ',') !== FALSE) + { + return $this->_track_aliases(explode(',', $table)); + } + + // if a table alias is used we can recognize it by a space + if (strpos($table, " ") !== FALSE) + { + // if the alias is written with the AS keyword, remove it + $table = preg_replace('/ AS /i', ' ', $table); + + // Grab the alias + $table = trim(strrchr($table, " ")); + + // Store the alias, if it doesn't already exist + if ( ! in_array($table, $this->ar_aliased_tables)) + { + $this->ar_aliased_tables[] = $table; + } + } + } + + // -------------------------------------------------------------------- + + /** + * Compile the SELECT statement + * + * Generates a query string based on which functions were used. + * Should not be called directly. The get() function calls it. + * + * @access private + * @return string + */ + function _compile_select($select_override = FALSE) + { + // Combine any cached components with the current statements + $this->_merge_cache(); + + // ---------------------------------------------------------------- + + // Write the "select" portion of the query + + if ($select_override !== FALSE) + { + $sql = $select_override; + } + else + { + $sql = ( ! $this->ar_distinct) ? 'SELECT ' : 'SELECT DISTINCT '; + + if (count($this->ar_select) == 0) + { + $sql .= '*'; + } + else + { + // Cycle through the "select" portion of the query and prep each column name. + // The reason we protect identifiers here rather then in the select() function + // is because until the user calls the from() function we don't know if there are aliases + foreach ($this->ar_select as $key => $val) + { + $this->ar_select[$key] = $this->_protect_identifiers($val); + } + + $sql .= implode(', ', $this->ar_select); + } + } + + // ---------------------------------------------------------------- + + // Write the "FROM" portion of the query + + if (count($this->ar_from) > 0) + { + $sql .= "\nFROM "; + + $sql .= $this->_from_tables($this->ar_from); + } + + // ---------------------------------------------------------------- + + // Write the "JOIN" portion of the query + + if (count($this->ar_join) > 0) + { + $sql .= "\n"; + + $sql .= implode("\n", $this->ar_join); + } + + // ---------------------------------------------------------------- + + // Write the "WHERE" portion of the query + + if (count($this->ar_where) > 0 OR count($this->ar_like) > 0) + { + $sql .= "\n"; + + $sql .= "WHERE "; + } + + $sql .= implode("\n", $this->ar_where); + + // ---------------------------------------------------------------- + + // Write the "LIKE" portion of the query + + if (count($this->ar_like) > 0) + { + if (count($this->ar_where) > 0) + { + $sql .= "\nAND "; + } + + $sql .= implode("\n", $this->ar_like); + } + + // ---------------------------------------------------------------- + + // Write the "GROUP BY" portion of the query + + if (count($this->ar_groupby) > 0) + { + $sql .= "\nGROUP BY "; + + $sql .= implode(', ', $this->ar_groupby); + } + + // ---------------------------------------------------------------- + + // Write the "HAVING" portion of the query + + if (count($this->ar_having) > 0) + { + $sql .= "\nHAVING "; + $sql .= implode("\n", $this->ar_having); + } + + // ---------------------------------------------------------------- + + // Write the "ORDER BY" portion of the query + + if (count($this->ar_orderby) > 0) + { + $sql .= "\nORDER BY "; + $sql .= implode(', ', $this->ar_orderby); + + if ($this->ar_order !== FALSE) + { + $sql .= ($this->ar_order == 'desc') ? ' DESC' : ' ASC'; + } + } + + // ---------------------------------------------------------------- + + // Write the "LIMIT" portion of the query + + if (is_numeric($this->ar_limit)) + { + $sql .= "\n"; + $sql = $this->_limit($sql, $this->ar_limit, $this->ar_offset); + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Object to Array + * + * Takes an object as input and converts the class variables to array key/vals + * + * @access public + * @param object + * @return array + */ + function _object_to_array($object) + { + if ( ! is_object($object)) + { + return $object; + } + + $array = array(); + foreach (get_object_vars($object) as $key => $val) + { + // There are some built in keys we need to ignore for this conversion + if ( ! is_object($val) && ! is_array($val) && $key != '_parent_name' && $key != '_ci_scaffolding' && $key != '_ci_scaff_table') + { + $array[$key] = $val; + } + } + + return $array; + } + + // -------------------------------------------------------------------- + + /** + * Start Cache + * + * Starts AR caching + * + * @access public + * @return void + */ + function start_cache() + { + $this->ar_caching = TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Stop Cache + * + * Stops AR caching + * + * @access public + * @return void + */ + function stop_cache() + { + $this->ar_caching = FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Flush Cache + * + * Empties the AR cache + * + * @access public + * @return void + */ + function flush_cache() + { + $this->_reset_run( + array( + 'ar_cache_select' => array(), + 'ar_cache_from' => array(), + 'ar_cache_join' => array(), + 'ar_cache_where' => array(), + 'ar_cache_like' => array(), + 'ar_cache_groupby' => array(), + 'ar_cache_having' => array(), + 'ar_cache_orderby' => array(), + 'ar_cache_set' => array(), + 'ar_cache_exists' => array() + ) + ); + } + + // -------------------------------------------------------------------- + + /** + * Merge Cache + * + * When called, this function merges any cached AR arrays with + * locally called ones. + * + * @access private + * @return void + */ + function _merge_cache() + { + if (count($this->ar_cache_exists) == 0) + { + return; + } + + foreach ($this->ar_cache_exists as $val) + { + $ar_variable = 'ar_'.$val; + $ar_cache_var = 'ar_cache_'.$val; + + if (count($this->$ar_cache_var) == 0) + { + continue; + } + + $this->$ar_variable = array_unique(array_merge($this->$ar_cache_var, $this->$ar_variable)); + } + + // If we are "protecting identifiers" we need to examine the "from" + // portion of the query to determine if there are any aliases + if ($this->_protect_identifiers === TRUE AND count($this->ar_cache_from) > 0) + { + $this->_track_aliases($this->ar_from); + } + } + + // -------------------------------------------------------------------- + + /** + * Resets the active record values. Called by the get() function + * + * @access private + * @param array An array of fields to reset + * @return void + */ + function _reset_run($ar_reset_items) + { + foreach ($ar_reset_items as $item => $default_value) + { + if ( ! in_array($item, $this->ar_store_array)) + { + $this->$item = $default_value; + } + } + } + + // -------------------------------------------------------------------- + + /** + * Resets the active record values. Called by the get() function + * + * @access private + * @return void + */ + function _reset_select() + { + $ar_reset_items = array( + 'ar_select' => array(), + 'ar_from' => array(), + 'ar_join' => array(), + 'ar_where' => array(), + 'ar_like' => array(), + 'ar_groupby' => array(), + 'ar_having' => array(), + 'ar_orderby' => array(), + 'ar_wherein' => array(), + 'ar_aliased_tables' => array(), + 'ar_distinct' => FALSE, + 'ar_limit' => FALSE, + 'ar_offset' => FALSE, + 'ar_order' => FALSE, + ); + + $this->_reset_run($ar_reset_items); + } + + // -------------------------------------------------------------------- + + /** + * Resets the active record "write" values. + * + * Called by the insert() update() and delete() functions + * + * @access private + * @return void + */ + function _reset_write() + { + $ar_reset_items = array( + 'ar_set' => array(), + 'ar_from' => array(), + 'ar_where' => array(), + 'ar_like' => array(), + 'ar_orderby' => array(), + 'ar_limit' => FALSE, + 'ar_order' => FALSE + ); + + $this->_reset_run($ar_reset_items); + } + +} + +/* End of file DB_active_rec.php */ /* Location: ./system/database/DB_active_rec.php */ \ No newline at end of file diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php index 9bb1b165..70a2d95e 100644 --- a/system/database/DB_cache.php +++ b/system/database/DB_cache.php @@ -1,195 +1,195 @@ -CI - // and load the file helper since we use it a lot - $this->CI =& get_instance(); - $this->db =& $db; - $this->CI->load->helper('file'); - } - - // -------------------------------------------------------------------- - - /** - * Set Cache Directory Path - * - * @access public - * @param string the path to the cache directory - * @return bool - */ - function check_path($path = '') - { - if ($path == '') - { - if ($this->db->cachedir == '') - { - return $this->db->cache_off(); - } - - $path = $this->db->cachedir; - } - - // Add a trailing slash to the path if needed - $path = preg_replace("/(.+?)\/*$/", "\\1/", $path); - - if ( ! is_dir($path) OR ! is_really_writable($path)) - { - // If the path is wrong we'll turn off caching - return $this->db->cache_off(); - } - - $this->db->cachedir = $path; - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Retrieve a cached query - * - * The URI being requested will become the name of the cache sub-folder. - * An MD5 hash of the SQL statement will become the cache file name - * - * @access public - * @return string - */ - function read($sql) - { - if ( ! $this->check_path()) - { - return $this->db->cache_off(); - } - - $segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1); - - $segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); - - $filepath = $this->db->cachedir.$segment_one.'+'.$segment_two.'/'.md5($sql); - - if (FALSE === ($cachedata = read_file($filepath))) - { - return FALSE; - } - - return unserialize($cachedata); - } - - // -------------------------------------------------------------------- - - /** - * Write a query to a cache file - * - * @access public - * @return bool - */ - function write($sql, $object) - { - if ( ! $this->check_path()) - { - return $this->db->cache_off(); - } - - $segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1); - - $segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); - - $dir_path = $this->db->cachedir.$segment_one.'+'.$segment_two.'/'; - - $filename = md5($sql); - - if ( ! @is_dir($dir_path)) - { - if ( ! @mkdir($dir_path, DIR_WRITE_MODE)) - { - return FALSE; - } - - @chmod($dir_path, DIR_WRITE_MODE); - } - - if (write_file($dir_path.$filename, serialize($object)) === FALSE) - { - return FALSE; - } - - @chmod($dir_path.$filename, DIR_WRITE_MODE); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Delete cache files within a particular directory - * - * @access public - * @return bool - */ - function delete($segment_one = '', $segment_two = '') - { - if ($segment_one == '') - { - $segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1); - } - - if ($segment_two == '') - { - $segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); - } - - $dir_path = $this->db->cachedir.$segment_one.'+'.$segment_two.'/'; - - delete_files($dir_path, TRUE); - } - - // -------------------------------------------------------------------- - - /** - * Delete all existing cache files - * - * @access public - * @return bool - */ - function delete_all() - { - delete_files($this->db->cachedir, TRUE); - } - -} - - -/* End of file DB_cache.php */ +CI + // and load the file helper since we use it a lot + $this->CI =& get_instance(); + $this->db =& $db; + $this->CI->load->helper('file'); + } + + // -------------------------------------------------------------------- + + /** + * Set Cache Directory Path + * + * @access public + * @param string the path to the cache directory + * @return bool + */ + function check_path($path = '') + { + if ($path == '') + { + if ($this->db->cachedir == '') + { + return $this->db->cache_off(); + } + + $path = $this->db->cachedir; + } + + // Add a trailing slash to the path if needed + $path = preg_replace("/(.+?)\/*$/", "\\1/", $path); + + if ( ! is_dir($path) OR ! is_really_writable($path)) + { + // If the path is wrong we'll turn off caching + return $this->db->cache_off(); + } + + $this->db->cachedir = $path; + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Retrieve a cached query + * + * The URI being requested will become the name of the cache sub-folder. + * An MD5 hash of the SQL statement will become the cache file name + * + * @access public + * @return string + */ + function read($sql) + { + if ( ! $this->check_path()) + { + return $this->db->cache_off(); + } + + $segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1); + + $segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); + + $filepath = $this->db->cachedir.$segment_one.'+'.$segment_two.'/'.md5($sql); + + if (FALSE === ($cachedata = read_file($filepath))) + { + return FALSE; + } + + return unserialize($cachedata); + } + + // -------------------------------------------------------------------- + + /** + * Write a query to a cache file + * + * @access public + * @return bool + */ + function write($sql, $object) + { + if ( ! $this->check_path()) + { + return $this->db->cache_off(); + } + + $segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1); + + $segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); + + $dir_path = $this->db->cachedir.$segment_one.'+'.$segment_two.'/'; + + $filename = md5($sql); + + if ( ! @is_dir($dir_path)) + { + if ( ! @mkdir($dir_path, DIR_WRITE_MODE)) + { + return FALSE; + } + + @chmod($dir_path, DIR_WRITE_MODE); + } + + if (write_file($dir_path.$filename, serialize($object)) === FALSE) + { + return FALSE; + } + + @chmod($dir_path.$filename, DIR_WRITE_MODE); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Delete cache files within a particular directory + * + * @access public + * @return bool + */ + function delete($segment_one = '', $segment_two = '') + { + if ($segment_one == '') + { + $segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1); + } + + if ($segment_two == '') + { + $segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2); + } + + $dir_path = $this->db->cachedir.$segment_one.'+'.$segment_two.'/'; + + delete_files($dir_path, TRUE); + } + + // -------------------------------------------------------------------- + + /** + * Delete all existing cache files + * + * @access public + * @return bool + */ + function delete_all() + { + delete_files($this->db->cachedir, TRUE); + } + +} + + +/* End of file DB_cache.php */ /* Location: ./system/database/DB_cache.php */ \ No newline at end of file diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index dbd82dbc..4293acc9 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1,1319 +1,1319 @@ - $val) - { - $this->$key = $val; - } - } - - log_message('debug', 'Database Driver Class Initialized'); - } - - // -------------------------------------------------------------------- - - /** - * Initialize Database Settings - * - * @access private Called by the constructor - * @param mixed - * @return void - */ - function initialize() - { - // If an existing connection resource is available - // there is no need to connect and select the database - if (is_resource($this->conn_id) OR is_object($this->conn_id)) - { - return TRUE; - } - - // ---------------------------------------------------------------- - - // Connect to the database and set the connection ID - $this->conn_id = ($this->pconnect == FALSE) ? $this->db_connect() : $this->db_pconnect(); - - // No connection resource? Throw an error - if ( ! $this->conn_id) - { - log_message('error', 'Unable to connect to the database'); - - if ($this->db_debug) - { - $this->display_error('db_unable_to_connect'); - } - return FALSE; - } - - // ---------------------------------------------------------------- - - // Select the DB... assuming a database name is specified in the config file - if ($this->database != '') - { - if ( ! $this->db_select()) - { - log_message('error', 'Unable to select database: '.$this->database); - - if ($this->db_debug) - { - $this->display_error('db_unable_to_select', $this->database); - } - return FALSE; - } - else - { - // We've selected the DB. Now we set the character set - if ( ! $this->db_set_charset($this->char_set, $this->dbcollat)) - { - return FALSE; - } - - return TRUE; - } - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Set client character set - * - * @access public - * @param string - * @param string - * @return resource - */ - function db_set_charset($charset, $collation) - { - if ( ! $this->_db_set_charset($this->char_set, $this->dbcollat)) - { - log_message('error', 'Unable to set database connection charset: '.$this->char_set); - - if ($this->db_debug) - { - $this->display_error('db_unable_to_set_charset', $this->char_set); - } - - return FALSE; - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * The name of the platform in use (mysql, mssql, etc...) - * - * @access public - * @return string - */ - function platform() - { - return $this->dbdriver; - } - - // -------------------------------------------------------------------- - - /** - * Database Version Number. Returns a string containing the - * version of the database being used - * - * @access public - * @return string - */ - function version() - { - if (FALSE === ($sql = $this->_version())) - { - if ($this->db_debug) - { - return $this->display_error('db_unsupported_function'); - } - return FALSE; - } - - if ($this->dbdriver == 'oci8') - { - return $sql; - } - - $query = $this->query($sql); - return $query->row('ver'); - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * Accepts an SQL string as input and returns a result object upon - * successful execution of a "read" type query. Returns boolean TRUE - * upon successful execution of a "write" type query. Returns boolean - * FALSE upon failure, and if the $db_debug variable is set to TRUE - * will raise an error. - * - * @access public - * @param string An SQL query string - * @param array An array of binding data - * @return mixed - */ - function query($sql, $binds = FALSE, $return_object = TRUE) - { - if ($sql == '') - { - if ($this->db_debug) - { - log_message('error', 'Invalid query: '.$sql); - return $this->display_error('db_invalid_query'); - } - return FALSE; - } - - // Verify table prefix and replace if necessary - if ( ($this->dbprefix != '' AND $this->swap_pre != '') AND ($this->dbprefix != $this->swap_pre) ) - { - $sql = preg_replace("/(\W)".$this->swap_pre."(\S+?)/", "\\1".$this->dbprefix."\\2", $sql); - } - - // Is query caching enabled? If the query is a "read type" - // we will load the caching class and return the previously - // cached query if it exists - if ($this->cache_on == TRUE AND stristr($sql, 'SELECT')) - { - if ($this->_cache_init()) - { - $this->load_rdriver(); - if (FALSE !== ($cache = $this->CACHE->read($sql))) - { - return $cache; - } - } - } - - // Compile binds if needed - if ($binds !== FALSE) - { - $sql = $this->compile_binds($sql, $binds); - } - - // Save the query for debugging - if ($this->save_queries == TRUE) - { - $this->queries[] = $sql; - } - - // Start the Query Timer - $time_start = list($sm, $ss) = explode(' ', microtime()); - - // Run the Query - if (FALSE === ($this->result_id = $this->simple_query($sql))) - { - if ($this->save_queries == TRUE) - { - $this->query_times[] = 0; - } - - // This will trigger a rollback if transactions are being used - $this->_trans_status = FALSE; - - if ($this->db_debug) - { - // grab the error number and message now, as we might run some - // additional queries before displaying the error - $error_no = $this->_error_number(); - $error_msg = $this->_error_message(); - - // We call this function in order to roll-back queries - // if transactions are enabled. If we don't call this here - // the error message will trigger an exit, causing the - // transactions to remain in limbo. - $this->trans_complete(); - - // Log and display errors - log_message('error', 'Query error: '.$error_msg); - return $this->display_error( - array( - 'Error Number: '.$error_no, - $error_msg, - $sql - ) - ); - } - - return FALSE; - } - - // Stop and aggregate the query time results - $time_end = list($em, $es) = explode(' ', microtime()); - $this->benchmark += ($em + $es) - ($sm + $ss); - - if ($this->save_queries == TRUE) - { - $this->query_times[] = ($em + $es) - ($sm + $ss); - } - - // Increment the query counter - $this->query_count++; - - // Was the query a "write" type? - // If so we'll simply return true - if ($this->is_write_type($sql) === TRUE) - { - // If caching is enabled we'll auto-cleanup any - // existing files related to this particular URI - if ($this->cache_on == TRUE AND $this->cache_autodel == TRUE AND $this->_cache_init()) - { - $this->CACHE->delete(); - } - - return TRUE; - } - - // Return TRUE if we don't need to create a result object - // Currently only the Oracle driver uses this when stored - // procedures are used - if ($return_object !== TRUE) - { - return TRUE; - } - - // Load and instantiate the result driver - - $driver = $this->load_rdriver(); - $RES = new $driver(); - $RES->conn_id = $this->conn_id; - $RES->result_id = $this->result_id; - - if ($this->dbdriver == 'oci8') - { - $RES->stmt_id = $this->stmt_id; - $RES->curs_id = NULL; - $RES->limit_used = $this->limit_used; - $this->stmt_id = FALSE; - } - - // oci8 vars must be set before calling this - $RES->num_rows = $RES->num_rows(); - - // Is query caching enabled? If so, we'll serialize the - // result object and save it to a cache file. - if ($this->cache_on == TRUE AND $this->_cache_init()) - { - // We'll create a new instance of the result object - // only without the platform specific driver since - // we can't use it with cached data (the query result - // resource ID won't be any good once we've cached the - // result object, so we'll have to compile the data - // and save it) - $CR = new CI_DB_result(); - $CR->num_rows = $RES->num_rows(); - $CR->result_object = $RES->result_object(); - $CR->result_array = $RES->result_array(); - - // Reset these since cached objects can not utilize resource IDs. - $CR->conn_id = NULL; - $CR->result_id = NULL; - - $this->CACHE->write($sql, $CR); - } - - return $RES; - } - - // -------------------------------------------------------------------- - - /** - * Load the result drivers - * - * @access public - * @return string the name of the result class - */ - function load_rdriver() - { - $driver = 'CI_DB_'.$this->dbdriver.'_result'; - - if ( ! class_exists($driver)) - { - include_once(BASEPATH.'database/DB_result'.EXT); - include_once(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_result'.EXT); - } - - return $driver; - } - - // -------------------------------------------------------------------- - - /** - * Simple Query - * This is a simplified version of the query() function. Internally - * we only use it when running transaction commands since they do - * not require all the features of the main query() function. - * - * @access public - * @param string the sql query - * @return mixed - */ - function simple_query($sql) - { - if ( ! $this->conn_id) - { - $this->initialize(); - } - - return $this->_execute($sql); - } - - // -------------------------------------------------------------------- - - /** - * Disable Transactions - * This permits transactions to be disabled at run-time. - * - * @access public - * @return void - */ - function trans_off() - { - $this->trans_enabled = FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Enable/disable Transaction Strict Mode - * When strict mode is enabled, if you are running multiple groups of - * transactions, if one group fails all groups will be rolled back. - * If strict mode is disabled, each group is treated autonomously, meaning - * a failure of one group will not affect any others - * - * @access public - * @return void - */ - function trans_strict($mode = TRUE) - { - $this->trans_strict = is_bool($mode) ? $mode : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Start Transaction - * - * @access public - * @return void - */ - function trans_start($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return FALSE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - $this->_trans_depth += 1; - return; - } - - $this->trans_begin($test_mode); - } - - // -------------------------------------------------------------------- - - /** - * Complete Transaction - * - * @access public - * @return bool - */ - function trans_complete() - { - if ( ! $this->trans_enabled) - { - return FALSE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 1) - { - $this->_trans_depth -= 1; - return TRUE; - } - - // The query() function will set this flag to FALSE in the event that a query failed - if ($this->_trans_status === FALSE) - { - $this->trans_rollback(); - - // If we are NOT running in strict mode, we will reset - // the _trans_status flag so that subsequent groups of transactions - // will be permitted. - if ($this->trans_strict === FALSE) - { - $this->_trans_status = TRUE; - } - - log_message('debug', 'DB Transaction Failure'); - return FALSE; - } - - $this->trans_commit(); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Lets you retrieve the transaction flag to determine if it has failed - * - * @access public - * @return bool - */ - function trans_status() - { - return $this->_trans_status; - } - - // -------------------------------------------------------------------- - - /** - * Compile Bindings - * - * @access public - * @param string the sql statement - * @param array an array of bind data - * @return string - */ - function compile_binds($sql, $binds) - { - if (strpos($sql, $this->bind_marker) === FALSE) - { - return $sql; - } - - if ( ! is_array($binds)) - { - $binds = array($binds); - } - - // Get the sql segments around the bind markers - $segments = explode($this->bind_marker, $sql); - - // The count of bind should be 1 less then the count of segments - // If there are more bind arguments trim it down - if (count($binds) >= count($segments)) { - $binds = array_slice($binds, 0, count($segments)-1); - } - - // Construct the binded query - $result = $segments[0]; - $i = 0; - foreach ($binds as $bind) - { - $result .= $this->escape($bind); - $result .= $segments[++$i]; - } - - return $result; - } - - // -------------------------------------------------------------------- - - /** - * Determines if a query is a "write" type. - * - * @access public - * @param string An SQL query string - * @return boolean - */ - function is_write_type($sql) - { - if ( ! preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|LOAD DATA|COPY|ALTER|GRANT|REVOKE|LOCK|UNLOCK)\s+/i', $sql)) - { - return FALSE; - } - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Calculate the aggregate query elapsed time - * - * @access public - * @param integer The number of decimal places - * @return integer - */ - function elapsed_time($decimals = 6) - { - return number_format($this->benchmark, $decimals); - } - - // -------------------------------------------------------------------- - - /** - * Returns the total number of queries - * - * @access public - * @return integer - */ - function total_queries() - { - return $this->query_count; - } - - // -------------------------------------------------------------------- - - /** - * Returns the last query that was executed - * - * @access public - * @return void - */ - function last_query() - { - return end($this->queries); - } - - // -------------------------------------------------------------------- - - /** - * "Smart" Escape String - * - * Escapes data based on type - * Sets boolean and null types - * - * @access public - * @param string - * @return integer - */ - function escape($str) - { - switch (gettype($str)) - { - case 'string' : $str = "'".$this->escape_str($str)."'"; - break; - case 'boolean' : $str = ($str === FALSE) ? 0 : 1; - break; - default : $str = ($str === NULL) ? 'NULL' : $str; - break; - } - - return $str; - } - - // -------------------------------------------------------------------- - - /** - * Primary - * - * Retrieves the primary key. It assumes that the row in the first - * position is the primary key - * - * @access public - * @param string the table name - * @return string - */ - function primary($table = '') - { - $fields = $this->list_fields($table); - - if ( ! is_array($fields)) - { - return FALSE; - } - - return current($fields); - } - - // -------------------------------------------------------------------- - - /** - * Returns an array of table names - * - * @access public - * @return array - */ - function list_tables($constrain_by_prefix = FALSE) - { - // Is there a cached result? - if (isset($this->data_cache['table_names'])) - { - return $this->data_cache['table_names']; - } - - if (FALSE === ($sql = $this->_list_tables($constrain_by_prefix))) - { - if ($this->db_debug) - { - return $this->display_error('db_unsupported_function'); - } - return FALSE; - } - - $retval = array(); - $query = $this->query($sql); - - if ($query->num_rows() > 0) - { - foreach($query->result_array() as $row) - { - if (isset($row['TABLE_NAME'])) - { - $retval[] = $row['TABLE_NAME']; - } - else - { - $retval[] = array_shift($row); - } - } - } - - $this->data_cache['table_names'] = $retval; - return $this->data_cache['table_names']; - } - - // -------------------------------------------------------------------- - - /** - * Determine if a particular table exists - * @access public - * @return boolean - */ - function table_exists($table_name) - { - return ( ! in_array($this->_protect_identifiers($table_name, TRUE, FALSE, FALSE), $this->list_tables())) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Fetch MySQL Field Names - * - * @access public - * @param string the table name - * @return array - */ - function list_fields($table = '') - { - // Is there a cached result? - if (isset($this->data_cache['field_names'][$table])) - { - return $this->data_cache['field_names'][$table]; - } - - if ($table == '') - { - if ($this->db_debug) - { - return $this->display_error('db_field_param_missing'); - } - return FALSE; - } - - if (FALSE === ($sql = $this->_list_columns($this->_protect_identifiers($table, TRUE, NULL, FALSE)))) - { - if ($this->db_debug) - { - return $this->display_error('db_unsupported_function'); - } - return FALSE; - } - - $query = $this->query($sql); - - $retval = array(); - foreach($query->result_array() as $row) - { - if (isset($row['COLUMN_NAME'])) - { - $retval[] = $row['COLUMN_NAME']; - } - else - { - $retval[] = current($row); - } - } - - $this->data_cache['field_names'][$table] = $retval; - return $this->data_cache['field_names'][$table]; - } - - // -------------------------------------------------------------------- - - /** - * Determine if a particular field exists - * @access public - * @param string - * @param string - * @return boolean - */ - function field_exists($field_name, $table_name) - { - return ( ! in_array($field_name, $this->list_fields($table_name))) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Returns an object with field data - * - * @access public - * @param string the table name - * @return object - */ - function field_data($table = '') - { - if ($table == '') - { - if ($this->db_debug) - { - return $this->display_error('db_field_param_missing'); - } - return FALSE; - } - - $query = $this->query($this->_field_data($this->_protect_identifiers($table, TRUE, NULL, FALSE))); - - return $query->field_data(); - } - - // -------------------------------------------------------------------- - - /** - * Generate an insert string - * - * @access public - * @param string the table upon which the query will be performed - * @param array an associative array data of key/values - * @return string - */ - function insert_string($table, $data) - { - $fields = array(); - $values = array(); - - foreach($data as $key => $val) - { - $fields[] = $this->_escape_identifiers($key); - $values[] = $this->escape($val); - } - - return $this->_insert($this->_protect_identifiers($table, TRUE, NULL, FALSE), $fields, $values); - } - - // -------------------------------------------------------------------- - - /** - * Generate an update string - * - * @access public - * @param string the table upon which the query will be performed - * @param array an associative array data of key/values - * @param mixed the "where" statement - * @return string - */ - function update_string($table, $data, $where) - { - if ($where == '') - { - return false; - } - - $fields = array(); - foreach($data as $key => $val) - { - $fields[$this->_protect_identifiers($key)] = $this->escape($val); - } - - if ( ! is_array($where)) - { - $dest = array($where); - } - else - { - $dest = array(); - foreach ($where as $key => $val) - { - $prefix = (count($dest) == 0) ? '' : ' AND '; - - if ($val !== '') - { - if ( ! $this->_has_operator($key)) - { - $key .= ' ='; - } - - $val = ' '.$this->escape($val); - } - - $dest[] = $prefix.$key.$val; - } - } - - return $this->_update($this->_protect_identifiers($table, TRUE, NULL, FALSE), $fields, $dest); - } - - // -------------------------------------------------------------------- - - /** - * Tests whether the string has an SQL operator - * - * @access private - * @param string - * @return bool - */ - function _has_operator($str) - { - $str = trim($str); - if ( ! preg_match("/(\s|<|>|!|=|is null|is not null)/i", $str)) - { - return FALSE; - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Enables a native PHP function to be run, using a platform agnostic wrapper. - * - * @access public - * @param string the function name - * @param mixed any parameters needed by the function - * @return mixed - */ - function call_function($function) - { - $driver = ($this->dbdriver == 'postgre') ? 'pg_' : $this->dbdriver.'_'; - - if (FALSE === strpos($driver, $function)) - { - $function = $driver.$function; - } - - if ( ! function_exists($function)) - { - if ($this->db_debug) - { - return $this->display_error('db_unsupported_function'); - } - return FALSE; - } - else - { - $args = (func_num_args() > 1) ? array_splice(func_get_args(), 1) : null; - - return call_user_func_array($function, $args); - } - } - - // -------------------------------------------------------------------- - - /** - * Set Cache Directory Path - * - * @access public - * @param string the path to the cache directory - * @return void - */ - function cache_set_path($path = '') - { - $this->cachedir = $path; - } - - // -------------------------------------------------------------------- - - /** - * Enable Query Caching - * - * @access public - * @return void - */ - function cache_on() - { - $this->cache_on = TRUE; - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Disable Query Caching - * - * @access public - * @return void - */ - function cache_off() - { - $this->cache_on = FALSE; - return FALSE; - } - - - // -------------------------------------------------------------------- - - /** - * Delete the cache files associated with a particular URI - * - * @access public - * @return void - */ - function cache_delete($segment_one = '', $segment_two = '') - { - if ( ! $this->_cache_init()) - { - return FALSE; - } - return $this->CACHE->delete($segment_one, $segment_two); - } - - // -------------------------------------------------------------------- - - /** - * Delete All cache files - * - * @access public - * @return void - */ - function cache_delete_all() - { - if ( ! $this->_cache_init()) - { - return FALSE; - } - - return $this->CACHE->delete_all(); - } - - // -------------------------------------------------------------------- - - /** - * Initialize the Cache Class - * - * @access private - * @return void - */ - function _cache_init() - { - if (is_object($this->CACHE) AND class_exists('CI_DB_Cache')) - { - return TRUE; - } - - if ( ! @include(BASEPATH.'database/DB_cache'.EXT)) - { - return $this->cache_off(); - } - - $this->CACHE = new CI_DB_Cache($this); // pass db object to support multiple db connections and returned db objects - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @return void - */ - function close() - { - if (is_resource($this->conn_id) OR is_object($this->conn_id)) - { - $this->_close($this->conn_id); - } - $this->conn_id = FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Display an error message - * - * @access public - * @param string the error message - * @param string any "swap" values - * @param boolean whether to localize the message - * @return string sends the application/error_db.php template - */ - function display_error($error = '', $swap = '', $native = FALSE) - { - $LANG =& load_class('Language'); - $LANG->load('db'); - - $heading = $LANG->line('db_error_heading'); - - if ($native == TRUE) - { - $message = $error; - } - else - { - $message = ( ! is_array($error)) ? array(str_replace('%s', $swap, $LANG->line($error))) : $error; - } - - $error =& load_class('Exceptions'); - echo $error->show_error($heading, $message, 'error_db'); - exit; - } - - // -------------------------------------------------------------------- - - /** - * Protect Identifiers - * - * This function adds backticks if appropriate based on db type - * - * @access private - * @param mixed the item to escape - * @return mixed the item with backticks - */ - function protect_identifiers($item, $prefix_single = FALSE) - { - return $this->_protect_identifiers($item, $prefix_single); - } - - // -------------------------------------------------------------------- - - /** - * Protect Identifiers - * - * This function is used extensively by the Active Record class, and by - * a couple functions in this class. - * It takes a column or table name (optionally with an alias) and inserts - * the table prefix onto it. Some logic is necessary in order to deal with - * column names that include the path. Consider a query like this: - * - * SELECT * FROM hostname.database.table.column AS c FROM hostname.database.table - * - * Or a query with aliasing: - * - * SELECT m.member_id, m.member_name FROM members AS m - * - * Since the column name can include up to four segments (host, DB, table, column) - * or also have an alias prefix, we need to do a bit of work to figure this out and - * insert the table prefix (if it exists) in the proper position, and escape only - * the correct identifiers. - * - * @access private - * @param string - * @param bool - * @param mixed - * @param bool - * @return string - */ - function _protect_identifiers($item, $prefix_single = FALSE, $protect_identifiers = NULL, $field_exists = TRUE) - { - if ( ! is_bool($protect_identifiers)) - { - $protect_identifiers = $this->_protect_identifiers; - } - - // Convert tabs or multiple spaces into single spaces - $item = preg_replace('/[\t| ]+/', ' ', $item); - - // If the item has an alias declaration we remove it and set it aside. - // Basically we remove everything to the right of the first space - $alias = ''; - if (strpos($item, ' ') !== FALSE) - { - $alias = strstr($item, " "); - $item = substr($item, 0, - strlen($alias)); - } - - // Break the string apart if it contains periods, then insert the table prefix - // in the correct location, assuming the period doesn't indicate that we're dealing - // with an alias. While we're at it, we will escape the components - if (strpos($item, '.') !== FALSE) - { - $parts = explode('.', $item); - - // Does the first segment of the exploded item match - // one of the aliases previously identified? If so, - // we have nothing more to do other than escape the item - if (in_array($parts[0], $this->ar_aliased_tables)) - { - if ($protect_identifiers === TRUE) - { - foreach ($parts as $key => $val) - { - if ( ! in_array($val, $this->_reserved_identifiers)) - { - $parts[$key] = $this->_escape_identifiers($val); - } - } - - $item = implode('.', $parts); - } - return $item.$alias; - } - - // Is there a table prefix defined in the config file? If not, no need to do anything - if ($this->dbprefix != '') - { - // We now add the table prefix based on some logic. - // Do we have 4 segments (hostname.database.table.column)? - // If so, we add the table prefix to the column name in the 3rd segment. - if (isset($parts[3])) - { - $i = 2; - } - // Do we have 3 segments (database.table.column)? - // If so, we add the table prefix to the column name in 2nd position - elseif (isset($parts[2])) - { - $i = 1; - } - // Do we have 2 segments (table.column)? - // If so, we add the table prefix to the column name in 1st segment - else - { - $i = 0; - } - - // This flag is set when the supplied $item does not contain a field name. - // This can happen when this function is being called from a JOIN. - if ($field_exists == FALSE) - { - $i++; - } - - // We only add the table prefix if it does not already exist - if (substr($parts[$i], 0, strlen($this->dbprefix)) != $this->dbprefix) - { - $parts[$i] = $this->dbprefix.$parts[$i]; - } - - // Put the parts back together - $item = implode('.', $parts); - } - - if ($protect_identifiers === TRUE) - { - $item = $this->_escape_identifiers($item); - } - - return $item.$alias; - } - - // This is basically a bug fix for queries that use MAX, MIN, etc. - // If a parenthesis is found we know that we do not need to - // escape the data or add a prefix. There's probably a more graceful - // way to deal with this, but I'm not thinking of it -- Rick - if (strpos($item, '(') !== FALSE) - { - return $item.$alias; - } - - // Is there a table prefix? If not, no need to insert it - if ($this->dbprefix != '') - { - // Do we prefix an item with no segments? - if ($prefix_single == TRUE AND substr($item, 0, strlen($this->dbprefix)) != $this->dbprefix) - { - $item = $this->dbprefix.$item; - } - } - - if ($protect_identifiers === TRUE AND ! in_array($item, $this->_reserved_identifiers)) - { - $item = $this->_escape_identifiers($item); - } - - return $item.$alias; - } - - -} - - -/* End of file DB_driver.php */ + $val) + { + $this->$key = $val; + } + } + + log_message('debug', 'Database Driver Class Initialized'); + } + + // -------------------------------------------------------------------- + + /** + * Initialize Database Settings + * + * @access private Called by the constructor + * @param mixed + * @return void + */ + function initialize() + { + // If an existing connection resource is available + // there is no need to connect and select the database + if (is_resource($this->conn_id) OR is_object($this->conn_id)) + { + return TRUE; + } + + // ---------------------------------------------------------------- + + // Connect to the database and set the connection ID + $this->conn_id = ($this->pconnect == FALSE) ? $this->db_connect() : $this->db_pconnect(); + + // No connection resource? Throw an error + if ( ! $this->conn_id) + { + log_message('error', 'Unable to connect to the database'); + + if ($this->db_debug) + { + $this->display_error('db_unable_to_connect'); + } + return FALSE; + } + + // ---------------------------------------------------------------- + + // Select the DB... assuming a database name is specified in the config file + if ($this->database != '') + { + if ( ! $this->db_select()) + { + log_message('error', 'Unable to select database: '.$this->database); + + if ($this->db_debug) + { + $this->display_error('db_unable_to_select', $this->database); + } + return FALSE; + } + else + { + // We've selected the DB. Now we set the character set + if ( ! $this->db_set_charset($this->char_set, $this->dbcollat)) + { + return FALSE; + } + + return TRUE; + } + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Set client character set + * + * @access public + * @param string + * @param string + * @return resource + */ + function db_set_charset($charset, $collation) + { + if ( ! $this->_db_set_charset($this->char_set, $this->dbcollat)) + { + log_message('error', 'Unable to set database connection charset: '.$this->char_set); + + if ($this->db_debug) + { + $this->display_error('db_unable_to_set_charset', $this->char_set); + } + + return FALSE; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * The name of the platform in use (mysql, mssql, etc...) + * + * @access public + * @return string + */ + function platform() + { + return $this->dbdriver; + } + + // -------------------------------------------------------------------- + + /** + * Database Version Number. Returns a string containing the + * version of the database being used + * + * @access public + * @return string + */ + function version() + { + if (FALSE === ($sql = $this->_version())) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + + if ($this->dbdriver == 'oci8') + { + return $sql; + } + + $query = $this->query($sql); + return $query->row('ver'); + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * Accepts an SQL string as input and returns a result object upon + * successful execution of a "read" type query. Returns boolean TRUE + * upon successful execution of a "write" type query. Returns boolean + * FALSE upon failure, and if the $db_debug variable is set to TRUE + * will raise an error. + * + * @access public + * @param string An SQL query string + * @param array An array of binding data + * @return mixed + */ + function query($sql, $binds = FALSE, $return_object = TRUE) + { + if ($sql == '') + { + if ($this->db_debug) + { + log_message('error', 'Invalid query: '.$sql); + return $this->display_error('db_invalid_query'); + } + return FALSE; + } + + // Verify table prefix and replace if necessary + if ( ($this->dbprefix != '' AND $this->swap_pre != '') AND ($this->dbprefix != $this->swap_pre) ) + { + $sql = preg_replace("/(\W)".$this->swap_pre."(\S+?)/", "\\1".$this->dbprefix."\\2", $sql); + } + + // Is query caching enabled? If the query is a "read type" + // we will load the caching class and return the previously + // cached query if it exists + if ($this->cache_on == TRUE AND stristr($sql, 'SELECT')) + { + if ($this->_cache_init()) + { + $this->load_rdriver(); + if (FALSE !== ($cache = $this->CACHE->read($sql))) + { + return $cache; + } + } + } + + // Compile binds if needed + if ($binds !== FALSE) + { + $sql = $this->compile_binds($sql, $binds); + } + + // Save the query for debugging + if ($this->save_queries == TRUE) + { + $this->queries[] = $sql; + } + + // Start the Query Timer + $time_start = list($sm, $ss) = explode(' ', microtime()); + + // Run the Query + if (FALSE === ($this->result_id = $this->simple_query($sql))) + { + if ($this->save_queries == TRUE) + { + $this->query_times[] = 0; + } + + // This will trigger a rollback if transactions are being used + $this->_trans_status = FALSE; + + if ($this->db_debug) + { + // grab the error number and message now, as we might run some + // additional queries before displaying the error + $error_no = $this->_error_number(); + $error_msg = $this->_error_message(); + + // We call this function in order to roll-back queries + // if transactions are enabled. If we don't call this here + // the error message will trigger an exit, causing the + // transactions to remain in limbo. + $this->trans_complete(); + + // Log and display errors + log_message('error', 'Query error: '.$error_msg); + return $this->display_error( + array( + 'Error Number: '.$error_no, + $error_msg, + $sql + ) + ); + } + + return FALSE; + } + + // Stop and aggregate the query time results + $time_end = list($em, $es) = explode(' ', microtime()); + $this->benchmark += ($em + $es) - ($sm + $ss); + + if ($this->save_queries == TRUE) + { + $this->query_times[] = ($em + $es) - ($sm + $ss); + } + + // Increment the query counter + $this->query_count++; + + // Was the query a "write" type? + // If so we'll simply return true + if ($this->is_write_type($sql) === TRUE) + { + // If caching is enabled we'll auto-cleanup any + // existing files related to this particular URI + if ($this->cache_on == TRUE AND $this->cache_autodel == TRUE AND $this->_cache_init()) + { + $this->CACHE->delete(); + } + + return TRUE; + } + + // Return TRUE if we don't need to create a result object + // Currently only the Oracle driver uses this when stored + // procedures are used + if ($return_object !== TRUE) + { + return TRUE; + } + + // Load and instantiate the result driver + + $driver = $this->load_rdriver(); + $RES = new $driver(); + $RES->conn_id = $this->conn_id; + $RES->result_id = $this->result_id; + + if ($this->dbdriver == 'oci8') + { + $RES->stmt_id = $this->stmt_id; + $RES->curs_id = NULL; + $RES->limit_used = $this->limit_used; + $this->stmt_id = FALSE; + } + + // oci8 vars must be set before calling this + $RES->num_rows = $RES->num_rows(); + + // Is query caching enabled? If so, we'll serialize the + // result object and save it to a cache file. + if ($this->cache_on == TRUE AND $this->_cache_init()) + { + // We'll create a new instance of the result object + // only without the platform specific driver since + // we can't use it with cached data (the query result + // resource ID won't be any good once we've cached the + // result object, so we'll have to compile the data + // and save it) + $CR = new CI_DB_result(); + $CR->num_rows = $RES->num_rows(); + $CR->result_object = $RES->result_object(); + $CR->result_array = $RES->result_array(); + + // Reset these since cached objects can not utilize resource IDs. + $CR->conn_id = NULL; + $CR->result_id = NULL; + + $this->CACHE->write($sql, $CR); + } + + return $RES; + } + + // -------------------------------------------------------------------- + + /** + * Load the result drivers + * + * @access public + * @return string the name of the result class + */ + function load_rdriver() + { + $driver = 'CI_DB_'.$this->dbdriver.'_result'; + + if ( ! class_exists($driver)) + { + include_once(BASEPATH.'database/DB_result'.EXT); + include_once(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_result'.EXT); + } + + return $driver; + } + + // -------------------------------------------------------------------- + + /** + * Simple Query + * This is a simplified version of the query() function. Internally + * we only use it when running transaction commands since they do + * not require all the features of the main query() function. + * + * @access public + * @param string the sql query + * @return mixed + */ + function simple_query($sql) + { + if ( ! $this->conn_id) + { + $this->initialize(); + } + + return $this->_execute($sql); + } + + // -------------------------------------------------------------------- + + /** + * Disable Transactions + * This permits transactions to be disabled at run-time. + * + * @access public + * @return void + */ + function trans_off() + { + $this->trans_enabled = FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Enable/disable Transaction Strict Mode + * When strict mode is enabled, if you are running multiple groups of + * transactions, if one group fails all groups will be rolled back. + * If strict mode is disabled, each group is treated autonomously, meaning + * a failure of one group will not affect any others + * + * @access public + * @return void + */ + function trans_strict($mode = TRUE) + { + $this->trans_strict = is_bool($mode) ? $mode : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Start Transaction + * + * @access public + * @return void + */ + function trans_start($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return FALSE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + $this->_trans_depth += 1; + return; + } + + $this->trans_begin($test_mode); + } + + // -------------------------------------------------------------------- + + /** + * Complete Transaction + * + * @access public + * @return bool + */ + function trans_complete() + { + if ( ! $this->trans_enabled) + { + return FALSE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 1) + { + $this->_trans_depth -= 1; + return TRUE; + } + + // The query() function will set this flag to FALSE in the event that a query failed + if ($this->_trans_status === FALSE) + { + $this->trans_rollback(); + + // If we are NOT running in strict mode, we will reset + // the _trans_status flag so that subsequent groups of transactions + // will be permitted. + if ($this->trans_strict === FALSE) + { + $this->_trans_status = TRUE; + } + + log_message('debug', 'DB Transaction Failure'); + return FALSE; + } + + $this->trans_commit(); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Lets you retrieve the transaction flag to determine if it has failed + * + * @access public + * @return bool + */ + function trans_status() + { + return $this->_trans_status; + } + + // -------------------------------------------------------------------- + + /** + * Compile Bindings + * + * @access public + * @param string the sql statement + * @param array an array of bind data + * @return string + */ + function compile_binds($sql, $binds) + { + if (strpos($sql, $this->bind_marker) === FALSE) + { + return $sql; + } + + if ( ! is_array($binds)) + { + $binds = array($binds); + } + + // Get the sql segments around the bind markers + $segments = explode($this->bind_marker, $sql); + + // The count of bind should be 1 less then the count of segments + // If there are more bind arguments trim it down + if (count($binds) >= count($segments)) { + $binds = array_slice($binds, 0, count($segments)-1); + } + + // Construct the binded query + $result = $segments[0]; + $i = 0; + foreach ($binds as $bind) + { + $result .= $this->escape($bind); + $result .= $segments[++$i]; + } + + return $result; + } + + // -------------------------------------------------------------------- + + /** + * Determines if a query is a "write" type. + * + * @access public + * @param string An SQL query string + * @return boolean + */ + function is_write_type($sql) + { + if ( ! preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|LOAD DATA|COPY|ALTER|GRANT|REVOKE|LOCK|UNLOCK)\s+/i', $sql)) + { + return FALSE; + } + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Calculate the aggregate query elapsed time + * + * @access public + * @param integer The number of decimal places + * @return integer + */ + function elapsed_time($decimals = 6) + { + return number_format($this->benchmark, $decimals); + } + + // -------------------------------------------------------------------- + + /** + * Returns the total number of queries + * + * @access public + * @return integer + */ + function total_queries() + { + return $this->query_count; + } + + // -------------------------------------------------------------------- + + /** + * Returns the last query that was executed + * + * @access public + * @return void + */ + function last_query() + { + return end($this->queries); + } + + // -------------------------------------------------------------------- + + /** + * "Smart" Escape String + * + * Escapes data based on type + * Sets boolean and null types + * + * @access public + * @param string + * @return integer + */ + function escape($str) + { + switch (gettype($str)) + { + case 'string' : $str = "'".$this->escape_str($str)."'"; + break; + case 'boolean' : $str = ($str === FALSE) ? 0 : 1; + break; + default : $str = ($str === NULL) ? 'NULL' : $str; + break; + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Primary + * + * Retrieves the primary key. It assumes that the row in the first + * position is the primary key + * + * @access public + * @param string the table name + * @return string + */ + function primary($table = '') + { + $fields = $this->list_fields($table); + + if ( ! is_array($fields)) + { + return FALSE; + } + + return current($fields); + } + + // -------------------------------------------------------------------- + + /** + * Returns an array of table names + * + * @access public + * @return array + */ + function list_tables($constrain_by_prefix = FALSE) + { + // Is there a cached result? + if (isset($this->data_cache['table_names'])) + { + return $this->data_cache['table_names']; + } + + if (FALSE === ($sql = $this->_list_tables($constrain_by_prefix))) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + + $retval = array(); + $query = $this->query($sql); + + if ($query->num_rows() > 0) + { + foreach($query->result_array() as $row) + { + if (isset($row['TABLE_NAME'])) + { + $retval[] = $row['TABLE_NAME']; + } + else + { + $retval[] = array_shift($row); + } + } + } + + $this->data_cache['table_names'] = $retval; + return $this->data_cache['table_names']; + } + + // -------------------------------------------------------------------- + + /** + * Determine if a particular table exists + * @access public + * @return boolean + */ + function table_exists($table_name) + { + return ( ! in_array($this->_protect_identifiers($table_name, TRUE, FALSE, FALSE), $this->list_tables())) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Fetch MySQL Field Names + * + * @access public + * @param string the table name + * @return array + */ + function list_fields($table = '') + { + // Is there a cached result? + if (isset($this->data_cache['field_names'][$table])) + { + return $this->data_cache['field_names'][$table]; + } + + if ($table == '') + { + if ($this->db_debug) + { + return $this->display_error('db_field_param_missing'); + } + return FALSE; + } + + if (FALSE === ($sql = $this->_list_columns($this->_protect_identifiers($table, TRUE, NULL, FALSE)))) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + + $query = $this->query($sql); + + $retval = array(); + foreach($query->result_array() as $row) + { + if (isset($row['COLUMN_NAME'])) + { + $retval[] = $row['COLUMN_NAME']; + } + else + { + $retval[] = current($row); + } + } + + $this->data_cache['field_names'][$table] = $retval; + return $this->data_cache['field_names'][$table]; + } + + // -------------------------------------------------------------------- + + /** + * Determine if a particular field exists + * @access public + * @param string + * @param string + * @return boolean + */ + function field_exists($field_name, $table_name) + { + return ( ! in_array($field_name, $this->list_fields($table_name))) ? FALSE : TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Returns an object with field data + * + * @access public + * @param string the table name + * @return object + */ + function field_data($table = '') + { + if ($table == '') + { + if ($this->db_debug) + { + return $this->display_error('db_field_param_missing'); + } + return FALSE; + } + + $query = $this->query($this->_field_data($this->_protect_identifiers($table, TRUE, NULL, FALSE))); + + return $query->field_data(); + } + + // -------------------------------------------------------------------- + + /** + * Generate an insert string + * + * @access public + * @param string the table upon which the query will be performed + * @param array an associative array data of key/values + * @return string + */ + function insert_string($table, $data) + { + $fields = array(); + $values = array(); + + foreach($data as $key => $val) + { + $fields[] = $this->_escape_identifiers($key); + $values[] = $this->escape($val); + } + + return $this->_insert($this->_protect_identifiers($table, TRUE, NULL, FALSE), $fields, $values); + } + + // -------------------------------------------------------------------- + + /** + * Generate an update string + * + * @access public + * @param string the table upon which the query will be performed + * @param array an associative array data of key/values + * @param mixed the "where" statement + * @return string + */ + function update_string($table, $data, $where) + { + if ($where == '') + { + return false; + } + + $fields = array(); + foreach($data as $key => $val) + { + $fields[$this->_protect_identifiers($key)] = $this->escape($val); + } + + if ( ! is_array($where)) + { + $dest = array($where); + } + else + { + $dest = array(); + foreach ($where as $key => $val) + { + $prefix = (count($dest) == 0) ? '' : ' AND '; + + if ($val !== '') + { + if ( ! $this->_has_operator($key)) + { + $key .= ' ='; + } + + $val = ' '.$this->escape($val); + } + + $dest[] = $prefix.$key.$val; + } + } + + return $this->_update($this->_protect_identifiers($table, TRUE, NULL, FALSE), $fields, $dest); + } + + // -------------------------------------------------------------------- + + /** + * Tests whether the string has an SQL operator + * + * @access private + * @param string + * @return bool + */ + function _has_operator($str) + { + $str = trim($str); + if ( ! preg_match("/(\s|<|>|!|=|is null|is not null)/i", $str)) + { + return FALSE; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Enables a native PHP function to be run, using a platform agnostic wrapper. + * + * @access public + * @param string the function name + * @param mixed any parameters needed by the function + * @return mixed + */ + function call_function($function) + { + $driver = ($this->dbdriver == 'postgre') ? 'pg_' : $this->dbdriver.'_'; + + if (FALSE === strpos($driver, $function)) + { + $function = $driver.$function; + } + + if ( ! function_exists($function)) + { + if ($this->db_debug) + { + return $this->display_error('db_unsupported_function'); + } + return FALSE; + } + else + { + $args = (func_num_args() > 1) ? array_splice(func_get_args(), 1) : null; + + return call_user_func_array($function, $args); + } + } + + // -------------------------------------------------------------------- + + /** + * Set Cache Directory Path + * + * @access public + * @param string the path to the cache directory + * @return void + */ + function cache_set_path($path = '') + { + $this->cachedir = $path; + } + + // -------------------------------------------------------------------- + + /** + * Enable Query Caching + * + * @access public + * @return void + */ + function cache_on() + { + $this->cache_on = TRUE; + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Disable Query Caching + * + * @access public + * @return void + */ + function cache_off() + { + $this->cache_on = FALSE; + return FALSE; + } + + + // -------------------------------------------------------------------- + + /** + * Delete the cache files associated with a particular URI + * + * @access public + * @return void + */ + function cache_delete($segment_one = '', $segment_two = '') + { + if ( ! $this->_cache_init()) + { + return FALSE; + } + return $this->CACHE->delete($segment_one, $segment_two); + } + + // -------------------------------------------------------------------- + + /** + * Delete All cache files + * + * @access public + * @return void + */ + function cache_delete_all() + { + if ( ! $this->_cache_init()) + { + return FALSE; + } + + return $this->CACHE->delete_all(); + } + + // -------------------------------------------------------------------- + + /** + * Initialize the Cache Class + * + * @access private + * @return void + */ + function _cache_init() + { + if (is_object($this->CACHE) AND class_exists('CI_DB_Cache')) + { + return TRUE; + } + + if ( ! @include(BASEPATH.'database/DB_cache'.EXT)) + { + return $this->cache_off(); + } + + $this->CACHE = new CI_DB_Cache($this); // pass db object to support multiple db connections and returned db objects + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @return void + */ + function close() + { + if (is_resource($this->conn_id) OR is_object($this->conn_id)) + { + $this->_close($this->conn_id); + } + $this->conn_id = FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Display an error message + * + * @access public + * @param string the error message + * @param string any "swap" values + * @param boolean whether to localize the message + * @return string sends the application/error_db.php template + */ + function display_error($error = '', $swap = '', $native = FALSE) + { + $LANG =& load_class('Language'); + $LANG->load('db'); + + $heading = $LANG->line('db_error_heading'); + + if ($native == TRUE) + { + $message = $error; + } + else + { + $message = ( ! is_array($error)) ? array(str_replace('%s', $swap, $LANG->line($error))) : $error; + } + + $error =& load_class('Exceptions'); + echo $error->show_error($heading, $message, 'error_db'); + exit; + } + + // -------------------------------------------------------------------- + + /** + * Protect Identifiers + * + * This function adds backticks if appropriate based on db type + * + * @access private + * @param mixed the item to escape + * @return mixed the item with backticks + */ + function protect_identifiers($item, $prefix_single = FALSE) + { + return $this->_protect_identifiers($item, $prefix_single); + } + + // -------------------------------------------------------------------- + + /** + * Protect Identifiers + * + * This function is used extensively by the Active Record class, and by + * a couple functions in this class. + * It takes a column or table name (optionally with an alias) and inserts + * the table prefix onto it. Some logic is necessary in order to deal with + * column names that include the path. Consider a query like this: + * + * SELECT * FROM hostname.database.table.column AS c FROM hostname.database.table + * + * Or a query with aliasing: + * + * SELECT m.member_id, m.member_name FROM members AS m + * + * Since the column name can include up to four segments (host, DB, table, column) + * or also have an alias prefix, we need to do a bit of work to figure this out and + * insert the table prefix (if it exists) in the proper position, and escape only + * the correct identifiers. + * + * @access private + * @param string + * @param bool + * @param mixed + * @param bool + * @return string + */ + function _protect_identifiers($item, $prefix_single = FALSE, $protect_identifiers = NULL, $field_exists = TRUE) + { + if ( ! is_bool($protect_identifiers)) + { + $protect_identifiers = $this->_protect_identifiers; + } + + // Convert tabs or multiple spaces into single spaces + $item = preg_replace('/[\t| ]+/', ' ', $item); + + // If the item has an alias declaration we remove it and set it aside. + // Basically we remove everything to the right of the first space + $alias = ''; + if (strpos($item, ' ') !== FALSE) + { + $alias = strstr($item, " "); + $item = substr($item, 0, - strlen($alias)); + } + + // Break the string apart if it contains periods, then insert the table prefix + // in the correct location, assuming the period doesn't indicate that we're dealing + // with an alias. While we're at it, we will escape the components + if (strpos($item, '.') !== FALSE) + { + $parts = explode('.', $item); + + // Does the first segment of the exploded item match + // one of the aliases previously identified? If so, + // we have nothing more to do other than escape the item + if (in_array($parts[0], $this->ar_aliased_tables)) + { + if ($protect_identifiers === TRUE) + { + foreach ($parts as $key => $val) + { + if ( ! in_array($val, $this->_reserved_identifiers)) + { + $parts[$key] = $this->_escape_identifiers($val); + } + } + + $item = implode('.', $parts); + } + return $item.$alias; + } + + // Is there a table prefix defined in the config file? If not, no need to do anything + if ($this->dbprefix != '') + { + // We now add the table prefix based on some logic. + // Do we have 4 segments (hostname.database.table.column)? + // If so, we add the table prefix to the column name in the 3rd segment. + if (isset($parts[3])) + { + $i = 2; + } + // Do we have 3 segments (database.table.column)? + // If so, we add the table prefix to the column name in 2nd position + elseif (isset($parts[2])) + { + $i = 1; + } + // Do we have 2 segments (table.column)? + // If so, we add the table prefix to the column name in 1st segment + else + { + $i = 0; + } + + // This flag is set when the supplied $item does not contain a field name. + // This can happen when this function is being called from a JOIN. + if ($field_exists == FALSE) + { + $i++; + } + + // We only add the table prefix if it does not already exist + if (substr($parts[$i], 0, strlen($this->dbprefix)) != $this->dbprefix) + { + $parts[$i] = $this->dbprefix.$parts[$i]; + } + + // Put the parts back together + $item = implode('.', $parts); + } + + if ($protect_identifiers === TRUE) + { + $item = $this->_escape_identifiers($item); + } + + return $item.$alias; + } + + // This is basically a bug fix for queries that use MAX, MIN, etc. + // If a parenthesis is found we know that we do not need to + // escape the data or add a prefix. There's probably a more graceful + // way to deal with this, but I'm not thinking of it -- Rick + if (strpos($item, '(') !== FALSE) + { + return $item.$alias; + } + + // Is there a table prefix? If not, no need to insert it + if ($this->dbprefix != '') + { + // Do we prefix an item with no segments? + if ($prefix_single == TRUE AND substr($item, 0, strlen($this->dbprefix)) != $this->dbprefix) + { + $item = $this->dbprefix.$item; + } + } + + if ($protect_identifiers === TRUE AND ! in_array($item, $this->_reserved_identifiers)) + { + $item = $this->_escape_identifiers($item); + } + + return $item.$alias; + } + + +} + + +/* End of file DB_driver.php */ /* Location: ./system/database/DB_driver.php */ \ No newline at end of file diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index 20f0a308..f708910f 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -1,355 +1,355 @@ -db - $CI =& get_instance(); - $this->db =& $CI->db; - log_message('debug', "Database Forge Class Initialized"); - } - - // -------------------------------------------------------------------- - - /** - * Create database - * - * @access public - * @param string the database name - * @return bool - */ - function create_database($db_name) - { - $sql = $this->_create_database($db_name); - - if (is_bool($sql)) - { - return $sql; - } - - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access public - * @param string the database name - * @return bool - */ - function drop_database($db_name) - { - $sql = $this->_drop_database($db_name); - - if (is_bool($sql)) - { - return $sql; - } - - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Add Key - * - * @access public - * @param string key - * @param string type - * @return void - */ - function add_key($key = '', $primary = FALSE) - { - if (is_array($key)) - { - foreach($key as $one) - { - $this->add_key($one, $primary); - } - - return; - } - - if ($key == '') - { - show_error('Key information is required for that operation.'); - } - - if ($primary === TRUE) - { - $this->primary_keys[] = $key; - } - else - { - $this->keys[] = $key; - } - } - - // -------------------------------------------------------------------- - - /** - * Add Field - * - * @access public - * @param string collation - * @return void - */ - function add_field($field = '') - { - if ($field == '') - { - show_error('Field information is required.'); - } - - if (is_string($field)) - { - if ($field == 'id') - { - $this->add_field(array( - 'id' => array( - 'type' => 'INT', - 'constraint' => 9, - 'auto_increment' => TRUE - ) - )); - $this->add_key('id', TRUE); - } - else - { - if (strpos($field, ' ') === FALSE) - { - show_error('Field information is required for that operation.'); - } - - $this->fields[] = $field; - } - } - - if (is_array($field)) - { - $this->fields = array_merge($this->fields, $field); - } - - } - - // -------------------------------------------------------------------- - - /** - * Create Table - * - * @access public - * @param string the table name - * @return bool - */ - function create_table($table = '', $if_not_exists = FALSE) - { - if ($table == '') - { - show_error('A table name is required for that operation.'); - } - - if (count($this->fields) == 0) - { - show_error('Field information is required.'); - } - - $sql = $this->_create_table($this->db->dbprefix.$table, $this->fields, $this->primary_keys, $this->keys, $if_not_exists); - - $this->_reset(); - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * @access public - * @param string the table name - * @return bool - */ - function drop_table($table_name) - { - $sql = $this->_drop_table($this->db->dbprefix.$table_name); - - if (is_bool($sql)) - { - return $sql; - } - - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Rename Table - * - * @access public - * @param string the old table name - * @param string the new table name - * @return bool - */ - function rename_table($table_name, $new_table_name) - { - if ($table_name == '' OR $new_table_name == '') - { - show_error('A table name is required for that operation.'); - } - - $sql = $this->_rename_table($table_name, $new_table_name); - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Column Add - * - * @access public - * @param string the table name - * @param string the column name - * @param string the column definition - * @return bool - */ - function add_column($table = '', $field = array(), $after_field = '') - { - if ($table == '') - { - show_error('A table name is required for that operation.'); - } - - // add field info into field array, but we can only do one at a time - // so only grab the first field in the event there are more then one - $this->add_field(array_slice($field, 0, 1)); - - if (count($this->fields) == 0) - { - show_error('Field information is required.'); - } - - $sql = $this->_alter_table('ADD', $this->db->dbprefix.$table, $this->fields, $after_field); - - $this->_reset(); - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Column Drop - * - * @access public - * @param string the table name - * @param string the column name - * @return bool - */ - function drop_column($table = '', $column_name = '') - { - - if ($table == '') - { - show_error('A table name is required for that operation.'); - } - - if ($column_name == '') - { - show_error('A column name is required for that operation.'); - } - - $sql = $this->_alter_table('DROP', $this->db->dbprefix.$table, $column_name); - - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Column Modify - * - * @access public - * @param string the table name - * @param string the column name - * @param string the column definition - * @return bool - */ - function modify_column($table = '', $field = array()) - { - if ($table == '') - { - show_error('A table name is required for that operation.'); - } - - // add field info into field array, but we can only do one at a time - // so only grab the first field in the event there are more then one - $this->add_field(array_slice($field, 0, 1)); - - if (count($this->fields) == 0) - { - show_error('Field information is required.'); - } - - $sql = $this->_alter_table('CHANGE', $this->db->dbprefix.$table, $this->fields); - - $this->_reset(); - return $this->db->query($sql); - } - - // -------------------------------------------------------------------- - - /** - * Reset - * - * Resets table creation vars - * - * @access private - * @return void - */ - function _reset() - { - $this->fields = array(); - $this->keys = array(); - $this->primary_keys = array(); - } - -} - -/* End of file DB_forge.php */ +db + $CI =& get_instance(); + $this->db =& $CI->db; + log_message('debug', "Database Forge Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * Create database + * + * @access public + * @param string the database name + * @return bool + */ + function create_database($db_name) + { + $sql = $this->_create_database($db_name); + + if (is_bool($sql)) + { + return $sql; + } + + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access public + * @param string the database name + * @return bool + */ + function drop_database($db_name) + { + $sql = $this->_drop_database($db_name); + + if (is_bool($sql)) + { + return $sql; + } + + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Add Key + * + * @access public + * @param string key + * @param string type + * @return void + */ + function add_key($key = '', $primary = FALSE) + { + if (is_array($key)) + { + foreach($key as $one) + { + $this->add_key($one, $primary); + } + + return; + } + + if ($key == '') + { + show_error('Key information is required for that operation.'); + } + + if ($primary === TRUE) + { + $this->primary_keys[] = $key; + } + else + { + $this->keys[] = $key; + } + } + + // -------------------------------------------------------------------- + + /** + * Add Field + * + * @access public + * @param string collation + * @return void + */ + function add_field($field = '') + { + if ($field == '') + { + show_error('Field information is required.'); + } + + if (is_string($field)) + { + if ($field == 'id') + { + $this->add_field(array( + 'id' => array( + 'type' => 'INT', + 'constraint' => 9, + 'auto_increment' => TRUE + ) + )); + $this->add_key('id', TRUE); + } + else + { + if (strpos($field, ' ') === FALSE) + { + show_error('Field information is required for that operation.'); + } + + $this->fields[] = $field; + } + } + + if (is_array($field)) + { + $this->fields = array_merge($this->fields, $field); + } + + } + + // -------------------------------------------------------------------- + + /** + * Create Table + * + * @access public + * @param string the table name + * @return bool + */ + function create_table($table = '', $if_not_exists = FALSE) + { + if ($table == '') + { + show_error('A table name is required for that operation.'); + } + + if (count($this->fields) == 0) + { + show_error('Field information is required.'); + } + + $sql = $this->_create_table($this->db->dbprefix.$table, $this->fields, $this->primary_keys, $this->keys, $if_not_exists); + + $this->_reset(); + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * @access public + * @param string the table name + * @return bool + */ + function drop_table($table_name) + { + $sql = $this->_drop_table($this->db->dbprefix.$table_name); + + if (is_bool($sql)) + { + return $sql; + } + + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Rename Table + * + * @access public + * @param string the old table name + * @param string the new table name + * @return bool + */ + function rename_table($table_name, $new_table_name) + { + if ($table_name == '' OR $new_table_name == '') + { + show_error('A table name is required for that operation.'); + } + + $sql = $this->_rename_table($table_name, $new_table_name); + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Column Add + * + * @access public + * @param string the table name + * @param string the column name + * @param string the column definition + * @return bool + */ + function add_column($table = '', $field = array(), $after_field = '') + { + if ($table == '') + { + show_error('A table name is required for that operation.'); + } + + // add field info into field array, but we can only do one at a time + // so only grab the first field in the event there are more then one + $this->add_field(array_slice($field, 0, 1)); + + if (count($this->fields) == 0) + { + show_error('Field information is required.'); + } + + $sql = $this->_alter_table('ADD', $this->db->dbprefix.$table, $this->fields, $after_field); + + $this->_reset(); + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Column Drop + * + * @access public + * @param string the table name + * @param string the column name + * @return bool + */ + function drop_column($table = '', $column_name = '') + { + + if ($table == '') + { + show_error('A table name is required for that operation.'); + } + + if ($column_name == '') + { + show_error('A column name is required for that operation.'); + } + + $sql = $this->_alter_table('DROP', $this->db->dbprefix.$table, $column_name); + + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Column Modify + * + * @access public + * @param string the table name + * @param string the column name + * @param string the column definition + * @return bool + */ + function modify_column($table = '', $field = array()) + { + if ($table == '') + { + show_error('A table name is required for that operation.'); + } + + // add field info into field array, but we can only do one at a time + // so only grab the first field in the event there are more then one + $this->add_field(array_slice($field, 0, 1)); + + if (count($this->fields) == 0) + { + show_error('Field information is required.'); + } + + $sql = $this->_alter_table('CHANGE', $this->db->dbprefix.$table, $this->fields); + + $this->_reset(); + return $this->db->query($sql); + } + + // -------------------------------------------------------------------- + + /** + * Reset + * + * Resets table creation vars + * + * @access private + * @return void + */ + function _reset() + { + $this->fields = array(); + $this->keys = array(); + $this->primary_keys = array(); + } + +} + +/* End of file DB_forge.php */ /* Location: ./system/database/DB_forge.php */ \ No newline at end of file diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 8f55f671..41281418 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -1,342 +1,342 @@ -result_object() : $this->result_array(); - } - - // -------------------------------------------------------------------- - - /** - * Query result. "object" version. - * - * @access public - * @return object - */ - function result_object() - { - if (count($this->result_object) > 0) - { - return $this->result_object; - } - - // In the event that query caching is on the result_id variable - // will return FALSE since there isn't a valid SQL resource so - // we'll simply return an empty array. - if ($this->result_id === FALSE OR $this->num_rows() == 0) - { - return array(); - } - - $this->_data_seek(0); - while ($row = $this->_fetch_object()) - { - $this->result_object[] = $row; - } - - return $this->result_object; - } - - // -------------------------------------------------------------------- - - /** - * Query result. "array" version. - * - * @access public - * @return array - */ - function result_array() - { - if (count($this->result_array) > 0) - { - return $this->result_array; - } - - // In the event that query caching is on the result_id variable - // will return FALSE since there isn't a valid SQL resource so - // we'll simply return an empty array. - if ($this->result_id === FALSE OR $this->num_rows() == 0) - { - return array(); - } - - $this->_data_seek(0); - while ($row = $this->_fetch_assoc()) - { - $this->result_array[] = $row; - } - - return $this->result_array; - } - - // -------------------------------------------------------------------- - - /** - * Query result. Acts as a wrapper function for the following functions. - * - * @access public - * @param string - * @param string can be "object" or "array" - * @return mixed either a result object or array - */ - function row($n = 0, $type = 'object') - { - if ( ! is_numeric($n)) - { - // We cache the row data for subsequent uses - if ( ! is_array($this->row_data)) - { - $this->row_data = $this->row_array(0); - } - - // array_key_exists() instead of isset() to allow for MySQL NULL values - if (array_key_exists($n, $this->row_data)) - { - return $this->row_data[$n]; - } - // reset the $n variable if the result was not achieved - $n = 0; - } - - return ($type == 'object') ? $this->row_object($n) : $this->row_array($n); - } - - // -------------------------------------------------------------------- - - /** - * Assigns an item into a particular column slot - * - * @access public - * @return object - */ - function set_row($key, $value = NULL) - { - // We cache the row data for subsequent uses - if ( ! is_array($this->row_data)) - { - $this->row_data = $this->row_array(0); - } - - if (is_array($key)) - { - foreach ($key as $k => $v) - { - $this->row_data[$k] = $v; - } - - return; - } - - if ($key != '' AND ! is_null($value)) - { - $this->row_data[$key] = $value; - } - } - - // -------------------------------------------------------------------- - - /** - * Returns a single result row - object version - * - * @access public - * @return object - */ - function row_object($n = 0) - { - $result = $this->result_object(); - - if (count($result) == 0) - { - return $result; - } - - if ($n != $this->current_row AND isset($result[$n])) - { - $this->current_row = $n; - } - - return $result[$this->current_row]; - } - - // -------------------------------------------------------------------- - - /** - * Returns a single result row - array version - * - * @access public - * @return array - */ - function row_array($n = 0) - { - $result = $this->result_array(); - - if (count($result) == 0) - { - return $result; - } - - if ($n != $this->current_row AND isset($result[$n])) - { - $this->current_row = $n; - } - - return $result[$this->current_row]; - } - - - // -------------------------------------------------------------------- - - /** - * Returns the "first" row - * - * @access public - * @return object - */ - function first_row($type = 'object') - { - $result = $this->result($type); - - if (count($result) == 0) - { - return $result; - } - return $result[0]; - } - - // -------------------------------------------------------------------- - - /** - * Returns the "last" row - * - * @access public - * @return object - */ - function last_row($type = 'object') - { - $result = $this->result($type); - - if (count($result) == 0) - { - return $result; - } - return $result[count($result) -1]; - } - - // -------------------------------------------------------------------- - - /** - * Returns the "next" row - * - * @access public - * @return object - */ - function next_row($type = 'object') - { - $result = $this->result($type); - - if (count($result) == 0) - { - return $result; - } - - if (isset($result[$this->current_row + 1])) - { - ++$this->current_row; - } - - return $result[$this->current_row]; - } - - // -------------------------------------------------------------------- - - /** - * Returns the "previous" row - * - * @access public - * @return object - */ - function previous_row($type = 'object') - { - $result = $this->result($type); - - if (count($result) == 0) - { - return $result; - } - - if (isset($result[$this->current_row - 1])) - { - --$this->current_row; - } - return $result[$this->current_row]; - } - - // -------------------------------------------------------------------- - - /** - * The following functions are normally overloaded by the identically named - * methods in the platform-specific driver -- except when query caching - * is used. When caching is enabled we do not load the other driver. - * These functions are primarily here to prevent undefined function errors - * when a cached result object is in use. They are not otherwise fully - * operational due to the unavailability of the database resource IDs with - * cached results. - */ - function num_rows() { return $this->num_rows; } - function num_fields() { return 0; } - function list_fields() { return array(); } - function field_data() { return array(); } - function free_result() { return TRUE; } - function _data_seek() { return TRUE; } - function _fetch_assoc() { return array(); } - function _fetch_object() { return array(); } - -} -// END DB_result class - -/* End of file DB_result.php */ +result_object() : $this->result_array(); + } + + // -------------------------------------------------------------------- + + /** + * Query result. "object" version. + * + * @access public + * @return object + */ + function result_object() + { + if (count($this->result_object) > 0) + { + return $this->result_object; + } + + // In the event that query caching is on the result_id variable + // will return FALSE since there isn't a valid SQL resource so + // we'll simply return an empty array. + if ($this->result_id === FALSE OR $this->num_rows() == 0) + { + return array(); + } + + $this->_data_seek(0); + while ($row = $this->_fetch_object()) + { + $this->result_object[] = $row; + } + + return $this->result_object; + } + + // -------------------------------------------------------------------- + + /** + * Query result. "array" version. + * + * @access public + * @return array + */ + function result_array() + { + if (count($this->result_array) > 0) + { + return $this->result_array; + } + + // In the event that query caching is on the result_id variable + // will return FALSE since there isn't a valid SQL resource so + // we'll simply return an empty array. + if ($this->result_id === FALSE OR $this->num_rows() == 0) + { + return array(); + } + + $this->_data_seek(0); + while ($row = $this->_fetch_assoc()) + { + $this->result_array[] = $row; + } + + return $this->result_array; + } + + // -------------------------------------------------------------------- + + /** + * Query result. Acts as a wrapper function for the following functions. + * + * @access public + * @param string + * @param string can be "object" or "array" + * @return mixed either a result object or array + */ + function row($n = 0, $type = 'object') + { + if ( ! is_numeric($n)) + { + // We cache the row data for subsequent uses + if ( ! is_array($this->row_data)) + { + $this->row_data = $this->row_array(0); + } + + // array_key_exists() instead of isset() to allow for MySQL NULL values + if (array_key_exists($n, $this->row_data)) + { + return $this->row_data[$n]; + } + // reset the $n variable if the result was not achieved + $n = 0; + } + + return ($type == 'object') ? $this->row_object($n) : $this->row_array($n); + } + + // -------------------------------------------------------------------- + + /** + * Assigns an item into a particular column slot + * + * @access public + * @return object + */ + function set_row($key, $value = NULL) + { + // We cache the row data for subsequent uses + if ( ! is_array($this->row_data)) + { + $this->row_data = $this->row_array(0); + } + + if (is_array($key)) + { + foreach ($key as $k => $v) + { + $this->row_data[$k] = $v; + } + + return; + } + + if ($key != '' AND ! is_null($value)) + { + $this->row_data[$key] = $value; + } + } + + // -------------------------------------------------------------------- + + /** + * Returns a single result row - object version + * + * @access public + * @return object + */ + function row_object($n = 0) + { + $result = $this->result_object(); + + if (count($result) == 0) + { + return $result; + } + + if ($n != $this->current_row AND isset($result[$n])) + { + $this->current_row = $n; + } + + return $result[$this->current_row]; + } + + // -------------------------------------------------------------------- + + /** + * Returns a single result row - array version + * + * @access public + * @return array + */ + function row_array($n = 0) + { + $result = $this->result_array(); + + if (count($result) == 0) + { + return $result; + } + + if ($n != $this->current_row AND isset($result[$n])) + { + $this->current_row = $n; + } + + return $result[$this->current_row]; + } + + + // -------------------------------------------------------------------- + + /** + * Returns the "first" row + * + * @access public + * @return object + */ + function first_row($type = 'object') + { + $result = $this->result($type); + + if (count($result) == 0) + { + return $result; + } + return $result[0]; + } + + // -------------------------------------------------------------------- + + /** + * Returns the "last" row + * + * @access public + * @return object + */ + function last_row($type = 'object') + { + $result = $this->result($type); + + if (count($result) == 0) + { + return $result; + } + return $result[count($result) -1]; + } + + // -------------------------------------------------------------------- + + /** + * Returns the "next" row + * + * @access public + * @return object + */ + function next_row($type = 'object') + { + $result = $this->result($type); + + if (count($result) == 0) + { + return $result; + } + + if (isset($result[$this->current_row + 1])) + { + ++$this->current_row; + } + + return $result[$this->current_row]; + } + + // -------------------------------------------------------------------- + + /** + * Returns the "previous" row + * + * @access public + * @return object + */ + function previous_row($type = 'object') + { + $result = $this->result($type); + + if (count($result) == 0) + { + return $result; + } + + if (isset($result[$this->current_row - 1])) + { + --$this->current_row; + } + return $result[$this->current_row]; + } + + // -------------------------------------------------------------------- + + /** + * The following functions are normally overloaded by the identically named + * methods in the platform-specific driver -- except when query caching + * is used. When caching is enabled we do not load the other driver. + * These functions are primarily here to prevent undefined function errors + * when a cached result object is in use. They are not otherwise fully + * operational due to the unavailability of the database resource IDs with + * cached results. + */ + function num_rows() { return $this->num_rows; } + function num_fields() { return 0; } + function list_fields() { return array(); } + function field_data() { return array(); } + function free_result() { return TRUE; } + function _data_seek() { return TRUE; } + function _fetch_assoc() { return array(); } + function _fetch_object() { return array(); } + +} +// END DB_result class + +/* End of file DB_result.php */ /* Location: ./system/database/DB_result.php */ \ No newline at end of file diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index a37522d9..195e4c46 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -1,389 +1,389 @@ -db - $CI =& get_instance(); - $this->db =& $CI->db; - - log_message('debug', "Database Utility Class Initialized"); - } - - // -------------------------------------------------------------------- - - /** - * List databases - * - * @access public - * @return bool - */ - function list_databases() - { - // Is there a cached result? - if (isset($this->data_cache['db_names'])) - { - return $this->data_cache['db_names']; - } - - $query = $this->db->query($this->_list_databases()); - $dbs = array(); - if ($query->num_rows() > 0) - { - foreach ($query->result_array() as $row) - { - $dbs[] = current($row); - } - } - - $this->data_cache['db_names'] = $dbs; - return $this->data_cache['db_names']; - } - - // -------------------------------------------------------------------- - - /** - * Optimize Table - * - * @access public - * @param string the table name - * @return bool - */ - function optimize_table($table_name) - { - $sql = $this->_optimize_table($table_name); - - if (is_bool($sql)) - { - show_error('db_must_use_set'); - } - - $query = $this->db->query($sql); - $res = $query->result_array(); - - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - return current($res); - } - - // -------------------------------------------------------------------- - - /** - * Optimize Database - * - * @access public - * @return array - */ - function optimize_database() - { - $result = array(); - foreach ($this->db->list_tables() as $table_name) - { - $sql = $this->_optimize_table($table_name); - - if (is_bool($sql)) - { - return $sql; - } - - $query = $this->db->query($sql); - - // Build the result array... - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - $res = $query->result_array(); - $res = current($res); - $key = str_replace($this->db->database.'.', '', current($res)); - $keys = array_keys($res); - unset($res[$keys[0]]); - - $result[$key] = $res; - } - - return $result; - } - - // -------------------------------------------------------------------- - - /** - * Repair Table - * - * @access public - * @param string the table name - * @return bool - */ - function repair_table($table_name) - { - $sql = $this->_repair_table($table_name); - - if (is_bool($sql)) - { - return $sql; - } - - $query = $this->db->query($sql); - - // Note: Due to a bug in current() that affects some versions - // of PHP we can not pass function call directly into it - $res = $query->result_array(); - return current($res); - } - - // -------------------------------------------------------------------- - - /** - * Generate CSV from a query result object - * - * @access public - * @param object The query result object - * @param string The delimiter - comma by default - * @param string The newline character - \n by default - * @param string The enclosure - double quote by default - * @return string - */ - function csv_from_result($query, $delim = ",", $newline = "\n", $enclosure = '"') - { - if ( ! is_object($query) OR ! method_exists($query, 'field_names')) - { - show_error('You must submit a valid result object'); - } - - $out = ''; - - // First generate the headings from the table column names - foreach ($query->list_fields() as $name) - { - $out .= $enclosure.str_replace($enclosure, $enclosure.$enclosure, $name).$enclosure.$delim; - } - - $out = rtrim($out); - $out .= $newline; - - // Next blast through the result array and build out the rows - foreach ($query->result_array() as $row) - { - foreach ($row as $item) - { - $out .= $enclosure.str_replace($enclosure, $enclosure.$enclosure, $item).$enclosure.$delim; - } - $out = rtrim($out); - $out .= $newline; - } - - return $out; - } - - // -------------------------------------------------------------------- - - /** - * Generate XML data from a query result object - * - * @access public - * @param object The query result object - * @param array Any preferences - * @return string - */ - function xml_from_result($query, $params = array()) - { - if ( ! is_object($query) OR ! method_exists($query, 'field_names')) - { - show_error('You must submit a valid result object'); - } - - // Set our default values - foreach (array('root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t") as $key => $val) - { - if ( ! isset($params[$key])) - { - $params[$key] = $val; - } - } - - // Create variables for convenience - extract($params); - - // Load the xml helper - $CI =& get_instance(); - $CI->load->helper('xml'); - - // Generate the result - $xml = "<{$root}>".$newline; - foreach ($query->result_array() as $row) - { - $xml .= $tab."<{$element}>".$newline; - - foreach ($row as $key => $val) - { - $xml .= $tab.$tab."<{$key}>".xml_convert($val)."".$newline; - } - $xml .= $tab."".$newline; - } - $xml .= "".$newline; - - return $xml; - } - - // -------------------------------------------------------------------- - - /** - * Database Backup - * - * @access public - * @return void - */ - function backup($params = array()) - { - // If the parameters have not been submitted as an - // array then we know that it is simply the table - // name, which is a valid short cut. - if (is_string($params)) - { - $params = array('tables' => $params); - } - - // ------------------------------------------------------ - - // Set up our default preferences - $prefs = array( - 'tables' => array(), - 'ignore' => array(), - 'filename' => '', - 'format' => 'gzip', // gzip, zip, txt - 'add_drop' => TRUE, - 'add_insert' => TRUE, - 'newline' => "\n" - ); - - // Did the user submit any preferences? If so set them.... - if (count($params) > 0) - { - foreach ($prefs as $key => $val) - { - if (isset($params[$key])) - { - $prefs[$key] = $params[$key]; - } - } - } - - // ------------------------------------------------------ - - // Are we backing up a complete database or individual tables? - // If no table names were submitted we'll fetch the entire table list - if (count($prefs['tables']) == 0) - { - $prefs['tables'] = $this->db->list_tables(); - } - - // ------------------------------------------------------ - - // Validate the format - if ( ! in_array($prefs['format'], array('gzip', 'zip', 'txt'), TRUE)) - { - $prefs['format'] = 'txt'; - } - - // ------------------------------------------------------ - - // Is the encoder supported? If not, we'll either issue an - // error or use plain text depending on the debug settings - if (($prefs['format'] == 'gzip' AND ! @function_exists('gzencode')) - OR ($prefs['format'] == 'zip' AND ! @function_exists('gzcompress'))) - { - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_compression'); - } - - $prefs['format'] = 'txt'; - } - - // ------------------------------------------------------ - - // Set the filename if not provided - Only needed with Zip files - if ($prefs['filename'] == '' AND $prefs['format'] == 'zip') - { - $prefs['filename'] = (count($prefs['tables']) == 1) ? $prefs['tables'] : $this->db->database; - $prefs['filename'] .= '_'.date('Y-m-d_H-i', time()); - } - - // ------------------------------------------------------ - - // Was a Gzip file requested? - if ($prefs['format'] == 'gzip') - { - return gzencode($this->_backup($prefs)); - } - - // ------------------------------------------------------ - - // Was a text file requested? - if ($prefs['format'] == 'txt') - { - return $this->_backup($prefs); - } - - // ------------------------------------------------------ - - // Was a Zip file requested? - if ($prefs['format'] == 'zip') - { - // If they included the .zip file extension we'll remove it - if (preg_match("|.+?\.zip$|", $prefs['filename'])) - { - $prefs['filename'] = str_replace('.zip', '', $prefs['filename']); - } - - // Tack on the ".sql" file extension if needed - if ( ! preg_match("|.+?\.sql$|", $prefs['filename'])) - { - $prefs['filename'] .= '.sql'; - } - - // Load the Zip class and output it - - $CI =& get_instance(); - $CI->load->library('zip'); - $CI->zip->add_data($prefs['filename'], $this->_backup($prefs)); - return $CI->zip->get_zip(); - } - - } - -} - - -/* End of file DB_utility.php */ +db + $CI =& get_instance(); + $this->db =& $CI->db; + + log_message('debug', "Database Utility Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * List databases + * + * @access public + * @return bool + */ + function list_databases() + { + // Is there a cached result? + if (isset($this->data_cache['db_names'])) + { + return $this->data_cache['db_names']; + } + + $query = $this->db->query($this->_list_databases()); + $dbs = array(); + if ($query->num_rows() > 0) + { + foreach ($query->result_array() as $row) + { + $dbs[] = current($row); + } + } + + $this->data_cache['db_names'] = $dbs; + return $this->data_cache['db_names']; + } + + // -------------------------------------------------------------------- + + /** + * Optimize Table + * + * @access public + * @param string the table name + * @return bool + */ + function optimize_table($table_name) + { + $sql = $this->_optimize_table($table_name); + + if (is_bool($sql)) + { + show_error('db_must_use_set'); + } + + $query = $this->db->query($sql); + $res = $query->result_array(); + + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + return current($res); + } + + // -------------------------------------------------------------------- + + /** + * Optimize Database + * + * @access public + * @return array + */ + function optimize_database() + { + $result = array(); + foreach ($this->db->list_tables() as $table_name) + { + $sql = $this->_optimize_table($table_name); + + if (is_bool($sql)) + { + return $sql; + } + + $query = $this->db->query($sql); + + // Build the result array... + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + $res = $query->result_array(); + $res = current($res); + $key = str_replace($this->db->database.'.', '', current($res)); + $keys = array_keys($res); + unset($res[$keys[0]]); + + $result[$key] = $res; + } + + return $result; + } + + // -------------------------------------------------------------------- + + /** + * Repair Table + * + * @access public + * @param string the table name + * @return bool + */ + function repair_table($table_name) + { + $sql = $this->_repair_table($table_name); + + if (is_bool($sql)) + { + return $sql; + } + + $query = $this->db->query($sql); + + // Note: Due to a bug in current() that affects some versions + // of PHP we can not pass function call directly into it + $res = $query->result_array(); + return current($res); + } + + // -------------------------------------------------------------------- + + /** + * Generate CSV from a query result object + * + * @access public + * @param object The query result object + * @param string The delimiter - comma by default + * @param string The newline character - \n by default + * @param string The enclosure - double quote by default + * @return string + */ + function csv_from_result($query, $delim = ",", $newline = "\n", $enclosure = '"') + { + if ( ! is_object($query) OR ! method_exists($query, 'field_names')) + { + show_error('You must submit a valid result object'); + } + + $out = ''; + + // First generate the headings from the table column names + foreach ($query->list_fields() as $name) + { + $out .= $enclosure.str_replace($enclosure, $enclosure.$enclosure, $name).$enclosure.$delim; + } + + $out = rtrim($out); + $out .= $newline; + + // Next blast through the result array and build out the rows + foreach ($query->result_array() as $row) + { + foreach ($row as $item) + { + $out .= $enclosure.str_replace($enclosure, $enclosure.$enclosure, $item).$enclosure.$delim; + } + $out = rtrim($out); + $out .= $newline; + } + + return $out; + } + + // -------------------------------------------------------------------- + + /** + * Generate XML data from a query result object + * + * @access public + * @param object The query result object + * @param array Any preferences + * @return string + */ + function xml_from_result($query, $params = array()) + { + if ( ! is_object($query) OR ! method_exists($query, 'field_names')) + { + show_error('You must submit a valid result object'); + } + + // Set our default values + foreach (array('root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t") as $key => $val) + { + if ( ! isset($params[$key])) + { + $params[$key] = $val; + } + } + + // Create variables for convenience + extract($params); + + // Load the xml helper + $CI =& get_instance(); + $CI->load->helper('xml'); + + // Generate the result + $xml = "<{$root}>".$newline; + foreach ($query->result_array() as $row) + { + $xml .= $tab."<{$element}>".$newline; + + foreach ($row as $key => $val) + { + $xml .= $tab.$tab."<{$key}>".xml_convert($val)."".$newline; + } + $xml .= $tab."".$newline; + } + $xml .= "".$newline; + + return $xml; + } + + // -------------------------------------------------------------------- + + /** + * Database Backup + * + * @access public + * @return void + */ + function backup($params = array()) + { + // If the parameters have not been submitted as an + // array then we know that it is simply the table + // name, which is a valid short cut. + if (is_string($params)) + { + $params = array('tables' => $params); + } + + // ------------------------------------------------------ + + // Set up our default preferences + $prefs = array( + 'tables' => array(), + 'ignore' => array(), + 'filename' => '', + 'format' => 'gzip', // gzip, zip, txt + 'add_drop' => TRUE, + 'add_insert' => TRUE, + 'newline' => "\n" + ); + + // Did the user submit any preferences? If so set them.... + if (count($params) > 0) + { + foreach ($prefs as $key => $val) + { + if (isset($params[$key])) + { + $prefs[$key] = $params[$key]; + } + } + } + + // ------------------------------------------------------ + + // Are we backing up a complete database or individual tables? + // If no table names were submitted we'll fetch the entire table list + if (count($prefs['tables']) == 0) + { + $prefs['tables'] = $this->db->list_tables(); + } + + // ------------------------------------------------------ + + // Validate the format + if ( ! in_array($prefs['format'], array('gzip', 'zip', 'txt'), TRUE)) + { + $prefs['format'] = 'txt'; + } + + // ------------------------------------------------------ + + // Is the encoder supported? If not, we'll either issue an + // error or use plain text depending on the debug settings + if (($prefs['format'] == 'gzip' AND ! @function_exists('gzencode')) + OR ($prefs['format'] == 'zip' AND ! @function_exists('gzcompress'))) + { + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_compression'); + } + + $prefs['format'] = 'txt'; + } + + // ------------------------------------------------------ + + // Set the filename if not provided - Only needed with Zip files + if ($prefs['filename'] == '' AND $prefs['format'] == 'zip') + { + $prefs['filename'] = (count($prefs['tables']) == 1) ? $prefs['tables'] : $this->db->database; + $prefs['filename'] .= '_'.date('Y-m-d_H-i', time()); + } + + // ------------------------------------------------------ + + // Was a Gzip file requested? + if ($prefs['format'] == 'gzip') + { + return gzencode($this->_backup($prefs)); + } + + // ------------------------------------------------------ + + // Was a text file requested? + if ($prefs['format'] == 'txt') + { + return $this->_backup($prefs); + } + + // ------------------------------------------------------ + + // Was a Zip file requested? + if ($prefs['format'] == 'zip') + { + // If they included the .zip file extension we'll remove it + if (preg_match("|.+?\.zip$|", $prefs['filename'])) + { + $prefs['filename'] = str_replace('.zip', '', $prefs['filename']); + } + + // Tack on the ".sql" file extension if needed + if ( ! preg_match("|.+?\.sql$|", $prefs['filename'])) + { + $prefs['filename'] .= '.sql'; + } + + // Load the Zip class and output it + + $CI =& get_instance(); + $CI->load->library('zip'); + $CI->zip->add_data($prefs['filename'], $this->_backup($prefs)); + return $CI->zip->get_zip(); + } + + } + +} + + +/* End of file DB_utility.php */ /* Location: ./system/database/DB_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/index.html b/system/database/drivers/index.html index 065d2da5..c942a79c 100644 --- a/system/database/drivers/index.html +++ b/system/database/drivers/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/database/drivers/mssql/index.html b/system/database/drivers/mssql/index.html index 065d2da5..c942a79c 100644 --- a/system/database/drivers/mssql/index.html +++ b/system/database/drivers/mssql/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 6ad0880f..78f81daf 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -1,622 +1,622 @@ -port != '') - { - $this->hostname .= ','.$this->port; - } - - return @mssql_connect($this->hostname, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - if ($this->port != '') - { - $this->hostname .= ','.$this->port; - } - - return @mssql_pconnect($this->hostname, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - // Note: The brackets are required in the event that the DB name - // contains reserved characters - return @mssql_select_db('['.$this->database.']', $this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Set client character set - * - * @access public - * @param string - * @param string - * @return resource - */ - function db_set_charset($charset, $collation) - { - // @todo - add support if needed - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - return @mssql_query($sql, $this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - $this->simple_query('BEGIN TRAN'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('COMMIT TRAN'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('ROLLBACK TRAN'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - // Access the CI object - $CI =& get_instance(); - - // Escape single quotes - return str_replace("'", "''", $CI->input->_remove_invisible_characters($str)); - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @mssql_rows_affected($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * Returns the last id created in the Identity column. - * - * @access public - * @return integer - */ - function insert_id() - { - $ver = self::_parse_major_version($this->version()); - $sql = ($ver >= 8 ? "SELECT SCOPE_IDENTITY() AS last_id" : "SELECT @@IDENTITY AS last_id"); - $query = $this->query($sql); - $row = $query->row(); - return $row->last_id; - } - - // -------------------------------------------------------------------- - - /** - * Parse major version - * - * Grabs the major version number from the - * database server version string passed in. - * - * @access private - * @param string $version - * @return int16 major version number - */ - function _parse_major_version($version) - { - preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $version, $ver_info); - return $ver_info[1]; // return the major version b/c that's all we're interested in. - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT @@VERSION AS ver"; - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * List table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @param boolean - * @return string - */ - function _list_tables($prefix_limit = FALSE) - { - $sql = "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name"; - - // for future compatibility - if ($prefix_limit !== FALSE AND $this->dbprefix != '') - { - //$sql .= " LIKE '".$this->dbprefix."%'"; - return FALSE; // not currently supported - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * List column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access private - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SELECT * FROM INFORMATION_SCHEMA.Columns WHERE TABLE_NAME = '".$table."'"; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT TOP 1 * FROM ".$table; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - // Are errros even supported in MS SQL? - return ''; - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - // Are error numbers supported? - return ''; - } - - // -------------------------------------------------------------------- - - /** - * Escape the SQL Identifiers - * - * This function escapes column and table names - * - * @access private - * @param string - * @return string - */ - function _escape_identifiers($item) - { - if ($this->_escape_char == '') - { - return $item; - } - - foreach ($this->_reserved_identifiers as $id) - { - if (strpos($item, '.'.$id) !== FALSE) - { - $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - } - - if (strpos($item, '.') !== FALSE) - { - $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; - } - else - { - $str = $this->_escape_char.$item.$this->_escape_char; - } - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - - // -------------------------------------------------------------------- - - /** - * From Tables - * - * This function implicitly groups FROM tables so there is no confusion - * about operator precedence in harmony with SQL standards - * - * @access public - * @param type - * @return type - */ - function _from_tables($tables) - { - if ( ! is_array($tables)) - { - $tables = array($tables); - } - - return implode(', ', $tables); - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @param array the orderby clause - * @param array the limit clause - * @return string - */ - function _update($table, $values, $where, $orderby = array(), $limit = FALSE) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; - - $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); - - $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; - - $sql .= $orderby.$limit; - - return $sql; - } - - - // -------------------------------------------------------------------- - - /** - * Truncate statement - * - * Generates a platform-specific truncate string from the supplied data - * If the database does not support the truncate() command - * This function maps to "DELETE FROM table" - * - * @access public - * @param string the table name - * @return string - */ - function _truncate($table) - { - return "TRUNCATE ".$table; - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @param string the limit clause - * @return string - */ - function _delete($table, $where = array(), $like = array(), $limit = FALSE) - { - $conditions = ''; - - if (count($where) > 0 OR count($like) > 0) - { - $conditions = "\nWHERE "; - $conditions .= implode("\n", $this->ar_where); - - if (count($where) > 0 && count($like) > 0) - { - $conditions .= " AND "; - } - $conditions .= implode("\n", $like); - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - return "DELETE FROM ".$table.$conditions.$limit; - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - $i = $limit + $offset; - - return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$i.' ', $sql); - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @mssql_close($conn_id); - } - -} - - - -/* End of file mssql_driver.php */ +port != '') + { + $this->hostname .= ','.$this->port; + } + + return @mssql_connect($this->hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + if ($this->port != '') + { + $this->hostname .= ','.$this->port; + } + + return @mssql_pconnect($this->hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + // Note: The brackets are required in the event that the DB name + // contains reserved characters + return @mssql_select_db('['.$this->database.']', $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Set client character set + * + * @access public + * @param string + * @param string + * @return resource + */ + function db_set_charset($charset, $collation) + { + // @todo - add support if needed + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @mssql_query($sql, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + $this->simple_query('BEGIN TRAN'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('COMMIT TRAN'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('ROLLBACK TRAN'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + // Access the CI object + $CI =& get_instance(); + + // Escape single quotes + return str_replace("'", "''", $CI->input->_remove_invisible_characters($str)); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @mssql_rows_affected($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * Returns the last id created in the Identity column. + * + * @access public + * @return integer + */ + function insert_id() + { + $ver = self::_parse_major_version($this->version()); + $sql = ($ver >= 8 ? "SELECT SCOPE_IDENTITY() AS last_id" : "SELECT @@IDENTITY AS last_id"); + $query = $this->query($sql); + $row = $query->row(); + return $row->last_id; + } + + // -------------------------------------------------------------------- + + /** + * Parse major version + * + * Grabs the major version number from the + * database server version string passed in. + * + * @access private + * @param string $version + * @return int16 major version number + */ + function _parse_major_version($version) + { + preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $version, $ver_info); + return $ver_info[1]; // return the major version b/c that's all we're interested in. + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT @@VERSION AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * List table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @param boolean + * @return string + */ + function _list_tables($prefix_limit = FALSE) + { + $sql = "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name"; + + // for future compatibility + if ($prefix_limit !== FALSE AND $this->dbprefix != '') + { + //$sql .= " LIKE '".$this->dbprefix."%'"; + return FALSE; // not currently supported + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * List column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access private + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SELECT * FROM INFORMATION_SCHEMA.Columns WHERE TABLE_NAME = '".$table."'"; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT TOP 1 * FROM ".$table; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + // Are errros even supported in MS SQL? + return ''; + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + // Are error numbers supported? + return ''; + } + + // -------------------------------------------------------------------- + + /** + * Escape the SQL Identifiers + * + * This function escapes column and table names + * + * @access private + * @param string + * @return string + */ + function _escape_identifiers($item) + { + if ($this->_escape_char == '') + { + return $item; + } + + foreach ($this->_reserved_identifiers as $id) + { + if (strpos($item, '.'.$id) !== FALSE) + { + $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + } + + if (strpos($item, '.') !== FALSE) + { + $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; + } + else + { + $str = $this->_escape_char.$item.$this->_escape_char; + } + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + + // -------------------------------------------------------------------- + + /** + * From Tables + * + * This function implicitly groups FROM tables so there is no confusion + * about operator precedence in harmony with SQL standards + * + * @access public + * @param type + * @return type + */ + function _from_tables($tables) + { + if ( ! is_array($tables)) + { + $tables = array($tables); + } + + return implode(', ', $tables); + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @param array the orderby clause + * @param array the limit clause + * @return string + */ + function _update($table, $values, $where, $orderby = array(), $limit = FALSE) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; + + $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); + + $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; + + $sql .= $orderby.$limit; + + return $sql; + } + + + // -------------------------------------------------------------------- + + /** + * Truncate statement + * + * Generates a platform-specific truncate string from the supplied data + * If the database does not support the truncate() command + * This function maps to "DELETE FROM table" + * + * @access public + * @param string the table name + * @return string + */ + function _truncate($table) + { + return "TRUNCATE ".$table; + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @param string the limit clause + * @return string + */ + function _delete($table, $where = array(), $like = array(), $limit = FALSE) + { + $conditions = ''; + + if (count($where) > 0 OR count($like) > 0) + { + $conditions = "\nWHERE "; + $conditions .= implode("\n", $this->ar_where); + + if (count($where) > 0 && count($like) > 0) + { + $conditions .= " AND "; + } + $conditions .= implode("\n", $like); + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$table.$conditions.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $i = $limit + $offset; + + return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$i.' ', $sql); + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @mssql_close($conn_id); + } + +} + + + +/* End of file mssql_driver.php */ /* Location: ./system/database/drivers/mssql/mssql_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php index 8665dc05..512fc47d 100644 --- a/system/database/drivers/mssql/mssql_forge.php +++ b/system/database/drivers/mssql/mssql_forge.php @@ -1,248 +1,248 @@ -db->_escape_identifiers($table); - } - - // -------------------------------------------------------------------- - - /** - * Create Table - * - * @access private - * @param string the table name - * @param array the fields - * @param mixed primary key(s) - * @param mixed key(s) - * @param boolean should 'IF NOT EXISTS' be added to the SQL - * @return bool - */ - function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) - { - $sql = 'CREATE TABLE '; - - if ($if_not_exists === TRUE) - { - $sql .= 'IF NOT EXISTS '; - } - - $sql .= $this->db->_escape_identifiers($table)." ("; - $current_field_count = 0; - - foreach ($fields as $field=>$attributes) - { - // Numeric field names aren't allowed in databases, so if the key is - // numeric, we know it was assigned by PHP and the developer manually - // entered the field information, so we'll simply add it to the list - if (is_numeric($field)) - { - $sql .= "\n\t$attributes"; - } - else - { - $attributes = array_change_key_case($attributes, CASE_UPPER); - - $sql .= "\n\t".$this->db->_protect_identifiers($field); - - $sql .= ' '.$attributes['TYPE']; - - if (array_key_exists('CONSTRAINT', $attributes)) - { - $sql .= '('.$attributes['CONSTRAINT'].')'; - } - - if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) - { - $sql .= ' UNSIGNED'; - } - - if (array_key_exists('DEFAULT', $attributes)) - { - $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; - } - - if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) - { - $sql .= ' NULL'; - } - else - { - $sql .= ' NOT NULL'; - } - - if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) - { - $sql .= ' AUTO_INCREMENT'; - } - } - - // don't add a comma on the end of the last field - if (++$current_field_count < count($fields)) - { - $sql .= ','; - } - } - - if (count($primary_keys) > 0) - { - $primary_keys = $this->db->_protect_identifiers($primary_keys); - $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; - } - - if (is_array($keys) && count($keys) > 0) - { - foreach ($keys as $key) - { - if (is_array($key)) - { - $key = $this->db->_protect_identifiers($key); - } - else - { - $key = array($this->db->_protect_identifiers($key)); - } - - $sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")"; - } - } - - $sql .= "\n)"; - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Alter table query - * - * Generates a platform-specific query so that a table can be altered - * Called by add_column(), drop_column(), and column_alter(), - * - * @access private - * @param string the ALTER type (ADD, DROP, CHANGE) - * @param string the column name - * @param string the table name - * @param string the column definition - * @param string the default value - * @param boolean should 'NOT NULL' be added - * @param string the field after which we should add the new field - * @return object - */ - function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name); - - // DROP has everything it needs now. - if ($alter_type == 'DROP') - { - return $sql; - } - - $sql .= " $column_definition"; - - if ($default_value != '') - { - $sql .= " DEFAULT \"$default_value\""; - } - - if ($null === NULL) - { - $sql .= ' NULL'; - } - else - { - $sql .= ' NOT NULL'; - } - - if ($after_field != '') - { - $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); - } - - return $sql; - - } - - // -------------------------------------------------------------------- - - /** - * Rename a table - * - * Generates a platform-specific query so that a table can be renamed - * - * @access private - * @param string the old table name - * @param string the new table name - * @return string - */ - function _rename_table($table_name, $new_table_name) - { - // I think this syntax will work, but can find little documentation on renaming tables in MSSQL - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); - return $sql; - } - -} - -/* End of file mssql_forge.php */ +db->_escape_identifiers($table); + } + + // -------------------------------------------------------------------- + + /** + * Create Table + * + * @access private + * @param string the table name + * @param array the fields + * @param mixed primary key(s) + * @param mixed key(s) + * @param boolean should 'IF NOT EXISTS' be added to the SQL + * @return bool + */ + function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) + { + $sql = 'CREATE TABLE '; + + if ($if_not_exists === TRUE) + { + $sql .= 'IF NOT EXISTS '; + } + + $sql .= $this->db->_escape_identifiers($table)." ("; + $current_field_count = 0; + + foreach ($fields as $field=>$attributes) + { + // Numeric field names aren't allowed in databases, so if the key is + // numeric, we know it was assigned by PHP and the developer manually + // entered the field information, so we'll simply add it to the list + if (is_numeric($field)) + { + $sql .= "\n\t$attributes"; + } + else + { + $attributes = array_change_key_case($attributes, CASE_UPPER); + + $sql .= "\n\t".$this->db->_protect_identifiers($field); + + $sql .= ' '.$attributes['TYPE']; + + if (array_key_exists('CONSTRAINT', $attributes)) + { + $sql .= '('.$attributes['CONSTRAINT'].')'; + } + + if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) + { + $sql .= ' UNSIGNED'; + } + + if (array_key_exists('DEFAULT', $attributes)) + { + $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; + } + + if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) + { + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; + } + + if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) + { + $sql .= ' AUTO_INCREMENT'; + } + } + + // don't add a comma on the end of the last field + if (++$current_field_count < count($fields)) + { + $sql .= ','; + } + } + + if (count($primary_keys) > 0) + { + $primary_keys = $this->db->_protect_identifiers($primary_keys); + $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; + } + + if (is_array($keys) && count($keys) > 0) + { + foreach ($keys as $key) + { + if (is_array($key)) + { + $key = $this->db->_protect_identifiers($key); + } + else + { + $key = array($this->db->_protect_identifiers($key)); + } + + $sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")"; + } + } + + $sql .= "\n)"; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Alter table query + * + * Generates a platform-specific query so that a table can be altered + * Called by add_column(), drop_column(), and column_alter(), + * + * @access private + * @param string the ALTER type (ADD, DROP, CHANGE) + * @param string the column name + * @param string the table name + * @param string the column definition + * @param string the default value + * @param boolean should 'NOT NULL' be added + * @param string the field after which we should add the new field + * @return object + */ + function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name); + + // DROP has everything it needs now. + if ($alter_type == 'DROP') + { + return $sql; + } + + $sql .= " $column_definition"; + + if ($default_value != '') + { + $sql .= " DEFAULT \"$default_value\""; + } + + if ($null === NULL) + { + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; + } + + if ($after_field != '') + { + $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); + } + + return $sql; + + } + + // -------------------------------------------------------------------- + + /** + * Rename a table + * + * Generates a platform-specific query so that a table can be renamed + * + * @access private + * @param string the old table name + * @param string the new table name + * @return string + */ + function _rename_table($table_name, $new_table_name) + { + // I think this syntax will work, but can find little documentation on renaming tables in MSSQL + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); + return $sql; + } + +} + +/* End of file mssql_forge.php */ /* Location: ./system/database/drivers/mssql/mssql_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php index 33fdda9d..e9679cb1 100644 --- a/system/database/drivers/mssql/mssql_result.php +++ b/system/database/drivers/mssql/mssql_result.php @@ -1,169 +1,169 @@ -result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @mssql_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - while ($field = mssql_fetch_field($this->result_id)) - { - $field_names[] = $field->name; - } - - return $field_names; - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - while ($field = mssql_fetch_field($this->result_id)) - { - $F = new stdClass(); - $F->name = $field->name; - $F->type = $field->type; - $F->max_length = $field->max_length; - $F->primary_key = 0; - $F->default = ''; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - mssql_free_result($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return mssql_data_seek($this->result_id, $n); - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - return mssql_fetch_assoc($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - return mssql_fetch_object($this->result_id); - } - -} - - -/* End of file mssql_result.php */ +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @mssql_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + while ($field = mssql_fetch_field($this->result_id)) + { + $field_names[] = $field->name; + } + + return $field_names; + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + while ($field = mssql_fetch_field($this->result_id)) + { + $F = new stdClass(); + $F->name = $field->name; + $F->type = $field->type; + $F->max_length = $field->max_length; + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + mssql_free_result($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return mssql_data_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return mssql_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return mssql_fetch_object($this->result_id); + } + +} + + +/* End of file mssql_result.php */ /* Location: ./system/database/drivers/mssql/mssql_result.php */ \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php index 1736fbaf..38118acc 100644 --- a/system/database/drivers/mssql/mssql_utility.php +++ b/system/database/drivers/mssql/mssql_utility.php @@ -1,123 +1,123 @@ -db->display_error('db_unsuported_feature'); - } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access private - * @param string the database name - * @return bool - */ - function _create_database($name) - { - return "CREATE DATABASE ".$name; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - return "DROP DATABASE ".$name; - } - -} - - -/* End of file mssql_utility.php */ +db->display_error('db_unsuported_feature'); + } + + /** + * + * The functions below have been deprecated as of 1.6, and are only here for backwards + * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation + * is STRONGLY discouraged in favour if using dbforge. + * + */ + + /** + * Create database + * + * @access private + * @param string the database name + * @return bool + */ + function _create_database($name) + { + return "CREATE DATABASE ".$name; + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access private + * @param string the database name + * @return bool + */ + function _drop_database($name) + { + return "DROP DATABASE ".$name; + } + +} + + +/* End of file mssql_utility.php */ /* Location: ./system/database/drivers/mssql/mssql_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/mysql/index.html b/system/database/drivers/mysql/index.html index 065d2da5..c942a79c 100644 --- a/system/database/drivers/mysql/index.html +++ b/system/database/drivers/mysql/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 45bf7714..943b3c03 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -1,634 +1,634 @@ -port != '') - { - $this->hostname .= ':'.$this->port; - } - - return @mysql_connect($this->hostname, $this->username, $this->password, TRUE); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - if ($this->port != '') - { - $this->hostname .= ':'.$this->port; - } - - return @mysql_pconnect($this->hostname, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - return @mysql_select_db($this->database, $this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Set client character set - * - * @access public - * @param string - * @param string - * @return resource - */ - function db_set_charset($charset, $collation) - { - return @mysql_query("SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'", $this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT version() AS ver"; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - return @mysql_query($sql, $this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - // "DELETE FROM TABLE" returns 0 affected rows This hack modifies - // the query so that it returns the number of affected rows - if ($this->delete_hack === TRUE) - { - if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) - { - $sql = preg_replace("/^\s*DELETE\s+FROM\s+(\S+)\s*$/", "DELETE FROM \\1 WHERE 1=1", $sql); - } - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - $this->simple_query('SET AUTOCOMMIT=0'); - $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('COMMIT'); - $this->simple_query('SET AUTOCOMMIT=1'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('ROLLBACK'); - $this->simple_query('SET AUTOCOMMIT=1'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - if (is_array($str)) - { - foreach($str as $key => $val) - { - $str[$key] = $this->escape_str($val); - } - - return $str; - } - - if (function_exists('mysql_real_escape_string') AND is_resource($this->conn_id)) - { - return mysql_real_escape_string($str, $this->conn_id); - } - elseif (function_exists('mysql_escape_string')) - { - return mysql_escape_string($str); - } - else - { - return addslashes($str); - } - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @mysql_affected_rows($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - return @mysql_insert_id($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return (int)$row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * List table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @param boolean - * @return string - */ - function _list_tables($prefix_limit = FALSE) - { - $sql = "SHOW TABLES FROM ".$this->_escape_char.$this->database.$this->_escape_char; - - if ($prefix_limit !== FALSE AND $this->dbprefix != '') - { - $sql .= " LIKE '".$this->dbprefix."%'"; - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SHOW COLUMNS FROM ".$table; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT * FROM ".$table." LIMIT 1"; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - return mysql_error($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - return mysql_errno($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Escape the SQL Identifiers - * - * This function escapes column and table names - * - * @access private - * @param string - * @return string - */ - function _escape_identifiers($item) - { - if ($this->_escape_char == '') - { - return $item; - } - - foreach ($this->_reserved_identifiers as $id) - { - if (strpos($item, '.'.$id) !== FALSE) - { - $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - } - - if (strpos($item, '.') !== FALSE) - { - $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; - } - else - { - $str = $this->_escape_char.$item.$this->_escape_char; - } - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - - // -------------------------------------------------------------------- - - /** - * From Tables - * - * This function implicitly groups FROM tables so there is no confusion - * about operator precedence in harmony with SQL standards - * - * @access public - * @param type - * @return type - */ - function _from_tables($tables) - { - if ( ! is_array($tables)) - { - $tables = array($tables); - } - - return '('.implode(', ', $tables).')'; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @param array the orderby clause - * @param array the limit clause - * @return string - */ - function _update($table, $values, $where, $orderby = array(), $limit = FALSE) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; - - $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); - - $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; - - $sql .= $orderby.$limit; - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Truncate statement - * - * Generates a platform-specific truncate string from the supplied data - * If the database does not support the truncate() command - * This function maps to "DELETE FROM table" - * - * @access public - * @param string the table name - * @return string - */ - function _truncate($table) - { - return "TRUNCATE ".$table; - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @param string the limit clause - * @return string - */ - function _delete($table, $where = array(), $like = array(), $limit = FALSE) - { - $conditions = ''; - - if (count($where) > 0 OR count($like) > 0) - { - $conditions = "\nWHERE "; - $conditions .= implode("\n", $this->ar_where); - - if (count($where) > 0 && count($like) > 0) - { - $conditions .= " AND "; - } - $conditions .= implode("\n", $like); - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - return "DELETE FROM ".$table.$conditions.$limit; - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - if ($offset == 0) - { - $offset = ''; - } - else - { - $offset .= ", "; - } - - return $sql."LIMIT ".$offset.$limit; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @mysql_close($conn_id); - } - -} - - -/* End of file mysql_driver.php */ +port != '') + { + $this->hostname .= ':'.$this->port; + } + + return @mysql_connect($this->hostname, $this->username, $this->password, TRUE); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + if ($this->port != '') + { + $this->hostname .= ':'.$this->port; + } + + return @mysql_pconnect($this->hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return @mysql_select_db($this->database, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Set client character set + * + * @access public + * @param string + * @param string + * @return resource + */ + function db_set_charset($charset, $collation) + { + return @mysql_query("SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'", $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @mysql_query($sql, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + // "DELETE FROM TABLE" returns 0 affected rows This hack modifies + // the query so that it returns the number of affected rows + if ($this->delete_hack === TRUE) + { + if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) + { + $sql = preg_replace("/^\s*DELETE\s+FROM\s+(\S+)\s*$/", "DELETE FROM \\1 WHERE 1=1", $sql); + } + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + $this->simple_query('SET AUTOCOMMIT=0'); + $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('COMMIT'); + $this->simple_query('SET AUTOCOMMIT=1'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('ROLLBACK'); + $this->simple_query('SET AUTOCOMMIT=1'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + if (is_array($str)) + { + foreach($str as $key => $val) + { + $str[$key] = $this->escape_str($val); + } + + return $str; + } + + if (function_exists('mysql_real_escape_string') AND is_resource($this->conn_id)) + { + return mysql_real_escape_string($str, $this->conn_id); + } + elseif (function_exists('mysql_escape_string')) + { + return mysql_escape_string($str); + } + else + { + return addslashes($str); + } + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @mysql_affected_rows($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @mysql_insert_id($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return (int)$row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * List table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @param boolean + * @return string + */ + function _list_tables($prefix_limit = FALSE) + { + $sql = "SHOW TABLES FROM ".$this->_escape_char.$this->database.$this->_escape_char; + + if ($prefix_limit !== FALSE AND $this->dbprefix != '') + { + $sql .= " LIKE '".$this->dbprefix."%'"; + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SHOW COLUMNS FROM ".$table; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$table." LIMIT 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return mysql_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return mysql_errno($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape the SQL Identifiers + * + * This function escapes column and table names + * + * @access private + * @param string + * @return string + */ + function _escape_identifiers($item) + { + if ($this->_escape_char == '') + { + return $item; + } + + foreach ($this->_reserved_identifiers as $id) + { + if (strpos($item, '.'.$id) !== FALSE) + { + $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + } + + if (strpos($item, '.') !== FALSE) + { + $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; + } + else + { + $str = $this->_escape_char.$item.$this->_escape_char; + } + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + + // -------------------------------------------------------------------- + + /** + * From Tables + * + * This function implicitly groups FROM tables so there is no confusion + * about operator precedence in harmony with SQL standards + * + * @access public + * @param type + * @return type + */ + function _from_tables($tables) + { + if ( ! is_array($tables)) + { + $tables = array($tables); + } + + return '('.implode(', ', $tables).')'; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @param array the orderby clause + * @param array the limit clause + * @return string + */ + function _update($table, $values, $where, $orderby = array(), $limit = FALSE) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; + + $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); + + $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; + + $sql .= $orderby.$limit; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Truncate statement + * + * Generates a platform-specific truncate string from the supplied data + * If the database does not support the truncate() command + * This function maps to "DELETE FROM table" + * + * @access public + * @param string the table name + * @return string + */ + function _truncate($table) + { + return "TRUNCATE ".$table; + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @param string the limit clause + * @return string + */ + function _delete($table, $where = array(), $like = array(), $limit = FALSE) + { + $conditions = ''; + + if (count($where) > 0 OR count($like) > 0) + { + $conditions = "\nWHERE "; + $conditions .= implode("\n", $this->ar_where); + + if (count($where) > 0 && count($like) > 0) + { + $conditions .= " AND "; + } + $conditions .= implode("\n", $like); + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$table.$conditions.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + if ($offset == 0) + { + $offset = ''; + } + else + { + $offset .= ", "; + } + + return $sql."LIMIT ".$offset.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @mysql_close($conn_id); + } + +} + + +/* End of file mysql_driver.php */ /* Location: ./system/database/drivers/mysql/mysql_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index 28a77b3b..d8cb77ea 100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php @@ -1,254 +1,254 @@ -$attributes) - { - // Numeric field names aren't allowed in databases, so if the key is - // numeric, we know it was assigned by PHP and the developer manually - // entered the field information, so we'll simply add it to the list - if (is_numeric($field)) - { - $sql .= "\n\t$attributes"; - } - else - { - $attributes = array_change_key_case($attributes, CASE_UPPER); - - $sql .= "\n\t".$this->db->_protect_identifiers($field); - - if (array_key_exists('NAME', $attributes)) - { - $sql .= ' '.$this->db->_protect_identifiers($attributes['NAME']).' '; - } - - if (array_key_exists('TYPE', $attributes)) - { - $sql .= ' '.$attributes['TYPE']; - } - - if (array_key_exists('CONSTRAINT', $attributes)) - { - $sql .= '('.$attributes['CONSTRAINT'].')'; - } - - if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) - { - $sql .= ' UNSIGNED'; - } - - if (array_key_exists('DEFAULT', $attributes)) - { - $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; - } - - if (array_key_exists('NULL', $attributes)) - { - $sql .= ($attributes['NULL'] === TRUE) ? ' NULL' : ' NOT NULL'; - } - - if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) - { - $sql .= ' AUTO_INCREMENT'; - } - } - - // don't add a comma on the end of the last field - if (++$current_field_count < count($fields)) - { - $sql .= ','; - } - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Create Table - * - * @access private - * @param string the table name - * @param mixed the fields - * @param mixed primary key(s) - * @param mixed key(s) - * @param boolean should 'IF NOT EXISTS' be added to the SQL - * @return bool - */ - function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) - { - $sql = 'CREATE TABLE '; - - if ($if_not_exists === TRUE) - { - $sql .= 'IF NOT EXISTS '; - } - - $sql .= $this->db->_escape_identifiers($table)." ("; - - $sql .= $this->_process_fields($fields); - - if (count($primary_keys) > 0) - { - $key_name = $this->db->_protect_identifiers(implode('_', $primary_keys)); - $primary_keys = $this->db->_protect_identifiers($primary_keys); - $sql .= ",\n\tPRIMARY KEY ".$key_name." (" . implode(', ', $primary_keys) . ")"; - } - - if (is_array($keys) && count($keys) > 0) - { - foreach ($keys as $key) - { - if (is_array($key)) - { - $key_name = $this->db->_protect_identifiers(implode('_', $key)); - $key = $this->db->_protect_identifiers($key); - } - else - { - $key_name = $this->db->_protect_identifiers($key); - $key = array($key_name); - } - - $sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")"; - } - } - - $sql .= "\n) DEFAULT CHARACTER SET {$this->db->char_set} COLLATE {$this->db->dbcollat};"; - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * @access private - * @return string - */ - function _drop_table($table) - { - return "DROP TABLE IF EXISTS ".$this->db->_escape_identifiers($table); - } - - // -------------------------------------------------------------------- - - /** - * Alter table query - * - * Generates a platform-specific query so that a table can be altered - * Called by add_column(), drop_column(), and column_alter(), - * - * @access private - * @param string the ALTER type (ADD, DROP, CHANGE) - * @param string the column name - * @param array fields - * @param string the field after which we should add the new field - * @return object - */ - function _alter_table($alter_type, $table, $fields, $after_field = '') - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type "; - - // DROP has everything it needs now. - if ($alter_type == 'DROP') - { - return $sql.$this->db->_protect_identifiers($fields); - } - - $sql .= $this->_process_fields($fields); - - if ($after_field != '') - { - $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Rename a table - * - * Generates a platform-specific query so that a table can be renamed - * - * @access private - * @param string the old table name - * @param string the new table name - * @return string - */ - function _rename_table($table_name, $new_table_name) - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); - return $sql; - } - -} - -/* End of file mysql_forge.php */ +$attributes) + { + // Numeric field names aren't allowed in databases, so if the key is + // numeric, we know it was assigned by PHP and the developer manually + // entered the field information, so we'll simply add it to the list + if (is_numeric($field)) + { + $sql .= "\n\t$attributes"; + } + else + { + $attributes = array_change_key_case($attributes, CASE_UPPER); + + $sql .= "\n\t".$this->db->_protect_identifiers($field); + + if (array_key_exists('NAME', $attributes)) + { + $sql .= ' '.$this->db->_protect_identifiers($attributes['NAME']).' '; + } + + if (array_key_exists('TYPE', $attributes)) + { + $sql .= ' '.$attributes['TYPE']; + } + + if (array_key_exists('CONSTRAINT', $attributes)) + { + $sql .= '('.$attributes['CONSTRAINT'].')'; + } + + if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) + { + $sql .= ' UNSIGNED'; + } + + if (array_key_exists('DEFAULT', $attributes)) + { + $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; + } + + if (array_key_exists('NULL', $attributes)) + { + $sql .= ($attributes['NULL'] === TRUE) ? ' NULL' : ' NOT NULL'; + } + + if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) + { + $sql .= ' AUTO_INCREMENT'; + } + } + + // don't add a comma on the end of the last field + if (++$current_field_count < count($fields)) + { + $sql .= ','; + } + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Create Table + * + * @access private + * @param string the table name + * @param mixed the fields + * @param mixed primary key(s) + * @param mixed key(s) + * @param boolean should 'IF NOT EXISTS' be added to the SQL + * @return bool + */ + function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) + { + $sql = 'CREATE TABLE '; + + if ($if_not_exists === TRUE) + { + $sql .= 'IF NOT EXISTS '; + } + + $sql .= $this->db->_escape_identifiers($table)." ("; + + $sql .= $this->_process_fields($fields); + + if (count($primary_keys) > 0) + { + $key_name = $this->db->_protect_identifiers(implode('_', $primary_keys)); + $primary_keys = $this->db->_protect_identifiers($primary_keys); + $sql .= ",\n\tPRIMARY KEY ".$key_name." (" . implode(', ', $primary_keys) . ")"; + } + + if (is_array($keys) && count($keys) > 0) + { + foreach ($keys as $key) + { + if (is_array($key)) + { + $key_name = $this->db->_protect_identifiers(implode('_', $key)); + $key = $this->db->_protect_identifiers($key); + } + else + { + $key_name = $this->db->_protect_identifiers($key); + $key = array($key_name); + } + + $sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")"; + } + } + + $sql .= "\n) DEFAULT CHARACTER SET {$this->db->char_set} COLLATE {$this->db->dbcollat};"; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * @access private + * @return string + */ + function _drop_table($table) + { + return "DROP TABLE IF EXISTS ".$this->db->_escape_identifiers($table); + } + + // -------------------------------------------------------------------- + + /** + * Alter table query + * + * Generates a platform-specific query so that a table can be altered + * Called by add_column(), drop_column(), and column_alter(), + * + * @access private + * @param string the ALTER type (ADD, DROP, CHANGE) + * @param string the column name + * @param array fields + * @param string the field after which we should add the new field + * @return object + */ + function _alter_table($alter_type, $table, $fields, $after_field = '') + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type "; + + // DROP has everything it needs now. + if ($alter_type == 'DROP') + { + return $sql.$this->db->_protect_identifiers($fields); + } + + $sql .= $this->_process_fields($fields); + + if ($after_field != '') + { + $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Rename a table + * + * Generates a platform-specific query so that a table can be renamed + * + * @access private + * @param string the old table name + * @param string the new table name + * @return string + */ + function _rename_table($table_name, $new_table_name) + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); + return $sql; + } + +} + +/* End of file mysql_forge.php */ /* Location: ./system/database/drivers/mysql/mysql_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php index a28a1985..673aeac8 100644 --- a/system/database/drivers/mysql/mysql_result.php +++ b/system/database/drivers/mysql/mysql_result.php @@ -1,169 +1,169 @@ -result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @mysql_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - while ($field = mysql_fetch_field($this->result_id)) - { - $field_names[] = $field->name; - } - - return $field_names; - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - while ($field = mysql_fetch_field($this->result_id)) - { - $F = new stdClass(); - $F->name = $field->name; - $F->type = $field->type; - $F->default = $field->def; - $F->max_length = $field->max_length; - $F->primary_key = $field->primary_key; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - mysql_free_result($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return mysql_data_seek($this->result_id, $n); - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - return mysql_fetch_assoc($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - return mysql_fetch_object($this->result_id); - } - -} - - -/* End of file mysql_result.php */ +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @mysql_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + while ($field = mysql_fetch_field($this->result_id)) + { + $field_names[] = $field->name; + } + + return $field_names; + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + while ($field = mysql_fetch_field($this->result_id)) + { + $F = new stdClass(); + $F->name = $field->name; + $F->type = $field->type; + $F->default = $field->def; + $F->max_length = $field->max_length; + $F->primary_key = $field->primary_key; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + mysql_free_result($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return mysql_data_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return mysql_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return mysql_fetch_object($this->result_id); + } + +} + + +/* End of file mysql_result.php */ /* Location: ./system/database/drivers/mysql/mysql_result.php */ \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php index d2c10dbb..003b1dd6 100644 --- a/system/database/drivers/mysql/mysql_utility.php +++ b/system/database/drivers/mysql/mysql_utility.php @@ -1,245 +1,245 @@ -db->_escape_identifiers($table); - } - - // -------------------------------------------------------------------- - - /** - * Repair table query - * - * Generates a platform-specific query so that a table can be repaired - * - * @access private - * @param string the table name - * @return object - */ - function _repair_table($table) - { - return "REPAIR TABLE ".$this->db->_escape_identifiers($table); - } - - // -------------------------------------------------------------------- - /** - * MySQL Export - * - * @access private - * @param array Preferences - * @return mixed - */ - function _backup($params = array()) - { - if (count($params) == 0) - { - return FALSE; - } - - // Extract the prefs for simplicity - extract($params); - - // Build the output - $output = ''; - foreach ((array)$tables as $table) - { - // Is the table in the "ignore" list? - if (in_array($table, (array)$ignore, TRUE)) - { - continue; - } - - // Get the table schema - $query = $this->db->query("SHOW CREATE TABLE `".$this->db->database.'`.'.$table); - - // No result means the table name was invalid - if ($query === FALSE) - { - continue; - } - - // Write out the table schema - $output .= '#'.$newline.'# TABLE STRUCTURE FOR: '.$table.$newline.'#'.$newline.$newline; - - if ($add_drop == TRUE) - { - $output .= 'DROP TABLE IF EXISTS '.$table.';'.$newline.$newline; - } - - $i = 0; - $result = $query->result_array(); - foreach ($result[0] as $val) - { - if ($i++ % 2) - { - $output .= $val.';'.$newline.$newline; - } - } - - // If inserts are not needed we're done... - if ($add_insert == FALSE) - { - continue; - } - - // Grab all the data from the current table - $query = $this->db->query("SELECT * FROM $table"); - - if ($query->num_rows() == 0) - { - continue; - } - - // Fetch the field names and determine if the field is an - // integer type. We use this info to decide whether to - // surround the data with quotes or not - - $i = 0; - $field_str = ''; - $is_int = array(); - while ($field = mysql_fetch_field($query->result_id)) - { - // Most versions of MySQL store timestamp as a string - $is_int[$i] = (in_array( - strtolower(mysql_field_type($query->result_id, $i)), - array('tinyint', 'smallint', 'mediumint', 'int', 'bigint'), //, 'timestamp'), - TRUE) - ) ? TRUE : FALSE; - - // Create a string of field names - $field_str .= '`'.$field->name.'`, '; - $i++; - } - - // Trim off the end comma - $field_str = preg_replace( "/, $/" , "" , $field_str); - - - // Build the insert string - foreach ($query->result_array() as $row) - { - $val_str = ''; - - $i = 0; - foreach ($row as $v) - { - // Is the value NULL? - if ($v === NULL) - { - $val_str .= 'NULL'; - } - else - { - // Escape the data if it's not an integer - if ($is_int[$i] == FALSE) - { - $val_str .= $this->db->escape($v); - } - else - { - $val_str .= $v; - } - } - - // Append a comma - $val_str .= ', '; - $i++; - } - - // Remove the comma at the end of the string - $val_str = preg_replace( "/, $/" , "" , $val_str); - - // Build the INSERT string - $output .= 'INSERT INTO '.$table.' ('.$field_str.') VALUES ('.$val_str.');'.$newline; - } - - $output .= $newline.$newline; - } - - return $output; - } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access private - * @param string the database name - * @return bool - */ - function _create_database($name) - { - return "CREATE DATABASE ".$name; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - return "DROP DATABASE ".$name; - } - -} - -/* End of file mysql_utility.php */ +db->_escape_identifiers($table); + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Generates a platform-specific query so that a table can be repaired + * + * @access private + * @param string the table name + * @return object + */ + function _repair_table($table) + { + return "REPAIR TABLE ".$this->db->_escape_identifiers($table); + } + + // -------------------------------------------------------------------- + /** + * MySQL Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + if (count($params) == 0) + { + return FALSE; + } + + // Extract the prefs for simplicity + extract($params); + + // Build the output + $output = ''; + foreach ((array)$tables as $table) + { + // Is the table in the "ignore" list? + if (in_array($table, (array)$ignore, TRUE)) + { + continue; + } + + // Get the table schema + $query = $this->db->query("SHOW CREATE TABLE `".$this->db->database.'`.'.$table); + + // No result means the table name was invalid + if ($query === FALSE) + { + continue; + } + + // Write out the table schema + $output .= '#'.$newline.'# TABLE STRUCTURE FOR: '.$table.$newline.'#'.$newline.$newline; + + if ($add_drop == TRUE) + { + $output .= 'DROP TABLE IF EXISTS '.$table.';'.$newline.$newline; + } + + $i = 0; + $result = $query->result_array(); + foreach ($result[0] as $val) + { + if ($i++ % 2) + { + $output .= $val.';'.$newline.$newline; + } + } + + // If inserts are not needed we're done... + if ($add_insert == FALSE) + { + continue; + } + + // Grab all the data from the current table + $query = $this->db->query("SELECT * FROM $table"); + + if ($query->num_rows() == 0) + { + continue; + } + + // Fetch the field names and determine if the field is an + // integer type. We use this info to decide whether to + // surround the data with quotes or not + + $i = 0; + $field_str = ''; + $is_int = array(); + while ($field = mysql_fetch_field($query->result_id)) + { + // Most versions of MySQL store timestamp as a string + $is_int[$i] = (in_array( + strtolower(mysql_field_type($query->result_id, $i)), + array('tinyint', 'smallint', 'mediumint', 'int', 'bigint'), //, 'timestamp'), + TRUE) + ) ? TRUE : FALSE; + + // Create a string of field names + $field_str .= '`'.$field->name.'`, '; + $i++; + } + + // Trim off the end comma + $field_str = preg_replace( "/, $/" , "" , $field_str); + + + // Build the insert string + foreach ($query->result_array() as $row) + { + $val_str = ''; + + $i = 0; + foreach ($row as $v) + { + // Is the value NULL? + if ($v === NULL) + { + $val_str .= 'NULL'; + } + else + { + // Escape the data if it's not an integer + if ($is_int[$i] == FALSE) + { + $val_str .= $this->db->escape($v); + } + else + { + $val_str .= $v; + } + } + + // Append a comma + $val_str .= ', '; + $i++; + } + + // Remove the comma at the end of the string + $val_str = preg_replace( "/, $/" , "" , $val_str); + + // Build the INSERT string + $output .= 'INSERT INTO '.$table.' ('.$field_str.') VALUES ('.$val_str.');'.$newline; + } + + $output .= $newline.$newline; + } + + return $output; + } + + /** + * + * The functions below have been deprecated as of 1.6, and are only here for backwards + * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation + * is STRONGLY discouraged in favour if using dbforge. + * + */ + + /** + * Create database + * + * @access private + * @param string the database name + * @return bool + */ + function _create_database($name) + { + return "CREATE DATABASE ".$name; + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access private + * @param string the database name + * @return bool + */ + function _drop_database($name) + { + return "DROP DATABASE ".$name; + } + +} + +/* End of file mysql_utility.php */ /* Location: ./system/database/drivers/mysql/mysql_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/mysqli/index.html b/system/database/drivers/mysqli/index.html index 065d2da5..c942a79c 100644 --- a/system/database/drivers/mysqli/index.html +++ b/system/database/drivers/mysqli/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 1b3da7a6..ce458f29 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -1,625 +1,625 @@ -port != '') - { - return @mysqli_connect($this->hostname, $this->username, $this->password, $this->database, $this->port); - } - else - { - return @mysqli_connect($this->hostname, $this->username, $this->password, $this->database); - } - - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - return $this->db_connect(); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - return @mysqli_select_db($this->conn_id, $this->database); - } - - // -------------------------------------------------------------------- - - /** - * Set client character set - * - * @access private - * @param string - * @param string - * @return resource - */ - function _db_set_charset($charset, $collation) - { - return @mysqli_query($this->conn_id, "SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'"); - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT version() AS ver"; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - $result = @mysqli_query($this->conn_id, $sql); - return $result; - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - // "DELETE FROM TABLE" returns 0 affected rows This hack modifies - // the query so that it returns the number of affected rows - if ($this->delete_hack === TRUE) - { - if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) - { - $sql = preg_replace("/^\s*DELETE\s+FROM\s+(\S+)\s*$/", "DELETE FROM \\1 WHERE 1=1", $sql); - } - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - $this->simple_query('SET AUTOCOMMIT=0'); - $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('COMMIT'); - $this->simple_query('SET AUTOCOMMIT=1'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('ROLLBACK'); - $this->simple_query('SET AUTOCOMMIT=1'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - if (function_exists('mysqli_real_escape_string') AND is_object($this->conn_id)) - { - return mysqli_real_escape_string($this->conn_id, $str); - } - elseif (function_exists('mysql_escape_string')) - { - return mysql_escape_string($str); - } - else - { - return addslashes($str); - } - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @mysqli_affected_rows($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - return @mysqli_insert_id($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * List table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @param boolean - * @return string - */ - function _list_tables($prefix_limit = FALSE) - { - $sql = "SHOW TABLES FROM ".$this->_escape_char.$this->database.$this->_escape_char; - - if ($prefix_limit !== FALSE AND $this->dbprefix != '') - { - $sql .= " LIKE '".$this->dbprefix."%'"; - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SHOW COLUMNS FROM ".$table; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT * FROM ".$table." LIMIT 1"; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - return mysqli_error($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - return mysqli_errno($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Escape the SQL Identifiers - * - * This function escapes column and table names - * - * @access private - * @param string - * @return string - */ - function _escape_identifiers($item) - { - if ($this->_escape_char == '') - { - return $item; - } - - foreach ($this->_reserved_identifiers as $id) - { - if (strpos($item, '.'.$id) !== FALSE) - { - $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - } - - if (strpos($item, '.') !== FALSE) - { - $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; - } - else - { - $str = $this->_escape_char.$item.$this->_escape_char; - } - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - - // -------------------------------------------------------------------- - - /** - * From Tables - * - * This function implicitly groups FROM tables so there is no confusion - * about operator precedence in harmony with SQL standards - * - * @access public - * @param type - * @return type - */ - function _from_tables($tables) - { - if ( ! is_array($tables)) - { - $tables = array($tables); - } - - return '('.implode(', ', $tables).')'; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @param array the orderby clause - * @param array the limit clause - * @return string - */ - function _update($table, $values, $where, $orderby = array(), $limit = FALSE) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; - - $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); - - $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; - - $sql .= $orderby.$limit; - - return $sql; - } - - - // -------------------------------------------------------------------- - - /** - * Truncate statement - * - * Generates a platform-specific truncate string from the supplied data - * If the database does not support the truncate() command - * This function maps to "DELETE FROM table" - * - * @access public - * @param string the table name - * @return string - */ - function _truncate($table) - { - return "TRUNCATE ".$table; - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @param string the limit clause - * @return string - */ - function _delete($table, $where = array(), $like = array(), $limit = FALSE) - { - $conditions = ''; - - if (count($where) > 0 OR count($like) > 0) - { - $conditions = "\nWHERE "; - $conditions .= implode("\n", $this->ar_where); - - if (count($where) > 0 && count($like) > 0) - { - $conditions .= " AND "; - } - $conditions .= implode("\n", $like); - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - return "DELETE FROM ".$table.$conditions.$limit; - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - $sql .= "LIMIT ".$limit; - - if ($offset > 0) - { - $sql .= " OFFSET ".$offset; - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @mysqli_close($conn_id); - } - - -} - - -/* End of file mysqli_driver.php */ +port != '') + { + return @mysqli_connect($this->hostname, $this->username, $this->password, $this->database, $this->port); + } + else + { + return @mysqli_connect($this->hostname, $this->username, $this->password, $this->database); + } + + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return $this->db_connect(); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return @mysqli_select_db($this->conn_id, $this->database); + } + + // -------------------------------------------------------------------- + + /** + * Set client character set + * + * @access private + * @param string + * @param string + * @return resource + */ + function _db_set_charset($charset, $collation) + { + return @mysqli_query($this->conn_id, "SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'"); + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + $result = @mysqli_query($this->conn_id, $sql); + return $result; + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + // "DELETE FROM TABLE" returns 0 affected rows This hack modifies + // the query so that it returns the number of affected rows + if ($this->delete_hack === TRUE) + { + if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) + { + $sql = preg_replace("/^\s*DELETE\s+FROM\s+(\S+)\s*$/", "DELETE FROM \\1 WHERE 1=1", $sql); + } + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + $this->simple_query('SET AUTOCOMMIT=0'); + $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('COMMIT'); + $this->simple_query('SET AUTOCOMMIT=1'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('ROLLBACK'); + $this->simple_query('SET AUTOCOMMIT=1'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + if (function_exists('mysqli_real_escape_string') AND is_object($this->conn_id)) + { + return mysqli_real_escape_string($this->conn_id, $str); + } + elseif (function_exists('mysql_escape_string')) + { + return mysql_escape_string($str); + } + else + { + return addslashes($str); + } + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @mysqli_affected_rows($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @mysqli_insert_id($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * List table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @param boolean + * @return string + */ + function _list_tables($prefix_limit = FALSE) + { + $sql = "SHOW TABLES FROM ".$this->_escape_char.$this->database.$this->_escape_char; + + if ($prefix_limit !== FALSE AND $this->dbprefix != '') + { + $sql .= " LIKE '".$this->dbprefix."%'"; + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SHOW COLUMNS FROM ".$table; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$table." LIMIT 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return mysqli_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return mysqli_errno($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape the SQL Identifiers + * + * This function escapes column and table names + * + * @access private + * @param string + * @return string + */ + function _escape_identifiers($item) + { + if ($this->_escape_char == '') + { + return $item; + } + + foreach ($this->_reserved_identifiers as $id) + { + if (strpos($item, '.'.$id) !== FALSE) + { + $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + } + + if (strpos($item, '.') !== FALSE) + { + $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; + } + else + { + $str = $this->_escape_char.$item.$this->_escape_char; + } + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + + // -------------------------------------------------------------------- + + /** + * From Tables + * + * This function implicitly groups FROM tables so there is no confusion + * about operator precedence in harmony with SQL standards + * + * @access public + * @param type + * @return type + */ + function _from_tables($tables) + { + if ( ! is_array($tables)) + { + $tables = array($tables); + } + + return '('.implode(', ', $tables).')'; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @param array the orderby clause + * @param array the limit clause + * @return string + */ + function _update($table, $values, $where, $orderby = array(), $limit = FALSE) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; + + $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); + + $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; + + $sql .= $orderby.$limit; + + return $sql; + } + + + // -------------------------------------------------------------------- + + /** + * Truncate statement + * + * Generates a platform-specific truncate string from the supplied data + * If the database does not support the truncate() command + * This function maps to "DELETE FROM table" + * + * @access public + * @param string the table name + * @return string + */ + function _truncate($table) + { + return "TRUNCATE ".$table; + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @param string the limit clause + * @return string + */ + function _delete($table, $where = array(), $like = array(), $limit = FALSE) + { + $conditions = ''; + + if (count($where) > 0 OR count($like) > 0) + { + $conditions = "\nWHERE "; + $conditions .= implode("\n", $this->ar_where); + + if (count($where) > 0 && count($like) > 0) + { + $conditions .= " AND "; + } + $conditions .= implode("\n", $like); + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$table.$conditions.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $sql .= "LIMIT ".$limit; + + if ($offset > 0) + { + $sql .= " OFFSET ".$offset; + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @mysqli_close($conn_id); + } + + +} + + +/* End of file mysqli_driver.php */ /* Location: ./system/database/drivers/mysqli/mysqli_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index c7889bf4..99c2ebc3 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -1,254 +1,254 @@ -$attributes) - { - // Numeric field names aren't allowed in databases, so if the key is - // numeric, we know it was assigned by PHP and the developer manually - // entered the field information, so we'll simply add it to the list - if (is_numeric($field)) - { - $sql .= "\n\t$attributes"; - } - else - { - $attributes = array_change_key_case($attributes, CASE_UPPER); - - $sql .= "\n\t".$this->db->_protect_identifiers($field); - - if (array_key_exists('NAME', $attributes)) - { - $sql .= ' '.$this->db->_protect_identifiers($attributes['NAME']).' '; - } - - if (array_key_exists('TYPE', $attributes)) - { - $sql .= ' '.$attributes['TYPE']; - } - - if (array_key_exists('CONSTRAINT', $attributes)) - { - $sql .= '('.$attributes['CONSTRAINT'].')'; - } - - if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) - { - $sql .= ' UNSIGNED'; - } - - if (array_key_exists('DEFAULT', $attributes)) - { - $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; - } - - if (array_key_exists('NULL', $attributes)) - { - $sql .= ($attributes['NULL'] === TRUE) ? ' NULL' : ' NOT NULL'; - } - - if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) - { - $sql .= ' AUTO_INCREMENT'; - } - } - - // don't add a comma on the end of the last field - if (++$current_field_count < count($fields)) - { - $sql .= ','; - } - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Create Table - * - * @access private - * @param string the table name - * @param mixed the fields - * @param mixed primary key(s) - * @param mixed key(s) - * @param boolean should 'IF NOT EXISTS' be added to the SQL - * @return bool - */ - function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) - { - $sql = 'CREATE TABLE '; - - if ($if_not_exists === TRUE) - { - $sql .= 'IF NOT EXISTS '; - } - - $sql .= $this->db->_escape_identifiers($table)." ("; - - $sql .= $this->_process_fields($fields); - - if (count($primary_keys) > 0) - { - $key_name = $this->db->_protect_identifiers(implode('_', $primary_keys)); - $primary_keys = $this->db->_protect_identifiers($primary_keys); - $sql .= ",\n\tPRIMARY KEY ".$key_name." (" . implode(', ', $primary_keys) . ")"; - } - - if (is_array($keys) && count($keys) > 0) - { - foreach ($keys as $key) - { - if (is_array($key)) - { - $key_name = $this->db->_protect_identifiers(implode('_', $key)); - $key = $this->db->_protect_identifiers($key); - } - else - { - $key_name = $this->db->_protect_identifiers($key); - $key = array($key_name); - } - - $sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")"; - } - } - - $sql .= "\n) DEFAULT CHARACTER SET {$this->db->char_set} COLLATE {$this->db->dbcollat};"; - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * @access private - * @return string - */ - function _drop_table($table) - { - return "DROP TABLE IF EXISTS ".$this->db->_escape_identifiers($table); - } - - // -------------------------------------------------------------------- - - /** - * Alter table query - * - * Generates a platform-specific query so that a table can be altered - * Called by add_column(), drop_column(), and column_alter(), - * - * @access private - * @param string the ALTER type (ADD, DROP, CHANGE) - * @param string the column name - * @param array fields - * @param string the field after which we should add the new field - * @return object - */ - function _alter_table($alter_type, $table, $fields, $after_field = '') - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type "; - - // DROP has everything it needs now. - if ($alter_type == 'DROP') - { - return $sql.$this->db->_protect_identifiers($fields); - } - - $sql .= $this->_process_fields($fields); - - if ($after_field != '') - { - $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Rename a table - * - * Generates a platform-specific query so that a table can be renamed - * - * @access private - * @param string the old table name - * @param string the new table name - * @return string - */ - function _rename_table($table_name, $new_table_name) - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); - return $sql; - } - -} - -/* End of file mysqli_forge.php */ +$attributes) + { + // Numeric field names aren't allowed in databases, so if the key is + // numeric, we know it was assigned by PHP and the developer manually + // entered the field information, so we'll simply add it to the list + if (is_numeric($field)) + { + $sql .= "\n\t$attributes"; + } + else + { + $attributes = array_change_key_case($attributes, CASE_UPPER); + + $sql .= "\n\t".$this->db->_protect_identifiers($field); + + if (array_key_exists('NAME', $attributes)) + { + $sql .= ' '.$this->db->_protect_identifiers($attributes['NAME']).' '; + } + + if (array_key_exists('TYPE', $attributes)) + { + $sql .= ' '.$attributes['TYPE']; + } + + if (array_key_exists('CONSTRAINT', $attributes)) + { + $sql .= '('.$attributes['CONSTRAINT'].')'; + } + + if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) + { + $sql .= ' UNSIGNED'; + } + + if (array_key_exists('DEFAULT', $attributes)) + { + $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; + } + + if (array_key_exists('NULL', $attributes)) + { + $sql .= ($attributes['NULL'] === TRUE) ? ' NULL' : ' NOT NULL'; + } + + if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) + { + $sql .= ' AUTO_INCREMENT'; + } + } + + // don't add a comma on the end of the last field + if (++$current_field_count < count($fields)) + { + $sql .= ','; + } + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Create Table + * + * @access private + * @param string the table name + * @param mixed the fields + * @param mixed primary key(s) + * @param mixed key(s) + * @param boolean should 'IF NOT EXISTS' be added to the SQL + * @return bool + */ + function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) + { + $sql = 'CREATE TABLE '; + + if ($if_not_exists === TRUE) + { + $sql .= 'IF NOT EXISTS '; + } + + $sql .= $this->db->_escape_identifiers($table)." ("; + + $sql .= $this->_process_fields($fields); + + if (count($primary_keys) > 0) + { + $key_name = $this->db->_protect_identifiers(implode('_', $primary_keys)); + $primary_keys = $this->db->_protect_identifiers($primary_keys); + $sql .= ",\n\tPRIMARY KEY ".$key_name." (" . implode(', ', $primary_keys) . ")"; + } + + if (is_array($keys) && count($keys) > 0) + { + foreach ($keys as $key) + { + if (is_array($key)) + { + $key_name = $this->db->_protect_identifiers(implode('_', $key)); + $key = $this->db->_protect_identifiers($key); + } + else + { + $key_name = $this->db->_protect_identifiers($key); + $key = array($key_name); + } + + $sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")"; + } + } + + $sql .= "\n) DEFAULT CHARACTER SET {$this->db->char_set} COLLATE {$this->db->dbcollat};"; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * @access private + * @return string + */ + function _drop_table($table) + { + return "DROP TABLE IF EXISTS ".$this->db->_escape_identifiers($table); + } + + // -------------------------------------------------------------------- + + /** + * Alter table query + * + * Generates a platform-specific query so that a table can be altered + * Called by add_column(), drop_column(), and column_alter(), + * + * @access private + * @param string the ALTER type (ADD, DROP, CHANGE) + * @param string the column name + * @param array fields + * @param string the field after which we should add the new field + * @return object + */ + function _alter_table($alter_type, $table, $fields, $after_field = '') + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type "; + + // DROP has everything it needs now. + if ($alter_type == 'DROP') + { + return $sql.$this->db->_protect_identifiers($fields); + } + + $sql .= $this->_process_fields($fields); + + if ($after_field != '') + { + $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Rename a table + * + * Generates a platform-specific query so that a table can be renamed + * + * @access private + * @param string the old table name + * @param string the new table name + * @return string + */ + function _rename_table($table_name, $new_table_name) + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); + return $sql; + } + +} + +/* End of file mysqli_forge.php */ /* Location: ./system/database/drivers/mysqli/mysqli_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index b690914b..5b1f7936 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php @@ -1,169 +1,169 @@ -result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @mysqli_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - while ($field = mysqli_fetch_field($this->result_id)) - { - $field_names[] = $field->name; - } - - return $field_names; - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - while ($field = mysqli_fetch_field($this->result_id)) - { - $F = new stdClass(); - $F->name = $field->name; - $F->type = $field->type; - $F->default = $field->def; - $F->max_length = $field->max_length; - $F->primary_key = ($field->flags & MYSQLI_PRI_KEY_FLAG) ? 1 : 0; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_object($this->result_id)) - { - mysqli_free_result($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return mysqli_data_seek($this->result_id, $n); - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - return mysqli_fetch_assoc($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - return mysqli_fetch_object($this->result_id); - } - -} - - -/* End of file mysqli_result.php */ +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @mysqli_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + while ($field = mysqli_fetch_field($this->result_id)) + { + $field_names[] = $field->name; + } + + return $field_names; + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + while ($field = mysqli_fetch_field($this->result_id)) + { + $F = new stdClass(); + $F->name = $field->name; + $F->type = $field->type; + $F->default = $field->def; + $F->max_length = $field->max_length; + $F->primary_key = ($field->flags & MYSQLI_PRI_KEY_FLAG) ? 1 : 0; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_object($this->result_id)) + { + mysqli_free_result($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return mysqli_data_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return mysqli_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return mysqli_fetch_object($this->result_id); + } + +} + + +/* End of file mysqli_result.php */ /* Location: ./system/database/drivers/mysqli/mysqli_result.php */ \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php index d19b6437..c1d191d1 100644 --- a/system/database/drivers/mysqli/mysqli_utility.php +++ b/system/database/drivers/mysqli/mysqli_utility.php @@ -1,123 +1,123 @@ -db->_escape_identifiers($table); - } - - // -------------------------------------------------------------------- - - /** - * Repair table query - * - * Generates a platform-specific query so that a table can be repaired - * - * @access private - * @param string the table name - * @return object - */ - function _repair_table($table) - { - return "REPAIR TABLE ".$this->db->_escape_identifiers($table); - } - - // -------------------------------------------------------------------- - - /** - * MySQLi Export - * - * @access private - * @param array Preferences - * @return mixed - */ - function _backup($params = array()) - { - // Currently unsupported - return $this->db->display_error('db_unsuported_feature'); - } - - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access private - * @param string the database name - * @return bool - */ - function _create_database($name) - { - return "CREATE DATABASE ".$name; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - return "DROP DATABASE ".$name; - } - -} - -/* End of file mysqli_utility.php */ +db->_escape_identifiers($table); + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Generates a platform-specific query so that a table can be repaired + * + * @access private + * @param string the table name + * @return object + */ + function _repair_table($table) + { + return "REPAIR TABLE ".$this->db->_escape_identifiers($table); + } + + // -------------------------------------------------------------------- + + /** + * MySQLi Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + // Currently unsupported + return $this->db->display_error('db_unsuported_feature'); + } + + + /** + * + * The functions below have been deprecated as of 1.6, and are only here for backwards + * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation + * is STRONGLY discouraged in favour if using dbforge. + * + */ + + /** + * Create database + * + * @access private + * @param string the database name + * @return bool + */ + function _create_database($name) + { + return "CREATE DATABASE ".$name; + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access private + * @param string the database name + * @return bool + */ + function _drop_database($name) + { + return "DROP DATABASE ".$name; + } + +} + +/* End of file mysqli_utility.php */ /* Location: ./system/database/drivers/mysqli/mysqli_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/oci8/index.html b/system/database/drivers/oci8/index.html index 065d2da5..c942a79c 100644 --- a/system/database/drivers/oci8/index.html +++ b/system/database/drivers/oci8/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 0c146778..0629a594 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -1,737 +1,737 @@ -username, $this->password, $this->hostname); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - return @ociplogon($this->username, $this->password, $this->hostname); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Set client character set - * - * @access public - * @param string - * @param string - * @return resource - */ - function db_set_charset($charset, $collation) - { - // @todo - add support if needed - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return ociserverversion($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - // oracle must parse the query before it is run. All of the actions with - // the query are based on the statement id returned by ociparse - $this->stmt_id = FALSE; - $this->_set_stmt_id($sql); - ocisetprefetch($this->stmt_id, 1000); - return @ociexecute($this->stmt_id, $this->_commit); - } - - /** - * Generate a statement ID - * - * @access private - * @param string an SQL query - * @return none - */ - function _set_stmt_id($sql) - { - if ( ! is_resource($this->stmt_id)) - { - $this->stmt_id = ociparse($this->conn_id, $this->_prep_query($sql)); - } - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * getCursor. Returns a cursor from the datbase - * - * @access public - * @return cursor id - */ - function get_cursor() - { - $this->curs_id = ocinewcursor($this->conn_id); - return $this->curs_id; - } - - // -------------------------------------------------------------------- - - /** - * Stored Procedure. Executes a stored procedure - * - * @access public - * @param package package stored procedure is in - * @param procedure stored procedure to execute - * @param params array of parameters - * @return array - * - * params array keys - * - * KEY OPTIONAL NOTES - * name no the name of the parameter should be in : format - * value no the value of the parameter. If this is an OUT or IN OUT parameter, - * this should be a reference to a variable - * type yes the type of the parameter - * length yes the max size of the parameter - */ - function stored_procedure($package, $procedure, $params) - { - if ($package == '' OR $procedure == '' OR ! is_array($params)) - { - if ($this->db_debug) - { - log_message('error', 'Invalid query: '.$package.'.'.$procedure); - return $this->display_error('db_invalid_query'); - } - return FALSE; - } - - // build the query string - $sql = "begin $package.$procedure("; - - $have_cursor = FALSE; - foreach($params as $param) - { - $sql .= $param['name'] . ","; - - if (array_key_exists('type', $param) && ($param['type'] == OCI_B_CURSOR)) - { - $have_cursor = TRUE; - } - } - $sql = trim($sql, ",") . "); end;"; - - $this->stmt_id = FALSE; - $this->_set_stmt_id($sql); - $this->_bind_params($params); - $this->query($sql, FALSE, $have_cursor); - } - - // -------------------------------------------------------------------- - - /** - * Bind parameters - * - * @access private - * @return none - */ - function _bind_params($params) - { - if ( ! is_array($params) OR ! is_resource($this->stmt_id)) - { - return; - } - - foreach ($params as $param) - { - foreach (array('name', 'value', 'type', 'length') as $val) - { - if ( ! isset($param[$val])) - { - $param[$val] = ''; - } - } - - ocibindbyname($this->stmt_id, $param['name'], $param['value'], $param['length'], $param['type']); - } - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - $this->_commit = OCI_DEFAULT; - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $ret = OCIcommit($this->conn_id); - $this->_commit = OCI_COMMIT_ON_SUCCESS; - return $ret; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $ret = OCIrollback($this->conn_id); - $this->_commit = OCI_COMMIT_ON_SUCCESS; - return $ret; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - // Access the CI object - $CI =& get_instance(); - - return $CI->_remove_invisible_characters($str); - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @ocirowcount($this->stmt_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - // not supported in oracle - return $this->display_error('db_unsupported_function'); - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); - - if ($query == FALSE) - { - return 0; - } - - $row = $query->row(); - return $row->NUMROWS; - } - - // -------------------------------------------------------------------- - - /** - * Show table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @param boolean - * @return string - */ - function _list_tables($prefix_limit = FALSE) - { - $sql = "SELECT TABLE_NAME FROM ALL_TABLES"; - - if ($prefix_limit !== FALSE AND $this->dbprefix != '') - { - $sql .= " WHERE TABLE_NAME LIKE '".$this->dbprefix."%'"; - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SELECT COLUMN_NAME FROM all_tab_columns WHERE table_name = '$table'"; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT * FROM ".$table." where rownum = 1"; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - $error = ocierror($this->conn_id); - return $error['message']; - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - $error = ocierror($this->conn_id); - return $error['code']; - } - - // -------------------------------------------------------------------- - - /** - * Escape the SQL Identifiers - * - * This function escapes column and table names - * - * @access private - * @param string - * @return string - */ - function _escape_identifiers($item) - { - if ($this->_escape_char == '') - { - return $item; - } - - foreach ($this->_reserved_identifiers as $id) - { - if (strpos($item, '.'.$id) !== FALSE) - { - $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - } - - if (strpos($item, '.') !== FALSE) - { - $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; - } - else - { - $str = $this->_escape_char.$item.$this->_escape_char; - } - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - - // -------------------------------------------------------------------- - - /** - * From Tables - * - * This function implicitly groups FROM tables so there is no confusion - * about operator precedence in harmony with SQL standards - * - * @access public - * @param type - * @return type - */ - function _from_tables($tables) - { - if ( ! is_array($tables)) - { - $tables = array($tables); - } - - return implode(', ', $tables); - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @param array the orderby clause - * @param array the limit clause - * @return string - */ - function _update($table, $values, $where, $orderby = array(), $limit = FALSE) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; - - $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); - - $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; - - $sql .= $orderby.$limit; - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Truncate statement - * - * Generates a platform-specific truncate string from the supplied data - * If the database does not support the truncate() command - * This function maps to "DELETE FROM table" - * - * @access public - * @param string the table name - * @return string - */ - function _truncate($table) - { - return "TRUNCATE TABLE ".$table; - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @param string the limit clause - * @return string - */ - function _delete($table, $where = array(), $like = array(), $limit = FALSE) - { - $conditions = ''; - - if (count($where) > 0 OR count($like) > 0) - { - $conditions = "\nWHERE "; - $conditions .= implode("\n", $this->ar_where); - - if (count($where) > 0 && count($like) > 0) - { - $conditions .= " AND "; - } - $conditions .= implode("\n", $like); - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - return "DELETE FROM ".$table.$conditions.$limit; - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - $limit = $offset + $limit; - $newsql = "SELECT * FROM (select inner_query.*, rownum rnum FROM ($sql) inner_query WHERE rownum < $limit)"; - - if ($offset != 0) - { - $newsql .= " WHERE rnum >= $offset"; - } - - // remember that we used limits - $this->limit_used = TRUE; - - return $newsql; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @ocilogoff($conn_id); - } - - -} - - - -/* End of file oci8_driver.php */ +username, $this->password, $this->hostname); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return @ociplogon($this->username, $this->password, $this->hostname); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Set client character set + * + * @access public + * @param string + * @param string + * @return resource + */ + function db_set_charset($charset, $collation) + { + // @todo - add support if needed + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return ociserverversion($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + // oracle must parse the query before it is run. All of the actions with + // the query are based on the statement id returned by ociparse + $this->stmt_id = FALSE; + $this->_set_stmt_id($sql); + ocisetprefetch($this->stmt_id, 1000); + return @ociexecute($this->stmt_id, $this->_commit); + } + + /** + * Generate a statement ID + * + * @access private + * @param string an SQL query + * @return none + */ + function _set_stmt_id($sql) + { + if ( ! is_resource($this->stmt_id)) + { + $this->stmt_id = ociparse($this->conn_id, $this->_prep_query($sql)); + } + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * getCursor. Returns a cursor from the datbase + * + * @access public + * @return cursor id + */ + function get_cursor() + { + $this->curs_id = ocinewcursor($this->conn_id); + return $this->curs_id; + } + + // -------------------------------------------------------------------- + + /** + * Stored Procedure. Executes a stored procedure + * + * @access public + * @param package package stored procedure is in + * @param procedure stored procedure to execute + * @param params array of parameters + * @return array + * + * params array keys + * + * KEY OPTIONAL NOTES + * name no the name of the parameter should be in : format + * value no the value of the parameter. If this is an OUT or IN OUT parameter, + * this should be a reference to a variable + * type yes the type of the parameter + * length yes the max size of the parameter + */ + function stored_procedure($package, $procedure, $params) + { + if ($package == '' OR $procedure == '' OR ! is_array($params)) + { + if ($this->db_debug) + { + log_message('error', 'Invalid query: '.$package.'.'.$procedure); + return $this->display_error('db_invalid_query'); + } + return FALSE; + } + + // build the query string + $sql = "begin $package.$procedure("; + + $have_cursor = FALSE; + foreach($params as $param) + { + $sql .= $param['name'] . ","; + + if (array_key_exists('type', $param) && ($param['type'] == OCI_B_CURSOR)) + { + $have_cursor = TRUE; + } + } + $sql = trim($sql, ",") . "); end;"; + + $this->stmt_id = FALSE; + $this->_set_stmt_id($sql); + $this->_bind_params($params); + $this->query($sql, FALSE, $have_cursor); + } + + // -------------------------------------------------------------------- + + /** + * Bind parameters + * + * @access private + * @return none + */ + function _bind_params($params) + { + if ( ! is_array($params) OR ! is_resource($this->stmt_id)) + { + return; + } + + foreach ($params as $param) + { + foreach (array('name', 'value', 'type', 'length') as $val) + { + if ( ! isset($param[$val])) + { + $param[$val] = ''; + } + } + + ocibindbyname($this->stmt_id, $param['name'], $param['value'], $param['length'], $param['type']); + } + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + $this->_commit = OCI_DEFAULT; + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $ret = OCIcommit($this->conn_id); + $this->_commit = OCI_COMMIT_ON_SUCCESS; + return $ret; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $ret = OCIrollback($this->conn_id); + $this->_commit = OCI_COMMIT_ON_SUCCESS; + return $ret; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + // Access the CI object + $CI =& get_instance(); + + return $CI->_remove_invisible_characters($str); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @ocirowcount($this->stmt_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + // not supported in oracle + return $this->display_error('db_unsupported_function'); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); + + if ($query == FALSE) + { + return 0; + } + + $row = $query->row(); + return $row->NUMROWS; + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @param boolean + * @return string + */ + function _list_tables($prefix_limit = FALSE) + { + $sql = "SELECT TABLE_NAME FROM ALL_TABLES"; + + if ($prefix_limit !== FALSE AND $this->dbprefix != '') + { + $sql .= " WHERE TABLE_NAME LIKE '".$this->dbprefix."%'"; + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SELECT COLUMN_NAME FROM all_tab_columns WHERE table_name = '$table'"; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$table." where rownum = 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + $error = ocierror($this->conn_id); + return $error['message']; + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + $error = ocierror($this->conn_id); + return $error['code']; + } + + // -------------------------------------------------------------------- + + /** + * Escape the SQL Identifiers + * + * This function escapes column and table names + * + * @access private + * @param string + * @return string + */ + function _escape_identifiers($item) + { + if ($this->_escape_char == '') + { + return $item; + } + + foreach ($this->_reserved_identifiers as $id) + { + if (strpos($item, '.'.$id) !== FALSE) + { + $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + } + + if (strpos($item, '.') !== FALSE) + { + $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; + } + else + { + $str = $this->_escape_char.$item.$this->_escape_char; + } + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + + // -------------------------------------------------------------------- + + /** + * From Tables + * + * This function implicitly groups FROM tables so there is no confusion + * about operator precedence in harmony with SQL standards + * + * @access public + * @param type + * @return type + */ + function _from_tables($tables) + { + if ( ! is_array($tables)) + { + $tables = array($tables); + } + + return implode(', ', $tables); + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @param array the orderby clause + * @param array the limit clause + * @return string + */ + function _update($table, $values, $where, $orderby = array(), $limit = FALSE) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; + + $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); + + $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; + + $sql .= $orderby.$limit; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Truncate statement + * + * Generates a platform-specific truncate string from the supplied data + * If the database does not support the truncate() command + * This function maps to "DELETE FROM table" + * + * @access public + * @param string the table name + * @return string + */ + function _truncate($table) + { + return "TRUNCATE TABLE ".$table; + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @param string the limit clause + * @return string + */ + function _delete($table, $where = array(), $like = array(), $limit = FALSE) + { + $conditions = ''; + + if (count($where) > 0 OR count($like) > 0) + { + $conditions = "\nWHERE "; + $conditions .= implode("\n", $this->ar_where); + + if (count($where) > 0 && count($like) > 0) + { + $conditions .= " AND "; + } + $conditions .= implode("\n", $like); + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$table.$conditions.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $limit = $offset + $limit; + $newsql = "SELECT * FROM (select inner_query.*, rownum rnum FROM ($sql) inner_query WHERE rownum < $limit)"; + + if ($offset != 0) + { + $newsql .= " WHERE rnum >= $offset"; + } + + // remember that we used limits + $this->limit_used = TRUE; + + return $newsql; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @ocilogoff($conn_id); + } + + +} + + + +/* End of file oci8_driver.php */ /* Location: ./system/database/drivers/oci8/oci8_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php index 4b073d07..bbc11f33 100644 --- a/system/database/drivers/oci8/oci8_forge.php +++ b/system/database/drivers/oci8/oci8_forge.php @@ -1,248 +1,248 @@ -db->_escape_identifiers($table)." ("; - $current_field_count = 0; - - foreach ($fields as $field=>$attributes) - { - // Numeric field names aren't allowed in databases, so if the key is - // numeric, we know it was assigned by PHP and the developer manually - // entered the field information, so we'll simply add it to the list - if (is_numeric($field)) - { - $sql .= "\n\t$attributes"; - } - else - { - $attributes = array_change_key_case($attributes, CASE_UPPER); - - $sql .= "\n\t".$this->db->_protect_identifiers($field); - - $sql .= ' '.$attributes['TYPE']; - - if (array_key_exists('CONSTRAINT', $attributes)) - { - $sql .= '('.$attributes['CONSTRAINT'].')'; - } - - if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) - { - $sql .= ' UNSIGNED'; - } - - if (array_key_exists('DEFAULT', $attributes)) - { - $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; - } - - if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) - { - $sql .= ' NULL'; - } - else - { - $sql .= ' NOT NULL'; - } - - if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) - { - $sql .= ' AUTO_INCREMENT'; - } - } - - // don't add a comma on the end of the last field - if (++$current_field_count < count($fields)) - { - $sql .= ','; - } - } - - if (count($primary_keys) > 0) - { - $primary_keys = $this->db->_protect_identifiers($primary_keys); - $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; - } - - if (is_array($keys) && count($keys) > 0) - { - foreach ($keys as $key) - { - if (is_array($key)) - { - $key = $this->db->_protect_identifiers($key); - } - else - { - $key = array($this->db->_protect_identifiers($key)); - } - - $sql .= ",\n\tUNIQUE COLUMNS (" . implode(', ', $key) . ")"; - } - } - - $sql .= "\n)"; - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * @access private - * @return bool - */ - function _drop_table($table) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Alter table query - * - * Generates a platform-specific query so that a table can be altered - * Called by add_column(), drop_column(), and column_alter(), - * - * @access private - * @param string the ALTER type (ADD, DROP, CHANGE) - * @param string the column name - * @param string the table name - * @param string the column definition - * @param string the default value - * @param boolean should 'NOT NULL' be added - * @param string the field after which we should add the new field - * @return object - */ - function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name); - - // DROP has everything it needs now. - if ($alter_type == 'DROP') - { - return $sql; - } - - $sql .= " $column_definition"; - - if ($default_value != '') - { - $sql .= " DEFAULT \"$default_value\""; - } - - if ($null === NULL) - { - $sql .= ' NULL'; - } - else - { - $sql .= ' NOT NULL'; - } - - if ($after_field != '') - { - $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); - } - - return $sql; - - } - - // -------------------------------------------------------------------- - - /** - * Rename a table - * - * Generates a platform-specific query so that a table can be renamed - * - * @access private - * @param string the old table name - * @param string the new table name - * @return string - */ - function _rename_table($table_name, $new_table_name) - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); - return $sql; - } - - -} - -/* End of file oci8_forge.php */ +db->_escape_identifiers($table)." ("; + $current_field_count = 0; + + foreach ($fields as $field=>$attributes) + { + // Numeric field names aren't allowed in databases, so if the key is + // numeric, we know it was assigned by PHP and the developer manually + // entered the field information, so we'll simply add it to the list + if (is_numeric($field)) + { + $sql .= "\n\t$attributes"; + } + else + { + $attributes = array_change_key_case($attributes, CASE_UPPER); + + $sql .= "\n\t".$this->db->_protect_identifiers($field); + + $sql .= ' '.$attributes['TYPE']; + + if (array_key_exists('CONSTRAINT', $attributes)) + { + $sql .= '('.$attributes['CONSTRAINT'].')'; + } + + if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) + { + $sql .= ' UNSIGNED'; + } + + if (array_key_exists('DEFAULT', $attributes)) + { + $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; + } + + if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) + { + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; + } + + if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) + { + $sql .= ' AUTO_INCREMENT'; + } + } + + // don't add a comma on the end of the last field + if (++$current_field_count < count($fields)) + { + $sql .= ','; + } + } + + if (count($primary_keys) > 0) + { + $primary_keys = $this->db->_protect_identifiers($primary_keys); + $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; + } + + if (is_array($keys) && count($keys) > 0) + { + foreach ($keys as $key) + { + if (is_array($key)) + { + $key = $this->db->_protect_identifiers($key); + } + else + { + $key = array($this->db->_protect_identifiers($key)); + } + + $sql .= ",\n\tUNIQUE COLUMNS (" . implode(', ', $key) . ")"; + } + } + + $sql .= "\n)"; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * @access private + * @return bool + */ + function _drop_table($table) + { + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Alter table query + * + * Generates a platform-specific query so that a table can be altered + * Called by add_column(), drop_column(), and column_alter(), + * + * @access private + * @param string the ALTER type (ADD, DROP, CHANGE) + * @param string the column name + * @param string the table name + * @param string the column definition + * @param string the default value + * @param boolean should 'NOT NULL' be added + * @param string the field after which we should add the new field + * @return object + */ + function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name); + + // DROP has everything it needs now. + if ($alter_type == 'DROP') + { + return $sql; + } + + $sql .= " $column_definition"; + + if ($default_value != '') + { + $sql .= " DEFAULT \"$default_value\""; + } + + if ($null === NULL) + { + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; + } + + if ($after_field != '') + { + $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); + } + + return $sql; + + } + + // -------------------------------------------------------------------- + + /** + * Rename a table + * + * Generates a platform-specific query so that a table can be renamed + * + * @access private + * @param string the old table name + * @param string the new table name + * @return string + */ + function _rename_table($table_name, $new_table_name) + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); + return $sql; + } + + +} + +/* End of file oci8_forge.php */ /* Location: ./system/database/drivers/oci8/oci8_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index 4cfbfa4b..7d7cd1c3 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -1,249 +1,249 @@ -result_array()); - @ociexecute($this->stmt_id); - - if ($this->curs_id) - { - @ociexecute($this->curs_id); - } - - return $rowcount; - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - $count = @ocinumcols($this->stmt_id); - - // if we used a limit we subtract it - if ($this->limit_used) - { - $count = $count - 1; - } - - return $count; - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - $fieldCount = $this->num_fields(); - for ($c = 1; $c <= $fieldCount; $c++) - { - $field_names[] = ocicolumnname($this->stmt_id, $c); - } - return $field_names; - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - $fieldCount = $this->num_fields(); - for ($c = 1; $c <= $fieldCount; $c++) - { - $F = new stdClass(); - $F->name = ocicolumnname($this->stmt_id, $c); - $F->type = ocicolumntype($this->stmt_id, $c); - $F->max_length = ocicolumnsize($this->stmt_id, $c); - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - ocifreestatement($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc(&$row) - { - $id = ($this->curs_id) ? $this->curs_id : $this->stmt_id; - - return ocifetchinto($id, $row, OCI_ASSOC + OCI_RETURN_NULLS); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - $result = array(); - - // If PHP 5 is being used we can fetch an result object - if (function_exists('oci_fetch_object')) - { - $id = ($this->curs_id) ? $this->curs_id : $this->stmt_id; - - return @oci_fetch_object($id); - } - - // If PHP 4 is being used we have to build our own result - foreach ($this->result_array() as $key => $val) - { - $obj = new stdClass(); - if (is_array($val)) - { - foreach ($val as $k => $v) - { - $obj->$k = $v; - } - } - else - { - $obj->$key = $val; - } - - $result[] = $obj; - } - - return $result; - } - - // -------------------------------------------------------------------- - - /** - * Query result. "array" version. - * - * @access public - * @return array - */ - function result_array() - { - if (count($this->result_array) > 0) - { - return $this->result_array; - } - - // oracle's fetch functions do not return arrays. - // The information is returned in reference parameters - $row = NULL; - while ($this->_fetch_assoc($row)) - { - $this->result_array[] = $row; - } - - return $this->result_array; - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return FALSE; // Not needed - } - -} - - -/* End of file oci8_result.php */ +result_array()); + @ociexecute($this->stmt_id); + + if ($this->curs_id) + { + @ociexecute($this->curs_id); + } + + return $rowcount; + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + $count = @ocinumcols($this->stmt_id); + + // if we used a limit we subtract it + if ($this->limit_used) + { + $count = $count - 1; + } + + return $count; + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + $fieldCount = $this->num_fields(); + for ($c = 1; $c <= $fieldCount; $c++) + { + $field_names[] = ocicolumnname($this->stmt_id, $c); + } + return $field_names; + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + $fieldCount = $this->num_fields(); + for ($c = 1; $c <= $fieldCount; $c++) + { + $F = new stdClass(); + $F->name = ocicolumnname($this->stmt_id, $c); + $F->type = ocicolumntype($this->stmt_id, $c); + $F->max_length = ocicolumnsize($this->stmt_id, $c); + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + ocifreestatement($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc(&$row) + { + $id = ($this->curs_id) ? $this->curs_id : $this->stmt_id; + + return ocifetchinto($id, $row, OCI_ASSOC + OCI_RETURN_NULLS); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + $result = array(); + + // If PHP 5 is being used we can fetch an result object + if (function_exists('oci_fetch_object')) + { + $id = ($this->curs_id) ? $this->curs_id : $this->stmt_id; + + return @oci_fetch_object($id); + } + + // If PHP 4 is being used we have to build our own result + foreach ($this->result_array() as $key => $val) + { + $obj = new stdClass(); + if (is_array($val)) + { + foreach ($val as $k => $v) + { + $obj->$k = $v; + } + } + else + { + $obj->$key = $val; + } + + $result[] = $obj; + } + + return $result; + } + + // -------------------------------------------------------------------- + + /** + * Query result. "array" version. + * + * @access public + * @return array + */ + function result_array() + { + if (count($this->result_array) > 0) + { + return $this->result_array; + } + + // oracle's fetch functions do not return arrays. + // The information is returned in reference parameters + $row = NULL; + while ($this->_fetch_assoc($row)) + { + $this->result_array[] = $row; + } + + return $this->result_array; + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return FALSE; // Not needed + } + +} + + +/* End of file oci8_result.php */ /* Location: ./system/database/drivers/oci8/oci8_result.php */ \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php index a3b6d815..cf6e9e64 100644 --- a/system/database/drivers/oci8/oci8_utility.php +++ b/system/database/drivers/oci8/oci8_utility.php @@ -1,122 +1,122 @@ -db->display_error('db_unsuported_feature'); - } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access public - * @param string the database name - * @return bool - */ - function _create_database($name) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - return FALSE; - } - -} - -/* End of file oci8_utility.php */ +db->display_error('db_unsuported_feature'); + } + + /** + * + * The functions below have been deprecated as of 1.6, and are only here for backwards + * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation + * is STRONGLY discouraged in favour if using dbforge. + * + */ + + /** + * Create database + * + * @access public + * @param string the database name + * @return bool + */ + function _create_database($name) + { + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access private + * @param string the database name + * @return bool + */ + function _drop_database($name) + { + return FALSE; + } + +} + +/* End of file oci8_utility.php */ /* Location: ./system/database/drivers/oci8/oci8_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/odbc/index.html b/system/database/drivers/odbc/index.html index 065d2da5..c942a79c 100644 --- a/system/database/drivers/odbc/index.html +++ b/system/database/drivers/odbc/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 3c6f0154..8fcbcfe0 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -1,594 +1,594 @@ -_random_keyword = ' RND('.time().')'; // database specific random keyword - } - - /** - * Non-persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_connect() - { - return @odbc_connect($this->hostname, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - return @odbc_pconnect($this->hostname, $this->username, $this->password); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - // Not needed for ODBC - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Set client character set - * - * @access public - * @param string - * @param string - * @return resource - */ - function db_set_charset($charset, $collation) - { - // @todo - add support if needed - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT version() AS ver"; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - return @odbc_exec($this->conn_id, $sql); - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - return odbc_autocommit($this->conn_id, FALSE); - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $ret = odbc_commit($this->conn_id); - odbc_autocommit($this->conn_id, TRUE); - return $ret; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $ret = odbc_rollback($this->conn_id); - odbc_autocommit($this->conn_id, TRUE); - return $ret; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - // Access the CI object - $CI =& get_instance(); - - // ODBC doesn't require escaping - return $CI->_remove_invisible_characters($str); - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @odbc_num_rows($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - return @odbc_insert_id($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * Show table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @param boolean - * @return string - */ - function _list_tables($prefix_limit = FALSE) - { - $sql = "SHOW TABLES FROM `".$this->database."`"; - - if ($prefix_limit !== FALSE AND $this->dbprefix != '') - { - //$sql .= " LIKE '".$this->dbprefix."%'"; - return FALSE; // not currently supported - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SHOW COLUMNS FROM ".$table; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT TOP 1 FROM ".$table; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - return odbc_errormsg($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - return odbc_error($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Escape the SQL Identifiers - * - * This function escapes column and table names - * - * @access private - * @param string - * @return string - */ - function _escape_identifiers($item) - { - if ($this->_escape_char == '') - { - return $item; - } - - foreach ($this->_reserved_identifiers as $id) - { - if (strpos($item, '.'.$id) !== FALSE) - { - $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - } - - if (strpos($item, '.') !== FALSE) - { - $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; - } - else - { - $str = $this->_escape_char.$item.$this->_escape_char; - } - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - - // -------------------------------------------------------------------- - - /** - * From Tables - * - * This function implicitly groups FROM tables so there is no confusion - * about operator precedence in harmony with SQL standards - * - * @access public - * @param type - * @return type - */ - function _from_tables($tables) - { - if ( ! is_array($tables)) - { - $tables = array($tables); - } - - return '('.implode(', ', $tables).')'; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @param array the orderby clause - * @param array the limit clause - * @return string - */ - function _update($table, $values, $where, $orderby = array(), $limit = FALSE) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; - - $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); - - $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; - - $sql .= $orderby.$limit; - - return $sql; - } - - - // -------------------------------------------------------------------- - - /** - * Truncate statement - * - * Generates a platform-specific truncate string from the supplied data - * If the database does not support the truncate() command - * This function maps to "DELETE FROM table" - * - * @access public - * @param string the table name - * @return string - */ - function _truncate($table) - { - return $this->_delete($table); - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @param string the limit clause - * @return string - */ - function _delete($table, $where = array(), $like = array(), $limit = FALSE) - { - $conditions = ''; - - if (count($where) > 0 OR count($like) > 0) - { - $conditions = "\nWHERE "; - $conditions .= implode("\n", $this->ar_where); - - if (count($where) > 0 && count($like) > 0) - { - $conditions .= " AND "; - } - $conditions .= implode("\n", $like); - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - return "DELETE FROM ".$table.$conditions.$limit; - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - // Does ODBC doesn't use the LIMIT clause? - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @odbc_close($conn_id); - } - - -} - - - -/* End of file odbc_driver.php */ +_random_keyword = ' RND('.time().')'; // database specific random keyword + } + + /** + * Non-persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_connect() + { + return @odbc_connect($this->hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return @odbc_pconnect($this->hostname, $this->username, $this->password); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + // Not needed for ODBC + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Set client character set + * + * @access public + * @param string + * @param string + * @return resource + */ + function db_set_charset($charset, $collation) + { + // @todo - add support if needed + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @odbc_exec($this->conn_id, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + return odbc_autocommit($this->conn_id, FALSE); + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $ret = odbc_commit($this->conn_id); + odbc_autocommit($this->conn_id, TRUE); + return $ret; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $ret = odbc_rollback($this->conn_id); + odbc_autocommit($this->conn_id, TRUE); + return $ret; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + // Access the CI object + $CI =& get_instance(); + + // ODBC doesn't require escaping + return $CI->_remove_invisible_characters($str); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @odbc_num_rows($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @odbc_insert_id($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @param boolean + * @return string + */ + function _list_tables($prefix_limit = FALSE) + { + $sql = "SHOW TABLES FROM `".$this->database."`"; + + if ($prefix_limit !== FALSE AND $this->dbprefix != '') + { + //$sql .= " LIKE '".$this->dbprefix."%'"; + return FALSE; // not currently supported + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SHOW COLUMNS FROM ".$table; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT TOP 1 FROM ".$table; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return odbc_errormsg($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return odbc_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape the SQL Identifiers + * + * This function escapes column and table names + * + * @access private + * @param string + * @return string + */ + function _escape_identifiers($item) + { + if ($this->_escape_char == '') + { + return $item; + } + + foreach ($this->_reserved_identifiers as $id) + { + if (strpos($item, '.'.$id) !== FALSE) + { + $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + } + + if (strpos($item, '.') !== FALSE) + { + $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; + } + else + { + $str = $this->_escape_char.$item.$this->_escape_char; + } + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + + // -------------------------------------------------------------------- + + /** + * From Tables + * + * This function implicitly groups FROM tables so there is no confusion + * about operator precedence in harmony with SQL standards + * + * @access public + * @param type + * @return type + */ + function _from_tables($tables) + { + if ( ! is_array($tables)) + { + $tables = array($tables); + } + + return '('.implode(', ', $tables).')'; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @param array the orderby clause + * @param array the limit clause + * @return string + */ + function _update($table, $values, $where, $orderby = array(), $limit = FALSE) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; + + $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); + + $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; + + $sql .= $orderby.$limit; + + return $sql; + } + + + // -------------------------------------------------------------------- + + /** + * Truncate statement + * + * Generates a platform-specific truncate string from the supplied data + * If the database does not support the truncate() command + * This function maps to "DELETE FROM table" + * + * @access public + * @param string the table name + * @return string + */ + function _truncate($table) + { + return $this->_delete($table); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @param string the limit clause + * @return string + */ + function _delete($table, $where = array(), $like = array(), $limit = FALSE) + { + $conditions = ''; + + if (count($where) > 0 OR count($like) > 0) + { + $conditions = "\nWHERE "; + $conditions .= implode("\n", $this->ar_where); + + if (count($where) > 0 && count($like) > 0) + { + $conditions .= " AND "; + } + $conditions .= implode("\n", $like); + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$table.$conditions.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + // Does ODBC doesn't use the LIMIT clause? + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @odbc_close($conn_id); + } + + +} + + + +/* End of file odbc_driver.php */ /* Location: ./system/database/drivers/odbc/odbc_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php index 099925ca..5305afbe 100644 --- a/system/database/drivers/odbc/odbc_forge.php +++ b/system/database/drivers/odbc/odbc_forge.php @@ -1,266 +1,266 @@ -db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - // ODBC has no "drop database" command since it's - // designed to connect to an existing database - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Create Table - * - * @access private - * @param string the table name - * @param array the fields - * @param mixed primary key(s) - * @param mixed key(s) - * @param boolean should 'IF NOT EXISTS' be added to the SQL - * @return bool - */ - function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) - { - $sql = 'CREATE TABLE '; - - if ($if_not_exists === TRUE) - { - $sql .= 'IF NOT EXISTS '; - } - - $sql .= $this->db->_escape_identifiers($table)." ("; - $current_field_count = 0; - - foreach ($fields as $field=>$attributes) - { - // Numeric field names aren't allowed in databases, so if the key is - // numeric, we know it was assigned by PHP and the developer manually - // entered the field information, so we'll simply add it to the list - if (is_numeric($field)) - { - $sql .= "\n\t$attributes"; - } - else - { - $attributes = array_change_key_case($attributes, CASE_UPPER); - - $sql .= "\n\t".$this->db->_protect_identifiers($field); - - $sql .= ' '.$attributes['TYPE']; - - if (array_key_exists('CONSTRAINT', $attributes)) - { - $sql .= '('.$attributes['CONSTRAINT'].')'; - } - - if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) - { - $sql .= ' UNSIGNED'; - } - - if (array_key_exists('DEFAULT', $attributes)) - { - $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; - } - - if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) - { - $sql .= ' NULL'; - } - else - { - $sql .= ' NOT NULL'; - } - - if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) - { - $sql .= ' AUTO_INCREMENT'; - } - } - - // don't add a comma on the end of the last field - if (++$current_field_count < count($fields)) - { - $sql .= ','; - } - } - - if (count($primary_keys) > 0) - { - $primary_keys = $this->db->_protect_identifiers($primary_keys); - $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; - } - - if (is_array($keys) && count($keys) > 0) - { - foreach ($keys as $key) - { - if (is_array($key)) - { - $key = $this->db->_protect_identifiers($key); - } - else - { - $key = array($this->db->_protect_identifiers($key)); - } - - $sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")"; - } - } - - $sql .= "\n)"; - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * @access private - * @return bool - */ - function _drop_table($table) - { - // Not a supported ODBC feature - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Alter table query - * - * Generates a platform-specific query so that a table can be altered - * Called by add_column(), drop_column(), and column_alter(), - * - * @access private - * @param string the ALTER type (ADD, DROP, CHANGE) - * @param string the column name - * @param string the table name - * @param string the column definition - * @param string the default value - * @param boolean should 'NOT NULL' be added - * @param string the field after which we should add the new field - * @return object - */ - function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name); - - // DROP has everything it needs now. - if ($alter_type == 'DROP') - { - return $sql; - } - - $sql .= " $column_definition"; - - if ($default_value != '') - { - $sql .= " DEFAULT \"$default_value\""; - } - - if ($null === NULL) - { - $sql .= ' NULL'; - } - else - { - $sql .= ' NOT NULL'; - } - - if ($after_field != '') - { - $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); - } - - return $sql; - - } - - - // -------------------------------------------------------------------- - - /** - * Rename a table - * - * Generates a platform-specific query so that a table can be renamed - * - * @access private - * @param string the old table name - * @param string the new table name - * @return string - */ - function _rename_table($table_name, $new_table_name) - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); - return $sql; - } - - -} - -/* End of file odbc_forge.php */ +db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access private + * @param string the database name + * @return bool + */ + function _drop_database($name) + { + // ODBC has no "drop database" command since it's + // designed to connect to an existing database + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Create Table + * + * @access private + * @param string the table name + * @param array the fields + * @param mixed primary key(s) + * @param mixed key(s) + * @param boolean should 'IF NOT EXISTS' be added to the SQL + * @return bool + */ + function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) + { + $sql = 'CREATE TABLE '; + + if ($if_not_exists === TRUE) + { + $sql .= 'IF NOT EXISTS '; + } + + $sql .= $this->db->_escape_identifiers($table)." ("; + $current_field_count = 0; + + foreach ($fields as $field=>$attributes) + { + // Numeric field names aren't allowed in databases, so if the key is + // numeric, we know it was assigned by PHP and the developer manually + // entered the field information, so we'll simply add it to the list + if (is_numeric($field)) + { + $sql .= "\n\t$attributes"; + } + else + { + $attributes = array_change_key_case($attributes, CASE_UPPER); + + $sql .= "\n\t".$this->db->_protect_identifiers($field); + + $sql .= ' '.$attributes['TYPE']; + + if (array_key_exists('CONSTRAINT', $attributes)) + { + $sql .= '('.$attributes['CONSTRAINT'].')'; + } + + if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) + { + $sql .= ' UNSIGNED'; + } + + if (array_key_exists('DEFAULT', $attributes)) + { + $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; + } + + if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) + { + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; + } + + if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) + { + $sql .= ' AUTO_INCREMENT'; + } + } + + // don't add a comma on the end of the last field + if (++$current_field_count < count($fields)) + { + $sql .= ','; + } + } + + if (count($primary_keys) > 0) + { + $primary_keys = $this->db->_protect_identifiers($primary_keys); + $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; + } + + if (is_array($keys) && count($keys) > 0) + { + foreach ($keys as $key) + { + if (is_array($key)) + { + $key = $this->db->_protect_identifiers($key); + } + else + { + $key = array($this->db->_protect_identifiers($key)); + } + + $sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")"; + } + } + + $sql .= "\n)"; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * @access private + * @return bool + */ + function _drop_table($table) + { + // Not a supported ODBC feature + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Alter table query + * + * Generates a platform-specific query so that a table can be altered + * Called by add_column(), drop_column(), and column_alter(), + * + * @access private + * @param string the ALTER type (ADD, DROP, CHANGE) + * @param string the column name + * @param string the table name + * @param string the column definition + * @param string the default value + * @param boolean should 'NOT NULL' be added + * @param string the field after which we should add the new field + * @return object + */ + function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name); + + // DROP has everything it needs now. + if ($alter_type == 'DROP') + { + return $sql; + } + + $sql .= " $column_definition"; + + if ($default_value != '') + { + $sql .= " DEFAULT \"$default_value\""; + } + + if ($null === NULL) + { + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; + } + + if ($after_field != '') + { + $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); + } + + return $sql; + + } + + + // -------------------------------------------------------------------- + + /** + * Rename a table + * + * Generates a platform-specific query so that a table can be renamed + * + * @access private + * @param string the old table name + * @param string the new table name + * @return string + */ + function _rename_table($table_name, $new_table_name) + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); + return $sql; + } + + +} + +/* End of file odbc_forge.php */ /* Location: ./system/database/drivers/odbc/odbc_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php index 6d6542e7..9a59cfc2 100644 --- a/system/database/drivers/odbc/odbc_result.php +++ b/system/database/drivers/odbc/odbc_result.php @@ -1,228 +1,228 @@ -result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @odbc_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $field_names[] = odbc_field_name($this->result_id, $i); - } - - return $field_names; - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $F = new stdClass(); - $F->name = odbc_field_name($this->result_id, $i); - $F->type = odbc_field_type($this->result_id, $i); - $F->max_length = odbc_field_len($this->result_id, $i); - $F->primary_key = 0; - $F->default = ''; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - odbc_free_result($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - if (function_exists('odbc_fetch_object')) - { - return odbc_fetch_array($this->result_id); - } - else - { - return $this->_odbc_fetch_array($this->result_id); - } - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - if (function_exists('odbc_fetch_object')) - { - return odbc_fetch_object($this->result_id); - } - else - { - return $this->_odbc_fetch_object($this->result_id); - } - } - - - /** - * Result - object - * - * subsititutes the odbc_fetch_object function when - * not available (odbc_fetch_object requires unixODBC) - * - * @access private - * @return object - */ - function _odbc_fetch_object(& $odbc_result) { - $rs = array(); - $rs_obj = false; - if (odbc_fetch_into($odbc_result, $rs)) { - foreach ($rs as $k=>$v) { - $field_name= odbc_field_name($odbc_result, $k+1); - $rs_obj->$field_name = $v; - } - } - return $rs_obj; - } - - - /** - * Result - array - * - * subsititutes the odbc_fetch_array function when - * not available (odbc_fetch_array requires unixODBC) - * - * @access private - * @return array - */ - function _odbc_fetch_array(& $odbc_result) { - $rs = array(); - $rs_assoc = false; - if (odbc_fetch_into($odbc_result, $rs)) { - $rs_assoc=array(); - foreach ($rs as $k=>$v) { - $field_name= odbc_field_name($odbc_result, $k+1); - $rs_assoc[$field_name] = $v; - } - } - return $rs_assoc; - } - -} - - -/* End of file odbc_result.php */ +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @odbc_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $field_names[] = odbc_field_name($this->result_id, $i); + } + + return $field_names; + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $F = new stdClass(); + $F->name = odbc_field_name($this->result_id, $i); + $F->type = odbc_field_type($this->result_id, $i); + $F->max_length = odbc_field_len($this->result_id, $i); + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + odbc_free_result($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + if (function_exists('odbc_fetch_object')) + { + return odbc_fetch_array($this->result_id); + } + else + { + return $this->_odbc_fetch_array($this->result_id); + } + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + if (function_exists('odbc_fetch_object')) + { + return odbc_fetch_object($this->result_id); + } + else + { + return $this->_odbc_fetch_object($this->result_id); + } + } + + + /** + * Result - object + * + * subsititutes the odbc_fetch_object function when + * not available (odbc_fetch_object requires unixODBC) + * + * @access private + * @return object + */ + function _odbc_fetch_object(& $odbc_result) { + $rs = array(); + $rs_obj = false; + if (odbc_fetch_into($odbc_result, $rs)) { + foreach ($rs as $k=>$v) { + $field_name= odbc_field_name($odbc_result, $k+1); + $rs_obj->$field_name = $v; + } + } + return $rs_obj; + } + + + /** + * Result - array + * + * subsititutes the odbc_fetch_array function when + * not available (odbc_fetch_array requires unixODBC) + * + * @access private + * @return array + */ + function _odbc_fetch_array(& $odbc_result) { + $rs = array(); + $rs_assoc = false; + if (odbc_fetch_into($odbc_result, $rs)) { + $rs_assoc=array(); + foreach ($rs as $k=>$v) { + $field_name= odbc_field_name($odbc_result, $k+1); + $rs_assoc[$field_name] = $v; + } + } + return $rs_assoc; + } + +} + + +/* End of file odbc_result.php */ /* Location: ./system/database/drivers/odbc/odbc_result.php */ \ No newline at end of file diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php index 6f4376ed..67aee642 100644 --- a/system/database/drivers/odbc/odbc_utility.php +++ b/system/database/drivers/odbc/odbc_utility.php @@ -1,148 +1,148 @@ -db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Optimize table query - * - * Generates a platform-specific query so that a table can be optimized - * - * @access private - * @param string the table name - * @return object - */ - function _optimize_table($table) - { - // Not a supported ODBC feature - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Repair table query - * - * Generates a platform-specific query so that a table can be repaired - * - * @access private - * @param string the table name - * @return object - */ - function _repair_table($table) - { - // Not a supported ODBC feature - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * ODBC Export - * - * @access private - * @param array Preferences - * @return mixed - */ - function _backup($params = array()) - { - // Currently unsupported - return $this->db->display_error('db_unsuported_feature'); - } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access private - * @param string the database name - * @return bool - */ - function _create_database() - { - // ODBC has no "create database" command since it's - // designed to connect to an existing database - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - // ODBC has no "drop database" command since it's - // designed to connect to an existing database - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } -} - -/* End of file odbc_utility.php */ +db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Optimize table query + * + * Generates a platform-specific query so that a table can be optimized + * + * @access private + * @param string the table name + * @return object + */ + function _optimize_table($table) + { + // Not a supported ODBC feature + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Generates a platform-specific query so that a table can be repaired + * + * @access private + * @param string the table name + * @return object + */ + function _repair_table($table) + { + // Not a supported ODBC feature + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * ODBC Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + // Currently unsupported + return $this->db->display_error('db_unsuported_feature'); + } + + /** + * + * The functions below have been deprecated as of 1.6, and are only here for backwards + * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation + * is STRONGLY discouraged in favour if using dbforge. + * + */ + + /** + * Create database + * + * @access private + * @param string the database name + * @return bool + */ + function _create_database() + { + // ODBC has no "create database" command since it's + // designed to connect to an existing database + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access private + * @param string the database name + * @return bool + */ + function _drop_database($name) + { + // ODBC has no "drop database" command since it's + // designed to connect to an existing database + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return FALSE; + } +} + +/* End of file odbc_utility.php */ /* Location: ./system/database/drivers/odbc/odbc_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/postgre/index.html b/system/database/drivers/postgre/index.html index 065d2da5..c942a79c 100644 --- a/system/database/drivers/postgre/index.html +++ b/system/database/drivers/postgre/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 68622a22..da0b0f23 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -1,636 +1,636 @@ - 'host', - 'port' => 'port', - 'database' => 'dbname', - 'username' => 'user', - 'password' => 'password' - ); - - $connect_string = ""; - foreach ($components as $key => $val) - { - if (isset($this->$key) && $this->$key != '') - { - $connect_string .= " $val=".$this->$key; - } - } - return trim($connect_string); - } - - // -------------------------------------------------------------------- - - /** - * Non-persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_connect() - { - return @pg_connect($this->_connect_string()); - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - return @pg_pconnect($this->_connect_string()); - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - // Not needed for Postgre so we'll return TRUE - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Set client character set - * - * @access public - * @param string - * @param string - * @return resource - */ - function db_set_charset($charset, $collation) - { - // @todo - add support if needed - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return "SELECT version() AS ver"; - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - return @pg_query($this->conn_id, $sql); - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - return @pg_exec($this->conn_id, "begin"); - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - return @pg_exec($this->conn_id, "commit"); - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - return @pg_exec($this->conn_id, "rollback"); - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - return pg_escape_string($str); - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return @pg_affected_rows($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - $v = $this->_version(); - $v = $v['server']; - - $table = func_num_args() > 0 ? func_get_arg(0) : null; - $column = func_num_args() > 1 ? func_get_arg(1) : null; - - if ($table == null && $v >= '8.1') - { - $sql='SELECT LASTVAL() as ins_id'; - } - elseif ($table != null && $column != null && $v >= '8.0') - { - $sql = sprintf("SELECT pg_get_serial_sequence('%s','%s') as seq", $table, $column); - $query = $this->query($sql); - $row = $query->row(); - $sql = sprintf("SELECT CURRVAL('%s') as ins_id", $row->seq); - } - elseif ($table != null) - { - // seq_name passed in table parameter - $sql = sprintf("SELECT CURRVAL('%s') as ins_id", $table); - } - else - { - return pg_last_oid($this->result_id); - } - $query = $this->query($sql); - $row = $query->row(); - return $row->ins_id; - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * Show table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @param boolean - * @return string - */ - function _list_tables($prefix_limit = FALSE) - { - $sql = "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"; - - if ($prefix_limit !== FALSE AND $this->dbprefix != '') - { - $sql .= " AND table_name LIKE '".$this->dbprefix."%'"; - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - return "SELECT column_name FROM information_schema.columns WHERE table_name ='".$table."'"; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT * FROM ".$table." LIMIT 1"; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - return pg_last_error($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - return ''; - } - - // -------------------------------------------------------------------- - - /** - * Escape the SQL Identifiers - * - * This function escapes column and table names - * - * @access private - * @param string - * @return string - */ - function _escape_identifiers($item) - { - if ($this->_escape_char == '') - { - return $item; - } - - foreach ($this->_reserved_identifiers as $id) - { - if (strpos($item, '.'.$id) !== FALSE) - { - $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - } - - if (strpos($item, '.') !== FALSE) - { - $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; - } - else - { - $str = $this->_escape_char.$item.$this->_escape_char; - } - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - - // -------------------------------------------------------------------- - - /** - * From Tables - * - * This function implicitly groups FROM tables so there is no confusion - * about operator precedence in harmony with SQL standards - * - * @access public - * @param type - * @return type - */ - function _from_tables($tables) - { - if ( ! is_array($tables)) - { - $tables = array($tables); - } - - return implode(', ', $tables); - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @param array the orderby clause - * @param array the limit clause - * @return string - */ - function _update($table, $values, $where, $orderby = array(), $limit = FALSE) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; - - $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); - - $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; - - $sql .= $orderby.$limit; - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Truncate statement - * - * Generates a platform-specific truncate string from the supplied data - * If the database does not support the truncate() command - * This function maps to "DELETE FROM table" - * - * @access public - * @param string the table name - * @return string - */ - function _truncate($table) - { - return "TRUNCATE ".$table; - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @param string the limit clause - * @return string - */ - function _delete($table, $where = array(), $like = array(), $limit = FALSE) - { - $conditions = ''; - - if (count($where) > 0 OR count($like) > 0) - { - $conditions = "\nWHERE "; - $conditions .= implode("\n", $this->ar_where); - - if (count($where) > 0 && count($like) > 0) - { - $conditions .= " AND "; - } - $conditions .= implode("\n", $like); - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - return "DELETE FROM ".$table.$conditions.$limit; - } - - // -------------------------------------------------------------------- - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - $sql .= "LIMIT ".$limit; - - if ($offset > 0) - { - $sql .= " OFFSET ".$offset; - } - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @pg_close($conn_id); - } - - -} - - -/* End of file postgre_driver.php */ + 'host', + 'port' => 'port', + 'database' => 'dbname', + 'username' => 'user', + 'password' => 'password' + ); + + $connect_string = ""; + foreach ($components as $key => $val) + { + if (isset($this->$key) && $this->$key != '') + { + $connect_string .= " $val=".$this->$key; + } + } + return trim($connect_string); + } + + // -------------------------------------------------------------------- + + /** + * Non-persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_connect() + { + return @pg_connect($this->_connect_string()); + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return @pg_pconnect($this->_connect_string()); + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + // Not needed for Postgre so we'll return TRUE + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Set client character set + * + * @access public + * @param string + * @param string + * @return resource + */ + function db_set_charset($charset, $collation) + { + // @todo - add support if needed + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return "SELECT version() AS ver"; + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @pg_query($this->conn_id, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + return @pg_exec($this->conn_id, "begin"); + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + return @pg_exec($this->conn_id, "commit"); + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + return @pg_exec($this->conn_id, "rollback"); + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + return pg_escape_string($str); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @pg_affected_rows($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + $v = $this->_version(); + $v = $v['server']; + + $table = func_num_args() > 0 ? func_get_arg(0) : null; + $column = func_num_args() > 1 ? func_get_arg(1) : null; + + if ($table == null && $v >= '8.1') + { + $sql='SELECT LASTVAL() as ins_id'; + } + elseif ($table != null && $column != null && $v >= '8.0') + { + $sql = sprintf("SELECT pg_get_serial_sequence('%s','%s') as seq", $table, $column); + $query = $this->query($sql); + $row = $query->row(); + $sql = sprintf("SELECT CURRVAL('%s') as ins_id", $row->seq); + } + elseif ($table != null) + { + // seq_name passed in table parameter + $sql = sprintf("SELECT CURRVAL('%s') as ins_id", $table); + } + else + { + return pg_last_oid($this->result_id); + } + $query = $this->query($sql); + $row = $query->row(); + return $row->ins_id; + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * Show table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @param boolean + * @return string + */ + function _list_tables($prefix_limit = FALSE) + { + $sql = "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"; + + if ($prefix_limit !== FALSE AND $this->dbprefix != '') + { + $sql .= " AND table_name LIKE '".$this->dbprefix."%'"; + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SELECT column_name FROM information_schema.columns WHERE table_name ='".$table."'"; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$table." LIMIT 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return pg_last_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return ''; + } + + // -------------------------------------------------------------------- + + /** + * Escape the SQL Identifiers + * + * This function escapes column and table names + * + * @access private + * @param string + * @return string + */ + function _escape_identifiers($item) + { + if ($this->_escape_char == '') + { + return $item; + } + + foreach ($this->_reserved_identifiers as $id) + { + if (strpos($item, '.'.$id) !== FALSE) + { + $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + } + + if (strpos($item, '.') !== FALSE) + { + $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; + } + else + { + $str = $this->_escape_char.$item.$this->_escape_char; + } + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + + // -------------------------------------------------------------------- + + /** + * From Tables + * + * This function implicitly groups FROM tables so there is no confusion + * about operator precedence in harmony with SQL standards + * + * @access public + * @param type + * @return type + */ + function _from_tables($tables) + { + if ( ! is_array($tables)) + { + $tables = array($tables); + } + + return implode(', ', $tables); + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @param array the orderby clause + * @param array the limit clause + * @return string + */ + function _update($table, $values, $where, $orderby = array(), $limit = FALSE) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; + + $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); + + $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; + + $sql .= $orderby.$limit; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Truncate statement + * + * Generates a platform-specific truncate string from the supplied data + * If the database does not support the truncate() command + * This function maps to "DELETE FROM table" + * + * @access public + * @param string the table name + * @return string + */ + function _truncate($table) + { + return "TRUNCATE ".$table; + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @param string the limit clause + * @return string + */ + function _delete($table, $where = array(), $like = array(), $limit = FALSE) + { + $conditions = ''; + + if (count($where) > 0 OR count($like) > 0) + { + $conditions = "\nWHERE "; + $conditions .= implode("\n", $this->ar_where); + + if (count($where) > 0 && count($like) > 0) + { + $conditions .= " AND "; + } + $conditions .= implode("\n", $like); + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$table.$conditions.$limit; + } + + // -------------------------------------------------------------------- + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + $sql .= "LIMIT ".$limit; + + if ($offset > 0) + { + $sql .= " OFFSET ".$offset; + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @pg_close($conn_id); + } + + +} + + +/* End of file postgre_driver.php */ /* Location: ./system/database/drivers/postgre/postgre_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php index 5b4bcc29..72c2dd79 100644 --- a/system/database/drivers/postgre/postgre_forge.php +++ b/system/database/drivers/postgre/postgre_forge.php @@ -1,248 +1,248 @@ -db->_escape_identifiers($table)." ("; - $current_field_count = 0; - - foreach ($fields as $field=>$attributes) - { - // Numeric field names aren't allowed in databases, so if the key is - // numeric, we know it was assigned by PHP and the developer manually - // entered the field information, so we'll simply add it to the list - if (is_numeric($field)) - { - $sql .= "\n\t$attributes"; - } - else - { - $attributes = array_change_key_case($attributes, CASE_UPPER); - - $sql .= "\n\t".$this->db->_protect_identifiers($field); - - $sql .= ' '.$attributes['TYPE']; - - if (array_key_exists('CONSTRAINT', $attributes)) - { - $sql .= '('.$attributes['CONSTRAINT'].')'; - } - - if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) - { - $sql .= ' UNSIGNED'; - } - - if (array_key_exists('DEFAULT', $attributes)) - { - $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; - } - - if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) - { - $sql .= ' NULL'; - } - else - { - $sql .= ' NOT NULL'; - } - - if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) - { - $sql .= ' AUTO_INCREMENT'; - } - } - - // don't add a comma on the end of the last field - if (++$current_field_count < count($fields)) - { - $sql .= ','; - } - } - - if (count($primary_keys) > 0) - { - $primary_keys = $this->db->_protect_identifiers($primary_keys); - $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; - } - - if (is_array($keys) && count($keys) > 0) - { - foreach ($keys as $key) - { - if (is_array($key)) - { - $key = $this->db->_protect_identifiers($key); - } - else - { - $key = array($this->db->_protect_identifiers($key)); - } - - $sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")"; - } - } - - $sql .= "\n);"; - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * @access private - * @return bool - */ - function _drop_table($table) - { - return "DROP TABLE ".$this->db->_escape_identifiers($table)." CASCADE"; - } - - // -------------------------------------------------------------------- - - /** - * Alter table query - * - * Generates a platform-specific query so that a table can be altered - * Called by add_column(), drop_column(), and column_alter(), - * - * @access private - * @param string the ALTER type (ADD, DROP, CHANGE) - * @param string the column name - * @param string the table name - * @param string the column definition - * @param string the default value - * @param boolean should 'NOT NULL' be added - * @param string the field after which we should add the new field - * @return object - */ - function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name); - - // DROP has everything it needs now. - if ($alter_type == 'DROP') - { - return $sql; - } - - $sql .= " $column_definition"; - - if ($default_value != '') - { - $sql .= " DEFAULT \"$default_value\""; - } - - if ($null === NULL) - { - $sql .= ' NULL'; - } - else - { - $sql .= ' NOT NULL'; - } - - if ($after_field != '') - { - $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); - } - - return $sql; - - } - - // -------------------------------------------------------------------- - - /** - * Rename a table - * - * Generates a platform-specific query so that a table can be renamed - * - * @access private - * @param string the old table name - * @param string the new table name - * @return string - */ - function _rename_table($table_name, $new_table_name) - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); - return $sql; - } - - -} - -/* End of file postgre_forge.php */ +db->_escape_identifiers($table)." ("; + $current_field_count = 0; + + foreach ($fields as $field=>$attributes) + { + // Numeric field names aren't allowed in databases, so if the key is + // numeric, we know it was assigned by PHP and the developer manually + // entered the field information, so we'll simply add it to the list + if (is_numeric($field)) + { + $sql .= "\n\t$attributes"; + } + else + { + $attributes = array_change_key_case($attributes, CASE_UPPER); + + $sql .= "\n\t".$this->db->_protect_identifiers($field); + + $sql .= ' '.$attributes['TYPE']; + + if (array_key_exists('CONSTRAINT', $attributes)) + { + $sql .= '('.$attributes['CONSTRAINT'].')'; + } + + if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) + { + $sql .= ' UNSIGNED'; + } + + if (array_key_exists('DEFAULT', $attributes)) + { + $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; + } + + if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) + { + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; + } + + if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) + { + $sql .= ' AUTO_INCREMENT'; + } + } + + // don't add a comma on the end of the last field + if (++$current_field_count < count($fields)) + { + $sql .= ','; + } + } + + if (count($primary_keys) > 0) + { + $primary_keys = $this->db->_protect_identifiers($primary_keys); + $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; + } + + if (is_array($keys) && count($keys) > 0) + { + foreach ($keys as $key) + { + if (is_array($key)) + { + $key = $this->db->_protect_identifiers($key); + } + else + { + $key = array($this->db->_protect_identifiers($key)); + } + + $sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")"; + } + } + + $sql .= "\n);"; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * @access private + * @return bool + */ + function _drop_table($table) + { + return "DROP TABLE ".$this->db->_escape_identifiers($table)." CASCADE"; + } + + // -------------------------------------------------------------------- + + /** + * Alter table query + * + * Generates a platform-specific query so that a table can be altered + * Called by add_column(), drop_column(), and column_alter(), + * + * @access private + * @param string the ALTER type (ADD, DROP, CHANGE) + * @param string the column name + * @param string the table name + * @param string the column definition + * @param string the default value + * @param boolean should 'NOT NULL' be added + * @param string the field after which we should add the new field + * @return object + */ + function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name); + + // DROP has everything it needs now. + if ($alter_type == 'DROP') + { + return $sql; + } + + $sql .= " $column_definition"; + + if ($default_value != '') + { + $sql .= " DEFAULT \"$default_value\""; + } + + if ($null === NULL) + { + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; + } + + if ($after_field != '') + { + $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); + } + + return $sql; + + } + + // -------------------------------------------------------------------- + + /** + * Rename a table + * + * Generates a platform-specific query so that a table can be renamed + * + * @access private + * @param string the old table name + * @param string the new table name + * @return string + */ + function _rename_table($table_name, $new_table_name) + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); + return $sql; + } + + +} + +/* End of file postgre_forge.php */ /* Location: ./system/database/drivers/postgre/postgre_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php index 78b9a604..3206c133 100644 --- a/system/database/drivers/postgre/postgre_result.php +++ b/system/database/drivers/postgre/postgre_result.php @@ -1,169 +1,169 @@ -result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @pg_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $field_names[] = pg_field_name($this->result_id, $i); - } - - return $field_names; - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $F = new stdClass(); - $F->name = pg_field_name($this->result_id, $i); - $F->type = pg_field_type($this->result_id, $i); - $F->max_length = pg_field_size($this->result_id, $i); - $F->primary_key = 0; - $F->default = ''; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - if (is_resource($this->result_id)) - { - pg_free_result($this->result_id); - $this->result_id = FALSE; - } - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return pg_result_seek($this->result_id, $n); - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - return pg_fetch_assoc($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - return pg_fetch_object($this->result_id); - } - -} - - -/* End of file postgre_result.php */ +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @pg_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $field_names[] = pg_field_name($this->result_id, $i); + } + + return $field_names; + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $F = new stdClass(); + $F->name = pg_field_name($this->result_id, $i); + $F->type = pg_field_type($this->result_id, $i); + $F->max_length = pg_field_size($this->result_id, $i); + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if (is_resource($this->result_id)) + { + pg_free_result($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return pg_result_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return pg_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return pg_fetch_object($this->result_id); + } + +} + + +/* End of file postgre_result.php */ /* Location: ./system/database/drivers/postgre/postgre_result.php */ \ No newline at end of file diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php index f9b0f22e..06292f22 100644 --- a/system/database/drivers/postgre/postgre_utility.php +++ b/system/database/drivers/postgre/postgre_utility.php @@ -1,124 +1,124 @@ -db->display_error('db_unsuported_feature'); - } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access private - * @param string the database name - * @return bool - */ - function _create_database($name) - { - return "CREATE DATABASE ".$name; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - return "DROP DATABASE ".$name; - } - - -} - - -/* End of file postgre_utility.php */ +db->display_error('db_unsuported_feature'); + } + + /** + * + * The functions below have been deprecated as of 1.6, and are only here for backwards + * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation + * is STRONGLY discouraged in favour if using dbforge. + * + */ + + /** + * Create database + * + * @access private + * @param string the database name + * @return bool + */ + function _create_database($name) + { + return "CREATE DATABASE ".$name; + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access private + * @param string the database name + * @return bool + */ + function _drop_database($name) + { + return "DROP DATABASE ".$name; + } + + +} + + +/* End of file postgre_utility.php */ /* Location: ./system/database/drivers/postgre/postgre_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite/index.html b/system/database/drivers/sqlite/index.html index 065d2da5..c942a79c 100644 --- a/system/database/drivers/sqlite/index.html +++ b/system/database/drivers/sqlite/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 992e2479..058cef77 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -1,612 +1,612 @@ -database, FILE_WRITE_MODE, $error)) - { - log_message('error', $error); - - if ($this->db_debug) - { - $this->display_error($error, '', TRUE); - } - - return FALSE; - } - - return $conn_id; - } - - // -------------------------------------------------------------------- - - /** - * Persistent database connection - * - * @access private called by the base class - * @return resource - */ - function db_pconnect() - { - if ( ! $conn_id = @sqlite_popen($this->database, FILE_WRITE_MODE, $error)) - { - log_message('error', $error); - - if ($this->db_debug) - { - $this->display_error($error, '', TRUE); - } - - return FALSE; - } - - return $conn_id; - } - - // -------------------------------------------------------------------- - - /** - * Select the database - * - * @access private called by the base class - * @return resource - */ - function db_select() - { - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Set client character set - * - * @access public - * @param string - * @param string - * @return resource - */ - function db_set_charset($charset, $collation) - { - // @todo - add support if needed - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Version number query string - * - * @access public - * @return string - */ - function _version() - { - return sqlite_libversion(); - } - - // -------------------------------------------------------------------- - - /** - * Execute the query - * - * @access private called by the base class - * @param string an SQL query - * @return resource - */ - function _execute($sql) - { - $sql = $this->_prep_query($sql); - return @sqlite_query($this->conn_id, $sql); - } - - // -------------------------------------------------------------------- - - /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @access private called by execute() - * @param string an SQL query - * @return string - */ - function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Begin Transaction - * - * @access public - * @return bool - */ - function trans_begin($test_mode = FALSE) - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - // Reset the transaction failure flag. - // If the $test_mode flag is set to TRUE transactions will be rolled back - // even if the queries produce a successful result. - $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - - $this->simple_query('BEGIN TRANSACTION'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Commit Transaction - * - * @access public - * @return bool - */ - function trans_commit() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('COMMIT'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Rollback Transaction - * - * @access public - * @return bool - */ - function trans_rollback() - { - if ( ! $this->trans_enabled) - { - return TRUE; - } - - // When transactions are nested we only begin/commit/rollback the outermost ones - if ($this->_trans_depth > 0) - { - return TRUE; - } - - $this->simple_query('ROLLBACK'); - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Escape String - * - * @access public - * @param string - * @return string - */ - function escape_str($str) - { - return sqlite_escape_string($str); - } - - // -------------------------------------------------------------------- - - /** - * Affected Rows - * - * @access public - * @return integer - */ - function affected_rows() - { - return sqlite_changes($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Insert ID - * - * @access public - * @return integer - */ - function insert_id() - { - return @sqlite_last_insert_rowid($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * "Count All" query - * - * Generates a platform-specific query string that counts all records in - * the specified database - * - * @access public - * @param string - * @return string - */ - function count_all($table = '') - { - if ($table == '') - return '0'; - - $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); - - if ($query->num_rows() == 0) - return '0'; - - $row = $query->row(); - return $row->numrows; - } - - // -------------------------------------------------------------------- - - /** - * List table query - * - * Generates a platform-specific query string so that the table names can be fetched - * - * @access private - * @param boolean - * @return string - */ - function _list_tables($prefix_limit = FALSE) - { - $sql = "SELECT name from sqlite_master WHERE type='table'"; - - if ($prefix_limit !== FALSE AND $this->dbprefix != '') - { - $sql .= " AND 'name' LIKE '".$this->dbprefix."%'"; - } - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Show column query - * - * Generates a platform-specific query string so that the column names can be fetched - * - * @access public - * @param string the table name - * @return string - */ - function _list_columns($table = '') - { - // Not supported - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Field data query - * - * Generates a platform-specific query so that the column data can be retrieved - * - * @access public - * @param string the table name - * @return object - */ - function _field_data($table) - { - return "SELECT * FROM ".$table." LIMIT 1"; - } - - // -------------------------------------------------------------------- - - /** - * The error message string - * - * @access private - * @return string - */ - function _error_message() - { - return sqlite_error_string(sqlite_last_error($this->conn_id)); - } - - // -------------------------------------------------------------------- - - /** - * The error message number - * - * @access private - * @return integer - */ - function _error_number() - { - return sqlite_last_error($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * Escape the SQL Identifiers - * - * This function escapes column and table names - * - * @access private - * @param string - * @return string - */ - function _escape_identifiers($item) - { - if ($this->_escape_char == '') - { - return $item; - } - - foreach ($this->_reserved_identifiers as $id) - { - if (strpos($item, '.'.$id) !== FALSE) - { - $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - } - - if (strpos($item, '.') !== FALSE) - { - $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; - } - else - { - $str = $this->_escape_char.$item.$this->_escape_char; - } - - // remove duplicates if the user already included the escape - return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); - } - - // -------------------------------------------------------------------- - - /** - * From Tables - * - * This function implicitly groups FROM tables so there is no confusion - * about operator precedence in harmony with SQL standards - * - * @access public - * @param type - * @return type - */ - function _from_tables($tables) - { - if ( ! is_array($tables)) - { - $tables = array($tables); - } - - return '('.implode(', ', $tables).')'; - } - - // -------------------------------------------------------------------- - - /** - * Insert statement - * - * Generates a platform-specific insert string from the supplied data - * - * @access public - * @param string the table name - * @param array the insert keys - * @param array the insert values - * @return string - */ - function _insert($table, $keys, $values) - { - return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; - } - - // -------------------------------------------------------------------- - - /** - * Update statement - * - * Generates a platform-specific update string from the supplied data - * - * @access public - * @param string the table name - * @param array the update data - * @param array the where clause - * @param array the orderby clause - * @param array the limit clause - * @return string - */ - function _update($table, $values, $where, $orderby = array(), $limit = FALSE) - { - foreach($values as $key => $val) - { - $valstr[] = $key." = ".$val; - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; - - $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); - - $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; - - $sql .= $orderby.$limit; - - return $sql; - } - - - // -------------------------------------------------------------------- - - /** - * Truncate statement - * - * Generates a platform-specific truncate string from the supplied data - * If the database does not support the truncate() command - * This function maps to "DELETE FROM table" - * - * @access public - * @param string the table name - * @return string - */ - function _truncate($table) - { - return $this->_delete($table); - } - - // -------------------------------------------------------------------- - - /** - * Delete statement - * - * Generates a platform-specific delete string from the supplied data - * - * @access public - * @param string the table name - * @param array the where clause - * @param string the limit clause - * @return string - */ - function _delete($table, $where = array(), $like = array(), $limit = FALSE) - { - $conditions = ''; - - if (count($where) > 0 OR count($like) > 0) - { - $conditions = "\nWHERE "; - $conditions .= implode("\n", $this->ar_where); - - if (count($where) > 0 && count($like) > 0) - { - $conditions .= " AND "; - } - $conditions .= implode("\n", $like); - } - - $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; - - return "DELETE FROM ".$table.$conditions.$limit; - } - - // -------------------------------------------------------------------- - - /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @access public - * @param string the sql query string - * @param integer the number of rows to limit the query to - * @param integer the offset value - * @return string - */ - function _limit($sql, $limit, $offset) - { - if ($offset == 0) - { - $offset = ''; - } - else - { - $offset .= ", "; - } - - return $sql."LIMIT ".$offset.$limit; - } - - // -------------------------------------------------------------------- - - /** - * Close DB Connection - * - * @access public - * @param resource - * @return void - */ - function _close($conn_id) - { - @sqlite_close($conn_id); - } - - -} - - -/* End of file sqlite_driver.php */ +database, FILE_WRITE_MODE, $error)) + { + log_message('error', $error); + + if ($this->db_debug) + { + $this->display_error($error, '', TRUE); + } + + return FALSE; + } + + return $conn_id; + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + if ( ! $conn_id = @sqlite_popen($this->database, FILE_WRITE_MODE, $error)) + { + log_message('error', $error); + + if ($this->db_debug) + { + $this->display_error($error, '', TRUE); + } + + return FALSE; + } + + return $conn_id; + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Set client character set + * + * @access public + * @param string + * @param string + * @return resource + */ + function db_set_charset($charset, $collation) + { + // @todo - add support if needed + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return sqlite_libversion(); + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @sqlite_query($this->conn_id, $sql); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + $this->simple_query('BEGIN TRANSACTION'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('COMMIT'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + $this->simple_query('ROLLBACK'); + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @return string + */ + function escape_str($str) + { + return sqlite_escape_string($str); + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return sqlite_changes($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @sqlite_last_insert_rowid($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified database + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + return '0'; + + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); + + if ($query->num_rows() == 0) + return '0'; + + $row = $query->row(); + return $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * List table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @param boolean + * @return string + */ + function _list_tables($prefix_limit = FALSE) + { + $sql = "SELECT name from sqlite_master WHERE type='table'"; + + if ($prefix_limit !== FALSE AND $this->dbprefix != '') + { + $sql .= " AND 'name' LIKE '".$this->dbprefix."%'"; + } + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + // Not supported + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$table." LIMIT 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return sqlite_error_string(sqlite_last_error($this->conn_id)); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return sqlite_last_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape the SQL Identifiers + * + * This function escapes column and table names + * + * @access private + * @param string + * @return string + */ + function _escape_identifiers($item) + { + if ($this->_escape_char == '') + { + return $item; + } + + foreach ($this->_reserved_identifiers as $id) + { + if (strpos($item, '.'.$id) !== FALSE) + { + $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + } + + if (strpos($item, '.') !== FALSE) + { + $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; + } + else + { + $str = $this->_escape_char.$item.$this->_escape_char; + } + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + + // -------------------------------------------------------------------- + + /** + * From Tables + * + * This function implicitly groups FROM tables so there is no confusion + * about operator precedence in harmony with SQL standards + * + * @access public + * @param type + * @return type + */ + function _from_tables($tables) + { + if ( ! is_array($tables)) + { + $tables = array($tables); + } + + return '('.implode(', ', $tables).')'; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @param array the orderby clause + * @param array the limit clause + * @return string + */ + function _update($table, $values, $where, $orderby = array(), $limit = FALSE) + { + foreach($values as $key => $val) + { + $valstr[] = $key." = ".$val; + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; + + $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); + + $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; + + $sql .= $orderby.$limit; + + return $sql; + } + + + // -------------------------------------------------------------------- + + /** + * Truncate statement + * + * Generates a platform-specific truncate string from the supplied data + * If the database does not support the truncate() command + * This function maps to "DELETE FROM table" + * + * @access public + * @param string the table name + * @return string + */ + function _truncate($table) + { + return $this->_delete($table); + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @param string the limit clause + * @return string + */ + function _delete($table, $where = array(), $like = array(), $limit = FALSE) + { + $conditions = ''; + + if (count($where) > 0 OR count($like) > 0) + { + $conditions = "\nWHERE "; + $conditions .= implode("\n", $this->ar_where); + + if (count($where) > 0 && count($like) > 0) + { + $conditions .= " AND "; + } + $conditions .= implode("\n", $like); + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$table.$conditions.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + if ($offset == 0) + { + $offset = ''; + } + else + { + $offset .= ", "; + } + + return $sql."LIMIT ".$offset.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @sqlite_close($conn_id); + } + + +} + + +/* End of file sqlite_driver.php */ /* Location: ./system/database/drivers/sqlite/sqlite_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php index 2039525b..73630def 100644 --- a/system/database/drivers/sqlite/sqlite_forge.php +++ b/system/database/drivers/sqlite/sqlite_forge.php @@ -1,265 +1,265 @@ -db->database) OR ! @unlink($this->db->database)) - { - if ($this->db->db_debug) - { - return $this->db->display_error('db_unable_to_drop'); - } - return FALSE; - } - return TRUE; - } - // -------------------------------------------------------------------- - - /** - * Create Table - * - * @access private - * @param string the table name - * @param array the fields - * @param mixed primary key(s) - * @param mixed key(s) - * @param boolean should 'IF NOT EXISTS' be added to the SQL - * @return bool - */ - function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) - { - $sql = 'CREATE TABLE '; - - // IF NOT EXISTS added to SQLite in 3.3.0 - if ($if_not_exists === TRUE && version_compare($this->_version(), '3.3.0', '>=') === TRUE) - { - $sql .= 'IF NOT EXISTS '; - } - - $sql .= $this->db->_escape_identifiers($table)."("; - $current_field_count = 0; - - foreach ($fields as $field=>$attributes) - { - // Numeric field names aren't allowed in databases, so if the key is - // numeric, we know it was assigned by PHP and the developer manually - // entered the field information, so we'll simply add it to the list - if (is_numeric($field)) - { - $sql .= "\n\t$attributes"; - } - else - { - $attributes = array_change_key_case($attributes, CASE_UPPER); - - $sql .= "\n\t".$this->db->_protect_identifiers($field); - - $sql .= ' '.$attributes['TYPE']; - - if (array_key_exists('CONSTRAINT', $attributes)) - { - $sql .= '('.$attributes['CONSTRAINT'].')'; - } - - if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) - { - $sql .= ' UNSIGNED'; - } - - if (array_key_exists('DEFAULT', $attributes)) - { - $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; - } - - if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) - { - $sql .= ' NULL'; - } - else - { - $sql .= ' NOT NULL'; - } - - if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) - { - $sql .= ' AUTO_INCREMENT'; - } - } - - // don't add a comma on the end of the last field - if (++$current_field_count < count($fields)) - { - $sql .= ','; - } - } - - if (count($primary_keys) > 0) - { - $primary_keys = $this->db->_protect_identifiers($primary_keys); - $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; - } - - if (is_array($keys) && count($keys) > 0) - { - foreach ($keys as $key) - { - if (is_array($key)) - { - $key = $this->db->_protect_identifiers($key); - } - else - { - $key = array($this->db->_protect_identifiers($key)); - } - - $sql .= ",\n\tUNIQUE (" . implode(', ', $key) . ")"; - } - } - - $sql .= "\n)"; - - return $sql; - } - - // -------------------------------------------------------------------- - - /** - * Drop Table - * - * Unsupported feature in SQLite - * - * @access private - * @return bool - */ - function _drop_table($table) - { - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return array(); - } - - // -------------------------------------------------------------------- - - /** - * Alter table query - * - * Generates a platform-specific query so that a table can be altered - * Called by add_column(), drop_column(), and column_alter(), - * - * @access private - * @param string the ALTER type (ADD, DROP, CHANGE) - * @param string the column name - * @param string the table name - * @param string the column definition - * @param string the default value - * @param boolean should 'NOT NULL' be added - * @param string the field after which we should add the new field - * @return object - */ - function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name); - - // DROP has everything it needs now. - if ($alter_type == 'DROP') - { - // SQLite does not support dropping columns - // http://www.sqlite.org/omitted.html - // http://www.sqlite.org/faq.html#q11 - return FALSE; - } - - $sql .= " $column_definition"; - - if ($default_value != '') - { - $sql .= " DEFAULT \"$default_value\""; - } - - if ($null === NULL) - { - $sql .= ' NULL'; - } - else - { - $sql .= ' NOT NULL'; - } - - if ($after_field != '') - { - $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); - } - - return $sql; - - } - - // -------------------------------------------------------------------- - - /** - * Rename a table - * - * Generates a platform-specific query so that a table can be renamed - * - * @access private - * @param string the old table name - * @param string the new table name - * @return string - */ - function _rename_table($table_name, $new_table_name) - { - $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); - return $sql; - } -} - -/* End of file sqlite_forge.php */ +db->database) OR ! @unlink($this->db->database)) + { + if ($this->db->db_debug) + { + return $this->db->display_error('db_unable_to_drop'); + } + return FALSE; + } + return TRUE; + } + // -------------------------------------------------------------------- + + /** + * Create Table + * + * @access private + * @param string the table name + * @param array the fields + * @param mixed primary key(s) + * @param mixed key(s) + * @param boolean should 'IF NOT EXISTS' be added to the SQL + * @return bool + */ + function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) + { + $sql = 'CREATE TABLE '; + + // IF NOT EXISTS added to SQLite in 3.3.0 + if ($if_not_exists === TRUE && version_compare($this->_version(), '3.3.0', '>=') === TRUE) + { + $sql .= 'IF NOT EXISTS '; + } + + $sql .= $this->db->_escape_identifiers($table)."("; + $current_field_count = 0; + + foreach ($fields as $field=>$attributes) + { + // Numeric field names aren't allowed in databases, so if the key is + // numeric, we know it was assigned by PHP and the developer manually + // entered the field information, so we'll simply add it to the list + if (is_numeric($field)) + { + $sql .= "\n\t$attributes"; + } + else + { + $attributes = array_change_key_case($attributes, CASE_UPPER); + + $sql .= "\n\t".$this->db->_protect_identifiers($field); + + $sql .= ' '.$attributes['TYPE']; + + if (array_key_exists('CONSTRAINT', $attributes)) + { + $sql .= '('.$attributes['CONSTRAINT'].')'; + } + + if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) + { + $sql .= ' UNSIGNED'; + } + + if (array_key_exists('DEFAULT', $attributes)) + { + $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; + } + + if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) + { + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; + } + + if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) + { + $sql .= ' AUTO_INCREMENT'; + } + } + + // don't add a comma on the end of the last field + if (++$current_field_count < count($fields)) + { + $sql .= ','; + } + } + + if (count($primary_keys) > 0) + { + $primary_keys = $this->db->_protect_identifiers($primary_keys); + $sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")"; + } + + if (is_array($keys) && count($keys) > 0) + { + foreach ($keys as $key) + { + if (is_array($key)) + { + $key = $this->db->_protect_identifiers($key); + } + else + { + $key = array($this->db->_protect_identifiers($key)); + } + + $sql .= ",\n\tUNIQUE (" . implode(', ', $key) . ")"; + } + } + + $sql .= "\n)"; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * Unsupported feature in SQLite + * + * @access private + * @return bool + */ + function _drop_table($table) + { + if ($this->db->db_debug) + { + return $this->db->display_error('db_unsuported_feature'); + } + return array(); + } + + // -------------------------------------------------------------------- + + /** + * Alter table query + * + * Generates a platform-specific query so that a table can be altered + * Called by add_column(), drop_column(), and column_alter(), + * + * @access private + * @param string the ALTER type (ADD, DROP, CHANGE) + * @param string the column name + * @param string the table name + * @param string the column definition + * @param string the default value + * @param boolean should 'NOT NULL' be added + * @param string the field after which we should add the new field + * @return object + */ + function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '') + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name); + + // DROP has everything it needs now. + if ($alter_type == 'DROP') + { + // SQLite does not support dropping columns + // http://www.sqlite.org/omitted.html + // http://www.sqlite.org/faq.html#q11 + return FALSE; + } + + $sql .= " $column_definition"; + + if ($default_value != '') + { + $sql .= " DEFAULT \"$default_value\""; + } + + if ($null === NULL) + { + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; + } + + if ($after_field != '') + { + $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); + } + + return $sql; + + } + + // -------------------------------------------------------------------- + + /** + * Rename a table + * + * Generates a platform-specific query so that a table can be renamed + * + * @access private + * @param string the old table name + * @param string the new table name + * @return string + */ + function _rename_table($table_name, $new_table_name) + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table_name)." RENAME TO ".$this->db->_protect_identifiers($new_table_name); + return $sql; + } +} + +/* End of file sqlite_forge.php */ /* Location: ./system/database/drivers/sqlite/sqlite_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php index 735a0736..bed16982 100644 --- a/system/database/drivers/sqlite/sqlite_result.php +++ b/system/database/drivers/sqlite/sqlite_result.php @@ -1,179 +1,179 @@ -result_id); - } - - // -------------------------------------------------------------------- - - /** - * Number of fields in the result set - * - * @access public - * @return integer - */ - function num_fields() - { - return @sqlite_num_fields($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Fetch Field Names - * - * Generates an array of column names - * - * @access public - * @return array - */ - function list_fields() - { - $field_names = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $field_names[] = sqlite_field_name($this->result_id, $i); - } - - return $field_names; - } - - // -------------------------------------------------------------------- - - /** - * Field data - * - * Generates an array of objects containing field meta-data - * - * @access public - * @return array - */ - function field_data() - { - $retval = array(); - for ($i = 0; $i < $this->num_fields(); $i++) - { - $F = new stdClass(); - $F->name = sqlite_field_name($this->result_id, $i); - $F->type = 'varchar'; - $F->max_length = 0; - $F->primary_key = 0; - $F->default = ''; - - $retval[] = $F; - } - - return $retval; - } - - // -------------------------------------------------------------------- - - /** - * Free the result - * - * @return null - */ - function free_result() - { - // Not implemented in SQLite - } - - // -------------------------------------------------------------------- - - /** - * Data Seek - * - * Moves the internal pointer to the desired offset. We call - * this internally before fetching results to make sure the - * result set starts at zero - * - * @access private - * @return array - */ - function _data_seek($n = 0) - { - return sqlite_seek($this->result_id, $n); - } - - // -------------------------------------------------------------------- - - /** - * Result - associative array - * - * Returns the result set as an array - * - * @access private - * @return array - */ - function _fetch_assoc() - { - return sqlite_fetch_array($this->result_id); - } - - // -------------------------------------------------------------------- - - /** - * Result - object - * - * Returns the result set as an object - * - * @access private - * @return object - */ - function _fetch_object() - { - if (function_exists('sqlite_fetch_object')) - { - return sqlite_fetch_object($this->result_id); - } - else - { - $arr = sqlite_fetch_array($this->result_id, SQLITE_ASSOC); - if (is_array($arr)) - { - $obj = (object) $arr; - return $obj; - } else { - return NULL; - } - } - } - -} - - -/* End of file sqlite_result.php */ +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @sqlite_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + $field_names = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $field_names[] = sqlite_field_name($this->result_id, $i); + } + + return $field_names; + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + for ($i = 0; $i < $this->num_fields(); $i++) + { + $F = new stdClass(); + $F->name = sqlite_field_name($this->result_id, $i); + $F->type = 'varchar'; + $F->max_length = 0; + $F->primary_key = 0; + $F->default = ''; + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + // Not implemented in SQLite + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return sqlite_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return sqlite_fetch_array($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + if (function_exists('sqlite_fetch_object')) + { + return sqlite_fetch_object($this->result_id); + } + else + { + $arr = sqlite_fetch_array($this->result_id, SQLITE_ASSOC); + if (is_array($arr)) + { + $obj = (object) $arr; + return $obj; + } else { + return NULL; + } + } + } + +} + + +/* End of file sqlite_result.php */ /* Location: ./system/database/drivers/sqlite/sqlite_result.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php index 3527b5b1..c067403f 100644 --- a/system/database/drivers/sqlite/sqlite_utility.php +++ b/system/database/drivers/sqlite/sqlite_utility.php @@ -1,141 +1,141 @@ -db_debug) - { - return $this->display_error('db_unsuported_feature'); - } - return array(); - } - - // -------------------------------------------------------------------- - - /** - * Optimize table query - * - * Is optimization even supported in SQLite? - * - * @access private - * @param string the table name - * @return object - */ - function _optimize_table($table) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Repair table query - * - * Are table repairs even supported in SQLite? - * - * @access private - * @param string the table name - * @return object - */ - function _repair_table($table) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * SQLite Export - * - * @access private - * @param array Preferences - * @return mixed - */ - function _backup($params = array()) - { - // Currently unsupported - return $this->db->display_error('db_unsuported_feature'); - } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access public - * @param string the database name - * @return bool - */ - function _create_database() - { - // In SQLite, a database is created when you connect to the database. - // We'll return TRUE so that an error isn't generated - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - if ( ! @file_exists($this->db->database) OR ! @unlink($this->db->database)) - { - if ($this->db->db_debug) - { - return $this->db->display_error('db_unable_to_drop'); - } - return FALSE; - } - return TRUE; - } - -} - -/* End of file sqlite_utility.php */ +db_debug) + { + return $this->display_error('db_unsuported_feature'); + } + return array(); + } + + // -------------------------------------------------------------------- + + /** + * Optimize table query + * + * Is optimization even supported in SQLite? + * + * @access private + * @param string the table name + * @return object + */ + function _optimize_table($table) + { + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Are table repairs even supported in SQLite? + * + * @access private + * @param string the table name + * @return object + */ + function _repair_table($table) + { + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * SQLite Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + // Currently unsupported + return $this->db->display_error('db_unsuported_feature'); + } + + /** + * + * The functions below have been deprecated as of 1.6, and are only here for backwards + * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation + * is STRONGLY discouraged in favour if using dbforge. + * + */ + + /** + * Create database + * + * @access public + * @param string the database name + * @return bool + */ + function _create_database() + { + // In SQLite, a database is created when you connect to the database. + // We'll return TRUE so that an error isn't generated + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Drop database + * + * @access private + * @param string the database name + * @return bool + */ + function _drop_database($name) + { + if ( ! @file_exists($this->db->database) OR ! @unlink($this->db->database)) + { + if ($this->db->db_debug) + { + return $this->db->display_error('db_unable_to_drop'); + } + return FALSE; + } + return TRUE; + } + +} + +/* End of file sqlite_utility.php */ /* Location: ./system/database/drivers/sqlite/sqlite_utility.php */ \ No newline at end of file diff --git a/system/database/index.html b/system/database/index.html index 065d2da5..c942a79c 100644 --- a/system/database/index.html +++ b/system/database/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/fonts/index.html b/system/fonts/index.html index 065d2da5..c942a79c 100644 --- a/system/fonts/index.html +++ b/system/fonts/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php index 4c8323b3..411d3097 100644 --- a/system/helpers/array_helper.php +++ b/system/helpers/array_helper.php @@ -1,78 +1,78 @@ - 0) // 8 = FILE_APPEND flag - { - $mode = FOPEN_WRITE_CREATE; - } - else - { - $mode = FOPEN_WRITE_CREATE_DESTRUCTIVE; - } - - // Check if we're using the include path - if (($flags & 1) > 0) // 1 = FILE_USE_INCLUDE_PATH flag - { - $use_include_path = TRUE; - } - else - { - $use_include_path = FALSE; - } - - $fp = @fopen($filename, $mode, $use_include_path); - - if ($fp === FALSE) - { - $backtrace = debug_backtrace(); - _exception_handler(E_USER_WARNING, 'file_put_contents('.htmlentities($filename).') failed to open stream', $backtrace[0]['file'], $backtrace[0]['line']); - return FALSE; - } - - if (($flags & LOCK_EX) > 0) - { - if ( ! flock($fp, LOCK_EX)) - { - $backtrace = debug_backtrace(); - _exception_handler(E_USER_WARNING, 'file_put_contents('.htmlentities($filename).') unable to acquire an exclusive lock on file', $backtrace[0]['file'], $backtrace[0]['line']); - return FALSE; - } - } - - // write it - if (($written = @fwrite($fp, $data)) === FALSE) - { - $backtrace = debug_backtrace(); - _exception_handler(E_USER_WARNING, 'file_put_contents('.htmlentities($filename).') failed to write to '.htmlentities($filename), $backtrace[0]['file'], $backtrace[0]['line']); - } - - // Close the handle - @fclose($fp); - - // Return length - return $written; - } -} - -// ------------------------------------------------------------------------ - -/** - * fputcsv() - * - * Format line as CSV and write to file pointer - * http://us.php.net/manual/en/function.fputcsv.php - * - * @access public - * @param resource file pointer - * @param array data to be written - * @param string delimiter - * @param string enclosure - * @return int length of written string - */ -if ( ! function_exists('fputcsv')) -{ - function fputcsv($handle, $fields, $delimiter = ',', $enclosure = '"') - { - // Checking for a handle resource - if ( ! is_resource($handle)) - { - $backtrace = debug_backtrace(); - _exception_handler(E_USER_WARNING, 'fputcsv() expects parameter 1 to be stream resource, '.gettype($handle).' given', $backtrace[0]['file'], $backtrace[0]['line']); - return FALSE; - } - - // OK, it is a resource, but is it a stream? - if (get_resource_type($handle) !== 'stream') - { - $backtrace = debug_backtrace(); - _exception_handler(E_USER_WARNING, 'fputcsv() expects parameter 1 to be stream resource, '.get_resource_type($handle).' given', $backtrace[0]['file'], $backtrace[0]['line']); - return FALSE; - } - - // Checking for an array of fields - if ( ! is_array($fields)) - { - $backtrace = debug_backtrace(); - _exception_handler(E_USER_WARNING, 'fputcsv() expects parameter 2 to be array, '.gettype($fields).' given', $backtrace[0]['file'], $backtrace[0]['line']); - return FALSE; - } - - // validate delimiter - if (strlen($delimiter) > 1) - { - $delimiter = substr($delimiter, 0, 1); - $backtrace = debug_backtrace(); - _exception_handler(E_NOTICE, 'fputcsv() delimiter must be one character long, "'.htmlentities($delimiter).'" used', $backtrace[0]['file'], $backtrace[0]['line']); - } - - // validate enclosure - if (strlen($enclosure) > 1) - { - $enclosure = substr($enclosure, 0, 1); - $backtrace = debug_backtrace(); - _exception_handler(E_NOTICE, 'fputcsv() enclosure must be one character long, "'.htmlentities($enclosure).'" used', $backtrace[0]['file'], $backtrace[0]['line']); - - } - - $out = ''; - - foreach ($fields as $cell) - { - $cell = str_replace($enclosure, $enclosure.$enclosure, $cell); - - if (strpos($cell, $delimiter) !== FALSE OR strpos($cell, $enclosure) !== FALSE OR strpos($cell, "\n") !== FALSE) - { - $out .= $enclosure.$cell.$enclosure.$delimiter; - } - else - { - $out .= $cell.$delimiter; - } - } - - $length = @fwrite($handle, substr($out, 0, -1)."\n"); - - return $length; - } -} - -// ------------------------------------------------------------------------ - -/** - * stripos() - * - * Find position of first occurrence of a case-insensitive string - * http://us.php.net/manual/en/function.stripos.php - * - * @access public - * @param string haystack - * @param string needle - * @param int offset - * @return int numeric position of the first occurrence of needle in the haystack - */ -if ( ! function_exists('stripos')) -{ - function stripos($haystack, $needle, $offset = NULL) - { - // Cast non string scalar values - if (is_scalar($haystack)) - { - settype($haystack, 'STRING'); - } - - if ( ! is_string($haystack)) - { - $backtrace = debug_backtrace(); - _exception_handler(E_USER_WARNING, 'stripos() expects parameter 1 to be string, '.gettype($haystack).' given', $backtrace[0]['file'], $backtrace[0]['line']); - return FALSE; - } - - if ( ! is_scalar($needle)) - { - $backtrace = debug_backtrace(); - _exception_handler(E_USER_WARNING, 'stripos() needle is not a string or an integer in '.$backtrace[0]['file'], $backtrace[0]['line']); - return FALSE; - } - - if (is_float($offset)) - { - $offset = (int)$offset; - } - - if ( ! is_int($offset) && ! is_bool($offset) && ! is_null($offset)) - { - $backtrace = debug_backtrace(); - _exception_handler(E_USER_WARNING, 'stripos() expects parameter 3 to be long, '.gettype($offset).' given', $backtrace[0]['file'], $backtrace[0]['line']); - return NULL; - } - - return strpos(strtolower($haystack), strtolower($needle), $offset); - } -} - -// ------------------------------------------------------------------------ - -/** - * str_ireplace() - * - * Find position of first occurrence of a case-insensitive string - * http://us.php.net/manual/en/function.str-ireplace.php - * (parameter 4, $count, is not supported as to do so in PHP 4 would make - * it a required parameter) - * - * @access public - * @param mixed search - * @param mixed replace - * @param mixed subject - * @return int numeric position of the first occurrence of needle in the haystack - */ -if ( ! function_exists('str_ireplace')) -{ - function str_ireplace($search, $replace, $subject) - { - // Nothing to do here - if ($search === NULL OR $subject === NULL) - { - return $subject; - } - - // Crazy arguments - if (is_scalar($search) && is_array($replace)) - { - $backtrace = debug_backtrace(); - - if (is_object($replace)) - { - show_error('Object of class '.get_class($replace).' could not be converted to string in '.$backtrace[0]['file'].' on line '.$backtrace[0]['line']); - } - else - { - _exception_handler(E_USER_NOTICE, 'Array to string conversion in '.$backtrace[0]['file'], $backtrace[0]['line']); - } - } - - // Searching for an array - if (is_array($search)) - { - // Replacing with an array - if (is_array($replace)) - { - $search = array_values($search); - $replace = array_values($replace); - - if (count($search) >= count($replace)) - { - $replace = array_pad($replace, count($search), ''); - } - else - { - $replace = array_slice($replace, 0, count($search)); - } - } - else - { - // Replacing with a string all positions - $replace = array_fill(0, count($search), $replace); - } - } - else - { - //Searching for a string and replacing with a string. - $search = array((string)$search); - $replace = array((string)$replace); - } - - // Prepare the search array - foreach ($search as $search_key => $search_value) - { - $search[$search_key] = '/'.preg_quote($search_value, '/').'/i'; - } - - // Prepare the replace array (escape backreferences) - foreach ($replace as $k => $v) - { - $replace[$k] = str_replace(array(chr(92), '$'), array(chr(92).chr(92), '\$'), $v); - } - - // do the replacement - $result = preg_replace($search, $replace, (array)$subject); - - // Check if subject was initially a string and return it as a string - if ( ! is_array($subject)) - { - return current($result); - } - - // Otherwise, just return the array - return $result; - } -} - -// ------------------------------------------------------------------------ - -/** - * http_build_query() - * - * Generate URL-encoded query string - * http://us.php.net/manual/en/function.http-build-query.php - * - * @access public - * @param array form data - * @param string numeric prefix - * @param string argument separator - * @return string URL-encoded string - */ -if ( ! function_exists('http_build_query')) -{ - function http_build_query($formdata, $numeric_prefix = NULL, $separator = NULL) - { - // Check the data - if ( ! is_array($formdata) && ! is_object($formdata)) - { - $backtrace = debug_backtrace(); - _exception_handler(E_USER_WARNING, 'http_build_query() Parameter 1 expected to be Array or Object. Incorrect value given', $backtrace[0]['file'], $backtrace[0]['line']); - return FALSE; - } - - // Cast it as array - if (is_object($formdata)) - { - $formdata = get_object_vars($formdata); - } - - // If the array is empty, return NULL - if (empty($formdata)) - { - return NULL; - } - - // Argument separator - if ($separator === NULL) - { - $separator = ini_get('arg_separator.output'); - - if (strlen($separator) == 0) - { - $separator = '&'; - } - } - - // Start building the query - $tmp = array(); - - foreach ($formdata as $key => $val) - { - if ($val === NULL) - { - continue; - } - - if (is_integer($key) && $numeric_prefix != NULL) - { - $key = $numeric_prefix.$key; - } - - if (is_resource($val)) - { - return NULL; - } - - // hand it off to a recursive parser - $tmp[] = _http_build_query_helper($key, $val, $separator); - } - - return implode($separator, $tmp); - } - - - // Helper helper. Remind anyone of college? - // Required to handle recursion in nested arrays. - // - // You could shave fractions of fractions of a second by moving where - // the urlencoding takes place, but it's much less intuitive, and if - // your application has 10,000 form fields, well, you have other problems ;) - function _http_build_query_helper($key, $val, $separator = '&') - { - if (is_scalar($val)) - { - return urlencode($key).'='.urlencode($val); - } - else - { - // arrays please - if (is_object($val)) - { - $val = get_object_vars($val); - } - - foreach ($val as $k => $v) - { - $tmp[] = _http_build_query_helper($key.'['.$k.']', $v, $separator); - } - } - - return implode($separator, $tmp); - } -} - - -/* End of file compatibility_helper.php */ + 0) // 8 = FILE_APPEND flag + { + $mode = FOPEN_WRITE_CREATE; + } + else + { + $mode = FOPEN_WRITE_CREATE_DESTRUCTIVE; + } + + // Check if we're using the include path + if (($flags & 1) > 0) // 1 = FILE_USE_INCLUDE_PATH flag + { + $use_include_path = TRUE; + } + else + { + $use_include_path = FALSE; + } + + $fp = @fopen($filename, $mode, $use_include_path); + + if ($fp === FALSE) + { + $backtrace = debug_backtrace(); + _exception_handler(E_USER_WARNING, 'file_put_contents('.htmlentities($filename).') failed to open stream', $backtrace[0]['file'], $backtrace[0]['line']); + return FALSE; + } + + if (($flags & LOCK_EX) > 0) + { + if ( ! flock($fp, LOCK_EX)) + { + $backtrace = debug_backtrace(); + _exception_handler(E_USER_WARNING, 'file_put_contents('.htmlentities($filename).') unable to acquire an exclusive lock on file', $backtrace[0]['file'], $backtrace[0]['line']); + return FALSE; + } + } + + // write it + if (($written = @fwrite($fp, $data)) === FALSE) + { + $backtrace = debug_backtrace(); + _exception_handler(E_USER_WARNING, 'file_put_contents('.htmlentities($filename).') failed to write to '.htmlentities($filename), $backtrace[0]['file'], $backtrace[0]['line']); + } + + // Close the handle + @fclose($fp); + + // Return length + return $written; + } +} + +// ------------------------------------------------------------------------ + +/** + * fputcsv() + * + * Format line as CSV and write to file pointer + * http://us.php.net/manual/en/function.fputcsv.php + * + * @access public + * @param resource file pointer + * @param array data to be written + * @param string delimiter + * @param string enclosure + * @return int length of written string + */ +if ( ! function_exists('fputcsv')) +{ + function fputcsv($handle, $fields, $delimiter = ',', $enclosure = '"') + { + // Checking for a handle resource + if ( ! is_resource($handle)) + { + $backtrace = debug_backtrace(); + _exception_handler(E_USER_WARNING, 'fputcsv() expects parameter 1 to be stream resource, '.gettype($handle).' given', $backtrace[0]['file'], $backtrace[0]['line']); + return FALSE; + } + + // OK, it is a resource, but is it a stream? + if (get_resource_type($handle) !== 'stream') + { + $backtrace = debug_backtrace(); + _exception_handler(E_USER_WARNING, 'fputcsv() expects parameter 1 to be stream resource, '.get_resource_type($handle).' given', $backtrace[0]['file'], $backtrace[0]['line']); + return FALSE; + } + + // Checking for an array of fields + if ( ! is_array($fields)) + { + $backtrace = debug_backtrace(); + _exception_handler(E_USER_WARNING, 'fputcsv() expects parameter 2 to be array, '.gettype($fields).' given', $backtrace[0]['file'], $backtrace[0]['line']); + return FALSE; + } + + // validate delimiter + if (strlen($delimiter) > 1) + { + $delimiter = substr($delimiter, 0, 1); + $backtrace = debug_backtrace(); + _exception_handler(E_NOTICE, 'fputcsv() delimiter must be one character long, "'.htmlentities($delimiter).'" used', $backtrace[0]['file'], $backtrace[0]['line']); + } + + // validate enclosure + if (strlen($enclosure) > 1) + { + $enclosure = substr($enclosure, 0, 1); + $backtrace = debug_backtrace(); + _exception_handler(E_NOTICE, 'fputcsv() enclosure must be one character long, "'.htmlentities($enclosure).'" used', $backtrace[0]['file'], $backtrace[0]['line']); + + } + + $out = ''; + + foreach ($fields as $cell) + { + $cell = str_replace($enclosure, $enclosure.$enclosure, $cell); + + if (strpos($cell, $delimiter) !== FALSE OR strpos($cell, $enclosure) !== FALSE OR strpos($cell, "\n") !== FALSE) + { + $out .= $enclosure.$cell.$enclosure.$delimiter; + } + else + { + $out .= $cell.$delimiter; + } + } + + $length = @fwrite($handle, substr($out, 0, -1)."\n"); + + return $length; + } +} + +// ------------------------------------------------------------------------ + +/** + * stripos() + * + * Find position of first occurrence of a case-insensitive string + * http://us.php.net/manual/en/function.stripos.php + * + * @access public + * @param string haystack + * @param string needle + * @param int offset + * @return int numeric position of the first occurrence of needle in the haystack + */ +if ( ! function_exists('stripos')) +{ + function stripos($haystack, $needle, $offset = NULL) + { + // Cast non string scalar values + if (is_scalar($haystack)) + { + settype($haystack, 'STRING'); + } + + if ( ! is_string($haystack)) + { + $backtrace = debug_backtrace(); + _exception_handler(E_USER_WARNING, 'stripos() expects parameter 1 to be string, '.gettype($haystack).' given', $backtrace[0]['file'], $backtrace[0]['line']); + return FALSE; + } + + if ( ! is_scalar($needle)) + { + $backtrace = debug_backtrace(); + _exception_handler(E_USER_WARNING, 'stripos() needle is not a string or an integer in '.$backtrace[0]['file'], $backtrace[0]['line']); + return FALSE; + } + + if (is_float($offset)) + { + $offset = (int)$offset; + } + + if ( ! is_int($offset) && ! is_bool($offset) && ! is_null($offset)) + { + $backtrace = debug_backtrace(); + _exception_handler(E_USER_WARNING, 'stripos() expects parameter 3 to be long, '.gettype($offset).' given', $backtrace[0]['file'], $backtrace[0]['line']); + return NULL; + } + + return strpos(strtolower($haystack), strtolower($needle), $offset); + } +} + +// ------------------------------------------------------------------------ + +/** + * str_ireplace() + * + * Find position of first occurrence of a case-insensitive string + * http://us.php.net/manual/en/function.str-ireplace.php + * (parameter 4, $count, is not supported as to do so in PHP 4 would make + * it a required parameter) + * + * @access public + * @param mixed search + * @param mixed replace + * @param mixed subject + * @return int numeric position of the first occurrence of needle in the haystack + */ +if ( ! function_exists('str_ireplace')) +{ + function str_ireplace($search, $replace, $subject) + { + // Nothing to do here + if ($search === NULL OR $subject === NULL) + { + return $subject; + } + + // Crazy arguments + if (is_scalar($search) && is_array($replace)) + { + $backtrace = debug_backtrace(); + + if (is_object($replace)) + { + show_error('Object of class '.get_class($replace).' could not be converted to string in '.$backtrace[0]['file'].' on line '.$backtrace[0]['line']); + } + else + { + _exception_handler(E_USER_NOTICE, 'Array to string conversion in '.$backtrace[0]['file'], $backtrace[0]['line']); + } + } + + // Searching for an array + if (is_array($search)) + { + // Replacing with an array + if (is_array($replace)) + { + $search = array_values($search); + $replace = array_values($replace); + + if (count($search) >= count($replace)) + { + $replace = array_pad($replace, count($search), ''); + } + else + { + $replace = array_slice($replace, 0, count($search)); + } + } + else + { + // Replacing with a string all positions + $replace = array_fill(0, count($search), $replace); + } + } + else + { + //Searching for a string and replacing with a string. + $search = array((string)$search); + $replace = array((string)$replace); + } + + // Prepare the search array + foreach ($search as $search_key => $search_value) + { + $search[$search_key] = '/'.preg_quote($search_value, '/').'/i'; + } + + // Prepare the replace array (escape backreferences) + foreach ($replace as $k => $v) + { + $replace[$k] = str_replace(array(chr(92), '$'), array(chr(92).chr(92), '\$'), $v); + } + + // do the replacement + $result = preg_replace($search, $replace, (array)$subject); + + // Check if subject was initially a string and return it as a string + if ( ! is_array($subject)) + { + return current($result); + } + + // Otherwise, just return the array + return $result; + } +} + +// ------------------------------------------------------------------------ + +/** + * http_build_query() + * + * Generate URL-encoded query string + * http://us.php.net/manual/en/function.http-build-query.php + * + * @access public + * @param array form data + * @param string numeric prefix + * @param string argument separator + * @return string URL-encoded string + */ +if ( ! function_exists('http_build_query')) +{ + function http_build_query($formdata, $numeric_prefix = NULL, $separator = NULL) + { + // Check the data + if ( ! is_array($formdata) && ! is_object($formdata)) + { + $backtrace = debug_backtrace(); + _exception_handler(E_USER_WARNING, 'http_build_query() Parameter 1 expected to be Array or Object. Incorrect value given', $backtrace[0]['file'], $backtrace[0]['line']); + return FALSE; + } + + // Cast it as array + if (is_object($formdata)) + { + $formdata = get_object_vars($formdata); + } + + // If the array is empty, return NULL + if (empty($formdata)) + { + return NULL; + } + + // Argument separator + if ($separator === NULL) + { + $separator = ini_get('arg_separator.output'); + + if (strlen($separator) == 0) + { + $separator = '&'; + } + } + + // Start building the query + $tmp = array(); + + foreach ($formdata as $key => $val) + { + if ($val === NULL) + { + continue; + } + + if (is_integer($key) && $numeric_prefix != NULL) + { + $key = $numeric_prefix.$key; + } + + if (is_resource($val)) + { + return NULL; + } + + // hand it off to a recursive parser + $tmp[] = _http_build_query_helper($key, $val, $separator); + } + + return implode($separator, $tmp); + } + + + // Helper helper. Remind anyone of college? + // Required to handle recursion in nested arrays. + // + // You could shave fractions of fractions of a second by moving where + // the urlencoding takes place, but it's much less intuitive, and if + // your application has 10,000 form fields, well, you have other problems ;) + function _http_build_query_helper($key, $val, $separator = '&') + { + if (is_scalar($val)) + { + return urlencode($key).'='.urlencode($val); + } + else + { + // arrays please + if (is_object($val)) + { + $val = get_object_vars($val); + } + + foreach ($val as $k => $v) + { + $tmp[] = _http_build_query_helper($key.'['.$k.']', $v, $separator); + } + } + + return implode($separator, $tmp); + } +} + + +/* End of file compatibility_helper.php */ /* Location: ./system/helpers/compatibility_helper.php */ \ No newline at end of file diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php index 61561b71..d906882a 100644 --- a/system/helpers/cookie_helper.php +++ b/system/helpers/cookie_helper.php @@ -1,136 +1,136 @@ -config->item('cookie_prefix') != '') - { - $prefix = $CI->config->item('cookie_prefix'); - } - if ($domain == '' AND $CI->config->item('cookie_domain') != '') - { - $domain = $CI->config->item('cookie_domain'); - } - if ($path == '/' AND $CI->config->item('cookie_path') != '/') - { - $path = $CI->config->item('cookie_path'); - } - - if ( ! is_numeric($expire)) - { - $expire = time() - 86500; - } - else - { - if ($expire > 0) - { - $expire = time() + $expire; - } - else - { - $expire = 0; - } - } - - setcookie($prefix.$name, $value, $expire, $path, $domain, 0); - } -} - -// -------------------------------------------------------------------- - -/** - * Fetch an item from the COOKIE array - * - * @access public - * @param string - * @param bool - * @return mixed - */ -if ( ! function_exists('get_cookie')) -{ - function get_cookie($index = '', $xss_clean = FALSE) - { - $CI =& get_instance(); - return $CI->input->cookie($index, $xss_clean); - } -} - -// -------------------------------------------------------------------- - -/** - * Delete a COOKIE - * - * @param mixed - * @param string the cookie domain. Usually: .yourdomain.com - * @param string the cookie path - * @param string the cookie prefix - * @return void - */ -if ( ! function_exists('delete_cookie')) -{ - function delete_cookie($name = '', $domain = '', $path = '/', $prefix = '') - { - set_cookie($name, '', '', $domain, $path, $prefix); - } -} - - -/* End of file cookie_helper.php */ +config->item('cookie_prefix') != '') + { + $prefix = $CI->config->item('cookie_prefix'); + } + if ($domain == '' AND $CI->config->item('cookie_domain') != '') + { + $domain = $CI->config->item('cookie_domain'); + } + if ($path == '/' AND $CI->config->item('cookie_path') != '/') + { + $path = $CI->config->item('cookie_path'); + } + + if ( ! is_numeric($expire)) + { + $expire = time() - 86500; + } + else + { + if ($expire > 0) + { + $expire = time() + $expire; + } + else + { + $expire = 0; + } + } + + setcookie($prefix.$name, $value, $expire, $path, $domain, 0); + } +} + +// -------------------------------------------------------------------- + +/** + * Fetch an item from the COOKIE array + * + * @access public + * @param string + * @param bool + * @return mixed + */ +if ( ! function_exists('get_cookie')) +{ + function get_cookie($index = '', $xss_clean = FALSE) + { + $CI =& get_instance(); + return $CI->input->cookie($index, $xss_clean); + } +} + +// -------------------------------------------------------------------- + +/** + * Delete a COOKIE + * + * @param mixed + * @param string the cookie domain. Usually: .yourdomain.com + * @param string the cookie path + * @param string the cookie prefix + * @return void + */ +if ( ! function_exists('delete_cookie')) +{ + function delete_cookie($name = '', $domain = '', $path = '/', $prefix = '') + { + set_cookie($name, '', '', $domain, $path, $prefix); + } +} + + +/* End of file cookie_helper.php */ /* Location: ./system/helpers/cookie_helper.php */ \ No newline at end of file diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index c9c89688..dbd7e0ec 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -1,611 +1,611 @@ -config->item('time_reference')) == 'gmt') - { - $now = time(); - $system_time = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now)); - - if (strlen($system_time) < 10) - { - $system_time = time(); - log_message('error', 'The Date class could not set a proper GMT timestamp so the local time() value was used.'); - } - - return $system_time; - } - else - { - return time(); - } - } -} - -// ------------------------------------------------------------------------ - -/** - * Convert MySQL Style Datecodes - * - * This function is identical to PHPs date() function, - * except that it allows date codes to be formatted using - * the MySQL style, where each code letter is preceded - * with a percent sign: %Y %m %d etc... - * - * The benefit of doing dates this way is that you don't - * have to worry about escaping your text letters that - * match the date codes. - * - * @access public - * @param string - * @param integer - * @return integer - */ -if ( ! function_exists('mdate')) -{ - function mdate($datestr = '', $time = '') - { - if ($datestr == '') - return ''; - - if ($time == '') - $time = now(); - - $datestr = str_replace('%\\', '', preg_replace("/([a-z]+?){1}/i", "\\\\\\1", $datestr)); - return date($datestr, $time); - } -} - -// ------------------------------------------------------------------------ - -/** - * Standard Date - * - * Returns a date formatted according to the submitted standard. - * - * @access public - * @param string the chosen format - * @param integer Unix timestamp - * @return string - */ -if ( ! function_exists('standard_date')) -{ - function standard_date($fmt = 'DATE_RFC822', $time = '') - { - $formats = array( - 'DATE_ATOM' => '%Y-%m-%dT%H:%i:%s%Q', - 'DATE_COOKIE' => '%l, %d-%M-%y %H:%i:%s UTC', - 'DATE_ISO8601' => '%Y-%m-%dT%H:%i:%s%O', - 'DATE_RFC822' => '%D, %d %M %y %H:%i:%s %O', - 'DATE_RFC850' => '%l, %d-%M-%y %H:%m:%i UTC', - 'DATE_RFC1036' => '%D, %d %M %y %H:%i:%s %O', - 'DATE_RFC1123' => '%D, %d %M %Y %H:%i:%s %O', - 'DATE_RSS' => '%D, %d %M %Y %H:%i:%s %O', - 'DATE_W3C' => '%Y-%m-%dT%H:%i:%s%Q' - ); - - if ( ! isset($formats[$fmt])) - { - return FALSE; - } - - return mdate($formats[$fmt], $time); - } -} - -// ------------------------------------------------------------------------ - -/** - * Timespan - * - * Returns a span of seconds in this format: - * 10 days 14 hours 36 minutes 47 seconds - * - * @access public - * @param integer a number of seconds - * @param integer Unix timestamp - * @return integer - */ -if ( ! function_exists('timespan')) -{ - function timespan($seconds = 1, $time = '') - { - $CI =& get_instance(); - $CI->lang->load('date'); - - if ( ! is_numeric($seconds)) - { - $seconds = 1; - } - - if ( ! is_numeric($time)) - { - $time = time(); - } - - if ($time <= $seconds) - { - $seconds = 1; - } - else - { - $seconds = $time - $seconds; - } - - $str = ''; - $years = floor($seconds / 31536000); - - if ($years > 0) - { - $str .= $years.' '.$CI->lang->line((($years > 1) ? 'date_years' : 'date_year')).', '; - } - - $seconds -= $years * 31536000; - $months = floor($seconds / 2628000); - - if ($years > 0 OR $months > 0) - { - if ($months > 0) - { - $str .= $months.' '.$CI->lang->line((($months > 1) ? 'date_months' : 'date_month')).', '; - } - - $seconds -= $months * 2628000; - } - - $weeks = floor($seconds / 604800); - - if ($years > 0 OR $months > 0 OR $weeks > 0) - { - if ($weeks > 0) - { - $str .= $weeks.' '.$CI->lang->line((($weeks > 1) ? 'date_weeks' : 'date_week')).', '; - } - - $seconds -= $weeks * 604800; - } - - $days = floor($seconds / 86400); - - if ($months > 0 OR $weeks > 0 OR $days > 0) - { - if ($days > 0) - { - $str .= $days.' '.$CI->lang->line((($days > 1) ? 'date_days' : 'date_day')).', '; - } - - $seconds -= $days * 86400; - } - - $hours = floor($seconds / 3600); - - if ($days > 0 OR $hours > 0) - { - if ($hours > 0) - { - $str .= $hours.' '.$CI->lang->line((($hours > 1) ? 'date_hours' : 'date_hour')).', '; - } - - $seconds -= $hours * 3600; - } - - $minutes = floor($seconds / 60); - - if ($days > 0 OR $hours > 0 OR $minutes > 0) - { - if ($minutes > 0) - { - $str .= $minutes.' '.$CI->lang->line((($minutes > 1) ? 'date_minutes' : 'date_minute')).', '; - } - - $seconds -= $minutes * 60; - } - - if ($str == '') - { - $str .= $seconds.' '.$CI->lang->line((($seconds > 1) ? 'date_seconds' : 'date_second')).', '; - } - - return substr(trim($str), 0, -1); - } -} - -// ------------------------------------------------------------------------ - -/** - * Number of days in a month - * - * Takes a month/year as input and returns the number of days - * for the given month/year. Takes leap years into consideration. - * - * @access public - * @param integer a numeric month - * @param integer a numeric year - * @return integer - */ -if ( ! function_exists('days_in_month')) -{ - function days_in_month($month = 0, $year = '') - { - if ($month < 1 OR $month > 12) - { - return 0; - } - - if ( ! is_numeric($year) OR strlen($year) != 4) - { - $year = date('Y'); - } - - if ($month == 2) - { - if ($year % 400 == 0 OR ($year % 4 == 0 AND $year % 100 != 0)) - { - return 29; - } - } - - $days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); - return $days_in_month[$month - 1]; - } -} - -// ------------------------------------------------------------------------ - -/** - * Converts a local Unix timestamp to GMT - * - * @access public - * @param integer Unix timestamp - * @return integer - */ -if ( ! function_exists('local_to_gmt')) -{ - function local_to_gmt($time = '') - { - if ($time == '') - $time = time(); - - return mktime( gmdate("H", $time), gmdate("i", $time), gmdate("s", $time), gmdate("m", $time), gmdate("d", $time), gmdate("Y", $time)); - } -} - -// ------------------------------------------------------------------------ - -/** - * Converts GMT time to a localized value - * - * Takes a Unix timestamp (in GMT) as input, and returns - * at the local value based on the timezone and DST setting - * submitted - * - * @access public - * @param integer Unix timestamp - * @param string timezone - * @param bool whether DST is active - * @return integer - */ -if ( ! function_exists('gmt_to_local')) -{ - function gmt_to_local($time = '', $timezone = 'UTC', $dst = FALSE) - { - if ($time == '') - { - return now(); - } - - $time += timezones($timezone) * 3600; - - if ($dst == TRUE) - { - $time += 3600; - } - - return $time; - } -} - -// ------------------------------------------------------------------------ - -/** - * Converts a MySQL Timestamp to Unix - * - * @access public - * @param integer Unix timestamp - * @return integer - */ -if ( ! function_exists('mysql_to_unix')) -{ - function mysql_to_unix($time = '') - { - // We'll remove certain characters for backward compatibility - // since the formatting changed with MySQL 4.1 - // YYYY-MM-DD HH:MM:SS - - $time = str_replace('-', '', $time); - $time = str_replace(':', '', $time); - $time = str_replace(' ', '', $time); - - // YYYYMMDDHHMMSS - return mktime( - substr($time, 8, 2), - substr($time, 10, 2), - substr($time, 12, 2), - substr($time, 4, 2), - substr($time, 6, 2), - substr($time, 0, 4) - ); - } -} - -// ------------------------------------------------------------------------ - -/** - * Unix to "Human" - * - * Formats Unix timestamp to the following prototype: 2006-08-21 11:35 PM - * - * @access public - * @param integer Unix timestamp - * @param bool whether to show seconds - * @param string format: us or euro - * @return string - */ -if ( ! function_exists('unix_to_human')) -{ - function unix_to_human($time = '', $seconds = FALSE, $fmt = 'us') - { - $r = date('Y', $time).'-'.date('m', $time).'-'.date('d', $time).' '; - - if ($fmt == 'us') - { - $r .= date('h', $time).':'.date('i', $time); - } - else - { - $r .= date('H', $time).':'.date('i', $time); - } - - if ($seconds) - { - $r .= ':'.date('s', $time); - } - - if ($fmt == 'us') - { - $r .= ' '.date('A', $time); - } - - return $r; - } -} - -// ------------------------------------------------------------------------ - -/** - * Convert "human" date to GMT - * - * Reverses the above process - * - * @access public - * @param string format: us or euro - * @return integer - */ -if ( ! function_exists('human_to_unix')) -{ - function human_to_unix($datestr = '') - { - if ($datestr == '') - { - return FALSE; - } - - $datestr = trim($datestr); - $datestr = preg_replace("/\040+/", "\040", $datestr); - - if ( ! preg_match('/^[0-9]{2,4}\-[0-9]{1,2}\-[0-9]{1,2}\s[0-9]{1,2}:[0-9]{1,2}(?::[0-9]{1,2})?(?:\s[AP]M)?$/i', $datestr)) - { - return FALSE; - } - - $split = preg_split("/\040/", $datestr); - - $ex = explode("-", $split['0']); - - $year = (strlen($ex['0']) == 2) ? '20'.$ex['0'] : $ex['0']; - $month = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; - $day = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; - - $ex = explode(":", $split['1']); - - $hour = (strlen($ex['0']) == 1) ? '0'.$ex['0'] : $ex['0']; - $min = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; - - if (isset($ex['2']) AND ereg("[0-9]{1,2}", $ex['2'])) - { - $sec = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; - } - else - { - // Unless specified, seconds get set to zero. - $sec = '00'; - } - - if (isset($split['2'])) - { - $ampm = strtolower($split['2']); - - if (substr($ampm, 0, 1) == 'p' AND $hour < 12) - $hour = $hour + 12; - - if (substr($ampm, 0, 1) == 'a' AND $hour == 12) - $hour = '00'; - - if (strlen($hour) == 1) - $hour = '0'.$hour; - } - - return mktime($hour, $min, $sec, $month, $day, $year); - } -} - -// ------------------------------------------------------------------------ - -/** - * Timezone Menu - * - * Generates a drop-down menu of timezones. - * - * @access public - * @param string timezone - * @param string classname - * @param string menu name - * @return string - */ -if ( ! function_exists('timezone_menu')) -{ - function timezone_menu($default = 'UTC', $class = "", $name = 'timezones') - { - $CI =& get_instance(); - $CI->lang->load('date'); - - if ($default == 'GMT') - $default = 'UTC'; - - $menu = '"; - - return $menu; - } -} - -// ------------------------------------------------------------------------ - -/** - * Timezones - * - * Returns an array of timezones. This is a helper function - * for various other ones in this library - * - * @access public - * @param string timezone - * @return string - */ -if ( ! function_exists('timezones')) -{ - function timezones($tz = '') - { - // Note: Don't change the order of these even though - // some items appear to be in the wrong order - - $zones = array( - 'UM12' => -12, - 'UM11' => -11, - 'UM10' => -10, - 'UM95' => -9.5, - 'UM9' => -9, - 'UM8' => -8, - 'UM7' => -7, - 'UM6' => -6, - 'UM5' => -5, - 'UM45' => -4.5, - 'UM4' => -4, - 'UM35' => -3.5, - 'UM3' => -3, - 'UM2' => -2, - 'UM1' => -1, - 'UTC' => 0, - 'UP1' => +1, - 'UP2' => +2, - 'UP3' => +3, - 'UP35' => +3.5, - 'UP4' => +4, - 'UP45' => +4.5, - 'UP5' => +5, - 'UP55' => +5.5, - 'UP575' => +5.75, - 'UP6' => +6, - 'UP65' => +6.5, - 'UP7' => +7, - 'UP8' => +8, - 'UP875' => +8.75, - 'UP9' => +9, - 'UP95' => +9.5, - 'UP10' => +10, - 'UP105' => +10.5, - 'UP11' => +11, - 'UP115' => +11.5, - 'UP12' => +12, - 'UP1275' => +12.75, - 'UP13' => +13, - 'UP14' => +14 - ); - - if ($tz == '') - { - return $zones; - } - - if ($tz == 'GMT') - $tz = 'UTC'; - - return ( ! isset($zones[$tz])) ? 0 : $zones[$tz]; - } -} - - -/* End of file date_helper.php */ +config->item('time_reference')) == 'gmt') + { + $now = time(); + $system_time = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now)); + + if (strlen($system_time) < 10) + { + $system_time = time(); + log_message('error', 'The Date class could not set a proper GMT timestamp so the local time() value was used.'); + } + + return $system_time; + } + else + { + return time(); + } + } +} + +// ------------------------------------------------------------------------ + +/** + * Convert MySQL Style Datecodes + * + * This function is identical to PHPs date() function, + * except that it allows date codes to be formatted using + * the MySQL style, where each code letter is preceded + * with a percent sign: %Y %m %d etc... + * + * The benefit of doing dates this way is that you don't + * have to worry about escaping your text letters that + * match the date codes. + * + * @access public + * @param string + * @param integer + * @return integer + */ +if ( ! function_exists('mdate')) +{ + function mdate($datestr = '', $time = '') + { + if ($datestr == '') + return ''; + + if ($time == '') + $time = now(); + + $datestr = str_replace('%\\', '', preg_replace("/([a-z]+?){1}/i", "\\\\\\1", $datestr)); + return date($datestr, $time); + } +} + +// ------------------------------------------------------------------------ + +/** + * Standard Date + * + * Returns a date formatted according to the submitted standard. + * + * @access public + * @param string the chosen format + * @param integer Unix timestamp + * @return string + */ +if ( ! function_exists('standard_date')) +{ + function standard_date($fmt = 'DATE_RFC822', $time = '') + { + $formats = array( + 'DATE_ATOM' => '%Y-%m-%dT%H:%i:%s%Q', + 'DATE_COOKIE' => '%l, %d-%M-%y %H:%i:%s UTC', + 'DATE_ISO8601' => '%Y-%m-%dT%H:%i:%s%O', + 'DATE_RFC822' => '%D, %d %M %y %H:%i:%s %O', + 'DATE_RFC850' => '%l, %d-%M-%y %H:%m:%i UTC', + 'DATE_RFC1036' => '%D, %d %M %y %H:%i:%s %O', + 'DATE_RFC1123' => '%D, %d %M %Y %H:%i:%s %O', + 'DATE_RSS' => '%D, %d %M %Y %H:%i:%s %O', + 'DATE_W3C' => '%Y-%m-%dT%H:%i:%s%Q' + ); + + if ( ! isset($formats[$fmt])) + { + return FALSE; + } + + return mdate($formats[$fmt], $time); + } +} + +// ------------------------------------------------------------------------ + +/** + * Timespan + * + * Returns a span of seconds in this format: + * 10 days 14 hours 36 minutes 47 seconds + * + * @access public + * @param integer a number of seconds + * @param integer Unix timestamp + * @return integer + */ +if ( ! function_exists('timespan')) +{ + function timespan($seconds = 1, $time = '') + { + $CI =& get_instance(); + $CI->lang->load('date'); + + if ( ! is_numeric($seconds)) + { + $seconds = 1; + } + + if ( ! is_numeric($time)) + { + $time = time(); + } + + if ($time <= $seconds) + { + $seconds = 1; + } + else + { + $seconds = $time - $seconds; + } + + $str = ''; + $years = floor($seconds / 31536000); + + if ($years > 0) + { + $str .= $years.' '.$CI->lang->line((($years > 1) ? 'date_years' : 'date_year')).', '; + } + + $seconds -= $years * 31536000; + $months = floor($seconds / 2628000); + + if ($years > 0 OR $months > 0) + { + if ($months > 0) + { + $str .= $months.' '.$CI->lang->line((($months > 1) ? 'date_months' : 'date_month')).', '; + } + + $seconds -= $months * 2628000; + } + + $weeks = floor($seconds / 604800); + + if ($years > 0 OR $months > 0 OR $weeks > 0) + { + if ($weeks > 0) + { + $str .= $weeks.' '.$CI->lang->line((($weeks > 1) ? 'date_weeks' : 'date_week')).', '; + } + + $seconds -= $weeks * 604800; + } + + $days = floor($seconds / 86400); + + if ($months > 0 OR $weeks > 0 OR $days > 0) + { + if ($days > 0) + { + $str .= $days.' '.$CI->lang->line((($days > 1) ? 'date_days' : 'date_day')).', '; + } + + $seconds -= $days * 86400; + } + + $hours = floor($seconds / 3600); + + if ($days > 0 OR $hours > 0) + { + if ($hours > 0) + { + $str .= $hours.' '.$CI->lang->line((($hours > 1) ? 'date_hours' : 'date_hour')).', '; + } + + $seconds -= $hours * 3600; + } + + $minutes = floor($seconds / 60); + + if ($days > 0 OR $hours > 0 OR $minutes > 0) + { + if ($minutes > 0) + { + $str .= $minutes.' '.$CI->lang->line((($minutes > 1) ? 'date_minutes' : 'date_minute')).', '; + } + + $seconds -= $minutes * 60; + } + + if ($str == '') + { + $str .= $seconds.' '.$CI->lang->line((($seconds > 1) ? 'date_seconds' : 'date_second')).', '; + } + + return substr(trim($str), 0, -1); + } +} + +// ------------------------------------------------------------------------ + +/** + * Number of days in a month + * + * Takes a month/year as input and returns the number of days + * for the given month/year. Takes leap years into consideration. + * + * @access public + * @param integer a numeric month + * @param integer a numeric year + * @return integer + */ +if ( ! function_exists('days_in_month')) +{ + function days_in_month($month = 0, $year = '') + { + if ($month < 1 OR $month > 12) + { + return 0; + } + + if ( ! is_numeric($year) OR strlen($year) != 4) + { + $year = date('Y'); + } + + if ($month == 2) + { + if ($year % 400 == 0 OR ($year % 4 == 0 AND $year % 100 != 0)) + { + return 29; + } + } + + $days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); + return $days_in_month[$month - 1]; + } +} + +// ------------------------------------------------------------------------ + +/** + * Converts a local Unix timestamp to GMT + * + * @access public + * @param integer Unix timestamp + * @return integer + */ +if ( ! function_exists('local_to_gmt')) +{ + function local_to_gmt($time = '') + { + if ($time == '') + $time = time(); + + return mktime( gmdate("H", $time), gmdate("i", $time), gmdate("s", $time), gmdate("m", $time), gmdate("d", $time), gmdate("Y", $time)); + } +} + +// ------------------------------------------------------------------------ + +/** + * Converts GMT time to a localized value + * + * Takes a Unix timestamp (in GMT) as input, and returns + * at the local value based on the timezone and DST setting + * submitted + * + * @access public + * @param integer Unix timestamp + * @param string timezone + * @param bool whether DST is active + * @return integer + */ +if ( ! function_exists('gmt_to_local')) +{ + function gmt_to_local($time = '', $timezone = 'UTC', $dst = FALSE) + { + if ($time == '') + { + return now(); + } + + $time += timezones($timezone) * 3600; + + if ($dst == TRUE) + { + $time += 3600; + } + + return $time; + } +} + +// ------------------------------------------------------------------------ + +/** + * Converts a MySQL Timestamp to Unix + * + * @access public + * @param integer Unix timestamp + * @return integer + */ +if ( ! function_exists('mysql_to_unix')) +{ + function mysql_to_unix($time = '') + { + // We'll remove certain characters for backward compatibility + // since the formatting changed with MySQL 4.1 + // YYYY-MM-DD HH:MM:SS + + $time = str_replace('-', '', $time); + $time = str_replace(':', '', $time); + $time = str_replace(' ', '', $time); + + // YYYYMMDDHHMMSS + return mktime( + substr($time, 8, 2), + substr($time, 10, 2), + substr($time, 12, 2), + substr($time, 4, 2), + substr($time, 6, 2), + substr($time, 0, 4) + ); + } +} + +// ------------------------------------------------------------------------ + +/** + * Unix to "Human" + * + * Formats Unix timestamp to the following prototype: 2006-08-21 11:35 PM + * + * @access public + * @param integer Unix timestamp + * @param bool whether to show seconds + * @param string format: us or euro + * @return string + */ +if ( ! function_exists('unix_to_human')) +{ + function unix_to_human($time = '', $seconds = FALSE, $fmt = 'us') + { + $r = date('Y', $time).'-'.date('m', $time).'-'.date('d', $time).' '; + + if ($fmt == 'us') + { + $r .= date('h', $time).':'.date('i', $time); + } + else + { + $r .= date('H', $time).':'.date('i', $time); + } + + if ($seconds) + { + $r .= ':'.date('s', $time); + } + + if ($fmt == 'us') + { + $r .= ' '.date('A', $time); + } + + return $r; + } +} + +// ------------------------------------------------------------------------ + +/** + * Convert "human" date to GMT + * + * Reverses the above process + * + * @access public + * @param string format: us or euro + * @return integer + */ +if ( ! function_exists('human_to_unix')) +{ + function human_to_unix($datestr = '') + { + if ($datestr == '') + { + return FALSE; + } + + $datestr = trim($datestr); + $datestr = preg_replace("/\040+/", "\040", $datestr); + + if ( ! preg_match('/^[0-9]{2,4}\-[0-9]{1,2}\-[0-9]{1,2}\s[0-9]{1,2}:[0-9]{1,2}(?::[0-9]{1,2})?(?:\s[AP]M)?$/i', $datestr)) + { + return FALSE; + } + + $split = preg_split("/\040/", $datestr); + + $ex = explode("-", $split['0']); + + $year = (strlen($ex['0']) == 2) ? '20'.$ex['0'] : $ex['0']; + $month = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; + $day = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; + + $ex = explode(":", $split['1']); + + $hour = (strlen($ex['0']) == 1) ? '0'.$ex['0'] : $ex['0']; + $min = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; + + if (isset($ex['2']) AND ereg("[0-9]{1,2}", $ex['2'])) + { + $sec = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; + } + else + { + // Unless specified, seconds get set to zero. + $sec = '00'; + } + + if (isset($split['2'])) + { + $ampm = strtolower($split['2']); + + if (substr($ampm, 0, 1) == 'p' AND $hour < 12) + $hour = $hour + 12; + + if (substr($ampm, 0, 1) == 'a' AND $hour == 12) + $hour = '00'; + + if (strlen($hour) == 1) + $hour = '0'.$hour; + } + + return mktime($hour, $min, $sec, $month, $day, $year); + } +} + +// ------------------------------------------------------------------------ + +/** + * Timezone Menu + * + * Generates a drop-down menu of timezones. + * + * @access public + * @param string timezone + * @param string classname + * @param string menu name + * @return string + */ +if ( ! function_exists('timezone_menu')) +{ + function timezone_menu($default = 'UTC', $class = "", $name = 'timezones') + { + $CI =& get_instance(); + $CI->lang->load('date'); + + if ($default == 'GMT') + $default = 'UTC'; + + $menu = '"; + + return $menu; + } +} + +// ------------------------------------------------------------------------ + +/** + * Timezones + * + * Returns an array of timezones. This is a helper function + * for various other ones in this library + * + * @access public + * @param string timezone + * @return string + */ +if ( ! function_exists('timezones')) +{ + function timezones($tz = '') + { + // Note: Don't change the order of these even though + // some items appear to be in the wrong order + + $zones = array( + 'UM12' => -12, + 'UM11' => -11, + 'UM10' => -10, + 'UM95' => -9.5, + 'UM9' => -9, + 'UM8' => -8, + 'UM7' => -7, + 'UM6' => -6, + 'UM5' => -5, + 'UM45' => -4.5, + 'UM4' => -4, + 'UM35' => -3.5, + 'UM3' => -3, + 'UM2' => -2, + 'UM1' => -1, + 'UTC' => 0, + 'UP1' => +1, + 'UP2' => +2, + 'UP3' => +3, + 'UP35' => +3.5, + 'UP4' => +4, + 'UP45' => +4.5, + 'UP5' => +5, + 'UP55' => +5.5, + 'UP575' => +5.75, + 'UP6' => +6, + 'UP65' => +6.5, + 'UP7' => +7, + 'UP8' => +8, + 'UP875' => +8.75, + 'UP9' => +9, + 'UP95' => +9.5, + 'UP10' => +10, + 'UP105' => +10.5, + 'UP11' => +11, + 'UP115' => +11.5, + 'UP12' => +12, + 'UP1275' => +12.75, + 'UP13' => +13, + 'UP14' => +14 + ); + + if ($tz == '') + { + return $zones; + } + + if ($tz == 'GMT') + $tz = 'UTC'; + + return ( ! isset($zones[$tz])) ? 0 : $zones[$tz]; + } +} + + +/* End of file date_helper.php */ /* Location: ./system/helpers/date_helper.php */ \ No newline at end of file diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php index 8a1b999c..be365909 100644 --- a/system/helpers/directory_helper.php +++ b/system/helpers/directory_helper.php @@ -1,80 +1,80 @@ - 0) - { - $data =& fread($fp, filesize($file)); - } - - flock($fp, LOCK_UN); - fclose($fp); - - return $data; - } -} - -// ------------------------------------------------------------------------ - -/** - * Write File - * - * Writes data to the file specified in the path. - * Creates a new file if non-existent. - * - * @access public - * @param string path to file - * @param string file data - * @return bool - */ -if ( ! function_exists('write_file')) -{ - function write_file($path, $data, $mode = FOPEN_WRITE_CREATE_DESTRUCTIVE) - { - if ( ! $fp = @fopen($path, $mode)) - { - return FALSE; - } - - flock($fp, LOCK_EX); - fwrite($fp, $data); - flock($fp, LOCK_UN); - fclose($fp); - - return TRUE; - } -} - -// ------------------------------------------------------------------------ - -/** - * Delete Files - * - * Deletes all files contained in the supplied directory path. - * Files must be writable or owned by the system in order to be deleted. - * If the second parameter is set to TRUE, any directories contained - * within the supplied base directory will be nuked as well. - * - * @access public - * @param string path to file - * @param bool whether to delete any directories found in the path - * @return bool - */ -if ( ! function_exists('delete_files')) -{ - function delete_files($path, $del_dir = FALSE, $level = 0) - { - // Trim the trailing slash - $path = preg_replace("|^(.+?)/*$|", "\\1", $path); - - if ( ! $current_dir = @opendir($path)) - return; - - while(FALSE !== ($filename = @readdir($current_dir))) - { - if ($filename != "." and $filename != "..") - { - if (is_dir($path.'/'.$filename)) - { - // Ignore empty folders - if (substr($filename, 0, 1) != '.') - { - delete_files($path.'/'.$filename, $del_dir, $level + 1); - } - } - else - { - unlink($path.'/'.$filename); - } - } - } - @closedir($current_dir); - - if ($del_dir == TRUE AND $level > 0) - { - @rmdir($path); - } - } -} - -// ------------------------------------------------------------------------ - -/** - * Get Filenames - * - * Reads the specified directory and builds an array containing the filenames. - * Any sub-folders contained within the specified path are read as well. - * - * @access public - * @param string path to source - * @param bool whether to include the path as part of the filename - * @param bool internal variable to determine recursion status - do not use in calls - * @return array - */ -if ( ! function_exists('get_filenames')) -{ - function get_filenames($source_dir, $include_path = FALSE, $_recursion = FALSE) - { - static $_filedata = array(); - - if ($fp = @opendir($source_dir)) - { - // reset the array and make sure $source_dir has a trailing slash on the initial call - if ($_recursion === FALSE) - { - $_filedata = array(); - $source_dir = rtrim(realpath($source_dir), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; - } - - while (FALSE !== ($file = readdir($fp))) - { - if (@is_dir($source_dir.$file) && strncmp($file, '.', 1) !== 0) - { - get_filenames($source_dir.$file.DIRECTORY_SEPARATOR, $include_path, TRUE); - } - elseif (strncmp($file, '.', 1) !== 0) - { - - $_filedata[] = ($include_path == TRUE) ? $source_dir.$file : $file; - } - } - return $_filedata; - } - else - { - return FALSE; - } - } -} - -// -------------------------------------------------------------------- - -/** - * Get Directory File Information - * - * Reads the specified directory and builds an array containing the filenames, - * filesize, dates, and permissions - * - * Any sub-folders contained within the specified path are read as well. - * - * @access public - * @param string path to source - * @param bool whether to include the path as part of the filename - * @param bool internal variable to determine recursion status - do not use in calls - * @return array - */ -if ( ! function_exists('get_dir_file_info')) -{ - function get_dir_file_info($source_dir, $include_path = FALSE, $_recursion = FALSE) - { - $_filedata = array(); - $relative_path = $source_dir; - - if ($fp = @opendir($source_dir)) - { - // reset the array and make sure $source_dir has a trailing slash on the initial call - if ($_recursion === FALSE) - { - $_filedata = array(); - $source_dir = rtrim(realpath($source_dir), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; - } - - while (FALSE !== ($file = readdir($fp))) - { - if (@is_dir($source_dir.$file) && strncmp($file, '.', 1) !== 0) - { - get_dir_file_info($source_dir.$file.DIRECTORY_SEPARATOR, $include_path, TRUE); - } - elseif (strncmp($file, '.', 1) !== 0) - { - $_filedata[$file] = get_file_info($source_dir.$file); - $_filedata[$file]['relative_path'] = $relative_path; - } - } - return $_filedata; - } - else - { - return FALSE; - } - } -} - -// -------------------------------------------------------------------- - -/** -* Get File Info -* -* Given a file and path, returns the name, path, size, date modified -* Second parameter allows you to explicitly declare what information you want returned -* Options are: name, server_path, size, date, readable, writable, executable, fileperms -* Returns FALSE if the file cannot be found. -* -* @access public -* @param string path to file -* @param mixed array or comma separated string of information returned -* @return array -*/ -if ( ! function_exists('get_file_info')) -{ - function get_file_info($file, $returned_values = array('name', 'server_path', 'size', 'date')) - { - - if ( ! file_exists($file)) - { - return FALSE; - } - - if (is_string($returned_values)) - { - $returned_values = explode(',', $returned_values); - } - - foreach ($returned_values as $key) - { - switch ($key) - { - case 'name': - $fileinfo['name'] = substr(strrchr($file, '/'), 1); - break; - case 'server_path': - $fileinfo['server_path'] = $file; - break; - case 'size': - $fileinfo['size'] = filesize($file); - break; - case 'date': - $fileinfo['date'] = filectime($file); - break; - case 'readable': - $fileinfo['readable'] = is_readable($file); - break; - case 'writable': - // There are known problems using is_weritable on IIS. It may not be reliable - consider fileperms() - $fileinfo['writable'] = is_writable($file); - break; - case 'executable': - $fileinfo['executable'] = is_executable($file); - break; - case 'fileperms': - $fileinfo['fileperms'] = fileperms($file); - break; - } - } - - return $fileinfo; - } -} - -// -------------------------------------------------------------------- - -/** - * Get Mime by Extension - * - * Translates a file extension into a mime type based on config/mimes.php. - * Returns FALSE if it can't determine the type, or open the mime config file - * - * Note: this is NOT an accurate way of determining file mime types, and is here strictly as a convenience - * It should NOT be trusted, and should certainly NOT be used for security - * - * @access public - * @param string path to file - * @return mixed - */ -if ( ! function_exists('get_mime_by_extension')) -{ - function get_mime_by_extension($file) - { - $extension = substr(strrchr($file, '.'), 1); - - global $mimes; - - if ( ! is_array($mimes)) - { - if ( ! require_once(APPPATH.'config/mimes.php')) - { - return FALSE; - } - } - - if (array_key_exists($extension, $mimes)) - { - if (is_array($mimes[$extension])) - { - // Multiple mime types, just give the first one - return current($mimes[$extension]); - } - else - { - return $mimes[$extension]; - } - } - else - { - return FALSE; - } - } -} - -// -------------------------------------------------------------------- - -/** - * Symbolic Permissions - * - * Takes a numeric value representing a file's permissions and returns - * standard symbolic notation representing that value - * - * @access public - * @param int - * @return string - */ -if ( ! function_exists('symbolic_permissions')) -{ - function symbolic_permissions($perms) - { - if (($perms & 0xC000) == 0xC000) - { - $symbolic = 's'; // Socket - } - elseif (($perms & 0xA000) == 0xA000) - { - $symbolic = 'l'; // Symbolic Link - } - elseif (($perms & 0x8000) == 0x8000) - { - $symbolic = '-'; // Regular - } - elseif (($perms & 0x6000) == 0x6000) - { - $symbolic = 'b'; // Block special - } - elseif (($perms & 0x4000) == 0x4000) - { - $symbolic = 'd'; // Directory - } - elseif (($perms & 0x2000) == 0x2000) - { - $symbolic = 'c'; // Character special - } - elseif (($perms & 0x1000) == 0x1000) - { - $symbolic = 'p'; // FIFO pipe - } - else - { - $symbolic = 'u'; // Unknown - } - - // Owner - $symbolic .= (($perms & 0x0100) ? 'r' : '-'); - $symbolic .= (($perms & 0x0080) ? 'w' : '-'); - $symbolic .= (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x' ) : (($perms & 0x0800) ? 'S' : '-')); - - // Group - $symbolic .= (($perms & 0x0020) ? 'r' : '-'); - $symbolic .= (($perms & 0x0010) ? 'w' : '-'); - $symbolic .= (($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x' ) : (($perms & 0x0400) ? 'S' : '-')); - - // World - $symbolic .= (($perms & 0x0004) ? 'r' : '-'); - $symbolic .= (($perms & 0x0002) ? 'w' : '-'); - $symbolic .= (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x' ) : (($perms & 0x0200) ? 'T' : '-')); - - return $symbolic; - } -} - -// -------------------------------------------------------------------- - -/** - * Octal Permissions - * - * Takes a numeric value representing a file's permissions and returns - * a three character string representing the file's octal permissions - * - * @access public - * @param int - * @return string - */ -if ( ! function_exists('octal_permissions')) -{ - function octal_permissions($perms) - { - return substr(sprintf('%o', $perms), -3); - } -} - - -/* End of file file_helper.php */ + 0) + { + $data =& fread($fp, filesize($file)); + } + + flock($fp, LOCK_UN); + fclose($fp); + + return $data; + } +} + +// ------------------------------------------------------------------------ + +/** + * Write File + * + * Writes data to the file specified in the path. + * Creates a new file if non-existent. + * + * @access public + * @param string path to file + * @param string file data + * @return bool + */ +if ( ! function_exists('write_file')) +{ + function write_file($path, $data, $mode = FOPEN_WRITE_CREATE_DESTRUCTIVE) + { + if ( ! $fp = @fopen($path, $mode)) + { + return FALSE; + } + + flock($fp, LOCK_EX); + fwrite($fp, $data); + flock($fp, LOCK_UN); + fclose($fp); + + return TRUE; + } +} + +// ------------------------------------------------------------------------ + +/** + * Delete Files + * + * Deletes all files contained in the supplied directory path. + * Files must be writable or owned by the system in order to be deleted. + * If the second parameter is set to TRUE, any directories contained + * within the supplied base directory will be nuked as well. + * + * @access public + * @param string path to file + * @param bool whether to delete any directories found in the path + * @return bool + */ +if ( ! function_exists('delete_files')) +{ + function delete_files($path, $del_dir = FALSE, $level = 0) + { + // Trim the trailing slash + $path = preg_replace("|^(.+?)/*$|", "\\1", $path); + + if ( ! $current_dir = @opendir($path)) + return; + + while(FALSE !== ($filename = @readdir($current_dir))) + { + if ($filename != "." and $filename != "..") + { + if (is_dir($path.'/'.$filename)) + { + // Ignore empty folders + if (substr($filename, 0, 1) != '.') + { + delete_files($path.'/'.$filename, $del_dir, $level + 1); + } + } + else + { + unlink($path.'/'.$filename); + } + } + } + @closedir($current_dir); + + if ($del_dir == TRUE AND $level > 0) + { + @rmdir($path); + } + } +} + +// ------------------------------------------------------------------------ + +/** + * Get Filenames + * + * Reads the specified directory and builds an array containing the filenames. + * Any sub-folders contained within the specified path are read as well. + * + * @access public + * @param string path to source + * @param bool whether to include the path as part of the filename + * @param bool internal variable to determine recursion status - do not use in calls + * @return array + */ +if ( ! function_exists('get_filenames')) +{ + function get_filenames($source_dir, $include_path = FALSE, $_recursion = FALSE) + { + static $_filedata = array(); + + if ($fp = @opendir($source_dir)) + { + // reset the array and make sure $source_dir has a trailing slash on the initial call + if ($_recursion === FALSE) + { + $_filedata = array(); + $source_dir = rtrim(realpath($source_dir), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; + } + + while (FALSE !== ($file = readdir($fp))) + { + if (@is_dir($source_dir.$file) && strncmp($file, '.', 1) !== 0) + { + get_filenames($source_dir.$file.DIRECTORY_SEPARATOR, $include_path, TRUE); + } + elseif (strncmp($file, '.', 1) !== 0) + { + + $_filedata[] = ($include_path == TRUE) ? $source_dir.$file : $file; + } + } + return $_filedata; + } + else + { + return FALSE; + } + } +} + +// -------------------------------------------------------------------- + +/** + * Get Directory File Information + * + * Reads the specified directory and builds an array containing the filenames, + * filesize, dates, and permissions + * + * Any sub-folders contained within the specified path are read as well. + * + * @access public + * @param string path to source + * @param bool whether to include the path as part of the filename + * @param bool internal variable to determine recursion status - do not use in calls + * @return array + */ +if ( ! function_exists('get_dir_file_info')) +{ + function get_dir_file_info($source_dir, $include_path = FALSE, $_recursion = FALSE) + { + $_filedata = array(); + $relative_path = $source_dir; + + if ($fp = @opendir($source_dir)) + { + // reset the array and make sure $source_dir has a trailing slash on the initial call + if ($_recursion === FALSE) + { + $_filedata = array(); + $source_dir = rtrim(realpath($source_dir), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; + } + + while (FALSE !== ($file = readdir($fp))) + { + if (@is_dir($source_dir.$file) && strncmp($file, '.', 1) !== 0) + { + get_dir_file_info($source_dir.$file.DIRECTORY_SEPARATOR, $include_path, TRUE); + } + elseif (strncmp($file, '.', 1) !== 0) + { + $_filedata[$file] = get_file_info($source_dir.$file); + $_filedata[$file]['relative_path'] = $relative_path; + } + } + return $_filedata; + } + else + { + return FALSE; + } + } +} + +// -------------------------------------------------------------------- + +/** +* Get File Info +* +* Given a file and path, returns the name, path, size, date modified +* Second parameter allows you to explicitly declare what information you want returned +* Options are: name, server_path, size, date, readable, writable, executable, fileperms +* Returns FALSE if the file cannot be found. +* +* @access public +* @param string path to file +* @param mixed array or comma separated string of information returned +* @return array +*/ +if ( ! function_exists('get_file_info')) +{ + function get_file_info($file, $returned_values = array('name', 'server_path', 'size', 'date')) + { + + if ( ! file_exists($file)) + { + return FALSE; + } + + if (is_string($returned_values)) + { + $returned_values = explode(',', $returned_values); + } + + foreach ($returned_values as $key) + { + switch ($key) + { + case 'name': + $fileinfo['name'] = substr(strrchr($file, '/'), 1); + break; + case 'server_path': + $fileinfo['server_path'] = $file; + break; + case 'size': + $fileinfo['size'] = filesize($file); + break; + case 'date': + $fileinfo['date'] = filectime($file); + break; + case 'readable': + $fileinfo['readable'] = is_readable($file); + break; + case 'writable': + // There are known problems using is_weritable on IIS. It may not be reliable - consider fileperms() + $fileinfo['writable'] = is_writable($file); + break; + case 'executable': + $fileinfo['executable'] = is_executable($file); + break; + case 'fileperms': + $fileinfo['fileperms'] = fileperms($file); + break; + } + } + + return $fileinfo; + } +} + +// -------------------------------------------------------------------- + +/** + * Get Mime by Extension + * + * Translates a file extension into a mime type based on config/mimes.php. + * Returns FALSE if it can't determine the type, or open the mime config file + * + * Note: this is NOT an accurate way of determining file mime types, and is here strictly as a convenience + * It should NOT be trusted, and should certainly NOT be used for security + * + * @access public + * @param string path to file + * @return mixed + */ +if ( ! function_exists('get_mime_by_extension')) +{ + function get_mime_by_extension($file) + { + $extension = substr(strrchr($file, '.'), 1); + + global $mimes; + + if ( ! is_array($mimes)) + { + if ( ! require_once(APPPATH.'config/mimes.php')) + { + return FALSE; + } + } + + if (array_key_exists($extension, $mimes)) + { + if (is_array($mimes[$extension])) + { + // Multiple mime types, just give the first one + return current($mimes[$extension]); + } + else + { + return $mimes[$extension]; + } + } + else + { + return FALSE; + } + } +} + +// -------------------------------------------------------------------- + +/** + * Symbolic Permissions + * + * Takes a numeric value representing a file's permissions and returns + * standard symbolic notation representing that value + * + * @access public + * @param int + * @return string + */ +if ( ! function_exists('symbolic_permissions')) +{ + function symbolic_permissions($perms) + { + if (($perms & 0xC000) == 0xC000) + { + $symbolic = 's'; // Socket + } + elseif (($perms & 0xA000) == 0xA000) + { + $symbolic = 'l'; // Symbolic Link + } + elseif (($perms & 0x8000) == 0x8000) + { + $symbolic = '-'; // Regular + } + elseif (($perms & 0x6000) == 0x6000) + { + $symbolic = 'b'; // Block special + } + elseif (($perms & 0x4000) == 0x4000) + { + $symbolic = 'd'; // Directory + } + elseif (($perms & 0x2000) == 0x2000) + { + $symbolic = 'c'; // Character special + } + elseif (($perms & 0x1000) == 0x1000) + { + $symbolic = 'p'; // FIFO pipe + } + else + { + $symbolic = 'u'; // Unknown + } + + // Owner + $symbolic .= (($perms & 0x0100) ? 'r' : '-'); + $symbolic .= (($perms & 0x0080) ? 'w' : '-'); + $symbolic .= (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x' ) : (($perms & 0x0800) ? 'S' : '-')); + + // Group + $symbolic .= (($perms & 0x0020) ? 'r' : '-'); + $symbolic .= (($perms & 0x0010) ? 'w' : '-'); + $symbolic .= (($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x' ) : (($perms & 0x0400) ? 'S' : '-')); + + // World + $symbolic .= (($perms & 0x0004) ? 'r' : '-'); + $symbolic .= (($perms & 0x0002) ? 'w' : '-'); + $symbolic .= (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x' ) : (($perms & 0x0200) ? 'T' : '-')); + + return $symbolic; + } +} + +// -------------------------------------------------------------------- + +/** + * Octal Permissions + * + * Takes a numeric value representing a file's permissions and returns + * a three character string representing the file's octal permissions + * + * @access public + * @param int + * @return string + */ +if ( ! function_exists('octal_permissions')) +{ + function octal_permissions($perms) + { + return substr(sprintf('%o', $perms), -3); + } +} + + +/* End of file file_helper.php */ /* Location: ./system/helpers/file_helper.php */ \ No newline at end of file diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 109d8c17..c002c6fc 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -1,963 +1,963 @@ -config->site_url($action) : $action; - - $form = '
    0) - { - $form .= form_hidden($hidden); - } - - return $form; - } -} - -// ------------------------------------------------------------------------ - -/** - * Form Declaration - Multipart type - * - * Creates the opening portion of the form, but with "multipart/form-data". - * - * @access public - * @param string the URI segments of the form destination - * @param array a key/value pair of attributes - * @param array a key/value pair hidden data - * @return string - */ -if ( ! function_exists('form_open_multipart')) -{ - function form_open_multipart($action, $attributes = array(), $hidden = array()) - { - $attributes['enctype'] = 'multipart/form-data'; - return form_open($action, $attributes, $hidden); - } -} - -// ------------------------------------------------------------------------ - -/** - * Hidden Input Field - * - * Generates hidden fields. You can pass a simple key/value string or an associative - * array with multiple values. - * - * @access public - * @param mixed - * @param string - * @return string - */ -if ( ! function_exists('form_hidden')) -{ - function form_hidden($name, $value = '') - { - if ( ! is_array($name)) - { - return ''; - } - - $form = ''; - - foreach ($name as $name => $value) - { - $form .= "\n"; - $form .= ''; - } - - return $form; - } -} - -// ------------------------------------------------------------------------ - -/** - * Text Input Field - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -if ( ! function_exists('form_input')) -{ - function form_input($data = '', $value = '', $extra = '') - { - $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - - return ""; - } -} - -// ------------------------------------------------------------------------ - -/** - * Password Field - * - * Identical to the input function but adds the "password" type - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -if ( ! function_exists('form_password')) -{ - function form_password($data = '', $value = '', $extra = '') - { - if ( ! is_array($data)) - { - $data = array('name' => $data); - } - - $data['type'] = 'password'; - return form_input($data, $value, $extra); - } -} - -// ------------------------------------------------------------------------ - -/** - * Upload Field - * - * Identical to the input function but adds the "file" type - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -if ( ! function_exists('form_upload')) -{ - function form_upload($data = '', $value = '', $extra = '') - { - if ( ! is_array($data)) - { - $data = array('name' => $data); - } - - $data['type'] = 'file'; - return form_input($data, $value, $extra); - } -} - -// ------------------------------------------------------------------------ - -/** - * Textarea field - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -if ( ! function_exists('form_textarea')) -{ - function form_textarea($data = '', $value = '', $extra = '') - { - $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); - - if ( ! is_array($data) OR ! isset($data['value'])) - { - $val = $value; - } - else - { - $val = $data['value']; - unset($data['value']); // textareas don't use the value attribute - } - - return ""; - } -} - -// ------------------------------------------------------------------------ - -/** - * Drop-down Menu - * - * @access public - * @param string - * @param array - * @param string - * @param string - * @return string - */ -if ( ! function_exists('form_dropdown')) -{ - function form_dropdown($name = '', $options = array(), $selected = array(), $extra = '') - { - if ( ! is_array($selected)) - { - $selected = array($selected); - } - - // If no selected state was submitted we will attempt to set it automatically - if (count($selected) === 0) - { - // If the form name appears in the $_POST array we have a winner! - if (isset($_POST[$name])) - { - $selected = array($_POST[$name]); - } - } - - if ($extra != '') $extra = ' '.$extra; - - $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; - - $form = ''; - - return $form; - } -} - -// ------------------------------------------------------------------------ - -/** - * Checkbox Field - * - * @access public - * @param mixed - * @param string - * @param bool - * @param string - * @return string - */ -if ( ! function_exists('form_checkbox')) -{ - function form_checkbox($data = '', $value = '', $checked = FALSE, $extra = '') - { - $defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - - if (is_array($data) AND array_key_exists('checked', $data)) - { - $checked = $data['checked']; - - if ($checked == FALSE) - { - unset($data['checked']); - } - else - { - $data['checked'] = 'checked'; - } - } - - if ($checked == TRUE) - { - $defaults['checked'] = 'checked'; - } - else - { - unset($defaults['checked']); - } - - return ""; - } -} - -// ------------------------------------------------------------------------ - -/** - * Radio Button - * - * @access public - * @param mixed - * @param string - * @param bool - * @param string - * @return string - */ -if ( ! function_exists('form_radio')) -{ - function form_radio($data = '', $value = '', $checked = FALSE, $extra = '') - { - if ( ! is_array($data)) - { - $data = array('name' => $data); - } - - $data['type'] = 'radio'; - return form_checkbox($data, $value, $checked, $extra); - } -} - -// ------------------------------------------------------------------------ - -/** - * Submit Button - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -if ( ! function_exists('form_submit')) -{ - function form_submit($data = '', $value = '', $extra = '') - { - $defaults = array('type' => 'submit', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - - return ""; - } -} - -// ------------------------------------------------------------------------ - -/** - * Reset Button - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -if ( ! function_exists('form_reset')) -{ - function form_reset($data = '', $value = '', $extra = '') - { - $defaults = array('type' => 'reset', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); - - return ""; - } -} - -// ------------------------------------------------------------------------ - -/** - * Form Button - * - * @access public - * @param mixed - * @param string - * @param string - * @return string - */ -if ( ! function_exists('form_button')) -{ - function form_button($data = '', $content = '', $extra = '') - { - $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'type' => 'submit'); - - if ( is_array($data) AND isset($data['content'])) - { - $content = $data['content']; - unset($data['content']); // content is not an attribute - } - - return ""; - } -} - -// ------------------------------------------------------------------------ - -/** - * Form Label Tag - * - * @access public - * @param string The text to appear onscreen - * @param string The id the label applies to - * @param string Additional attributes - * @return string - */ -if ( ! function_exists('form_label')) -{ - function form_label($label_text = '', $id = '', $attributes = array()) - { - - $label = ' 0) - { - foreach ($attributes as $key => $val) - { - $label .= ' '.$key.'="'.$val.'"'; - } - } - - $label .= ">$label_text"; - - return $label; - } -} - -// ------------------------------------------------------------------------ -/** - * Fieldset Tag - * - * Used to produce
    text. To close fieldset - * use form_fieldset_close() - * - * @access public - * @param string The legend text - * @param string Additional attributes - * @return string - */ -if ( ! function_exists('form_fieldset')) -{ - function form_fieldset($legend_text = '', $attributes = array()) - { - $fieldset = "".$extra; - } -} - -// ------------------------------------------------------------------------ - -/** - * Form Close Tag - * - * @access public - * @param string - * @return string - */ -if ( ! function_exists('form_close')) -{ - function form_close($extra = '') - { - return "".$extra; - } -} - -// ------------------------------------------------------------------------ - -/** - * Form Prep - * - * Formats text so that it can be safely placed in a form field in the event it has HTML tags. - * - * @access public - * @param string - * @return string - */ -if ( ! function_exists('form_prep')) -{ - function form_prep($str = '') - { - // if the field name is an array we do this recursively - if (is_array($str)) - { - foreach ($str as $key => $val) - { - $str[$key] = form_prep($val); - } - - return $str; - } - - if ($str === '') - { - return ''; - } - - $temp = '__TEMP_AMPERSANDS__'; - - // Replace entities to temporary markers so that - // htmlspecialchars won't mess them up - $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); - $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); - - $str = htmlspecialchars($str); - - // In case htmlspecialchars misses these. - $str = str_replace(array("'", '"'), array("'", """), $str); - - // Decode the temp markers back to entities - $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); - $str = preg_replace("/$temp(\w+);/","&\\1;",$str); - - return $str; - } -} - -// ------------------------------------------------------------------------ - -/** - * Form Value - * - * Grabs a value from the POST array for the specified field so you can - * re-populate an input field or textarea. If Form Validation - * is active it retrieves the info from the validation class - * - * @access public - * @param string - * @return mixed - */ -if ( ! function_exists('set_value')) -{ - function set_value($field = '', $default = '') - { - if (FALSE === ($OBJ =& _get_validation_object())) - { - if ( ! isset($_POST[$field])) - { - return $default; - } - - return form_prep($_POST[$field]); - } - - return form_prep($OBJ->set_value($field, $default)); - } -} - -// ------------------------------------------------------------------------ - -/** - * Set Select - * - * Let's you set the selected value of a '; + } + + $form = ''; + + foreach ($name as $name => $value) + { + $form .= "\n"; + $form .= ''; + } + + return $form; + } +} + +// ------------------------------------------------------------------------ + +/** + * Text Input Field + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +if ( ! function_exists('form_input')) +{ + function form_input($data = '', $value = '', $extra = '') + { + $defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + return ""; + } +} + +// ------------------------------------------------------------------------ + +/** + * Password Field + * + * Identical to the input function but adds the "password" type + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +if ( ! function_exists('form_password')) +{ + function form_password($data = '', $value = '', $extra = '') + { + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'password'; + return form_input($data, $value, $extra); + } +} + +// ------------------------------------------------------------------------ + +/** + * Upload Field + * + * Identical to the input function but adds the "file" type + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +if ( ! function_exists('form_upload')) +{ + function form_upload($data = '', $value = '', $extra = '') + { + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'file'; + return form_input($data, $value, $extra); + } +} + +// ------------------------------------------------------------------------ + +/** + * Textarea field + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +if ( ! function_exists('form_textarea')) +{ + function form_textarea($data = '', $value = '', $extra = '') + { + $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'cols' => '90', 'rows' => '12'); + + if ( ! is_array($data) OR ! isset($data['value'])) + { + $val = $value; + } + else + { + $val = $data['value']; + unset($data['value']); // textareas don't use the value attribute + } + + return ""; + } +} + +// ------------------------------------------------------------------------ + +/** + * Drop-down Menu + * + * @access public + * @param string + * @param array + * @param string + * @param string + * @return string + */ +if ( ! function_exists('form_dropdown')) +{ + function form_dropdown($name = '', $options = array(), $selected = array(), $extra = '') + { + if ( ! is_array($selected)) + { + $selected = array($selected); + } + + // If no selected state was submitted we will attempt to set it automatically + if (count($selected) === 0) + { + // If the form name appears in the $_POST array we have a winner! + if (isset($_POST[$name])) + { + $selected = array($_POST[$name]); + } + } + + if ($extra != '') $extra = ' '.$extra; + + $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; + + $form = ''; + + return $form; + } +} + +// ------------------------------------------------------------------------ + +/** + * Checkbox Field + * + * @access public + * @param mixed + * @param string + * @param bool + * @param string + * @return string + */ +if ( ! function_exists('form_checkbox')) +{ + function form_checkbox($data = '', $value = '', $checked = FALSE, $extra = '') + { + $defaults = array('type' => 'checkbox', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + if (is_array($data) AND array_key_exists('checked', $data)) + { + $checked = $data['checked']; + + if ($checked == FALSE) + { + unset($data['checked']); + } + else + { + $data['checked'] = 'checked'; + } + } + + if ($checked == TRUE) + { + $defaults['checked'] = 'checked'; + } + else + { + unset($defaults['checked']); + } + + return ""; + } +} + +// ------------------------------------------------------------------------ + +/** + * Radio Button + * + * @access public + * @param mixed + * @param string + * @param bool + * @param string + * @return string + */ +if ( ! function_exists('form_radio')) +{ + function form_radio($data = '', $value = '', $checked = FALSE, $extra = '') + { + if ( ! is_array($data)) + { + $data = array('name' => $data); + } + + $data['type'] = 'radio'; + return form_checkbox($data, $value, $checked, $extra); + } +} + +// ------------------------------------------------------------------------ + +/** + * Submit Button + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +if ( ! function_exists('form_submit')) +{ + function form_submit($data = '', $value = '', $extra = '') + { + $defaults = array('type' => 'submit', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + return ""; + } +} + +// ------------------------------------------------------------------------ + +/** + * Reset Button + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +if ( ! function_exists('form_reset')) +{ + function form_reset($data = '', $value = '', $extra = '') + { + $defaults = array('type' => 'reset', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value); + + return ""; + } +} + +// ------------------------------------------------------------------------ + +/** + * Form Button + * + * @access public + * @param mixed + * @param string + * @param string + * @return string + */ +if ( ! function_exists('form_button')) +{ + function form_button($data = '', $content = '', $extra = '') + { + $defaults = array('name' => (( ! is_array($data)) ? $data : ''), 'type' => 'submit'); + + if ( is_array($data) AND isset($data['content'])) + { + $content = $data['content']; + unset($data['content']); // content is not an attribute + } + + return ""; + } +} + +// ------------------------------------------------------------------------ + +/** + * Form Label Tag + * + * @access public + * @param string The text to appear onscreen + * @param string The id the label applies to + * @param string Additional attributes + * @return string + */ +if ( ! function_exists('form_label')) +{ + function form_label($label_text = '', $id = '', $attributes = array()) + { + + $label = ' 0) + { + foreach ($attributes as $key => $val) + { + $label .= ' '.$key.'="'.$val.'"'; + } + } + + $label .= ">$label_text"; + + return $label; + } +} + +// ------------------------------------------------------------------------ +/** + * Fieldset Tag + * + * Used to produce
    text. To close fieldset + * use form_fieldset_close() + * + * @access public + * @param string The legend text + * @param string Additional attributes + * @return string + */ +if ( ! function_exists('form_fieldset')) +{ + function form_fieldset($legend_text = '', $attributes = array()) + { + $fieldset = "".$extra; + } +} + +// ------------------------------------------------------------------------ + +/** + * Form Close Tag + * + * @access public + * @param string + * @return string + */ +if ( ! function_exists('form_close')) +{ + function form_close($extra = '') + { + return "".$extra; + } +} + +// ------------------------------------------------------------------------ + +/** + * Form Prep + * + * Formats text so that it can be safely placed in a form field in the event it has HTML tags. + * + * @access public + * @param string + * @return string + */ +if ( ! function_exists('form_prep')) +{ + function form_prep($str = '') + { + // if the field name is an array we do this recursively + if (is_array($str)) + { + foreach ($str as $key => $val) + { + $str[$key] = form_prep($val); + } + + return $str; + } + + if ($str === '') + { + return ''; + } + + $temp = '__TEMP_AMPERSANDS__'; + + // Replace entities to temporary markers so that + // htmlspecialchars won't mess them up + $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); + $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); + + $str = htmlspecialchars($str); + + // In case htmlspecialchars misses these. + $str = str_replace(array("'", '"'), array("'", """), $str); + + // Decode the temp markers back to entities + $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); + $str = preg_replace("/$temp(\w+);/","&\\1;",$str); + + return $str; + } +} + +// ------------------------------------------------------------------------ + +/** + * Form Value + * + * Grabs a value from the POST array for the specified field so you can + * re-populate an input field or textarea. If Form Validation + * is active it retrieves the info from the validation class + * + * @access public + * @param string + * @return mixed + */ +if ( ! function_exists('set_value')) +{ + function set_value($field = '', $default = '') + { + if (FALSE === ($OBJ =& _get_validation_object())) + { + if ( ! isset($_POST[$field])) + { + return $default; + } + + return form_prep($_POST[$field]); + } + + return form_prep($OBJ->set_value($field, $default)); + } +} + +// ------------------------------------------------------------------------ + +/** + * Set Select + * + * Let's you set the selected value of a '; - - -Then, on the page that accepts the submission you'll have something like this: - - // First, delete old captchas - $expiration = time()-7200; // Two hour limit - $DB->query("DELETE FROM captcha WHERE captcha_time < ".$expiration); - - // Then see if a captcha exists: - $sql = "SELECT COUNT(*) AS count FROM captcha WHERE word = ? AND ip_address = ? AND date > ?"; - $binds = array($_POST['captcha'], $this->input->ip_address(), $expiration); - $query = $this->db->query($sql, $binds); - $row = $query->row(); - - if ($row->count == 0) - { - echo "You must submit the word that appears in the image"; - } - -*/ - - - -/** -|========================================================== -| Create Captcha -|========================================================== -| -*/ -function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '') -{ - $defaults = array('word' => '', 'img_path' => '', 'img_url' => '', 'img_width' => '150', 'img_height' => '30', 'font_path' => '', 'expiration' => 7200); - - foreach ($defaults as $key => $val) - { - if ( ! is_array($data)) - { - if ( ! isset($$key) OR $$key == '') - { - $$key = $val; - } - } - else - { - $$key = ( ! isset($data[$key])) ? $val : $data[$key]; - } - } - - if ($img_path == '' OR $img_url == '') - { - return FALSE; - } - - if ( ! @is_dir($img_path)) - { - return FALSE; - } - - if ( ! is_really_writable($img_path)) - { - return FALSE; - } - - if ( ! extension_loaded('gd')) - { - return FALSE; - } - - // ----------------------------------- - // Remove old images - // ----------------------------------- - - list($usec, $sec) = explode(" ", microtime()); - $now = ((float)$usec + (float)$sec); - - $current_dir = @opendir($img_path); - - while($filename = @readdir($current_dir)) - { - if ($filename != "." and $filename != ".." and $filename != "index.html") - { - $name = str_replace(".jpg", "", $filename); - - if (($name + $expiration) < $now) - { - @unlink($img_path.$filename); - } - } - } - - @closedir($current_dir); - - // ----------------------------------- - // Do we have a "word" yet? - // ----------------------------------- - - if ($word == '') - { - $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; - - $str = ''; - for ($i = 0; $i < 8; $i++) - { - $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); - } - - $word = $str; - } - - // ----------------------------------- - // Determine angle and position - // ----------------------------------- - - $length = strlen($word); - $angle = ($length >= 6) ? rand(-($length-6), ($length-6)) : 0; - $x_axis = rand(6, (360/$length)-16); - $y_axis = ($angle >= 0 ) ? rand($img_height, $img_width) : rand(6, $img_height); - - // ----------------------------------- - // Create image - // ----------------------------------- - - // PHP.net recommends imagecreatetruecolor(), but it isn't always available - if (function_exists('imagecreatetruecolor')) - { - $im = imagecreatetruecolor($img_width, $img_height); - } - else - { - $im = imagecreate($img_width, $img_height); - } - - // ----------------------------------- - // Assign colors - // ----------------------------------- - - $bg_color = imagecolorallocate ($im, 255, 255, 255); - $border_color = imagecolorallocate ($im, 153, 102, 102); - $text_color = imagecolorallocate ($im, 204, 153, 153); - $grid_color = imagecolorallocate($im, 255, 182, 182); - $shadow_color = imagecolorallocate($im, 255, 240, 240); - - // ----------------------------------- - // Create the rectangle - // ----------------------------------- - - ImageFilledRectangle($im, 0, 0, $img_width, $img_height, $bg_color); - - // ----------------------------------- - // Create the spiral pattern - // ----------------------------------- - - $theta = 1; - $thetac = 7; - $radius = 16; - $circles = 20; - $points = 32; - - for ($i = 0; $i < ($circles * $points) - 1; $i++) - { - $theta = $theta + $thetac; - $rad = $radius * ($i / $points ); - $x = ($rad * cos($theta)) + $x_axis; - $y = ($rad * sin($theta)) + $y_axis; - $theta = $theta + $thetac; - $rad1 = $radius * (($i + 1) / $points); - $x1 = ($rad1 * cos($theta)) + $x_axis; - $y1 = ($rad1 * sin($theta )) + $y_axis; - imageline($im, $x, $y, $x1, $y1, $grid_color); - $theta = $theta - $thetac; - } - - // ----------------------------------- - // Write the text - // ----------------------------------- - - $use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE; - - if ($use_font == FALSE) - { - $font_size = 5; - $x = rand(0, $img_width/($length/3)); - $y = 0; - } - else - { - $font_size = 16; - $x = rand(0, $img_width/($length/1.5)); - $y = $font_size+2; - } - - for ($i = 0; $i < strlen($word); $i++) - { - if ($use_font == FALSE) - { - $y = rand(0 , $img_height/2); - imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color); - $x += ($font_size*2); - } - else - { - $y = rand($img_height/2, $img_height-3); - imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1)); - $x += $font_size; - } - } - - - // ----------------------------------- - // Create the border - // ----------------------------------- - - imagerectangle($im, 0, 0, $img_width-1, $img_height-1, $border_color); - - // ----------------------------------- - // Generate the image - // ----------------------------------- - - $img_name = $now.'.jpg'; - - ImageJPEG($im, $img_path.$img_name); - - $img = "\""; - - ImageDestroy($im); - - return array('word' => $word, 'time' => $now, 'image' => $img); -} - - -/* End of file captcha_pi.php */ +load->plugin('captcha'); + +Once loaded you can generate a captcha like this: + + $vals = array( + 'word' => 'Random word', + 'img_path' => './captcha/', + 'img_url' => 'http://example.com/captcha/', + 'font_path' => './system/fonts/texb.ttf', + 'img_width' => '150', + 'img_height' => 30, + 'expiration' => 7200 + ); + + $cap = create_captcha($vals); + echo $cap['image']; + + +NOTES: + + The captcha function requires the GD image library. + + Only the img_path and img_url are required. + + If a "word" is not supplied, the function will generate a random + ASCII string. You might put together your own word library that + you can draw randomly from. + + If you do not specify a path to a TRUE TYPE font, the native ugly GD + font will be used. + + The "captcha" folder must be writable (666, or 777) + + The "expiration" (in seconds) signifies how long an image will + remain in the captcha folder before it will be deleted. The default + is two hours. + +RETURNED DATA + +The create_captcha() function returns an associative array with this data: + + [array] + ( + 'image' => IMAGE TAG + 'time' => TIMESTAMP (in microtime) + 'word' => CAPTCHA WORD + ) + +The "image" is the actual image tag: + + +The "time" is the micro timestamp used as the image name without the file +extension. It will be a number like this: 1139612155.3422 + +The "word" is the word that appears in the captcha image, which if not +supplied to the function, will be a random string. + + +ADDING A DATABASE + +In order for the captcha function to prevent someone from posting, you will need +to add the information returned from create_captcha() function to your database. +Then, when the data from the form is submitted by the user you will need to verify +that the data exists in the database and has not expired. + +Here is a table prototype: + + CREATE TABLE captcha ( + captcha_id bigint(13) unsigned NOT NULL auto_increment, + captcha_time int(10) unsigned NOT NULL, + ip_address varchar(16) default '0' NOT NULL, + word varchar(20) NOT NULL, + PRIMARY KEY `captcha_id` (`captcha_id`), + KEY `word` (`word`) + ) + + +Here is an example of usage with a DB. + +On the page where the captcha will be shown you'll have something like this: + + $this->load->plugin('captcha'); + $vals = array( + 'img_path' => './captcha/', + 'img_url' => 'http://example.com/captcha/' + ); + + $cap = create_captcha($vals); + + $data = array( + 'captcha_id' => '', + 'captcha_time' => $cap['time'], + 'ip_address' => $this->input->ip_address(), + 'word' => $cap['word'] + ); + + $query = $this->db->insert_string('captcha', $data); + $this->db->query($query); + + echo 'Submit the word you see below:'; + echo $cap['image']; + echo ''; + + +Then, on the page that accepts the submission you'll have something like this: + + // First, delete old captchas + $expiration = time()-7200; // Two hour limit + $DB->query("DELETE FROM captcha WHERE captcha_time < ".$expiration); + + // Then see if a captcha exists: + $sql = "SELECT COUNT(*) AS count FROM captcha WHERE word = ? AND ip_address = ? AND date > ?"; + $binds = array($_POST['captcha'], $this->input->ip_address(), $expiration); + $query = $this->db->query($sql, $binds); + $row = $query->row(); + + if ($row->count == 0) + { + echo "You must submit the word that appears in the image"; + } + +*/ + + + +/** +|========================================================== +| Create Captcha +|========================================================== +| +*/ +function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '') +{ + $defaults = array('word' => '', 'img_path' => '', 'img_url' => '', 'img_width' => '150', 'img_height' => '30', 'font_path' => '', 'expiration' => 7200); + + foreach ($defaults as $key => $val) + { + if ( ! is_array($data)) + { + if ( ! isset($$key) OR $$key == '') + { + $$key = $val; + } + } + else + { + $$key = ( ! isset($data[$key])) ? $val : $data[$key]; + } + } + + if ($img_path == '' OR $img_url == '') + { + return FALSE; + } + + if ( ! @is_dir($img_path)) + { + return FALSE; + } + + if ( ! is_really_writable($img_path)) + { + return FALSE; + } + + if ( ! extension_loaded('gd')) + { + return FALSE; + } + + // ----------------------------------- + // Remove old images + // ----------------------------------- + + list($usec, $sec) = explode(" ", microtime()); + $now = ((float)$usec + (float)$sec); + + $current_dir = @opendir($img_path); + + while($filename = @readdir($current_dir)) + { + if ($filename != "." and $filename != ".." and $filename != "index.html") + { + $name = str_replace(".jpg", "", $filename); + + if (($name + $expiration) < $now) + { + @unlink($img_path.$filename); + } + } + } + + @closedir($current_dir); + + // ----------------------------------- + // Do we have a "word" yet? + // ----------------------------------- + + if ($word == '') + { + $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; + + $str = ''; + for ($i = 0; $i < 8; $i++) + { + $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); + } + + $word = $str; + } + + // ----------------------------------- + // Determine angle and position + // ----------------------------------- + + $length = strlen($word); + $angle = ($length >= 6) ? rand(-($length-6), ($length-6)) : 0; + $x_axis = rand(6, (360/$length)-16); + $y_axis = ($angle >= 0 ) ? rand($img_height, $img_width) : rand(6, $img_height); + + // ----------------------------------- + // Create image + // ----------------------------------- + + // PHP.net recommends imagecreatetruecolor(), but it isn't always available + if (function_exists('imagecreatetruecolor')) + { + $im = imagecreatetruecolor($img_width, $img_height); + } + else + { + $im = imagecreate($img_width, $img_height); + } + + // ----------------------------------- + // Assign colors + // ----------------------------------- + + $bg_color = imagecolorallocate ($im, 255, 255, 255); + $border_color = imagecolorallocate ($im, 153, 102, 102); + $text_color = imagecolorallocate ($im, 204, 153, 153); + $grid_color = imagecolorallocate($im, 255, 182, 182); + $shadow_color = imagecolorallocate($im, 255, 240, 240); + + // ----------------------------------- + // Create the rectangle + // ----------------------------------- + + ImageFilledRectangle($im, 0, 0, $img_width, $img_height, $bg_color); + + // ----------------------------------- + // Create the spiral pattern + // ----------------------------------- + + $theta = 1; + $thetac = 7; + $radius = 16; + $circles = 20; + $points = 32; + + for ($i = 0; $i < ($circles * $points) - 1; $i++) + { + $theta = $theta + $thetac; + $rad = $radius * ($i / $points ); + $x = ($rad * cos($theta)) + $x_axis; + $y = ($rad * sin($theta)) + $y_axis; + $theta = $theta + $thetac; + $rad1 = $radius * (($i + 1) / $points); + $x1 = ($rad1 * cos($theta)) + $x_axis; + $y1 = ($rad1 * sin($theta )) + $y_axis; + imageline($im, $x, $y, $x1, $y1, $grid_color); + $theta = $theta - $thetac; + } + + // ----------------------------------- + // Write the text + // ----------------------------------- + + $use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE; + + if ($use_font == FALSE) + { + $font_size = 5; + $x = rand(0, $img_width/($length/3)); + $y = 0; + } + else + { + $font_size = 16; + $x = rand(0, $img_width/($length/1.5)); + $y = $font_size+2; + } + + for ($i = 0; $i < strlen($word); $i++) + { + if ($use_font == FALSE) + { + $y = rand(0 , $img_height/2); + imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color); + $x += ($font_size*2); + } + else + { + $y = rand($img_height/2, $img_height-3); + imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1)); + $x += $font_size; + } + } + + + // ----------------------------------- + // Create the border + // ----------------------------------- + + imagerectangle($im, 0, 0, $img_width-1, $img_height-1, $border_color); + + // ----------------------------------- + // Generate the image + // ----------------------------------- + + $img_name = $now.'.jpg'; + + ImageJPEG($im, $img_path.$img_name); + + $img = "\""; + + ImageDestroy($im); + + return array('word' => $word, 'time' => $now, 'image' => $img); +} + + +/* End of file captcha_pi.php */ /* Location: ./system/plugins/captcha_pi.php */ \ No newline at end of file diff --git a/system/plugins/index.html b/system/plugins/index.html index 065d2da5..c942a79c 100644 --- a/system/plugins/index.html +++ b/system/plugins/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/plugins/js_calendar_pi.php b/system/plugins/js_calendar_pi.php index e165c544..6dadd4ad 100644 --- a/system/plugins/js_calendar_pi.php +++ b/system/plugins/js_calendar_pi.php @@ -1,629 +1,629 @@ -load->plugin('js_calendar'); - -Once loaded you'll add the calendar script to the of your page like this: - - - -The above function will be passed the name of your form. - -Then to show the actual calendar you'll do this: - - -
    - -

    Today

    -
    - - -Note: The first parameter is the name of the field containing your date, the second parameter contains the "now" time, -and the third tells the calendar whether to highlight the current day or not. - -Lastly, you'll need some CSS for your calendar: - -.calendar { - border: 1px #6975A3 solid; - background-color: transparent; -} -.calheading { - background-color: #7C8BC0; - color: #fff; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - font-weight: bold; - text-align: center; -} -.calnavleft { - background-color: #7C8BC0; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 10px; - font-weight: bold; - color: #fff; - padding: 4px; - cursor: pointer; -} -.calnavright { - background-color: #7C8BC0; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 10px; - font-weight: bold; - color: #fff; - text-align: right; - padding: 4px; - cursor: pointer; -} -.caldayheading { - background-color: #000; - color: #fff; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 10px; - text-align: center; - padding: 6px 2px 6px 2px; -} -.caldaycells{ - color: #000; - background-color: #D1D7E6; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - text-align: center; - padding: 4px; - border: 1px #E0E5F1 solid; - cursor: pointer; -} -.caldaycellhover{ - color: #fff; - background-color: #B3BCD4; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - text-align: center; - padding: 4px; - border: 1px #B3BCD4 solid; - cursor: pointer; -} -.caldayselected{ - background-color: #737FAC; - color: #fff; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - font-weight: bold; - text-align: center; - border: 1px #566188 solid; - padding: 3px; - cursor: pointer; -} -.calblanktop { - background-color: #fff; - padding: 4px; -} -.calblankbot { - background-color: #fff; - padding: 4px; -} - - -*/ - -function js_calendar_script($form_name = 'entryform') -{ -$CI =& get_instance(); -$CI->load->language('calendar'); -ob_start(); -?> - - - var '.$field_id.' = new calendar("'.$field_id.'", '.$time.', '.(($highlight == TRUE) ? 'true' : 'false').'); - document.write('.$field_id.'.write()); - '; -} - - -/* End of file js_calendar_pi.php */ +load->plugin('js_calendar'); + +Once loaded you'll add the calendar script to the of your page like this: + + + +The above function will be passed the name of your form. + +Then to show the actual calendar you'll do this: + + +
    + +

    Today

    +
    + + +Note: The first parameter is the name of the field containing your date, the second parameter contains the "now" time, +and the third tells the calendar whether to highlight the current day or not. + +Lastly, you'll need some CSS for your calendar: + +.calendar { + border: 1px #6975A3 solid; + background-color: transparent; +} +.calheading { + background-color: #7C8BC0; + color: #fff; + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 11px; + font-weight: bold; + text-align: center; +} +.calnavleft { + background-color: #7C8BC0; + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 10px; + font-weight: bold; + color: #fff; + padding: 4px; + cursor: pointer; +} +.calnavright { + background-color: #7C8BC0; + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 10px; + font-weight: bold; + color: #fff; + text-align: right; + padding: 4px; + cursor: pointer; +} +.caldayheading { + background-color: #000; + color: #fff; + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 10px; + text-align: center; + padding: 6px 2px 6px 2px; +} +.caldaycells{ + color: #000; + background-color: #D1D7E6; + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 11px; + text-align: center; + padding: 4px; + border: 1px #E0E5F1 solid; + cursor: pointer; +} +.caldaycellhover{ + color: #fff; + background-color: #B3BCD4; + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 11px; + text-align: center; + padding: 4px; + border: 1px #B3BCD4 solid; + cursor: pointer; +} +.caldayselected{ + background-color: #737FAC; + color: #fff; + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 11px; + font-weight: bold; + text-align: center; + border: 1px #566188 solid; + padding: 3px; + cursor: pointer; +} +.calblanktop { + background-color: #fff; + padding: 4px; +} +.calblankbot { + background-color: #fff; + padding: 4px; +} + + +*/ + +function js_calendar_script($form_name = 'entryform') +{ +$CI =& get_instance(); +$CI->load->language('calendar'); +ob_start(); +?> + + + var '.$field_id.' = new calendar("'.$field_id.'", '.$time.', '.(($highlight == TRUE) ? 'true' : 'false').'); + document.write('.$field_id.'.write()); + '; +} + + +/* End of file js_calendar_pi.php */ /* Location: ./system/plugins/js_calendar_pi.php */ \ No newline at end of file diff --git a/system/scaffolding/Scaffolding.php b/system/scaffolding/Scaffolding.php index 28172ca1..1d526701 100644 --- a/system/scaffolding/Scaffolding.php +++ b/system/scaffolding/Scaffolding.php @@ -1,291 +1,291 @@ -CI =& get_instance(); - - $this->CI->load->database("", FALSE, TRUE); - $this->CI->load->library('pagination'); - - // Turn off caching - $this->CI->db->cache_off(); - - /** - * Set the current table name - * This is done when initializing scaffolding: - * $this->load->scaffolding('table_name') - * - */ - $this->current_table = $db_table; - - /** - * Set the path to the "view" files - * We'll manually override the "view" path so that - * the load->view function knows where to look. - */ - - $this->CI->load->_ci_view_path = BASEPATH.'scaffolding/views/'; - - // Set the base URL - $this->base_url = $this->CI->config->site_url().'/'.$this->CI->uri->segment(1).$this->CI->uri->slash_segment(2, 'both'); - $this->base_uri = $this->CI->uri->segment(1).$this->CI->uri->slash_segment(2, 'leading'); - - // Set a few globals - $data = array( - 'image_url' => $this->CI->config->system_url().'scaffolding/images/', - 'base_uri' => $this->base_uri, - 'base_url' => $this->base_url, - 'title' => $this->current_table - ); - - $this->CI->load->vars($data); - - // Load the language file and create variables - $this->lang = $this->CI->load->scaffold_language('scaffolding', '', TRUE); - $this->CI->load->vars($this->lang); - - // Load the helper files we plan to use - $this->CI->load->helper(array('url', 'form')); - - - log_message('debug', 'Scaffolding Class Initialized'); - } - - // -------------------------------------------------------------------- - - /** - * "Add" Page - * - * Shows a form representing the currently selected DB - * so that data can be inserted - * - * @access public - * @return string the HTML "add" page - */ - function add() - { - $data = array( - 'title' => ( ! isset($this->lang['scaff_add'])) ? 'Add Data' : $this->lang['scaff_add'], - 'fields' => $this->CI->db->field_data($this->current_table), - 'action' => $this->base_uri.'/insert' - ); - - $this->CI->load->view('add', $data); - } - - // -------------------------------------------------------------------- - - /** - * Insert the data - * - * @access public - * @return void redirects to the view page - */ - function insert() - { - if ($this->CI->db->insert($this->current_table, $_POST) === FALSE) - { - $this->add(); - } - else - { - redirect($this->base_uri.'/view/'); - } - } - - // -------------------------------------------------------------------- - - /** - * "View" Page - * - * Shows a table containing the data in the currently - * selected DB - * - * @access public - * @return string the HTML "view" page - */ - function view() - { - // Fetch the total number of DB rows - $total_rows = $this->CI->db->count_all($this->current_table); - - if ($total_rows < 1) - { - return $this->CI->load->view('no_data'); - } - - // Set the query limit/offset - $per_page = 20; - $offset = $this->CI->uri->segment(4, 0); - - // Run the query - $query = $this->CI->db->get($this->current_table, $per_page, $offset); - - // Now let's get the field names - $fields = $this->CI->db->list_fields($this->current_table); - - // We assume that the column in the first position is the primary field. - $primary = current($fields); - - // Pagination! - $this->CI->pagination->initialize( - array( - 'base_url' => $this->base_url.'/view', - 'total_rows' => $total_rows, - 'per_page' => $per_page, - 'uri_segment' => 4, - 'full_tag_open' => '

    ', - 'full_tag_close' => '

    ' - ) - ); - - $data = array( - 'title' => ( ! isset($this->lang['scaff_view'])) ? 'View Data' : $this->lang['scaff_view'], - 'query' => $query, - 'fields' => $fields, - 'primary' => $primary, - 'paginate' => $this->CI->pagination->create_links() - ); - - $this->CI->load->view('view', $data); - } - - // -------------------------------------------------------------------- - - /** - * "Edit" Page - * - * Shows a form representing the currently selected DB - * so that data can be edited - * - * @access public - * @return string the HTML "edit" page - */ - function edit() - { - if (FALSE === ($id = $this->CI->uri->segment(4))) - { - return $this->view(); - } - - // Fetch the primary field name - $primary = $this->CI->db->primary($this->current_table); - - // Run the query - $query = $this->CI->db->get_where($this->current_table, array($primary => $id)); - - $data = array( - 'title' => ( ! isset($this->lang['scaff_edit'])) ? 'Edit Data' : $this->lang['scaff_edit'], - 'fields' => $query->field_data(), - 'query' => $query->row(), - 'action' => $this->base_uri.'/update/'.$this->CI->uri->segment(4) - ); - - $this->CI->load->view('edit', $data); - } - - // -------------------------------------------------------------------- - - /** - * Update - * - * @access public - * @return void redirects to the view page - */ - function update() - { - // Fetch the primary key - $primary = $this->CI->db->primary($this->current_table); - - // Now do the query - $this->CI->db->update($this->current_table, $_POST, array($primary => $this->CI->uri->segment(4))); - - redirect($this->base_uri.'/view/'); - } - - // -------------------------------------------------------------------- - - /** - * Delete Confirmation - * - * @access public - * @return string the HTML "delete confirm" page - */ - function delete() - { - if ( ! isset($this->lang['scaff_del_confirm'])) - { - $message = 'Are you sure you want to delete the following row: '.$this->CI->uri->segment(4); - } - else - { - $message = $this->lang['scaff_del_confirm'].' '.$this->CI->uri->segment(4); - } - - $data = array( - 'title' => ( ! isset($this->lang['scaff_delete'])) ? 'Delete Data' : $this->lang['scaff_delete'], - 'message' => $message, - 'no' => anchor(array($this->base_uri, 'view'), ( ! isset($this->lang['scaff_no'])) ? 'No' : $this->lang['scaff_no']), - 'yes' => anchor(array($this->base_uri, 'do_delete', $this->CI->uri->segment(4)), ( ! isset($this->lang['scaff_yes'])) ? 'Yes' : $this->lang['scaff_yes']) - ); - - $this->CI->load->view('delete', $data); - } - - // -------------------------------------------------------------------- - - /** - * Delete - * - * @access public - * @return void redirects to the view page - */ - function do_delete() - { - // Fetch the primary key - $primary = $this->CI->db->primary($this->current_table); - - // Now do the query - $this->CI->db->where($primary, $this->CI->uri->segment(4)); - $this->CI->db->delete($this->current_table); - - header("Refresh:0;url=".site_url(array($this->base_uri, 'view'))); - exit; - } - -} - -/* End of file Scaffolding.php */ +CI =& get_instance(); + + $this->CI->load->database("", FALSE, TRUE); + $this->CI->load->library('pagination'); + + // Turn off caching + $this->CI->db->cache_off(); + + /** + * Set the current table name + * This is done when initializing scaffolding: + * $this->load->scaffolding('table_name') + * + */ + $this->current_table = $db_table; + + /** + * Set the path to the "view" files + * We'll manually override the "view" path so that + * the load->view function knows where to look. + */ + + $this->CI->load->_ci_view_path = BASEPATH.'scaffolding/views/'; + + // Set the base URL + $this->base_url = $this->CI->config->site_url().'/'.$this->CI->uri->segment(1).$this->CI->uri->slash_segment(2, 'both'); + $this->base_uri = $this->CI->uri->segment(1).$this->CI->uri->slash_segment(2, 'leading'); + + // Set a few globals + $data = array( + 'image_url' => $this->CI->config->system_url().'scaffolding/images/', + 'base_uri' => $this->base_uri, + 'base_url' => $this->base_url, + 'title' => $this->current_table + ); + + $this->CI->load->vars($data); + + // Load the language file and create variables + $this->lang = $this->CI->load->scaffold_language('scaffolding', '', TRUE); + $this->CI->load->vars($this->lang); + + // Load the helper files we plan to use + $this->CI->load->helper(array('url', 'form')); + + + log_message('debug', 'Scaffolding Class Initialized'); + } + + // -------------------------------------------------------------------- + + /** + * "Add" Page + * + * Shows a form representing the currently selected DB + * so that data can be inserted + * + * @access public + * @return string the HTML "add" page + */ + function add() + { + $data = array( + 'title' => ( ! isset($this->lang['scaff_add'])) ? 'Add Data' : $this->lang['scaff_add'], + 'fields' => $this->CI->db->field_data($this->current_table), + 'action' => $this->base_uri.'/insert' + ); + + $this->CI->load->view('add', $data); + } + + // -------------------------------------------------------------------- + + /** + * Insert the data + * + * @access public + * @return void redirects to the view page + */ + function insert() + { + if ($this->CI->db->insert($this->current_table, $_POST) === FALSE) + { + $this->add(); + } + else + { + redirect($this->base_uri.'/view/'); + } + } + + // -------------------------------------------------------------------- + + /** + * "View" Page + * + * Shows a table containing the data in the currently + * selected DB + * + * @access public + * @return string the HTML "view" page + */ + function view() + { + // Fetch the total number of DB rows + $total_rows = $this->CI->db->count_all($this->current_table); + + if ($total_rows < 1) + { + return $this->CI->load->view('no_data'); + } + + // Set the query limit/offset + $per_page = 20; + $offset = $this->CI->uri->segment(4, 0); + + // Run the query + $query = $this->CI->db->get($this->current_table, $per_page, $offset); + + // Now let's get the field names + $fields = $this->CI->db->list_fields($this->current_table); + + // We assume that the column in the first position is the primary field. + $primary = current($fields); + + // Pagination! + $this->CI->pagination->initialize( + array( + 'base_url' => $this->base_url.'/view', + 'total_rows' => $total_rows, + 'per_page' => $per_page, + 'uri_segment' => 4, + 'full_tag_open' => '

    ', + 'full_tag_close' => '

    ' + ) + ); + + $data = array( + 'title' => ( ! isset($this->lang['scaff_view'])) ? 'View Data' : $this->lang['scaff_view'], + 'query' => $query, + 'fields' => $fields, + 'primary' => $primary, + 'paginate' => $this->CI->pagination->create_links() + ); + + $this->CI->load->view('view', $data); + } + + // -------------------------------------------------------------------- + + /** + * "Edit" Page + * + * Shows a form representing the currently selected DB + * so that data can be edited + * + * @access public + * @return string the HTML "edit" page + */ + function edit() + { + if (FALSE === ($id = $this->CI->uri->segment(4))) + { + return $this->view(); + } + + // Fetch the primary field name + $primary = $this->CI->db->primary($this->current_table); + + // Run the query + $query = $this->CI->db->get_where($this->current_table, array($primary => $id)); + + $data = array( + 'title' => ( ! isset($this->lang['scaff_edit'])) ? 'Edit Data' : $this->lang['scaff_edit'], + 'fields' => $query->field_data(), + 'query' => $query->row(), + 'action' => $this->base_uri.'/update/'.$this->CI->uri->segment(4) + ); + + $this->CI->load->view('edit', $data); + } + + // -------------------------------------------------------------------- + + /** + * Update + * + * @access public + * @return void redirects to the view page + */ + function update() + { + // Fetch the primary key + $primary = $this->CI->db->primary($this->current_table); + + // Now do the query + $this->CI->db->update($this->current_table, $_POST, array($primary => $this->CI->uri->segment(4))); + + redirect($this->base_uri.'/view/'); + } + + // -------------------------------------------------------------------- + + /** + * Delete Confirmation + * + * @access public + * @return string the HTML "delete confirm" page + */ + function delete() + { + if ( ! isset($this->lang['scaff_del_confirm'])) + { + $message = 'Are you sure you want to delete the following row: '.$this->CI->uri->segment(4); + } + else + { + $message = $this->lang['scaff_del_confirm'].' '.$this->CI->uri->segment(4); + } + + $data = array( + 'title' => ( ! isset($this->lang['scaff_delete'])) ? 'Delete Data' : $this->lang['scaff_delete'], + 'message' => $message, + 'no' => anchor(array($this->base_uri, 'view'), ( ! isset($this->lang['scaff_no'])) ? 'No' : $this->lang['scaff_no']), + 'yes' => anchor(array($this->base_uri, 'do_delete', $this->CI->uri->segment(4)), ( ! isset($this->lang['scaff_yes'])) ? 'Yes' : $this->lang['scaff_yes']) + ); + + $this->CI->load->view('delete', $data); + } + + // -------------------------------------------------------------------- + + /** + * Delete + * + * @access public + * @return void redirects to the view page + */ + function do_delete() + { + // Fetch the primary key + $primary = $this->CI->db->primary($this->current_table); + + // Now do the query + $this->CI->db->where($primary, $this->CI->uri->segment(4)); + $this->CI->db->delete($this->current_table); + + header("Refresh:0;url=".site_url(array($this->base_uri, 'view'))); + exit; + } + +} + +/* End of file Scaffolding.php */ /* Location: ./system/scaffolding/Scaffolding.php */ \ No newline at end of file diff --git a/system/scaffolding/images/index.html b/system/scaffolding/images/index.html index 065d2da5..c942a79c 100644 --- a/system/scaffolding/images/index.html +++ b/system/scaffolding/images/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/scaffolding/index.html b/system/scaffolding/index.html index 065d2da5..c942a79c 100644 --- a/system/scaffolding/index.html +++ b/system/scaffolding/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/scaffolding/views/add.php b/system/scaffolding/views/add.php index cac255ac..cbb12f6f 100644 --- a/system/scaffolding/views/add.php +++ b/system/scaffolding/views/add.php @@ -1,32 +1,32 @@ -load->view('header'); ?> - -

    - - - - - - - -primary_key == 1) continue; ?> - - - - - type == 'blob'): ?> - - - - - - - -
    name; echo ' '.$field->default; ?>
    - - - - - -load->view('footer'); -/* End of file add.php */ -/* Location: ./system/scaffolding/views/add.php */ +load->view('header'); ?> + +

    + + + + + + + +primary_key == 1) continue; ?> + + + + + type == 'blob'): ?> + + + + + + + +
    name; echo ' '.$field->default; ?>
    + + + + + +load->view('footer'); +/* End of file add.php */ +/* Location: ./system/scaffolding/views/add.php */ diff --git a/system/scaffolding/views/delete.php b/system/scaffolding/views/delete.php index 87b59bef..d1954219 100644 --- a/system/scaffolding/views/delete.php +++ b/system/scaffolding/views/delete.php @@ -1,9 +1,9 @@ -load->view('header'); ?> - -

    - -

      |   - -load->view('footer'); -/* End of file delete.php */ -/* Location: ./system/scaffolding/views/delete.php */ +load->view('header'); ?> + +

    + +

      |   + +load->view('footer'); +/* End of file delete.php */ +/* Location: ./system/scaffolding/views/delete.php */ diff --git a/system/scaffolding/views/edit.php b/system/scaffolding/views/edit.php index c66259d9..fe553e59 100644 --- a/system/scaffolding/views/edit.php +++ b/system/scaffolding/views/edit.php @@ -1,33 +1,33 @@ -load->view('header'); ?> - - -

    - - - - - - - -primary_key == 1) continue; ?> - - - - - type == 'blob'): ?> - - - - - - - -
    name; ?>
    - - - - - -load->view('footer'); -/* End of file edit.php */ +load->view('header'); ?> + + +

    + + + + + + + +primary_key == 1) continue; ?> + + + + + type == 'blob'): ?> + + + + + + + +
    name; ?>
    + + + + + +load->view('footer'); +/* End of file edit.php */ /* Location: ./system/scaffolding/views/edit.php */ \ No newline at end of file diff --git a/system/scaffolding/views/footer.php b/system/scaffolding/views/footer.php index a287664f..0e71401c 100644 --- a/system/scaffolding/views/footer.php +++ b/system/scaffolding/views/footer.php @@ -1,10 +1,10 @@ - -
    - - - - + +
    + + + + \ No newline at end of file diff --git a/system/scaffolding/views/header.php b/system/scaffolding/views/header.php index a1621ff3..50f234a4 100644 --- a/system/scaffolding/views/header.php +++ b/system/scaffolding/views/header.php @@ -1,29 +1,29 @@ - - - - -<?php echo $title; ?> - - - - - - - - - - - - -
    + + + + +<?php echo $title; ?> + + + + + + + + + + + + +
    \ No newline at end of file diff --git a/system/scaffolding/views/index.html b/system/scaffolding/views/index.html index 065d2da5..c942a79c 100644 --- a/system/scaffolding/views/index.html +++ b/system/scaffolding/views/index.html @@ -1,10 +1,10 @@ - - - 403 Forbidden - - - -

    Directory access is forbidden.

    - - + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + \ No newline at end of file diff --git a/system/scaffolding/views/no_data.php b/system/scaffolding/views/no_data.php index 963341b7..bc81e748 100644 --- a/system/scaffolding/views/no_data.php +++ b/system/scaffolding/views/no_data.php @@ -1,8 +1,8 @@ -load->view('header'); ?> - -

    -

    - -load->view('footer'); -/* End of file no_data.php */ +load->view('header'); ?> + +

    +

    + +load->view('footer'); +/* End of file no_data.php */ /* Location: ./system/scaffolding/views/no_data.php */ \ No newline at end of file diff --git a/system/scaffolding/views/stylesheet.css b/system/scaffolding/views/stylesheet.css index ba6ee0a2..3f487dd0 100644 --- a/system/scaffolding/views/stylesheet.css +++ b/system/scaffolding/views/stylesheet.css @@ -1,143 +1,143 @@ -body { - margin: 0; - padding: 0; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - color: #4F5155; - background: #fff url(background.jpg) repeat-x left top; -} - -a { - color: #8B0D00; - background-color: transparent; - text-decoration: none; - font-weight: bold; -} - -a:visited { - color: #8B0D00; - background-color: transparent; - text-decoration: none; -} - -a:hover { - color: #000; - text-decoration: none; - background-color: transparent; -} - - -#header { - margin: 0; - padding: 0; -} - -#header_left { - background-color: transparent; - float: left; - padding: 21px 0 0 32px; - margin: 0 -} - -#header_right { - background-color: transparent; - float: right; - text-align: right; - padding: 35px 50px 20px 0; - margin: 0 -} - -#footer { - margin: 20px 0 15px 0; - padding: 0; -} - -#footer p { - font-size: 10px; - color: #999; - text-align: center; -} - -#outer { - margin: 30px 40px 0 40px; -} - -img { - padding:0; - border: 0; - margin: 0; -} - -.nopad { - padding:0; - border: 0; - margin: 0; -} - -table { - background-color: #efefef; -} - -th { - background-color: #eee; - font-weight: bold; - padding: 6px; - text-align: left; -} - -td { - background-color: #fff; - padding: 6px; -} - - -form { - margin: 0; - padding: 0; -} - -.input { - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - width: 600px; - color: #333; - border: 1px solid #B3B4BD; - font-size: 11px; - height: 2em; - padding: 0; - margin: 0; -} - -.textarea { - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 12px; - width: 600px; - color: #333; - border: 1px solid #B3B4BD; - padding: 0; - margin: 0; -} - -.select { - background-color: #fff; - font-size: 11px; - font-weight: normal; - color: #333; - padding: 0; - margin: 0 0 3px 0; -} - -.checkbox { - background-color: transparent; - padding: 0; - border: 0; -} - -.submit { - background-color: #8B0D00; - color: #FFF; - font-weight: normal; - border: 1px solid #000; - margin: 6px 0 0 0; - padding: 1px 5px 1px 5px; -} +body { + margin: 0; + padding: 0; + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 11px; + color: #4F5155; + background: #fff url(background.jpg) repeat-x left top; +} + +a { + color: #8B0D00; + background-color: transparent; + text-decoration: none; + font-weight: bold; +} + +a:visited { + color: #8B0D00; + background-color: transparent; + text-decoration: none; +} + +a:hover { + color: #000; + text-decoration: none; + background-color: transparent; +} + + +#header { + margin: 0; + padding: 0; +} + +#header_left { + background-color: transparent; + float: left; + padding: 21px 0 0 32px; + margin: 0 +} + +#header_right { + background-color: transparent; + float: right; + text-align: right; + padding: 35px 50px 20px 0; + margin: 0 +} + +#footer { + margin: 20px 0 15px 0; + padding: 0; +} + +#footer p { + font-size: 10px; + color: #999; + text-align: center; +} + +#outer { + margin: 30px 40px 0 40px; +} + +img { + padding:0; + border: 0; + margin: 0; +} + +.nopad { + padding:0; + border: 0; + margin: 0; +} + +table { + background-color: #efefef; +} + +th { + background-color: #eee; + font-weight: bold; + padding: 6px; + text-align: left; +} + +td { + background-color: #fff; + padding: 6px; +} + + +form { + margin: 0; + padding: 0; +} + +.input { + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 11px; + width: 600px; + color: #333; + border: 1px solid #B3B4BD; + font-size: 11px; + height: 2em; + padding: 0; + margin: 0; +} + +.textarea { + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 12px; + width: 600px; + color: #333; + border: 1px solid #B3B4BD; + padding: 0; + margin: 0; +} + +.select { + background-color: #fff; + font-size: 11px; + font-weight: normal; + color: #333; + padding: 0; + margin: 0 0 3px 0; +} + +.checkbox { + background-color: transparent; + padding: 0; + border: 0; +} + +.submit { + background-color: #8B0D00; + color: #FFF; + font-weight: normal; + border: 1px solid #000; + margin: 6px 0 0 0; + padding: 1px 5px 1px 5px; +} diff --git a/system/scaffolding/views/view.php b/system/scaffolding/views/view.php index 69c1f45d..a81241d3 100644 --- a/system/scaffolding/views/view.php +++ b/system/scaffolding/views/view.php @@ -1,27 +1,27 @@ -load->view('header'); ?> - - - - - - - - - - -result() as $row): ?> - - - - - - - - -
    EditDelete
     $primary), $scaff_edit); ?> $primary), $scaff_delete); ?>$field);?>
    - - - -load->view('footer'); -/* End of file view.php */ +load->view('header'); ?> + + + + + + + + + + +result() as $row): ?> + + + + + + + + +
    EditDelete
     $primary), $scaff_edit); ?> $primary), $scaff_delete); ?>$field);?>
    + + + +load->view('footer'); +/* End of file view.php */ /* Location: ./system/scaffolding/views/view.php */ \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index cdadea79..6f23617b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1,957 +1,957 @@ - - - - - - - - - - - - - - - - - - - -Change Log : CodeIgniter User Guide - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Change Log

    - -

    Version 1.7.1

    -

    Release Date: not yet released
    -SVN Revision:

    - -
      -
    • Libraries -
        -
      • Changed default current page indicator in the Pagination library to use <strong> instead of <b>
        • -
      • A "HTTP/1.1 400 Bad Request" header is now sent when disallowed characters are encountered.
        • -
      • Added <big>, <small>, <q>, and <tt> to the Typography parser's inline elements.
        • -
      -
      • -
    • Helpers - -
      • -
    - -

    Bug fixes for 1.7.1

    -
      -
    • Fixed a bug in the MySQLi driver when no port is specified
      • -
    • Fixed a bug (#5702), in which the field label was not being fetched properly, when "matching" one field to another.
      • -
    • Fixed a bug in which identifers were not being escaped properly when reserved characters were used.
      • -
    • Fixed a bug with the regular expression used to protect submitted paragraph tags in auto typography.
      • -
    • Fixed a bug where double dashes within tag attributes were being converted to em dash entities.
      • -
    • Fixed a bug where double spaces within tag attributes were being converted to non-breaking space entities.
      • -
    • Changed a few docblock comments to reflect actual return values.
      • -
    • Fixed a bug with high ascii characters in subject and from email headers.
      • -
    - - -

    Version 1.7

    -

    Release Date: October 23, 2008
    -SVN Revision: 1541

    - -
      -
    • Libraries -
        -
      • Added a new Form Validation Class. It simplifies setting rules and field names, supports arrays as field names, allows groups of validation rules to be saved in a config file, and adds some helper functions for use in view files. Please note that the old Validation class is now deprecated. We will leave it in the library folder for some time so that existing applications that use it will not break, but you are encouraged to migrate to the new version.
        • -
      • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
        • -
      • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
        • -
      • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
        • -
      • Added controller class/method info to Profiler class and support for multiple database connections.
        • -
      • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
        • -
      • Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.
        • -
      • Improved Parser class to allow multiple calls to the parse() function. The output of each is appended in the output.
        • -
      • Added max_filename option to set a file name length limit in the File Upload Class.
        • -
      • Added set_status_header() function to Output class.
        • -
      • Modified Pagination class to only output the "First" link when the link for page one would not be shown.
        • -
      • Added support for mb_strlen in the Form Validation class so that multi-byte languages will calculate string lengths properly.
        • -
      -
      • -
    • Database -
        -
      • Improved Active Record class to allow full path column and table names: hostname.database.table.column. Also improved the alias handling.
        • -
      • Improved how table and column names are escaped and prefixed. It now honors full path names when adding prefixes and escaping.
        • -
      • Added Active Record caching feature to "update" and "delete" functions.
        • -
      • Added removal of non-printing control characters in escape_str() of DB drivers that do not have native PHP escaping mechanisms (mssql, oci8, odbc), to avoid potential SQL errors, and possible sources of SQL injection.
        • -
      • Added port support to MySQL, MySQLi, and MS SQL database drivers.
        • -
      • Added driver name variable in each DB driver, based on bug report #4436.
        • -
      -
      • -
    • Helpers -
        -
      • Added several new "setting" functions to the Form helper that allow POST data to be retrieved and set into forms. These are intended to be used on their own, or with the new Form Validation Class.
        • -
      • Added current_url() and uri_segments() to URL helper.
        • -
      • Altered auto_link() in the URL helper so that email addresses with "+" included will be linked.
        • -
      • Added meta() function to HTML helper.
        • -
      • Improved accuracy of calculations in Number helper.
        • -
      • Removed added newlines ("\n") from most form and html helper functions.
        • -
      • Tightened up validation in the Date helper function human_to_unix(), and eliminated the POSIX regex.
        • -
      • Updated Date helper to match the world's current time zones and offsets.
        • -
      • Modified url_title() in the URL helper to remove characters and digits that are part of - character entities, to allow dashes, underscores, and periods regardless of the $separator, and to allow uppercase characters.
        • -
      • Added support for arbitrary attributes in anchor_popup() of the URL helper.
        • -
      -
      • -
    • Other Changes -
        -
      • Added PHP Style Guide to docs.
        • -
      • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
        • -
      • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
        • -
      • Added a file lock check during caching, before trying to write to the file.
        • -
      • Modified Cookie key cleaning to unset a few troublesome key names that can be present in certain environments, preventing CI from halting execution.
        • -
      • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div.
        • -
      -
      • -
    - -

    Bug fixes for 1.7.0

    -
      -
    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • -
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229, #5254, #5351).
      • -
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
      • -
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
      • -
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • -
    • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.
      • -
    • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.
      • -
    • Fixed a bug (#4536) in backups with the MySQL driver where some legacy code was causing certain characters to be double escaped.
      • -
    • Fixed a routing bug (#4661) that occurred when the default route pointed to a subfolder.
      • -
    • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
      • -
    • Fixed the spelling of "raspberry" in config/smileys.php.
      • -
    • Fixed incorrect parenthesis in form_open() function (#5135).
      • -
    • Fixed a bug that was ignoring case when comparing controller methods (#4560).
      • -
    • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function.
      • -
    • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
      • -
    • Fixed Oracle bug (#3306) that was preventing multiple queries in one action.
      • -
    • Fixed ODBC bug that was ignoring connection params due to its use of a constructor.
      • -
    • Fixed a DB driver bug with num_rows() that would cause an error with the Oracle driver.
      • -
    • Fixed MS SQL bug (#4915). Added brackets around database name in MS SQL driver when selecting the database, in the event that reserved characters are used in the name.
      • -
    • Fixed a DB caching bug (4718) in which the path was incorrect when no URI segments were present.
      • -
    • Fixed Image_lib class bug #4562. A path was not defined for NetPBM.
      • -
    • Fixed Image_lib class bug #4532. When cropping an image with identical height/width settings on output, a copy is made.
      • -
    • Fixed DB_driver bug (4900), in which a database error was not being logged correctly.
      • -
    • Fixed DB backup bug in which field names were not being escaped.
      • -
    • Fixed a DB Active Record caching bug in which multiple calls to cached data were not being honored.
      • -
    • Fixed a bug in the Session class that was disallowing slashes in the serialized array.
      • -
    • Fixed a Form Validation bug in which the "isset" error message was being trigged by the "required" rule.
      • -
    • Fixed a spelling error in a Loader error message.
      • -
    • Fixed a bug (5050) with IP validation with empty segments.
      • -
    • Fixed a bug in which the parser was being greedy if multiple identical sets of tags were enountered.
      • -
    - -

    Version 1.6.3

    -

    Release Date: June 26, 2008
    -SVN Revision: 1238

    -

    Version 1.6.3 is a security and maintenance release and is recommended for all users.

    -
      -
    • Database -
        -
      • Modified MySQL/MySQLi Forge class to give explicit names to keys
        • -
      • Added ability to set multiple column non-primary keys to the Forge class
        • -
      • Added ability to set additional database config values in DSN connections via the query string.
        • -
      -
      • -
    • Libraries -
        -
      • Set the mime type check in the Upload class to reference the global mimes variable.
        • -
      • Added support for query strings to the Pagination class, automatically detected or explicitly declared.
        • -
      • Added get_post() to the Input class.
        • -
      • Documented get() in the Input class.
        • -
      • Added the ability to automatically output language items as form labels in the Language class.
        • -
      -
      • -
    • Helpers - -
      • -
    • Other changes -
        -
      • Improved security in xss_clean().
        • -
      • Removed an unused Router reference in _display_cache().
        • -
      • Added ability to use xss_clean() to test images for XSS, useful for upload security.
        • -
      • Considerably expanded list of mobile user-agents in config/user_agents.php.
        • -
      • Charset information in the userguide has been moved above title for internationalization purposes (#4614).
        • -
      • Added "Using Associative Arrays In a Request Parameter" example to the XMLRPC userguide page.
        • -
      • Removed maxlength and size as automatically added attributes of form_input() in the form helper.
        • -
      • Documented the language file use of byte_format() in the number helper.
        • -
      -
      • -
    - - -

    Bug fixes for 1.6.3

    - -
      -
    • Added a language key for valid_emails in validation_lang.php.
      • -
    • Amended fixes for bug (#3419) with parsing DSN database connections.
      • -
    • Moved the _has_operators() function (#4535) into DB_driver from DB_active_rec.
      • -
    • Fixed a syntax error in upload_lang.php.
      • -
    • Fixed a bug (#4542) with a regular expression in the Image library.
      • -
    • Fixed a bug (#4561) where orhaving() wasn't properly passing values.
      • -
    • Removed some unused variables from the code (#4563).
      • -
    • Fixed a bug where having() was not adding an = into the statement (#4568).
      • -
    • Fixed assorted user guide typos or examples (#4574, #4706).
      • -
    • Added quoted-printable headers to Email class when the multi-part override is used.
      • -
    • Fixed a double opening <p> tag in the index pages of each system directory.
      • -
    - -

    Version 1.6.2

    -

    Release Date: May 13, 2008
    -SVN Revision: 1155

    -
      -
    • Active Record -
        -
      • Added the ability to prevent escaping in having() clauses.
        • -
      • Added rename_table() into DBForge.
        • -
      • Fixed a bug that wasn't allowing escaping to be turned off if the value of a query was NULL.
        • -
      • DB Forge is now assigned to any models that exist after loading (#3457).
        • -
      -
      • -
    • Database -
        -
      • Added Strict Mode to database transactions.
        • -
      • Escape behaviour in where() clauses has changed; values in those with the "FALSE" argument are no longer escaped (ie: quoted).
        • -
      -
      • -
    • Config -
        -
      • Added 'application/vnd.ms-powerpoint' to list of mime types.
        • -
      • Added 'audio/mpg' to list of mime types.
        • -
      • Added new user-modifiable file constants.php containing file mode and fopen constants.
        • -
      • Added the ability to set CRLF settings via config in the Email class.
        • -
      -
      • -
    • Libraries -
        -
      • Added increased security for filename handling in the Upload library.
        • -
      • Added increased security for sessions for client-side data tampering.
        • -
      • The MySQLi forge class is now in sync with MySQL forge.
        • -
      • Added the ability to set CRLF settings via config in the Email class.
        • -
      • Unit Testing results are now colour coded, and a change was made to the default template of results.
        • -
      • Added a valid_emails rule to the Validation class.
        • -
      • The Zip class now exits within download().
        • -
      • The Zip class has undergone a substantial re-write for speed and clarity (thanks stanleyxu for the hard work and code contribution in bug report #3425!)
        • -
      -
      • -
    • Helpers -
        -
      • Added a Compatibility Helper for using some common PHP 5 functions safely in applications that might run on PHP 4 servers (thanks Seppo for the hard work and code contribution!)
        • -
      • Added form_button() in the Form helper.
        • -
      • Changed the radio() and checkbox() functions to default to not checked by default.
        • -
      • Added the ability to include an optional HTTP Response Code in the redirect() function of the URL Helper.
        • -
      • Modified img() in the HTML Helper to remove an unneeded space (#4208).
        • -
      • Modified anchor() in the URL helper to no longer add a default title= attribute (#4209).
        • -
      • The Download helper now exits within force_download().
        • -
      • Added get_dir_file_info(), get_file_info(), and get_mime_by_extension() to the File Helper.
        • -
      • Added symbolic_permissions() and octal_permissions() to the File helper.
        • -
      -
      • -
    • Plugins -
        -
      • Modified captcha generation to first look for the function imagecreatetruecolor, and fallback to imagecreate if it isn't available (#4226).
        • -
      -
      • -
    • Other - Changes -
        -
      • Added ability for xss_clean() to accept arrays.
        • -
      • Removed closing PHP tags from all PHP files to avoid accidental output and potential 'cannot modify headers' errors.
        • -
      • Removed "scripts" from the auto-load search path. Scripts were deprecated - in Version 1.4.1 (September 21, 2006). If you still need to use them for legacy reasons, they must now be manually loaded in each Controller.
        • -
      • Added a Reserved Names page to the userguide, and migrated reserved controller names into it.
        • -
      • Added a Common Functions page to the userguide for globally available functions.
        • -
      • Improved security and performance of xss_clean().
        • -
      -
      • -
    - -

    Bugfixes for 1.6.2

    -
      -
    • Fixed a bug where SET queries were not being handled as "write" queries.
      • -
    • Fixed a bug (#3191) with ORIG_PATH_INFO URI parsing.
      • -
    • Fixed a bug in DB Forge, when inserting an id field (#3456).
      • -
    • Fixed a bug in the table library that could cause identically constructed rows to be dropped (#3459).
      • -
    • Fixed DB Driver and MySQLi result driver checking for resources instead of objects (#3461).
      • -
    • Fixed an AR_caching error where it wasn't tracking table aliases (#3463).
      • -
    • Fixed a bug in AR compiling, where select statements with arguments got incorrectly escaped (#3478).
      • -
    • Fixed an incorrect documentation of $this->load->language (#3520).
      • -
    • Fixed bugs (#3523, #4350) in get_filenames() with recursion and problems with Windows when $include_path is used.
      • -
    • Fixed a bug (#4153) in the XML-RPC class preventing dateTime.iso8601 from being used.
      • -
    • Fixed an AR bug with or_where_not_in() (#4171).
      • -
    • Fixed a bug with xss_clean() that would add semicolons to GET URI variable strings.
      • -
    • Fixed a bug (#4206) in the Directory Helper where the directory resource was not being closed, and minor improvements.
      • -
    • Fixed a bug in the FTP library where delete_dir() was not working recursively (#4215).
      • -
    • Fixed a Validation bug when set_rules() is used with a non-array field name and rule (#4220).
      • -
    • Fixed a bug (#4223) where DB caching would not work for returned DB objects or multiple DB connections.
      • -
    • Fixed a bug in the Upload library that might output the same error twice (#4390).
      • -
    • Fixed an AR bug when joining with a table alias and table prefix (#4400).
      • -
    • Fixed a bug in the DB class testing the $params argument.
      • -
    • Fixed a bug in the Table library where the integer 0 in cell data would be displayed as a blank cell.
      • -
    • Fixed a bug in link_tag() of the URL helper where a key was passed instead of a value.
      • -
    • Fixed a bug in DB_result::row() that prevented it from returning individual fields with MySQL NULL values.
      • -
    • Fixed a bug where SMTP emails were not having dot transformation performed on lines that begin with a dot.
      • -
    • Fixed a bug in display_error() in the DB driver that was instantiating new Language and Exception objects, and not using the error heading.
      • -
    • Fixed a bug (#4413) where a URI containing slashes only e.g. 'http://example.com/index.php?//' would result in PHP errors
      • -
    • Fixed an array to string conversion error in the Validation library (#4425)
      • -
    • Fixed bug (#4451, #4299, #4339) where failed transactions will not rollback when debug mode is enabled.
      • -
    • Fixed a bug (#4506) with overlay_watermark() in the Image library preventing support for PNG-24s with alpha transparency
      • -
    • Fixed assorted user guide typos (#3453, #4364, #4379, #4399, #4408, #4412, #4448, #4488).
      • -
    - -

    Version 1.6.1

    -

    Release Date: February 12, 2008
    - SVN Revision: 984

    -
      -
    • Active Record - -
      • -
    • Database drivers -
        -
      • Added support for setting client character set and collation for MySQLi.
        • -
      -
      • -
    • Core Changes -
        -
      • Modified xss_clean() to be more intelligent with its handling of URL encoded strings.
        • -
      • Added $_SERVER, $_FILES, $_ENV, and $_SESSION to sanitization of globals.
        • -
      • Added a Path Helper.
        • -
      • Simplified _reindex_segments() in the URI class.
        • -
      • Escaped the '-' in the default 'permitted_uri_chars' config item, to prevent errors if developers just try to add additional characters to the end of the default expression.
        • -
      • Modified method calling to controllers to show a 404 when a private or protected method is accessed via a URL.
        • -
      • Modified framework initiated 404s to log the controller and method for invalid requests.
        • -
      -
      • -
    • Helpers -
        -
      • Modified get_filenames() in the File Helper to return FALSE if the $source_dir is not readable.
        • -
      -
      • -
    - - -

    Bugfixes for 1.6.1

    -
      -
    • Deprecated is_numeric as a validation rule. Use of numeric and integer are preferred.
      • -
    • Fixed bug (#3379) in DBForge with SQLite for table creation.
      • -
    • Made Active Record fully database prefix aware (#3384).
      • -
    • Fixed a bug where DBForge was outputting invalid SQL in Postgres by adding brackets around the tables in FROM.
      • -
    • Changed the behaviour of Active Record's update() to make the WHERE clause optional (#3395).
      • -
    • Fixed a bug (#3396) where certain POST variables would cause a PHP warning.
      • -
    • Fixed a bug in query binding (#3402).
      • -
    • Changed order of SQL keywords in the Profiler $highlight array so OR would not be highlighted before ORDER BY.
      • -
    • Fixed a bug (#3404) where the MySQLi driver was testing if $this->conn_id was a resource instead of an object.
      • -
    • Fixed a bug (#3419) connecting to a database via a DSN string.
      • -
    • Fixed a bug (#3445) where the routed segment array was not re-indexed to begin with 1 when the default controller is used.
      • -
    • Fixed assorted user guide typos.
      • -
    - - - -

    Version 1.6.0

    -

    Release Date: January 30, 2008

    -
      -
    • DBForge -
        -
      • Added DBForge to the database tools.
        • -
      • Moved create_database() and drop_database() into DBForge.
        • -
      • Added add_field(), add_key(), create_table(), drop_table(), add_column(), drop_column(), modify_column() into DBForge.
        • -
      -
      • - -
    • Active Record -
        -
      • Added protect_identifiers() in Active Record.
        • -
      • All AR queries are backticked if appropriate to the database.
        • -
      • Added where_in(), or_where_in(), where_not_in(), or_where_not_in(), not_like() and or_not_like() to Active Record.
        • -
      • Added support for limit() into update() and delete() statements in Active Record.
        • -
      • Added empty_table() and truncate_table() to Active Record.
        • -
      • Added the ability to pass an array of tables to the delete() statement in Active Record.
        • -
      • Added count_all_results() function to Active Record.
        • -
      • Added select_max(), select_min(), select_avg() and select_sum() to Active Record.
        • -
      • Added the ability to use aliases with joins in Active Record.
        • -
      • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
        • -
      • Added a third parameter to set() in Active Record that withholds escaping data.
        • -
      • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
        • -
      -
      • - -
    • Other Database Related -
        -
      • MySQL driver now requires MySQL 4.1+
        • -
      • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or not. Previously they were always saved.
        • -
      • Added $this->db->dbprefix() to manually add database prefixes.
        • -
      • Added 'random' as an order_by() option , and removed "rand()" as a listed option as it was MySQL only.
        • -
      • Added a check for NULL fields in the MySQL database backup utility.
        • -
      • Added "constrain_by_prefix" parameter to db->list_table() function. If set to TRUE it will limit the result to only table names with the current prefix.
        • -
      • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); havingor() for having_or(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
        • -
      • Modified csv_from_result() to output CSV data more in the spirit of basic rules of RFC 4180.
        • -
      • Added 'char_set' and 'dbcollat' database configuration settings, to explicitly set the client communication properly.
        • -
      • Removed 'active_r' configuration setting and replaced with a global $active_record setting, which is more - in harmony with the global nature of the behavior (#1834).
        • -
      -
      • - -
    • Core changes -
        -
      • Added ability to load multiple views, whose content will be appended to the output in the order loaded.
        • -
      • Added the ability to auto-load Models.
        • -
      • Reorganized the URI and Routes classes for better clarity.
        • -
      • Added Compat.php to allow function overrides for older versions of PHP or PHP environments missing certain extensions / libraries
        • -
      • Added memory usage, GET, URI string data, and individual query execution time to Profiler output.
        • -
      • Deprecated Scaffolding.
        • -
      • Added is_really_writable() to Common.php to provide a cross-platform reliable method of testing file/folder writability.
        • -
      -
      • - -
    • Libraries -
        -
      • Changed the load protocol of Models to allow for extension.
        • -
      • Strengthened the Encryption library to help protect against man in the middle attacks when MCRYPT_MODE_CBC mode is used.
        • -
      • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
        • -
      • Removed 'last_visit' from the Session class.
        • -
      • Added a language entry for valid_ip validation error.
        • -
      • Modified prep_for_form() in the Validation class to accept arrays, adding support for POST array validation (via callbacks only)
        • -
      • Added an "integer" rule into the Validation library.
        • -
      • Added valid_base64() to the Validation library.
        • -
      • Documented clear() in the Image Processing library.
        • -
      • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
        • -
      • Modified Upload class $_FILES error messages to be more precise.
        • -
      • Moved the safe mode and auth checks for the Email library into the constructor.
        • -
      • Modified variable names in _ci_load() method of Loader class to avoid conflicts with view variables.
        • -
      • Added a few additional mime type variations for CSV.
        • -
      • Enabled the 'system' methods for the XML-RPC Server library, except for 'system.multicall' which is still disabled.
        • -
      -
      • - -
    • Helpers & Plugins -
        -
      • Added link_tag() to the HTML helper.
        • -
      • Added img() to the HTML helper.
        • -
      • Added ability to "extend" Helpers.
        • -
      • Added an email helper into core helpers.
        • -
      • Added strip_quotes() function to string helper.
        • -
      • Added reduce_multiples() function to string helper.
        • -
      • Added quotes_to_entities() function to string helper.
        • -
      • Added form_fieldset(), form_fieldset_close(), form_label(), and form_reset() function to form helper.
        • -
      • Added support for external urls in form_open().
        • -
      • Removed support for db_backup in MySQLi due to incompatible functions.
        • -
      • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
        • -
      -
      • - - -
    • Documentation Changes -
        -
      • Added Writing Documentation section for the community to use in writing their own documentation.
        • -
      • Added titles to all user manual pages.
        • -
      • Added attributes into <html> of userguide for valid html.
        • -
      • Added Zip Encoding Class to the table of contents of the userguide.
        • -
      • Moved part of the userguide menu javascript to an external file.
        • -
      • Documented distinct() in Active Record.
        • -
      • Documented the timezones() function in the Date Helper.
        • -
      • Documented unset_userdata in the Session class.
        • -
      • Documented 2 config options to the Database configuration page.
        • -
      -
      • -
    - -

    Bug fixes for Version 1.6.0

    - -
      -
    • Fixed a bug (#1813) preventing using $CI->db in the same application with returned database objects.
      • -
    • Fixed a bug (#1842) where the $this->uri->rsegments array would not include the 'index' method if routed to the controller without an implicit method.
      • -
    • Fixed a bug (#1872) where word_limiter() was not retaining whitespace.
      • -
    • Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.
      • -
    • Fixed a bug (#2542)in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
      • -
    • Fixed a bug (#2545) in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
      • -
    • Fixed a bug (#2668) in the parser class where numeric data was ignored.
      • -
    • Fixed a bug (#2679) where the "previous" pagination link would get drawn on the first page.
      • -
    • Fixed a bug (#2702) in _object_to_array that broke some types of inserts and updates.
      • -
    • Fixed a bug (#2732) in the SQLite driver for PHP 4.
      • -
    • Fixed a bug (#2754) in Pagination to scan for non-positive num_links.
      • -
    • Fixed a bug (#2762) in the Session library where user agent matching would fail on user agents ending with a space.
      • -
    • Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgres and sqlite drivers.
      • -
    • Fixed a bug (#2810) in the typography helper causing extraneous paragraph tags when string contains tags.
      • -
    • Fixed a bug (#2849) where arguments passed to a subfolder controller method would be incorrectly shifted, dropping the 3rd segment value.
      • -
    • Fixed a bug (#2858) which referenced a wrong variable in the Image class.
      • -
    • Fixed a bug (#2875)when loading plugin files as _plugin. and not _pi.
      • -
    • Fixed a bug (#2912) in get_filenames() in the File Helper where the array wasn't cleared after each call.
      • -
    • Fixed a bug (#2974) in highlight_phrase() that caused an error with slashes.
      • -
    • Fixed a bug (#3003) in the Encryption Library to support modes other than MCRYPT_MODE_ECB
      • -
    • Fixed a bug (#3015) in the User Agent library where more then 2 languages where not reported with languages().
      • -
    • Fixed a bug (#3017) in the Email library where some timezones were calculated incorrectly.
      • -
    • Fixed a bug (#3024) in which master_dim wasn't getting reset by clear() in the Image library.
      • -
    • Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.
      • -
    • Fixed a bug (#3166) that prevented num_rows from working in Oracle.
      • -
    • Fixed a bug (#3175) preventing certain libraries from working properly when autoloaded in PHP 4.
      • -
    • Fixed a bug (#3267) in the Typography Helper where unordered list was listed "un.
      • -
    • Fixed a bug (#3268) where the Router could leave '/' as the path.
      • -
    • Fixed a bug (#3279) where the Email class was sending the wrong Content-Transfer-Encoding for some character sets.
      • -
    • Fixed a bug (#3284) where the rsegment array would not be set properly if the requested URI contained more segments than the routed URI.
      • -
    • Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).
      • -
    • Removed an extraneous call to loading models (#3286).
      • -
    • Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.
      • -
    • Fixed a bug (#3314) which would cause the top level path to be deleted in delete_files() of the File helper.
      • -
    • Fixed a bug (#3328) where the smiley helper might return an undefined variable.
      • -
    • Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.
      • -
    • Removed an unused parameter from Profiler (#3332).
      • -
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
      • -
    • Fixed a bug in the upload library when allowed_files wasn't defined.
      • -
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
      • -
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
      • -
    • Fixed a bug in Validation where individual error messages for checkboxes wasn't supported.
      • -
    • Fixed a bug in captcha calling an invalid PHP function.
      • -
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
      • -
    • Fixed a bug that was making validation callbacks required even when not set as such.
      • -
    • Fixed a bug in the XML-RPC library so if a type is specified, a more intelligent decision is made as to the default type.
      • -
    • Fixed an example of comma-separated emails in the email library documentation.
      • -
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
      • -
    • Fixed a typo in the database language file.
      • -
    • Fixed a typo in the image language file "suppor" to "support".
      • -
    • Fixed an example for XML RPC.
      • -
    • Fixed an example of accept_charset() in the User Agent Library.
      • -
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
      • -
    • Fixed a typo in the String Helper (uniquid changed to uniqid).
      • -
    • Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login), and FTP Class (ftp_unable_to_remame).
      • -
    • Added a stripslashes() into the Upload Library.
      • -
    • Fixed a series of grammatical and spelling errors in the language files.
      • -
    • Fixed assorted user guide typos.
      • -
    -

    Version 1.5.4

    -

    Release Date: July 12, 2007

    -
      -
    • Added custom Language files to the autoload options.
      • -
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
      • -
    • Added array to string into the profiler.
      • -
    • Added some additional mime types in application/config/mimes.php.
      • -
    • Added filename_security() method to Input library.
      • -
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
      • -
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
      • -
    • Fixed MSSQL insert_id().
      • -
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
      • -
    • Fixed a bug that was allowing multiple load attempts on extended classes.
      • -
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
      • -
    • Fixed a bug in the escape_str() function in the MySQL driver.
      • -
    • Fixed a typo in the Calendar library
      • -
    • Fixed a typo in rpcs.php library
      • -
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
      • -
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
      • -
    • Fixed an IP validation bug.
      • -
    • Fixed a bug in display of POST keys in the Profiler output
      • -
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
      • -
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
      • -
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
      • -
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
      • -
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
      • -
    • Fixed various doc typos.
      • -
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
      • -
    • Docs now validate to XHTML 1 transitional
      • -
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
      • -
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
      • -
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
      • -
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
      • -
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
      • -
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
      • -
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
      • -
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.
      • -
    -

    Version 1.5.3

    -

    Release Date: April 15, 2007

    -
      -
    • Added array to string into the profiler
      • -
    • Code Igniter references updated to CodeIgniter
      • -
    • pMachine references updated to EllisLab
      • -
    • Fixed a bug in the repeater function of string helper.
      • -
    • Fixed a bug in ODBC driver
      • -
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
      • -
    • Fixed a bug in the redirect function of the url helper.
      • -
    • Fixed an undefined variable in Loader
      • -
    • Fixed a version bug in the Postgres driver
      • -
    • Fixed a bug in the textarea function of the form helper for use with strings
      • -
    • Fixed doc typos.
      • -
    -

    Version 1.5.2

    -

    Release Date: February 13, 2007

    -
      -
    • Added subversion information to the downloads page.
      • -
    • Added support for captions in the Table Library
      • -
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather than download
      • -
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
      • -
    • Removed unescaped variables in error messages of Input and Router classes
      • -
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
      • -
    • Fixed a bug in the form helper that gave textarea a value attribute
      • -
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
      • -
    • Fixed some doc typos.
      • -
    - - -

    Version 1.5.1

    -

    Release Date: November 23, 2006

    -
      -
    • Added support for submitting arrays of libraries in the $this->load->library function.
      • -
    • Added support for naming custom library files in lower or uppercase.
      • -
    • Fixed a bug related to output buffering.
      • -
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
      • -
    • Fixed a bug that was suppressing errors in controllers.
      • -
    • Fixed a problem that can cause a loop to occur when the config file is missing.
      • -
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
      • -
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
      • -
    • Fixed some bugs in the Oracle DB driver.
      • -
    • Fixed an incorrectly named variable in the MySQLi result driver.
      • -
    • Fixed some doc typos.
      • -
    -

    Version 1.5.0.1

    -

    Release Date: October 31, 2006

    -
      -
    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
      • -
    • Fixed a bug in the word_wrap() helper function.
      • -
    • Fixed an invalid color Hex number in the Profiler class.
      • -
    • Fixed a corrupted image in the user guide.
      • -
    - - - -

    Version 1.5.0

    -

    Release Date: October 30, 2006

    - -
      -
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • -
    • Added Database Caching Class.
      • -
    • Added transaction support to the database classes.
      • -
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
      • -
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
      • -
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
      • -
    • Added Zip Encoding Library.
      • -
    • Added FTP Library.
      • -
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
      • -
    • Added support for storing models within sub-folders.
      • -
    • Added Download Helper.
      • -
    • Added simple_query() function to the database classes
      • -
    • Added standard_date() function to the Date Helper.
      • -
    • Added $query->free_result() to database class.
      • -
    • Added $query->list_fields() function to database class
      • -
    • Added $this->db->platform() function
      • -
    • Added new File Helper: get_filenames()
      • -
    • Added new helper: Smiley Helper
      • -
    • Added support for <ul> and <ol> lists in the HTML Helper
      • -
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
      • -
    • Added the ability to rename or relocate the "application" folder.
      • -
    • Added more thorough initialization in the upload class so that all class variables are reset.
      • -
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
      • -
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
      • -
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
      • -
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
      • -
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
      • -
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
      • -
    • Fixed a bug in the Email class related to SMTP Helo data.
      • -
    • Fixed a bug in the word wrapping helper and function in the email class.
      • -
    • Fixed a bug in the validation class.
      • -
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
      • -
    • Fixed a problem in the form_prep() function that was double encoding entities.
      • -
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
      • -
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
      • -
    • Fixed a pagination bug that was permitting negative values in the URL.
      • -
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
      • -
    • Changed _get_config() to get_config() since the function is not a private one.
      • -
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
      • -
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
      • -
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
      • -
    - - - - -

    Version 1.4.1

    -

    Release Date: September 21, 2006

    - -
      -
    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
      • -
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
      • -
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
      • -
    • Added $this->output->set_header() function, which allows you to set server headers.
      • -
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
      • -
    • Added Inflector helper.
      • -
    • Added element() function in the array helper.
      • -
    • Added RAND() to active record orderby() function.
      • -
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
      • -
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
      • -
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
      • -
    • Added output compression option to the config file.
      • -
    • Removed the is_numeric test from the db->escape() function.
      • -
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
      • -
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
      • -
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
      • -
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
      • -
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
      • -
    • Added some code to allow email attachments to be reset when sending batches of email.
      • -
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own -libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
      • -
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
      • -
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().
      • -
    - - - -

    Version 1.4.0

    -

    Release Date: September 17, 2006

    - -
      -
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • -
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
      • -
    • Added regular expressions support for routing rules.
      • -
    • Added the ability to remap function calls within your controllers.
      • -
    • Added the ability to replace core system classes with your own classes.
      • -
    • Added support for % character in URL.
      • -
    • Added the ability to supply full URLs using the anchor() helper function.
      • -
    • Added mode parameter to file_write() helper.
      • -
    • Added support for changing the port number in the Postgres driver.
      • -
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
      • -
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
      • -
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
      • -
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
      • -
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • -
    • Updated the form_open() helper to allow the GET method to be used.
      • -
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • -
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
      • -
    • Updated the Models loader function to allow multiple loads of the same model.
      • -
    • Updated the MS SQL driver so that single quotes are escaped.
      • -
    • Updated the Postgres and ODBC drivers for better compatibility.
      • -
    • Removed a strtolower() call that was changing URL segments to lower case.
      • -
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
      • -
    • Removed backticks from Postgres class since these are not needed.
      • -
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
      • -
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
      • -
    • Fixed an bug that was preventing the input class from unsetting GET variables.
      • -
    • Fixed a router bug that was making it too greedy when matching end segments.
      • -
    • Fixed a bug that was preventing multiple discrete database calls.
      • -
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
      • -
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
      • -
    • Fixed some missing prefixes when using the database prefix feature.
      • -
    • Fixed a typo in the Calendar class (cal_november).
      • -
    • Fixed a bug in the form_checkbox() helper.
      • -
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
      • -
    • Fixed an evaluation bug in the database initialization function.
      • -
    • Fixed a minor bug in one of the error messages in the language class.
      • -
    • Fixed a bug in the date helper timespan function.
      • -
    • Fixed an undefined variable in the DB Driver class.
      • -
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
      • -
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
      • -
    • Fixed a couple bugs in the Unit Testing class.
      • -
    • Fixed an incorrectly named variable in the Validation class.
      • -
    • Fixed an incorrectly named variable in the URI class.
      • -
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
      • -
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
      • -
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
      • -
    • Fixed some MS SQL bugs.
      • -
    • Fixed some doc typos.
      • -
    - - - -

    Version 1.3.3

    -

    Release Date: June 1, 2006

    - -
      - -
    • Models do not connect automatically to the database as of this version. More info here.
      • -
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
      • -
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
      • -
    • Fixed a bug in the active record "having" function.
      • -
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
      • -
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
      • -
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
      • -
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
      • -
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
      • -
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
      • -
    • Fixed a bug in the hash() security helper.
      • -
    • Fixed some typos.
      • -
    - - - - -

    Version 1.3.2

    -

    Release Date: April 17, 2006

    - -
      -
    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
      • -
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
      • -
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
      • -
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
      • -
    • Fixed a couple bugs in the Model class.
      • -
    • Fixed some documentation typos and errata.
      • -
    - - - -

    Version 1.3.1

    -

    Release Date: April 11, 2006

    - -
      -
    • Added a Unit Testing Library.
      • -
    • Added the ability to pass objects to the insert() and update() database functions. -This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
      • -
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
      • -
    • Added getwhere function to Active Record class.
      • -
    • Added count_all function to Active Record class.
      • -
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
      • -
    • Added $this->db->last_query(), which allows you to view your last query that was run.
      • -
    • Added a new mime type to the upload class for better compatibility.
      • -
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
      • -
    • Fixed a bug in a couple of the active record functions (where and orderby).
      • -
    • Fixed a bug in the image library when realpath() returns false.
      • -
    • Fixed a bug in the Models that was preventing libraries from being used within them.
      • -
    • Fixed a bug in the "exact_length" function of the validation class.
      • -
    • Fixed some typos in the user guide
      • -
    - - -

    Version 1.3

    -

    Release Date: April 3, 2006

    - -
      -
    • Added support for Models.
      • -
    • Redesigned the database libraries to support additional RDBMs (Postgres, MySQLi, etc.).
      • -
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
      • -
    • Added a feature to the database class that lets you run custom function calls.
      • -
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
      • -
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
      • -
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
      • -
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
      • -
    • Added a new error template for use with native PHP errors.
      • -
    • Added "alternator" function in the string helpers.
      • -
    • Removed slashing from the input class. After much debate we decided to kill this feature.
      • -
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
      • -
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and -all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
      • -
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
      • -
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
      • -
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
      • -
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
      • -
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
      • -
    • Fixed some typos in the default calendar template
      • -
    • Fixed some typos in the user guide
      • -
    - - - - - - - - -

    Version 1.2

    -

    Release Date: March 21, 2006

    - -
      -
    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
      • -
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
      • -
    • Added new File Helper: delete_files()
      • -
    • Added new URL Helpers: base_url(), index_page()
      • -
    • Added the ability to create your own core libraries and store them in your local application directory.
      • -
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
      • -
    • Added Javascript Calendar plugin.
      • -
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
      • -
    • Updated the parser class so that it allows tag pars within other tag pairs.
      • -
    • Fixed a bug in the DB "where" function.
      • -
    • Fixed a bug that was preventing custom config files to be auto-loaded.
      • -
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
      • -
    • Fixed some bugs in the xss_clean function
      • -
    - - - - - -

    Version Beta 1.1

    -

    Release Date: March 10, 2006

    - -
      -
    • Added a Calendaring class.
      • -
    • Added support for running multiple applications that share a common CodeIgniter backend.
      • -
    • Moved the "uri protocol" variable from the index.php file into the config.php file
      • -
    • Fixed a problem that was preventing certain function calls from working within constructors.
      • -
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
      • -
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
      • -
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
      • -
    • Fixed a data type error in the form_radio function (form helper)
      • -
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
      • -
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
      • -
    • Fixed a pagination problem in the scaffolding.
      • -
    • Fixed a bug in the mysql class "where" function.
      • -
    • Fixed a regex problem in some code that trimmed duplicate slashes.
      • -
    • Fixed a bug in the br() function in the HTML helper
      • -
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
      • -
    • Removed the "style" attributes form the form helpers.
      • -
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.
      • -
    - -

    Version Beta 1.0

    -

    Release Date: February 28, 2006

    -

    First publicly released version.

    - -
    - - - - - - - + + + + + + + + + + + + + + + + + + + +Change Log : CodeIgniter User Guide + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Change Log

    + +

    Version 1.7.1

    +

    Release Date: not yet released
    +SVN Revision:

    + +
      +
    • Libraries +
        +
      • Changed default current page indicator in the Pagination library to use <strong> instead of <b>
        • +
      • A "HTTP/1.1 400 Bad Request" header is now sent when disallowed characters are encountered.
        • +
      • Added <big>, <small>, <q>, and <tt> to the Typography parser's inline elements.
        • +
      +
      • +
    • Helpers + +
      • +
    + +

    Bug fixes for 1.7.1

    +
      +
    • Fixed a bug in the MySQLi driver when no port is specified
      • +
    • Fixed a bug (#5702), in which the field label was not being fetched properly, when "matching" one field to another.
      • +
    • Fixed a bug in which identifers were not being escaped properly when reserved characters were used.
      • +
    • Fixed a bug with the regular expression used to protect submitted paragraph tags in auto typography.
      • +
    • Fixed a bug where double dashes within tag attributes were being converted to em dash entities.
      • +
    • Fixed a bug where double spaces within tag attributes were being converted to non-breaking space entities.
      • +
    • Changed a few docblock comments to reflect actual return values.
      • +
    • Fixed a bug with high ascii characters in subject and from email headers.
      • +
    + + +

    Version 1.7

    +

    Release Date: October 23, 2008
    +SVN Revision: 1541

    + +
      +
    • Libraries +
        +
      • Added a new Form Validation Class. It simplifies setting rules and field names, supports arrays as field names, allows groups of validation rules to be saved in a config file, and adds some helper functions for use in view files. Please note that the old Validation class is now deprecated. We will leave it in the library folder for some time so that existing applications that use it will not break, but you are encouraged to migrate to the new version.
        • +
      • Updated the Sessions class so that any custom data being saved gets stored to a database rather than the session cookie (assuming you are using a database to store session data), permitting much more data to be saved.
        • +
      • Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the Loader class for more info.
        • +
      • Added the ability to assign library objects to your own variable names when you use $this->load->library(). Please see the Loader class for more info.
        • +
      • Added controller class/method info to Profiler class and support for multiple database connections.
        • +
      • Improved the "auto typography" feature and moved it out of the helper into its own Typography Class.
        • +
      • Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.
        • +
      • Improved Parser class to allow multiple calls to the parse() function. The output of each is appended in the output.
        • +
      • Added max_filename option to set a file name length limit in the File Upload Class.
        • +
      • Added set_status_header() function to Output class.
        • +
      • Modified Pagination class to only output the "First" link when the link for page one would not be shown.
        • +
      • Added support for mb_strlen in the Form Validation class so that multi-byte languages will calculate string lengths properly.
        • +
      +
      • +
    • Database +
        +
      • Improved Active Record class to allow full path column and table names: hostname.database.table.column. Also improved the alias handling.
        • +
      • Improved how table and column names are escaped and prefixed. It now honors full path names when adding prefixes and escaping.
        • +
      • Added Active Record caching feature to "update" and "delete" functions.
        • +
      • Added removal of non-printing control characters in escape_str() of DB drivers that do not have native PHP escaping mechanisms (mssql, oci8, odbc), to avoid potential SQL errors, and possible sources of SQL injection.
        • +
      • Added port support to MySQL, MySQLi, and MS SQL database drivers.
        • +
      • Added driver name variable in each DB driver, based on bug report #4436.
        • +
      +
      • +
    • Helpers +
        +
      • Added several new "setting" functions to the Form helper that allow POST data to be retrieved and set into forms. These are intended to be used on their own, or with the new Form Validation Class.
        • +
      • Added current_url() and uri_segments() to URL helper.
        • +
      • Altered auto_link() in the URL helper so that email addresses with "+" included will be linked.
        • +
      • Added meta() function to HTML helper.
        • +
      • Improved accuracy of calculations in Number helper.
        • +
      • Removed added newlines ("\n") from most form and html helper functions.
        • +
      • Tightened up validation in the Date helper function human_to_unix(), and eliminated the POSIX regex.
        • +
      • Updated Date helper to match the world's current time zones and offsets.
        • +
      • Modified url_title() in the URL helper to remove characters and digits that are part of + character entities, to allow dashes, underscores, and periods regardless of the $separator, and to allow uppercase characters.
        • +
      • Added support for arbitrary attributes in anchor_popup() of the URL helper.
        • +
      +
      • +
    • Other Changes +
        +
      • Added PHP Style Guide to docs.
        • +
      • Added sanitization in xss_clean() for a deprecated HTML tag that could be abused in user input in Internet Explorer.
        • +
      • Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.
        • +
      • Added a file lock check during caching, before trying to write to the file.
        • +
      • Modified Cookie key cleaning to unset a few troublesome key names that can be present in certain environments, preventing CI from halting execution.
        • +
      • Changed the output of the profiler to use style attribute rather than clear, and added the id "codeigniter_profiler" to the container div.
        • +
      +
      • +
    + +

    Bug fixes for 1.7.0

    +
      +
    • Fixed bug in xss_clean() that could remove some desirable tag attributes.
      • +
    • Fixed assorted user guide typos or examples (#4807, #4812, #4840, #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229, #5254, #5351).
      • +
    • Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.
      • +
    • Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.
      • +
    • Modified XSS sanitization to no longer add semicolons after &[single letter], such as in M&M's, B&B, etc.
      • +
    • Modified XSS sanitization to no longer strip XHTML image tags of closing slashes.
      • +
    • Fixed a bug in the Session class when database sessions are used where upon session update all userdata would be errantly written to the session cookie.
      • +
    • Fixed a bug (#4536) in backups with the MySQL driver where some legacy code was causing certain characters to be double escaped.
      • +
    • Fixed a routing bug (#4661) that occurred when the default route pointed to a subfolder.
      • +
    • Fixed the spelling of "Dhaka" in the timezone_menu() function of the Date helper.
      • +
    • Fixed the spelling of "raspberry" in config/smileys.php.
      • +
    • Fixed incorrect parenthesis in form_open() function (#5135).
      • +
    • Fixed a bug that was ignoring case when comparing controller methods (#4560).
      • +
    • Fixed a bug (#4615) that was not setting SMTP authorization settings when using the initialize function.
      • +
    • Fixed a bug in highlight_code() in the Text helper that would leave a stray </span> in certain cases.
      • +
    • Fixed Oracle bug (#3306) that was preventing multiple queries in one action.
      • +
    • Fixed ODBC bug that was ignoring connection params due to its use of a constructor.
      • +
    • Fixed a DB driver bug with num_rows() that would cause an error with the Oracle driver.
      • +
    • Fixed MS SQL bug (#4915). Added brackets around database name in MS SQL driver when selecting the database, in the event that reserved characters are used in the name.
      • +
    • Fixed a DB caching bug (4718) in which the path was incorrect when no URI segments were present.
      • +
    • Fixed Image_lib class bug #4562. A path was not defined for NetPBM.
      • +
    • Fixed Image_lib class bug #4532. When cropping an image with identical height/width settings on output, a copy is made.
      • +
    • Fixed DB_driver bug (4900), in which a database error was not being logged correctly.
      • +
    • Fixed DB backup bug in which field names were not being escaped.
      • +
    • Fixed a DB Active Record caching bug in which multiple calls to cached data were not being honored.
      • +
    • Fixed a bug in the Session class that was disallowing slashes in the serialized array.
      • +
    • Fixed a Form Validation bug in which the "isset" error message was being trigged by the "required" rule.
      • +
    • Fixed a spelling error in a Loader error message.
      • +
    • Fixed a bug (5050) with IP validation with empty segments.
      • +
    • Fixed a bug in which the parser was being greedy if multiple identical sets of tags were enountered.
      • +
    + +

    Version 1.6.3

    +

    Release Date: June 26, 2008
    +SVN Revision: 1238

    +

    Version 1.6.3 is a security and maintenance release and is recommended for all users.

    +
      +
    • Database +
        +
      • Modified MySQL/MySQLi Forge class to give explicit names to keys
        • +
      • Added ability to set multiple column non-primary keys to the Forge class
        • +
      • Added ability to set additional database config values in DSN connections via the query string.
        • +
      +
      • +
    • Libraries +
        +
      • Set the mime type check in the Upload class to reference the global mimes variable.
        • +
      • Added support for query strings to the Pagination class, automatically detected or explicitly declared.
        • +
      • Added get_post() to the Input class.
        • +
      • Documented get() in the Input class.
        • +
      • Added the ability to automatically output language items as form labels in the Language class.
        • +
      +
      • +
    • Helpers + +
      • +
    • Other changes +
        +
      • Improved security in xss_clean().
        • +
      • Removed an unused Router reference in _display_cache().
        • +
      • Added ability to use xss_clean() to test images for XSS, useful for upload security.
        • +
      • Considerably expanded list of mobile user-agents in config/user_agents.php.
        • +
      • Charset information in the userguide has been moved above title for internationalization purposes (#4614).
        • +
      • Added "Using Associative Arrays In a Request Parameter" example to the XMLRPC userguide page.
        • +
      • Removed maxlength and size as automatically added attributes of form_input() in the form helper.
        • +
      • Documented the language file use of byte_format() in the number helper.
        • +
      +
      • +
    + + +

    Bug fixes for 1.6.3

    + +
      +
    • Added a language key for valid_emails in validation_lang.php.
      • +
    • Amended fixes for bug (#3419) with parsing DSN database connections.
      • +
    • Moved the _has_operators() function (#4535) into DB_driver from DB_active_rec.
      • +
    • Fixed a syntax error in upload_lang.php.
      • +
    • Fixed a bug (#4542) with a regular expression in the Image library.
      • +
    • Fixed a bug (#4561) where orhaving() wasn't properly passing values.
      • +
    • Removed some unused variables from the code (#4563).
      • +
    • Fixed a bug where having() was not adding an = into the statement (#4568).
      • +
    • Fixed assorted user guide typos or examples (#4574, #4706).
      • +
    • Added quoted-printable headers to Email class when the multi-part override is used.
      • +
    • Fixed a double opening <p> tag in the index pages of each system directory.
      • +
    + +

    Version 1.6.2

    +

    Release Date: May 13, 2008
    +SVN Revision: 1155

    +
      +
    • Active Record +
        +
      • Added the ability to prevent escaping in having() clauses.
        • +
      • Added rename_table() into DBForge.
        • +
      • Fixed a bug that wasn't allowing escaping to be turned off if the value of a query was NULL.
        • +
      • DB Forge is now assigned to any models that exist after loading (#3457).
        • +
      +
      • +
    • Database +
        +
      • Added Strict Mode to database transactions.
        • +
      • Escape behaviour in where() clauses has changed; values in those with the "FALSE" argument are no longer escaped (ie: quoted).
        • +
      +
      • +
    • Config +
        +
      • Added 'application/vnd.ms-powerpoint' to list of mime types.
        • +
      • Added 'audio/mpg' to list of mime types.
        • +
      • Added new user-modifiable file constants.php containing file mode and fopen constants.
        • +
      • Added the ability to set CRLF settings via config in the Email class.
        • +
      +
      • +
    • Libraries +
        +
      • Added increased security for filename handling in the Upload library.
        • +
      • Added increased security for sessions for client-side data tampering.
        • +
      • The MySQLi forge class is now in sync with MySQL forge.
        • +
      • Added the ability to set CRLF settings via config in the Email class.
        • +
      • Unit Testing results are now colour coded, and a change was made to the default template of results.
        • +
      • Added a valid_emails rule to the Validation class.
        • +
      • The Zip class now exits within download().
        • +
      • The Zip class has undergone a substantial re-write for speed and clarity (thanks stanleyxu for the hard work and code contribution in bug report #3425!)
        • +
      +
      • +
    • Helpers +
        +
      • Added a Compatibility Helper for using some common PHP 5 functions safely in applications that might run on PHP 4 servers (thanks Seppo for the hard work and code contribution!)
        • +
      • Added form_button() in the Form helper.
        • +
      • Changed the radio() and checkbox() functions to default to not checked by default.
        • +
      • Added the ability to include an optional HTTP Response Code in the redirect() function of the URL Helper.
        • +
      • Modified img() in the HTML Helper to remove an unneeded space (#4208).
        • +
      • Modified anchor() in the URL helper to no longer add a default title= attribute (#4209).
        • +
      • The Download helper now exits within force_download().
        • +
      • Added get_dir_file_info(), get_file_info(), and get_mime_by_extension() to the File Helper.
        • +
      • Added symbolic_permissions() and octal_permissions() to the File helper.
        • +
      +
      • +
    • Plugins +
        +
      • Modified captcha generation to first look for the function imagecreatetruecolor, and fallback to imagecreate if it isn't available (#4226).
        • +
      +
      • +
    • Other + Changes +
        +
      • Added ability for xss_clean() to accept arrays.
        • +
      • Removed closing PHP tags from all PHP files to avoid accidental output and potential 'cannot modify headers' errors.
        • +
      • Removed "scripts" from the auto-load search path. Scripts were deprecated + in Version 1.4.1 (September 21, 2006). If you still need to use them for legacy reasons, they must now be manually loaded in each Controller.
        • +
      • Added a Reserved Names page to the userguide, and migrated reserved controller names into it.
        • +
      • Added a Common Functions page to the userguide for globally available functions.
        • +
      • Improved security and performance of xss_clean().
        • +
      +
      • +
    + +

    Bugfixes for 1.6.2

    +
      +
    • Fixed a bug where SET queries were not being handled as "write" queries.
      • +
    • Fixed a bug (#3191) with ORIG_PATH_INFO URI parsing.
      • +
    • Fixed a bug in DB Forge, when inserting an id field (#3456).
      • +
    • Fixed a bug in the table library that could cause identically constructed rows to be dropped (#3459).
      • +
    • Fixed DB Driver and MySQLi result driver checking for resources instead of objects (#3461).
      • +
    • Fixed an AR_caching error where it wasn't tracking table aliases (#3463).
      • +
    • Fixed a bug in AR compiling, where select statements with arguments got incorrectly escaped (#3478).
      • +
    • Fixed an incorrect documentation of $this->load->language (#3520).
      • +
    • Fixed bugs (#3523, #4350) in get_filenames() with recursion and problems with Windows when $include_path is used.
      • +
    • Fixed a bug (#4153) in the XML-RPC class preventing dateTime.iso8601 from being used.
      • +
    • Fixed an AR bug with or_where_not_in() (#4171).
      • +
    • Fixed a bug with xss_clean() that would add semicolons to GET URI variable strings.
      • +
    • Fixed a bug (#4206) in the Directory Helper where the directory resource was not being closed, and minor improvements.
      • +
    • Fixed a bug in the FTP library where delete_dir() was not working recursively (#4215).
      • +
    • Fixed a Validation bug when set_rules() is used with a non-array field name and rule (#4220).
      • +
    • Fixed a bug (#4223) where DB caching would not work for returned DB objects or multiple DB connections.
      • +
    • Fixed a bug in the Upload library that might output the same error twice (#4390).
      • +
    • Fixed an AR bug when joining with a table alias and table prefix (#4400).
      • +
    • Fixed a bug in the DB class testing the $params argument.
      • +
    • Fixed a bug in the Table library where the integer 0 in cell data would be displayed as a blank cell.
      • +
    • Fixed a bug in link_tag() of the URL helper where a key was passed instead of a value.
      • +
    • Fixed a bug in DB_result::row() that prevented it from returning individual fields with MySQL NULL values.
      • +
    • Fixed a bug where SMTP emails were not having dot transformation performed on lines that begin with a dot.
      • +
    • Fixed a bug in display_error() in the DB driver that was instantiating new Language and Exception objects, and not using the error heading.
      • +
    • Fixed a bug (#4413) where a URI containing slashes only e.g. 'http://example.com/index.php?//' would result in PHP errors
      • +
    • Fixed an array to string conversion error in the Validation library (#4425)
      • +
    • Fixed bug (#4451, #4299, #4339) where failed transactions will not rollback when debug mode is enabled.
      • +
    • Fixed a bug (#4506) with overlay_watermark() in the Image library preventing support for PNG-24s with alpha transparency
      • +
    • Fixed assorted user guide typos (#3453, #4364, #4379, #4399, #4408, #4412, #4448, #4488).
      • +
    + +

    Version 1.6.1

    +

    Release Date: February 12, 2008
    + SVN Revision: 984

    +
      +
    • Active Record + +
      • +
    • Database drivers +
        +
      • Added support for setting client character set and collation for MySQLi.
        • +
      +
      • +
    • Core Changes +
        +
      • Modified xss_clean() to be more intelligent with its handling of URL encoded strings.
        • +
      • Added $_SERVER, $_FILES, $_ENV, and $_SESSION to sanitization of globals.
        • +
      • Added a Path Helper.
        • +
      • Simplified _reindex_segments() in the URI class.
        • +
      • Escaped the '-' in the default 'permitted_uri_chars' config item, to prevent errors if developers just try to add additional characters to the end of the default expression.
        • +
      • Modified method calling to controllers to show a 404 when a private or protected method is accessed via a URL.
        • +
      • Modified framework initiated 404s to log the controller and method for invalid requests.
        • +
      +
      • +
    • Helpers +
        +
      • Modified get_filenames() in the File Helper to return FALSE if the $source_dir is not readable.
        • +
      +
      • +
    + + +

    Bugfixes for 1.6.1

    +
      +
    • Deprecated is_numeric as a validation rule. Use of numeric and integer are preferred.
      • +
    • Fixed bug (#3379) in DBForge with SQLite for table creation.
      • +
    • Made Active Record fully database prefix aware (#3384).
      • +
    • Fixed a bug where DBForge was outputting invalid SQL in Postgres by adding brackets around the tables in FROM.
      • +
    • Changed the behaviour of Active Record's update() to make the WHERE clause optional (#3395).
      • +
    • Fixed a bug (#3396) where certain POST variables would cause a PHP warning.
      • +
    • Fixed a bug in query binding (#3402).
      • +
    • Changed order of SQL keywords in the Profiler $highlight array so OR would not be highlighted before ORDER BY.
      • +
    • Fixed a bug (#3404) where the MySQLi driver was testing if $this->conn_id was a resource instead of an object.
      • +
    • Fixed a bug (#3419) connecting to a database via a DSN string.
      • +
    • Fixed a bug (#3445) where the routed segment array was not re-indexed to begin with 1 when the default controller is used.
      • +
    • Fixed assorted user guide typos.
      • +
    + + + +

    Version 1.6.0

    +

    Release Date: January 30, 2008

    +
      +
    • DBForge +
        +
      • Added DBForge to the database tools.
        • +
      • Moved create_database() and drop_database() into DBForge.
        • +
      • Added add_field(), add_key(), create_table(), drop_table(), add_column(), drop_column(), modify_column() into DBForge.
        • +
      +
      • + +
    • Active Record +
        +
      • Added protect_identifiers() in Active Record.
        • +
      • All AR queries are backticked if appropriate to the database.
        • +
      • Added where_in(), or_where_in(), where_not_in(), or_where_not_in(), not_like() and or_not_like() to Active Record.
        • +
      • Added support for limit() into update() and delete() statements in Active Record.
        • +
      • Added empty_table() and truncate_table() to Active Record.
        • +
      • Added the ability to pass an array of tables to the delete() statement in Active Record.
        • +
      • Added count_all_results() function to Active Record.
        • +
      • Added select_max(), select_min(), select_avg() and select_sum() to Active Record.
        • +
      • Added the ability to use aliases with joins in Active Record.
        • +
      • Added a third parameter to Active Record's like() clause to control where the wildcard goes.
        • +
      • Added a third parameter to set() in Active Record that withholds escaping data.
        • +
      • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
        • +
      +
      • + +
    • Other Database Related +
        +
      • MySQL driver now requires MySQL 4.1+
        • +
      • Added $this->DB->save_queries variable to DB driver, enabling queries to get saved or not. Previously they were always saved.
        • +
      • Added $this->db->dbprefix() to manually add database prefixes.
        • +
      • Added 'random' as an order_by() option , and removed "rand()" as a listed option as it was MySQL only.
        • +
      • Added a check for NULL fields in the MySQL database backup utility.
        • +
      • Added "constrain_by_prefix" parameter to db->list_table() function. If set to TRUE it will limit the result to only table names with the current prefix.
        • +
      • Deprecated from Active Record; getwhere() for get_where(); groupby() for group_by(); havingor() for having_or(); orderby() for order_by; orwhere() for or_where(); and orlike() for or_like().
        • +
      • Modified csv_from_result() to output CSV data more in the spirit of basic rules of RFC 4180.
        • +
      • Added 'char_set' and 'dbcollat' database configuration settings, to explicitly set the client communication properly.
        • +
      • Removed 'active_r' configuration setting and replaced with a global $active_record setting, which is more + in harmony with the global nature of the behavior (#1834).
        • +
      +
      • + +
    • Core changes +
        +
      • Added ability to load multiple views, whose content will be appended to the output in the order loaded.
        • +
      • Added the ability to auto-load Models.
        • +
      • Reorganized the URI and Routes classes for better clarity.
        • +
      • Added Compat.php to allow function overrides for older versions of PHP or PHP environments missing certain extensions / libraries
        • +
      • Added memory usage, GET, URI string data, and individual query execution time to Profiler output.
        • +
      • Deprecated Scaffolding.
        • +
      • Added is_really_writable() to Common.php to provide a cross-platform reliable method of testing file/folder writability.
        • +
      +
      • + +
    • Libraries +
        +
      • Changed the load protocol of Models to allow for extension.
        • +
      • Strengthened the Encryption library to help protect against man in the middle attacks when MCRYPT_MODE_CBC mode is used.
        • +
      • Added Flashdata variables, session_id regeneration and configurable session update times to the Session class.
        • +
      • Removed 'last_visit' from the Session class.
        • +
      • Added a language entry for valid_ip validation error.
        • +
      • Modified prep_for_form() in the Validation class to accept arrays, adding support for POST array validation (via callbacks only)
        • +
      • Added an "integer" rule into the Validation library.
        • +
      • Added valid_base64() to the Validation library.
        • +
      • Documented clear() in the Image Processing library.
        • +
      • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
        • +
      • Modified Upload class $_FILES error messages to be more precise.
        • +
      • Moved the safe mode and auth checks for the Email library into the constructor.
        • +
      • Modified variable names in _ci_load() method of Loader class to avoid conflicts with view variables.
        • +
      • Added a few additional mime type variations for CSV.
        • +
      • Enabled the 'system' methods for the XML-RPC Server library, except for 'system.multicall' which is still disabled.
        • +
      +
      • + +
    • Helpers & Plugins +
        +
      • Added link_tag() to the HTML helper.
        • +
      • Added img() to the HTML helper.
        • +
      • Added ability to "extend" Helpers.
        • +
      • Added an email helper into core helpers.
        • +
      • Added strip_quotes() function to string helper.
        • +
      • Added reduce_multiples() function to string helper.
        • +
      • Added quotes_to_entities() function to string helper.
        • +
      • Added form_fieldset(), form_fieldset_close(), form_label(), and form_reset() function to form helper.
        • +
      • Added support for external urls in form_open().
        • +
      • Removed support for db_backup in MySQLi due to incompatible functions.
        • +
      • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
        • +
      +
      • + + +
    • Documentation Changes +
        +
      • Added Writing Documentation section for the community to use in writing their own documentation.
        • +
      • Added titles to all user manual pages.
        • +
      • Added attributes into <html> of userguide for valid html.
        • +
      • Added Zip Encoding Class to the table of contents of the userguide.
        • +
      • Moved part of the userguide menu javascript to an external file.
        • +
      • Documented distinct() in Active Record.
        • +
      • Documented the timezones() function in the Date Helper.
        • +
      • Documented unset_userdata in the Session class.
        • +
      • Documented 2 config options to the Database configuration page.
        • +
      +
      • +
    + +

    Bug fixes for Version 1.6.0

    + +
      +
    • Fixed a bug (#1813) preventing using $CI->db in the same application with returned database objects.
      • +
    • Fixed a bug (#1842) where the $this->uri->rsegments array would not include the 'index' method if routed to the controller without an implicit method.
      • +
    • Fixed a bug (#1872) where word_limiter() was not retaining whitespace.
      • +
    • Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.
      • +
    • Fixed a bug (#2542)in the clean_email() method of the Email class to allow for non-numeric / non-sequential array keys.
      • +
    • Fixed a bug (#2545) in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.
      • +
    • Fixed a bug (#2668) in the parser class where numeric data was ignored.
      • +
    • Fixed a bug (#2679) where the "previous" pagination link would get drawn on the first page.
      • +
    • Fixed a bug (#2702) in _object_to_array that broke some types of inserts and updates.
      • +
    • Fixed a bug (#2732) in the SQLite driver for PHP 4.
      • +
    • Fixed a bug (#2754) in Pagination to scan for non-positive num_links.
      • +
    • Fixed a bug (#2762) in the Session library where user agent matching would fail on user agents ending with a space.
      • +
    • Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgres and sqlite drivers.
      • +
    • Fixed a bug (#2810) in the typography helper causing extraneous paragraph tags when string contains tags.
      • +
    • Fixed a bug (#2849) where arguments passed to a subfolder controller method would be incorrectly shifted, dropping the 3rd segment value.
      • +
    • Fixed a bug (#2858) which referenced a wrong variable in the Image class.
      • +
    • Fixed a bug (#2875)when loading plugin files as _plugin. and not _pi.
      • +
    • Fixed a bug (#2912) in get_filenames() in the File Helper where the array wasn't cleared after each call.
      • +
    • Fixed a bug (#2974) in highlight_phrase() that caused an error with slashes.
      • +
    • Fixed a bug (#3003) in the Encryption Library to support modes other than MCRYPT_MODE_ECB
      • +
    • Fixed a bug (#3015) in the User Agent library where more then 2 languages where not reported with languages().
      • +
    • Fixed a bug (#3017) in the Email library where some timezones were calculated incorrectly.
      • +
    • Fixed a bug (#3024) in which master_dim wasn't getting reset by clear() in the Image library.
      • +
    • Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.
      • +
    • Fixed a bug (#3166) that prevented num_rows from working in Oracle.
      • +
    • Fixed a bug (#3175) preventing certain libraries from working properly when autoloaded in PHP 4.
      • +
    • Fixed a bug (#3267) in the Typography Helper where unordered list was listed "un.
      • +
    • Fixed a bug (#3268) where the Router could leave '/' as the path.
      • +
    • Fixed a bug (#3279) where the Email class was sending the wrong Content-Transfer-Encoding for some character sets.
      • +
    • Fixed a bug (#3284) where the rsegment array would not be set properly if the requested URI contained more segments than the routed URI.
      • +
    • Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).
      • +
    • Removed an extraneous call to loading models (#3286).
      • +
    • Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.
      • +
    • Fixed a bug (#3314) which would cause the top level path to be deleted in delete_files() of the File helper.
      • +
    • Fixed a bug (#3328) where the smiley helper might return an undefined variable.
      • +
    • Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.
      • +
    • Removed an unused parameter from Profiler (#3332).
      • +
    • Fixed a bug in database driver where num_rows property wasn't getting updated.
      • +
    • Fixed a bug in the upload library when allowed_files wasn't defined.
      • +
    • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
      • +
    • Fixed a bug in Validation where valid_ip() wasn't called properly.
      • +
    • Fixed a bug in Validation where individual error messages for checkboxes wasn't supported.
      • +
    • Fixed a bug in captcha calling an invalid PHP function.
      • +
    • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
      • +
    • Fixed a bug that was making validation callbacks required even when not set as such.
      • +
    • Fixed a bug in the XML-RPC library so if a type is specified, a more intelligent decision is made as to the default type.
      • +
    • Fixed an example of comma-separated emails in the email library documentation.
      • +
    • Fixed an example in the Calendar library for Showing Next/Previous Month Links.
      • +
    • Fixed a typo in the database language file.
      • +
    • Fixed a typo in the image language file "suppor" to "support".
      • +
    • Fixed an example for XML RPC.
      • +
    • Fixed an example of accept_charset() in the User Agent Library.
      • +
    • Fixed a typo in the docblock comments that had CodeIgniter spelled CodeIgnitor.
      • +
    • Fixed a typo in the String Helper (uniquid changed to uniqid).
      • +
    • Fixed typos in the email Language class (email_attachment_unredable, email_filed_smtp_login), and FTP Class (ftp_unable_to_remame).
      • +
    • Added a stripslashes() into the Upload Library.
      • +
    • Fixed a series of grammatical and spelling errors in the language files.
      • +
    • Fixed assorted user guide typos.
      • +
    +

    Version 1.5.4

    +

    Release Date: July 12, 2007

    +
      +
    • Added custom Language files to the autoload options.
      • +
    • Added stripslashes() to the _clean_input_data() function in the Input class when magic quotes is on so that data will always be un-slashed within the framework.
      • +
    • Added array to string into the profiler.
      • +
    • Added some additional mime types in application/config/mimes.php.
      • +
    • Added filename_security() method to Input library.
      • +
    • Added some additional arguments to the Inflection helper singular() to compensate for words ending in "s". Also added a force parameter to pluralize().
      • +
    • Added $config['charset'] to the config file. Default value is 'UTF-8', used in some string handling functions.
      • +
    • Fixed MSSQL insert_id().
      • +
    • Fixed a logic error in the DB trans_status() function. It was incorrectly returning TRUE on failure and FALSE on success.
      • +
    • Fixed a bug that was allowing multiple load attempts on extended classes.
      • +
    • Fixed a bug in the bootstrap file that was incorrectly attempting to discern the full server path even when it was explicity set by the user.
      • +
    • Fixed a bug in the escape_str() function in the MySQL driver.
      • +
    • Fixed a typo in the Calendar library
      • +
    • Fixed a typo in rpcs.php library
      • +
    • Fixed a bug in the Zip library, providing PC Zip file compatibility with Mac OS X
      • +
    • Fixed a bug in router that was ignoring the scaffolding route for optimization
      • +
    • Fixed an IP validation bug.
      • +
    • Fixed a bug in display of POST keys in the Profiler output
      • +
    • Fixed a bug in display of queries with characters that would be interpreted as HTML in the Profiler output
      • +
    • Fixed a bug in display of Email class print debugger with characters that would be interpreted as HTML in the debugging output
      • +
    • Fixed a bug in the Content-Transfer-Encoding of HTML emails with the quoted-printable MIME type
      • +
    • Fixed a bug where one could unset certain PHP superglobals by setting them via GET or POST data
      • +
    • Fixed an undefined function error in the insert_id() function of the PostgreSQL driver
      • +
    • Fixed various doc typos.
      • +
    • Documented two functions from the String helper that were missing from the user guide: trim_slashes() and reduce_double_slashes().
      • +
    • Docs now validate to XHTML 1 transitional
      • +
    • Updated the XSS Filtering to take into account the IE expression() ability and improved certain deletions to prevent possible exploits
      • +
    • Modified the Router so that when Query Strings are Enabled, the controller trigger and function trigger values are sanitized for filename include security.
      • +
    • Modified the is_image() method in the Upload library to take into account Windows IE 6/7 eccentricities when dealing with MIMEs
      • +
    • Modified XSS Cleaning routine to be more performance friendly and compatible with PHP 5.2's new PCRE backtrack and recursion limits.
      • +
    • Modified the URL Helper to type cast the $title as a string in case a numeric value is supplied
      • +
    • Modified Form Helper form_dropdown() to type cast the keys and values of the options array as strings, allowing numeric values to be properly set as 'selected'
      • +
    • Deprecated the use if is_numeric() in various places since it allows periods. Due to compatibility problems with ctype_digit(), making it unreliable in some installations, the following regular expression was used instead: preg_match("/[^0-9]/", $n)
      • +
    • Deprecated: APPVER has been deprecated and replaced with CI_VERSION for clarity.
      • +
    +

    Version 1.5.3

    +

    Release Date: April 15, 2007

    +
      +
    • Added array to string into the profiler
      • +
    • Code Igniter references updated to CodeIgniter
      • +
    • pMachine references updated to EllisLab
      • +
    • Fixed a bug in the repeater function of string helper.
      • +
    • Fixed a bug in ODBC driver
      • +
    • Fixed a bug in result_array() that was returning an empty array when no result is produced.
      • +
    • Fixed a bug in the redirect function of the url helper.
      • +
    • Fixed an undefined variable in Loader
      • +
    • Fixed a version bug in the Postgres driver
      • +
    • Fixed a bug in the textarea function of the form helper for use with strings
      • +
    • Fixed doc typos.
      • +
    +

    Version 1.5.2

    +

    Release Date: February 13, 2007

    +
      +
    • Added subversion information to the downloads page.
      • +
    • Added support for captions in the Table Library
      • +
    • Fixed a bug in the download_helper that was causing Internet Explorer to load rather than download
      • +
    • Fixed a bug in the Active Record Join function that was not taking table prefixes into consideration.
      • +
    • Removed unescaped variables in error messages of Input and Router classes
      • +
    • Fixed a bug in the Loader that was causing errors on Libraries loaded twice. A debug message is now silently made in the log.
      • +
    • Fixed a bug in the form helper that gave textarea a value attribute
      • +
    • Fixed a bug in the Image Library that was ignoring resizing the same size image
      • +
    • Fixed some doc typos.
      • +
    + + +

    Version 1.5.1

    +

    Release Date: November 23, 2006

    +
      +
    • Added support for submitting arrays of libraries in the $this->load->library function.
      • +
    • Added support for naming custom library files in lower or uppercase.
      • +
    • Fixed a bug related to output buffering.
      • +
    • Fixed a bug in the active record class that was not resetting query data after a completed query.
      • +
    • Fixed a bug that was suppressing errors in controllers.
      • +
    • Fixed a problem that can cause a loop to occur when the config file is missing.
      • +
    • Fixed a bug that occurred when multiple models were loaded with the third parameter set to TRUE.
      • +
    • Fixed an oversight that was not unsetting globals properly in the input sanitize function.
      • +
    • Fixed some bugs in the Oracle DB driver.
      • +
    • Fixed an incorrectly named variable in the MySQLi result driver.
      • +
    • Fixed some doc typos.
      • +
    +

    Version 1.5.0.1

    +

    Release Date: October 31, 2006

    +
      +
    • Fixed a problem in which duplicate attempts to load helpers and classes were not being stopped.
      • +
    • Fixed a bug in the word_wrap() helper function.
      • +
    • Fixed an invalid color Hex number in the Profiler class.
      • +
    • Fixed a corrupted image in the user guide.
      • +
    + + + +

    Version 1.5.0

    +

    Release Date: October 30, 2006

    + +
      +
    • Added DB utility class, permitting DB backups, CVS or XML files from DB results, and various other functions.
      • +
    • Added Database Caching Class.
      • +
    • Added transaction support to the database classes.
      • +
    • Added Profiler Class which generates a report of Benchmark execution times, queries, and POST data at the bottom of your pages.
      • +
    • Added User Agent Library which allows browsers, robots, and mobile devises to be identified.
      • +
    • Added HTML Table Class , enabling tables to be generated from arrays or database results.
      • +
    • Added Zip Encoding Library.
      • +
    • Added FTP Library.
      • +
    • Added the ability to extend libraries and extend core classes, in addition to being able to replace them.
      • +
    • Added support for storing models within sub-folders.
      • +
    • Added Download Helper.
      • +
    • Added simple_query() function to the database classes
      • +
    • Added standard_date() function to the Date Helper.
      • +
    • Added $query->free_result() to database class.
      • +
    • Added $query->list_fields() function to database class
      • +
    • Added $this->db->platform() function
      • +
    • Added new File Helper: get_filenames()
      • +
    • Added new helper: Smiley Helper
      • +
    • Added support for <ul> and <ol> lists in the HTML Helper
      • +
    • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
      • +
    • Added the ability to rename or relocate the "application" folder.
      • +
    • Added more thorough initialization in the upload class so that all class variables are reset.
      • +
    • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
      • +
    • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
      • +
    • Moved most of the functions in the Controller class into the Loader class, allowing fewer reserved function names for controllers when running under PHP 5.
      • +
    • Updated the DB Result class to return an empty array when $query->result() doesn't produce a result.
      • +
    • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
      • +
    • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
      • +
    • Fixed a bug in the Email class related to SMTP Helo data.
      • +
    • Fixed a bug in the word wrapping helper and function in the email class.
      • +
    • Fixed a bug in the validation class.
      • +
    • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
      • +
    • Fixed a problem in the form_prep() function that was double encoding entities.
      • +
    • Fixed a bug that affects some versions of PHP when output buffering is nested.
      • +
    • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
      • +
    • Fixed a pagination bug that was permitting negative values in the URL.
      • +
    • Fixed an oversight in which the Loader class was not allowed to be exteneded.
      • +
    • Changed _get_config() to get_config() since the function is not a private one.
      • +
    • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
      • +
    • Deprecated $this->db->field_names() USE $this->db->list_fields()
      • +
    • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
      • +
    + + + + +

    Version 1.4.1

    +

    Release Date: September 21, 2006

    + +
      +
    • Added a new feature that passes URI segments directly to your function calls as parameters. See the Controllers page for more info.
      • +
    • Added support for a function named _output(), which when used in your controllers will received the final rendered output from the output class. More info in the Controllers page.
      • +
    • Added several new functions in the URI Class to let you retrieve and manipulate URI segments that have been re-routed using the URI Routing feature. Previously, the URI class did not permit you to access any re-routed URI segments, but now it does.
      • +
    • Added $this->output->set_header() function, which allows you to set server headers.
      • +
    • Updated plugins, helpers, and language classes to allow your application folder to contain its own plugins, helpers, and language folders. Previously they were always treated as global for your entire installation. If your application folder contains any of these resources they will be used instead the global ones.
      • +
    • Added Inflector helper.
      • +
    • Added element() function in the array helper.
      • +
    • Added RAND() to active record orderby() function.
      • +
    • Added delete_cookie() and get_cookie() to Cookie helper, even though the input class has a cookie fetching function.
      • +
    • Added Oracle database driver (still undergoing testing so it might have some bugs).
      • +
    • Added the ability to combine pseudo-variables and php variables in the template parser class.
      • +
    • Added output compression option to the config file.
      • +
    • Removed the is_numeric test from the db->escape() function.
      • +
    • Fixed a MySQLi bug that was causing error messages not to contain proper error data.
      • +
    • Fixed a bug in the email class which was causing it to ignore explicitly set alternative headers.
      • +
    • Fixed a bug that was causing a PHP error when the Exceptions class was called within the get_config() function since it was causing problems.
      • +
    • Fixed an oversight in the cookie helper in which the config file cookie settings were not being honored.
      • +
    • Fixed an oversight in the upload class. An item mentioned in the 1.4 changelog was missing.
      • +
    • Added some code to allow email attachments to be reset when sending batches of email.
      • +
    • Deprecated the application/scripts folder. It will continue to work for legacy users, but it is recommended that you create your own +libraries or models instead. It was originally added before CI had user libraries or models, but it's not needed anymore.
      • +
    • Deprecated the $autoload['core'] item from the autoload.php file. Instead, please now use: $autoload['libraries']
      • +
    • Deprecated the following database functions: $this->db->smart_escape_str() and $this->db->fields().
      • +
    + + + +

    Version 1.4.0

    +

    Release Date: September 17, 2006

    + +
      +
    • Added Hooks feature, enabling you to tap into and modify the inner workings of the framework without hacking the core files.
      • +
    • Added the ability to organize controller files into sub-folders. Kudos to Marco for suggesting this (and the next two) feature.
      • +
    • Added regular expressions support for routing rules.
      • +
    • Added the ability to remap function calls within your controllers.
      • +
    • Added the ability to replace core system classes with your own classes.
      • +
    • Added support for % character in URL.
      • +
    • Added the ability to supply full URLs using the anchor() helper function.
      • +
    • Added mode parameter to file_write() helper.
      • +
    • Added support for changing the port number in the Postgres driver.
      • +
    • Moved the list of "allowed URI characters" out of the Router class and into the config file.
      • +
    • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
      • +
    • Updated the Upload class to allow the upload field name to be set when calling do_upload().
      • +
    • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
      • +
    • Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.
      • +
    • Updated the form_open() helper to allow the GET method to be used.
      • +
    • Updated the MySQLi execute() function with some code to help prevent lost connection errors.
      • +
    • Updated the SQLite Driver to check for object support before attempting to return results as objects. If unsupported it returns an array.
      • +
    • Updated the Models loader function to allow multiple loads of the same model.
      • +
    • Updated the MS SQL driver so that single quotes are escaped.
      • +
    • Updated the Postgres and ODBC drivers for better compatibility.
      • +
    • Removed a strtolower() call that was changing URL segments to lower case.
      • +
    • Removed some references that were interfering with PHP 4.4.1 compatibility.
      • +
    • Removed backticks from Postgres class since these are not needed.
      • +
    • Renamed display() to _display() in the Output class to make it clear that it's a private function.
      • +
    • Deprecated the hash() function due to a naming conflict with a native PHP function with the same name. Please use dohash() instead.
      • +
    • Fixed an bug that was preventing the input class from unsetting GET variables.
      • +
    • Fixed a router bug that was making it too greedy when matching end segments.
      • +
    • Fixed a bug that was preventing multiple discrete database calls.
      • +
    • Fixed a bug in which loading a language file was producing a "file contains no data" message.
      • +
    • Fixed a session bug caused by the XSS Filtering feature inadvertently changing the case of certain words.
      • +
    • Fixed some missing prefixes when using the database prefix feature.
      • +
    • Fixed a typo in the Calendar class (cal_november).
      • +
    • Fixed a bug in the form_checkbox() helper.
      • +
    • Fixed a bug that was allowing the second segment of the URI to be identical to the class name.
      • +
    • Fixed an evaluation bug in the database initialization function.
      • +
    • Fixed a minor bug in one of the error messages in the language class.
      • +
    • Fixed a bug in the date helper timespan function.
      • +
    • Fixed an undefined variable in the DB Driver class.
      • +
    • Fixed a bug in which dollar signs used as binding replacement values in the DB class would be treated as RegEx back-references.
      • +
    • Fixed a bug in the set_hash() function which was preventing MD5 from being used.
      • +
    • Fixed a couple bugs in the Unit Testing class.
      • +
    • Fixed an incorrectly named variable in the Validation class.
      • +
    • Fixed an incorrectly named variable in the URI class.
      • +
    • Fixed a bug in the config class that was preventing the base URL from being called properly.
      • +
    • Fixed a bug in the validation class that was not permitting callbacks if the form field was empty.
      • +
    • Fixed a problem that was preventing scaffolding from working properly with MySQLi.
      • +
    • Fixed some MS SQL bugs.
      • +
    • Fixed some doc typos.
      • +
    + + + +

    Version 1.3.3

    +

    Release Date: June 1, 2006

    + +
      + +
    • Models do not connect automatically to the database as of this version. More info here.
      • +
    • Updated the Sessions class to utilize the active record class when running session related queries. Previously the queries assumed MySQL syntax.
      • +
    • Updated alternator() function to re-initialize when called with no arguments, allowing multiple calls.
      • +
    • Fixed a bug in the active record "having" function.
      • +
    • Fixed a problem in the validation class which was making checkboxes be ignored when required.
      • +
    • Fixed a bug in the word_limiter() helper function. It was cutting off the fist word.
      • +
    • Fixed a bug in the xss_clean function due to a PHP bug that affects some versions of html_entity_decode.
      • +
    • Fixed a validation bug that was preventing rules from being set twice in one controller.
      • +
    • Fixed a calendar bug that was not letting it use dynamically loaded languages.
      • +
    • Fixed a bug in the active record class when using WHERE clauses with LIKE
      • +
    • Fixed a bug in the hash() security helper.
      • +
    • Fixed some typos.
      • +
    + + + + +

    Version 1.3.2

    +

    Release Date: April 17, 2006

    + +
      +
    • Changed the behavior of the validation class such that if a "required" rule is NOT explicitly stated for a field then all other tests get ignored.
      • +
    • Fixed a bug in the Controller class that was causing it to look in the local "init" folder instead of the main system one.
      • +
    • Fixed a bug in the init_pagination file. The $config item was not being set correctly.
      • +
    • Fixed a bug in the auto typography helper that was causing inconsistent behavior.
      • +
    • Fixed a couple bugs in the Model class.
      • +
    • Fixed some documentation typos and errata.
      • +
    + + + +

    Version 1.3.1

    +

    Release Date: April 11, 2006

    + +
      +
    • Added a Unit Testing Library.
      • +
    • Added the ability to pass objects to the insert() and update() database functions. +This feature enables you to (among other things) use your Model class variables to run queries with. See the Models page for details.
      • +
    • Added the ability to pass objects to the view loading function: $this->load->view('my_view', $object);
      • +
    • Added getwhere function to Active Record class.
      • +
    • Added count_all function to Active Record class.
      • +
    • Added language file for scaffolding and fixed a scaffolding bug that occurs when there are no rows in the specified table.
      • +
    • Added $this->db->last_query(), which allows you to view your last query that was run.
      • +
    • Added a new mime type to the upload class for better compatibility.
      • +
    • Changed how cache files are read to prevent PHP errors if the cache file contains an XML tag, which PHP wants to interpret as a short tag.
      • +
    • Fixed a bug in a couple of the active record functions (where and orderby).
      • +
    • Fixed a bug in the image library when realpath() returns false.
      • +
    • Fixed a bug in the Models that was preventing libraries from being used within them.
      • +
    • Fixed a bug in the "exact_length" function of the validation class.
      • +
    • Fixed some typos in the user guide
      • +
    + + +

    Version 1.3

    +

    Release Date: April 3, 2006

    + +
      +
    • Added support for Models.
      • +
    • Redesigned the database libraries to support additional RDBMs (Postgres, MySQLi, etc.).
      • +
    • Redesigned the Active Record class to enable more varied types of queries with simpler syntax, and advanced features like JOINs.
      • +
    • Added a feature to the database class that lets you run custom function calls.
      • +
    • Added support for private functions in your controllers. Any controller function name that starts with an underscore will not be served by a URI request.
      • +
    • Added the ability to pass your own initialization parameters to your custom core libraries when using $this->load->library()
      • +
    • Added support for running standard query string URLs. These can be optionally enabled in your config file.
      • +
    • Added the ability to specify a "suffix", which will be appended to your URLs. For example, you could add .html to your URLs, making them appear static. This feature is enabled in your config file.
      • +
    • Added a new error template for use with native PHP errors.
      • +
    • Added "alternator" function in the string helpers.
      • +
    • Removed slashing from the input class. After much debate we decided to kill this feature.
      • +
    • Change the commenting style in the scripts to the PEAR standard so that IDEs and tools like phpDocumenter can harvest the comments.
      • +
    • Added better class and function name-spacing to avoid collisions with user developed classes. All CodeIgniter classes are now prefixed with CI_ and +all controller methods are prefixed with _ci to avoid controller collisions. A list of reserved function names can be found here.
      • +
    • Redesigned how the "CI" super object is referenced, depending on whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful way to manage objects that utilizes a bit less resources.
      • +
    • Deprecated: $this->db->use_table() has been deprecated. Please read the Active Record page for information.
      • +
    • Deprecated: $this->db->smart_escape_str() has been deprecated. Please use this instead: $this->db->escape()
      • +
    • Fixed a bug in the exception handler which was preventing some PHP errors from showing up.
      • +
    • Fixed a typo in the URI class. $this->total_segment() should be plural: $this->total_segments()
      • +
    • Fixed some typos in the default calendar template
      • +
    • Fixed some typos in the user guide
      • +
    + + + + + + + + +

    Version 1.2

    +

    Release Date: March 21, 2006

    + +
      +
    • Redesigned some internal aspects of the framework to resolve scoping problems that surfaced during the beta tests. The problem was most notable when instantiating classes in your constructors, particularly if those classes in turn did work in their constructors.
      • +
    • Added a global function named get_instance() allowing the main CodeIgniter object to be accessible throughout your own classes.
      • +
    • Added new File Helper: delete_files()
      • +
    • Added new URL Helpers: base_url(), index_page()
      • +
    • Added the ability to create your own core libraries and store them in your local application directory.
      • +
    • Added an overwrite option to the Upload class, enabling files to be overwritten rather than having the file name appended.
      • +
    • Added Javascript Calendar plugin.
      • +
    • Added search feature to user guide. Note: This is done using Google, which at the time of this writing has not crawled all the pages of the docs.
      • +
    • Updated the parser class so that it allows tag pars within other tag pairs.
      • +
    • Fixed a bug in the DB "where" function.
      • +
    • Fixed a bug that was preventing custom config files to be auto-loaded.
      • +
    • Fixed a bug in the mysql class bind feature that prevented question marks in the replacement data.
      • +
    • Fixed some bugs in the xss_clean function
      • +
    + + + + + +

    Version Beta 1.1

    +

    Release Date: March 10, 2006

    + +
      +
    • Added a Calendaring class.
      • +
    • Added support for running multiple applications that share a common CodeIgniter backend.
      • +
    • Moved the "uri protocol" variable from the index.php file into the config.php file
      • +
    • Fixed a problem that was preventing certain function calls from working within constructors.
      • +
    • Fixed a problem that was preventing the $this->load->library function from working in constructors.
      • +
    • Fixed a bug that occurred when the session class was loaded using the auto-load routine.
      • +
    • Fixed a bug that can happen with PHP versions that do not support the E_STRICT constant
      • +
    • Fixed a data type error in the form_radio function (form helper)
      • +
    • Fixed a bug that was preventing the xss_clean function from being called from the validation class.
      • +
    • Fixed the cookie related config names, which were incorrectly specified as $conf rather than $config
      • +
    • Fixed a pagination problem in the scaffolding.
      • +
    • Fixed a bug in the mysql class "where" function.
      • +
    • Fixed a regex problem in some code that trimmed duplicate slashes.
      • +
    • Fixed a bug in the br() function in the HTML helper
      • +
    • Fixed a syntax mistake in the form_dropdown function in the Form Helper.
      • +
    • Removed the "style" attributes form the form helpers.
      • +
    • Updated the documentation. Added "next/previous" links to each page and fixed various typos.
      • +
    + +

    Version Beta 1.0

    +

    Release Date: February 28, 2006

    +

    First publicly released version.

    + +
    + + + + + + + diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 2a8955c4..871c59a5 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -1,757 +1,757 @@ - - - - - -Active Record : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - -
    - -

    Active Record Class

    - -

    CodeIgniter uses a modified version of the Active Record Database Pattern. -This pattern allows information to be retrieved, inserted, and updated in your database with minimal scripting. -In some cases only one or two lines of code are necessary to perform a database action. -CodeIgniter does not require that each database table be its own class file. It instead provides a more simplified interface.

    - -

    Beyond simplicity, a major benefit to using the Active Record features is that it allows you to create database independent applications, since the query syntax -is generated by each database adapter. It also allows for safer queries, since the values are escaped automatically by the system.

    - -

    Note: If you intend to write your own queries you can disable this class in your database config file, allowing the core database library and adapter to utilize fewer resources.

    - - - -

     Selecting Data

    - -

    The following functions allow you to build SQL SELECT statements.

    - -

    Note: If you are using PHP 5 you can use method chaining for more compact syntax. This is described at the end of the page.

    - - -

    $this->db->get();

    - -

    Runs the selection query and returns the result. Can be used by itself to retrieve all records from a table:

    - -$query = $this->db->get('mytable');
    -
    -// Produces: SELECT * FROM mytable     - -

    The second and third parameters enable you to set a limit and offset clause:

    - -$query = $this->db->get('mytable', 10, 20);
    -
    -// Produces: SELECT * FROM mytable LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)     - -

    You'll notice that the above function is assigned to a variable named $query, which can be used to show the results:

    - -$query = $this->db->get('mytable');
    -
    -foreach ($query->result() as $row)
    -{
    -    echo $row->title;
    -}     - -

    Please visit the result functions page for a full discussion regarding result generation.

    - - -

    $this->db->get_where();

    - -

    Identical to the above function except that it permits you to add a "where" clause in the second parameter, -instead of using the db->where() function:

    - -$query = $this->db->get_where('mytable', array('id' => $id), $limit, $offset); - -

    Please read the about the where function below for more information.

    -

    Note: get_where() was formerly known as getwhere(), which has been deprecated

    - -

    $this->db->select();

    -

    Permits you to write the SELECT portion of your query:

    -

    -$this->db->select('title, content, date');
    -
    -$query = $this->db->get('mytable');
    -
    -// Produces: SELECT title, content, date FROM mytable

    -

    Note: If you are selecting all (*) from a table you do not need to use this function. When omitted, CodeIgniter assumes you wish to SELECT *

    - -

    $this->db->select() accepts an optional second parameter. If you set it to FALSE, CodeIgniter will not try to protect your field or table names with backticks. This is useful if you need a compound select statement.

    -

    $this->db->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4') AS amount_paid', FALSE);
    -$query = $this->db->get('mytable');
    -

    -

    $this->db->select_max();

    -

    Writes a "SELECT MAX(field)" portion for your query. You can optionally include a second parameter to rename the resulting field.

    -

    -$this->db->select_max('age');
    -$query = $this->db->get('members');
    - -// Produces: SELECT MAX(age) as age FROM members
    -
    -$this->db->select_max('age', 'member_age');
    -$query = $this->db->get('members');
    -// Produces: SELECT MAX(age) as member_age FROM members

    - -

    $this->db->select_min();

    -

    Writes a "SELECT MIN(field)" portion for your query. As with select_max(), You can optionally include a second parameter to rename the resulting field.

    -

    -$this->db->select_min('age');
    -$query = $this->db->get('members');
    -// Produces: SELECT MIN(age) as age FROM members

    - -

    $this->db->select_avg();

    -

    Writes a "SELECT AVG(field)" portion for your query. As with select_max(), You can optionally include a second parameter to rename the resulting field.

    -

    -$this->db->select_avg('age');
    -$query = $this->db->get('members');
    -// Produces: SELECT AVG(age) as age FROM members

    - -

    $this->db->select_sum();

    -

    Writes a "SELECT SUM(field)" portion for your query. As with select_max(), You can optionally include a second parameter to rename the resulting field.

    -

    -$this->db->select_sum('age');
    -$query = $this->db->get('members');
    -// Produces: SELECT SUM(age) as age FROM members

    - -

    $this->db->from();

    - -

    Permits you to write the FROM portion of your query:

    - - -$this->db->select('title, content, date');
    -$this->db->from('mytable');
    -
    -$query = $this->db->get();
    -
    -// Produces: SELECT title, content, date FROM mytable     - -

    Note: As shown earlier, the FROM portion of your query can be specified in the $this->db->get() function, so use whichever method -you prefer.

    - -

    $this->db->join();

    - -

    Permits you to write the JOIN portion of your query:

    - - -$this->db->select('*');
    -$this->db->from('blogs');
    -$this->db->join('comments', 'comments.id = blogs.id');
    -
    -$query = $this->db->get();
    -
    -// Produces:
    -// SELECT * FROM blogs
    -// JOIN comments ON comments.id = blogs.id
    -     - -

    Multiple function calls can be made if you need several joins in one query.

    - -

    If you need something other than a natural JOIN you can specify it via the third parameter of the function. -Options are: left, right, outer, inner, left outer, and right outer.

    - - -$this->db->join('comments', 'comments.id = blogs.id', 'left');
    -
    -// Produces: LEFT JOIN comments ON comments.id = blogs.id     - - - - - -

    $this->db->where();

    -

    This function enables you to set WHERE clauses using one of four methods:

    - -

    Note: All values passed to this function are escaped automatically, producing safer queries.

    - -
      -
    1. Simple key/value method: - - $this->db->where('name', $name); -

      // Produces: WHERE name = 'Joe'       - -

      Notice that the equal sign is added for you.

      - -

      If you use multiple function calls they will be chained together with AND between them:

      - - $this->db->where('name', $name);
      - $this->db->where('title', $title);
      - $this->db->where('status', $status); -

      // WHERE name 'Joe' AND title = 'boss' AND status = 'active'
      2. - -
    2. Custom key/value method: - -

      You can include an operator in the first parameter in order to control the comparison:

      - - $this->db->where('name !=', $name);
      - $this->db->where('id <', $id); -

      // Produces: WHERE name != 'Joe' AND id < 45
      3. -
    3. Associative array method: - - - - $array = array('name' => $name, 'title' => $title, 'status' => $status);

      - - $this->db->where($array); -

      // Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'       - -

      You can include your own operators using this method as well:

      - - - $array = array('name !=' => $name, 'id <' => $id, 'date >' => $date);

      - - $this->db->where($array);
      4. -
    4. Custom string: - -

      You can write your own clauses manually:

      - - - $where = "name='Joe' AND status='boss' OR status='active'";

      - $this->db->where($where);
      5. -
    - - -

    $this->db->where() accepts an optional third parameter. If you set it to FALSE, CodeIgniter will not try to protect your field or table names with backticks.

    -

    $this->db->where('MATCH (field) AGAINST ("value")', NULL, FALSE);
    -

    -

    $this->db->or_where();

    -

    This function is identical to the one above, except that multiple instances are joined by OR:

    - - -$this->db->where('name !=', $name);
    -$this->db->or_where('id >', $id); -
    -
    // Produces: WHERE name != 'Joe' OR id > 50     - -

    Note: or_where() was formerly known as orwhere(), which has been deprecated.

    - - -

    $this->db->where_in();

    -

    Generates a WHERE field IN ('item', 'item') SQL query joined with AND if appropriate

    -

    - $names = array('Frank', 'Todd', 'James');
    - $this->db->where_in('username', $names);
    - // Produces: WHERE username IN ('Frank', 'Todd', 'James')

    - -

    $this->db->or_where_in();

    -

    Generates a WHERE field IN ('item', 'item') SQL query joined with OR if appropriate

    -

    - $names = array('Frank', 'Todd', 'James');
    - $this->db->or_where_in('username', $names);
    - // Produces: OR username IN ('Frank', 'Todd', 'James')

    - -

    $this->db->where_not_in();

    -

    Generates a WHERE field NOT IN ('item', 'item') SQL query joined with AND if appropriate

    -

    - $names = array('Frank', 'Todd', 'James');
    - $this->db->where_not_in('username', $names);
    - // Produces: WHERE username NOT IN ('Frank', 'Todd', 'James')

    - -

    $this->db->or_where_not_in();

    -

    Generates a WHERE field NOT IN ('item', 'item') SQL query joined with OR if appropriate

    -

    - $names = array('Frank', 'Todd', 'James');
    - $this->db->or_where_not_in('username', $names);
    - // Produces: OR username NOT IN ('Frank', 'Todd', 'James')

    - -

    $this->db->like();

    -

    This function enables you to generate LIKE clauses, useful for doing searches.

    - -

    Note: All values passed to this function are escaped automatically.

    - - -
      -
    1. Simple key/value method: - - $this->db->like('title', 'match'); -

      // Produces: WHERE title LIKE '%match%'       - -

      If you use multiple function calls they will be chained together with AND between them:

      - - $this->db->like('title', 'match');
      - $this->db->like('body', 'match'); -

      - // WHERE title LIKE '%match%' AND body LIKE '%match%       - If you want to control where the wildcard (%) is placed, you can use an optional third argument. Your options are 'before', 'after' and 'both' (which is the default). - $this->db->like('title', 'match', 'before'); -
      - // Produces: WHERE title LIKE '%match'
      -
      - $this->db->like('title', 'match', 'after');
      -// Produces: WHERE title LIKE 'match%'
      -
      - $this->db->like('title', 'match', 'both');
      -// Produces: WHERE title LIKE '%match%'
      2. - -
    2. Associative array method: - - - $array = array('title' => $match, 'page1' => $match, 'page2' => $match);

      - - $this->db->like($array); -

      // WHERE title LIKE '%match%' AND page1 LIKE '%match%' AND page2 LIKE '%match%'
      3. -
    - - -

    $this->db->or_like();

    -

    This function is identical to the one above, except that multiple instances are joined by OR:

    - - -$this->db->like('title', 'match');
    -$this->db->or_like('body', $match); -
    -
    // WHERE title LIKE '%match%' OR body LIKE '%match%'     - - - - -

    Note: or_like() was formerly known as orlike(), which has been deprecated.

    -

    $this->db->not_like();

    -

    This function is identical to like(), except that it generates NOT LIKE statements:

    - $this->db->not_like('title', 'match');
    -
    -// WHERE title NOT LIKE '%match%     -

    $this->db->or_not_like();

    -

    This function is identical to not_like(), except that multiple instances are joined by OR:

    - $this->db->like('title', 'match');
    -$this->db->or_not_like('body', 'match');
    -
    -// WHERE title LIKE '%match% OR body NOT LIKE '%match%'     -

    $this->db->group_by();

    -

    Permits you to write the GROUP BY portion of your query:

    - -$this->db->group_by("title"); -

    // Produces: GROUP BY title -     - -

    You can also pass an array of multiple values as well:

    - -$this->db->group_by(array("title", "date")); -
    -
    // Produces: GROUP BY title, date     - -

    Note: group_by() was formerly known as groupby(), which has been deprecated.

    - -

    $this->db->distinct();
    -

    -

    Adds the "DISTINCT" keyword to a query

    -

    $this->db->distinct();
    - $this->db->get('table');
    -
    - // Produces: SELECT DISTINCT * FROM table

    -

    $this->db->having();

    -

    Permits you to write the HAVING portion of your query. There are 2 possible syntaxe, 1 argument or 2:

    - -$this->db->having('user_id = 45'); -
    -// Produces: HAVING user_id = 45
    -
    -$this->db->having('user_id', 45);
    -// Produces: HAVING user_id = 45
    -
    -     - -

    You can also pass an array of multiple values as well:

    - - -

    $this->db->having(array('title =' => 'My Title', 'id <' => $id));
    -
    - // Produces: HAVING title = 'My Title', id < 45

    -

    If you are using a database that CodeIgniter escapes queries for, you can prevent escaping content by passing an optional third argument, and setting it to FALSE.

    -

    $this->db->having('user_id', 45);
    -// Produces: HAVING `user_id` = 45 in some databases such as MySQL -
    - $this->db->having('user_id', 45, FALSE);
    -// Produces: HAVING user_id = 45

    -

    $this->db->or_having();

    -

    Identical to having(), only separates multiple clauses with "OR".

    -

    $this->db->order_by();

    -

    Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. -The second parameter lets you set the direction of the result. Options are asc or desc, or random.

    - -$this->db->order_by("title", "desc"); -
    -
    // Produces: ORDER BY title DESC -     - -

    You can also pass your own string in the first parameter:

    - -$this->db->order_by('title desc, name asc'); -
    -
    // Produces: ORDER BY title DESC, name ASC -     - -

    Or multiple function calls can be made if you need multiple fields.

    - -

    $this->db->order_by("title", "desc");
    - $this->db->order_by("name", "asc");
    -
    - // Produces: ORDER BY title DESC, name ASC -

    -

    Note: order_by() was formerly known as orderby(), which has been deprecated.

    -

    Note: random ordering is not currently supported in Oracle or MSSQL drivers. These will default to 'ASC'.

    -

    $this->db->limit();

    -

    Lets you limit the number of rows you would like returned by the query:

    - - -$this->db->limit(10);
    -
    -// Produces: LIMIT 10     - - -

    The second parameter lets you set a result offset.

    - - -$this->db->limit(10, 20);
    -
    -// Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)     - - -

    $this->db->count_all_results();

    - -

    Permits you to determine the number of rows in a particular Active Record query. Queries will accept Active Record restrictors such as where(), or_where(), like(), or_like(), etc. Example:

    -echo $this->db->count_all_results('my_table');
    - -// Produces an integer, like 25
    -
    -$this->db->like('title', 'match');
    -$this->db->from('my_table');
    -echo $this->db->count_all_results();
    -// Produces an integer, like 17     - -

    $this->db->count_all();

    - -

    Permits you to determine the number of rows in a particular table. Submit the table name in the first parameter. Example:

    - -echo $this->db->count_all('my_table');
    -
    -// Produces an integer, like 25     - - - -  -

    Inserting Data

    - -

    $this->db->insert();

    -

    Generates an insert string based on the data you supply, and runs the query. You can either pass an -array or an object to the function. Here is an example using an array:

    - - -$data = array(
    -               'title' => 'My title' ,
    -               'name' => 'My Name' ,
    -               'date' => 'My date'
    -            );
    -
    -$this->db->insert('mytable', $data); -

    -// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')     - -

    The first parameter will contain the table name, the second is an associative array of values.

    - -

    Here is an example using an object:

    - - -/*
    -    class Myclass {
    -        var $title = 'My Title';
    -        var $content = 'My Content';
    -        var $date = 'My Date';
    -    }
    -*/
    -
    -$object = new Myclass;
    -
    -$this->db->insert('mytable', $object); -

    -// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')     - -

    The first parameter will contain the table name, the second is an associative array of values.

    - -

    Note: All values are escaped automatically producing safer queries.

    - - - - -

    $this->db->set();

    -

    This function enables you to set values for inserts or updates.

    - -

    It can be used instead of passing a data array directly to the insert or update functions:

    - -$this->db->set('name', $name); -
    -$this->db->insert('mytable'); -

    -// Produces: INSERT INTO mytable (name) VALUES ('{$name}')     - -

    If you use multiple function called they will be assembled properly based on whether you are doing an insert or an update:

    - -$this->db->set('name', $name);
    -$this->db->set('title', $title);
    -$this->db->set('status', $status);
    -$this->db->insert('mytable');     -

    set() will also accept an optional third parameter ($escape), that will prevent data from being escaped if set to FALSE. To illustrate the difference, here is set() used both with and without the escape parameter.

    -

    $this->db->set('field', 'field+1', FALSE);
    - $this->db->insert('mytable');
    - // gives INSERT INTO mytable (field) VALUES (field+1)
    -
    - $this->db->set('field', 'field+1');
    - $this->db->insert('mytable');
    - // gives INSERT INTO mytable (field) VALUES ('field+1')

    -

    You can also pass an associative array to this function:

    - -$array = array('name' => $name, 'title' => $title, 'status' => $status);

    - -$this->db->set($array);
    -$this->db->insert('mytable'); -     - -

    Or an object:

    - - - -/*
    -    class Myclass {
    -        var $title = 'My Title';
    -        var $content = 'My Content';
    -        var $date = 'My Date';
    -    }
    -*/
    -
    -$object = new Myclass;
    -
    -$this->db->set($object);
    -$this->db->insert('mytable'); -     - - - -  -

    Updating Data

    - -

    $this->db->update();

    -

    Generates an update string and runs the query based on the data you supply. You can pass an -array or an object to the function. Here is an example using -an array:

    - - -$data = array(
    -               'title' => $title,
    -               'name' => $name,
    -               'date' => $date
    -            );
    -
    -$this->db->where('id', $id);
    -$this->db->update('mytable', $data); -

    -// Produces:
    -// UPDATE mytable
    -// SET title = '{$title}', name = '{$name}', date = '{$date}'
    -// WHERE id = $id     - -

    Or you can supply an object:

    - - -/*
    -    class Myclass {
    -        var $title = 'My Title';
    -        var $content = 'My Content';
    -        var $date = 'My Date';
    -    }
    -*/
    -
    -$object = new Myclass;
    -
    -$this->db->where('id', $id);
    -$this->db->update('mytable', $object); -
    -
    -// Produces:
    -// UPDATE mytable
    -// SET title = '{$title}', name = '{$name}', date = '{$date}'
    -// WHERE id = $id     - - - -

    Note: All values are escaped automatically producing safer queries.

    - -

    You'll notice the use of the $this->db->where() function, enabling you to set the WHERE clause. -You can optionally pass this information directly into the update function as a string:

    - -$this->db->update('mytable', $data, "id = 4"); - -

    Or as an array:

    - -$this->db->update('mytable', $data, array('id' => $id)); - -

    You may also use the $this->db->set() function described above when performing updates.

    - - -  -

    Deleting Data

    - - - -

    $this->db->delete();

    -

    Generates a delete SQL string and runs the query.

    - - -$this->db->delete('mytable', array('id' => $id)); -

    -// Produces:
    -// DELETE FROM mytable
    -// WHERE id = $id     - -

    The first parameter is the table name, the second is the where clause. You can also use the where() or or_where() functions instead of passing -the data to the second parameter of the function:

    - -

    $this->db->where('id', $id);
    - $this->db->delete('mytable');
    -
    - // Produces:
    - // DELETE FROM mytable
    - // WHERE id = $id

    -

    An array of table names can be passed into delete() if you would like to delete data from more then 1 table.

    -

    $tables = array('table1', 'table2', 'table3');
    -$this->db->where('id', '5');
    -$this->db->delete($tables);

    -

    If you want to delete all data from a table, you can use the truncate() function, or empty_table().

    -

    $this->db->empty_table();

    -

    Generates a delete SQL string and runs the query. $this->db->empty_table('mytable');
    -
    -// Produces
    -// DELETE FROM mytable

    -

    $this->db->truncate();

    -

    Generates a truncate SQL string and runs the query.

    - $this->db->from('mytable');
    -$this->db->truncate();
    -// or
    -$this->db->truncate('mytable');
    -
    -// Produce:
    -// TRUNCATE mytable
    -     -

    Note: If the TRUNCATE command isn't available, truncate() will execute as "DELETE FROM table".

    - -

     Method Chaining

    - -

    Method chaining allows you to simplify your syntax by connecting multiple functions. Consider this example:

    - - -$this->db->select('title')->from('mytable')->where('id', $id)->limit(10, 20);
    -
    -$query = $this->db->get();     - -

    Note: Method chaining only works with PHP 5.

    - -

     

    - -

     Active Record Caching

    - -

    While not "true" caching, Active Record enables you to save (or "cache") certain parts of your queries for reuse at a later point in your script's execution. Normally, when an Active Record call is completed, all stored information is reset for the next call. With caching, you can prevent this reset, and reuse information easily.

    - -

    Cached calls are cumulative. If you make 2 cached select() calls, and then 2 uncached select() calls, this will result in 4 select() calls. There are three Caching functions available:

    - -

    $this->db->start_cache()

    - -

    This function must be called to begin caching. All Active Record queries of the correct type (see below for supported queries) are stored for later use.

    - -

    $this->db->stop_cache()

    - -

    This function can be called to stop caching.

    - -

    $this->db->flush_cache()

    - -

    This function deletes all items from the Active Record cache.

    - -

    Here's a usage example:

    - -

    $this->db->start_cache();
    -$this->db->select('field1');
    -$this->db->stop_cache();

    -$this->db->get('tablename');
    -
    -//Generates: SELECT `field1` FROM (`tablename`)
    -
    -$this->db->select('field2');
    -$this->db->get('tablename');
    -
    -//Generates: SELECT `field1`, `field2` FROM (`tablename`)
    -
    -$this->db->flush_cache();
    -
    -$this->db->select('field2');
    -$this->db->get('tablename');
    -
    -//Generates: SELECT `field2` FROM (`tablename`)

    - -

    Note: The following statements can be cached: select, from, join, where, like, groupby, having, orderby, set

    -

     

    -
    - - - - - - + + + + + +Active Record : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + +
    + +

    Active Record Class

    + +

    CodeIgniter uses a modified version of the Active Record Database Pattern. +This pattern allows information to be retrieved, inserted, and updated in your database with minimal scripting. +In some cases only one or two lines of code are necessary to perform a database action. +CodeIgniter does not require that each database table be its own class file. It instead provides a more simplified interface.

    + +

    Beyond simplicity, a major benefit to using the Active Record features is that it allows you to create database independent applications, since the query syntax +is generated by each database adapter. It also allows for safer queries, since the values are escaped automatically by the system.

    + +

    Note: If you intend to write your own queries you can disable this class in your database config file, allowing the core database library and adapter to utilize fewer resources.

    + + + +

     Selecting Data

    + +

    The following functions allow you to build SQL SELECT statements.

    + +

    Note: If you are using PHP 5 you can use method chaining for more compact syntax. This is described at the end of the page.

    + + +

    $this->db->get();

    + +

    Runs the selection query and returns the result. Can be used by itself to retrieve all records from a table:

    + +$query = $this->db->get('mytable');
    +
    +// Produces: SELECT * FROM mytable     + +

    The second and third parameters enable you to set a limit and offset clause:

    + +$query = $this->db->get('mytable', 10, 20);
    +
    +// Produces: SELECT * FROM mytable LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)     + +

    You'll notice that the above function is assigned to a variable named $query, which can be used to show the results:

    + +$query = $this->db->get('mytable');
    +
    +foreach ($query->result() as $row)
    +{
    +    echo $row->title;
    +}     + +

    Please visit the result functions page for a full discussion regarding result generation.

    + + +

    $this->db->get_where();

    + +

    Identical to the above function except that it permits you to add a "where" clause in the second parameter, +instead of using the db->where() function:

    + +$query = $this->db->get_where('mytable', array('id' => $id), $limit, $offset); + +

    Please read the about the where function below for more information.

    +

    Note: get_where() was formerly known as getwhere(), which has been deprecated

    + +

    $this->db->select();

    +

    Permits you to write the SELECT portion of your query:

    +

    +$this->db->select('title, content, date');
    +
    +$query = $this->db->get('mytable');
    +
    +// Produces: SELECT title, content, date FROM mytable

    +

    Note: If you are selecting all (*) from a table you do not need to use this function. When omitted, CodeIgniter assumes you wish to SELECT *

    + +

    $this->db->select() accepts an optional second parameter. If you set it to FALSE, CodeIgniter will not try to protect your field or table names with backticks. This is useful if you need a compound select statement.

    +

    $this->db->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4') AS amount_paid', FALSE);
    +$query = $this->db->get('mytable');
    +

    +

    $this->db->select_max();

    +

    Writes a "SELECT MAX(field)" portion for your query. You can optionally include a second parameter to rename the resulting field.

    +

    +$this->db->select_max('age');
    +$query = $this->db->get('members');
    + +// Produces: SELECT MAX(age) as age FROM members
    +
    +$this->db->select_max('age', 'member_age');
    +$query = $this->db->get('members');
    +// Produces: SELECT MAX(age) as member_age FROM members

    + +

    $this->db->select_min();

    +

    Writes a "SELECT MIN(field)" portion for your query. As with select_max(), You can optionally include a second parameter to rename the resulting field.

    +

    +$this->db->select_min('age');
    +$query = $this->db->get('members');
    +// Produces: SELECT MIN(age) as age FROM members

    + +

    $this->db->select_avg();

    +

    Writes a "SELECT AVG(field)" portion for your query. As with select_max(), You can optionally include a second parameter to rename the resulting field.

    +

    +$this->db->select_avg('age');
    +$query = $this->db->get('members');
    +// Produces: SELECT AVG(age) as age FROM members

    + +

    $this->db->select_sum();

    +

    Writes a "SELECT SUM(field)" portion for your query. As with select_max(), You can optionally include a second parameter to rename the resulting field.

    +

    +$this->db->select_sum('age');
    +$query = $this->db->get('members');
    +// Produces: SELECT SUM(age) as age FROM members

    + +

    $this->db->from();

    + +

    Permits you to write the FROM portion of your query:

    + + +$this->db->select('title, content, date');
    +$this->db->from('mytable');
    +
    +$query = $this->db->get();
    +
    +// Produces: SELECT title, content, date FROM mytable     + +

    Note: As shown earlier, the FROM portion of your query can be specified in the $this->db->get() function, so use whichever method +you prefer.

    + +

    $this->db->join();

    + +

    Permits you to write the JOIN portion of your query:

    + + +$this->db->select('*');
    +$this->db->from('blogs');
    +$this->db->join('comments', 'comments.id = blogs.id');
    +
    +$query = $this->db->get();
    +
    +// Produces:
    +// SELECT * FROM blogs
    +// JOIN comments ON comments.id = blogs.id
    +     + +

    Multiple function calls can be made if you need several joins in one query.

    + +

    If you need something other than a natural JOIN you can specify it via the third parameter of the function. +Options are: left, right, outer, inner, left outer, and right outer.

    + + +$this->db->join('comments', 'comments.id = blogs.id', 'left');
    +
    +// Produces: LEFT JOIN comments ON comments.id = blogs.id     + + + + + +

    $this->db->where();

    +

    This function enables you to set WHERE clauses using one of four methods:

    + +

    Note: All values passed to this function are escaped automatically, producing safer queries.

    + +
      +
    1. Simple key/value method: + + $this->db->where('name', $name); +

      // Produces: WHERE name = 'Joe'       + +

      Notice that the equal sign is added for you.

      + +

      If you use multiple function calls they will be chained together with AND between them:

      + + $this->db->where('name', $name);
      + $this->db->where('title', $title);
      + $this->db->where('status', $status); +

      // WHERE name 'Joe' AND title = 'boss' AND status = 'active'
      2. + +
    2. Custom key/value method: + +

      You can include an operator in the first parameter in order to control the comparison:

      + + $this->db->where('name !=', $name);
      + $this->db->where('id <', $id); +

      // Produces: WHERE name != 'Joe' AND id < 45
      3. +
    3. Associative array method: + + + + $array = array('name' => $name, 'title' => $title, 'status' => $status);

      + + $this->db->where($array); +

      // Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'       + +

      You can include your own operators using this method as well:

      + + + $array = array('name !=' => $name, 'id <' => $id, 'date >' => $date);

      + + $this->db->where($array);
      4. +
    4. Custom string: + +

      You can write your own clauses manually:

      + + + $where = "name='Joe' AND status='boss' OR status='active'";

      + $this->db->where($where);
      5. +
    + + +

    $this->db->where() accepts an optional third parameter. If you set it to FALSE, CodeIgniter will not try to protect your field or table names with backticks.

    +

    $this->db->where('MATCH (field) AGAINST ("value")', NULL, FALSE);
    +

    +

    $this->db->or_where();

    +

    This function is identical to the one above, except that multiple instances are joined by OR:

    + + +$this->db->where('name !=', $name);
    +$this->db->or_where('id >', $id); +
    +
    // Produces: WHERE name != 'Joe' OR id > 50     + +

    Note: or_where() was formerly known as orwhere(), which has been deprecated.

    + + +

    $this->db->where_in();

    +

    Generates a WHERE field IN ('item', 'item') SQL query joined with AND if appropriate

    +

    + $names = array('Frank', 'Todd', 'James');
    + $this->db->where_in('username', $names);
    + // Produces: WHERE username IN ('Frank', 'Todd', 'James')

    + +

    $this->db->or_where_in();

    +

    Generates a WHERE field IN ('item', 'item') SQL query joined with OR if appropriate

    +

    + $names = array('Frank', 'Todd', 'James');
    + $this->db->or_where_in('username', $names);
    + // Produces: OR username IN ('Frank', 'Todd', 'James')

    + +

    $this->db->where_not_in();

    +

    Generates a WHERE field NOT IN ('item', 'item') SQL query joined with AND if appropriate

    +

    + $names = array('Frank', 'Todd', 'James');
    + $this->db->where_not_in('username', $names);
    + // Produces: WHERE username NOT IN ('Frank', 'Todd', 'James')

    + +

    $this->db->or_where_not_in();

    +

    Generates a WHERE field NOT IN ('item', 'item') SQL query joined with OR if appropriate

    +

    + $names = array('Frank', 'Todd', 'James');
    + $this->db->or_where_not_in('username', $names);
    + // Produces: OR username NOT IN ('Frank', 'Todd', 'James')

    + +

    $this->db->like();

    +

    This function enables you to generate LIKE clauses, useful for doing searches.

    + +

    Note: All values passed to this function are escaped automatically.

    + + +
      +
    1. Simple key/value method: + + $this->db->like('title', 'match'); +

      // Produces: WHERE title LIKE '%match%'       + +

      If you use multiple function calls they will be chained together with AND between them:

      + + $this->db->like('title', 'match');
      + $this->db->like('body', 'match'); +

      + // WHERE title LIKE '%match%' AND body LIKE '%match%       + If you want to control where the wildcard (%) is placed, you can use an optional third argument. Your options are 'before', 'after' and 'both' (which is the default). + $this->db->like('title', 'match', 'before'); +
      + // Produces: WHERE title LIKE '%match'
      +
      + $this->db->like('title', 'match', 'after');
      +// Produces: WHERE title LIKE 'match%'
      +
      + $this->db->like('title', 'match', 'both');
      +// Produces: WHERE title LIKE '%match%'
      2. + +
    2. Associative array method: + + + $array = array('title' => $match, 'page1' => $match, 'page2' => $match);

      + + $this->db->like($array); +

      // WHERE title LIKE '%match%' AND page1 LIKE '%match%' AND page2 LIKE '%match%'
      3. +
    + + +

    $this->db->or_like();

    +

    This function is identical to the one above, except that multiple instances are joined by OR:

    + + +$this->db->like('title', 'match');
    +$this->db->or_like('body', $match); +
    +
    // WHERE title LIKE '%match%' OR body LIKE '%match%'     + + + + +

    Note: or_like() was formerly known as orlike(), which has been deprecated.

    +

    $this->db->not_like();

    +

    This function is identical to like(), except that it generates NOT LIKE statements:

    + $this->db->not_like('title', 'match');
    +
    +// WHERE title NOT LIKE '%match%     +

    $this->db->or_not_like();

    +

    This function is identical to not_like(), except that multiple instances are joined by OR:

    + $this->db->like('title', 'match');
    +$this->db->or_not_like('body', 'match');
    +
    +// WHERE title LIKE '%match% OR body NOT LIKE '%match%'     +

    $this->db->group_by();

    +

    Permits you to write the GROUP BY portion of your query:

    + +$this->db->group_by("title"); +

    // Produces: GROUP BY title +     + +

    You can also pass an array of multiple values as well:

    + +$this->db->group_by(array("title", "date")); +
    +
    // Produces: GROUP BY title, date     + +

    Note: group_by() was formerly known as groupby(), which has been deprecated.

    + +

    $this->db->distinct();
    +

    +

    Adds the "DISTINCT" keyword to a query

    +

    $this->db->distinct();
    + $this->db->get('table');
    +
    + // Produces: SELECT DISTINCT * FROM table

    +

    $this->db->having();

    +

    Permits you to write the HAVING portion of your query. There are 2 possible syntaxe, 1 argument or 2:

    + +$this->db->having('user_id = 45'); +
    +// Produces: HAVING user_id = 45
    +
    +$this->db->having('user_id', 45);
    +// Produces: HAVING user_id = 45
    +
    +     + +

    You can also pass an array of multiple values as well:

    + + +

    $this->db->having(array('title =' => 'My Title', 'id <' => $id));
    +
    + // Produces: HAVING title = 'My Title', id < 45

    +

    If you are using a database that CodeIgniter escapes queries for, you can prevent escaping content by passing an optional third argument, and setting it to FALSE.

    +

    $this->db->having('user_id', 45);
    +// Produces: HAVING `user_id` = 45 in some databases such as MySQL +
    + $this->db->having('user_id', 45, FALSE);
    +// Produces: HAVING user_id = 45

    +

    $this->db->or_having();

    +

    Identical to having(), only separates multiple clauses with "OR".

    +

    $this->db->order_by();

    +

    Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. +The second parameter lets you set the direction of the result. Options are asc or desc, or random.

    + +$this->db->order_by("title", "desc"); +
    +
    // Produces: ORDER BY title DESC +     + +

    You can also pass your own string in the first parameter:

    + +$this->db->order_by('title desc, name asc'); +
    +
    // Produces: ORDER BY title DESC, name ASC +     + +

    Or multiple function calls can be made if you need multiple fields.

    + +

    $this->db->order_by("title", "desc");
    + $this->db->order_by("name", "asc");
    +
    + // Produces: ORDER BY title DESC, name ASC +

    +

    Note: order_by() was formerly known as orderby(), which has been deprecated.

    +

    Note: random ordering is not currently supported in Oracle or MSSQL drivers. These will default to 'ASC'.

    +

    $this->db->limit();

    +

    Lets you limit the number of rows you would like returned by the query:

    + + +$this->db->limit(10);
    +
    +// Produces: LIMIT 10     + + +

    The second parameter lets you set a result offset.

    + + +$this->db->limit(10, 20);
    +
    +// Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)     + + +

    $this->db->count_all_results();

    + +

    Permits you to determine the number of rows in a particular Active Record query. Queries will accept Active Record restrictors such as where(), or_where(), like(), or_like(), etc. Example:

    +echo $this->db->count_all_results('my_table');
    + +// Produces an integer, like 25
    +
    +$this->db->like('title', 'match');
    +$this->db->from('my_table');
    +echo $this->db->count_all_results();
    +// Produces an integer, like 17     + +

    $this->db->count_all();

    + +

    Permits you to determine the number of rows in a particular table. Submit the table name in the first parameter. Example:

    + +echo $this->db->count_all('my_table');
    +
    +// Produces an integer, like 25     + + + +  +

    Inserting Data

    + +

    $this->db->insert();

    +

    Generates an insert string based on the data you supply, and runs the query. You can either pass an +array or an object to the function. Here is an example using an array:

    + + +$data = array(
    +               'title' => 'My title' ,
    +               'name' => 'My Name' ,
    +               'date' => 'My date'
    +            );
    +
    +$this->db->insert('mytable', $data); +

    +// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')     + +

    The first parameter will contain the table name, the second is an associative array of values.

    + +

    Here is an example using an object:

    + + +/*
    +    class Myclass {
    +        var $title = 'My Title';
    +        var $content = 'My Content';
    +        var $date = 'My Date';
    +    }
    +*/
    +
    +$object = new Myclass;
    +
    +$this->db->insert('mytable', $object); +

    +// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')     + +

    The first parameter will contain the table name, the second is an associative array of values.

    + +

    Note: All values are escaped automatically producing safer queries.

    + + + + +

    $this->db->set();

    +

    This function enables you to set values for inserts or updates.

    + +

    It can be used instead of passing a data array directly to the insert or update functions:

    + +$this->db->set('name', $name); +
    +$this->db->insert('mytable'); +

    +// Produces: INSERT INTO mytable (name) VALUES ('{$name}')     + +

    If you use multiple function called they will be assembled properly based on whether you are doing an insert or an update:

    + +$this->db->set('name', $name);
    +$this->db->set('title', $title);
    +$this->db->set('status', $status);
    +$this->db->insert('mytable');     +

    set() will also accept an optional third parameter ($escape), that will prevent data from being escaped if set to FALSE. To illustrate the difference, here is set() used both with and without the escape parameter.

    +

    $this->db->set('field', 'field+1', FALSE);
    + $this->db->insert('mytable');
    + // gives INSERT INTO mytable (field) VALUES (field+1)
    +
    + $this->db->set('field', 'field+1');
    + $this->db->insert('mytable');
    + // gives INSERT INTO mytable (field) VALUES ('field+1')

    +

    You can also pass an associative array to this function:

    + +$array = array('name' => $name, 'title' => $title, 'status' => $status);

    + +$this->db->set($array);
    +$this->db->insert('mytable'); +     + +

    Or an object:

    + + + +/*
    +    class Myclass {
    +        var $title = 'My Title';
    +        var $content = 'My Content';
    +        var $date = 'My Date';
    +    }
    +*/
    +
    +$object = new Myclass;
    +
    +$this->db->set($object);
    +$this->db->insert('mytable'); +     + + + +  +

    Updating Data

    + +

    $this->db->update();

    +

    Generates an update string and runs the query based on the data you supply. You can pass an +array or an object to the function. Here is an example using +an array:

    + + +$data = array(
    +               'title' => $title,
    +               'name' => $name,
    +               'date' => $date
    +            );
    +
    +$this->db->where('id', $id);
    +$this->db->update('mytable', $data); +

    +// Produces:
    +// UPDATE mytable
    +// SET title = '{$title}', name = '{$name}', date = '{$date}'
    +// WHERE id = $id     + +

    Or you can supply an object:

    + + +/*
    +    class Myclass {
    +        var $title = 'My Title';
    +        var $content = 'My Content';
    +        var $date = 'My Date';
    +    }
    +*/
    +
    +$object = new Myclass;
    +
    +$this->db->where('id', $id);
    +$this->db->update('mytable', $object); +
    +
    +// Produces:
    +// UPDATE mytable
    +// SET title = '{$title}', name = '{$name}', date = '{$date}'
    +// WHERE id = $id     + + + +

    Note: All values are escaped automatically producing safer queries.

    + +

    You'll notice the use of the $this->db->where() function, enabling you to set the WHERE clause. +You can optionally pass this information directly into the update function as a string:

    + +$this->db->update('mytable', $data, "id = 4"); + +

    Or as an array:

    + +$this->db->update('mytable', $data, array('id' => $id)); + +

    You may also use the $this->db->set() function described above when performing updates.

    + + +  +

    Deleting Data

    + + + +

    $this->db->delete();

    +

    Generates a delete SQL string and runs the query.

    + + +$this->db->delete('mytable', array('id' => $id)); +

    +// Produces:
    +// DELETE FROM mytable
    +// WHERE id = $id     + +

    The first parameter is the table name, the second is the where clause. You can also use the where() or or_where() functions instead of passing +the data to the second parameter of the function:

    + +

    $this->db->where('id', $id);
    + $this->db->delete('mytable');
    +
    + // Produces:
    + // DELETE FROM mytable
    + // WHERE id = $id

    +

    An array of table names can be passed into delete() if you would like to delete data from more then 1 table.

    +

    $tables = array('table1', 'table2', 'table3');
    +$this->db->where('id', '5');
    +$this->db->delete($tables);

    +

    If you want to delete all data from a table, you can use the truncate() function, or empty_table().

    +

    $this->db->empty_table();

    +

    Generates a delete SQL string and runs the query. $this->db->empty_table('mytable');
    +
    +// Produces
    +// DELETE FROM mytable

    +

    $this->db->truncate();

    +

    Generates a truncate SQL string and runs the query.

    + $this->db->from('mytable');
    +$this->db->truncate();
    +// or
    +$this->db->truncate('mytable');
    +
    +// Produce:
    +// TRUNCATE mytable
    +     +

    Note: If the TRUNCATE command isn't available, truncate() will execute as "DELETE FROM table".

    + +

     Method Chaining

    + +

    Method chaining allows you to simplify your syntax by connecting multiple functions. Consider this example:

    + + +$this->db->select('title')->from('mytable')->where('id', $id)->limit(10, 20);
    +
    +$query = $this->db->get();     + +

    Note: Method chaining only works with PHP 5.

    + +

     

    + +

     Active Record Caching

    + +

    While not "true" caching, Active Record enables you to save (or "cache") certain parts of your queries for reuse at a later point in your script's execution. Normally, when an Active Record call is completed, all stored information is reset for the next call. With caching, you can prevent this reset, and reuse information easily.

    + +

    Cached calls are cumulative. If you make 2 cached select() calls, and then 2 uncached select() calls, this will result in 4 select() calls. There are three Caching functions available:

    + +

    $this->db->start_cache()

    + +

    This function must be called to begin caching. All Active Record queries of the correct type (see below for supported queries) are stored for later use.

    + +

    $this->db->stop_cache()

    + +

    This function can be called to stop caching.

    + +

    $this->db->flush_cache()

    + +

    This function deletes all items from the Active Record cache.

    + +

    Here's a usage example:

    + +

    $this->db->start_cache();
    +$this->db->select('field1');
    +$this->db->stop_cache();

    +$this->db->get('tablename');
    +
    +//Generates: SELECT `field1` FROM (`tablename`)
    +
    +$this->db->select('field2');
    +$this->db->get('tablename');
    +
    +//Generates: SELECT `field1`, `field2` FROM (`tablename`)
    +
    +$this->db->flush_cache();
    +
    +$this->db->select('field2');
    +$this->db->get('tablename');
    +
    +//Generates: SELECT `field2` FROM (`tablename`)

    + +

    Note: The following statements can be cached: select, from, join, where, like, groupby, having, orderby, set

    +

     

    +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 9016ffe0..485d7f4c 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -1,220 +1,220 @@ - - - - - -Database Caching Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - -

    Database Caching Class

    - -

    The Database Caching Class permits you to cache your queries as text files for reduced database load.

    - -

    Important:  This class is initialized automatically by the database driver -when caching is enabled. Do NOT load this class manually.

    - -Also note:  Not all query result functions are available when you use caching. Please read this page carefully.

    - -

    Enabling Caching

    - -

    Caching is enabled in three steps:

    - -
      -
    • Create a writable directory on your server where the cache files can be stored.
      • -
    • Set the path to your cache folder in your application/config/database.php file.
      • -
    • Enable the caching feature, either globally by setting the preference in your application/config/database.php file, or manually as described below.
      • -
    - -

    Once enabled, caching will happen automatically whenever a page is loaded that contains database queries.

    - - -

    How Does Caching Work?

    - -

    CodeIgniter's query caching system happens dynamically when your pages are viewed. -When caching is enabled, the first time a web page is loaded, the query result object will -be serialized and stored in a text file on your server. The next time the page is loaded the cache file will be used instead of -accessing your database. Your database usage can effectively be reduced to zero for any pages that have been cached.

    - -

    Only read-type (SELECT) queries can be cached, since these are the only type of queries that produce a result. -Write-type (INSERT, UPDATE, etc.) queries, since they don't generate a result, will not be cached by the system.

    - -

    Cache files DO NOT expire. Any queries that have been cached will remain cached until you delete them. The caching system -permits you clear caches associated with individual pages, or you can delete the entire collection of cache files. -Typically you'll want to use the housekeeping functions described below to delete cache files after certain -events take place, like when you've added new information to your database.

    - -

    Will Caching Improve Your Site's Performance?

    - -

    Getting a performance gain as a result of caching depends on many factors. -If you have a highly optimized database under very little load, you probably won't see a performance boost. -If your database is under heavy use you probably will see an improved response, assuming your file-system is not -overly taxed. Remember that caching simply changes how your information is retrieved, shifting it from being a database -operation to a file-system one.

    - -

    In some clustered server environments, for example, caching may be detrimental since file-system operations are so intense. -On single servers in shared environments, caching will probably be beneficial. Unfortunately there is no -single answer to the question of whether you should cache your database. It really depends on your situation.

    - -

    How are Cache Files Stored?

    - -

    CodeIgniter places the result of EACH query into its own cache file. Sets of cache files are further organized into -sub-folders corresponding to your controller functions. To be precise, the sub-folders are named identically to the -first two segments of your URI (the controller class name and function name).

    - -

    For example, let's say you have a controller called blog with a function called comments that -contains three queries. The caching system will create a cache folder -called blog+comments, into which it will write three cache files.

    - -

    If you use dynamic queries that change based on information in your URI (when using pagination, for example), each instance of -the query will produce its own cache file. It's possible, therefore, to end up with many times more cache files than you have -queries.

    - - -

    Managing your Cache Files

    - -

    Since cache files do not expire, you'll need to build deletion routines into your application. For example, let's say you have a blog -that allows user commenting. Whenever a new comment is submitted you'll want to delete the cache files associated with the -controller function that serves up your comments. You'll find two delete functions described below that help you -clear data.

    - - -

    Not All Database Functions Work with Caching

    - -

    Lastly, we need to point out that the result object that is cached is a simplified version of the full result object. For that reason, -some of the query result functions are not available for use.

    - -

    The following functions ARE NOT available when using a cached result object:

    - -
      -
    • num_fields()
      • -
    • field_names()
      • -
    • field_data()
      • -
    • free_result()
      • -
    - -

    Also, the two database resources (result_id and conn_id) are not available when caching, since result resources only -pertain to run-time operations.

    - - -
    - -

    Function Reference

    - - - -

    $this->db->cache_on()  /   $this->db->cache_off()

    - -

    Manually enables/disables caching. This can be useful if you want to -keep certain queries from being cached. Example:

    - - -// Turn caching on
    -$this->db->cache_on();
    -$query = $this->db->query("SELECT * FROM mytable");
    -
    -// Turn caching off for this one query
    -$this->db->cache_off();
    -$query = $this->db->query("SELECT * FROM members WHERE member_id = '$current_user'");
    -
    -// Turn caching back on
    -$this->db->cache_on();
    -$query = $this->db->query("SELECT * FROM another_table"); -     - - -

    $this->db->cache_delete()

    - -

    Deletes the cache files associated with a particular page. This is useful if you need to clear caching after you update your database.

    - -

    The caching system saves your cache files to folders that correspond to the URI of the page you are viewing. For example, if you are viewing -a page at example.com/index.php/blog/comments, the caching system will put all cache files associated with it in a folder -called blog+comments. To delete those particular cache files you will use:

    - -$this->db->cache_delete('blog', 'comments'); - -

    If you do not use any parameters the current URI will be used when determining what should be cleared.

    - - -

    $this->db->cache_delete_all()

    - -

    Clears all existing cache files. Example:

    - -$this->db->cache_delete_all(); - - - - - - - - - - -
    - - - - - - + + + + + +Database Caching Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + +

    Database Caching Class

    + +

    The Database Caching Class permits you to cache your queries as text files for reduced database load.

    + +

    Important:  This class is initialized automatically by the database driver +when caching is enabled. Do NOT load this class manually.

    + +Also note:  Not all query result functions are available when you use caching. Please read this page carefully.

    + +

    Enabling Caching

    + +

    Caching is enabled in three steps:

    + +
      +
    • Create a writable directory on your server where the cache files can be stored.
      • +
    • Set the path to your cache folder in your application/config/database.php file.
      • +
    • Enable the caching feature, either globally by setting the preference in your application/config/database.php file, or manually as described below.
      • +
    + +

    Once enabled, caching will happen automatically whenever a page is loaded that contains database queries.

    + + +

    How Does Caching Work?

    + +

    CodeIgniter's query caching system happens dynamically when your pages are viewed. +When caching is enabled, the first time a web page is loaded, the query result object will +be serialized and stored in a text file on your server. The next time the page is loaded the cache file will be used instead of +accessing your database. Your database usage can effectively be reduced to zero for any pages that have been cached.

    + +

    Only read-type (SELECT) queries can be cached, since these are the only type of queries that produce a result. +Write-type (INSERT, UPDATE, etc.) queries, since they don't generate a result, will not be cached by the system.

    + +

    Cache files DO NOT expire. Any queries that have been cached will remain cached until you delete them. The caching system +permits you clear caches associated with individual pages, or you can delete the entire collection of cache files. +Typically you'll want to use the housekeeping functions described below to delete cache files after certain +events take place, like when you've added new information to your database.

    + +

    Will Caching Improve Your Site's Performance?

    + +

    Getting a performance gain as a result of caching depends on many factors. +If you have a highly optimized database under very little load, you probably won't see a performance boost. +If your database is under heavy use you probably will see an improved response, assuming your file-system is not +overly taxed. Remember that caching simply changes how your information is retrieved, shifting it from being a database +operation to a file-system one.

    + +

    In some clustered server environments, for example, caching may be detrimental since file-system operations are so intense. +On single servers in shared environments, caching will probably be beneficial. Unfortunately there is no +single answer to the question of whether you should cache your database. It really depends on your situation.

    + +

    How are Cache Files Stored?

    + +

    CodeIgniter places the result of EACH query into its own cache file. Sets of cache files are further organized into +sub-folders corresponding to your controller functions. To be precise, the sub-folders are named identically to the +first two segments of your URI (the controller class name and function name).

    + +

    For example, let's say you have a controller called blog with a function called comments that +contains three queries. The caching system will create a cache folder +called blog+comments, into which it will write three cache files.

    + +

    If you use dynamic queries that change based on information in your URI (when using pagination, for example), each instance of +the query will produce its own cache file. It's possible, therefore, to end up with many times more cache files than you have +queries.

    + + +

    Managing your Cache Files

    + +

    Since cache files do not expire, you'll need to build deletion routines into your application. For example, let's say you have a blog +that allows user commenting. Whenever a new comment is submitted you'll want to delete the cache files associated with the +controller function that serves up your comments. You'll find two delete functions described below that help you +clear data.

    + + +

    Not All Database Functions Work with Caching

    + +

    Lastly, we need to point out that the result object that is cached is a simplified version of the full result object. For that reason, +some of the query result functions are not available for use.

    + +

    The following functions ARE NOT available when using a cached result object:

    + +
      +
    • num_fields()
      • +
    • field_names()
      • +
    • field_data()
      • +
    • free_result()
      • +
    + +

    Also, the two database resources (result_id and conn_id) are not available when caching, since result resources only +pertain to run-time operations.

    + + +
    + +

    Function Reference

    + + + +

    $this->db->cache_on()  /   $this->db->cache_off()

    + +

    Manually enables/disables caching. This can be useful if you want to +keep certain queries from being cached. Example:

    + + +// Turn caching on
    +$this->db->cache_on();
    +$query = $this->db->query("SELECT * FROM mytable");
    +
    +// Turn caching off for this one query
    +$this->db->cache_off();
    +$query = $this->db->query("SELECT * FROM members WHERE member_id = '$current_user'");
    +
    +// Turn caching back on
    +$this->db->cache_on();
    +$query = $this->db->query("SELECT * FROM another_table"); +     + + +

    $this->db->cache_delete()

    + +

    Deletes the cache files associated with a particular page. This is useful if you need to clear caching after you update your database.

    + +

    The caching system saves your cache files to folders that correspond to the URI of the page you are viewing. For example, if you are viewing +a page at example.com/index.php/blog/comments, the caching system will put all cache files associated with it in a folder +called blog+comments. To delete those particular cache files you will use:

    + +$this->db->cache_delete('blog', 'comments'); + +

    If you do not use any parameters the current URI will be used when determining what should be cleared.

    + + +

    $this->db->cache_delete_all()

    + +

    Clears all existing cache files. Example:

    + +$this->db->cache_delete_all(); + + + + + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 8ecccce2..ae940afa 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -1,118 +1,118 @@ - - - - - -Custom Function Calls : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - -

    Custom Function Calls

    - -

    $this->db->call_function();

    - -

    This function enables you to call PHP database functions that are not natively included in CodeIgniter, in a platform independent manner. -For example, lets say you want to call the mysql_get_client_info() function, which is not natively supported -by CodeIgniter. You could do so like this: -

    - -$this->db->call_function('get_client_info'); - -

    You must supply the name of the function, without the mysql_ prefix, in the first parameter. The prefix is added -automatically based on which database driver is currently being used. This permits you to run the same function on different database platforms. -Obviously not all function calls are identical between platforms, so there are limits to how useful this function can be in terms of portability.

    - -

    Any parameters needed by the function you are calling will be added to the second parameter.

    - -$this->db->call_function('some_function', $param1, $param2, etc..); - - -

    Often, you will either need to supply a database connection ID or a database result ID. The connection ID can be accessed using:

    - -$this->db->conn_id; - -

    The result ID can be accessed from within your result object, like this:

    - -$query = $this->db->query("SOME QUERY");
    -
    -$query->result_id;     - - - - - - - - - - - - - -
    - - - - - - + + + + + +Custom Function Calls : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + +

    Custom Function Calls

    + +

    $this->db->call_function();

    + +

    This function enables you to call PHP database functions that are not natively included in CodeIgniter, in a platform independent manner. +For example, lets say you want to call the mysql_get_client_info() function, which is not natively supported +by CodeIgniter. You could do so like this: +

    + +$this->db->call_function('get_client_info'); + +

    You must supply the name of the function, without the mysql_ prefix, in the first parameter. The prefix is added +automatically based on which database driver is currently being used. This permits you to run the same function on different database platforms. +Obviously not all function calls are identical between platforms, so there are limits to how useful this function can be in terms of portability.

    + +

    Any parameters needed by the function you are calling will be added to the second parameter.

    + +$this->db->call_function('some_function', $param1, $param2, etc..); + + +

    Often, you will either need to supply a database connection ID or a database result ID. The connection ID can be accessed using:

    + +$this->db->conn_id; + +

    The result ID can be accessed from within your result object, like this:

    + +$query = $this->db->query("SOME QUERY");
    +
    +$query->result_id;     + + + + + + + + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index f2da5808..c6991aaa 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -1,157 +1,157 @@ - - - - - -Database Configuration : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - - -

    Database Configuration

    - -

    CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.). -The config file is located at:

    - -

    application/config/database.php

    - -

    The config settings are stored in a multi-dimensional array with this prototype:

    - -$db['default']['hostname'] = "localhost";
    -$db['default']['username'] = "root";
    -$db['default']['password'] = "";
    -$db['default']['database'] = "database_name";
    -$db['default']['dbdriver'] = "mysql";
    -$db['default']['dbprefix'] = "";
    -$db['default']['pconnect'] = TRUE;
    -$db['default']['db_debug'] = FALSE;
    -$db['default']['cache_on'] = FALSE;
    -$db['default']['cachedir'] = "";
    -$db['default']['char_set'] = "utf8";
    -$db['default']['dbcollat'] = "utf8_general_ci";     - -

    The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store -multiple sets of connection values. If, for example, you run multiple environments (development, production, test, etc.) -under a single installation, you can set up a connection group for each, then switch between groups as needed. -For example, to set up a "test" environment you would do this:

    - -$db['test']['hostname'] = "localhost";
    -$db['test']['username'] = "root";
    -$db['test']['password'] = "";
    -$db['test']['database'] = "database_name";
    -$db['test']['dbdriver'] = "mysql";
    -$db['test']['dbprefix'] = "";
    -$db['test']['pconnect'] = TRUE;
    -$db['test']['db_debug'] = FALSE;
    -$db['test']['cache_on'] = FALSE;
    -$db['test']['cachedir'] = "";
    -$db['test']['char_set'] = "utf8";
    -$db['test']['dbcollat'] = "utf8_general_ci";     - - -

    Then, to globally tell the system to use that group you would set this variable located in the config file:

    - -$active_group = "test"; - -

    Note: The name "test" is arbitrary. It can be anything you want. By default we've used the word "default" -for the primary connection, but it too can be renamed to something more relevant to your project.

    - -

    Active Record

    - -

    The Active Record Class is globally enabled or disabled by setting the $active_record variable in the database configuration file to TRUE/FALSE (boolean). If you are not using the active record class, setting it to FALSE will utilize fewer resources when the database classes are initialized.

    - -$active_record = TRUE; - -

    Note: that some CodeIgniter classes such as Sessions require Active Records be enabled to access certain functionality.

    - -

    Explanation of Values:

    - -
      -
    • hostname - The hostname of your database server. Often this is "localhost".
      • -
    • 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, postgres, odbc, etc. Must be specified in lower case.
      • -
    • dbprefix - An optional table prefix which will added to the table name when running Active Record queries. This permits multiple CodeIgniter installations to share one database.
      • -
    • pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
      • -
    • db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
      • -
    • cache_on - TRUE/FALSE (boolean) - Whether database query caching is enabled, see also Database Caching Class.
      • -
    • cachedir - The absolute server path to your database query cache directory.
      • -
    • char_set - The character set used in communicating with the database.
      • -
    • dbcollat - The character collation used in communicating with the database.
      • -
    • port - The database port number. Currently only used with the Postgres driver. To use this value you have to add a line to the database config array.$db['default']['port'] = 5432;
      • -
    - -

    Note: Depending on what database platform you are using (MySQL, Postgres, etc.) -not all values will be needed. For example, when using SQLite you will not need to supply a username or password, and -the database name will be the path to your database file. The information above assumes you are using MySQL.

    - - - -
    - - - - - - + + + + + +Database Configuration : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + + +

    Database Configuration

    + +

    CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.). +The config file is located at:

    + +

    application/config/database.php

    + +

    The config settings are stored in a multi-dimensional array with this prototype:

    + +$db['default']['hostname'] = "localhost";
    +$db['default']['username'] = "root";
    +$db['default']['password'] = "";
    +$db['default']['database'] = "database_name";
    +$db['default']['dbdriver'] = "mysql";
    +$db['default']['dbprefix'] = "";
    +$db['default']['pconnect'] = TRUE;
    +$db['default']['db_debug'] = FALSE;
    +$db['default']['cache_on'] = FALSE;
    +$db['default']['cachedir'] = "";
    +$db['default']['char_set'] = "utf8";
    +$db['default']['dbcollat'] = "utf8_general_ci";     + +

    The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store +multiple sets of connection values. If, for example, you run multiple environments (development, production, test, etc.) +under a single installation, you can set up a connection group for each, then switch between groups as needed. +For example, to set up a "test" environment you would do this:

    + +$db['test']['hostname'] = "localhost";
    +$db['test']['username'] = "root";
    +$db['test']['password'] = "";
    +$db['test']['database'] = "database_name";
    +$db['test']['dbdriver'] = "mysql";
    +$db['test']['dbprefix'] = "";
    +$db['test']['pconnect'] = TRUE;
    +$db['test']['db_debug'] = FALSE;
    +$db['test']['cache_on'] = FALSE;
    +$db['test']['cachedir'] = "";
    +$db['test']['char_set'] = "utf8";
    +$db['test']['dbcollat'] = "utf8_general_ci";     + + +

    Then, to globally tell the system to use that group you would set this variable located in the config file:

    + +$active_group = "test"; + +

    Note: The name "test" is arbitrary. It can be anything you want. By default we've used the word "default" +for the primary connection, but it too can be renamed to something more relevant to your project.

    + +

    Active Record

    + +

    The Active Record Class is globally enabled or disabled by setting the $active_record variable in the database configuration file to TRUE/FALSE (boolean). If you are not using the active record class, setting it to FALSE will utilize fewer resources when the database classes are initialized.

    + +$active_record = TRUE; + +

    Note: that some CodeIgniter classes such as Sessions require Active Records be enabled to access certain functionality.

    + +

    Explanation of Values:

    + +
      +
    • hostname - The hostname of your database server. Often this is "localhost".
      • +
    • 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, postgres, odbc, etc. Must be specified in lower case.
      • +
    • dbprefix - An optional table prefix which will added to the table name when running Active Record queries. This permits multiple CodeIgniter installations to share one database.
      • +
    • pconnect - TRUE/FALSE (boolean) - Whether to use a persistent connection.
      • +
    • db_debug - TRUE/FALSE (boolean) - Whether database errors should be displayed.
      • +
    • cache_on - TRUE/FALSE (boolean) - Whether database query caching is enabled, see also Database Caching Class.
      • +
    • cachedir - The absolute server path to your database query cache directory.
      • +
    • char_set - The character set used in communicating with the database.
      • +
    • dbcollat - The character collation used in communicating with the database.
      • +
    • port - The database port number. Currently only used with the Postgres driver. To use this value you have to add a line to the database config array.$db['default']['port'] = 5432;
      • +
    + +

    Note: Depending on what database platform you are using (MySQL, Postgres, etc.) +not all values will be needed. For example, when using SQLite you will not need to supply a username or password, and +the database name will be the path to your database file. The information above assumes you are using MySQL.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 8ece6dce..90f90110 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -1,181 +1,181 @@ - - - - - -Connecting to your Database : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - - -

    Connecting to your Database

    - -

    There are two ways to connect to a database:

    - -

    Automatically Connecting

    - -

    The "auto connect" feature will load and instantiate the database class with every page load. -To enable "auto connecting", add the word database to the library array, as indicated in the following file:

    - -

    application/config/autoload.php

    - -

    Manually Connecting

    - -

    If only some of your pages require database connectivity you can manually connect to your database by adding this -line of code in any function where it is needed, or in your class constructor to make the database -available globally in that class.

    - -$this->load->database(); - -

    If the above function does not contain any information in the first parameter it will connect -to the group specified in your database config file. For most people, this is the preferred method of use.

    - -

    Available Parameters

    - -
      -
    1. The database connection values, passed either as an array or a DSN string.
      2. -
    2. TRUE/FALSE (boolean). Whether to return the connection ID (see Connecting to Multiple Databases below).
      3. -
    3. TRUE/FALSE (boolean). Whether to enable the Active Record class. Set to FALSE by default.
      4. -
    - - -

    Manuallly Connecting to a Database

    - -

    The first parameter of this function can optionally be used to specify a particular database group -from your config file, or you can even submit connection values for a database that is not specified in your config file. -Examples:

    - -

    To choose a specific group from your config file you can do this:

    - -$this->load->database('group_name'); - -

    Where group_name is the name of the connection group from your config file.

    - - -

    To connect manually to a desired database you can pass an array of values:

    - -$config['hostname'] = "localhost";
    -$config['username'] = "myusername";
    -$config['password'] = "mypassword";
    -$config['database'] = "mydatabase";
    -$config['dbdriver'] = "mysql";
    -$config['dbprefix'] = "";
    -$config['pconnect'] = FALSE;
    -$config['db_debug'] = TRUE;
    -$config['cache_on'] = FALSE;
    -$config['cachedir'] = "";
    -$config['char_set'] = "utf8";
    -$config['dbcollat'] = "utf8_general_ci";
    -
    -$this->load->database($config);     - -

    For information on each of these values please see the configuration page.

    - -

    Or you can submit your database values as a Data Source Name. DSNs must have this prototype:

    - -$dsn = 'dbdriver://username:password@hostname/database';
    -
    -$this->load->database($dsn);     - -

    To override default config values when connecting with a DSN string, add the config variables as a query string.

    - -$dsn = 'dbdriver://username:password@hostname/database?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=/path/to/cache';
    -
    -$this->load->database($dsn);     - -

    Connecting to Multiple Databases

    - -

    If you need to connect to more than one database simultaneously you can do so as follows:

    - - -$DB1 = $this->load->database('group_one', TRUE);
    -$DB2 = $this->load->database('group_two', TRUE); -     - -

    Note: Change the words "group_one" and "group_two" to the specific group names you are connecting to (or -you can pass the connection values as indicated above).

    - -

    By setting the second parameter to TRUE (boolean) the function will return the database object.

    - -
    -

    When you connect this way, you will use your object name to issue commands rather than the syntax used throughout this guide. In other words, rather than issuing commands with:

    - -

    $this->db->query();
    $this->db->result();
    etc...

    - -

    You will instead use:

    - -

    $DB1->query();
    $DB1->result();
    etc...

    - -
    - - - - - -
    - - - - - - + + + + + +Connecting to your Database : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + + +

    Connecting to your Database

    + +

    There are two ways to connect to a database:

    + +

    Automatically Connecting

    + +

    The "auto connect" feature will load and instantiate the database class with every page load. +To enable "auto connecting", add the word database to the library array, as indicated in the following file:

    + +

    application/config/autoload.php

    + +

    Manually Connecting

    + +

    If only some of your pages require database connectivity you can manually connect to your database by adding this +line of code in any function where it is needed, or in your class constructor to make the database +available globally in that class.

    + +$this->load->database(); + +

    If the above function does not contain any information in the first parameter it will connect +to the group specified in your database config file. For most people, this is the preferred method of use.

    + +

    Available Parameters

    + +
      +
    1. The database connection values, passed either as an array or a DSN string.
      2. +
    2. TRUE/FALSE (boolean). Whether to return the connection ID (see Connecting to Multiple Databases below).
      3. +
    3. TRUE/FALSE (boolean). Whether to enable the Active Record class. Set to FALSE by default.
      4. +
    + + +

    Manuallly Connecting to a Database

    + +

    The first parameter of this function can optionally be used to specify a particular database group +from your config file, or you can even submit connection values for a database that is not specified in your config file. +Examples:

    + +

    To choose a specific group from your config file you can do this:

    + +$this->load->database('group_name'); + +

    Where group_name is the name of the connection group from your config file.

    + + +

    To connect manually to a desired database you can pass an array of values:

    + +$config['hostname'] = "localhost";
    +$config['username'] = "myusername";
    +$config['password'] = "mypassword";
    +$config['database'] = "mydatabase";
    +$config['dbdriver'] = "mysql";
    +$config['dbprefix'] = "";
    +$config['pconnect'] = FALSE;
    +$config['db_debug'] = TRUE;
    +$config['cache_on'] = FALSE;
    +$config['cachedir'] = "";
    +$config['char_set'] = "utf8";
    +$config['dbcollat'] = "utf8_general_ci";
    +
    +$this->load->database($config);     + +

    For information on each of these values please see the configuration page.

    + +

    Or you can submit your database values as a Data Source Name. DSNs must have this prototype:

    + +$dsn = 'dbdriver://username:password@hostname/database';
    +
    +$this->load->database($dsn);     + +

    To override default config values when connecting with a DSN string, add the config variables as a query string.

    + +$dsn = 'dbdriver://username:password@hostname/database?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=/path/to/cache';
    +
    +$this->load->database($dsn);     + +

    Connecting to Multiple Databases

    + +

    If you need to connect to more than one database simultaneously you can do so as follows:

    + + +$DB1 = $this->load->database('group_one', TRUE);
    +$DB2 = $this->load->database('group_two', TRUE); +     + +

    Note: Change the words "group_one" and "group_two" to the specific group names you are connecting to (or +you can pass the connection values as indicated above).

    + +

    By setting the second parameter to TRUE (boolean) the function will return the database object.

    + +
    +

    When you connect this way, you will use your object name to issue commands rather than the syntax used throughout this guide. In other words, rather than issuing commands with:

    + +

    $this->db->query();
    $this->db->result();
    etc...

    + +

    You will instead use:

    + +

    $DB1->query();
    $DB1->result();
    etc...

    + +
    + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 4182390f..49d27299 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -1,217 +1,217 @@ - - - - - -Database Quick Start : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - - -
    - - - -
    - - - -
    - - -

    Database Quick Start: Example Code

    - -

    The following page contains example code showing how the database class is used. For complete details please -read the individual pages describing each function.

    - - -

    Initializing the Database Class

    - -

    The following code loads and initializes the database class based on your configuration settings:

    - -$this->load->database(); - -

    Once loaded the class is ready to be used as described below.

    - -

    Note: If all your pages require database access you can connect automatically. See the connecting page for details.

    - - -

    Standard Query With Multiple Results (Object Version)

    - -$query = $this->db->query('SELECT name, title, email FROM my_table');
    -
    -foreach ($query->result() as $row)
    -{
    -    echo $row->title;
    -    echo $row->name;
    -    echo $row->email;
    -}
    -
    -echo 'Total Results: ' . $query->num_rows(); -     - -

    The above result() function returns an array of objects. Example: $row->title

    - - -

    Standard Query With Multiple Results (Array Version)

    - -$query = $this->db->query('SELECT name, title, email FROM my_table');
    -
    -foreach ($query->result_array() as $row)
    -{
    -    echo $row['title'];
    -    echo $row['name'];
    -    echo $row['email'];
    -}     - -

    The above result_array() function returns an array of standard array indexes. Example: $row['title']

    - - -

    Testing for Results

    - -

    If you run queries that might not produce a result, you are encouraged to test for a result first -using the num_rows() function:

    - - -$query = $this->db->query("YOUR QUERY");
    -
    -if ($query->num_rows() > 0)
    -{
    -   foreach ($query->result() as $row)
    -   {
    -      echo $row->title;
    -      echo $row->name;
    -      echo $row->body;
    -   }
    -} -     - - - - -

    Standard Query With Single Result

    - -$query = $this->db->query('SELECT name FROM my_table LIMIT 1');
    -
    -$row = $query->row();
    -echo $row->name;
    -     - -

    The above row() function returns an object. Example: $row->name

    - - -

    Standard Query With Single Result (Array version)

    - -$query = $this->db->query('SELECT name FROM my_table LIMIT 1');
    -
    -$row = $query->row_array();
    -echo $row['name'];
    -     - -

    The above row_array() function returns an array. Example: $row['name']

    - - -

    Standard Insert

    - - -$sql = "INSERT INTO mytable (title, name)
    -        VALUES (".$this->db->escape($title).", ".$this->db->escape($name).")";
    -
    -$this->db->query($sql);
    -
    -echo $this->db->affected_rows(); -     - - - - -

    Active Record Query

    - -

    The Active Record Pattern gives you a simplified means of retrieving data:

    - - -$query = $this->db->get('table_name');
    -
    -foreach ($query->result() as $row)
    -{
    -    echo $row->title;
    -}     - -

    The above get() function retrieves all the results from the supplied table. -The Active Record class contains a full compliment of functions -for working with data.

    - - -

    Active Record Insert

    - - -$data = array(
    -               'title' => $title,
    -               'name' => $name,
    -               'date' => $date
    -            );
    -
    -$this->db->insert('mytable', $data); -

    -// Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')     - - - - -
    - - - - - - + + + + + +Database Quick Start : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + + +
    + + + +
    + + + +
    + + +

    Database Quick Start: Example Code

    + +

    The following page contains example code showing how the database class is used. For complete details please +read the individual pages describing each function.

    + + +

    Initializing the Database Class

    + +

    The following code loads and initializes the database class based on your configuration settings:

    + +$this->load->database(); + +

    Once loaded the class is ready to be used as described below.

    + +

    Note: If all your pages require database access you can connect automatically. See the connecting page for details.

    + + +

    Standard Query With Multiple Results (Object Version)

    + +$query = $this->db->query('SELECT name, title, email FROM my_table');
    +
    +foreach ($query->result() as $row)
    +{
    +    echo $row->title;
    +    echo $row->name;
    +    echo $row->email;
    +}
    +
    +echo 'Total Results: ' . $query->num_rows(); +     + +

    The above result() function returns an array of objects. Example: $row->title

    + + +

    Standard Query With Multiple Results (Array Version)

    + +$query = $this->db->query('SELECT name, title, email FROM my_table');
    +
    +foreach ($query->result_array() as $row)
    +{
    +    echo $row['title'];
    +    echo $row['name'];
    +    echo $row['email'];
    +}     + +

    The above result_array() function returns an array of standard array indexes. Example: $row['title']

    + + +

    Testing for Results

    + +

    If you run queries that might not produce a result, you are encouraged to test for a result first +using the num_rows() function:

    + + +$query = $this->db->query("YOUR QUERY");
    +
    +if ($query->num_rows() > 0)
    +{
    +   foreach ($query->result() as $row)
    +   {
    +      echo $row->title;
    +      echo $row->name;
    +      echo $row->body;
    +   }
    +} +     + + + + +

    Standard Query With Single Result

    + +$query = $this->db->query('SELECT name FROM my_table LIMIT 1');
    +
    +$row = $query->row();
    +echo $row->name;
    +     + +

    The above row() function returns an object. Example: $row->name

    + + +

    Standard Query With Single Result (Array version)

    + +$query = $this->db->query('SELECT name FROM my_table LIMIT 1');
    +
    +$row = $query->row_array();
    +echo $row['name'];
    +     + +

    The above row_array() function returns an array. Example: $row['name']

    + + +

    Standard Insert

    + + +$sql = "INSERT INTO mytable (title, name)
    +        VALUES (".$this->db->escape($title).", ".$this->db->escape($name).")";
    +
    +$this->db->query($sql);
    +
    +echo $this->db->affected_rows(); +     + + + + +

    Active Record Query

    + +

    The Active Record Pattern gives you a simplified means of retrieving data:

    + + +$query = $this->db->get('table_name');
    +
    +foreach ($query->result() as $row)
    +{
    +    echo $row->title;
    +}     + +

    The above get() function retrieves all the results from the supplied table. +The Active Record class contains a full compliment of functions +for working with data.

    + + +

    Active Record Insert

    + + +$data = array(
    +               'title' => $title,
    +               'name' => $name,
    +               'date' => $date
    +            );
    +
    +$this->db->insert('mytable', $data); +

    +// Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')     + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index ed8f63d6..067d5b69 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -1,163 +1,163 @@ - - - - - -Field Data : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - -
    - - - -
    - - - -
    - - -

    Field Data

    - - -

    $this->db->list_fields()

    -

    Returns an array containing the field names. This query can be called two ways:

    - - -

    1. You can supply the table name and call it from the $this->db-> object:

    - - -$fields = $this->db->list_fields('table_name');

    - -foreach ($fields as $field)
    -{
    -   echo $field;
    -} -     - -

    2. You can gather the field names associated with any query you run by calling the function -from your query result object:

    - - -$query = $this->db->query('SELECT * FROM some_table'); -

    - -foreach ($query->list_fields() as $field)
    -{
    -   echo $field;
    -} -     - - -

    $this->db->field_exists()

    - -

    Sometimes it's helpful to know whether a particular field exists before performing an action. -Returns a boolean TRUE/FALSE. Usage example:

    - - -if ($this->db->field_exists('field_name', 'table_name'))
    -{
    -   // some code...
    -} -     - -

    Note: Replace field_name with the name of the column you are looking for, and replace -table_name with the name of the table you are looking for.

    - - -

    $this->db->field_data()

    -

    Returns an array of objects containing field information.

    -

    Sometimes it's helpful to gather the field names or other metadata, like the column type, max length, etc.

    - - -

    Note: Not all databases provide meta-data.

    - -

    Usage example:

    - - -$fields = $this->db->field_data('table_name');

    - -foreach ($fields as $field)
    -{
    -   echo $field->name;
    -   echo $field->type;
    -   echo $field->max_length;
    -   echo $field->primary_key;
    -} -     - -

    If you have run a query already you can use the result object instead of supplying the table name:

    - - -$query = $this->db->query("YOUR QUERY");
    -$fields = $query->field_data(); -     - - -

    The following data is available from this function if supported by your database:

    - -
      -
    • name - column name
      • -
    • max_length - maximum length of the column
      • -
    • primary_key - 1 if the column is a primary key
      • -
    • type - the type of the column
      • -
    - - -
    - - - - - - + + + + + +Field Data : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + +
    + + + +
    + + + +
    + + +

    Field Data

    + + +

    $this->db->list_fields()

    +

    Returns an array containing the field names. This query can be called two ways:

    + + +

    1. You can supply the table name and call it from the $this->db-> object:

    + + +$fields = $this->db->list_fields('table_name');

    + +foreach ($fields as $field)
    +{
    +   echo $field;
    +} +     + +

    2. You can gather the field names associated with any query you run by calling the function +from your query result object:

    + + +$query = $this->db->query('SELECT * FROM some_table'); +

    + +foreach ($query->list_fields() as $field)
    +{
    +   echo $field;
    +} +     + + +

    $this->db->field_exists()

    + +

    Sometimes it's helpful to know whether a particular field exists before performing an action. +Returns a boolean TRUE/FALSE. Usage example:

    + + +if ($this->db->field_exists('field_name', 'table_name'))
    +{
    +   // some code...
    +} +     + +

    Note: Replace field_name with the name of the column you are looking for, and replace +table_name with the name of the table you are looking for.

    + + +

    $this->db->field_data()

    +

    Returns an array of objects containing field information.

    +

    Sometimes it's helpful to gather the field names or other metadata, like the column type, max length, etc.

    + + +

    Note: Not all databases provide meta-data.

    + +

    Usage example:

    + + +$fields = $this->db->field_data('table_name');

    + +foreach ($fields as $field)
    +{
    +   echo $field->name;
    +   echo $field->type;
    +   echo $field->max_length;
    +   echo $field->primary_key;
    +} +     + +

    If you have run a query already you can use the result object instead of supplying the table name:

    + + +$query = $this->db->query("YOUR QUERY");
    +$fields = $query->field_data(); +     + + +

    The following data is available from this function if supported by your database:

    + +
      +
    • name - column name
      • +
    • max_length - maximum length of the column
      • +
    • primary_key - 1 if the column is a primary key
      • +
    • type - the type of the column
      • +
    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index 3feb487d..409ca277 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -1,234 +1,234 @@ - - - - - -Database Forge Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - -

    Database Forge Class

    - -

    The Database Forge Class contains functions that help you manage your database.

    - -

    Table of Contents

    - - - - -

    Initializing the Forge Class

    - -

    Important:  In order to initialize the Forge class, your database driver must -already be running, since the forge class relies on it.

    - -

    Load the Forge Class as follows:

    - -$this->load->dbforge() - -

    Once initialized you will access the functions using the $this->dbforge object:

    - -$this->dbforge->some_function() -

    $this->dbforge->create_database('db_name')

    - -

    Permits you to create the database specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    - -if ($this->dbforge->create_database('my_db'))
    -{
    -    echo 'Database created!';
    -}     - - - - -

    $this->dbforge->drop_database('db_name')

    - -

    Permits you to drop the database specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    - -if ($this->dbforge->drop_database('my_db'))
    -{
    -    echo 'Database deleted!';
    -}     - - -

    Creating and Dropping Tables

    -

    There are several things you may wish to do when creating tables. Add fields, add keys to the table, alter columns. CodeIgniter provides a mechanism for this.

    -

    Adding fields

    -

    Fields are created via an associative array. Within the array you must include a 'type' key that relates to the datatype of the field. For example, INT, VARCHAR, TEXT, etc. Many datatypes (for example VARCHAR) also require a 'constraint' key.

    -

    $fields = array(
    -                        'users' => array(
    -                                                  'type' => 'VARCHAR',
    -                                                  'constraint' => '100',
    -                                           ),
    -                 );
    -
    -// will translate to "users VARCHAR(100)" when the field is added.

    -

    Additionally, the following key/values can be used:

    -
      -
    • unsigned/true : to generate "UNSIGNED" in the field definition.
      • -
    • default/value : to generate a default value in the field definition.
      • -
    • null/true : to generate "NULL" in the field definition. Without this, the field will default to "NOT NULL".
      • -
    • auto_increment/true : generates an auto_increment flag on the field. Note that the field type must be a type that supports this, such as integer.
      • -
    -

    $fields = array(
    -                         'blog_id' => array(
    -                                                  'type' => 'INT',
    -                                                  'constraint' => 5,
    -                                                  'unsigned' => TRUE,
    -                                                  'auto_increment' => TRUE
    -                                           ),
    -                         'blog_title' => array(
    -                                                 'type' => 'VARCHAR',
    -                                                 'constraint' => '100',
    -                                          ),
    -                        'blog_author' => array(
    -                                                 'type' =>'VARCHAR',
    -                                                 'constraint' => '100',
    -                                                 'default' => 'King of Town',
    -                                          ),
    -                        'blog_description' => array(
    -                                                 'type' => 'TEXT',
    -                                                 'null' => TRUE,
    -                                          ),
    -                );
    -

    -

    After the fields have been defined, they can be added using $this->dbforge->add_field($fields); followed by a call to the create_table() function.

    -

    $this->dbforge->add_field()

    -

    The add fields function will accept the above array.

    -

    Passing strings as fields

    -

    If you know exactly how you want a field to be created, you can pass the string into the field definitions with add_field()

    -

    $this->dbforge->add_field("label varchar(100) NOT NULL DEFAULT 'default label'");

    -

    Note: Multiple calls to add_field() are cumulative.

    -

    Creating an id field

    -

    There is a special exception for creating id fields. A field with type id will automatically be assinged as an INT(9) auto_incrementing Primary Key.

    -

    $this->dbforge->add_field('id');
    - // gives id INT(9) NOT NULL AUTO_INCREMENT

    -

    Adding Keys

    -

    Generally speaking, you'll want your table to have Keys. This is accomplished with $this->dbforge->add_key('field'). An optional second parameter set to TRUE will make it a primary key. Note that add_key() must be followed by a call to create_table().

    -

    Multiple column non-primary keys must be sent as an array. Sample output below is for MySQL.

    -

    $this->dbforge->add_key('blog_id', TRUE);
    - // gives PRIMARY KEY `blog_id` (`blog_id`)
    -
    - $this->dbforge->add_key('blog_id', TRUE);
    - $this->dbforge->add_key('site_id', TRUE);
    - // gives PRIMARY KEY `blog_id_site_id` (`blog_id`, `site_id`)
    -
    - $this->dbforge->add_key('blog_name');
    - // gives KEY `blog_name` (`blog_name`)
    -
    - $this->dbforge->add_key(array('blog_name', 'blog_label'));
    - // gives KEY `blog_name_blog_label` (`blog_name`, `blog_label`)

    -

    Creating a table

    -

    After fields and keys have been declared, you can create a new table with

    -

    $this->dbforge->create_table('table_name');
    -// gives CREATE TABLE table_name

    -

    An optional second parameter set to TRUE adds an "IF NOT EXISTS" clause into the definition

    -

    $this->dbforge->create_table('table_name', TRUE);
    -// gives CREATE TABLE IF NOT EXISTS table_name

    -

    Dropping a table

    -

    Executes a DROP TABLE sql

    -

    $this->dbforge->drop_table('table_name');
    - // gives DROP TABLE IF EXISTS table_name

    -

    Renaming a table

    -

    Executes a TABLE rename

    -

    $this->dbforge->rename_table('old_table_name', 'new_table_name');
    - // gives ALTER TABLE old_table_name RENAME TO new_table_name

    -

    Modifying Tables

    -

    $this->dbforge->add_column()

    -

    The add_column() function is used to modify an existing table. It accepts the same field array as above, and can be used for an unlimited number of additional fields.

    -

    $fields = array(
    -                         'preferences' => array('type' => 'TEXT')
    -);
    -$this->dbforge->add_column('table_name', $fields);
    -
    -// gives ALTER TABLE table_name ADD preferences TEXT

    -

    $this->dbforge->drop_column()

    -

    Used to remove a column from a table.

    -

    $this->dbforge->drop_column('table_name', 'column_to_drop');

    -

    $this->dbforge->modify_column()

    -

    The usage of this function is identical to add_column(), except it alters an existing column rather than adding a new one. In order to use it you must add a "name" key into the field defining array.

    -

    $fields = array(
    -                        'old_name' => array(
    -                                                         'name' => 'new_name',
    -                                                         'type' => 'TEXT',
    -                                                ),
    -);
    -$this->dbforge->modify_column('table_name', $fields);
    -
    - // gives ALTER TABLE table_name CHANGE old_name new_name TEXT

    -

     

    -
    - - - - - - + + + + + +Database Forge Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + +

    Database Forge Class

    + +

    The Database Forge Class contains functions that help you manage your database.

    + +

    Table of Contents

    + + + + +

    Initializing the Forge Class

    + +

    Important:  In order to initialize the Forge class, your database driver must +already be running, since the forge class relies on it.

    + +

    Load the Forge Class as follows:

    + +$this->load->dbforge() + +

    Once initialized you will access the functions using the $this->dbforge object:

    + +$this->dbforge->some_function() +

    $this->dbforge->create_database('db_name')

    + +

    Permits you to create the database specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    + +if ($this->dbforge->create_database('my_db'))
    +{
    +    echo 'Database created!';
    +}     + + + + +

    $this->dbforge->drop_database('db_name')

    + +

    Permits you to drop the database specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    + +if ($this->dbforge->drop_database('my_db'))
    +{
    +    echo 'Database deleted!';
    +}     + + +

    Creating and Dropping Tables

    +

    There are several things you may wish to do when creating tables. Add fields, add keys to the table, alter columns. CodeIgniter provides a mechanism for this.

    +

    Adding fields

    +

    Fields are created via an associative array. Within the array you must include a 'type' key that relates to the datatype of the field. For example, INT, VARCHAR, TEXT, etc. Many datatypes (for example VARCHAR) also require a 'constraint' key.

    +

    $fields = array(
    +                        'users' => array(
    +                                                  'type' => 'VARCHAR',
    +                                                  'constraint' => '100',
    +                                           ),
    +                 );
    +
    +// will translate to "users VARCHAR(100)" when the field is added.

    +

    Additionally, the following key/values can be used:

    +
      +
    • unsigned/true : to generate "UNSIGNED" in the field definition.
      • +
    • default/value : to generate a default value in the field definition.
      • +
    • null/true : to generate "NULL" in the field definition. Without this, the field will default to "NOT NULL".
      • +
    • auto_increment/true : generates an auto_increment flag on the field. Note that the field type must be a type that supports this, such as integer.
      • +
    +

    $fields = array(
    +                         'blog_id' => array(
    +                                                  'type' => 'INT',
    +                                                  'constraint' => 5,
    +                                                  'unsigned' => TRUE,
    +                                                  'auto_increment' => TRUE
    +                                           ),
    +                         'blog_title' => array(
    +                                                 'type' => 'VARCHAR',
    +                                                 'constraint' => '100',
    +                                          ),
    +                        'blog_author' => array(
    +                                                 'type' =>'VARCHAR',
    +                                                 'constraint' => '100',
    +                                                 'default' => 'King of Town',
    +                                          ),
    +                        'blog_description' => array(
    +                                                 'type' => 'TEXT',
    +                                                 'null' => TRUE,
    +                                          ),
    +                );
    +

    +

    After the fields have been defined, they can be added using $this->dbforge->add_field($fields); followed by a call to the create_table() function.

    +

    $this->dbforge->add_field()

    +

    The add fields function will accept the above array.

    +

    Passing strings as fields

    +

    If you know exactly how you want a field to be created, you can pass the string into the field definitions with add_field()

    +

    $this->dbforge->add_field("label varchar(100) NOT NULL DEFAULT 'default label'");

    +

    Note: Multiple calls to add_field() are cumulative.

    +

    Creating an id field

    +

    There is a special exception for creating id fields. A field with type id will automatically be assinged as an INT(9) auto_incrementing Primary Key.

    +

    $this->dbforge->add_field('id');
    + // gives id INT(9) NOT NULL AUTO_INCREMENT

    +

    Adding Keys

    +

    Generally speaking, you'll want your table to have Keys. This is accomplished with $this->dbforge->add_key('field'). An optional second parameter set to TRUE will make it a primary key. Note that add_key() must be followed by a call to create_table().

    +

    Multiple column non-primary keys must be sent as an array. Sample output below is for MySQL.

    +

    $this->dbforge->add_key('blog_id', TRUE);
    + // gives PRIMARY KEY `blog_id` (`blog_id`)
    +
    + $this->dbforge->add_key('blog_id', TRUE);
    + $this->dbforge->add_key('site_id', TRUE);
    + // gives PRIMARY KEY `blog_id_site_id` (`blog_id`, `site_id`)
    +
    + $this->dbforge->add_key('blog_name');
    + // gives KEY `blog_name` (`blog_name`)
    +
    + $this->dbforge->add_key(array('blog_name', 'blog_label'));
    + // gives KEY `blog_name_blog_label` (`blog_name`, `blog_label`)

    +

    Creating a table

    +

    After fields and keys have been declared, you can create a new table with

    +

    $this->dbforge->create_table('table_name');
    +// gives CREATE TABLE table_name

    +

    An optional second parameter set to TRUE adds an "IF NOT EXISTS" clause into the definition

    +

    $this->dbforge->create_table('table_name', TRUE);
    +// gives CREATE TABLE IF NOT EXISTS table_name

    +

    Dropping a table

    +

    Executes a DROP TABLE sql

    +

    $this->dbforge->drop_table('table_name');
    + // gives DROP TABLE IF EXISTS table_name

    +

    Renaming a table

    +

    Executes a TABLE rename

    +

    $this->dbforge->rename_table('old_table_name', 'new_table_name');
    + // gives ALTER TABLE old_table_name RENAME TO new_table_name

    +

    Modifying Tables

    +

    $this->dbforge->add_column()

    +

    The add_column() function is used to modify an existing table. It accepts the same field array as above, and can be used for an unlimited number of additional fields.

    +

    $fields = array(
    +                         'preferences' => array('type' => 'TEXT')
    +);
    +$this->dbforge->add_column('table_name', $fields);
    +
    +// gives ALTER TABLE table_name ADD preferences TEXT

    +

    $this->dbforge->drop_column()

    +

    Used to remove a column from a table.

    +

    $this->dbforge->drop_column('table_name', 'column_to_drop');

    +

    $this->dbforge->modify_column()

    +

    The usage of this function is identical to add_column(), except it alters an existing column rather than adding a new one. In order to use it you must add a "name" key into the field defining array.

    +

    $fields = array(
    +                        'old_name' => array(
    +                                                         'name' => 'new_name',
    +                                                         'type' => 'TEXT',
    +                                                ),
    +);
    +$this->dbforge->modify_column('table_name', $fields);
    +
    + // gives ALTER TABLE table_name CHANGE old_name new_name TEXT

    +

     

    +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 0647e2a8..9fcb7661 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -1,151 +1,151 @@ - - - - - -Query Helper Functions : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - - -
    - - - -
    - - -

    Query Helper Functions

    - - -

    $this->db->insert_id()

    -

    The insert ID number when performing database inserts.

    - -

    $this->db->affected_rows()

    -

    Displays the number of affected rows, when doing "write" type queries (insert, update, etc.).

    -

    Note: In MySQL "DELETE FROM TABLE" returns 0 affected rows. The database class has a small hack that allows it to return the -correct number of affected rows. By default this hack is enabled but it can be turned off in the database driver file.

    - - -

    $this->db->count_all();

    -

    Permits you to determine the number of rows in a particular table. Submit the table name in the first parameter. Example:

    -echo $this->db->count_all('my_table');
    -
    -// Produces an integer, like 25 -     - - -

    $this->db->platform()

    -

    Outputs the database platform you are running (MySQL, MS SQL, Postgres, etc...):

    -echo $this->db->platform(); - - -

    $this->db->version()

    -

    Outputs the database version you are running:

    -echo $this->db->version(); - - -

    $this->db->last_query();

    -

    Returns the last query that was run (the query string, not the result). Example:

    - -$str = $this->db->last_query();
    -
    -// Produces: SELECT * FROM sometable.... -     - - -

    The following two functions help simplify the process of writing database INSERTs and UPDATEs.

    - - -

    $this->db->insert_string();

    -

    This function simplifies the process of writing database inserts. It returns a correctly formatted SQL insert string. Example:

    - -$data = array('name' => $name, 'email' => $email, 'url' => $url);
    -
    -$str = $this->db->insert_string('table_name', $data); -     - -

    The first parameter is the table name, the second is an associative array with the data to be inserted. The above example produces:

    -INSERT INTO table_name (name, email, url) VALUES ('Rick', 'rick@example.com', 'example.com') - -

    Note: Values are automatically escaped, producing safer queries.

    - - - -

    $this->db->update_string();

    -

    This function simplifies the process of writing database updates. It returns a correctly formatted SQL update string. Example:

    - -$data = array('name' => $name, 'email' => $email, 'url' => $url);
    -
    -$where = "author_id = 1 AND status = 'active'"; -

    -$str = $this->db->update_string('table_name', $data, $where); -     - -

    The first parameter is the table name, the second is an associative array with the data to be updated, and the third parameter is the "where" clause. The above example produces:

    - UPDATE table_name SET name = 'Rick', email = 'rick@example.com', url = 'example.com' WHERE author_id = 1 AND status = 'active' - -

    Note: Values are automatically escaped, producing safer queries.

    - - -
    - - - - - - + + + + + +Query Helper Functions : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + + +
    + + + +
    + + +

    Query Helper Functions

    + + +

    $this->db->insert_id()

    +

    The insert ID number when performing database inserts.

    + +

    $this->db->affected_rows()

    +

    Displays the number of affected rows, when doing "write" type queries (insert, update, etc.).

    +

    Note: In MySQL "DELETE FROM TABLE" returns 0 affected rows. The database class has a small hack that allows it to return the +correct number of affected rows. By default this hack is enabled but it can be turned off in the database driver file.

    + + +

    $this->db->count_all();

    +

    Permits you to determine the number of rows in a particular table. Submit the table name in the first parameter. Example:

    +echo $this->db->count_all('my_table');
    +
    +// Produces an integer, like 25 +     + + +

    $this->db->platform()

    +

    Outputs the database platform you are running (MySQL, MS SQL, Postgres, etc...):

    +echo $this->db->platform(); + + +

    $this->db->version()

    +

    Outputs the database version you are running:

    +echo $this->db->version(); + + +

    $this->db->last_query();

    +

    Returns the last query that was run (the query string, not the result). Example:

    + +$str = $this->db->last_query();
    +
    +// Produces: SELECT * FROM sometable.... +     + + +

    The following two functions help simplify the process of writing database INSERTs and UPDATEs.

    + + +

    $this->db->insert_string();

    +

    This function simplifies the process of writing database inserts. It returns a correctly formatted SQL insert string. Example:

    + +$data = array('name' => $name, 'email' => $email, 'url' => $url);
    +
    +$str = $this->db->insert_string('table_name', $data); +     + +

    The first parameter is the table name, the second is an associative array with the data to be inserted. The above example produces:

    +INSERT INTO table_name (name, email, url) VALUES ('Rick', 'rick@example.com', 'example.com') + +

    Note: Values are automatically escaped, producing safer queries.

    + + + +

    $this->db->update_string();

    +

    This function simplifies the process of writing database updates. It returns a correctly formatted SQL update string. Example:

    + +$data = array('name' => $name, 'email' => $email, 'url' => $url);
    +
    +$where = "author_id = 1 AND status = 'active'"; +

    +$str = $this->db->update_string('table_name', $data, $where); +     + +

    The first parameter is the table name, the second is an associative array with the data to be updated, and the third parameter is the "where" clause. The above example produces:

    + UPDATE table_name SET name = 'Rick', email = 'rick@example.com', url = 'example.com' WHERE author_id = 1 AND status = 'active' + +

    Note: Values are automatically escaped, producing safer queries.

    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 73f814c3..b4ce57cc 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -1,99 +1,99 @@ - - - - - -The Database Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - - -

    The Database Class

    - -

    CodeIgniter comes with a full-featured and very fast abstracted database class that supports both traditional -structures and Active Record patterns. The database functions offer clear, simple syntax.

    - - - - -
    - - - - - - + + + + + +The Database Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + + +

    The Database Class

    + +

    CodeIgniter comes with a full-featured and very fast abstracted database class that supports both traditional +structures and Active Record patterns. The database functions offer clear, simple syntax.

    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 35f2da78..84c5f7f1 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -1,146 +1,146 @@ - - - - - -Queries : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - - -
    - - - -
    - - -

    Queries

    - -

    $this->db->query();

    - -

    To submit a query, use the following function:

    - -$this->db->query('YOUR QUERY HERE'); - -

    The query() function returns a database result object when "read" type queries are run, -which you can use to show your results. When "write" type queries are run it simply returns TRUE or FALSE -depending on success or failure. When retrieving data you will typically assign the query to your own variable, like this:

    - -$query = $this->db->query('YOUR QUERY HERE'); - -

    $this->db->simple_query();

    - -

    This is a simplified version of the $this->db->query() function. It ONLY returns TRUE/FALSE on success or failure. -It DOES NOT return a database result set, nor does it set the query timer, or compile bind data, or store your query for debugging. -It simply lets you submit a query. Most users will rarely use this function.

    - - -

    Adding Database prefixes manually

    -

    If you have configured a database prefix and would like to add it in manually for, you can use the following.

    -

    $this->db->dbprefix('tablename');
    -// outputs prefix_tablename

    - - -

    Protecting identifiers

    -

    In many databases it is advisable to protect table and field names - for example with backticks in MySQL. Active Record queries are automatically protected, however if you need to manually protect an identifier you can use:

    -

    $this->db->protect_identifiers('table_name');

    - -

    This function will also add a table prefix to your table, assuming you have a prefix specified in your database config file. To enable the prefixing set TRUE (boolen) via the second parameter:

    -

    $this->db->protect_identifiers('table_name', TRUE);

    - - -

    Escaping Queries

    -

    It's a very good security practice to escape your data before submitting it into your database. -CodeIgniter has two functions that help you do this:

    - -
      -
    1. $this->db->escape() This function determines the data type so that it -can escape only string data. It also automatically adds single quotes around the data so you don't have to: - -$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";
      2. - -
    2. $this->db->escape_str() This function escapes the data passed to it, regardless of type. -Most of the time you'll use the above function rather than this one. Use the function like this: - -$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')";
      3. -
    - - -

    Query Bindings

    - - -

    Bindings enable you to simplify your query syntax by letting the system put the queries together for you. Consider the following example:

    - - -$sql = "SELECT * FROM some_table WHERE id = ? AND status = ? AND author = ?"; -

    -$this->db->query($sql, array(3, 'live', 'Rick')); -     - -

    The question marks in the query are automatically replaced with the values in the array in the second parameter of the query function.

    -

    The secondary benefit of using binds is that the values are automatically escaped, producing safer queries. You don't have to remember to manually escape data; the engine does it automatically for you.

    - - - -
    - - - - - - + + + + + +Queries : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + + +
    + + + +
    + + +

    Queries

    + +

    $this->db->query();

    + +

    To submit a query, use the following function:

    + +$this->db->query('YOUR QUERY HERE'); + +

    The query() function returns a database result object when "read" type queries are run, +which you can use to show your results. When "write" type queries are run it simply returns TRUE or FALSE +depending on success or failure. When retrieving data you will typically assign the query to your own variable, like this:

    + +$query = $this->db->query('YOUR QUERY HERE'); + +

    $this->db->simple_query();

    + +

    This is a simplified version of the $this->db->query() function. It ONLY returns TRUE/FALSE on success or failure. +It DOES NOT return a database result set, nor does it set the query timer, or compile bind data, or store your query for debugging. +It simply lets you submit a query. Most users will rarely use this function.

    + + +

    Adding Database prefixes manually

    +

    If you have configured a database prefix and would like to add it in manually for, you can use the following.

    +

    $this->db->dbprefix('tablename');
    +// outputs prefix_tablename

    + + +

    Protecting identifiers

    +

    In many databases it is advisable to protect table and field names - for example with backticks in MySQL. Active Record queries are automatically protected, however if you need to manually protect an identifier you can use:

    +

    $this->db->protect_identifiers('table_name');

    + +

    This function will also add a table prefix to your table, assuming you have a prefix specified in your database config file. To enable the prefixing set TRUE (boolen) via the second parameter:

    +

    $this->db->protect_identifiers('table_name', TRUE);

    + + +

    Escaping Queries

    +

    It's a very good security practice to escape your data before submitting it into your database. +CodeIgniter has two functions that help you do this:

    + +
      +
    1. $this->db->escape() This function determines the data type so that it +can escape only string data. It also automatically adds single quotes around the data so you don't have to: + +$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";
      2. + +
    2. $this->db->escape_str() This function escapes the data passed to it, regardless of type. +Most of the time you'll use the above function rather than this one. Use the function like this: + +$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')";
      3. +
    + + +

    Query Bindings

    + + +

    Bindings enable you to simplify your query syntax by letting the system put the queries together for you. Consider the following example:

    + + +$sql = "SELECT * FROM some_table WHERE id = ? AND status = ? AND author = ?"; +

    +$this->db->query($sql, array(3, 'live', 'Rick')); +     + +

    The question marks in the query are automatically replaced with the values in the array in the second parameter of the query function.

    +

    The secondary benefit of using binds is that the values are automatically escaped, producing safer queries. You don't have to remember to manually escape data; the engine does it automatically for you.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/results.html b/user_guide/database/results.html index a6ca6219..7f8879e3 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -1,238 +1,238 @@ - - - - - -Generating Query Results : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - - - -

    Generating Query Results

    - - -

    There are several ways to generate query results:

    - -

    result()

    - -

    This function returns the query result as an array of objects, or an empty array on failure. - - Typically you'll use this in a foreach loop, like this:

    - - - $query = $this->db->query("YOUR QUERY");
    -
    - foreach ($query->result() as $row)
    - {
    -    echo $row->title;
    -    echo $row->name;
    -    echo $row->body;
    - }     - -

    The above function is an alias of result_object().

    - -

    If you run queries that might not produce a result, you are encouraged to test the result first:

    - - - $query = $this->db->query("YOUR QUERY");
    -
    - if ($query->num_rows() > 0)
    - {
    -    foreach ($query->result() as $row)
    -    {
    -       echo $row->title;
    -       echo $row->name;
    -       echo $row->body;
    -    }
    - } -     - -

    result_array()

    - -

    This function returns the query result as a pure array, or an empty array when no result is produced. Typically you'll use this in a foreach loop, like this:

    - - $query = $this->db->query("YOUR QUERY");
    -
    - foreach ($query->result_array() as $row)
    - {
    -    echo $row['title'];
    -    echo $row['name'];
    -    echo $row['body'];
    - }     - - -

    row()

    - -

    This function returns a single result row. If your query has more than one row, it returns only the first row. - The result is returned as an object. Here's a usage example:

    - - $query = $this->db->query("YOUR QUERY");
    -
    - if ($query->num_rows() > 0)
    - {
    -    $row = $query->row(); -

    -    echo $row->title;
    -    echo $row->name;
    -    echo $row->body;
    - } -     - -

    If you want a specific row returned you can submit the row number as a digit in the first parameter:

    - - $row = $query->row(5); - - -

    row_array()

    - -

    Identical to the above row() function, except it returns an array. Example:

    - - - $query = $this->db->query("YOUR QUERY");
    -
    - if ($query->num_rows() > 0)
    - {
    -    $row = $query->row_array(); -

    -    echo $row['title'];
    -    echo $row['name'];
    -    echo $row['body'];
    - } -     - - -

    If you want a specific row returned you can submit the row number as a digit in the first parameter:

    - - $row = $query->row_array(5); - - -

    In addition, you can walk forward/backwards/first/last through your results using these variations:

    - -

    - $row = $query->first_row()
    - $row = $query->last_row()
    - $row = $query->next_row()
    - $row = $query->previous_row() -

    - -

    By default they return an object unless you put the word "array" in the parameter:

    - -

    - $row = $query->first_row('array')
    - $row = $query->last_row('array')
    - $row = $query->next_row('array')
    - $row = $query->previous_row('array') -

    - - - -

    Result Helper Functions

    - - -

    $query->num_rows()

    -

    The number of rows returned by the query. Note: In this example, $query is the variable that the query result object is assigned to:

    - -$query = $this->db->query('SELECT * FROM my_table');

    -echo $query->num_rows(); -     - -

    $query->num_fields()

    -

    The number of FIELDS (columns) returned by the query. Make sure to call the function using your query result object:

    - -$query = $this->db->query('SELECT * FROM my_table');

    -echo $query->num_fields(); -     - - - -

    $query->free_result()

    -

    It frees the memory associated with the result and deletes the result resource ID. Normally PHP frees its memory automatically at the end of script -execution. However, if you are running a lot of queries in a particular script you might want to free the result after each query result has been -generated in order to cut down on memory consumptions. Example: -

    - -$query = $this->db->query('SELECT title FROM my_table');

    -foreach ($query->result() as $row)
    -{
    -   echo $row->title;
    -}
    -$query->free_result(); // The $query result object will no longer be available
    -
    -$query2 = $this->db->query('SELECT name FROM some_table');

    -$row = $query2->row();
    -echo $row->name;
    -$query2->free_result(); // The $query2 result object will no longer be available -     - - - - - -
    - - - - - - + + + + + +Generating Query Results : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + + + +

    Generating Query Results

    + + +

    There are several ways to generate query results:

    + +

    result()

    + +

    This function returns the query result as an array of objects, or an empty array on failure. + + Typically you'll use this in a foreach loop, like this:

    + + + $query = $this->db->query("YOUR QUERY");
    +
    + foreach ($query->result() as $row)
    + {
    +    echo $row->title;
    +    echo $row->name;
    +    echo $row->body;
    + }     + +

    The above function is an alias of result_object().

    + +

    If you run queries that might not produce a result, you are encouraged to test the result first:

    + + + $query = $this->db->query("YOUR QUERY");
    +
    + if ($query->num_rows() > 0)
    + {
    +    foreach ($query->result() as $row)
    +    {
    +       echo $row->title;
    +       echo $row->name;
    +       echo $row->body;
    +    }
    + } +     + +

    result_array()

    + +

    This function returns the query result as a pure array, or an empty array when no result is produced. Typically you'll use this in a foreach loop, like this:

    + + $query = $this->db->query("YOUR QUERY");
    +
    + foreach ($query->result_array() as $row)
    + {
    +    echo $row['title'];
    +    echo $row['name'];
    +    echo $row['body'];
    + }     + + +

    row()

    + +

    This function returns a single result row. If your query has more than one row, it returns only the first row. + The result is returned as an object. Here's a usage example:

    + + $query = $this->db->query("YOUR QUERY");
    +
    + if ($query->num_rows() > 0)
    + {
    +    $row = $query->row(); +

    +    echo $row->title;
    +    echo $row->name;
    +    echo $row->body;
    + } +     + +

    If you want a specific row returned you can submit the row number as a digit in the first parameter:

    + + $row = $query->row(5); + + +

    row_array()

    + +

    Identical to the above row() function, except it returns an array. Example:

    + + + $query = $this->db->query("YOUR QUERY");
    +
    + if ($query->num_rows() > 0)
    + {
    +    $row = $query->row_array(); +

    +    echo $row['title'];
    +    echo $row['name'];
    +    echo $row['body'];
    + } +     + + +

    If you want a specific row returned you can submit the row number as a digit in the first parameter:

    + + $row = $query->row_array(5); + + +

    In addition, you can walk forward/backwards/first/last through your results using these variations:

    + +

    + $row = $query->first_row()
    + $row = $query->last_row()
    + $row = $query->next_row()
    + $row = $query->previous_row() +

    + +

    By default they return an object unless you put the word "array" in the parameter:

    + +

    + $row = $query->first_row('array')
    + $row = $query->last_row('array')
    + $row = $query->next_row('array')
    + $row = $query->previous_row('array') +

    + + + +

    Result Helper Functions

    + + +

    $query->num_rows()

    +

    The number of rows returned by the query. Note: In this example, $query is the variable that the query result object is assigned to:

    + +$query = $this->db->query('SELECT * FROM my_table');

    +echo $query->num_rows(); +     + +

    $query->num_fields()

    +

    The number of FIELDS (columns) returned by the query. Make sure to call the function using your query result object:

    + +$query = $this->db->query('SELECT * FROM my_table');

    +echo $query->num_fields(); +     + + + +

    $query->free_result()

    +

    It frees the memory associated with the result and deletes the result resource ID. Normally PHP frees its memory automatically at the end of script +execution. However, if you are running a lot of queries in a particular script you might want to free the result after each query result has been +generated in order to cut down on memory consumptions. Example: +

    + +$query = $this->db->query('SELECT title FROM my_table');

    +foreach ($query->result() as $row)
    +{
    +   echo $row->title;
    +}
    +$query->free_result(); // The $query result object will no longer be available
    +
    +$query2 = $this->db->query('SELECT name FROM some_table');

    +$row = $query2->row();
    +echo $row->name;
    +$query2->free_result(); // The $query2 result object will no longer be available +     + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 7f8e461e..3f333933 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -1,113 +1,113 @@ - - - - - -Table Data : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - - - -

    Table Data

    - -

    These functions let you fetch table information.

    - -

    $this->db->list_tables();

    - -

    Returns an array containing the names of all the tables in the database you are currently connected to. Example:

    - -$tables = $this->db->list_tables();
    -
    -foreach ($tables as $table)
    -{
    -   echo $table;
    -} -     - - -

    $this->db->table_exists();

    - -

    Sometimes it's helpful to know whether a particular table exists before running an operation on it. -Returns a boolean TRUE/FALSE. Usage example:

    - - -if ($this->db->table_exists('table_name'))
    -{
    -   // some code...
    -} -     - -

    Note: Replace table_name with the name of the table you are looking for.

    - - - - - -
    - - - - - - + + + + + +Table Data : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + + + +

    Table Data

    + +

    These functions let you fetch table information.

    + +

    $this->db->list_tables();

    + +

    Returns an array containing the names of all the tables in the database you are currently connected to. Example:

    + +$tables = $this->db->list_tables();
    +
    +foreach ($tables as $table)
    +{
    +   echo $table;
    +} +     + + +

    $this->db->table_exists();

    + +

    Sometimes it's helpful to know whether a particular table exists before running an operation on it. +Returns a boolean TRUE/FALSE. Usage example:

    + + +if ($this->db->table_exists('table_name'))
    +{
    +   // some code...
    +} +     + +

    Note: Replace table_name with the name of the table you are looking for.

    + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 8652aad1..1276cdc3 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -1,200 +1,200 @@ - - - - - -Transactions : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - - -
    - - - -
    - - - -
    - - -

    Transactions

    - -

    CodeIgniter's database abstraction allows you to use transactions with databases that support transaction-safe table types. In MySQL, you'll need -to be running InnoDB or BDB table types rather than the more common MyISAM. Most other database platforms support transactions natively.

    - -

    If you are not familiar with -transactions we recommend you find a good online resource to learn about them for your particular database. The information below assumes you -have a basic understanding of transactions. -

    - -

    CodeIgniter's Approach to Transactions

    - -

    CodeIgniter utilizes an approach to transactions that is very similar to the process used by the popular database class ADODB. We've chosen that approach -because it greatly simplifies the process of running transactions. In most cases all that is required are two lines of code.

    - -

    Traditionally, transactions have required a fair amount of work to implement since they demand that you to keep track of your queries -and determine whether to commit or rollback based on the success or failure of your queries. This is particularly cumbersome with -nested queries. In contrast, -we've implemented a smart transaction system that does all this for you automatically (you can also manage your transactions manually if you choose to, -but there's really no benefit).

    - -

    Running Transactions

    - -

    To run your queries using transactions you will use the $this->db->trans_start() and $this->db->trans_complete() functions as follows:

    - - -$this->db->trans_start();
    -$this->db->query('AN SQL QUERY...');
    -$this->db->query('ANOTHER QUERY...');
    -$this->db->query('AND YET ANOTHER QUERY...');
    -$this->db->trans_complete(); -     - -

    You can run as many queries as you want between the start/complete functions and they will all be committed or rolled back based on success or failure -of any given query.

    - - -

    Strict Mode

    - -

    By default CodeIgniter runs all transactions in Strict Mode. When strict mode is enabled, if you are running multiple groups of -transactions, if one group fails all groups will be rolled back. If strict mode is disabled, each group is treated independently, meaning -a failure of one group will not affect any others.

    - -

    Strict Mode can be disabled as follows:

    - -$this->db->trans_strict(FALSE); - - -

    Managing Errors

    - -

    If you have error reporting enabled in your config/database.php file you'll see a standard error message if the commit was unsuccessful. If debugging is turned off, you can -manage your own errors like this:

    - - -$this->db->trans_start();
    -$this->db->query('AN SQL QUERY...');
    -$this->db->query('ANOTHER QUERY...');
    -$this->db->trans_complete();
    -
    -if ($this->db->trans_status() === FALSE)
    -{
    -    // generate an error... or use the log_message() function to log your error
    -} -     - - -

    Enabling Transactions

    - -

    Transactions are enabled automatically the moment you use $this->db->trans_start(). If you would like to disable transactions you -can do so using $this->db->trans_off():

    - - -$this->db->trans_off()

    - -$this->db->trans_start();
    -$this->db->query('AN SQL QUERY...');
    -$this->db->trans_complete(); -     - -

    When transactions are disabled, your queries will be auto-commited, just as they are when running queries without transactions.

    - - -

    Test Mode

    - -

    You can optionally put the transaction system into "test mode", which will cause your queries to be rolled back -- even if the queries produce a valid result. -To use test mode simply set the first parameter in the $this->db->trans_start() function to TRUE:

    - - -$this->db->trans_start(TRUE); // Query will be rolled back
    -$this->db->query('AN SQL QUERY...');
    -$this->db->trans_complete(); -     - - -

    Running Transactions Manually

    - -

    If you would like to run transactions manually you can do so as follows:

    - - -$this->db->trans_begin();

    - -$this->db->query('AN SQL QUERY...');
    -$this->db->query('ANOTHER QUERY...');
    -$this->db->query('AND YET ANOTHER QUERY...');
    - -
    - -if ($this->db->trans_status() === FALSE)
    -{
    -    $this->db->trans_rollback();
    -}
    -else
    -{
    -    $this->db->trans_commit();
    -}
    -     - -

    Note: Make sure to use $this->db->trans_begin() when running manual transactions, NOT -$this->db->trans_start().

    - - - - -
    - - - - - - + + + + + +Transactions : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + + +
    + + + +
    + + + +
    + + +

    Transactions

    + +

    CodeIgniter's database abstraction allows you to use transactions with databases that support transaction-safe table types. In MySQL, you'll need +to be running InnoDB or BDB table types rather than the more common MyISAM. Most other database platforms support transactions natively.

    + +

    If you are not familiar with +transactions we recommend you find a good online resource to learn about them for your particular database. The information below assumes you +have a basic understanding of transactions. +

    + +

    CodeIgniter's Approach to Transactions

    + +

    CodeIgniter utilizes an approach to transactions that is very similar to the process used by the popular database class ADODB. We've chosen that approach +because it greatly simplifies the process of running transactions. In most cases all that is required are two lines of code.

    + +

    Traditionally, transactions have required a fair amount of work to implement since they demand that you to keep track of your queries +and determine whether to commit or rollback based on the success or failure of your queries. This is particularly cumbersome with +nested queries. In contrast, +we've implemented a smart transaction system that does all this for you automatically (you can also manage your transactions manually if you choose to, +but there's really no benefit).

    + +

    Running Transactions

    + +

    To run your queries using transactions you will use the $this->db->trans_start() and $this->db->trans_complete() functions as follows:

    + + +$this->db->trans_start();
    +$this->db->query('AN SQL QUERY...');
    +$this->db->query('ANOTHER QUERY...');
    +$this->db->query('AND YET ANOTHER QUERY...');
    +$this->db->trans_complete(); +     + +

    You can run as many queries as you want between the start/complete functions and they will all be committed or rolled back based on success or failure +of any given query.

    + + +

    Strict Mode

    + +

    By default CodeIgniter runs all transactions in Strict Mode. When strict mode is enabled, if you are running multiple groups of +transactions, if one group fails all groups will be rolled back. If strict mode is disabled, each group is treated independently, meaning +a failure of one group will not affect any others.

    + +

    Strict Mode can be disabled as follows:

    + +$this->db->trans_strict(FALSE); + + +

    Managing Errors

    + +

    If you have error reporting enabled in your config/database.php file you'll see a standard error message if the commit was unsuccessful. If debugging is turned off, you can +manage your own errors like this:

    + + +$this->db->trans_start();
    +$this->db->query('AN SQL QUERY...');
    +$this->db->query('ANOTHER QUERY...');
    +$this->db->trans_complete();
    +
    +if ($this->db->trans_status() === FALSE)
    +{
    +    // generate an error... or use the log_message() function to log your error
    +} +     + + +

    Enabling Transactions

    + +

    Transactions are enabled automatically the moment you use $this->db->trans_start(). If you would like to disable transactions you +can do so using $this->db->trans_off():

    + + +$this->db->trans_off()

    + +$this->db->trans_start();
    +$this->db->query('AN SQL QUERY...');
    +$this->db->trans_complete(); +     + +

    When transactions are disabled, your queries will be auto-commited, just as they are when running queries without transactions.

    + + +

    Test Mode

    + +

    You can optionally put the transaction system into "test mode", which will cause your queries to be rolled back -- even if the queries produce a valid result. +To use test mode simply set the first parameter in the $this->db->trans_start() function to TRUE:

    + + +$this->db->trans_start(TRUE); // Query will be rolled back
    +$this->db->query('AN SQL QUERY...');
    +$this->db->trans_complete(); +     + + +

    Running Transactions Manually

    + +

    If you would like to run transactions manually you can do so as follows:

    + + +$this->db->trans_begin();

    + +$this->db->query('AN SQL QUERY...');
    +$this->db->query('ANOTHER QUERY...');
    +$this->db->query('AND YET ANOTHER QUERY...');
    + +
    + +if ($this->db->trans_status() === FALSE)
    +{
    +    $this->db->trans_rollback();
    +}
    +else
    +{
    +    $this->db->trans_commit();
    +}
    +     + +

    Note: Make sure to use $this->db->trans_begin() when running manual transactions, NOT +$this->db->trans_start().

    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index e6847b37..6d3f6f31 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -1,295 +1,295 @@ - - - - - -Database Utility Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - - -
    - - - -
    - -

    Database Utility Class

    - -

    The Database Utility Class contains functions that help you manage your database.

    - -

    Table of Contents

    - - - - - -

    Initializing the Utility Class

    - -

    Important:  In order to initialize the Utility class, your database driver must -already be running, since the utilities class relies on it.

    - -

    Load the Utility Class as follows:

    - -$this->load->dbutil() - -

    Once initialized you will access the functions using the $this->dbutil object:

    - -$this->dbutil->some_function() - -

    $this->dbutil->list_databases()

    -

    Returns an array of database names:

    - - -$dbs = $this->dbutil->list_databases();
    -
    -foreach($dbs as $db)
    -{
    -    echo $db;
    -}     -

    $this->dbutil->optimize_table('table_name');

    - -

    Note:  This features is only available for MySQL/MySQLi databases.

    - - -

    Permits you to optimize a table using the table name specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    - - -if ($this->dbutil->optimize_table('table_name'))
    -{
    -    echo 'Success!';
    -} -     - -

    Note: Not all database platforms support table optimization.

    - - -

    $this->dbutil->repair_table('table_name');

    - -

    Note:  This features is only available for MySQL/MySQLi databases.

    - - -

    Permits you to repair a table using the table name specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    - - -if ($this->dbutil->repair_table('table_name'))
    -{
    -    echo 'Success!';
    -} -     - -

    Note: Not all database platforms support table repairs.

    - - -

    $this->dbutil->optimize_database();

    - -

    Note:  This features is only available for MySQL/MySQLi databases.

    - -

    Permits you to optimize the database your DB class is currently connected to. Returns an array containing the DB status messages or FALSE on failure.

    - - -$result = $this->dbutil->optimize_database();
    -
    -if ($result !== FALSE)
    -{
    -    print_r($result);
    -} -     - -

    Note: Not all database platforms support table optimization.

    - - -

    $this->dbutil->csv_from_result($db_result)

    - -

    Permits you to generate a CSV file from a query result. The first parameter of the function must contain the result object from your query. -Example:

    - - -$this->load->dbutil();
    -
    -$query = $this->db->query("SELECT * FROM mytable");
    -
    -echo $this->dbutil->csv_from_result($query); -     - -

    The second and third parameters allows you to -set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example:

    - - -$delimiter = ",";
    -$newline = "\r\n";
    -
    -echo $this->dbutil->csv_from_result($query, $delimiter, $newline); -     - -

    Important:  This function will NOT write the CSV file for you. It simply creates the CSV layout. -If you need to write the file use the File Helper.

    - - -

    $this->dbutil->xml_from_result($db_result)

    - -

    Permits you to generate an XML file from a query result. The first parameter expects a query result object, the second -may contain an optional array of config parameters. Example:

    - - -$this->load->dbutil();
    -
    -$query = $this->db->query("SELECT * FROM mytable");
    -
    -$config = array (
    -                  'root'    => 'root',
    -                  'element' => 'element',
    -                  'newline' => "\n",
    -                  'tab'    => "\t"
    -                );
    -
    -echo $this->dbutil->xml_from_result($query, $config); -     - -

    Important:  This function will NOT write the XML file for you. It simply creates the XML layout. -If you need to write the file use the File Helper.

    - - -

    $this->dbutil->backup()

    - -

    Permits you to backup your full database or individual tables. The backup data can be compressed in either Zip or Gzip format.

    - -

    Note:  This features is only available for MySQL databases.

    - -

    Note: Due to the limited execution time and memory available to PHP, backing up very large -databases may not be possible. If your database is very large you might need to backup directly from your SQL server -via the command line, or have your server admin do it for you if you do not have root privileges.

    - -

    Usage Example

    - - -// Load the DB utility class
    -$this->load->dbutil();

    - -// Backup your entire database and assign it to a variable
    -$backup =& $this->dbutil->backup(); - -

    -// Load the file helper and write the file to your server
    -$this->load->helper('file');
    -write_file('/path/to/mybackup.gz', $backup); - -

    -// Load the download helper and send the file to your desktop
    -$this->load->helper('download');
    -force_download('mybackup.gz', $backup); -     - -

    Setting Backup Preferences

    - -

    Backup preferences are set by submitting an array of values to the first parameter of the backup function. Example:

    - -$prefs = array(
    -                'tables'      => array('table1', 'table2'),  // Array of tables to backup.
    -                'ignore'      => array(),           // List of tables to omit from the backup
    -                'format'      => 'txt',             // gzip, zip, txt
    -                'filename'    => 'mybackup.sql',    // File name - NEEDED ONLY WITH ZIP FILES
    -                'add_drop'    => TRUE,              // Whether to add DROP TABLE statements to backup file
    -                'add_insert'  => TRUE,              // Whether to add INSERT data to backup file
    -                'newline'     => "\n"               // Newline character used in backup file
    -              );
    -
    -$this->dbutil->backup($prefs); -     - - -

    Description of Backup Preferences

    - - - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefault ValueOptionsDescription
    tablesempty arrayNoneAn array of tables you want backed up. If left blank all tables will be exported.
    ignoreempty arrayNoneAn array of tables you want the backup routine to ignore.
    formatgzipgzip, zip, txtThe file format of the export file.
    filenamethe current date/timeNoneThe name of the backed-up file. The name is needed only if you are using zip compression.
    add_dropTRUETRUE/FALSEWhether to include DROP TABLE statements in your SQL export file.
    add_insertTRUETRUE/FALSEWhether to include INSERT statements in your SQL export file.
    newline"\n""\n", "\r", "\r\n"Type of newline to use in your SQL export file.
    - - -
    - - - - - - + + + + + +Database Utility Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + + +
    + + + +
    + +

    Database Utility Class

    + +

    The Database Utility Class contains functions that help you manage your database.

    + +

    Table of Contents

    + + + + + +

    Initializing the Utility Class

    + +

    Important:  In order to initialize the Utility class, your database driver must +already be running, since the utilities class relies on it.

    + +

    Load the Utility Class as follows:

    + +$this->load->dbutil() + +

    Once initialized you will access the functions using the $this->dbutil object:

    + +$this->dbutil->some_function() + +

    $this->dbutil->list_databases()

    +

    Returns an array of database names:

    + + +$dbs = $this->dbutil->list_databases();
    +
    +foreach($dbs as $db)
    +{
    +    echo $db;
    +}     +

    $this->dbutil->optimize_table('table_name');

    + +

    Note:  This features is only available for MySQL/MySQLi databases.

    + + +

    Permits you to optimize a table using the table name specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    + + +if ($this->dbutil->optimize_table('table_name'))
    +{
    +    echo 'Success!';
    +} +     + +

    Note: Not all database platforms support table optimization.

    + + +

    $this->dbutil->repair_table('table_name');

    + +

    Note:  This features is only available for MySQL/MySQLi databases.

    + + +

    Permits you to repair a table using the table name specified in the first parameter. Returns TRUE/FALSE based on success or failure:

    + + +if ($this->dbutil->repair_table('table_name'))
    +{
    +    echo 'Success!';
    +} +     + +

    Note: Not all database platforms support table repairs.

    + + +

    $this->dbutil->optimize_database();

    + +

    Note:  This features is only available for MySQL/MySQLi databases.

    + +

    Permits you to optimize the database your DB class is currently connected to. Returns an array containing the DB status messages or FALSE on failure.

    + + +$result = $this->dbutil->optimize_database();
    +
    +if ($result !== FALSE)
    +{
    +    print_r($result);
    +} +     + +

    Note: Not all database platforms support table optimization.

    + + +

    $this->dbutil->csv_from_result($db_result)

    + +

    Permits you to generate a CSV file from a query result. The first parameter of the function must contain the result object from your query. +Example:

    + + +$this->load->dbutil();
    +
    +$query = $this->db->query("SELECT * FROM mytable");
    +
    +echo $this->dbutil->csv_from_result($query); +     + +

    The second and third parameters allows you to +set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example:

    + + +$delimiter = ",";
    +$newline = "\r\n";
    +
    +echo $this->dbutil->csv_from_result($query, $delimiter, $newline); +     + +

    Important:  This function will NOT write the CSV file for you. It simply creates the CSV layout. +If you need to write the file use the File Helper.

    + + +

    $this->dbutil->xml_from_result($db_result)

    + +

    Permits you to generate an XML file from a query result. The first parameter expects a query result object, the second +may contain an optional array of config parameters. Example:

    + + +$this->load->dbutil();
    +
    +$query = $this->db->query("SELECT * FROM mytable");
    +
    +$config = array (
    +                  'root'    => 'root',
    +                  'element' => 'element',
    +                  'newline' => "\n",
    +                  'tab'    => "\t"
    +                );
    +
    +echo $this->dbutil->xml_from_result($query, $config); +     + +

    Important:  This function will NOT write the XML file for you. It simply creates the XML layout. +If you need to write the file use the File Helper.

    + + +

    $this->dbutil->backup()

    + +

    Permits you to backup your full database or individual tables. The backup data can be compressed in either Zip or Gzip format.

    + +

    Note:  This features is only available for MySQL databases.

    + +

    Note: Due to the limited execution time and memory available to PHP, backing up very large +databases may not be possible. If your database is very large you might need to backup directly from your SQL server +via the command line, or have your server admin do it for you if you do not have root privileges.

    + +

    Usage Example

    + + +// Load the DB utility class
    +$this->load->dbutil();

    + +// Backup your entire database and assign it to a variable
    +$backup =& $this->dbutil->backup(); + +

    +// Load the file helper and write the file to your server
    +$this->load->helper('file');
    +write_file('/path/to/mybackup.gz', $backup); + +

    +// Load the download helper and send the file to your desktop
    +$this->load->helper('download');
    +force_download('mybackup.gz', $backup); +     + +

    Setting Backup Preferences

    + +

    Backup preferences are set by submitting an array of values to the first parameter of the backup function. Example:

    + +$prefs = array(
    +                'tables'      => array('table1', 'table2'),  // Array of tables to backup.
    +                'ignore'      => array(),           // List of tables to omit from the backup
    +                'format'      => 'txt',             // gzip, zip, txt
    +                'filename'    => 'mybackup.sql',    // File name - NEEDED ONLY WITH ZIP FILES
    +                'add_drop'    => TRUE,              // Whether to add DROP TABLE statements to backup file
    +                'add_insert'  => TRUE,              // Whether to add INSERT data to backup file
    +                'newline'     => "\n"               // Newline character used in backup file
    +              );
    +
    +$this->dbutil->backup($prefs); +     + + +

    Description of Backup Preferences

    + + + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescription
    tablesempty arrayNoneAn array of tables you want backed up. If left blank all tables will be exported.
    ignoreempty arrayNoneAn array of tables you want the backup routine to ignore.
    formatgzipgzip, zip, txtThe file format of the export file.
    filenamethe current date/timeNoneThe name of the backed-up file. The name is needed only if you are using zip compression.
    add_dropTRUETRUE/FALSEWhether to include DROP TABLE statements in your SQL export file.
    add_insertTRUETRUE/FALSEWhether to include INSERT statements in your SQL export file.
    newline"\n""\n", "\r", "\r\n"Type of newline to use in your SQL export file.
    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 42ebdd1b..24088abd 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -1,86 +1,86 @@ - - - - - -Writing Documentation : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Writing Documentation

    - -

    To help facilitate a consistent, easy-to-read documentation style for CodeIgniter projects, Ellislab is making the markup and CSS from the CodeIgniter user guide freely available to the community for their use. For your convenience, a template file has been created that includes the primary blocks of markup used with brief samples.

    - -

    Files

    - - - - -
    - - - - - - - + + + + + +Writing Documentation : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Writing Documentation

    + +

    To help facilitate a consistent, easy-to-read documentation style for CodeIgniter projects, Ellislab is making the markup and CSS from the CodeIgniter user guide freely available to the community for their use. For your convenience, a template file has been created that includes the primary blocks of markup used with brief samples.

    + +

    Files

    + + + + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/doc_style/template.html b/user_guide/doc_style/template.html index 84f559d5..b6c7dbd6 100644 --- a/user_guide/doc_style/template.html +++ b/user_guide/doc_style/template.html @@ -1,128 +1,128 @@ - - - - - -CodeIgniter Project Documentation Template - - - - - - - - - - - - - - -
    - - - - - -

    Project Title

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Foo Class

    - -

    Brief description of Foo Class. If it extends a native CodeIgniter class, please link to the class in the CodeIgniter documents here.

    - -

    Important:  This is an important note with EMPHASIS.

    - -

    Features:

    - -
      -
    • Foo
      • -
    • Bar
      • -
    - -

    Usage Heading

    - -

    Within a text string, highlight variables using <var></var> tags, and highlight code using the <dfn></dfn> tags.

    - -

    Sub-heading

    - -

    Put code examples within <code></code> tags:

    - - - $this->load->library('foo');
    -
    - $this->foo->bar('bat'); -     - - -

    Table Preferences

    - -

    Use tables where appropriate for long lists of preferences.

    - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefault ValueOptionsDescription
    fooFooNoneDescription of foo.
    barBarbat, bag, or bakDescription of bar.
    - -

    Foo Function Reference

    - -

    $this->foo->bar()

    -

    Description

    -$this->foo->bar('baz') - -
    - - - - - - + + + + + +CodeIgniter Project Documentation Template + + + + + + + + + + + + + + +
    + + + + + +

    Project Title

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Foo Class

    + +

    Brief description of Foo Class. If it extends a native CodeIgniter class, please link to the class in the CodeIgniter documents here.

    + +

    Important:  This is an important note with EMPHASIS.

    + +

    Features:

    + +
      +
    • Foo
      • +
    • Bar
      • +
    + +

    Usage Heading

    + +

    Within a text string, highlight variables using <var></var> tags, and highlight code using the <dfn></dfn> tags.

    + +

    Sub-heading

    + +

    Put code examples within <code></code> tags:

    + + + $this->load->library('foo');
    +
    + $this->foo->bar('bat'); +     + + +

    Table Preferences

    + +

    Use tables where appropriate for long lists of preferences.

    + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescription
    fooFooNoneDescription of foo.
    barBarbat, bag, or bakDescription of bar.
    + +

    Foo Function Reference

    + +

    $this->foo->bar()

    +

    Description

    +$this->foo->bar('baz') + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index a8e86039..ed9d1c83 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -1,147 +1,147 @@ - - - - - -Alternate PHP Syntax for View Files : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Alternate PHP Syntax for View Files

    - -

    If you do not utilize CodeIgniter's template engine, you'll be using pure PHP -in your View files. To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use -PHPs alternative syntax for control structures and short tag echo statements. If you are not familiar with this syntax, it allows you to eliminate the braces from your code, -and eliminate "echo" statements.

    - -

    Automatic Short Tag Support

    - -

    Note: If you find that the syntax described in this page does not work on your server it might -be that "short tags" are disabled in your PHP ini file. CodeIgniter will optionally rewrite short tags on-the-fly, -allowing you to use that syntax even if your server doesn't support it. This feature can be enabled in your -config/config.php file.

    - -

    Please note that if you do use this feature, if PHP errors are encountered -in your view files, the error message and line number will not be accurately shown. Instead, all errors -will be shown as eval() errors.

    - - -

    Alternative Echos

    - -

    Normally to echo, or print out a variable you would do this:

    - -<?php echo $variable; ?> - -

    With the alternative syntax you can instead do it this way:

    - -<?=$variable?> - - - -

    Alternative Control Structures

    - -

    Controls structures, like if, for, foreach, and while can be -written in a simplified format as well. Here is an example using foreach:

    - - -<ul>
    -
    -<?php foreach($todo as $item): ?>
    -
    -<li><?=$item?></li>
    -
    -<?php endforeach; ?>
    -
    -</ul>     - -

    Notice that there are no braces. Instead, the end brace is replaced with endforeach. -Each of the control structures listed above has a similar closing syntax: -endif, endfor, endforeach, and endwhile

    - -

    Also notice that instead of using a semicolon after each structure (except the last one), there is a colon. This is -important!

    - -

    Here is another example, using if/elseif/else. Notice the colons:

    - - -<?php if ($username == 'sally'): ?>
    -
    -   <h3>Hi Sally</h3>
    -
    -<?php elseif ($username == 'joe'): ?>
    -
    -   <h3>Hi Joe</h3>
    -
    -<?php else: ?>
    -
    -   <h3>Hi unknown user</h3>
    -
    -<?php endif; ?>     - - - -
    - - - - - - + + + + + +Alternate PHP Syntax for View Files : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Alternate PHP Syntax for View Files

    + +

    If you do not utilize CodeIgniter's template engine, you'll be using pure PHP +in your View files. To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use +PHPs alternative syntax for control structures and short tag echo statements. If you are not familiar with this syntax, it allows you to eliminate the braces from your code, +and eliminate "echo" statements.

    + +

    Automatic Short Tag Support

    + +

    Note: If you find that the syntax described in this page does not work on your server it might +be that "short tags" are disabled in your PHP ini file. CodeIgniter will optionally rewrite short tags on-the-fly, +allowing you to use that syntax even if your server doesn't support it. This feature can be enabled in your +config/config.php file.

    + +

    Please note that if you do use this feature, if PHP errors are encountered +in your view files, the error message and line number will not be accurately shown. Instead, all errors +will be shown as eval() errors.

    + + +

    Alternative Echos

    + +

    Normally to echo, or print out a variable you would do this:

    + +<?php echo $variable; ?> + +

    With the alternative syntax you can instead do it this way:

    + +<?=$variable?> + + + +

    Alternative Control Structures

    + +

    Controls structures, like if, for, foreach, and while can be +written in a simplified format as well. Here is an example using foreach:

    + + +<ul>
    +
    +<?php foreach($todo as $item): ?>
    +
    +<li><?=$item?></li>
    +
    +<?php endforeach; ?>
    +
    +</ul>     + +

    Notice that there are no braces. Instead, the end brace is replaced with endforeach. +Each of the control structures listed above has a similar closing syntax: +endif, endfor, endforeach, and endwhile

    + +

    Also notice that instead of using a semicolon after each structure (except the last one), there is a colon. This is +important!

    + +

    Here is another example, using if/elseif/else. Notice the colons:

    + + +<?php if ($username == 'sally'): ?>
    +
    +   <h3>Hi Sally</h3>
    +
    +<?php elseif ($username == 'joe'): ?>
    +
    +   <h3>Hi Joe</h3>
    +
    +<?php else: ?>
    +
    +   <h3>Hi unknown user</h3>
    +
    +<?php endif; ?>     + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 9a1d6cd8..274eb50f 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -1,117 +1,117 @@ - - - - - -Creating Ancillary Classes : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Creating Ancillary Classes

    - -

    In some cases you may want to develop classes that exist apart from your controllers but have the ability to -utilize all of CodeIgniter's resources. This is easily possible as you'll see.

    - -

    get_instance()

    - - -

    Any class that you instantiate within your controller functions can access CodeIgniter's native resources simply by using the get_instance() function. -This function returns the main CodeIgniter object.

    - -

    Normally, to call any of the available CodeIgniter functions requires you to use the $this construct:

    - - -$this->load->helper('url');
    -$this->load->library('session');
    -$this->config->item('base_url');
    -etc. -     - -

    $this, however, only works within your controllers, your models, or your views. -If you would like to use CodeIgniter's classes from within your own custom classes you can do so as follows:

    - - -

    First, assign the CodeIgniter object to a variable:

    - -$CI =& get_instance(); - -

    Once you've assigned the object to a variable, you'll use that variable instead of $this:

    - - -$CI =& get_instance();

    -$CI->load->helper('url');
    -$CI->load->library('session');
    -$CI->config->item('base_url');
    -etc. -     - -

    Note: You'll notice that the above get_instance() function is being passed by reference: -

    -$CI =& get_instance(); -

    -This is very important. Assigning by reference allows you to use the original CodeIgniter object rather than creating a copy of it.

    -
    - - - - - - + + + + + +Creating Ancillary Classes : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Creating Ancillary Classes

    + +

    In some cases you may want to develop classes that exist apart from your controllers but have the ability to +utilize all of CodeIgniter's resources. This is easily possible as you'll see.

    + +

    get_instance()

    + + +

    Any class that you instantiate within your controller functions can access CodeIgniter's native resources simply by using the get_instance() function. +This function returns the main CodeIgniter object.

    + +

    Normally, to call any of the available CodeIgniter functions requires you to use the $this construct:

    + + +$this->load->helper('url');
    +$this->load->library('session');
    +$this->config->item('base_url');
    +etc. +     + +

    $this, however, only works within your controllers, your models, or your views. +If you would like to use CodeIgniter's classes from within your own custom classes you can do so as follows:

    + + +

    First, assign the CodeIgniter object to a variable:

    + +$CI =& get_instance(); + +

    Once you've assigned the object to a variable, you'll use that variable instead of $this:

    + + +$CI =& get_instance();

    +$CI->load->helper('url');
    +$CI->load->library('session');
    +$CI->config->item('base_url');
    +etc. +     + +

    Note: You'll notice that the above get_instance() function is being passed by reference: +

    +$CI =& get_instance(); +

    +This is very important. Assigning by reference allows you to use the original CodeIgniter object rather than creating a copy of it.

    +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index b4bfae50..2ab547d8 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -1,101 +1,101 @@ - - - - - -Auto-loading Resources : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Auto-loading Resources

    - -

    CodeIgniter comes with an "Auto-load" feature that permits libraries, helpers, and plugins to be initialized -automatically every time the system runs. If you need certain resources globally throughout your application you should -consider auto-loading them for convenience.

    - -

    The following items can be loaded automatically:

    - -
      -
    • Core classes found in the "libraries" folder
      • -
    • Helper files found in the "helpers" folder
      • -
    • Plugins found in the "plugins" folder
      • -
    • Custom config files found in the "config" folder
      • -
    • Language files found in the "system/language" folder
      • -
    • Models found in the "models" folder
      • -
    - -

    To autoload resources, open the application/config/autoload.php file and add the item you want -loaded to the autoload array. You'll find instructions in that file corresponding to each -type of item.

    - -

    Note: Do not include the file extension (.php) when adding items to the autoload array.

    - - - - - - -
    - - - - - - + + + + + +Auto-loading Resources : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Auto-loading Resources

    + +

    CodeIgniter comes with an "Auto-load" feature that permits libraries, helpers, and plugins to be initialized +automatically every time the system runs. If you need certain resources globally throughout your application you should +consider auto-loading them for convenience.

    + +

    The following items can be loaded automatically:

    + +
      +
    • Core classes found in the "libraries" folder
      • +
    • Helper files found in the "helpers" folder
      • +
    • Plugins found in the "plugins" folder
      • +
    • Custom config files found in the "config" folder
      • +
    • Language files found in the "system/language" folder
      • +
    • Models found in the "models" folder
      • +
    + +

    To autoload resources, open the application/config/autoload.php file and add the item you want +loaded to the autoload array. You'll find instructions in that file corresponding to each +type of item.

    + +

    Note: Do not include the file extension (.php) when adding items to the autoload array.

    + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 0a6d9d65..df433523 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -1,115 +1,115 @@ - - - - - -Web Page Caching : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Web Page Caching

    - -

    CodeIgniter lets you cache your pages in order to achieve maximum performance.

    - -

    Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the -server resources, memory, and processing cycles utilized, which affect your page load speeds. -By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.

    - - -

    How Does Caching Work?

    - -

    Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed. -When a page is loaded for the first time, the cache file will be written to your system/cache folder. On subsequent page loads the cache file will be retrieved -and sent to the requesting user's browser. If it has expired, it will be deleted and refreshed before being sent to the browser.

    - -

    Note: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled.

    - -

    Enabling Caching

    - -

    To enable caching, put the following tag in any of your controller functions:

    - -$this->output->cache(n); - -

    Where n is the number of minutes you wish the page to remain cached between refreshes.

    - -

    The above tag can go anywhere within a function. It is not affected by the order that it appears, so place it wherever it seems -most logical to you. Once the tag is in place, your pages will begin being cached.

    - -

    Warning: Because of the way CodeIgniter stores content for output, caching will only work if you are generating display for your controller with a view.

    -

    Note: Before the cache files can be written you must set the file permissions on your -system/cache folder such that it is writable.

    - -

    Deleting Caches

    - -

    If you no longer wish to cache a file you can remove the caching tag and it will no longer be refreshed when it expires. Note: -Removing the tag will not delete the cache immediately. It will have to expire normally. If you need to remove it earlier you -will need to manually delete it from your cache folder.

    - - - -
    - - - - - - + + + + + +Web Page Caching : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Web Page Caching

    + +

    CodeIgniter lets you cache your pages in order to achieve maximum performance.

    + +

    Although CodeIgniter is quite fast, the amount of dynamic information you display in your pages will correlate directly to the +server resources, memory, and processing cycles utilized, which affect your page load speeds. +By caching your pages, since they are saved in their fully rendered state, you can achieve performance that nears that of static web pages.

    + + +

    How Does Caching Work?

    + +

    Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed. +When a page is loaded for the first time, the cache file will be written to your system/cache folder. On subsequent page loads the cache file will be retrieved +and sent to the requesting user's browser. If it has expired, it will be deleted and refreshed before being sent to the browser.

    + +

    Note: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled.

    + +

    Enabling Caching

    + +

    To enable caching, put the following tag in any of your controller functions:

    + +$this->output->cache(n); + +

    Where n is the number of minutes you wish the page to remain cached between refreshes.

    + +

    The above tag can go anywhere within a function. It is not affected by the order that it appears, so place it wherever it seems +most logical to you. Once the tag is in place, your pages will begin being cached.

    + +

    Warning: Because of the way CodeIgniter stores content for output, caching will only work if you are generating display for your controller with a view.

    +

    Note: Before the cache files can be written you must set the file permissions on your +system/cache folder such that it is writable.

    + +

    Deleting Caches

    + +

    If you no longer wish to cache a file you can remove the caching tag and it will no longer be refreshed when it expires. Note: +Removing the tag will not delete the cache immediately. It will have to expire normally. If you need to remove it earlier you +will need to manually delete it from your cache folder.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 432ba02c..7f49e398 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -1,90 +1,90 @@ - - - - - -Common Functions : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Common Functions

    - -

    CodeIgniter uses a few functions for its operation that are globally defined, and are available to you at any point. These do not require loading any libraries or helpers.

    -

    is_really_writable('path/to/file')

    -

    is_writable() returns TRUE on Windows servers when you really can't write to the file as the OS reports to PHP as FALSE only if the read-only attribute is marked. This function determines if a file is actually writable by attempting to write to it first. Generally only recommended on platforms where this information may be unreliable.

    -if (is_really_writable('file.txt'))
    -{
    -    echo "I could write to this if I wanted to";
    -}
    -else
    -{
    -    echo "File is not writable";
    -}     -

    config_item('item_key')

    -

    The Config library is the preferred way of accessing configuration information, however config_item() can be used to retrieve single keys. See Config library documentation for more information.

    -

    show_error('message'), show_404('page'), log_message('level', 'message')

    -

    These are each outlined on the Error Handling page.

    -
    - - - - - - + + + + + +Common Functions : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Common Functions

    + +

    CodeIgniter uses a few functions for its operation that are globally defined, and are available to you at any point. These do not require loading any libraries or helpers.

    +

    is_really_writable('path/to/file')

    +

    is_writable() returns TRUE on Windows servers when you really can't write to the file as the OS reports to PHP as FALSE only if the read-only attribute is marked. This function determines if a file is actually writable by attempting to write to it first. Generally only recommended on platforms where this information may be unreliable.

    +if (is_really_writable('file.txt'))
    +{
    +    echo "I could write to this if I wanted to";
    +}
    +else
    +{
    +    echo "File is not writable";
    +}     +

    config_item('item_key')

    +

    The Config library is the preferred way of accessing configuration information, however config_item() can be used to retrieve single keys. See Config library documentation for more information.

    +

    show_error('message'), show_404('page'), log_message('level', 'message')

    +

    These are each outlined on the Error Handling page.

    +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index cb7f80ea..f11d0921 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -1,385 +1,385 @@ - - - - - -Controllers : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Controllers

    - -

    Controllers are the heart of your application, as they determine how HTTP requests should be handled.

    - - - - - - -

    What is a Controller?

    - -

    A Controller is simply a class file that is named in a way that can be associated with a URI.

    - -

    Consider this URI:

    - -example.com/index.php/blog/ - -

    In the above example, CodeIgniter would attempt to find a controller named blog.php and load it.

    - -

    When a controller's name matches the first segment of a URI, it will be loaded.

    - - -

    Let's try it:  Hello World!

    - -

    Let's create a simple controller so you can see it in action. Using your text editor, create a file called blog.php, and put the following code in it:

    - - - - - - -

    Then save the file to your application/controllers/ folder.

    - -

    Now visit the your site using a URL similar to this:

    - -example.com/index.php/blog/ - -

    If you did it right, you should see Hello World!.

    - -

    Note: Class names must start with an uppercase letter. In other words, this is valid:

    - -<?php
    -class Blog extends Controller {
    -
    -}
    -?>     - -

    This is not valid:

    - -<?php
    -class blog extends Controller {
    -
    -}
    -?>     - -

    Also, always make sure your controller extends the parent controller class so that it can inherit all its functions.

    - - - - -

    Functions

    - -

    In the above example the function name is index(). The "index" function is always loaded by default if the -second segment of the URI is empty. Another way to show your "Hello World" message would be this:

    - -example.com/index.php/blog/index/ - -

    The second segment of the URI determines which function in the controller gets called.

    - -

    Let's try it. Add a new function to your controller:

    - - - - -

    Now load the following URL to see the comment function:

    - -example.com/index.php/blog/comments/ - -

    You should see your new message.

    - - -

    Passing URI Segments to your Functions

    - -

    If your URI contains more then two segments they will be passed to your function as parameters.

    - -

    For example, lets say you have a URI like this:

    - -example.com/index.php/products/shoes/sandals/123 - -

    Your function will be passed URI segments 3 and 4 ("sandals" and "123"):

    - - -<?php
    -class Products extends Controller {
    -
    -    function shoes($sandals, $id)
    -    {
    -        echo $sandals;
    -        echo $id;
    -    }
    -}
    -?> -     - -

    Important:  If you are using the URI Routing feature, the segments -passed to your function will be the re-routed ones.

    - - - -

    Defining a Default Controller

    - -

    CodeIgniter can be told to load a default controller when a URI is not present, -as will be the case when only your site root URL is requested. To specify a default controller, open -your application/config/routes.php file and set this variable:

    - -$route['default_controller'] = 'Blog'; - -

    Where Blog is the name of the controller class you want used. If you now load your main index.php file without -specifying any URI segments you'll see your Hello World message by default.

    - - - - -

    Remapping Function Calls

    - -

    As noted above, the second segment of the URI typically determines which function in the controller gets called. -CodeIgniter permits you to override this behavior through the use of the _remap() function:

    - -function _remap()
    -{
    -    // Some code here...
    -}     - -

    Important:  If your controller contains a function named _remap(), it will always -get called regardless of what your URI contains. It overrides the normal behavior in which the URI determines which function is called, -allowing you to define your own function routing rules.

    - -

    The overridden function call (typically the second segment of the URI) will be passed as a parameter the _remap() function:

    - -function _remap($method)
    -{
    -    if ($method == 'some_method')
    -    {
    -        $this->$method();
    -    }
    -    else
    -    {
    -        $this->default_method();
    -    }
    -}     - - - - - - -

    Processing Output

    - -

    CodeIgniter has an output class that takes care of sending your final rendered data to the web browser automatically. More information on this can be found in the -Views and Output class pages. In some cases, however, you might want to -post-process the finalized data in some way and send it to the browser yourself. CodeIgniter permits you to -add a function named _output() to your controller that will receive the finalized output data.

    - -

    Important:  If your controller contains a function named _output(), it will always -be called by the output class instead of echoing the finalized data directly. The first parameter of the function will contain the finalized output.

    - -

    Here is an example:

    - - -function _output($output)
    -{
    -    echo $output;
    -}     - -

    Please note that your _output() function will receive the data in its finalized state. Benchmark and memory usage data will be rendered, -cache files written (if you have caching enabled), and headers will be sent (if you use that feature) -before it is handed off to the _output() function. If you are using this feature the page execution timer and memory usage stats might not be perfectly accurate -since they will not take into acccount any further processing you do. For an alternate way to control output before any of the final processing is done, please see -the available methods in the Output Class.

    - - -

    Private Functions

    - - -

    In some cases you may want certain functions hidden from public access. To make a function private, simply add an -underscore as the name prefix and it will not be served via a URL request. For example, if you were to have a function like this:

    - - -function _utility()
    -{
    -  // some code
    -}     - -

    Trying to access it via the URL, like this, will not work:

    - -example.com/index.php/blog/_utility/ - - - - -

    Organizing Your Controllers into Sub-folders

    - -

    If you are building a large application you might find it convenient to organize your controllers into sub-folders. CodeIgniter permits you to do this.

    - -

    Simply create folders within your application/controllers directory and place your controller classes within them.

    - -

    Note:  When using this feature the first segment of your URI must specify the folder. For example, lets say you have a controller -located here:

    - -application/controllers/products/shoes.php - -

    To call the above controller your URI will look something like this:

    - -example.com/index.php/products/shoes/show/123 - -

    Each of your sub-folders may contain a default controller which will be -called if the URL contains only the sub-folder. Simply name your default controller as specified in your -application/config/routes.php file

    - - -

    CodeIgniter also permits you to remap your URIs using its URI Routing feature.

    - - -

    Class Constructors

    - - -

    If you intend to use a constructor in any of your Controllers, you MUST place the following line of code in it:

    - -parent::Controller(); - -

    The reason this line is necessary is because your local constructor will be overriding the one in the parent controller class so we need to manually call it.

    - - -

    If you are not familiar with constructors, in PHP 4, a constructor is simply a function that has the exact same name as the class:

    - - -<?php
    -class Blog extends Controller {
    -
    -       function Blog()
    -       {
    -            parent::Controller();
    -       }
    -}
    -?>     - -

    In PHP 5, constructors use the following syntax:

    - - -<?php
    -class Blog extends Controller {
    -
    -       function __construct()
    -       {
    -            parent::Controller();
    -       }
    -}
    -?>     - -

    Constructors are useful if you need to set some default values, or run a default process when your class is instantiated. -Constructors can't return a value, but they can do some default work.

    - - -

    Reserved Function Names

    - -

    Since your controller classes will extend the main application controller you -must be careful not to name your functions identically to the ones used by that class, otherwise your local functions -will override them. See Reserved Names for a full list.

    - -

    That's it!

    - -

    That, in a nutshell, is all there is to know about controllers.

    - - - -
    - - - - - - + + + + + +Controllers : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Controllers

    + +

    Controllers are the heart of your application, as they determine how HTTP requests should be handled.

    + + + + + + +

    What is a Controller?

    + +

    A Controller is simply a class file that is named in a way that can be associated with a URI.

    + +

    Consider this URI:

    + +example.com/index.php/blog/ + +

    In the above example, CodeIgniter would attempt to find a controller named blog.php and load it.

    + +

    When a controller's name matches the first segment of a URI, it will be loaded.

    + + +

    Let's try it:  Hello World!

    + +

    Let's create a simple controller so you can see it in action. Using your text editor, create a file called blog.php, and put the following code in it:

    + + + + + + +

    Then save the file to your application/controllers/ folder.

    + +

    Now visit the your site using a URL similar to this:

    + +example.com/index.php/blog/ + +

    If you did it right, you should see Hello World!.

    + +

    Note: Class names must start with an uppercase letter. In other words, this is valid:

    + +<?php
    +class Blog extends Controller {
    +
    +}
    +?>     + +

    This is not valid:

    + +<?php
    +class blog extends Controller {
    +
    +}
    +?>     + +

    Also, always make sure your controller extends the parent controller class so that it can inherit all its functions.

    + + + + +

    Functions

    + +

    In the above example the function name is index(). The "index" function is always loaded by default if the +second segment of the URI is empty. Another way to show your "Hello World" message would be this:

    + +example.com/index.php/blog/index/ + +

    The second segment of the URI determines which function in the controller gets called.

    + +

    Let's try it. Add a new function to your controller:

    + + + + +

    Now load the following URL to see the comment function:

    + +example.com/index.php/blog/comments/ + +

    You should see your new message.

    + + +

    Passing URI Segments to your Functions

    + +

    If your URI contains more then two segments they will be passed to your function as parameters.

    + +

    For example, lets say you have a URI like this:

    + +example.com/index.php/products/shoes/sandals/123 + +

    Your function will be passed URI segments 3 and 4 ("sandals" and "123"):

    + + +<?php
    +class Products extends Controller {
    +
    +    function shoes($sandals, $id)
    +    {
    +        echo $sandals;
    +        echo $id;
    +    }
    +}
    +?> +     + +

    Important:  If you are using the URI Routing feature, the segments +passed to your function will be the re-routed ones.

    + + + +

    Defining a Default Controller

    + +

    CodeIgniter can be told to load a default controller when a URI is not present, +as will be the case when only your site root URL is requested. To specify a default controller, open +your application/config/routes.php file and set this variable:

    + +$route['default_controller'] = 'Blog'; + +

    Where Blog is the name of the controller class you want used. If you now load your main index.php file without +specifying any URI segments you'll see your Hello World message by default.

    + + + + +

    Remapping Function Calls

    + +

    As noted above, the second segment of the URI typically determines which function in the controller gets called. +CodeIgniter permits you to override this behavior through the use of the _remap() function:

    + +function _remap()
    +{
    +    // Some code here...
    +}     + +

    Important:  If your controller contains a function named _remap(), it will always +get called regardless of what your URI contains. It overrides the normal behavior in which the URI determines which function is called, +allowing you to define your own function routing rules.

    + +

    The overridden function call (typically the second segment of the URI) will be passed as a parameter the _remap() function:

    + +function _remap($method)
    +{
    +    if ($method == 'some_method')
    +    {
    +        $this->$method();
    +    }
    +    else
    +    {
    +        $this->default_method();
    +    }
    +}     + + + + + + +

    Processing Output

    + +

    CodeIgniter has an output class that takes care of sending your final rendered data to the web browser automatically. More information on this can be found in the +Views and Output class pages. In some cases, however, you might want to +post-process the finalized data in some way and send it to the browser yourself. CodeIgniter permits you to +add a function named _output() to your controller that will receive the finalized output data.

    + +

    Important:  If your controller contains a function named _output(), it will always +be called by the output class instead of echoing the finalized data directly. The first parameter of the function will contain the finalized output.

    + +

    Here is an example:

    + + +function _output($output)
    +{
    +    echo $output;
    +}     + +

    Please note that your _output() function will receive the data in its finalized state. Benchmark and memory usage data will be rendered, +cache files written (if you have caching enabled), and headers will be sent (if you use that feature) +before it is handed off to the _output() function. If you are using this feature the page execution timer and memory usage stats might not be perfectly accurate +since they will not take into acccount any further processing you do. For an alternate way to control output before any of the final processing is done, please see +the available methods in the Output Class.

    + + +

    Private Functions

    + + +

    In some cases you may want certain functions hidden from public access. To make a function private, simply add an +underscore as the name prefix and it will not be served via a URL request. For example, if you were to have a function like this:

    + + +function _utility()
    +{
    +  // some code
    +}     + +

    Trying to access it via the URL, like this, will not work:

    + +example.com/index.php/blog/_utility/ + + + + +

    Organizing Your Controllers into Sub-folders

    + +

    If you are building a large application you might find it convenient to organize your controllers into sub-folders. CodeIgniter permits you to do this.

    + +

    Simply create folders within your application/controllers directory and place your controller classes within them.

    + +

    Note:  When using this feature the first segment of your URI must specify the folder. For example, lets say you have a controller +located here:

    + +application/controllers/products/shoes.php + +

    To call the above controller your URI will look something like this:

    + +example.com/index.php/products/shoes/show/123 + +

    Each of your sub-folders may contain a default controller which will be +called if the URL contains only the sub-folder. Simply name your default controller as specified in your +application/config/routes.php file

    + + +

    CodeIgniter also permits you to remap your URIs using its URI Routing feature.

    + + +

    Class Constructors

    + + +

    If you intend to use a constructor in any of your Controllers, you MUST place the following line of code in it:

    + +parent::Controller(); + +

    The reason this line is necessary is because your local constructor will be overriding the one in the parent controller class so we need to manually call it.

    + + +

    If you are not familiar with constructors, in PHP 4, a constructor is simply a function that has the exact same name as the class:

    + + +<?php
    +class Blog extends Controller {
    +
    +       function Blog()
    +       {
    +            parent::Controller();
    +       }
    +}
    +?>     + +

    In PHP 5, constructors use the following syntax:

    + + +<?php
    +class Blog extends Controller {
    +
    +       function __construct()
    +       {
    +            parent::Controller();
    +       }
    +}
    +?>     + +

    Constructors are useful if you need to set some default values, or run a default process when your class is instantiated. +Constructors can't return a value, but they can do some default work.

    + + +

    Reserved Function Names

    + +

    Since your controller classes will extend the main application controller you +must be careful not to name your functions identically to the ones used by that class, otherwise your local functions +will override them. See Reserved Names for a full list.

    + +

    That's it!

    + +

    That, in a nutshell, is all there is to know about controllers.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index a8168239..ca95ad33 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -1,185 +1,185 @@ - - - - - -Creating Core System Classes : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Creating Core System Classes

    - -

    Every time CodeIgniter runs there are several base classes that are initialized automatically as part of the core framework. -It is possible, however, to swap any of the core system classes with your own versions or even extend the core versions.

    - -

    Most users will never have any need to do this, -but the option to replace or extend them does exist for those who would like to significantly alter the CodeIgniter core. -

    - -

    Note:  Messing with a core system class has a lot of implications, so make sure you -know what you are doing before attempting it.

    - - -

    System Class List

    - -

    The following is a list of the core system files that are invoked every time CodeIgniter runs:

    - -
      -
    • Benchmark
      • -
    • Config
      • -
    • Controller
      • -
    • Exceptions
      • -
    • Hooks
      • -
    • Input
      • -
    • Language
      • -
    • Loader
      • -
    • Log
      • -
    • Output
      • -
    • Router
      • -
    • URI
      • -
    - -

    Replacing Core Classes

    - -

    To use one of your own system classes instead of a default one simply place your version inside your local application/libraries directory:

    - -application/libraries/some-class.php - -

    If this directory does not exist you can create it.

    - -

    Any file named identically to one from the list above will be used instead of the one normally used.

    - -

    Please note that your class must use CI as a prefix. For example, if your file is named Input.php the class will be named:

    - - -class CI_Input {

    - -} -     - - - -

    Extending Core Class

    - -

    If all you need to do is add some functionality to an existing library - perhaps add a function or two - then -it's overkill to replace the entire library with your version. In this case it's better to simply extend the class. -Extending a class is nearly identical to replacing a class with a couple exceptions:

    - -
      -
    • The class declaration must extend the parent class.
      • -
    • Your new class name and filename must be prefixed with MY_ (this item is configurable. See below.).
      • -
    - -

    For example, to extend the native Input class you'll create a file named application/libraries/MY_Input.php, and declare your class with:

    - - -class MY_Input extends CI_Input {

    - -}     - -

    Note: If you need to use a constructor in your class make sure you extend the parent constructor:

    - - -class MY_Input extends CI_Input {
    -
    -    function My_Input()
    -    {
    -        parent::CI_Input();
    -    }
    -}     - -

    Tip:  Any functions in your class that are named identically to the functions in the parent class will be used instead of the native ones -(this is known as "method overriding"). -This allows you to substantially alter the CodeIgniter core.

    - -

    If you are extending the Controller core class, then be sure to extend your new class in your application controller's constructors.

    - -class Welcome extends MY_Controller {
    -
    -    function Welcome()
    -    {
    -        parent::MY_Controller();
    -    }
    -
    -    function index()
    -    {
    -        $this->load->view('welcome_message');
    -    }
    -}     - -

    Setting Your Own Prefix

    - -

    To set your own sub-class prefix, open your application/config/config.php file and look for this item:

    - -$config['subclass_prefix'] = 'MY_'; - -

    Please note that all native CodeIgniter libraries are prefixed with CI_ so DO NOT use that as your prefix.

    - - - - -
    - - - - - - + + + + + +Creating Core System Classes : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Creating Core System Classes

    + +

    Every time CodeIgniter runs there are several base classes that are initialized automatically as part of the core framework. +It is possible, however, to swap any of the core system classes with your own versions or even extend the core versions.

    + +

    Most users will never have any need to do this, +but the option to replace or extend them does exist for those who would like to significantly alter the CodeIgniter core. +

    + +

    Note:  Messing with a core system class has a lot of implications, so make sure you +know what you are doing before attempting it.

    + + +

    System Class List

    + +

    The following is a list of the core system files that are invoked every time CodeIgniter runs:

    + +
      +
    • Benchmark
      • +
    • Config
      • +
    • Controller
      • +
    • Exceptions
      • +
    • Hooks
      • +
    • Input
      • +
    • Language
      • +
    • Loader
      • +
    • Log
      • +
    • Output
      • +
    • Router
      • +
    • URI
      • +
    + +

    Replacing Core Classes

    + +

    To use one of your own system classes instead of a default one simply place your version inside your local application/libraries directory:

    + +application/libraries/some-class.php + +

    If this directory does not exist you can create it.

    + +

    Any file named identically to one from the list above will be used instead of the one normally used.

    + +

    Please note that your class must use CI as a prefix. For example, if your file is named Input.php the class will be named:

    + + +class CI_Input {

    + +} +     + + + +

    Extending Core Class

    + +

    If all you need to do is add some functionality to an existing library - perhaps add a function or two - then +it's overkill to replace the entire library with your version. In this case it's better to simply extend the class. +Extending a class is nearly identical to replacing a class with a couple exceptions:

    + +
      +
    • The class declaration must extend the parent class.
      • +
    • Your new class name and filename must be prefixed with MY_ (this item is configurable. See below.).
      • +
    + +

    For example, to extend the native Input class you'll create a file named application/libraries/MY_Input.php, and declare your class with:

    + + +class MY_Input extends CI_Input {

    + +}     + +

    Note: If you need to use a constructor in your class make sure you extend the parent constructor:

    + + +class MY_Input extends CI_Input {
    +
    +    function My_Input()
    +    {
    +        parent::CI_Input();
    +    }
    +}     + +

    Tip:  Any functions in your class that are named identically to the functions in the parent class will be used instead of the native ones +(this is known as "method overriding"). +This allows you to substantially alter the CodeIgniter core.

    + +

    If you are extending the Controller core class, then be sure to extend your new class in your application controller's constructors.

    + +class Welcome extends MY_Controller {
    +
    +    function Welcome()
    +    {
    +        parent::MY_Controller();
    +    }
    +
    +    function index()
    +    {
    +        $this->load->view('welcome_message');
    +    }
    +}     + +

    Setting Your Own Prefix

    + +

    To set your own sub-class prefix, open your application/config/config.php file and look for this item:

    + +$config['subclass_prefix'] = 'MY_'; + +

    Please note that all native CodeIgniter libraries are prefixed with CI_ so DO NOT use that as your prefix.

    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 15dfcec1..beac1959 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -1,298 +1,298 @@ - - - - - -Creating Libraries : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Creating Libraries

    - -

    When we use the term "Libraries" we are normally referring to the classes that are located in the libraries -directory and described in the Class Reference of this user guide. In this case, however, we will instead describe how you can create -your own libraries within your application/libraries directory in order to maintain separation between your local resources -and the global framework resources.

    - -

    As an added bonus, CodeIgniter permits your libraries to extend native classes if you simply need to add some functionality -to an existing library. Or you can even replace native libraries just by placing identically named versions in your application/libraries folder.

    - -

    In summary:

    - -
      -
    • You can create entirely new libraries.
      • -
    • You can extend native libraries.
      • -
    • You can replace native libraries.
      • -
    - -

    The page below explains these three concepts in detail.

    - -

    Note: The Database classes can not be extended or replaced with your own classes, -nor can the Loader class in PHP 4. All other classes are able to be replaced/extended.

    - - -

    Storage

    - -

    Your library classes should be placed within your application/libraries folder, as this is where CodeIgniter will look for them when -they are initialized.

    - - -

    Naming Conventions

    - -
      -
    • File names must be capitalized. For example:  Myclass.php
      • -
    • Class declarations must be capitalized. For example:  class Myclass
      • -
    • Class names and file names must match.
      • -
    - - -

    The Class File

    - -

    Classes should have this basic prototype (Note: We are using the name Someclass purely as an example):

    - -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); -

    -class Someclass {
    -
    -    function some_function()
    -    {
    -    }
    -}

    -?>     - - -

    Using Your Class

    - -

    From within any of your Controller functions you can initialize your class using the standard:

    - -$this->load->library('someclass'); - -

    Where someclass is the file name, without the ".php" file extension. You can submit the file name capitalized or lower case. -CodeIgniter doesn't care.

    - -

    Once loaded you can access your class using the lower case version:

    - -$this->someclass->some_function();  // Object instances will always be lower case - - - - -

    Passing Parameters When Initializing Your Class

    - -

    In the library loading function you can dynamically pass data via the second parameter and it will be passed to your class -constructor:

    - - -$params = array('type' => 'large', 'color' => 'red');
    -
    -$this->load->library('Someclass', $params);     - -

    If you use this feature you must set up your class constructor to expect data:

    - -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
    -
    -class Someclass {
    -
    -    function Someclass($params)
    -    {
    -        // Do something with $params
    -    }
    -}

    -?>     - -

    You can also pass parameters stored in a config file. Simply create a config file named identically to the class file name -and store it in your application/config/ folder. Note that if you dynamically pass parameters as described above, -the config file option will not be available.

    - - - - - - - -

    Utilizing CodeIgniter Resources within Your Library

    - - -

    To access CodeIgniter's native resources within your library use the get_instance() function. -This function returns the CodeIgniter super object.

    - -

    Normally from within your controller functions you will call any of the available CodeIgniter functions using the $this construct:

    - - -$this->load->helper('url');
    -$this->load->library('session');
    -$this->config->item('base_url');
    -etc. -     - -

    $this, however, only works directly within your controllers, your models, or your views. -If you would like to use CodeIgniter's classes from within your own custom classes you can do so as follows:

    - - -

    First, assign the CodeIgniter object to a variable:

    - -$CI =& get_instance(); - -

    Once you've assigned the object to a variable, you'll use that variable instead of $this:

    - - -$CI =& get_instance();
    -
    -$CI->load->helper('url');
    -$CI->load->library('session');
    -$CI->config->item('base_url');
    -etc. -     - -

    Note: You'll notice that the above get_instance() function is being passed by reference: -

    -$CI =& get_instance(); -
    -
    -This is very important. Assigning by reference allows you to use the original CodeIgniter object rather than creating a copy of it. -

    -Also, please note: If you are running PHP 4 it's usually best to avoid calling get_instance() -from within your class constructors. PHP 4 has trouble referencing the CI super object within application constructors -since objects do not exist until the class is fully instantiated.

    - - -

    Replacing Native Libraries with Your Versions

    - -

    Simply by naming your class files identically to a native library will cause CodeIgniter to use it instead of the native one. To use this -feature you must name the file and the class declaration exactly the same as the native library. For example, to replace the native Email library -you'll create a file named application/libraries/Email.php, and declare your class with:

    - - -class CI_Email {

    - -}     - -

    Note that most native classes are prefixed with CI_.

    - -

    To load your library you'll see the standard loading function:

    - -$this->load->library('email'); - -

    Note: At this time the Database classes can not be replaced with your own versions.

    - - -

    Extending Native Libraries

    - -

    If all you need to do is add some functionality to an existing library - perhaps add a function or two - then -it's overkill to replace the entire library with your version. In this case it's better to simply extend the class. -Extending a class is nearly identical to replacing a class with a couple exceptions:

    - -
      -
    • The class declaration must extend the parent class.
      • -
    • Your new class name and filename must be prefixed with MY_ (this item is configurable. See below.).
      • -
    - -

    For example, to extend the native Email class you'll create a file named application/libraries/MY_Email.php, and declare your class with:

    - - -class MY_Email extends CI_Email {

    - -}     - -

    Note: If you need to use a constructor in your class make sure you extend the parent constructor:

    - - - -class MY_Email extends CI_Email {
    -
    -    function My_Email()
    -    {
    -        parent::CI_Email();
    -    }
    -}     - - -

    Loading Your Sub-class

    - -

    To load your sub-class you'll use the standard syntax normally used. DO NOT include your prefix. For example, -to load the example above, which extends the Email class, you will use:

    - -$this->load->library('email'); - -

    Once loaded you will use the class variable as you normally would for the class you are extending. In the case of -the email class all calls will use:

    - - -$this->email->some_function(); - - -

    Setting Your Own Prefix

    - -

    To set your own sub-class prefix, open your application/config/config.php file and look for this item:

    - -$config['subclass_prefix'] = 'MY_'; - -

    Please note that all native CodeIgniter libraries are prefixed with CI_ so DO NOT use that as your prefix.

    - - - -
    - - - - - - + + + + + +Creating Libraries : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Creating Libraries

    + +

    When we use the term "Libraries" we are normally referring to the classes that are located in the libraries +directory and described in the Class Reference of this user guide. In this case, however, we will instead describe how you can create +your own libraries within your application/libraries directory in order to maintain separation between your local resources +and the global framework resources.

    + +

    As an added bonus, CodeIgniter permits your libraries to extend native classes if you simply need to add some functionality +to an existing library. Or you can even replace native libraries just by placing identically named versions in your application/libraries folder.

    + +

    In summary:

    + +
      +
    • You can create entirely new libraries.
      • +
    • You can extend native libraries.
      • +
    • You can replace native libraries.
      • +
    + +

    The page below explains these three concepts in detail.

    + +

    Note: The Database classes can not be extended or replaced with your own classes, +nor can the Loader class in PHP 4. All other classes are able to be replaced/extended.

    + + +

    Storage

    + +

    Your library classes should be placed within your application/libraries folder, as this is where CodeIgniter will look for them when +they are initialized.

    + + +

    Naming Conventions

    + +
      +
    • File names must be capitalized. For example:  Myclass.php
      • +
    • Class declarations must be capitalized. For example:  class Myclass
      • +
    • Class names and file names must match.
      • +
    + + +

    The Class File

    + +

    Classes should have this basic prototype (Note: We are using the name Someclass purely as an example):

    + +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +

    +class Someclass {
    +
    +    function some_function()
    +    {
    +    }
    +}

    +?>     + + +

    Using Your Class

    + +

    From within any of your Controller functions you can initialize your class using the standard:

    + +$this->load->library('someclass'); + +

    Where someclass is the file name, without the ".php" file extension. You can submit the file name capitalized or lower case. +CodeIgniter doesn't care.

    + +

    Once loaded you can access your class using the lower case version:

    + +$this->someclass->some_function();  // Object instances will always be lower case + + + + +

    Passing Parameters When Initializing Your Class

    + +

    In the library loading function you can dynamically pass data via the second parameter and it will be passed to your class +constructor:

    + + +$params = array('type' => 'large', 'color' => 'red');
    +
    +$this->load->library('Someclass', $params);     + +

    If you use this feature you must set up your class constructor to expect data:

    + +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
    +
    +class Someclass {
    +
    +    function Someclass($params)
    +    {
    +        // Do something with $params
    +    }
    +}

    +?>     + +

    You can also pass parameters stored in a config file. Simply create a config file named identically to the class file name +and store it in your application/config/ folder. Note that if you dynamically pass parameters as described above, +the config file option will not be available.

    + + + + + + + +

    Utilizing CodeIgniter Resources within Your Library

    + + +

    To access CodeIgniter's native resources within your library use the get_instance() function. +This function returns the CodeIgniter super object.

    + +

    Normally from within your controller functions you will call any of the available CodeIgniter functions using the $this construct:

    + + +$this->load->helper('url');
    +$this->load->library('session');
    +$this->config->item('base_url');
    +etc. +     + +

    $this, however, only works directly within your controllers, your models, or your views. +If you would like to use CodeIgniter's classes from within your own custom classes you can do so as follows:

    + + +

    First, assign the CodeIgniter object to a variable:

    + +$CI =& get_instance(); + +

    Once you've assigned the object to a variable, you'll use that variable instead of $this:

    + + +$CI =& get_instance();
    +
    +$CI->load->helper('url');
    +$CI->load->library('session');
    +$CI->config->item('base_url');
    +etc. +     + +

    Note: You'll notice that the above get_instance() function is being passed by reference: +

    +$CI =& get_instance(); +
    +
    +This is very important. Assigning by reference allows you to use the original CodeIgniter object rather than creating a copy of it. +

    +Also, please note: If you are running PHP 4 it's usually best to avoid calling get_instance() +from within your class constructors. PHP 4 has trouble referencing the CI super object within application constructors +since objects do not exist until the class is fully instantiated.

    + + +

    Replacing Native Libraries with Your Versions

    + +

    Simply by naming your class files identically to a native library will cause CodeIgniter to use it instead of the native one. To use this +feature you must name the file and the class declaration exactly the same as the native library. For example, to replace the native Email library +you'll create a file named application/libraries/Email.php, and declare your class with:

    + + +class CI_Email {

    + +}     + +

    Note that most native classes are prefixed with CI_.

    + +

    To load your library you'll see the standard loading function:

    + +$this->load->library('email'); + +

    Note: At this time the Database classes can not be replaced with your own versions.

    + + +

    Extending Native Libraries

    + +

    If all you need to do is add some functionality to an existing library - perhaps add a function or two - then +it's overkill to replace the entire library with your version. In this case it's better to simply extend the class. +Extending a class is nearly identical to replacing a class with a couple exceptions:

    + +
      +
    • The class declaration must extend the parent class.
      • +
    • Your new class name and filename must be prefixed with MY_ (this item is configurable. See below.).
      • +
    + +

    For example, to extend the native Email class you'll create a file named application/libraries/MY_Email.php, and declare your class with:

    + + +class MY_Email extends CI_Email {

    + +}     + +

    Note: If you need to use a constructor in your class make sure you extend the parent constructor:

    + + + +class MY_Email extends CI_Email {
    +
    +    function My_Email()
    +    {
    +        parent::CI_Email();
    +    }
    +}     + + +

    Loading Your Sub-class

    + +

    To load your sub-class you'll use the standard syntax normally used. DO NOT include your prefix. For example, +to load the example above, which extends the Email class, you will use:

    + +$this->load->library('email'); + +

    Once loaded you will use the class variable as you normally would for the class you are extending. In the case of +the email class all calls will use:

    + + +$this->email->some_function(); + + +

    Setting Your Own Prefix

    + +

    To set your own sub-class prefix, open your application/config/config.php file and look for this item:

    + +$config['subclass_prefix'] = 'MY_'; + +

    Please note that all native CodeIgniter libraries are prefixed with CI_ so DO NOT use that as your prefix.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index be52fe83..5dae4d76 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -1,86 +1,86 @@ - - - - - -Credits : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Credits

    - -

    CodeIgniter was originally developed by Rick Ellis (CEO of -Ellislab, Inc.). The framework was written for performance in the real -world, with many of the class libraries, helpers, and sub-systems borrowed from the code-base of -ExpressionEngine.

    - -

    It is currently developed and maintained by the ExpressionEngine Development Team.

    - -

    A hat tip goes to Ruby on Rails for inspiring us to create a PHP framework, and for -bringing frameworks into the general consciousness of the web community.

    - -
    - - - - - - + + + + + +Credits : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Credits

    + +

    CodeIgniter was originally developed by Rick Ellis (CEO of +Ellislab, Inc.). The framework was written for performance in the real +world, with many of the class libraries, helpers, and sub-systems borrowed from the code-base of +ExpressionEngine.

    + +

    It is currently developed and maintained by the ExpressionEngine Development Team.

    + +

    A hat tip goes to Ruby on Rails for inspiring us to create a PHP framework, and for +bringing frameworks into the general consciousness of the web community.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 07dc1b3d..036eacae 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -1,137 +1,137 @@ - - - - - -Error Handling : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Error Handling

    - -

    CodeIgniter lets you build error reporting into your applications using the functions described below. -In addition, it has an error logging class that permits error and debugging messages to be saved as text files.

    - -

    Note: By default, CodeIgniter displays all PHP errors. You might -wish to change this behavior once your development is complete. You'll find the error_reporting() -function located at the top of your main index.php file. Disabling error reporting will NOT prevent log files -from being written if there are errors.

    - -

    Unlike most systems in CodeIgniter, the error functions are simple procedural interfaces that are available -globally throughout the application. This approach permits error messages to get triggered without having to worry -about class/function scoping.

    - -

    The following functions let you generate errors:

    - -

    show_error('message')

    -

    This function will display the error message supplied to it using the following error template:

    -

    application/errors/error_general.php

    - -

    show_404('page')

    -

    This function will display the 404 error message supplied to it using the following error template:

    -

    application/errors/error_404.php

    - -

    The function expects the string passed to it to be the file path to the page that isn't found. -Note that CodeIgniter automatically shows 404 messages if controllers are not found.

    - - -

    log_message('level', 'message')

    - -

    This function lets you write messages to your log files. You must supply one of three "levels" -in the first parameter, indicating what type of message it is (debug, error, info), with the message -itself in the second parameter. Example:

    - - -if ($some_var == "")
    -{
    -    log_message('error', 'Some variable did not contain a value.');
    -}
    -else
    -{
    -    log_message('debug', 'Some variable was correctly set');
    -}
    -
    -log_message('info', 'The purpose of some variable is to provide some value.');
    -     - -

    There are three message types:

    - -
      -
    1. Error Messages. These are actual errors, such as PHP errors or user errors.
      2. -
    2. Debug Messages. These are messages that assist in debugging. For example, if a class has been initialized, you could log this as debugging info.
      3. -
    3. Informational Messages. These are the lowest priority messages, simply giving information regarding some process. CodeIgniter doesn't natively generate any info messages but you may want to in your application.
      4. -
    - - -

    Note: In order for the log file to actually be written, the - "logs" folder must be writable. In addition, you must set the "threshold" for logging. -You might, for example, only want error messages to be logged, and not the other two types. -If you set it to zero logging will be disabled.

    - - - -
    - - - - - - + + + + + +Error Handling : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Error Handling

    + +

    CodeIgniter lets you build error reporting into your applications using the functions described below. +In addition, it has an error logging class that permits error and debugging messages to be saved as text files.

    + +

    Note: By default, CodeIgniter displays all PHP errors. You might +wish to change this behavior once your development is complete. You'll find the error_reporting() +function located at the top of your main index.php file. Disabling error reporting will NOT prevent log files +from being written if there are errors.

    + +

    Unlike most systems in CodeIgniter, the error functions are simple procedural interfaces that are available +globally throughout the application. This approach permits error messages to get triggered without having to worry +about class/function scoping.

    + +

    The following functions let you generate errors:

    + +

    show_error('message')

    +

    This function will display the error message supplied to it using the following error template:

    +

    application/errors/error_general.php

    + +

    show_404('page')

    +

    This function will display the 404 error message supplied to it using the following error template:

    +

    application/errors/error_404.php

    + +

    The function expects the string passed to it to be the file path to the page that isn't found. +Note that CodeIgniter automatically shows 404 messages if controllers are not found.

    + + +

    log_message('level', 'message')

    + +

    This function lets you write messages to your log files. You must supply one of three "levels" +in the first parameter, indicating what type of message it is (debug, error, info), with the message +itself in the second parameter. Example:

    + + +if ($some_var == "")
    +{
    +    log_message('error', 'Some variable did not contain a value.');
    +}
    +else
    +{
    +    log_message('debug', 'Some variable was correctly set');
    +}
    +
    +log_message('info', 'The purpose of some variable is to provide some value.');
    +     + +

    There are three message types:

    + +
      +
    1. Error Messages. These are actual errors, such as PHP errors or user errors.
      2. +
    2. Debug Messages. These are messages that assist in debugging. For example, if a class has been initialized, you could log this as debugging info.
      3. +
    3. Informational Messages. These are the lowest priority messages, simply giving information regarding some process. CodeIgniter doesn't natively generate any info messages but you may want to in your application.
      4. +
    + + +

    Note: In order for the log file to actually be written, the + "logs" folder must be writable. In addition, you must set the "threshold" for logging. +You might, for example, only want error messages to be logged, and not the other two types. +If you set it to zero logging will be disabled.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 090456fc..02f4511b 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -1,185 +1,185 @@ - - - - - -Helper Functions : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Helper Functions

    - -

    Helpers, as the name suggests, help you with tasks. Each helper file is simply a collection of functions in a particular -category. There are URL Helpers, that assist in creating links, there are Form Helpers -that help you create form elements, Text Helpers perform various text formatting routines, -Cookie Helpers set and read cookies, File Helpers help you deal with files, etc. -

    - -

    Unlike most other systems in CodeIgniter, Helpers are not written in an Object Oriented format. They are simple, procedural functions. -Each helper function performs one specific task, with no dependence on other functions.

    - -

    CodeIgniter does not load Helper Files by default, so the first step in using -a Helper is to load it. Once loaded, it becomes globally available in your controller and views.

    - -

    Helpers are typically stored in your system/helpers, or system/application/helpers directory. CodeIgniter will look first in your system/application/helpers -directory. If the directory does not exist or the specified helper is not located there CI will instead look in your global -system/helpers folder.

    - - -

    Loading a Helper

    - -

    Loading a helper file is quite simple using the following function:

    - -$this->load->helper('name'); - -

    Where name is the file name of the helper, without the .php file extension or the "helper" part.

    - -

    For example, to load the URL Helper file, which is named url_helper.php, you would do this:

    - -$this->load->helper('url'); - -

    A helper can be loaded anywhere within your controller functions (or even within your View files, although that's not a good practice), -as long as you load it before you use it. You can load your helpers in your controller constructor so that they become available -automatically in any function, or you can load a helper in a specific function that needs it.

    - -

    Note: The Helper loading function above does not return a value, so don't try to assign it to a variable. Just use it as shown.

    - - -

    Loading Multiple Helpers

    - -

    If you need to load more than one helper you can specify them in an array, like this:

    - -$this->load->helper( array('helper1', 'helper2', 'helper3') ); - -

    Auto-loading Helpers

    - -

    If you find that you need a particular helper globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. -This is done by opening the application/config/autoload.php file and adding the helper to the autoload array.

    - - -

    Using a Helper

    - -

    Once you've loaded the Helper File containing the function you intend to use, you'll call it the way you would a standard PHP function.

    - -

    For example, to create a link using the anchor() function in one of your view files you would do this:

    - -<?php echo anchor('blog/comments', 'Click Here');?> - -

    Where "Click Here" is the name of the link, and "blog/comments" is the URI to the controller/function you wish to link to.

    - -

    "Extending" Helpers

    - -

    To "extend" Helpers, create a file in your application/helpers/ folder with an identical name to the existing Helper, but prefixed with MY_ (this item is configurable. See below.).

    - -

    If all you need to do is add some functionality to an existing helper - perhaps add a function or two, or change how a particular - helper function operates - then it's overkill to replace the entire helper with your version. In this case it's better to simply - "extend" the Helper. The term "extend" is used loosely since Helper functions are procedural and discrete and cannot be extended - in the traditional programmatic sense. Under the hood, this gives you the ability to add to the functions a Helper provides, - or to modify how the native Helper functions operate.

    - -

    For example, to extend the native Array Helper you'll create a file named application/helpers/MY_array_helper.php, and add or override functions:

    - - -// any_in_array() is not in the Array Helper, so it defines a new function
    -function any_in_array($needle, $haystack)
    -{
    -    $needle = (is_array($needle)) ? $needle : array($needle);
    -
    -    foreach ($needle as $item)
    -    {
    -        if (in_array($item, $haystack))
    -        {
    -            return TRUE;
    -        }
    -        }
    -
    -    return FALSE;
    -}
    -
    -// random_element() is included in Array Helper, so it overrides the native function
    -function random_element($array)
    -{
    -    shuffle($array);
    -    return array_pop($array);
    -}
    -     - -

    Setting Your Own Prefix

    - -

    The filename prefix for "extending" Helpers is the same used to extend libraries and Core classes. To set your own prefix, open your application/config/config.php file and look for this item:

    - -$config['subclass_prefix'] = 'MY_'; - -

    Please note that all native CodeIgniter libraries are prefixed with CI_ so DO NOT use that as your prefix.

    - - -

    Now What?

    - -

    In the Table of Contents you'll find a list of all the available Helper Files. Browse each one to see what they do.

    - - -
    - - - - - - + + + + + +Helper Functions : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Helper Functions

    + +

    Helpers, as the name suggests, help you with tasks. Each helper file is simply a collection of functions in a particular +category. There are URL Helpers, that assist in creating links, there are Form Helpers +that help you create form elements, Text Helpers perform various text formatting routines, +Cookie Helpers set and read cookies, File Helpers help you deal with files, etc. +

    + +

    Unlike most other systems in CodeIgniter, Helpers are not written in an Object Oriented format. They are simple, procedural functions. +Each helper function performs one specific task, with no dependence on other functions.

    + +

    CodeIgniter does not load Helper Files by default, so the first step in using +a Helper is to load it. Once loaded, it becomes globally available in your controller and views.

    + +

    Helpers are typically stored in your system/helpers, or system/application/helpers directory. CodeIgniter will look first in your system/application/helpers +directory. If the directory does not exist or the specified helper is not located there CI will instead look in your global +system/helpers folder.

    + + +

    Loading a Helper

    + +

    Loading a helper file is quite simple using the following function:

    + +$this->load->helper('name'); + +

    Where name is the file name of the helper, without the .php file extension or the "helper" part.

    + +

    For example, to load the URL Helper file, which is named url_helper.php, you would do this:

    + +$this->load->helper('url'); + +

    A helper can be loaded anywhere within your controller functions (or even within your View files, although that's not a good practice), +as long as you load it before you use it. You can load your helpers in your controller constructor so that they become available +automatically in any function, or you can load a helper in a specific function that needs it.

    + +

    Note: The Helper loading function above does not return a value, so don't try to assign it to a variable. Just use it as shown.

    + + +

    Loading Multiple Helpers

    + +

    If you need to load more than one helper you can specify them in an array, like this:

    + +$this->load->helper( array('helper1', 'helper2', 'helper3') ); + +

    Auto-loading Helpers

    + +

    If you find that you need a particular helper globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. +This is done by opening the application/config/autoload.php file and adding the helper to the autoload array.

    + + +

    Using a Helper

    + +

    Once you've loaded the Helper File containing the function you intend to use, you'll call it the way you would a standard PHP function.

    + +

    For example, to create a link using the anchor() function in one of your view files you would do this:

    + +<?php echo anchor('blog/comments', 'Click Here');?> + +

    Where "Click Here" is the name of the link, and "blog/comments" is the URI to the controller/function you wish to link to.

    + +

    "Extending" Helpers

    + +

    To "extend" Helpers, create a file in your application/helpers/ folder with an identical name to the existing Helper, but prefixed with MY_ (this item is configurable. See below.).

    + +

    If all you need to do is add some functionality to an existing helper - perhaps add a function or two, or change how a particular + helper function operates - then it's overkill to replace the entire helper with your version. In this case it's better to simply + "extend" the Helper. The term "extend" is used loosely since Helper functions are procedural and discrete and cannot be extended + in the traditional programmatic sense. Under the hood, this gives you the ability to add to the functions a Helper provides, + or to modify how the native Helper functions operate.

    + +

    For example, to extend the native Array Helper you'll create a file named application/helpers/MY_array_helper.php, and add or override functions:

    + + +// any_in_array() is not in the Array Helper, so it defines a new function
    +function any_in_array($needle, $haystack)
    +{
    +    $needle = (is_array($needle)) ? $needle : array($needle);
    +
    +    foreach ($needle as $item)
    +    {
    +        if (in_array($item, $haystack))
    +        {
    +            return TRUE;
    +        }
    +        }
    +
    +    return FALSE;
    +}
    +
    +// random_element() is included in Array Helper, so it overrides the native function
    +function random_element($array)
    +{
    +    shuffle($array);
    +    return array_pop($array);
    +}
    +     + +

    Setting Your Own Prefix

    + +

    The filename prefix for "extending" Helpers is the same used to extend libraries and Core classes. To set your own prefix, open your application/config/config.php file and look for this item:

    + +$config['subclass_prefix'] = 'MY_'; + +

    Please note that all native CodeIgniter libraries are prefixed with CI_ so DO NOT use that as your prefix.

    + + +

    Now What?

    + +

    In the Table of Contents you'll find a list of all the available Helper Files. Browse each one to see what they do.

    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index dcea24de..ae2a3db0 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -1,167 +1,167 @@ - - - - - -Hooks : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Hooks - Extending the Framework Core

    - -

    CodeIgniter's Hooks feature provides a means to tap into and modify the inner workings of the framework without hacking the core files. -When CodeIgniter runs it follows a specific execution process, diagramed in the Application Flow page. -There may be instances, however, where you'd like to cause some action to take place at a particular stage in the execution process. -For example, you might want to run a script right before your controllers get loaded, or right after, or you might want to trigger one of -your own scripts in some other location. -

    - -

    Enabling Hooks

    - -

    The hooks feature can be globally enabled/disabled by setting the following item in the application/config/config.php file:

    - -$config['enable_hooks'] = TRUE; - - -

    Defining a Hook

    - -

    Hooks are defined in application/config/hooks.php file. Each hook is specified as an array with this prototype:

    - - -$hook['pre_controller'] = array(
    -                                'class'    => 'MyClass',
    -                                'function' => 'Myfunction',
    -                                'filename' => 'Myclass.php',
    -                                'filepath' => 'hooks',
    -                                'params'   => array('beer', 'wine', 'snacks')
    -                                );     - -

    Notes:
    The array index correlates to the name of the particular hook point you want to -use. In the above example the hook point is pre_controller. A list of hook points is found below. -The following items should be defined in your associative hook array:

    - -
      -
    • class  The name of the class you wish to invoke. If you prefer to use a procedural function instead of a class, leave this item blank.
      • -
    • function  The function name you wish to call.
      • -
    • filename  The file name containing your class/function.
      • -
    • filepath  The name of the directory containing your script. Note: Your script must be located in a directory INSIDE your application folder, so the file path is relative to that folder. For example, if your script is located in application/hooks, you will simply use hooks as your filepath. If your script is located in application/hooks/utilities you will use hooks/utilities as your filepath. No trailing slash.
      • -
    • params  Any parameters you wish to pass to your script. This item is optional.
      • -
    - - -

    Multiple Calls to the Same Hook

    - -

    If want to use the same hook point with more then one script, simply make your array declaration multi-dimensional, like this:

    - - -$hook['pre_controller'][] = array(
    -                                'class'    => 'MyClass',
    -                                'function' => 'Myfunction',
    -                                'filename' => 'Myclass.php',
    -                                'filepath' => 'hooks',
    -                                'params'   => array('beer', 'wine', 'snacks')
    -                                );
    -
    -$hook['pre_controller'][] = array(
    -                                'class'    => 'MyOtherClass',
    -                                'function' => 'MyOtherfunction',
    -                                'filename' => 'Myotherclass.php',
    -                                'filepath' => 'hooks',
    -                                'params'   => array('red', 'yellow', 'blue')
    -                                );     - -

    Notice the brackets after each array index:

    - -$hook['pre_controller'][] - -

    This permits you to have the same hook point with multiple scripts. The order you define your array will be the execution order.

    - - -

    Hook Points

    - -

    The following is a list of available hook points.

    - -
      -
    • pre_system
      - Called very early during system execution. Only the benchmark and hooks class have been loaded at this point. No routing or other processes have happened.
      • -
    • pre_controller
      - Called immediately prior to any of your controllers being called. All base classes, routing, and security checks have been done.
      • -
    • post_controller_constructor
      - Called immediately after your controller is instantiated, but prior to any method calls happening.
      • -
    • post_controller
      - Called immediately after your controller is fully executed.
      • -
    • display_override
      - Overrides the _display() function, used to send the finalized page to the web browser at the end of system execution. This permits you to - use your own display methodology. Note that you will need to reference the CI superobject with $this->CI =& get_instance() and then the finalized data will be available by calling $this->CI->output->get_output()
      • -
    • cache_override
      - Enables you to call your own function instead of the _display_cache() function in the output class. This permits you to use your own cache display mechanism.
      • -
    • scaffolding_override
      - Permits a scaffolding request to trigger your own script instead.
      • -
    • post_system
      - Called after the final rendered page is sent to the browser, at the end of system execution after the finalized data is sent to the browser.
      • -
    -
    - - - - - - + + + + + +Hooks : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Hooks - Extending the Framework Core

    + +

    CodeIgniter's Hooks feature provides a means to tap into and modify the inner workings of the framework without hacking the core files. +When CodeIgniter runs it follows a specific execution process, diagramed in the Application Flow page. +There may be instances, however, where you'd like to cause some action to take place at a particular stage in the execution process. +For example, you might want to run a script right before your controllers get loaded, or right after, or you might want to trigger one of +your own scripts in some other location. +

    + +

    Enabling Hooks

    + +

    The hooks feature can be globally enabled/disabled by setting the following item in the application/config/config.php file:

    + +$config['enable_hooks'] = TRUE; + + +

    Defining a Hook

    + +

    Hooks are defined in application/config/hooks.php file. Each hook is specified as an array with this prototype:

    + + +$hook['pre_controller'] = array(
    +                                'class'    => 'MyClass',
    +                                'function' => 'Myfunction',
    +                                'filename' => 'Myclass.php',
    +                                'filepath' => 'hooks',
    +                                'params'   => array('beer', 'wine', 'snacks')
    +                                );     + +

    Notes:
    The array index correlates to the name of the particular hook point you want to +use. In the above example the hook point is pre_controller. A list of hook points is found below. +The following items should be defined in your associative hook array:

    + +
      +
    • class  The name of the class you wish to invoke. If you prefer to use a procedural function instead of a class, leave this item blank.
      • +
    • function  The function name you wish to call.
      • +
    • filename  The file name containing your class/function.
      • +
    • filepath  The name of the directory containing your script. Note: Your script must be located in a directory INSIDE your application folder, so the file path is relative to that folder. For example, if your script is located in application/hooks, you will simply use hooks as your filepath. If your script is located in application/hooks/utilities you will use hooks/utilities as your filepath. No trailing slash.
      • +
    • params  Any parameters you wish to pass to your script. This item is optional.
      • +
    + + +

    Multiple Calls to the Same Hook

    + +

    If want to use the same hook point with more then one script, simply make your array declaration multi-dimensional, like this:

    + + +$hook['pre_controller'][] = array(
    +                                'class'    => 'MyClass',
    +                                'function' => 'Myfunction',
    +                                'filename' => 'Myclass.php',
    +                                'filepath' => 'hooks',
    +                                'params'   => array('beer', 'wine', 'snacks')
    +                                );
    +
    +$hook['pre_controller'][] = array(
    +                                'class'    => 'MyOtherClass',
    +                                'function' => 'MyOtherfunction',
    +                                'filename' => 'Myotherclass.php',
    +                                'filepath' => 'hooks',
    +                                'params'   => array('red', 'yellow', 'blue')
    +                                );     + +

    Notice the brackets after each array index:

    + +$hook['pre_controller'][] + +

    This permits you to have the same hook point with multiple scripts. The order you define your array will be the execution order.

    + + +

    Hook Points

    + +

    The following is a list of available hook points.

    + +
      +
    • pre_system
      + Called very early during system execution. Only the benchmark and hooks class have been loaded at this point. No routing or other processes have happened.
      • +
    • pre_controller
      + Called immediately prior to any of your controllers being called. All base classes, routing, and security checks have been done.
      • +
    • post_controller_constructor
      + Called immediately after your controller is instantiated, but prior to any method calls happening.
      • +
    • post_controller
      + Called immediately after your controller is fully executed.
      • +
    • display_override
      + Overrides the _display() function, used to send the finalized page to the web browser at the end of system execution. This permits you to + use your own display methodology. Note that you will need to reference the CI superobject with $this->CI =& get_instance() and then the finalized data will be available by calling $this->CI->output->get_output()
      • +
    • cache_override
      + Enables you to call your own function instead of the _display_cache() function in the output class. This permits you to use your own cache display mechanism.
      • +
    • scaffolding_override
      + Permits a scaffolding request to trigger your own script instead.
      • +
    • post_system
      + Called after the final rendered page is sent to the browser, at the end of system execution after the finalized data is sent to the browser.
      • +
    +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 29a2d62f..f1c17527 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -1,94 +1,94 @@ - - - - - -Using CodeIgniter Libraries : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Using CodeIgniter Libraries

    - - -

    All of the available libraries are located in your system/libraries folder. -In most cases, to use one of these classes involves initializing it within a controller using the following initialization function:

    - -$this->load->library('class name'); - -

    Where class name is the name of the class you want to invoke. For example, to load the validation class you would do this:

    - -$this->load->library('validation'); - -

    Once initialized you can use it as indicated in the user guide page corresponding to that class.

    - -

    Creating Your Own Libraries

    - -

    Please read the section of the user guide that discusses how to create your own libraries

    - - - -
    - - - - - - + + + + + +Using CodeIgniter Libraries : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Using CodeIgniter Libraries

    + + +

    All of the available libraries are located in your system/libraries folder. +In most cases, to use one of these classes involves initializing it within a controller using the following initialization function:

    + +$this->load->library('class name'); + +

    Where class name is the name of the class you want to invoke. For example, to load the validation class you would do this:

    + +$this->load->library('validation'); + +

    Once initialized you can use it as indicated in the user guide page corresponding to that class.

    + +

    Creating Your Own Libraries

    + +

    Please read the section of the user guide that discusses how to create your own libraries

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index f1600d90..60f51f7f 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -1,133 +1,133 @@ - - - - - -Managing your Applications : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Managing your Applications

    - -

    By default it is assumed that you only intend to use CodeIgniter to manage one application, which you will build in your -system/application/ directory. It is possible, however, to have multiple sets of applications that share a single -CodeIgniter installation, or even to rename or relocate your application folder.

    - -

    Renaming the Application Folder

    - -

    If you would like to rename your application folder you may do so as long as you open your main index.php -file and set its name using the $application_folder variable:

    - -$application_folder = "application"; - -

    Relocating your Application Folder

    - -

    It is possible to move your application folder to a different location on your server than your system folder. -To do so open your main index.php and set a full server path in the $application_folder variable.

    - - -$application_folder = "/Path/to/your/application"; - - -

    Running Multiple Applications with one CodeIgniter Installation

    - -

    If you would like to share a common CodeIgniter installation to manage several different applications simply -put all of the directories located inside your application folder into their -own sub-folder.

    - -

    For example, let's say you want to create two applications, "foo" and "bar". You will structure your -application folder like this:

    - -system/application/foo/
    -system/application/foo/config/
    -system/application/foo/controllers/
    -system/application/foo/errors/
    -system/application/foo/libraries/
    -system/application/foo/models/
    -system/application/foo/views/
    -system/application/bar/
    -system/application/bar/config/
    -system/application/bar/controllers/
    -system/application/bar/errors/
    -system/application/bar/libraries/
    -system/application/bar/models/
    -system/application/bar/views/     - - -

    To select a particular application for use requires that you open your main index.php file and set the $application_folder -variable. For example, to select the "foo" application for use you would do this:

    - -$application_folder = "application/foo"; - -

    Note:  Each of your applications will need its own index.php file which -calls the desired application. The index.php file can be named anything you want.

    - - - - - -
    - - - - - - + + + + + +Managing your Applications : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Managing your Applications

    + +

    By default it is assumed that you only intend to use CodeIgniter to manage one application, which you will build in your +system/application/ directory. It is possible, however, to have multiple sets of applications that share a single +CodeIgniter installation, or even to rename or relocate your application folder.

    + +

    Renaming the Application Folder

    + +

    If you would like to rename your application folder you may do so as long as you open your main index.php +file and set its name using the $application_folder variable:

    + +$application_folder = "application"; + +

    Relocating your Application Folder

    + +

    It is possible to move your application folder to a different location on your server than your system folder. +To do so open your main index.php and set a full server path in the $application_folder variable.

    + + +$application_folder = "/Path/to/your/application"; + + +

    Running Multiple Applications with one CodeIgniter Installation

    + +

    If you would like to share a common CodeIgniter installation to manage several different applications simply +put all of the directories located inside your application folder into their +own sub-folder.

    + +

    For example, let's say you want to create two applications, "foo" and "bar". You will structure your +application folder like this:

    + +system/application/foo/
    +system/application/foo/config/
    +system/application/foo/controllers/
    +system/application/foo/errors/
    +system/application/foo/libraries/
    +system/application/foo/models/
    +system/application/foo/views/
    +system/application/bar/
    +system/application/bar/config/
    +system/application/bar/controllers/
    +system/application/bar/errors/
    +system/application/bar/libraries/
    +system/application/bar/models/
    +system/application/bar/views/     + + +

    To select a particular application for use requires that you open your main index.php file and set the $application_folder +variable. For example, to select the "foo" application for use you would do this:

    + +$application_folder = "application/foo"; + +

    Note:  Each of your applications will need its own index.php file which +calls the desired application. The index.php file can be named anything you want.

    + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/models.html b/user_guide/general/models.html index b061d06c..c566bf61 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -1,251 +1,251 @@ - - - - - -Models : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Models

    - -

    Models are optionally available for those who want to use a more traditional MVC approach.

    - - - - - - - -

    What is a Model?

    - -

    Models are PHP classes that are designed to work with information in your database. For example, let's say -you use CodeIgniter to manage a blog. You might have a model class that contains functions to insert, update, and -retrieve your blog data. Here is an example of what such a model class might look like:

    - - -class Blogmodel extends Model {
    -
    -    var $title   = '';
    -    var $content = '';
    -    var $date    = '';
    -
    -    function Blogmodel()
    -    {
    -        // Call the Model constructor
    -        parent::Model();
    -    }
    -    
    -    function get_last_ten_entries()
    -    {
    -        $query = $this->db->get('entries', 10);
    -        return $query->result();
    -    }
    -
    -    function insert_entry()
    -    {
    -        $this->title   = $_POST['title']; // please read the below note
    -        $this->content = $_POST['content'];
    -        $this->date    = time();
    -
    -        $this->db->insert('entries', $this);
    -    }
    -
    -    function update_entry()
    -    {
    -        $this->title   = $_POST['title'];
    -        $this->content = $_POST['content'];
    -        $this->date    = time();
    -
    -        $this->db->update('entries', $this, array('id' => $_POST['id']));
    -    }
    -
    -}     - -

    Note: The functions in the above example use the Active Record database functions.

    -

    Note: For the sake of simplicity in this example we're using $_POST directly. This is generally bad practice, and a more common approach would be to use the Input Class $this->input->post('title')

    -

    Anatomy of a Model

    - -

    Model classes are stored in your application/models/ folder. They can be nested within sub-folders if you -want this type of organization.

    - -

    The basic prototype for a model class is this:

    - - - -class Model_name extends Model {
    -
    -    function Model_name()
    -    {
    -        parent::Model();
    -    }
    -}     - -

    Where Model_name is the name of your class. Class names must have the first letter capitalized with the rest of the name lowercase. -Make sure your class extends the base Model class.

    - -

    The file name will be a lower case version of your class name. For example, if your class is this:

    - - -class User_model extends Model {
    -
    -    function User_model()
    -    {
    -        parent::Model();
    -    }
    -}     - -

    Your file will be this:

    - -application/models/user_model.php - - - -

    Loading a Model

    - -

    Your models will typically be loaded and called from within your controller functions. -To load a model you will use the following function:

    - -$this->load->model('Model_name'); - -

    If you model is located in a sub-folder, include the relative path from your models folder. For example, if -you have a model located at application/models/blog/queries.php you'll load it using:

    - -$this->load->model('blog/queries'); - - -

    Once loaded, you will access your model functions using an object with the same name as your class:

    - - -$this->load->model('Model_name');
    -
    -$this->Model_name->function(); -     - -

    If you would like your model assigned to a different object name you can specify it via the second parameter of the loading -function:

    - - - -$this->load->model('Model_name', 'fubar');
    -
    -$this->fubar->function(); -     - -

    Here is an example of a controller, that loads a model, then serves a view:

    - - -class Blog_controller extends Controller {
    -
    -    function blog()
    -    {
    -        $this->load->model('Blog');
    -
    -        $data['query'] = $this->Blog->get_last_ten_entries();

    -        $this->load->view('blog', $data);
    -    }
    -}     - -

    Auto-loading Models

    -

    If you find that you need a particular model globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. This is done by opening the application/config/autoload.php file and adding the model to the autoload array.

    - - -

    Connecting to your Database

    - -

    When a model is loaded it does NOT connect automatically to your database. The following options for connecting are available to you:

    - -
      -
    • You can connect using the standard database methods described here, either from within your Controller class or your Model class.
      • -
    • You can tell the model loading function to auto-connect by passing TRUE (boolean) via the third parameter, -and connectivity settings, as defined in your database config file will be used: - - $this->load->model('Model_name', '', TRUE); -
      • - - -
    • You can manually pass database connectivity settings via the third parameter: - - - $config['hostname'] = "localhost";
      - $config['username'] = "myusername";
      - $config['password'] = "mypassword";
      - $config['database'] = "mydatabase";
      - $config['dbdriver'] = "mysql";
      - $config['dbprefix'] = "";
      - $config['pconnect'] = FALSE;
      - $config['db_debug'] = TRUE;
      -
      - $this->load->model('Model_name', '', $config);
      • -
    - - -
    - - - - - - + + + + + +Models : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Models

    + +

    Models are optionally available for those who want to use a more traditional MVC approach.

    + + + + + + + +

    What is a Model?

    + +

    Models are PHP classes that are designed to work with information in your database. For example, let's say +you use CodeIgniter to manage a blog. You might have a model class that contains functions to insert, update, and +retrieve your blog data. Here is an example of what such a model class might look like:

    + + +class Blogmodel extends Model {
    +
    +    var $title   = '';
    +    var $content = '';
    +    var $date    = '';
    +
    +    function Blogmodel()
    +    {
    +        // Call the Model constructor
    +        parent::Model();
    +    }
    +    
    +    function get_last_ten_entries()
    +    {
    +        $query = $this->db->get('entries', 10);
    +        return $query->result();
    +    }
    +
    +    function insert_entry()
    +    {
    +        $this->title   = $_POST['title']; // please read the below note
    +        $this->content = $_POST['content'];
    +        $this->date    = time();
    +
    +        $this->db->insert('entries', $this);
    +    }
    +
    +    function update_entry()
    +    {
    +        $this->title   = $_POST['title'];
    +        $this->content = $_POST['content'];
    +        $this->date    = time();
    +
    +        $this->db->update('entries', $this, array('id' => $_POST['id']));
    +    }
    +
    +}     + +

    Note: The functions in the above example use the Active Record database functions.

    +

    Note: For the sake of simplicity in this example we're using $_POST directly. This is generally bad practice, and a more common approach would be to use the Input Class $this->input->post('title')

    +

    Anatomy of a Model

    + +

    Model classes are stored in your application/models/ folder. They can be nested within sub-folders if you +want this type of organization.

    + +

    The basic prototype for a model class is this:

    + + + +class Model_name extends Model {
    +
    +    function Model_name()
    +    {
    +        parent::Model();
    +    }
    +}     + +

    Where Model_name is the name of your class. Class names must have the first letter capitalized with the rest of the name lowercase. +Make sure your class extends the base Model class.

    + +

    The file name will be a lower case version of your class name. For example, if your class is this:

    + + +class User_model extends Model {
    +
    +    function User_model()
    +    {
    +        parent::Model();
    +    }
    +}     + +

    Your file will be this:

    + +application/models/user_model.php + + + +

    Loading a Model

    + +

    Your models will typically be loaded and called from within your controller functions. +To load a model you will use the following function:

    + +$this->load->model('Model_name'); + +

    If you model is located in a sub-folder, include the relative path from your models folder. For example, if +you have a model located at application/models/blog/queries.php you'll load it using:

    + +$this->load->model('blog/queries'); + + +

    Once loaded, you will access your model functions using an object with the same name as your class:

    + + +$this->load->model('Model_name');
    +
    +$this->Model_name->function(); +     + +

    If you would like your model assigned to a different object name you can specify it via the second parameter of the loading +function:

    + + + +$this->load->model('Model_name', 'fubar');
    +
    +$this->fubar->function(); +     + +

    Here is an example of a controller, that loads a model, then serves a view:

    + + +class Blog_controller extends Controller {
    +
    +    function blog()
    +    {
    +        $this->load->model('Blog');
    +
    +        $data['query'] = $this->Blog->get_last_ten_entries();

    +        $this->load->view('blog', $data);
    +    }
    +}     + +

    Auto-loading Models

    +

    If you find that you need a particular model globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. This is done by opening the application/config/autoload.php file and adding the model to the autoload array.

    + + +

    Connecting to your Database

    + +

    When a model is loaded it does NOT connect automatically to your database. The following options for connecting are available to you:

    + +
      +
    • You can connect using the standard database methods described here, either from within your Controller class or your Model class.
      • +
    • You can tell the model loading function to auto-connect by passing TRUE (boolean) via the third parameter, +and connectivity settings, as defined in your database config file will be used: + + $this->load->model('Model_name', '', TRUE); +
      • + + +
    • You can manually pass database connectivity settings via the third parameter: + + + $config['hostname'] = "localhost";
      + $config['username'] = "myusername";
      + $config['password'] = "mypassword";
      + $config['database'] = "mydatabase";
      + $config['dbdriver'] = "mysql";
      + $config['dbprefix'] = "";
      + $config['pconnect'] = FALSE;
      + $config['db_debug'] = TRUE;
      +
      + $this->load->model('Model_name', '', $config);
      • +
    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 8471840a..d902ad05 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -1,127 +1,127 @@ - - - - - -Plugins : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Plugins

    - -

    Plugins work almost identically to Helpers. The main difference is that a plugin usually -provides a single function, whereas a Helper is usually a collection of functions. Helpers are also considered a part of -the core system; plugins are intended to be created and shared by our community.

    - -

    Plugins should be saved to your system/plugins directory or you can create a folder called plugins inside -your application folder and store them there. CodeIgniter will look first in your system/application/plugins -directory. If the directory does not exist or the specified plugin is not located there CI will instead look in your global -system/plugins folder.

    - - -

    Loading a Plugin

    - -

    Loading a plugin file is quite simple using the following function:

    - -$this->load->plugin('name'); - -

    Where name is the file name of the plugin, without the .php file extension or the "plugin" part.

    - -

    For example, to load the Captcha plugin, which is named captcha_pi.php, you will do this:

    - -$this->load->plugin('captcha'); - - - -

    A plugin can be loaded anywhere within your controller functions (or even within your View files, although that's not a good practice), -as long as you load it before you use it. You can load your plugins in your controller constructor so that they become available -automatically in any function, or you can load a plugin in a specific function that needs it.

    - -

    Note: The Plugin loading function above does not return a value, so don't try to assign it to a variable. Just use it as shown.

    - - -

    Loading Multiple Plugins

    - -

    If you need to load more than one plugin you can specify them in an array, like this:

    - -$this->load->plugin( array('plugin1', 'plugin2', 'plugin3') ); - -

    Auto-loading Plugins

    - -

    If you find that you need a particular plugin globally throughout your application, you can tell CodeIgniter to auto-load it -during system initialization. This is done by opening the application/config/autoload.php file and adding the plugin to the autoload array.

    - - -

    Using a Plugin

    - -

    Once you've loaded the Plugin, you'll call it the way you would a standard PHP function.

    - - - - -
    - - - - - - + + + + + +Plugins : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Plugins

    + +

    Plugins work almost identically to Helpers. The main difference is that a plugin usually +provides a single function, whereas a Helper is usually a collection of functions. Helpers are also considered a part of +the core system; plugins are intended to be created and shared by our community.

    + +

    Plugins should be saved to your system/plugins directory or you can create a folder called plugins inside +your application folder and store them there. CodeIgniter will look first in your system/application/plugins +directory. If the directory does not exist or the specified plugin is not located there CI will instead look in your global +system/plugins folder.

    + + +

    Loading a Plugin

    + +

    Loading a plugin file is quite simple using the following function:

    + +$this->load->plugin('name'); + +

    Where name is the file name of the plugin, without the .php file extension or the "plugin" part.

    + +

    For example, to load the Captcha plugin, which is named captcha_pi.php, you will do this:

    + +$this->load->plugin('captcha'); + + + +

    A plugin can be loaded anywhere within your controller functions (or even within your View files, although that's not a good practice), +as long as you load it before you use it. You can load your plugins in your controller constructor so that they become available +automatically in any function, or you can load a plugin in a specific function that needs it.

    + +

    Note: The Plugin loading function above does not return a value, so don't try to assign it to a variable. Just use it as shown.

    + + +

    Loading Multiple Plugins

    + +

    If you need to load more than one plugin you can specify them in an array, like this:

    + +$this->load->plugin( array('plugin1', 'plugin2', 'plugin3') ); + +

    Auto-loading Plugins

    + +

    If you find that you need a particular plugin globally throughout your application, you can tell CodeIgniter to auto-load it +during system initialization. This is done by opening the application/config/autoload.php file and adding the plugin to the autoload array.

    + + +

    Using a Plugin

    + +

    Once you've loaded the Plugin, you'll call it the way you would a standard PHP function.

    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index a9c2a646..c06db92f 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -1,104 +1,104 @@ - - - - - -Profiling Your Application : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Profiling Your Application

    - -

    The Profiler Class will display benchmark results, queries you have run, and $_POST data at the bottom of your pages. -This information can be useful during development in order to help with debugging and optimization.

    - - -

    Initializing the Class

    - -

    Important:  This class does NOT need to be initialized. It is loaded automatically by the -Output Class if profiling is enabled as shown below.

    - -

    Enabling the Profiler

    - -

    To enable the profiler place the following function anywhere within your Controller functions:

    -$this->output->enable_profiler(TRUE); - -

    When enabled a report will be generated and inserted at the bottom of your pages.

    - -

    To disable the profiler you will use:

    -$this->output->enable_profiler(FALSE); - -

    Setting Benchmark Points

    - -

    In order for the Profiler to compile and display your benchmark data you must name your mark points using specific syntax.

    - -

    Please read the information on setting Benchmark points in Benchmark Class page.

    - - - -
    - - - - - - + + + + + +Profiling Your Application : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Profiling Your Application

    + +

    The Profiler Class will display benchmark results, queries you have run, and $_POST data at the bottom of your pages. +This information can be useful during development in order to help with debugging and optimization.

    + + +

    Initializing the Class

    + +

    Important:  This class does NOT need to be initialized. It is loaded automatically by the +Output Class if profiling is enabled as shown below.

    + +

    Enabling the Profiler

    + +

    To enable the profiler place the following function anywhere within your Controller functions:

    +$this->output->enable_profiler(TRUE); + +

    When enabled a report will be generated and inserted at the bottom of your pages.

    + +

    To disable the profiler you will use:

    +$this->output->enable_profiler(FALSE); + +

    Setting Benchmark Points

    + +

    In order for the Profiler to compile and display your benchmark data you must name your mark points using specific syntax.

    + +

    Please read the information on setting Benchmark points in Benchmark Class page.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index edeced0a..ff2a0481 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -1,77 +1,77 @@ - - - - - -Quick Reference Chart : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Quick Reference Chart

    - -

    For a PDF version of this chart, click here.

    - -

    - -
    - - - - - - + + + + + +Quick Reference Chart : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Quick Reference Chart

    + +

    For a PDF version of this chart, click here.

    + +

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 742cd193..d47903f7 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -1,82 +1,82 @@ - - - - - -Server Requirements : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Server Requirements

    - -
      -
    • PHP version 4.3.2 or newer.
      • -
    • A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, and ODBC.
      • -
    - - - -
    - - - - - - - + + + + + +Server Requirements : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Server Requirements

    + +
      +
    • PHP version 4.3.2 or newer.
      • +
    • A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, and ODBC.
      • +
    + + + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 10c44747..bdd7e22f 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -1,155 +1,155 @@ - - - - - -Reserved Names : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Reserved Names

    - -

    In order to help out, CodeIgniter uses a series of functions and names in its operation. Because of this, some names cannot be used by a developer. Following is a list of reserved names that cannot be used.

    -

    Controller names

    -

    Since your controller classes will extend the main application controller you -must be careful not to name your functions identically to the ones used by that class, otherwise your local functions -will override them. The following -is a list of reserved names. Do not name your controller functions any of these:

    -
      -
    • Controller
      • -
    • CI_Base
      • -
    • _ci_initialize
      • -
    • _ci_scaffolding
      • -
    -


    - If you are running PHP 4 there are some additional reserved names. These ONLY apply if you are running PHP 4.

    -
      -
    • CI_Loader
      • -
    • config
      • -
    • database
      • -
    • dbutil
      • -
    • dbforge
      • -
    • file
      • -
    • helper
      • -
    • helpers
      • -
    • language
      • -
    • library
      • -
    • model
      • -
    • plugin
      • -
    • plugins
      • -
    • scaffolding
      • -
    • script
      • -
    • view
      • -
    • vars
      • -
    • _ci_assign_to_models
      • -
    • _ci_autoloader
      • -
    • _ci_init_class
      • -
    • _ci_init_scaffolding
      • -
    • _ci_is_instance
      • -
    • _ci_load
      • -
    • _ci_load_class
      • -
    • _ci_object_to_array
      • -
    -

    Functions

    -
      -
    • is_really_writable()
      • -
    • load_class()
      • -
    • get_config()
      • -
    • config_item()
      • -
    • show_error()
      • -
    • show_404()
      • -
    • log_message()
      • -
    • _exception_handler()
      • -
    • get_instance()
      • -
    -

    Variables

    -
      -
    • $config
      • -
    • $mimes
      • -
    • $lang
      • -
    -

    Constants

    -
      -
    • EXT
      • -
    • FCPATH
      • -
    • SELF
      • -
    • BASEPATH
      • -
    • APPPATH
      • -
    • CI_VERSION
      • -
    • FILE_READ_MODE
      • -
    • FILE_WRITE_MODE
      • -
    • DIR_READ_MODE
      • -
    • DIR_WRITE_MODE
      • -
    • FOPEN_READ
      • -
    • FOPEN_READ_WRITE
      • -
    • FOPEN_WRITE_CREATE_DESTRUCTIVE
      • -
    • FOPEN_READ_WRITE_CREATE_DESTRUCTIVE
      • -
    • FOPEN_WRITE_CREATE
      • -
    • FOPEN_READ_WRITE_CREATE
      • -
    • FOPEN_WRITE_CREATE_STRICT
      • -
    • FOPEN_READ_WRITE_CREATE_STRICT
      • -
    -
    - - - - - - + + + + + +Reserved Names : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Reserved Names

    + +

    In order to help out, CodeIgniter uses a series of functions and names in its operation. Because of this, some names cannot be used by a developer. Following is a list of reserved names that cannot be used.

    +

    Controller names

    +

    Since your controller classes will extend the main application controller you +must be careful not to name your functions identically to the ones used by that class, otherwise your local functions +will override them. The following +is a list of reserved names. Do not name your controller functions any of these:

    +
      +
    • Controller
      • +
    • CI_Base
      • +
    • _ci_initialize
      • +
    • _ci_scaffolding
      • +
    +


    + If you are running PHP 4 there are some additional reserved names. These ONLY apply if you are running PHP 4.

    +
      +
    • CI_Loader
      • +
    • config
      • +
    • database
      • +
    • dbutil
      • +
    • dbforge
      • +
    • file
      • +
    • helper
      • +
    • helpers
      • +
    • language
      • +
    • library
      • +
    • model
      • +
    • plugin
      • +
    • plugins
      • +
    • scaffolding
      • +
    • script
      • +
    • view
      • +
    • vars
      • +
    • _ci_assign_to_models
      • +
    • _ci_autoloader
      • +
    • _ci_init_class
      • +
    • _ci_init_scaffolding
      • +
    • _ci_is_instance
      • +
    • _ci_load
      • +
    • _ci_load_class
      • +
    • _ci_object_to_array
      • +
    +

    Functions

    +
      +
    • is_really_writable()
      • +
    • load_class()
      • +
    • get_config()
      • +
    • config_item()
      • +
    • show_error()
      • +
    • show_404()
      • +
    • log_message()
      • +
    • _exception_handler()
      • +
    • get_instance()
      • +
    +

    Variables

    +
      +
    • $config
      • +
    • $mimes
      • +
    • $lang
      • +
    +

    Constants

    +
      +
    • EXT
      • +
    • FCPATH
      • +
    • SELF
      • +
    • BASEPATH
      • +
    • APPPATH
      • +
    • CI_VERSION
      • +
    • FILE_READ_MODE
      • +
    • FILE_WRITE_MODE
      • +
    • DIR_READ_MODE
      • +
    • DIR_WRITE_MODE
      • +
    • FOPEN_READ
      • +
    • FOPEN_READ_WRITE
      • +
    • FOPEN_WRITE_CREATE_DESTRUCTIVE
      • +
    • FOPEN_READ_WRITE_CREATE_DESTRUCTIVE
      • +
    • FOPEN_WRITE_CREATE
      • +
    • FOPEN_READ_WRITE_CREATE
      • +
    • FOPEN_WRITE_CREATE_STRICT
      • +
    • FOPEN_READ_WRITE_CREATE_STRICT
      • +
    +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 80c8ab0d..062dc193 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -1,176 +1,176 @@ - - - - - -URI Routing : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    URI Routing

    - -

    Typically there is a one-to-one relationship between a URL string and its corresponding controller class/method. -The segments in a URI normally follow this pattern:

    - -example.com/class/function/id/ - -

    In some instances, however, you may want to remap this relationship so that a different class/function can be called -instead of the one corresponding to the URL.

    - -

    For example, lets say you want your URLs to have this prototype:

    - -

    -example.com/product/1/
    -example.com/product/2/
    -example.com/product/3/
    -example.com/product/4/ -

    - -

    Normally the second segment of the URL is reserved for the function name, but in the example above it instead has a product ID. -To overcome this, CodeIgniter allows you to remap the URI handler.

    - - -

    Setting your own routing rules

    - -

    Routing rules are defined in your application/config/routes.php file. In it you'll see an array called $route that -permits you to specify your own routing criteria. Routes can either be specified using wildcards or Regular Expressions

    - - -

    Wildcards

    - -

    A typical wildcard route might look something like this:

    - -$route['product/:num'] = "catalog/product_lookup"; - -

    In a route, the array key contains the URI to be matched, while the array value contains the destination it should be re-routed to. -In the above example, if the literal word "product" is found in the first segment of the URL, and a number is found in the second segment, -the "catalog" class and the "product_lookup" method are instead used.

    - -

    You can match literal values or you can use two wildcard types:

    - -

    -:num
    -:any -

    - -

    :num will match a segment containing only numbers.
    -:any will match a segment containing any character. -

    - -

    Note: Routes will run in the order they are defined. -Higher routes will always take precedence over lower ones.

    - -

    Examples

    - -

    Here are a few routing examples:

    - -$route['journals'] = "blogs"; -

    A URL containing the word "journals" in the first segment will be remapped to the "blogs" class.

    - -$route['blog/joe'] = "blogs/users/34"; -

    A URL containing the segments blog/joe will be remapped to the "blogs" class and the "users" method. The ID will be set to "34".

    - -$route['product/:any'] = "catalog/product_lookup"; -

    A URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the "product_lookup" method.

    - -$route['product/(:num)'] = "catalog/product_lookup_by_id/$1"; -

    A URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the "product_lookup_by_id" method passing in the match as a variable to the function.

    - -

    Important: Do not use leading/trailing slashes.

    - -

    Regular Expressions

    - -

    If you prefer you can use regular expressions to define your routing rules. Any valid regular expression is allowed, as are back-references.

    - -

    Note:  If you use back-references you must use the dollar syntax rather than the double backslash syntax.

    - -

    A typical RegEx route might look something like this:

    - -$route['products/([a-z]+)/(\d+)'] = "$1/id_$2"; - -

    In the above example, a URI similar to products/shirts/123 would instead call the shirts controller class and the id_123 function.

    - -

    You can also mix and match wildcards with regular expressions.

    - -

    Reserved Routes

    - -

    There are two reserved routes:

    - -$route['default_controller'] = 'welcome'; - -

    This route indicates which controller class should be loaded if the URI contains no data, which will be the case -when people load your root URL. In the above example, the "welcome" class would be loaded. You -are encouraged to always have a default route otherwise a 404 page will appear by default.

    - -$route['scaffolding_trigger'] = 'scaffolding'; - -

    This route lets you set a secret word, which when present in the URL, triggers the scaffolding feature. -Please read the Scaffolding page for details.

    - -

    Important:  The reserved routes must come before any wildcard or regular expression routes.

    - -
    - - - - - - + + + + + +URI Routing : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    URI Routing

    + +

    Typically there is a one-to-one relationship between a URL string and its corresponding controller class/method. +The segments in a URI normally follow this pattern:

    + +example.com/class/function/id/ + +

    In some instances, however, you may want to remap this relationship so that a different class/function can be called +instead of the one corresponding to the URL.

    + +

    For example, lets say you want your URLs to have this prototype:

    + +

    +example.com/product/1/
    +example.com/product/2/
    +example.com/product/3/
    +example.com/product/4/ +

    + +

    Normally the second segment of the URL is reserved for the function name, but in the example above it instead has a product ID. +To overcome this, CodeIgniter allows you to remap the URI handler.

    + + +

    Setting your own routing rules

    + +

    Routing rules are defined in your application/config/routes.php file. In it you'll see an array called $route that +permits you to specify your own routing criteria. Routes can either be specified using wildcards or Regular Expressions

    + + +

    Wildcards

    + +

    A typical wildcard route might look something like this:

    + +$route['product/:num'] = "catalog/product_lookup"; + +

    In a route, the array key contains the URI to be matched, while the array value contains the destination it should be re-routed to. +In the above example, if the literal word "product" is found in the first segment of the URL, and a number is found in the second segment, +the "catalog" class and the "product_lookup" method are instead used.

    + +

    You can match literal values or you can use two wildcard types:

    + +

    +:num
    +:any +

    + +

    :num will match a segment containing only numbers.
    +:any will match a segment containing any character. +

    + +

    Note: Routes will run in the order they are defined. +Higher routes will always take precedence over lower ones.

    + +

    Examples

    + +

    Here are a few routing examples:

    + +$route['journals'] = "blogs"; +

    A URL containing the word "journals" in the first segment will be remapped to the "blogs" class.

    + +$route['blog/joe'] = "blogs/users/34"; +

    A URL containing the segments blog/joe will be remapped to the "blogs" class and the "users" method. The ID will be set to "34".

    + +$route['product/:any'] = "catalog/product_lookup"; +

    A URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the "product_lookup" method.

    + +$route['product/(:num)'] = "catalog/product_lookup_by_id/$1"; +

    A URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the "product_lookup_by_id" method passing in the match as a variable to the function.

    + +

    Important: Do not use leading/trailing slashes.

    + +

    Regular Expressions

    + +

    If you prefer you can use regular expressions to define your routing rules. Any valid regular expression is allowed, as are back-references.

    + +

    Note:  If you use back-references you must use the dollar syntax rather than the double backslash syntax.

    + +

    A typical RegEx route might look something like this:

    + +$route['products/([a-z]+)/(\d+)'] = "$1/id_$2"; + +

    In the above example, a URI similar to products/shirts/123 would instead call the shirts controller class and the id_123 function.

    + +

    You can also mix and match wildcards with regular expressions.

    + +

    Reserved Routes

    + +

    There are two reserved routes:

    + +$route['default_controller'] = 'welcome'; + +

    This route indicates which controller class should be loaded if the URI contains no data, which will be the case +when people load your root URL. In the above example, the "welcome" class would be loaded. You +are encouraged to always have a default route otherwise a 404 page will appear by default.

    + +$route['scaffolding_trigger'] = 'scaffolding'; + +

    This route lets you set a secret word, which when present in the URL, triggers the scaffolding feature. +Please read the Scaffolding page for details.

    + +

    Important:  The reserved routes must come before any wildcard or regular expression routes.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index f5925240..cc948481 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -1,146 +1,146 @@ - - - - - -Scaffolding : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Scaffolding

    - -

    CodeIgniter's Scaffolding feature provides a fast and very convenient way to add, edit, or delete information in your database -during development.

    - -

    Very Important: Scaffolding is intended for development use only. It provides very little -security other than a "secret" word, so anyone who has access to your CodeIgniter site can potentially edit or delete your information. -If you use scaffolding make sure you disable it immediately after you are through using it. DO NOT leave it enabled on a live site. -And please, set a secret word before you use it.

    - - -

    Why would someone use scaffolding?

    - -

    Here's a typical scenario: You create a new database table during development and you'd like a quick way to insert some data -into it to work with. Without scaffolding your choices are either to write some inserts using the command line or to use a -database management tool like phpMyAdmin. With CodeIgniter's scaffolding feature you can quickly add some data using its browser -interface. And when you are through using the data you can easily delete it.

    - -

    Setting a Secret Word

    - -

    Before enabling scaffolding please take a moment to set a secret word. This word, when encountered in your URL, -will launch the scaffolding interface, so please pick something obscure that no one is likely to guess.

    - -

    To set a secret word, open your application/config/routes.php file and look for this item:

    - -$route['scaffolding_trigger'] = ''; - -

    Once you've found it add your own unique word.

    - -

    Note: The scaffolding word can not start with an underscore.

    - - -

    Enabling Scaffolding

    - -

    Note: The information on this page assumes you already know how controllers work, and that you have -a working one available. It also assumes you have configured CodeIgniter to auto-connect to your database. -If not, the information here won't be very relevant, so you are encouraged to go through those sections first. -Lastly, it assumes you understand what a class constructor is. If not, read the last section of the controllers -page.

    - -

    To enable scaffolding you will initialize it in your constructor like this:

    - - -<?php
    -class Blog extends Controller {
    -
    -       function Blog()
    -       {
    -            parent::Controller();

    -            $this->load->scaffolding('table_name');
    -       }
    -}
    -?>     - -

    Where table_name is the name of the table (table, not database) you wish to work with.

    - -

    Once you've initialized scaffolding, you will access it with this URL prototype:

    - -example.com/index.php/class/secret_word/ - -

    For example, using a controller named Blog, and abracadabra as the secret word, -you would access scaffolding like this:

    - -example.com/index.php/blog/abracadabra/ - -

    The scaffolding interface should be self-explanatory. You can add, edit or delete records.

    - - -

    A Final Note:

    - -

    The scaffolding feature will only work with tables that contain a primary key, as this is information is needed to perform the various -database functions.

    - - -
    - - - - - - + + + + + +Scaffolding : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Scaffolding

    + +

    CodeIgniter's Scaffolding feature provides a fast and very convenient way to add, edit, or delete information in your database +during development.

    + +

    Very Important: Scaffolding is intended for development use only. It provides very little +security other than a "secret" word, so anyone who has access to your CodeIgniter site can potentially edit or delete your information. +If you use scaffolding make sure you disable it immediately after you are through using it. DO NOT leave it enabled on a live site. +And please, set a secret word before you use it.

    + + +

    Why would someone use scaffolding?

    + +

    Here's a typical scenario: You create a new database table during development and you'd like a quick way to insert some data +into it to work with. Without scaffolding your choices are either to write some inserts using the command line or to use a +database management tool like phpMyAdmin. With CodeIgniter's scaffolding feature you can quickly add some data using its browser +interface. And when you are through using the data you can easily delete it.

    + +

    Setting a Secret Word

    + +

    Before enabling scaffolding please take a moment to set a secret word. This word, when encountered in your URL, +will launch the scaffolding interface, so please pick something obscure that no one is likely to guess.

    + +

    To set a secret word, open your application/config/routes.php file and look for this item:

    + +$route['scaffolding_trigger'] = ''; + +

    Once you've found it add your own unique word.

    + +

    Note: The scaffolding word can not start with an underscore.

    + + +

    Enabling Scaffolding

    + +

    Note: The information on this page assumes you already know how controllers work, and that you have +a working one available. It also assumes you have configured CodeIgniter to auto-connect to your database. +If not, the information here won't be very relevant, so you are encouraged to go through those sections first. +Lastly, it assumes you understand what a class constructor is. If not, read the last section of the controllers +page.

    + +

    To enable scaffolding you will initialize it in your constructor like this:

    + + +<?php
    +class Blog extends Controller {
    +
    +       function Blog()
    +       {
    +            parent::Controller();

    +            $this->load->scaffolding('table_name');
    +       }
    +}
    +?>     + +

    Where table_name is the name of the table (table, not database) you wish to work with.

    + +

    Once you've initialized scaffolding, you will access it with this URL prototype:

    + +example.com/index.php/class/secret_word/ + +

    For example, using a controller named Blog, and abracadabra as the secret word, +you would access scaffolding like this:

    + +example.com/index.php/blog/abracadabra/ + +

    The scaffolding interface should be self-explanatory. You can add, edit or delete records.

    + + +

    A Final Note:

    + +

    The scaffolding feature will only work with tables that contain a primary key, as this is information is needed to perform the various +database functions.

    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 8b6eba8c..236b29b4 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -1,153 +1,153 @@ - - - - - -Security : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Security

    - -

    This page describes some "best practices" regarding web security, and details -CodeIgniter's internal security features.

    - - -

    URI Security

    - -

    CodeIgniter is fairly restrictive regarding which characters it allows in your URI strings in order to help -minimize the possibility that malicious data can be passed to your application. URIs may only contain the following: -

    - -
      -
    • Alpha-numeric text
      • -
    • Tilde: ~
      • -
    • Period: .
      • -
    • Colon: :
      • -
    • Underscore: _
      • -
    • Dash: -
      • -
    - -

    GET, POST, and COOKIE Data

    - -

    GET data is simply disallowed by CodeIgniter since the system utilizes URI segments rather than traditional URL query strings (unless -you have the query string option enabled in your config file). The global GET -array is unset by the Input class during system initialization.

    - -

    Register_globals

    - -

    During system initialization all global variables are unset, except those found in the $_POST and $_COOKIE arrays. The unsetting -routine is effectively the same as register_globals = off.

    - - -

    magic_quotes_runtime

    - -

    The magic_quotes_runtime directive is turned off during system initialization so that you don't have to remove slashes when -retrieving data from your database.

    - -

    Best Practices

    - -

    Before accepting any data into your application, whether it be POST data from a form submission, COOKIE data, URI data, -XML-RPC data, or even data from the SERVER array, you are encouraged to practice this three step approach:

    - -
      -
    1. Filter the data as if it were tainted.
      2. -
    2. Validate the data to ensure it conforms to the correct type, length, size, etc. (sometimes this step can replace step one)
      3. -
    3. Escape the data before submitting it into your database.
      4. -
    - -

    CodeIgniter provides the following functions to assist in this process:

    - -
      - -

    • XSS Filtering

      - -

      CodeIgniter comes with a Cross Site Scripting filter. This filter looks for commonly -used techniques to embed malicious Javascript into your data, or other types of code that attempt to hijack cookies -or do other malicious things. The XSS Filter is described here. -

      -
      • - -

    • Validate the data

      - -

      CodeIgniter has a Form Validation Class that assists you in validating, filtering, and prepping -your data.

      -
      • - -

    • Escape all data before database insertion

      - -

      Never insert information into your database without escaping it. Please see the section that discusses -queries for more information.

      - -
      • - -
    - - - - -
    - - - - - - + + + + + +Security : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Security

    + +

    This page describes some "best practices" regarding web security, and details +CodeIgniter's internal security features.

    + + +

    URI Security

    + +

    CodeIgniter is fairly restrictive regarding which characters it allows in your URI strings in order to help +minimize the possibility that malicious data can be passed to your application. URIs may only contain the following: +

    + +
      +
    • Alpha-numeric text
      • +
    • Tilde: ~
      • +
    • Period: .
      • +
    • Colon: :
      • +
    • Underscore: _
      • +
    • Dash: -
      • +
    + +

    GET, POST, and COOKIE Data

    + +

    GET data is simply disallowed by CodeIgniter since the system utilizes URI segments rather than traditional URL query strings (unless +you have the query string option enabled in your config file). The global GET +array is unset by the Input class during system initialization.

    + +

    Register_globals

    + +

    During system initialization all global variables are unset, except those found in the $_POST and $_COOKIE arrays. The unsetting +routine is effectively the same as register_globals = off.

    + + +

    magic_quotes_runtime

    + +

    The magic_quotes_runtime directive is turned off during system initialization so that you don't have to remove slashes when +retrieving data from your database.

    + +

    Best Practices

    + +

    Before accepting any data into your application, whether it be POST data from a form submission, COOKIE data, URI data, +XML-RPC data, or even data from the SERVER array, you are encouraged to practice this three step approach:

    + +
      +
    1. Filter the data as if it were tainted.
      2. +
    2. Validate the data to ensure it conforms to the correct type, length, size, etc. (sometimes this step can replace step one)
      3. +
    3. Escape the data before submitting it into your database.
      4. +
    + +

    CodeIgniter provides the following functions to assist in this process:

    + +
      + +

    • XSS Filtering

      + +

      CodeIgniter comes with a Cross Site Scripting filter. This filter looks for commonly +used techniques to embed malicious Javascript into your data, or other types of code that attempt to hijack cookies +or do other malicious things. The XSS Filter is described here. +

      +
      • + +

    • Validate the data

      + +

      CodeIgniter has a Form Validation Class that assists you in validating, filtering, and prepping +your data.

      +
      • + +

    • Escape all data before database insertion

      + +

      Never insert information into your database without escaping it. Please see the section that discusses +queries for more information.

      + +
      • + +
    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index faa1a8ff..43385d06 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -1,649 +1,649 @@ - - - - - -Style Guide : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    General Style and Syntax

    - -

    The following page describes the coding rules use adhere to when developing CodeIgniter.

    - - -

    Table of Contents

    - - -

    PHP Closing Tag

    -
    -

    The PHP closing tag on a PHP document ?> is optional to the PHP parser. However, if used, any whitespace following the closing tag, whether introduced - by the developer, user, or an FTP application, can cause unwanted output, PHP errors, or if the latter are suppressed, blank pages. For this reason, all PHP files should - OMIT the closing PHP tag, and instead use a comment block to mark the end of file and it's location relative to the application root. - This allows you to still identify a file as being complete and not truncated.

    -INCORRECT: -<?php - -echo "Here's my code!"; - -?> - -CORRECT: -<?php - -echo "Here's my code!"; - -/* End of file myfile.php */ -/* Location: ./system/modules/mymodule/myfile.php */ - -
    - - -

    Class and Method Naming

    -
    -

    Class names should always have their first letter uppercase, and the constructor method should match identically. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.

    - - INCORRECT: -class superclass -class SuperClass - -CORRECT: -class Super_class - -

    Notice that the Class and constructor methods are identically named and cased:

    - - class Super_class { - - function Super_class() - { - - } -} - -

    Examples of improper and proper method naming:

    - - INCORRECT: -function fileproperties() // not descriptive and needs underscore separator -function fileProperties() // not descriptive and uses CamelCase -function getfileproperties() // Better! But still missing underscore separator -function getFileProperties() // uses CamelCase -function get_the_file_properties_from_the_file() // wordy - -CORRECT: -function get_file_properties() // descriptive, underscore separator, and all lowercase letters - -
    - - -

    Variable Names

    -
    -

    The guidelines for variable naming is very similar to that used for class methods. Namely, variables should contain only lowercase letters, use underscore separators, and be reasonably named to indicate their purpose and contents. Very short, non-word variables should only be used as iterators in for() loops.

    -INCORRECT: -$j = 'foo'; // single letter variables should only be used in for() loops -$Str // contains uppercase letters -$bufferedText // uses CamelCasing, and could be shortened without losing semantic meaning -$groupid // multiple words, needs underscore separator -$name_of_last_city_used // too long - -CORRECT: -for ($j = 0; $j < 10; $j++) -$str -$buffer -$group_id -$last_city - -
    - - -

    Commenting

    -
    -

    In general, code should be commented prolifically. It not only helps describe the flow and intent of the code for less experienced programmers, but can prove invaluable when returning to your own code months down the line. There is not a required format for comments, but the following are recommended.

    - -

    DocBlock style comments preceding class and method declarations so they can be picked up by IDEs:

    - -/** - * Super Class - * - * @package Package Name - * @subpackage Subpackage - * @category Category - * @author Author Name - * @link http://example.com - */ -class Super_class { - -/** - * Encodes string for use in XML - * - * @access public - * @param string - * @return string - */ -function xml_encode($str) - -

    Use single line comments within code, leaving a blank line between large comment blocks and code.

    - -// break up the string by newlines -$parts = explode("\n", $str); - -// A longer comment that needs to give greater detail on what is -// occurring and why can use multiple single-line comments. Try to -// keep the width reasonable, around 70 characters is the easiest to -// read. Don't hesitate to link to permanent external resources -// that may provide greater detail: -// -// http://example.com/information_about_something/in_particular/ - -$parts = $this->foo($parts); - -
    - - -

    Constants

    -
    -

    Constants follow the same guidelines as do variables, except constants should always be fully uppercase. Always use ExpressionEngine constants when appropriate, i.e. SLASH, LD, RD, PATH_CACHE, etc.

    -INCORRECT: -myConstant // missing underscore separator and not fully uppercase -N // no single-letter constants -S_C_VER // not descriptive -$str = str_replace('{foo}', 'bar', $str); // should use LD and RD constants - -CORRECT: -MY_CONSTANT -NEWLINE -SUPER_CLASS_VERSION -$str = str_replace(LD.'foo'.RD, 'bar', $str); - -
    - - -

    TRUE, FALSE, and NULL

    -
    -

    TRUE, FALSE, and NULL keywords should always be fully uppercase.

    -INCORRECT: -if ($foo == true) -$bar = false; -function foo($bar = null) - -CORRECT: -if ($foo == TRUE) -$bar = FALSE; -function foo($bar = NULL) -
    - - - -

    Logical Operators

    -
    -

    Use of || is discouraged as its clarity on some output devices is low (looking like the number 11 for instance). - && is preferred over AND but either are acceptable, and a space should always precede and follow !.

    -INCORRECT: -if ($foo || $bar) -if ($foo AND $bar) // okay but not recommended for common syntax highlighting applications -if (!$foo) -if (! is_array($foo)) - -CORRECT: -if ($foo OR $bar) -if ($foo && $bar) // recommended -if ( ! $foo) -if ( ! is_array($foo)) - -
    - - - -

    Comparing Return Values and Typecasting

    -
    -

    Some PHP functions return FALSE on failure, but may also have a valid return value of "" or 0, which would evaluate to FALSE in loose comparisons. Be explicit by comparing the variable type when using these return values in conditionals to ensure the return value is indeed what you expect, and not a value that has an equivalent loose-type evaluation.

    -

    Use the same stringency in returning and checking your own variables. Use === and !== as necessary. - -INCORRECT: -// If 'foo' is at the beginning of the string, strpos will return a 0, -// resulting in this conditional evaluating as TRUE -if (strpos($str, 'foo') == FALSE) - -CORRECT: -if (strpos($str, 'foo') === FALSE) - - -INCORRECT: -function build_string($str = "") -{ - if ($str == "") // uh-oh! What if FALSE or the integer 0 is passed as an argument? - { - - } -} - -CORRECT: -function build_string($str = "") -{ - if ($str === "") - { - - } -} - -

    See also information regarding typecasting, which can be quite useful. Typecasting has a slightly different effect which may be desirable. When casting a variable as a string, for instance, NULL and boolean FALSE variables become empty strings, 0 (and other numbers) become strings of digits, and boolean TRUE becomes "1":

    - -$str = (string) $str; // cast $str as a string - -
    - - -

    Debugging Code

    -
    -

    No debugging code can be left in place for submitted add-ons unless it is commented out, i.e. no var_dump(), print_r(), die(), and exit() calls that were used while creating the add-on, unless they are commented out.

    - -// print_r($foo); -
    - - - -

    Whitespace in Files

    -
    -

    No whitespace can precede the opening PHP tag or follow the closing PHP tag. ExpressionEngine output is buffered, so whitespace in your files can cause output to begin before ExpressionEngine outputs its content, leading to errors and an inability for ExpressionEngine to send proper headers. In the examples below, select the text with your mouse to reveal the incorrect whitespace.

    - -

    INCORRECT:

    - -<?php - // ...there is whitespace and a linebreak above the opening PHP tag - // as well as whitespace after the closing PHP tag -?> - -

    CORRECT:

    -<?php - // this sample has no whitespace before or after the opening and closing PHP tags -?> - -
    - - -

    Compatibility

    -
    -

    Unless specifically mentioned in your add-on's documentation, all code must be compatible with PHP version 4.3+. Additionally, do not use PHP functions that require non-default libraries to be installed unless your code contains an alternative method when the function is not available, or you implicitly document that your add-on requires said PHP libraries.

    -
    - - - -

    Class and File Names using Common Words

    -
    -

    When your class or filename is a common word, or might quite likely be identically named in another PHP script, provide a unique prefix to help prevent collision. Always realize that your end users may be running other add-ons or third party PHP scripts. Choose a prefix that is unique to your identity as a developer or company.

    - -INCORRECT: -class Email pi.email.php -class Xml ext.xml.php -class Import mod.import.php - -CORRECT: -class Pre_email pi.pre_email.php -class Pre_xml ext.pre_xml.php -class Pre_import mod.pre_import.php - -
    - - -

    Database Table Names

    -
    -

    Any tables that your add-on might use must use the 'exp_' prefix, followed by a prefix uniquely identifying you as the developer or company, and then a short descriptive table name. You do not need to be concerned about the database prefix being used on the user's installation, as ExpressionEngine's database class will automatically convert 'exp_' to what is actually being used.

    - -INCORRECT: -email_addresses // missing both prefixes -pre_email_addresses // missing exp_ prefix -exp_email_addresses // missing unique prefix - -CORRECT: -exp_pre_email_addresses - - -

    NOTE: Be mindful that MySQL has a limit of 64 characters for table names. This should not be an issue as table names that would exceed this would likely have unreasonable names. For instance, the following table name exceeds this limitation by one character. Silly, no? exp_pre_email_addresses_of_registered_users_in_seattle_washington -

    - - - -

    One File per Class

    -
    -

    Use separate files for each class your add-on uses, unless the classes are closely related. An example of ExpressionEngine files that contains multiple classes is the Database class file, which contains both the DB class and the DB_Cache class, and the Magpie plugin, which contains both the Magpie and Snoopy classes.

    -
    - - - -

    Whitespace

    -
    -

    Use tabs for whitespace in your code, not spaces. This may seem like a small thing, but using tabs instead of whitespace allows the developer looking at your code to have indentation at levels that they prefer and customize in whatever application they use. And as a side benefit, it results in (slightly) more compact files, storing one tab character versus, say, four space characters.

    -
    - - - -

    Line Breaks

    -
    -

    Files must be saved with Unix line breaks. This is more of an issue for developers who work in Windows, but in any case ensure that your text editor is setup to save files with Unix line breaks.

    -
    - - - -

    Code Indenting

    -
    -

    Use Allman style indenting. With the exception of Class declarations, braces are always placed on a line by themselves, and indented at the same level as the control statement that "owns" them.

    - -INCORRECT: -function foo($bar) { - // ... -} - -foreach ($arr as $key => $val) { - // ... -} - -if ($foo == $bar) { - // ... -} else { - // ... -} - -for ($i = 0; $i < 10; $i++) - { - for ($j = 0; $j < 10; $j++) - { - // ... - } - } - -CORRECT: -function foo($bar) -{ - // ... -} - -foreach ($arr as $key => $val) -{ - // ... -} - -if ($foo == $bar) -{ - // ... -} -else -{ - // ... -} - -for ($i = 0; $i < 10; $i++) -{ - for ($j = 0; $j < 10; $j++) - { - // ... - } -} -
    - - -

    Bracket and Parenthetic Spacing

    -
    -

    In general, parenthesis and brackets should not use any additional spaces. The exception is that a space should always follow PHP control structures that accept arguments with parenthesis (declare, do-while, elseif, for, foreach, if, switch, while), to help distinguish them from functions and increase readability.

    - -INCORRECT: -$arr[ $foo ] = 'foo'; - -CORRECT: -$arr[$foo] = 'foo'; // no spaces around array keys - - -INCORRECT: -function foo ( $bar ) -{ - -} - -CORRECT: -function foo($bar) // no spaces around parenthesis in function declarations -{ - -} - - -INCORRECT: -foreach( $query->result() as $row ) - -CORRECT: -foreach ($query->result() as $row) // single space following PHP control structures, but not in interior parenthesis - -
    - - - -

    Localized Text in Control Panel

    -
    -

    Any text that is output in the control panel should use language variables in your module's lang file to allow localization.

    - -INCORRECT: -return "Invalid Selection"; - -CORRECT: -return $LANG->line('invalid_selection'); -
    - - - -

    Private Methods and Variables

    -
    -

    Methods and variables that are only accessed internally by your class, such as utility and helper functions that your public methods use for code abstraction, should be prefixed with an underscore.

    - -convert_text() // public method -_convert_text() // private method -
    - - - -

    PHP Errors

    -
    -

    Code must run error free and not rely on warnings and notices to be hidden to meet this requirement. For instance, never access a variable that you did not set yourself (such as $_POST array keys) without first checking to see that it isset().

    - -

    Make sure that while developing your add-on, error reporting is enabled for ALL users, and that display_errors is enabled in the PHP environment. You can check this setting with:

    - -if (ini_get('display_errors') == 1) -{ - exit "Enabled"; -} - -

    On some servers where display_errors is disabled, and you do not have the ability to change this in the php.ini, you can often enable it with:

    - -ini_set('display_errors', 1); - -

    NOTE: Setting the display_errors setting with ini_set() at runtime is not identical to having it enabled in the PHP environment. Namely, it will not have any effect if the script has fatal errors

    -
    - - - -

    Short Open Tags

    -
    -

    Always use full PHP opening tags, in case a server does not have short_open_tag enabled.

    - -INCORRECT: -<? echo $foo; ?> - -<?=$foo?> - -CORRECT: -<?php echo $foo; ?> -
    - - - -

    One Statement Per Line

    -
    -

    Never combine statements on one line.

    - -INCORRECT: -$foo = 'this'; $bar = 'that'; $bat = str_replace($foo, $bar, $bag); - -CORRECT: -$foo = 'this'; -$bar = 'that'; -$bat = str_replace($foo, $bar, $bag); - -
    - - - -

    Strings

    -
    -

    Always use single quoted strings unless you need variables parsed, and in cases where you do need variables parsed, use braces to prevent greedy token parsing. You may also use double-quoted strings if the string contains single quotes, so you do not have to use escape characters.

    - -INCORRECT: -"My String" // no variable parsing, so no use for double quotes -"My string $foo" // needs braces -'SELECT foo FROM bar WHERE baz = \'bag\'' // ugly - -CORRECT: -'My String' -"My string {$foo}" -"SELECT foo FROM bar WHERE baz = 'bag'" -
    - - - -

    SQL Queries

    -
    -

    MySQL keywords are always capitalized: SELECT, INSERT, UPDATE, WHERE, AS, JOIN, ON, IN, etc.

    - -

    Break up long queries into multiple lines for legibility, preferably breaking for each clause.

    - -INCORRECT: -// keywords are lowercase and query is too long for -// a single line (... indicates continuation of line) -$query = $this->db->query("select foo, bar, baz, foofoo, foobar as raboof, foobaz from exp_pre_email_addresses -...where foo != 'oof' and baz != 'zab' order by foobaz limit 5, 100"); - -CORRECT: -$query = $this->db->query("SELECT foo, bar, baz, foofoo, foobar AS raboof, foobaz - FROM exp_pre_email_addresses - WHERE foo != 'oof' - AND baz != 'zab' - ORDER BY foobaz - LIMIT 5, 100"); -
    - - - -

    Default Function Arguments

    -
    -

    Whenever appropriate, provide function argument defaults, which helps prevent PHP errors with mistaken calls and provides common fallback values which can save a few lines of code. Example:

    - -function foo($bar = '', $baz = FALSE) -
    - - - -

    Overlapping Tag Parameters

    -
    -

    Avoid multiple tag parameters that have effect on the same thing. For instance, instead of include= and exclude=, perhaps allow include= to handle the parameter alone, with the addition of "not", e.g. include="not bar". This will prevent problems of parameters overlapping or having to worry about which parameter has priority over another.

    -
    - - -
    - - - -
    - - - - - - + + + + + +Style Guide : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    General Style and Syntax

    + +

    The following page describes the coding rules use adhere to when developing CodeIgniter.

    + + +

    Table of Contents

    + + +

    PHP Closing Tag

    +
    +

    The PHP closing tag on a PHP document ?> is optional to the PHP parser. However, if used, any whitespace following the closing tag, whether introduced + by the developer, user, or an FTP application, can cause unwanted output, PHP errors, or if the latter are suppressed, blank pages. For this reason, all PHP files should + OMIT the closing PHP tag, and instead use a comment block to mark the end of file and it's location relative to the application root. + This allows you to still identify a file as being complete and not truncated.

    +INCORRECT: +<?php + +echo "Here's my code!"; + +?> + +CORRECT: +<?php + +echo "Here's my code!"; + +/* End of file myfile.php */ +/* Location: ./system/modules/mymodule/myfile.php */ + +
    + + +

    Class and Method Naming

    +
    +

    Class names should always have their first letter uppercase, and the constructor method should match identically. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.

    + + INCORRECT: +class superclass +class SuperClass + +CORRECT: +class Super_class + +

    Notice that the Class and constructor methods are identically named and cased:

    + + class Super_class { + + function Super_class() + { + + } +} + +

    Examples of improper and proper method naming:

    + + INCORRECT: +function fileproperties() // not descriptive and needs underscore separator +function fileProperties() // not descriptive and uses CamelCase +function getfileproperties() // Better! But still missing underscore separator +function getFileProperties() // uses CamelCase +function get_the_file_properties_from_the_file() // wordy + +CORRECT: +function get_file_properties() // descriptive, underscore separator, and all lowercase letters + +
    + + +

    Variable Names

    +
    +

    The guidelines for variable naming is very similar to that used for class methods. Namely, variables should contain only lowercase letters, use underscore separators, and be reasonably named to indicate their purpose and contents. Very short, non-word variables should only be used as iterators in for() loops.

    +INCORRECT: +$j = 'foo'; // single letter variables should only be used in for() loops +$Str // contains uppercase letters +$bufferedText // uses CamelCasing, and could be shortened without losing semantic meaning +$groupid // multiple words, needs underscore separator +$name_of_last_city_used // too long + +CORRECT: +for ($j = 0; $j < 10; $j++) +$str +$buffer +$group_id +$last_city + +
    + + +

    Commenting

    +
    +

    In general, code should be commented prolifically. It not only helps describe the flow and intent of the code for less experienced programmers, but can prove invaluable when returning to your own code months down the line. There is not a required format for comments, but the following are recommended.

    + +

    DocBlock style comments preceding class and method declarations so they can be picked up by IDEs:

    + +/** + * Super Class + * + * @package Package Name + * @subpackage Subpackage + * @category Category + * @author Author Name + * @link http://example.com + */ +class Super_class { + +/** + * Encodes string for use in XML + * + * @access public + * @param string + * @return string + */ +function xml_encode($str) + +

    Use single line comments within code, leaving a blank line between large comment blocks and code.

    + +// break up the string by newlines +$parts = explode("\n", $str); + +// A longer comment that needs to give greater detail on what is +// occurring and why can use multiple single-line comments. Try to +// keep the width reasonable, around 70 characters is the easiest to +// read. Don't hesitate to link to permanent external resources +// that may provide greater detail: +// +// http://example.com/information_about_something/in_particular/ + +$parts = $this->foo($parts); + +
    + + +

    Constants

    +
    +

    Constants follow the same guidelines as do variables, except constants should always be fully uppercase. Always use ExpressionEngine constants when appropriate, i.e. SLASH, LD, RD, PATH_CACHE, etc.

    +INCORRECT: +myConstant // missing underscore separator and not fully uppercase +N // no single-letter constants +S_C_VER // not descriptive +$str = str_replace('{foo}', 'bar', $str); // should use LD and RD constants + +CORRECT: +MY_CONSTANT +NEWLINE +SUPER_CLASS_VERSION +$str = str_replace(LD.'foo'.RD, 'bar', $str); + +
    + + +

    TRUE, FALSE, and NULL

    +
    +

    TRUE, FALSE, and NULL keywords should always be fully uppercase.

    +INCORRECT: +if ($foo == true) +$bar = false; +function foo($bar = null) + +CORRECT: +if ($foo == TRUE) +$bar = FALSE; +function foo($bar = NULL) +
    + + + +

    Logical Operators

    +
    +

    Use of || is discouraged as its clarity on some output devices is low (looking like the number 11 for instance). + && is preferred over AND but either are acceptable, and a space should always precede and follow !.

    +INCORRECT: +if ($foo || $bar) +if ($foo AND $bar) // okay but not recommended for common syntax highlighting applications +if (!$foo) +if (! is_array($foo)) + +CORRECT: +if ($foo OR $bar) +if ($foo && $bar) // recommended +if ( ! $foo) +if ( ! is_array($foo)) + +
    + + + +

    Comparing Return Values and Typecasting

    +
    +

    Some PHP functions return FALSE on failure, but may also have a valid return value of "" or 0, which would evaluate to FALSE in loose comparisons. Be explicit by comparing the variable type when using these return values in conditionals to ensure the return value is indeed what you expect, and not a value that has an equivalent loose-type evaluation.

    +

    Use the same stringency in returning and checking your own variables. Use === and !== as necessary. + +INCORRECT: +// If 'foo' is at the beginning of the string, strpos will return a 0, +// resulting in this conditional evaluating as TRUE +if (strpos($str, 'foo') == FALSE) + +CORRECT: +if (strpos($str, 'foo') === FALSE) + + +INCORRECT: +function build_string($str = "") +{ + if ($str == "") // uh-oh! What if FALSE or the integer 0 is passed as an argument? + { + + } +} + +CORRECT: +function build_string($str = "") +{ + if ($str === "") + { + + } +} + +

    See also information regarding typecasting, which can be quite useful. Typecasting has a slightly different effect which may be desirable. When casting a variable as a string, for instance, NULL and boolean FALSE variables become empty strings, 0 (and other numbers) become strings of digits, and boolean TRUE becomes "1":

    + +$str = (string) $str; // cast $str as a string + +
    + + +

    Debugging Code

    +
    +

    No debugging code can be left in place for submitted add-ons unless it is commented out, i.e. no var_dump(), print_r(), die(), and exit() calls that were used while creating the add-on, unless they are commented out.

    + +// print_r($foo); +
    + + + +

    Whitespace in Files

    +
    +

    No whitespace can precede the opening PHP tag or follow the closing PHP tag. ExpressionEngine output is buffered, so whitespace in your files can cause output to begin before ExpressionEngine outputs its content, leading to errors and an inability for ExpressionEngine to send proper headers. In the examples below, select the text with your mouse to reveal the incorrect whitespace.

    + +

    INCORRECT:

    + +<?php + // ...there is whitespace and a linebreak above the opening PHP tag + // as well as whitespace after the closing PHP tag +?> + +

    CORRECT:

    +<?php + // this sample has no whitespace before or after the opening and closing PHP tags +?> + +
    + + +

    Compatibility

    +
    +

    Unless specifically mentioned in your add-on's documentation, all code must be compatible with PHP version 4.3+. Additionally, do not use PHP functions that require non-default libraries to be installed unless your code contains an alternative method when the function is not available, or you implicitly document that your add-on requires said PHP libraries.

    +
    + + + +

    Class and File Names using Common Words

    +
    +

    When your class or filename is a common word, or might quite likely be identically named in another PHP script, provide a unique prefix to help prevent collision. Always realize that your end users may be running other add-ons or third party PHP scripts. Choose a prefix that is unique to your identity as a developer or company.

    + +INCORRECT: +class Email pi.email.php +class Xml ext.xml.php +class Import mod.import.php + +CORRECT: +class Pre_email pi.pre_email.php +class Pre_xml ext.pre_xml.php +class Pre_import mod.pre_import.php + +
    + + +

    Database Table Names

    +
    +

    Any tables that your add-on might use must use the 'exp_' prefix, followed by a prefix uniquely identifying you as the developer or company, and then a short descriptive table name. You do not need to be concerned about the database prefix being used on the user's installation, as ExpressionEngine's database class will automatically convert 'exp_' to what is actually being used.

    + +INCORRECT: +email_addresses // missing both prefixes +pre_email_addresses // missing exp_ prefix +exp_email_addresses // missing unique prefix + +CORRECT: +exp_pre_email_addresses + + +

    NOTE: Be mindful that MySQL has a limit of 64 characters for table names. This should not be an issue as table names that would exceed this would likely have unreasonable names. For instance, the following table name exceeds this limitation by one character. Silly, no? exp_pre_email_addresses_of_registered_users_in_seattle_washington +

    + + + +

    One File per Class

    +
    +

    Use separate files for each class your add-on uses, unless the classes are closely related. An example of ExpressionEngine files that contains multiple classes is the Database class file, which contains both the DB class and the DB_Cache class, and the Magpie plugin, which contains both the Magpie and Snoopy classes.

    +
    + + + +

    Whitespace

    +
    +

    Use tabs for whitespace in your code, not spaces. This may seem like a small thing, but using tabs instead of whitespace allows the developer looking at your code to have indentation at levels that they prefer and customize in whatever application they use. And as a side benefit, it results in (slightly) more compact files, storing one tab character versus, say, four space characters.

    +
    + + + +

    Line Breaks

    +
    +

    Files must be saved with Unix line breaks. This is more of an issue for developers who work in Windows, but in any case ensure that your text editor is setup to save files with Unix line breaks.

    +
    + + + +

    Code Indenting

    +
    +

    Use Allman style indenting. With the exception of Class declarations, braces are always placed on a line by themselves, and indented at the same level as the control statement that "owns" them.

    + +INCORRECT: +function foo($bar) { + // ... +} + +foreach ($arr as $key => $val) { + // ... +} + +if ($foo == $bar) { + // ... +} else { + // ... +} + +for ($i = 0; $i < 10; $i++) + { + for ($j = 0; $j < 10; $j++) + { + // ... + } + } + +CORRECT: +function foo($bar) +{ + // ... +} + +foreach ($arr as $key => $val) +{ + // ... +} + +if ($foo == $bar) +{ + // ... +} +else +{ + // ... +} + +for ($i = 0; $i < 10; $i++) +{ + for ($j = 0; $j < 10; $j++) + { + // ... + } +} +
    + + +

    Bracket and Parenthetic Spacing

    +
    +

    In general, parenthesis and brackets should not use any additional spaces. The exception is that a space should always follow PHP control structures that accept arguments with parenthesis (declare, do-while, elseif, for, foreach, if, switch, while), to help distinguish them from functions and increase readability.

    + +INCORRECT: +$arr[ $foo ] = 'foo'; + +CORRECT: +$arr[$foo] = 'foo'; // no spaces around array keys + + +INCORRECT: +function foo ( $bar ) +{ + +} + +CORRECT: +function foo($bar) // no spaces around parenthesis in function declarations +{ + +} + + +INCORRECT: +foreach( $query->result() as $row ) + +CORRECT: +foreach ($query->result() as $row) // single space following PHP control structures, but not in interior parenthesis + +
    + + + +

    Localized Text in Control Panel

    +
    +

    Any text that is output in the control panel should use language variables in your module's lang file to allow localization.

    + +INCORRECT: +return "Invalid Selection"; + +CORRECT: +return $LANG->line('invalid_selection'); +
    + + + +

    Private Methods and Variables

    +
    +

    Methods and variables that are only accessed internally by your class, such as utility and helper functions that your public methods use for code abstraction, should be prefixed with an underscore.

    + +convert_text() // public method +_convert_text() // private method +
    + + + +

    PHP Errors

    +
    +

    Code must run error free and not rely on warnings and notices to be hidden to meet this requirement. For instance, never access a variable that you did not set yourself (such as $_POST array keys) without first checking to see that it isset().

    + +

    Make sure that while developing your add-on, error reporting is enabled for ALL users, and that display_errors is enabled in the PHP environment. You can check this setting with:

    + +if (ini_get('display_errors') == 1) +{ + exit "Enabled"; +} + +

    On some servers where display_errors is disabled, and you do not have the ability to change this in the php.ini, you can often enable it with:

    + +ini_set('display_errors', 1); + +

    NOTE: Setting the display_errors setting with ini_set() at runtime is not identical to having it enabled in the PHP environment. Namely, it will not have any effect if the script has fatal errors

    +
    + + + +

    Short Open Tags

    +
    +

    Always use full PHP opening tags, in case a server does not have short_open_tag enabled.

    + +INCORRECT: +<? echo $foo; ?> + +<?=$foo?> + +CORRECT: +<?php echo $foo; ?> +
    + + + +

    One Statement Per Line

    +
    +

    Never combine statements on one line.

    + +INCORRECT: +$foo = 'this'; $bar = 'that'; $bat = str_replace($foo, $bar, $bag); + +CORRECT: +$foo = 'this'; +$bar = 'that'; +$bat = str_replace($foo, $bar, $bag); + +
    + + + +

    Strings

    +
    +

    Always use single quoted strings unless you need variables parsed, and in cases where you do need variables parsed, use braces to prevent greedy token parsing. You may also use double-quoted strings if the string contains single quotes, so you do not have to use escape characters.

    + +INCORRECT: +"My String" // no variable parsing, so no use for double quotes +"My string $foo" // needs braces +'SELECT foo FROM bar WHERE baz = \'bag\'' // ugly + +CORRECT: +'My String' +"My string {$foo}" +"SELECT foo FROM bar WHERE baz = 'bag'" +
    + + + +

    SQL Queries

    +
    +

    MySQL keywords are always capitalized: SELECT, INSERT, UPDATE, WHERE, AS, JOIN, ON, IN, etc.

    + +

    Break up long queries into multiple lines for legibility, preferably breaking for each clause.

    + +INCORRECT: +// keywords are lowercase and query is too long for +// a single line (... indicates continuation of line) +$query = $this->db->query("select foo, bar, baz, foofoo, foobar as raboof, foobaz from exp_pre_email_addresses +...where foo != 'oof' and baz != 'zab' order by foobaz limit 5, 100"); + +CORRECT: +$query = $this->db->query("SELECT foo, bar, baz, foofoo, foobar AS raboof, foobaz + FROM exp_pre_email_addresses + WHERE foo != 'oof' + AND baz != 'zab' + ORDER BY foobaz + LIMIT 5, 100"); +
    + + + +

    Default Function Arguments

    +
    +

    Whenever appropriate, provide function argument defaults, which helps prevent PHP errors with mistaken calls and provides common fallback values which can save a few lines of code. Example:

    + +function foo($bar = '', $baz = FALSE) +
    + + + +

    Overlapping Tag Parameters

    +
    +

    Avoid multiple tag parameters that have effect on the same thing. For instance, instead of include= and exclude=, perhaps allow include= to handle the parameter alone, with the addition of "not", e.g. include="not bar". This will prevent problems of parameters overlapping or having to worry about which parameter has priority over another.

    +
    + + +
    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 36e19d6c..2c9d5f8e 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -1,151 +1,151 @@ - - - - - -CodeIgniter URLs : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    CodeIgniter URLs

    - -

    By default, URLs in CodeIgniter are designed to be search-engine and human friendly. Rather than using the standard "query string" -approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a segment-based approach:

    - -example.com/news/article/my_article - -

    Note: Query string URLs can be optionally enabled, as described below.

    - -

    URI Segments

    - -

    The segments in the URL, in following with the Model-View-Controller approach, usually represent:

    - -example.com/class/function/ID - -
      -
    1. The first segment represents the controller class that should be invoked.
      2. -
    2. The second segment represents the class function, or method, that should be called.
      3. -
    3. The third, and any additional segments, represent the ID and any variables that will be passed to the controller.
      4. -
    - -

    The URI Class and the URL Helper -contain functions that make it easy to work with your URI data. In addition, your URLs can be remapped using the -URI Routing feature for more flexibility.

    - - - -

    Removing the index.php file

    - -

    By default, the index.php file will be included in your URLs:

    - -example.com/index.php/news/article/my_article - -

    You can easily remove this file by using a .htaccess file with some simple rules. Here is an example - of such a file, using the "negative" method in which everything is redirected except the specified items:

    - -RewriteEngine on
    -RewriteCond $1 !^(index\.php|images|robots\.txt)
    -RewriteRule ^(.*)$ /index.php/$1 [L]     - -

    In the above example, any HTTP request other than those for index.php, images, and robots.txt is treated as -a request for your index.php file.

    - - -

    Adding a URL Suffix

    - -

    In your config/config.php file you can specify a suffix that will be added to all URLs generated -by CodeIgniter. For example, if a URL is this:

    - -example.com/index.php/products/view/shoes - -

    You can optionally add a suffix, like .html, making the page appear to be of a certain type:

    - -example.com/index.php/products/view/shoes.html - - -

    Enabling Query Strings

    - -

    In some cases you might prefer to use query strings URLs:

    - -index.php?c=products&m=view&id=345 - -

    CodeIgniter optionally supports this capability, which can be enabled in your application/config.php file. If you -open your config file you'll see these items:

    - -$config['enable_query_strings'] = FALSE;
    -$config['controller_trigger'] = 'c';
    -$config['function_trigger'] = 'm';     - -

    If you change "enable_query_strings" to TRUE this feature will become active. Your controllers and functions will then -be accessible using the "trigger" words you've set to invoke your controllers and methods:

    - -index.php?c=controller&m=method - -

    Please note: If you are using query strings you will have to build your own URLs, rather than utilizing -the URL helpers (and other helpers that generate URLs, like some of the form helpers) as these are designed to work with -segment based URLs.

    - - -
    - - - - - - + + + + + +CodeIgniter URLs : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    CodeIgniter URLs

    + +

    By default, URLs in CodeIgniter are designed to be search-engine and human friendly. Rather than using the standard "query string" +approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a segment-based approach:

    + +example.com/news/article/my_article + +

    Note: Query string URLs can be optionally enabled, as described below.

    + +

    URI Segments

    + +

    The segments in the URL, in following with the Model-View-Controller approach, usually represent:

    + +example.com/class/function/ID + +
      +
    1. The first segment represents the controller class that should be invoked.
      2. +
    2. The second segment represents the class function, or method, that should be called.
      3. +
    3. The third, and any additional segments, represent the ID and any variables that will be passed to the controller.
      4. +
    + +

    The URI Class and the URL Helper +contain functions that make it easy to work with your URI data. In addition, your URLs can be remapped using the +URI Routing feature for more flexibility.

    + + + +

    Removing the index.php file

    + +

    By default, the index.php file will be included in your URLs:

    + +example.com/index.php/news/article/my_article + +

    You can easily remove this file by using a .htaccess file with some simple rules. Here is an example + of such a file, using the "negative" method in which everything is redirected except the specified items:

    + +RewriteEngine on
    +RewriteCond $1 !^(index\.php|images|robots\.txt)
    +RewriteRule ^(.*)$ /index.php/$1 [L]     + +

    In the above example, any HTTP request other than those for index.php, images, and robots.txt is treated as +a request for your index.php file.

    + + +

    Adding a URL Suffix

    + +

    In your config/config.php file you can specify a suffix that will be added to all URLs generated +by CodeIgniter. For example, if a URL is this:

    + +example.com/index.php/products/view/shoes + +

    You can optionally add a suffix, like .html, making the page appear to be of a certain type:

    + +example.com/index.php/products/view/shoes.html + + +

    Enabling Query Strings

    + +

    In some cases you might prefer to use query strings URLs:

    + +index.php?c=products&m=view&id=345 + +

    CodeIgniter optionally supports this capability, which can be enabled in your application/config.php file. If you +open your config file you'll see these items:

    + +$config['enable_query_strings'] = FALSE;
    +$config['controller_trigger'] = 'c';
    +$config['function_trigger'] = 'm';     + +

    If you change "enable_query_strings" to TRUE this feature will become active. Your controllers and functions will then +be accessible using the "trigger" words you've set to invoke your controllers and methods:

    + +index.php?c=controller&m=method + +

    Please note: If you are using query strings you will have to build your own URLs, rather than utilizing +the URL helpers (and other helpers that generate URLs, like some of the form helpers) as these are designed to work with +segment based URLs.

    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/general/views.html b/user_guide/general/views.html index ff600602..a8c3d602 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -1,274 +1,274 @@ - - - - - -Views : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Views

    - -

    A view is simply a web page, or a page fragment, like a header, footer, sidebar, etc. -In fact, views can flexibly be embedded within other views (within other views, etc., etc.) if you need this type -of hierarchy.

    - -

    Views are never called directly, they must be loaded by a controller. Remember that in an MVC framework, the Controller acts as the -traffic cop, so it is responsible for fetching a particular view. If you have not read the Controllers page -you should do so before continuing.

    - -

    Using the example controller you created in the controller page, let's add a view to it.

    - -

    Creating a View

    - -

    Using your text editor, create a file called blogview.php, and put this in it:

    - - - -

    Then save the file in your application/views/ folder.

    - -

    Loading a View

    - -

    To load a particular view file you will use the following function:

    - -$this->load->view('name'); - -

    Where name is the name of your view file. Note: The .php file extension does not need to be specified unless you use something other than .php.

    - - -

    Now, open the controller file you made earlier called blog.php, and replace the echo statement with the view loading function:

    - - - - - -

    If you visit the your site using the URL you did earlier you should see your new view. The URL was similar to this:

    - -example.com/index.php/blog/ - -

    Loading multiple views

    -

    CodeIgniter will intelligently handle multiple calls to $this->load->view from within a controller. If more then one call happens they will be appended together. For example, you may wish to have a header view, a menu view, a content view, and a footer view. That might look something like this:

    -

    <?php
    -
    -class Page extends Controller {

    - -    function index()
    -   {
    -      $data['page_title'] = 'Your title';
    -      $this->load->view('header');
    -      $this->load->view('menu');
    -      $this->load->view('content', $data);
    -      $this->load->view('footer');
    -   }
    -
    -}
    - ?>

    -

    In the example above, we are using "dynamically added data", which you will see below.

    -

    Storing Views within Sub-folders

    -

    Your view files can also be stored within sub-folders if you prefer that type of organization. When doing so you will need -to include the folder name loading the view. Example:

    - -$this->load->view('folder_name/file_name'); - - -

    Adding Dynamic Data to the View

    - -

    Data is passed from the controller to the view by way of an array or an object in the second -parameter of the view loading function. Here is an example using an array:

    - -$data = array(
    -               'title' => 'My Title',
    -               'heading' => 'My Heading',
    -               'message' => 'My Message'
    -          );
    -
    -$this->load->view('blogview', $data);     - -

    And here's an example using an object:

    - -$data = new Someclass();
    -$this->load->view('blogview', $data);     - -

    Note: If you use an object, the class variables will be turned into array elements.

    - - -

    Let's try it with your controller file. Open it add this code:

    - - - - -

    Now open your view file and change the text to variables that correspond to the array keys in your data:

    - - - - -

    Then load the page at the URL you've been using and you should see the variables replaced.

    - -

    Creating Loops

    - -

    The data array you pass to your view files is not limited to simple variables. You can -pass multi dimensional arrays, which can be looped to generate multiple rows. For example, if you -pull data from your database it will typically be in the form of a multi-dimensional array.

    - -

    Here's a simple example. Add this to your controller:

    - - - - -

    Now open your view file and create a loop:

    - - - -

    Note: You'll notice that in the example above we are using PHP's alternative syntax. If you -are not familiar with it you can read about it here.

    - -

    Returning views as data

    - -

    There is a third optional parameter lets you change the behavior of the function so that it returns data as a string -rather than sending it to your browser. This can be useful if you want to process the data in some way. If you -set the parameter to true (boolean) it will return data. The default behavior is false, which sends it -to your browser. Remember to assign it to a variable if you want the data returned:

    - -$string = $this->load->view('myfile', '', true); - -
    - - - - - - + + + + + +Views : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Views

    + +

    A view is simply a web page, or a page fragment, like a header, footer, sidebar, etc. +In fact, views can flexibly be embedded within other views (within other views, etc., etc.) if you need this type +of hierarchy.

    + +

    Views are never called directly, they must be loaded by a controller. Remember that in an MVC framework, the Controller acts as the +traffic cop, so it is responsible for fetching a particular view. If you have not read the Controllers page +you should do so before continuing.

    + +

    Using the example controller you created in the controller page, let's add a view to it.

    + +

    Creating a View

    + +

    Using your text editor, create a file called blogview.php, and put this in it:

    + + + +

    Then save the file in your application/views/ folder.

    + +

    Loading a View

    + +

    To load a particular view file you will use the following function:

    + +$this->load->view('name'); + +

    Where name is the name of your view file. Note: The .php file extension does not need to be specified unless you use something other than .php.

    + + +

    Now, open the controller file you made earlier called blog.php, and replace the echo statement with the view loading function:

    + + + + + +

    If you visit the your site using the URL you did earlier you should see your new view. The URL was similar to this:

    + +example.com/index.php/blog/ + +

    Loading multiple views

    +

    CodeIgniter will intelligently handle multiple calls to $this->load->view from within a controller. If more then one call happens they will be appended together. For example, you may wish to have a header view, a menu view, a content view, and a footer view. That might look something like this:

    +

    <?php
    +
    +class Page extends Controller {

    + +    function index()
    +   {
    +      $data['page_title'] = 'Your title';
    +      $this->load->view('header');
    +      $this->load->view('menu');
    +      $this->load->view('content', $data);
    +      $this->load->view('footer');
    +   }
    +
    +}
    + ?>

    +

    In the example above, we are using "dynamically added data", which you will see below.

    +

    Storing Views within Sub-folders

    +

    Your view files can also be stored within sub-folders if you prefer that type of organization. When doing so you will need +to include the folder name loading the view. Example:

    + +$this->load->view('folder_name/file_name'); + + +

    Adding Dynamic Data to the View

    + +

    Data is passed from the controller to the view by way of an array or an object in the second +parameter of the view loading function. Here is an example using an array:

    + +$data = array(
    +               'title' => 'My Title',
    +               'heading' => 'My Heading',
    +               'message' => 'My Message'
    +          );
    +
    +$this->load->view('blogview', $data);     + +

    And here's an example using an object:

    + +$data = new Someclass();
    +$this->load->view('blogview', $data);     + +

    Note: If you use an object, the class variables will be turned into array elements.

    + + +

    Let's try it with your controller file. Open it add this code:

    + + + + +

    Now open your view file and change the text to variables that correspond to the array keys in your data:

    + + + + +

    Then load the page at the URL you've been using and you should see the variables replaced.

    + +

    Creating Loops

    + +

    The data array you pass to your view files is not limited to simple variables. You can +pass multi dimensional arrays, which can be looped to generate multiple rows. For example, if you +pull data from your database it will typically be in the form of a multi-dimensional array.

    + +

    Here's a simple example. Add this to your controller:

    + + + + +

    Now open your view file and create a loop:

    + + + +

    Note: You'll notice that in the example above we are using PHP's alternative syntax. If you +are not familiar with it you can read about it here.

    + +

    Returning views as data

    + +

    There is a third optional parameter lets you change the behavior of the function so that it returns data as a string +rather than sending it to your browser. This can be useful if you want to process the data in some way. If you +set the parameter to true (boolean) it will return data. The default behavior is false, which sends it +to your browser. Remember to assign it to a variable if you want the data returned:

    + +$string = $this->load->view('myfile', '', true); + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 2a6bad3e..a7392d3f 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -1,119 +1,119 @@ - - - - - -Array Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Array Helper

    - -

    The Array Helper file contains functions that assist in working with arrays.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('array'); - -

    The following functions are available:

    - -

    element()

    - -

    Lets you fetch an item from an array. The function tests whether the array index is set and whether it has a value. If -a value exists it is returned. If a value does not exist it returns FALSE, or whatever you've specified as the default value via the third parameter. Example:

    - - -$array = array('color' => 'red', 'shape' => 'round', 'size' => '');
    -
    -// returns "red"
    -echo element('color', $array);
    -
    -// returns NULL
    -echo element('size', $array, NULL); -     - - -

    random_element()

    - -

    Takes an array as input and returns a random element from it. Usage example:

    - -$quotes = array(
    -            "I find that the harder I work, the more luck I seem to have. - Thomas Jefferson",
    -            "Don't stay in bed, unless you can make money in bed. - George Burns",
    -            "We didn't lose the game; we just ran out of time. - Vince Lombardi",
    -            "If everything seems under control, you're not going fast enough. - Mario Andretti",
    -            "Reality is merely an illusion, albeit a very persistent one. - Albert Einstein",
    -            "Chance favors the prepared mind - Louis Pasteur"
    -            );
    -
    -echo random_element($quotes);     - - - - -
    - - - - - - + + + + + +Array Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Array Helper

    + +

    The Array Helper file contains functions that assist in working with arrays.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('array'); + +

    The following functions are available:

    + +

    element()

    + +

    Lets you fetch an item from an array. The function tests whether the array index is set and whether it has a value. If +a value exists it is returned. If a value does not exist it returns FALSE, or whatever you've specified as the default value via the third parameter. Example:

    + + +$array = array('color' => 'red', 'shape' => 'round', 'size' => '');
    +
    +// returns "red"
    +echo element('color', $array);
    +
    +// returns NULL
    +echo element('size', $array, NULL); +     + + +

    random_element()

    + +

    Takes an array as input and returns a random element from it. Usage example:

    + +$quotes = array(
    +            "I find that the harder I work, the more luck I seem to have. - Thomas Jefferson",
    +            "Don't stay in bed, unless you can make money in bed. - George Burns",
    +            "We didn't lose the game; we just ran out of time. - Vince Lombardi",
    +            "If everything seems under control, you're not going fast enough. - Mario Andretti",
    +            "Reality is merely an illusion, albeit a very persistent one. - Albert Einstein",
    +            "Chance favors the prepared mind - Louis Pasteur"
    +            );
    +
    +echo random_element($quotes);     + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/compatibility_helper.html b/user_guide/helpers/compatibility_helper.html index 7f32a557..7a30c768 100644 --- a/user_guide/helpers/compatibility_helper.html +++ b/user_guide/helpers/compatibility_helper.html @@ -1,118 +1,118 @@ - - - - - -Compatibility Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - - -
    - - -
    - - - -
    - - -

    Compatibility Helper

    - -

    The Compatibility Helper file contains PHP 4 implementations of some PHP 5 only native PHP functions and constants. This can be useful - if you'd like to take advantage of some of these native function but your application may end up running on a PHP 4 server. - In these cases, it may be advantageous to Auto-load the Compatibility Helper so you - do not have to load it in each controller.

    - -

    Note: There are a few compatibility functions that are in CodeIgniter's native Compat.php file. - You may use those functions without loading this helper. The functions are split between that file and this Helper so that only - functions required by the framework are included by default. This way, whether or not you load the additional functions in this Helper - remains your choice.

    - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('compatibility'); - -

    Available Constants

    -

    The following constants are available:

    - -

    PHP_EOL

    -

    The newline character for the server's current OS, e.g. on Windows systems "\r\n", on *nix "\n". - -

    Available Functions

    -

    The following functions are available (see linked PHP documentation for documentation):

    - -

    file_put_contents() - The fourth parameter, $context, is not supported.

    - -

    fputcsv()

    - -

    http_build_query()

    - -

    str_ireplace() - The fourth parameter, $count, is not supported, as PHP 4 would make it become required.

    - -

    stripos()

    - - - - - - - -
    - - - - - - + + + + + +Compatibility Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + + +
    + + +
    + + + +
    + + +

    Compatibility Helper

    + +

    The Compatibility Helper file contains PHP 4 implementations of some PHP 5 only native PHP functions and constants. This can be useful + if you'd like to take advantage of some of these native function but your application may end up running on a PHP 4 server. + In these cases, it may be advantageous to Auto-load the Compatibility Helper so you + do not have to load it in each controller.

    + +

    Note: There are a few compatibility functions that are in CodeIgniter's native Compat.php file. + You may use those functions without loading this helper. The functions are split between that file and this Helper so that only + functions required by the framework are included by default. This way, whether or not you load the additional functions in this Helper + remains your choice.

    + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('compatibility'); + +

    Available Constants

    +

    The following constants are available:

    + +

    PHP_EOL

    +

    The newline character for the server's current OS, e.g. on Windows systems "\r\n", on *nix "\n". + +

    Available Functions

    +

    The following functions are available (see linked PHP documentation for documentation):

    + +

    file_put_contents() - The fourth parameter, $context, is not supported.

    + +

    fputcsv()

    + +

    http_build_query()

    + +

    str_ireplace() - The fourth parameter, $count, is not supported, as PHP 4 would make it become required.

    + +

    stripos()

    + + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index f30528af..99438bbc 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -1,148 +1,148 @@ - - - - - -Cookie Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Cookie Helper

    - -

    The Cookie Helper file contains functions that assist in working with cookies.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('cookie'); - -

    The following functions are available:

    - -

    set_cookie()

    - -

    Sets a cookie containing the values you specify. There are two ways to pass information to this function so that a cookie can be set: -Array Method, and Discrete Parameters:

    - -

    Array Method

    - -

    Using this method, an associative array is passed to the first parameter:

    - -$cookie = array(
    -                   'name'   => 'The Cookie Name',
    -                   'value'  => 'The Value',
    -                   'expire' => '86500',
    -                   'domain' => '.some-domain.com',
    -                   'path'   => '/',
    -                   'prefix' => 'myprefix_',
    -               );
    -
    -set_cookie($cookie); -     - -

    Notes:

    - -

    Only the name and value are required.

    - -

    The expiration is set in seconds, which will be added to the current time. Do not include the time, but rather only the -number of seconds from now that you wish the cookie to be valid. If the expiration is set to -zero the cookie will only last as long as the browser is open.

    -

    To delete a cookie set it with the expiration blank.

    -

    For site-wide cookies regardless of how your site is requested, add your URL to the domain starting with a period, like this: .your-domain.com

    -

    The path is usually not needed since the function sets a root path.

    -

    The prefix is only needed if you need to avoid name collisions with other identically named cookies for your server.

    - -

    Discrete Parameters

    - -

    If you prefer, you can set the cookie by passing data using individual parameters:

    - -set_cookie($name, $value, $expire, $domain, $path, $prefix); - -

    get_cookie()

    - -

    Lets you fetch a cookie. The first parameter will contain the name of the cookie you are looking for (including any prefixes):

    - -get_cookie('some_cookie'); - -

    The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

    - -

    The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

    - -

    get_cookie('some_cookie', TRUE);

    -

    delete_cookie()

    - -

    Lets you delete a cookie. Unless you've set a custom path or other values, only the name of the cookie is needed:

    - -delete_cookie("name"); - -

    This function is otherwise identical to set_cookie(), except that it does not have the value and expiration parameters. You can submit an array -of values in the first parameter or you can set discrete parameters.

    - -delete_cookie($name, $domain, $path, $prefix) - - -
    - - - - - - + + + + + +Cookie Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Cookie Helper

    + +

    The Cookie Helper file contains functions that assist in working with cookies.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('cookie'); + +

    The following functions are available:

    + +

    set_cookie()

    + +

    Sets a cookie containing the values you specify. There are two ways to pass information to this function so that a cookie can be set: +Array Method, and Discrete Parameters:

    + +

    Array Method

    + +

    Using this method, an associative array is passed to the first parameter:

    + +$cookie = array(
    +                   'name'   => 'The Cookie Name',
    +                   'value'  => 'The Value',
    +                   'expire' => '86500',
    +                   'domain' => '.some-domain.com',
    +                   'path'   => '/',
    +                   'prefix' => 'myprefix_',
    +               );
    +
    +set_cookie($cookie); +     + +

    Notes:

    + +

    Only the name and value are required.

    + +

    The expiration is set in seconds, which will be added to the current time. Do not include the time, but rather only the +number of seconds from now that you wish the cookie to be valid. If the expiration is set to +zero the cookie will only last as long as the browser is open.

    +

    To delete a cookie set it with the expiration blank.

    +

    For site-wide cookies regardless of how your site is requested, add your URL to the domain starting with a period, like this: .your-domain.com

    +

    The path is usually not needed since the function sets a root path.

    +

    The prefix is only needed if you need to avoid name collisions with other identically named cookies for your server.

    + +

    Discrete Parameters

    + +

    If you prefer, you can set the cookie by passing data using individual parameters:

    + +set_cookie($name, $value, $expire, $domain, $path, $prefix); + +

    get_cookie()

    + +

    Lets you fetch a cookie. The first parameter will contain the name of the cookie you are looking for (including any prefixes):

    + +get_cookie('some_cookie'); + +

    The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

    + +

    The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

    + +

    get_cookie('some_cookie', TRUE);

    +

    delete_cookie()

    + +

    Lets you delete a cookie. Unless you've set a custom path or other values, only the name of the cookie is needed:

    + +delete_cookie("name"); + +

    This function is otherwise identical to set_cookie(), except that it does not have the value and expiration parameters. You can submit an array +of values in the first parameter or you can set discrete parameters.

    + +delete_cookie($name, $domain, $path, $prefix) + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 7a7b4d70..e11fb0c8 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -1,408 +1,408 @@ - - - - - -Date Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Date Helper

    - -

    The Date Helper file contains functions that help you work with dates.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('date'); - - -

    The following functions are available:

    - -

    now()

    - -

    Returns the current time as a Unix timestamp, referenced either to your server's local time or GMT, based on the "time reference" -setting in your config file. If you do not intend to set your master time reference to GMT (which you'll typically do if you -run a site that lets each user set their own timezone settings) there is no benefit to using this function over PHP's time() function. -

    - - - - -

    mdate()

    - -

    This function is identical to PHPs date() function, except that it lets you -use MySQL style date codes, where each code letter is preceded with a percent sign: %Y %m %d etc.

    - -

    The benefit of doing dates this way is that you don't have to worry about escaping any characters that -are not date codes, as you would normally have to do with the date() function. Example:

    - -$datestring = "Year: %Y Month: %m Day: %d - %h:%i %a";
    -$time = time();
    -
    -echo mdate($datestring, $time);     - -

    If a timestamp is not included in the second parameter the current time will be used.

    - - -

    standard_date()

    - -

    Lets you generate a date string in one of several standardized formats. Example:

    - - -$format = 'DATE_RFC822';
    -$time = time();
    -
    -echo standard_date($format, $time); -     - -

    The first parameter must contain the format, the second parameter must contain the date as a Unix timestamp.

    - -

    Supported formats:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ConstantDescriptionExample
    DATE_ATOMAtom2005-08-15T16:13:03+0000
    DATE_COOKIEHTTP CookiesSun, 14 Aug 2005 16:13:03 UTC
    DATE_ISO8601ISO-86012005-08-14T16:13:03+0000
    DATE_RFC822RFC 822Sun, 14 Aug 2005 16:13:03 UTC
    DATE_RFC850RFC 850Sunday, 14-Aug-05 16:13:03 UTC
    DATE_RFC1036RFC 1036Sunday, 14-Aug-05 16:13:03 UTC
    DATE_RFC1123RFC 1123Sun, 14 Aug 2005 16:13:03 UTC
    DATE_RFC2822RFC 2822Sun, 14 Aug 2005 16:13:03 +0000
    DATE_RSSRSSSun, 14 Aug 2005 16:13:03 UTC
    DATE_W3CWorld Wide Web Consortium2005-08-14T16:13:03+0000
    - -

    local_to_gmt()

    - -

    Takes a Unix timestamp as input and returns it as GMT. Example:

    - -$now = time();
    -
    -$gmt = local_to_gmt($now);     - - -

    gmt_to_local()

    - -

    Takes a Unix timestamp (referenced to GMT) as input, and converts it to a localized timestamp based on the -timezone and Daylight Saving time submitted. Example:

    - - -$timestamp = '1140153693';
    -$timezone = 'UM8';
    -$daylight_saving = TRUE;
    -
    -echo gmt_to_local($timestamp, $timezone, $daylight_saving);     - -

    Note: For a list of timezones see the reference at the bottom of this page.

    - -

    mysql_to_unix()

    - -

    Takes a MySQL Timestamp as input and returns it as Unix. Example:

    - -$mysql = '20061124092345';
    -
    -$unix = mysql_to_unix($mysql);     - - -

    unix_to_human()

    - -

    Takes a Unix timestamp as input and returns it in a human readable format with this prototype:

    - -YYYY-MM-DD HH:MM:SS AM/PM - -

    This can be useful if you need to display a date in a form field for submission.

    - -

    The time can be formatted with or without seconds, and it can be set to European or US format. If only -the timestamp is submitted it will return the time without seconds formatted for the U.S. Examples:

    - -$now = time();
    -
    -echo unix_to_human($now); // U.S. time, no seconds
    -
    -echo unix_to_human($now, TRUE, 'us'); // U.S. time with seconds
    -
    -echo unix_to_human($now, TRUE, 'eu'); // Euro time with seconds     - - -

    human_to_unix()

    - -

    The opposite of the above function. Takes a "human" time as input and returns it as Unix. This function is -useful if you accept "human" formatted dates submitted via a form. Returns FALSE (boolean) if -the date string passed to it is not formatted as indicated above. Example:

    - -$now = time();
    -
    -$human = unix_to_human($now);
    -
    -$unix = human_to_unix($human);     - - - - - -

    timespan()

    - -

    Formats a unix timestamp so that is appears similar to this:

    - -1 Year, 10 Months, 2 Weeks, 5 Days, 10 Hours, 16 Minutes - -

    The first parameter must contain a Unix timestamp. The second parameter must contain a -timestamp that is greater that the first timestamp. If the second parameter empty, the current time will be used. The most common purpose -for this function is to show how much time has elapsed from some point in time in the past to now. Example:

    - -$post_date = '1079621429';
    -$now = time();
    -
    -echo timespan($post_date, $now);     - -

    Note: The text generated by this function is found in the following language file: language/<your_lang>/date_lang.php

    - - -

    days_in_month()

    - -

    Returns the number of days in a given month/year. Takes leap years into account. Example:

    -echo days_in_month(06, 2005); - -

    If the second parameter is empty, the current year will be used.

    -

    timezones()

    -

    Takes a timezone reference (for a list of valid timezones, see the "Timezone Reference" below) and returns the number of hours offset from UTC.

    -

    echo timezones('UM5');

    -

    This function is useful when used with timezone_menu().

    -

    timezone_menu()

    -

    Generates a pull-down menu of timezones, like this one:

    - -
    - -
    - -

    This menu is useful if you run a membership site in which your users are allowed to set their local timezone value.

    - -

    The first parameter lets you set the "selected" state of the menu. For example, to set Pacific time as the default you will do this:

    - -echo timezone_menu('UM8'); - -

    Please see the timezone reference below to see the values of this menu.

    - -

    The second parameter lets you set a CSS class name for the menu.

    - -

    Note: The text contained in the menu is found in the following language file: language/<your_lang>/date_lang.php

    - - - -

    Timezone Reference

    - -

    The following table indicates each timezone and its location.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Time ZoneLocation
    UM12(UTC - 12:00) Enitwetok, Kwajalien
    UM11(UTC - 11:00) Nome, Midway Island, Samoa
    UM10(UTC - 10:00) Hawaii
    UM9(UTC - 9:00) Alaska
    UM8(UTC - 8:00) Pacific Time
    UM7(UTC - 7:00) Mountain Time
    UM6(UTC - 6:00) Central Time, Mexico City
    UM5(UTC - 5:00) Eastern Time, Bogota, Lima, Quito
    UM4(UTC - 4:00) Atlantic Time, Caracas, La Paz
    UM25(UTC - 3:30) Newfoundland
    UM3(UTC - 3:00) Brazil, Buenos Aires, Georgetown, Falkland Is.
    UM2(UTC - 2:00) Mid-Atlantic, Ascention Is., St Helena
    UM1(UTC - 1:00) Azores, Cape Verde Islands
    UTC(UTC) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia
    UP1(UTC + 1:00) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome
    UP2(UTC + 2:00) Kaliningrad, South Africa, Warsaw
    UP3(UTC + 3:00) Baghdad, Riyadh, Moscow, Nairobi
    UP25(UTC + 3:30) Tehran
    UP4(UTC + 4:00) Adu Dhabi, Baku, Muscat, Tbilisi
    UP35(UTC + 4:30) Kabul
    UP5(UTC + 5:00) Islamabad, Karachi, Tashkent
    UP45(UTC + 5:30) Bombay, Calcutta, Madras, New Delhi
    UP6(UTC + 6:00) Almaty, Colomba, Dhaka
    UP7(UTC + 7:00) Bangkok, Hanoi, Jakarta
    UP8(UTC + 8:00) Beijing, Hong Kong, Perth, Singapore, Taipei
    UP9(UTC + 9:00) Osaka, Sapporo, Seoul, Tokyo, Yakutsk
    UP85(UTC + 9:30) Adelaide, Darwin
    UP10(UTC + 10:00) Melbourne, Papua New Guinea, Sydney, Vladivostok
    UP11(UTC + 11:00) Magadan, New Caledonia, Solomon Islands
    UP12(UTC + 12:00) Auckland, Wellington, Fiji, Marshall Island
    - - -
    - - - - - - + + + + + +Date Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Date Helper

    + +

    The Date Helper file contains functions that help you work with dates.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('date'); + + +

    The following functions are available:

    + +

    now()

    + +

    Returns the current time as a Unix timestamp, referenced either to your server's local time or GMT, based on the "time reference" +setting in your config file. If you do not intend to set your master time reference to GMT (which you'll typically do if you +run a site that lets each user set their own timezone settings) there is no benefit to using this function over PHP's time() function. +

    + + + + +

    mdate()

    + +

    This function is identical to PHPs date() function, except that it lets you +use MySQL style date codes, where each code letter is preceded with a percent sign: %Y %m %d etc.

    + +

    The benefit of doing dates this way is that you don't have to worry about escaping any characters that +are not date codes, as you would normally have to do with the date() function. Example:

    + +$datestring = "Year: %Y Month: %m Day: %d - %h:%i %a";
    +$time = time();
    +
    +echo mdate($datestring, $time);     + +

    If a timestamp is not included in the second parameter the current time will be used.

    + + +

    standard_date()

    + +

    Lets you generate a date string in one of several standardized formats. Example:

    + + +$format = 'DATE_RFC822';
    +$time = time();
    +
    +echo standard_date($format, $time); +     + +

    The first parameter must contain the format, the second parameter must contain the date as a Unix timestamp.

    + +

    Supported formats:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ConstantDescriptionExample
    DATE_ATOMAtom2005-08-15T16:13:03+0000
    DATE_COOKIEHTTP CookiesSun, 14 Aug 2005 16:13:03 UTC
    DATE_ISO8601ISO-86012005-08-14T16:13:03+0000
    DATE_RFC822RFC 822Sun, 14 Aug 2005 16:13:03 UTC
    DATE_RFC850RFC 850Sunday, 14-Aug-05 16:13:03 UTC
    DATE_RFC1036RFC 1036Sunday, 14-Aug-05 16:13:03 UTC
    DATE_RFC1123RFC 1123Sun, 14 Aug 2005 16:13:03 UTC
    DATE_RFC2822RFC 2822Sun, 14 Aug 2005 16:13:03 +0000
    DATE_RSSRSSSun, 14 Aug 2005 16:13:03 UTC
    DATE_W3CWorld Wide Web Consortium2005-08-14T16:13:03+0000
    + +

    local_to_gmt()

    + +

    Takes a Unix timestamp as input and returns it as GMT. Example:

    + +$now = time();
    +
    +$gmt = local_to_gmt($now);     + + +

    gmt_to_local()

    + +

    Takes a Unix timestamp (referenced to GMT) as input, and converts it to a localized timestamp based on the +timezone and Daylight Saving time submitted. Example:

    + + +$timestamp = '1140153693';
    +$timezone = 'UM8';
    +$daylight_saving = TRUE;
    +
    +echo gmt_to_local($timestamp, $timezone, $daylight_saving);     + +

    Note: For a list of timezones see the reference at the bottom of this page.

    + +

    mysql_to_unix()

    + +

    Takes a MySQL Timestamp as input and returns it as Unix. Example:

    + +$mysql = '20061124092345';
    +
    +$unix = mysql_to_unix($mysql);     + + +

    unix_to_human()

    + +

    Takes a Unix timestamp as input and returns it in a human readable format with this prototype:

    + +YYYY-MM-DD HH:MM:SS AM/PM + +

    This can be useful if you need to display a date in a form field for submission.

    + +

    The time can be formatted with or without seconds, and it can be set to European or US format. If only +the timestamp is submitted it will return the time without seconds formatted for the U.S. Examples:

    + +$now = time();
    +
    +echo unix_to_human($now); // U.S. time, no seconds
    +
    +echo unix_to_human($now, TRUE, 'us'); // U.S. time with seconds
    +
    +echo unix_to_human($now, TRUE, 'eu'); // Euro time with seconds     + + +

    human_to_unix()

    + +

    The opposite of the above function. Takes a "human" time as input and returns it as Unix. This function is +useful if you accept "human" formatted dates submitted via a form. Returns FALSE (boolean) if +the date string passed to it is not formatted as indicated above. Example:

    + +$now = time();
    +
    +$human = unix_to_human($now);
    +
    +$unix = human_to_unix($human);     + + + + + +

    timespan()

    + +

    Formats a unix timestamp so that is appears similar to this:

    + +1 Year, 10 Months, 2 Weeks, 5 Days, 10 Hours, 16 Minutes + +

    The first parameter must contain a Unix timestamp. The second parameter must contain a +timestamp that is greater that the first timestamp. If the second parameter empty, the current time will be used. The most common purpose +for this function is to show how much time has elapsed from some point in time in the past to now. Example:

    + +$post_date = '1079621429';
    +$now = time();
    +
    +echo timespan($post_date, $now);     + +

    Note: The text generated by this function is found in the following language file: language/<your_lang>/date_lang.php

    + + +

    days_in_month()

    + +

    Returns the number of days in a given month/year. Takes leap years into account. Example:

    +echo days_in_month(06, 2005); + +

    If the second parameter is empty, the current year will be used.

    +

    timezones()

    +

    Takes a timezone reference (for a list of valid timezones, see the "Timezone Reference" below) and returns the number of hours offset from UTC.

    +

    echo timezones('UM5');

    +

    This function is useful when used with timezone_menu().

    +

    timezone_menu()

    +

    Generates a pull-down menu of timezones, like this one:

    + +
    + +
    + +

    This menu is useful if you run a membership site in which your users are allowed to set their local timezone value.

    + +

    The first parameter lets you set the "selected" state of the menu. For example, to set Pacific time as the default you will do this:

    + +echo timezone_menu('UM8'); + +

    Please see the timezone reference below to see the values of this menu.

    + +

    The second parameter lets you set a CSS class name for the menu.

    + +

    Note: The text contained in the menu is found in the following language file: language/<your_lang>/date_lang.php

    + + + +

    Timezone Reference

    + +

    The following table indicates each timezone and its location.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Time ZoneLocation
    UM12(UTC - 12:00) Enitwetok, Kwajalien
    UM11(UTC - 11:00) Nome, Midway Island, Samoa
    UM10(UTC - 10:00) Hawaii
    UM9(UTC - 9:00) Alaska
    UM8(UTC - 8:00) Pacific Time
    UM7(UTC - 7:00) Mountain Time
    UM6(UTC - 6:00) Central Time, Mexico City
    UM5(UTC - 5:00) Eastern Time, Bogota, Lima, Quito
    UM4(UTC - 4:00) Atlantic Time, Caracas, La Paz
    UM25(UTC - 3:30) Newfoundland
    UM3(UTC - 3:00) Brazil, Buenos Aires, Georgetown, Falkland Is.
    UM2(UTC - 2:00) Mid-Atlantic, Ascention Is., St Helena
    UM1(UTC - 1:00) Azores, Cape Verde Islands
    UTC(UTC) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia
    UP1(UTC + 1:00) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome
    UP2(UTC + 2:00) Kaliningrad, South Africa, Warsaw
    UP3(UTC + 3:00) Baghdad, Riyadh, Moscow, Nairobi
    UP25(UTC + 3:30) Tehran
    UP4(UTC + 4:00) Adu Dhabi, Baku, Muscat, Tbilisi
    UP35(UTC + 4:30) Kabul
    UP5(UTC + 5:00) Islamabad, Karachi, Tashkent
    UP45(UTC + 5:30) Bombay, Calcutta, Madras, New Delhi
    UP6(UTC + 6:00) Almaty, Colomba, Dhaka
    UP7(UTC + 7:00) Bangkok, Hanoi, Jakarta
    UP8(UTC + 8:00) Beijing, Hong Kong, Perth, Singapore, Taipei
    UP9(UTC + 9:00) Osaka, Sapporo, Seoul, Tokyo, Yakutsk
    UP85(UTC + 9:30) Adelaide, Darwin
    UP10(UTC + 10:00) Melbourne, Papua New Guinea, Sydney, Vladivostok
    UP11(UTC + 11:00) Magadan, New Caledonia, Solomon Islands
    UP12(UTC + 12:00) Auckland, Wellington, Fiji, Marshall Island
    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index cbd743e3..5263bc6c 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -1,140 +1,140 @@ - - - - - -Directory Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - - -
    - - -
    - - - -
    - - -

    Directory Helper

    - -

    The Directory Helper file contains functions that assist in working with directories.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('directory'); - -

    The following functions are available:

    - -

    directory_map('source directory')

    - -

    This function reads the directory path specified in the first parameter -and builds an array representation of it and all its contained files. Example:

    - -$map = directory_map('./mydirectory/'); - -

    Note: Paths are almost always relative to your main index.php file.

    - - - -

    Sub-folders contained within the directory will be mapped as well. If you wish to map -only the top level directory set the second parameter to true (boolean):

    - -$map = directory_map('./mydirectory/', TRUE); - -

    Each folder name will be an array index, while its contained files will be numerically indexed. -Here is an example of a typical array:

    - -Array
    -(
    -   [libraries] => Array
    -   (
    -       [0] => benchmark.html
    -       [1] => config.html
    -       [database] => Array
    -       (
    -             [0] => active_record.html
    -             [1] => binds.html
    -             [2] => configuration.html
    -             [3] => connecting.html
    -             [4] => examples.html
    -             [5] => fields.html
    -             [6] => index.html
    -             [7] => queries.html
    -        )
    -       [2] => email.html
    -       [3] => file_uploading.html
    -       [4] => image_lib.html
    -       [5] => input.html
    -       [6] => language.html
    -       [7] => loader.html
    -       [8] => pagination.html
    -       [9] => uri.html
    -)     - - - - - - - -
    - - - - - - + + + + + +Directory Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + + +
    + + +
    + + + +
    + + +

    Directory Helper

    + +

    The Directory Helper file contains functions that assist in working with directories.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('directory'); + +

    The following functions are available:

    + +

    directory_map('source directory')

    + +

    This function reads the directory path specified in the first parameter +and builds an array representation of it and all its contained files. Example:

    + +$map = directory_map('./mydirectory/'); + +

    Note: Paths are almost always relative to your main index.php file.

    + + + +

    Sub-folders contained within the directory will be mapped as well. If you wish to map +only the top level directory set the second parameter to true (boolean):

    + +$map = directory_map('./mydirectory/', TRUE); + +

    Each folder name will be an array index, while its contained files will be numerically indexed. +Here is an example of a typical array:

    + +Array
    +(
    +   [libraries] => Array
    +   (
    +       [0] => benchmark.html
    +       [1] => config.html
    +       [database] => Array
    +       (
    +             [0] => active_record.html
    +             [1] => binds.html
    +             [2] => configuration.html
    +             [3] => connecting.html
    +             [4] => examples.html
    +             [5] => fields.html
    +             [6] => index.html
    +             [7] => queries.html
    +        )
    +       [2] => email.html
    +       [3] => file_uploading.html
    +       [4] => image_lib.html
    +       [5] => input.html
    +       [6] => language.html
    +       [7] => loader.html
    +       [8] => pagination.html
    +       [9] => uri.html
    +)     + + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index d9bf6938..6de99034 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -1,112 +1,112 @@ - - - - - -Download Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - - -
    - - -
    - - - -
    - - -

    Download Helper

    - -

    The Download Helper lets you download data to your desktop.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('download'); - -

    The following functions are available:

    - -

    force_download('filename', 'data')

    - -

    Generates server headers which force data to be downloaded to your desktop. Useful with file downloads. -The first parameter is the name you want the downloaded file to be named, the second parameter is the file data. -Example:

    - - -$data = 'Here is some text!';
    -$name = 'mytext.txt';
    -
    -force_download($name, $data); -     - -

    If you want to download an existing file from your server you'll need to read the file into a string:

    - - -$data = file_get_contents("/path/to/photo.jpg"); // Read the file's contents
    -$name = 'myphoto.jpg';
    -
    -force_download($name, $data); -     - - - - -
    - - - - - - + + + + + +Download Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + + +
    + + +
    + + + +
    + + +

    Download Helper

    + +

    The Download Helper lets you download data to your desktop.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('download'); + +

    The following functions are available:

    + +

    force_download('filename', 'data')

    + +

    Generates server headers which force data to be downloaded to your desktop. Useful with file downloads. +The first parameter is the name you want the downloaded file to be named, the second parameter is the file data. +Example:

    + + +$data = 'Here is some text!';
    +$name = 'mytext.txt';
    +
    +force_download($name, $data); +     + +

    If you want to download an existing file from your server you'll need to read the file into a string:

    + + +$data = file_get_contents("/path/to/photo.jpg"); // Read the file's contents
    +$name = 'myphoto.jpg';
    +
    +force_download($name, $data); +     + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index 732e5154..11c6d1ca 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -1,102 +1,102 @@ - - - - - -Email Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - - -
    - - -
    - - - -
    - - -

    Email Helper

    - -

    The Email Helper provides some assistive functions for working with Email. For a more robust email solution, see CodeIgniter's Email Class.

    - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -

    $this->load->helper('email');

    - -

    The following functions are available:

    - -

    valid_email('email')

    - -

    Checks if an email is a correctly formatted email. Note that is doesn't actually prove the email will recieve mail, simply that it is a validly formed address.

    -

    It returns TRUE/FALSE

    - $this->load->helper('email');
    -
    -if (valid_email('email@somesite.com'))
    -{
    -    echo 'email is valid';
    -}
    -else
    -{
    -    echo 'email is not valid';
    -}     -

    send_email('recipient', 'subject', 'message')

    -

    Sends an email using PHP's native mail() function. For a more robust email solution, see CodeIgniter's Email Class.

    -
    - - - - - - + + + + + +Email Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + + +
    + + +
    + + + +
    + + +

    Email Helper

    + +

    The Email Helper provides some assistive functions for working with Email. For a more robust email solution, see CodeIgniter's Email Class.

    + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +

    $this->load->helper('email');

    + +

    The following functions are available:

    + +

    valid_email('email')

    + +

    Checks if an email is a correctly formatted email. Note that is doesn't actually prove the email will recieve mail, simply that it is a validly formed address.

    +

    It returns TRUE/FALSE

    + $this->load->helper('email');
    +
    +if (valid_email('email@somesite.com'))
    +{
    +    echo 'email is valid';
    +}
    +else
    +{
    +    echo 'email is not valid';
    +}     +

    send_email('recipient', 'subject', 'message')

    +

    Sends an email using PHP's native mail() function. For a more robust email solution, see CodeIgniter's Email Class.

    +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index e534f50d..b16201c1 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -1,178 +1,178 @@ - - - - - -File Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    File Helper

    - -

    The File Helper file contains functions that assist in working with files.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('file'); - -

    The following functions are available:

    - -

    read_file('path')

    - -

    Returns the data contained in the file specified in the path. Example:

    - -$string = read_file('./path/to/file.php'); - -

    The path can be a relative or full server path. Returns FALSE (boolean) on failure.

    - -

    Note: The path is relative to your main site index.php file, NOT your controller or view files. -CodeIgniter uses a front controller so paths are always relative to the main site index.

    - -

    If your server is running an open_basedir restriction this function -might not work if you are trying to access a file above the calling script.

    - -

    write_file('path', $data)

    - -

    Writes data to the file specified in the path. If the file does not exist the function will create it. Example:

    - - -$data = 'Some file data';
    -
    -if ( ! write_file('./path/to/file.php', $data))
    -{
    -     echo 'Unable to write the file';
    -}
    -else
    -{
    -     echo 'File written!';
    -}     - -

    You can optionally set the write mode via the third parameter:

    - -write_file('./path/to/file.php', $data, 'r+'); - -

    The default mode is wb. Please see the PHP user guide for mode options.

    - -

    Note: In order for this function to write data to a file its file permissions must be set such that it is writable (666, 777, etc.). -If the file does not already exist, the directory containing it must be writable.

    - -

    Note: The path is relative to your main site index.php file, NOT your controller or view files. -CodeIgniter uses a front controller so paths are always relative to the main site index.

    - -

    delete_files('path')

    - -

    Deletes ALL files contained in the supplied path. Example:

    -delete_files('./path/to/directory/'); - -

    If the second parameter is set to true, any directories contained within the supplied root path will be deleted as well. Example:

    - -delete_files('./path/to/directory/', TRUE); - -

    Note: The files must be writable or owned by the system in order to be deleted.

    - -

    get_filenames('path/to/directory/')

    - -

    Takes a server path as input and returns an array containing the names of all files contained within it. The file path -can optionally be added to the file names by setting the second parameter to TRUE.

    - -

    get_dir_file_info('path/to/directory/')

    - -

    Reads the specified directory and builds an array containing the filenames, filesize, dates, and permissions. Any sub-folders contained within the specified path are read as well.

    - -

    get_file_info('path/to/file', $file_information)

    - -

    Given a file and path, returns the name, path, size, date modified. Second parameter allows you to explicitly declare what information you want returned; options are: name, server_path, size, date, readable, writable, executable, fileperms. Returns FALSE if the file cannot be found.

    - -

    Note: The "writable" uses the PHP function is_writable() which is known to have issues on the IIS webserver. Consider using fileperms instead, which returns information from PHP's fileperms() function.

    -

    get_mime_by_extension('file')

    - -

    Translates a file extension into a mime type based on config/mimes.php. Returns FALSE if it can't determine the type, or open the mime config file.

    -

    -$file = "somefile.png";
    -echo $file . ' is has a mime type of ' . get_mime_by_extension($file);     -

    -

    Note: This is not an accurate way of determining file mime types, and is here strictly as a convenience. It should not be used for security.

    - -

    symbolic_permissions($perms)

    - -

    Takes numeric permissions (such as is returned by fileperms() and returns standard symbolic notation of file permissions.

    - -echo symbolic_permissions(fileperms('./index.php'));
    -
    -// -rw-r--r--     - -

    octal_permissions($perms)

    - -

    Takes numeric permissions (such as is returned by fileperms() and returns a three character octal notation of file permissions.

    - -echo octal_permissions(fileperms('./index.php'));
    -
    -// 644     - -
    - - - - - - - + + + + + +File Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    File Helper

    + +

    The File Helper file contains functions that assist in working with files.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('file'); + +

    The following functions are available:

    + +

    read_file('path')

    + +

    Returns the data contained in the file specified in the path. Example:

    + +$string = read_file('./path/to/file.php'); + +

    The path can be a relative or full server path. Returns FALSE (boolean) on failure.

    + +

    Note: The path is relative to your main site index.php file, NOT your controller or view files. +CodeIgniter uses a front controller so paths are always relative to the main site index.

    + +

    If your server is running an open_basedir restriction this function +might not work if you are trying to access a file above the calling script.

    + +

    write_file('path', $data)

    + +

    Writes data to the file specified in the path. If the file does not exist the function will create it. Example:

    + + +$data = 'Some file data';
    +
    +if ( ! write_file('./path/to/file.php', $data))
    +{
    +     echo 'Unable to write the file';
    +}
    +else
    +{
    +     echo 'File written!';
    +}     + +

    You can optionally set the write mode via the third parameter:

    + +write_file('./path/to/file.php', $data, 'r+'); + +

    The default mode is wb. Please see the PHP user guide for mode options.

    + +

    Note: In order for this function to write data to a file its file permissions must be set such that it is writable (666, 777, etc.). +If the file does not already exist, the directory containing it must be writable.

    + +

    Note: The path is relative to your main site index.php file, NOT your controller or view files. +CodeIgniter uses a front controller so paths are always relative to the main site index.

    + +

    delete_files('path')

    + +

    Deletes ALL files contained in the supplied path. Example:

    +delete_files('./path/to/directory/'); + +

    If the second parameter is set to true, any directories contained within the supplied root path will be deleted as well. Example:

    + +delete_files('./path/to/directory/', TRUE); + +

    Note: The files must be writable or owned by the system in order to be deleted.

    + +

    get_filenames('path/to/directory/')

    + +

    Takes a server path as input and returns an array containing the names of all files contained within it. The file path +can optionally be added to the file names by setting the second parameter to TRUE.

    + +

    get_dir_file_info('path/to/directory/')

    + +

    Reads the specified directory and builds an array containing the filenames, filesize, dates, and permissions. Any sub-folders contained within the specified path are read as well.

    + +

    get_file_info('path/to/file', $file_information)

    + +

    Given a file and path, returns the name, path, size, date modified. Second parameter allows you to explicitly declare what information you want returned; options are: name, server_path, size, date, readable, writable, executable, fileperms. Returns FALSE if the file cannot be found.

    + +

    Note: The "writable" uses the PHP function is_writable() which is known to have issues on the IIS webserver. Consider using fileperms instead, which returns information from PHP's fileperms() function.

    +

    get_mime_by_extension('file')

    + +

    Translates a file extension into a mime type based on config/mimes.php. Returns FALSE if it can't determine the type, or open the mime config file.

    +

    +$file = "somefile.png";
    +echo $file . ' is has a mime type of ' . get_mime_by_extension($file);     +

    +

    Note: This is not an accurate way of determining file mime types, and is here strictly as a convenience. It should not be used for security.

    + +

    symbolic_permissions($perms)

    + +

    Takes numeric permissions (such as is returned by fileperms() and returns standard symbolic notation of file permissions.

    + +echo symbolic_permissions(fileperms('./index.php'));
    +
    +// -rw-r--r--     + +

    octal_permissions($perms)

    + +

    Takes numeric permissions (such as is returned by fileperms() and returns a three character octal notation of file permissions.

    + +echo octal_permissions(fileperms('./index.php'));
    +
    +// 644     + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index dfaa38ec..730acb6d 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -1,475 +1,475 @@ - - - - - -Form Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Form Helper

    - -

    The Form Helper file contains functions that assist in working with forms.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('form'); - -

    The following functions are available:

    - - - -

    form_open()

    - -

    Creates an opening form tag with a base URL built from your config preferences. It will optionally let you -add form attributes and hidden input fields.

    - -

    The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable -in the event your URLs ever change.

    - -

    Here's a simple example:

    - -echo form_open('email/send'); - -

    The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

    - -<form method="post" action="http:/example.com/index.php/email/send" /> - -

    Adding Attributes

    - -

    Attributes can be added by passing an associative array to the second parameter, like this:

    - - -$attributes = array('class' => 'email', 'id' => 'myform');
    -
    -echo form_open('email/send', $attributes);     - -

    The above example would create a form similar to this:

    - -<form method="post" action="http:/example.com/index.php/email/send"  class="email"  id="myform" /> - -

    Adding Hidden Input Fields

    - -

    Hidden fields can be added by passing an associative array to the third parameter, like this:

    - - -$hidden = array('username' => 'Joe', 'member_id' => '234');
    -
    -echo form_open('email/send', '', $hidden);     - -

    The above example would create a form similar to this:

    - -<form method="post" action="http:/example.com/index.php/email/send">
    -<input type="hidden" name="username" value="Joe" />
    -<input type="hidden" name="member_id" value="234" />     - - -

    form_open_multipart()

    - -

    This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute, -which is necessary if you would like to use the form to upload files with.

    - -

    form_hidden()

    - -

    Lets you generate hidden input fields. You can either submit a name/value string to create one field:

    - -form_hidden('username', 'johndoe');
    -
    -// Would produce:

    -<input type="hidden" name="username" value="johndoe" />     - -

    Or you can submit an associative array to create multiple fields:

    - -$data = array(
    -              'name'  => 'John Doe',
    -              'email' => 'john@example.com',
    -              'url'   => 'http://example.com'
    -            );
    -
    -echo form_hidden($data);
    -
    -// Would produce:

    -<input type="hidden" name="name" value="John Doe" />
    -<input type="hidden" name="email" value="john@example.com" />
    -<input type="hidden" name="url" value="http://example.com" />     - - - - -

    form_input()

    - -

    Lets you generate a standard text input field. You can minimally pass the field name and value in the first -and second parameter:

    - -echo form_input('username', 'johndoe'); - -

    Or you can pass an associative array containing any data you wish your form to contain:

    - -$data = array(
    -              'name'        => 'username',
    -              'id'          => 'username',
    -              'value'       => 'johndoe',
    -              'maxlength'   => '100',
    -              'size'        => '50',
    -              'style'       => 'width:50%',
    -            );
    -
    -echo form_input($data);
    -
    -// Would produce:

    -<input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />     - -

    If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the -third parameter:

    - -$js = 'onClick="some_function()"';
    -
    -echo form_input('username', 'johndoe', $js);     - -

    form_password()

    - -

    This function is identical in all respects to the form_input() function above -except that is sets it as a "password" type.

    - -

    form_upload()

    - -

    This function is identical in all respects to the form_input() function above -except that is sets it as a "file" type, allowing it to be used to upload files.

    - -

    form_textarea()

    - -

    This function is identical in all respects to the form_input() function above -except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above -example, you will instead specify "rows" and "cols".

    - - -

    form_dropdown()

    - -

    Lets you create a standard drop-down field. The first parameter will contain the name of the field, -the second parameter will contain an associative array of options, and the third parameter will contain the -value you wish to be selected. You can also pass an array through the third parameter, and CodeIgniter will create a multiple select for you. Example:

    - -$options = array(
    -                  'small'  => 'Small Shirt',
    -                  'med'    => 'Medium Shirt',
    -                  'large'   => 'Large Shirt',
    -                  'xlarge' => 'Extra Large Shirt',
    -                );
    -
    -$shirts_on_sale = array('small', 'large');
    -
    -echo form_dropdown('shirts', $options, 'large');
    -
    -// Would produce:
    -
    -<select name="shirts">
    -<option value="small">Small Shirt</option>
    -<option value="med">Medium Shirt</option>
    -<option value="large" selected="selected">Large Shirt</option>
    -<option value="xlarge">Extra Large Shirt</option>
    -</select>
    -
    -echo form_dropdown('shirts', $options, $shirts_on_sale);
    -
    -// Would produce:
    -
    -<select name="shirts" multiple="multiple">
    -<option value="small" selected="selected">Small Shirt</option>
    -<option value="med">Medium Shirt</option>
    -<option value="large" selected="selected">Large Shirt</option>
    -<option value="xlarge">Extra Large Shirt</option>
    -</select>     - - -

    If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the -fourth parameter:

    - -$js = 'onChange="some_function()"';
    -
    -echo form_dropdown('shirts', $options, 'large', $js);     - - -

    form_fieldset()

    - -

    Lets you generate fieldset/legend fields.

    -echo form_fieldset('Address Information');
    -echo "<p>fieldset content here</p>\n";
    -echo form_fieldset_close(); -
    -
    -// Produces
    -<fieldset> -
    -<legend>Address Information</legend> -
    -<p>form content here</p> -
    -</fieldset>     -

    Similar to other functions, you can submit an associative array in the second parameter if you prefer to set additional attributes.

    -

    $attributes = array('id' => 'address_info', 'class' => 'address_info');
    - echo form_fieldset('Address Information', $attributes);
    -echo "<p>fieldset content here</p>\n";
    -echo form_fieldset_close();
    -
    -// Produces
    -<fieldset id="address_info" class="address_info">
    -<legend>Address Information</legend>
    -<p>form content here</p>
    -</fieldset>

    -

    form_fieldset_close()

    -

    Produces a closing </fieldset> tag. The only advantage to using this function is it permits you to pass data to it - which will be added below the tag. For example:

    -$string = "</div></div>";
    -
    -echo fieldset_close($string);
    -
    -// Would produce:
    -</fieldset>
    -</div></div>     -

    form_checkbox()

    -

    Lets you generate a checkbox field. Simple example:

    -echo form_checkbox('newsletter', 'accept', TRUE);
    -
    -// Would produce:
    -
    -<input type="checkbox" name="newsletter" value="accept" checked="checked" />     -

    The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

    -

    Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

    - -$data = array(
    -    'name'        => 'newsletter',
    -    'id'          => 'newsletter',
    -    'value'       => 'accept',
    -    'checked'     => TRUE,
    -    'style'       => 'margin:10px',
    -    );
    -
    -echo form_checkbox($data);
    -
    -// Would produce:

    -<input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />     - -

    As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the -fourth parameter:

    - -$js = 'onClick="some_function()"';
    -
    - echo form_checkbox('newsletter', 'accept', TRUE, $js)     - - -

    form_radio()

    -

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    - - -

    form_submit()

    - -

    Lets you generate a standard submit button. Simple example:

    -echo form_submit('mysubmit', 'Submit Post!');
    -
    -// Would produce:
    -
    -<input type="submit" name="mysubmit" value="Submit Post!" />     -

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. - The third parameter lets you add extra data to your form, like JavaScript.

    -

    form_label()

    -

    Lets you generate a <label>. Simple example:

    -echo form_label('What is your Name', 'username');
    -
    -// Would produce: -
    -<label for="username">What is your Name</label>     -

    Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

    -

    $attributes = array(
    -    'class' => 'mycustomclass',
    -    'style' => 'color: #000;',
    -);
    - echo form_label('What is your Name', 'username', $attributes);
    -
    -// Would produce:
    -<label for="username" class="mycustomclass" style="color: #000;">What is your Name</label>

    -

    form_reset()

    - -

    Lets you generate a standard reset button. Use is identical to form_submit().

    - -

    form_button()

    - -

    Lets you generate a standard button element. You can minimally pass the button name and content in the first and second parameter:

    - -echo form_button('name','content');
    -
    -// Would produce
    -<button name="name" type="submit">Content</button> -     - -Or you can pass an associative array containing any data you wish your form to contain: - -$data = array(
    -    'name' => 'button',
    -    'id' => 'button',
    -    'value' => 'true',
    -    'type' => 'reset',
    -    'content' => 'Reset'
    -);
    -
    -echo form_button($data);
    -
    -// Would produce:
    -<button name="button" id="button" value="true" type="reset">Reset</button> -     - -If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the third parameter: - -$js = 'onClick="some_function()"';

    -echo form_button('mybutton', 'Click Me', $js); -     - - -

    form_close()

    - -

    Produces a closing </form> tag. The only advantage to using this function is it permits you to pass data to it -which will be added below the tag. For example:

    - -$string = "</div></div>";
    -
    -echo form_close($string);
    -
    -// Would produce:
    -
    -</form>
    -</div></div>     - - - - - -

    form_prep()

    - -

    Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form. Consider this example:

    - -$string = 'Here is a string containing "quoted" text.';
    -
    -<input type="text" name="myform" value="$string" />     - -

    Since the above string contains a set of quotes it will cause the form to break. -The form_prep function converts HTML so that it can be used safely:

    - -<input type="text" name="myform" value="<?php echo form_prep($string); ?>" /> - -

    Note: If you use any of the form helper functions listed in this page the form -values will be prepped automatically, so there is no need to call this function. Use it only if you are -creating your own form elements.

    - - -

    set_value()

    - -

    Permits you to set the value of an input form or textarea. You must supply the field name via the first parameter of the function. -The second (optional) parameter allows you to set a default value for the form. Example:

    - -<input type="text" name="quantity" value="<?php echo set_value('quantity', '0'); ?>" size="50" /> - -

    The above form will show "0" when loaded for the first time.

    - -

    set_select()

    - -

    If you use a <select> menu, this function permits you to display the menu item that was selected. The first parameter -must contain the name of the select menu, the second parameter must contain the value of -each item, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE).

    - -

    Example:

    - - -<select name="myselect">
    -<option value="one" <?php echo set_select('myselect', 'one', TRUE); ?> >One</option>
    -<option value="two" <?php echo set_select('myselect', 'two'); ?> >Two</option>
    -<option value="three" <?php echo set_select('myselect', 'three'); ?> >Three</option>
    -</select> -     - - -

    set_checkbox()

    - -

    Permits you to display a checkbox in the state it was submitted. The first parameter -must contain the name of the checkbox, the second parameter must contain its value, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE). Example:

    - -<input type="checkbox" name="mycheck" value="1" <?php echo set_checkbox('mycheck', '1'); ?> />
    -<input type="checkbox" name="mycheck" value="2" <?php echo set_checkbox('mycheck', '2'); ?> />     - - -

    set_radio()

    - -

    Permits you to display radio buttons in the state they were submitted. This function is identical to the set_checkbox() function above.

    - -<input type="radio" name="myradio" value="1" <?php echo set_radio('myradio', '1', TRUE); ?> />
    -<input type="radio" name="myradio" value="2" <?php echo set_radio('myradio', '2'); ?> />     - - - - -
    - - - - - - + + + + + +Form Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Form Helper

    + +

    The Form Helper file contains functions that assist in working with forms.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('form'); + +

    The following functions are available:

    + + + +

    form_open()

    + +

    Creates an opening form tag with a base URL built from your config preferences. It will optionally let you +add form attributes and hidden input fields.

    + +

    The main benefit of using this tag rather than hard coding your own HTML is that it permits your site to be more portable +in the event your URLs ever change.

    + +

    Here's a simple example:

    + +echo form_open('email/send'); + +

    The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

    + +<form method="post" action="http:/example.com/index.php/email/send" /> + +

    Adding Attributes

    + +

    Attributes can be added by passing an associative array to the second parameter, like this:

    + + +$attributes = array('class' => 'email', 'id' => 'myform');
    +
    +echo form_open('email/send', $attributes);     + +

    The above example would create a form similar to this:

    + +<form method="post" action="http:/example.com/index.php/email/send"  class="email"  id="myform" /> + +

    Adding Hidden Input Fields

    + +

    Hidden fields can be added by passing an associative array to the third parameter, like this:

    + + +$hidden = array('username' => 'Joe', 'member_id' => '234');
    +
    +echo form_open('email/send', '', $hidden);     + +

    The above example would create a form similar to this:

    + +<form method="post" action="http:/example.com/index.php/email/send">
    +<input type="hidden" name="username" value="Joe" />
    +<input type="hidden" name="member_id" value="234" />     + + +

    form_open_multipart()

    + +

    This function is absolutely identical to the form_open() tag above except that it adds a multipart attribute, +which is necessary if you would like to use the form to upload files with.

    + +

    form_hidden()

    + +

    Lets you generate hidden input fields. You can either submit a name/value string to create one field:

    + +form_hidden('username', 'johndoe');
    +
    +// Would produce:

    +<input type="hidden" name="username" value="johndoe" />     + +

    Or you can submit an associative array to create multiple fields:

    + +$data = array(
    +              'name'  => 'John Doe',
    +              'email' => 'john@example.com',
    +              'url'   => 'http://example.com'
    +            );
    +
    +echo form_hidden($data);
    +
    +// Would produce:

    +<input type="hidden" name="name" value="John Doe" />
    +<input type="hidden" name="email" value="john@example.com" />
    +<input type="hidden" name="url" value="http://example.com" />     + + + + +

    form_input()

    + +

    Lets you generate a standard text input field. You can minimally pass the field name and value in the first +and second parameter:

    + +echo form_input('username', 'johndoe'); + +

    Or you can pass an associative array containing any data you wish your form to contain:

    + +$data = array(
    +              'name'        => 'username',
    +              'id'          => 'username',
    +              'value'       => 'johndoe',
    +              'maxlength'   => '100',
    +              'size'        => '50',
    +              'style'       => 'width:50%',
    +            );
    +
    +echo form_input($data);
    +
    +// Would produce:

    +<input type="text" name="username" id="username" value="johndoe" maxlength="100" size="50" style="width:50%" />     + +

    If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the +third parameter:

    + +$js = 'onClick="some_function()"';
    +
    +echo form_input('username', 'johndoe', $js);     + +

    form_password()

    + +

    This function is identical in all respects to the form_input() function above +except that is sets it as a "password" type.

    + +

    form_upload()

    + +

    This function is identical in all respects to the form_input() function above +except that is sets it as a "file" type, allowing it to be used to upload files.

    + +

    form_textarea()

    + +

    This function is identical in all respects to the form_input() function above +except that it generates a "textarea" type. Note: Instead of the "maxlength" and "size" attributes in the above +example, you will instead specify "rows" and "cols".

    + + +

    form_dropdown()

    + +

    Lets you create a standard drop-down field. The first parameter will contain the name of the field, +the second parameter will contain an associative array of options, and the third parameter will contain the +value you wish to be selected. You can also pass an array through the third parameter, and CodeIgniter will create a multiple select for you. Example:

    + +$options = array(
    +                  'small'  => 'Small Shirt',
    +                  'med'    => 'Medium Shirt',
    +                  'large'   => 'Large Shirt',
    +                  'xlarge' => 'Extra Large Shirt',
    +                );
    +
    +$shirts_on_sale = array('small', 'large');
    +
    +echo form_dropdown('shirts', $options, 'large');
    +
    +// Would produce:
    +
    +<select name="shirts">
    +<option value="small">Small Shirt</option>
    +<option value="med">Medium Shirt</option>
    +<option value="large" selected="selected">Large Shirt</option>
    +<option value="xlarge">Extra Large Shirt</option>
    +</select>
    +
    +echo form_dropdown('shirts', $options, $shirts_on_sale);
    +
    +// Would produce:
    +
    +<select name="shirts" multiple="multiple">
    +<option value="small" selected="selected">Small Shirt</option>
    +<option value="med">Medium Shirt</option>
    +<option value="large" selected="selected">Large Shirt</option>
    +<option value="xlarge">Extra Large Shirt</option>
    +</select>     + + +

    If you would like the opening <select> to contain additional data, like JavaScript, you can pass it as a string in the +fourth parameter:

    + +$js = 'onChange="some_function()"';
    +
    +echo form_dropdown('shirts', $options, 'large', $js);     + + +

    form_fieldset()

    + +

    Lets you generate fieldset/legend fields.

    +echo form_fieldset('Address Information');
    +echo "<p>fieldset content here</p>\n";
    +echo form_fieldset_close(); +
    +
    +// Produces
    +<fieldset> +
    +<legend>Address Information</legend> +
    +<p>form content here</p> +
    +</fieldset>     +

    Similar to other functions, you can submit an associative array in the second parameter if you prefer to set additional attributes.

    +

    $attributes = array('id' => 'address_info', 'class' => 'address_info');
    + echo form_fieldset('Address Information', $attributes);
    +echo "<p>fieldset content here</p>\n";
    +echo form_fieldset_close();
    +
    +// Produces
    +<fieldset id="address_info" class="address_info">
    +<legend>Address Information</legend>
    +<p>form content here</p>
    +</fieldset>

    +

    form_fieldset_close()

    +

    Produces a closing </fieldset> tag. The only advantage to using this function is it permits you to pass data to it + which will be added below the tag. For example:

    +$string = "</div></div>";
    +
    +echo fieldset_close($string);
    +
    +// Would produce:
    +</fieldset>
    +</div></div>     +

    form_checkbox()

    +

    Lets you generate a checkbox field. Simple example:

    +echo form_checkbox('newsletter', 'accept', TRUE);
    +
    +// Would produce:
    +
    +<input type="checkbox" name="newsletter" value="accept" checked="checked" />     +

    The third parameter contains a boolean TRUE/FALSE to determine whether the box should be checked or not.

    +

    Similar to the other form functions in this helper, you can also pass an array of attributes to the function:

    + +$data = array(
    +    'name'        => 'newsletter',
    +    'id'          => 'newsletter',
    +    'value'       => 'accept',
    +    'checked'     => TRUE,
    +    'style'       => 'margin:10px',
    +    );
    +
    +echo form_checkbox($data);
    +
    +// Would produce:

    +<input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />     + +

    As with other functions, if you would like the tag to contain additional data, like JavaScript, you can pass it as a string in the +fourth parameter:

    + +$js = 'onClick="some_function()"';
    +
    + echo form_checkbox('newsletter', 'accept', TRUE, $js)     + + +

    form_radio()

    +

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    + + +

    form_submit()

    + +

    Lets you generate a standard submit button. Simple example:

    +echo form_submit('mysubmit', 'Submit Post!');
    +
    +// Would produce:
    +
    +<input type="submit" name="mysubmit" value="Submit Post!" />     +

    Similar to other functions, you can submit an associative array in the first parameter if you prefer to set your own attributes. + The third parameter lets you add extra data to your form, like JavaScript.

    +

    form_label()

    +

    Lets you generate a <label>. Simple example:

    +echo form_label('What is your Name', 'username');
    +
    +// Would produce: +
    +<label for="username">What is your Name</label>     +

    Similar to other functions, you can submit an associative array in the third parameter if you prefer to set additional attributes.

    +

    $attributes = array(
    +    'class' => 'mycustomclass',
    +    'style' => 'color: #000;',
    +);
    + echo form_label('What is your Name', 'username', $attributes);
    +
    +// Would produce:
    +<label for="username" class="mycustomclass" style="color: #000;">What is your Name</label>

    +

    form_reset()

    + +

    Lets you generate a standard reset button. Use is identical to form_submit().

    + +

    form_button()

    + +

    Lets you generate a standard button element. You can minimally pass the button name and content in the first and second parameter:

    + +echo form_button('name','content');
    +
    +// Would produce
    +<button name="name" type="submit">Content</button> +     + +Or you can pass an associative array containing any data you wish your form to contain: + +$data = array(
    +    'name' => 'button',
    +    'id' => 'button',
    +    'value' => 'true',
    +    'type' => 'reset',
    +    'content' => 'Reset'
    +);
    +
    +echo form_button($data);
    +
    +// Would produce:
    +<button name="button" id="button" value="true" type="reset">Reset</button> +     + +If you would like your form to contain some additional data, like JavaScript, you can pass it as a string in the third parameter: + +$js = 'onClick="some_function()"';

    +echo form_button('mybutton', 'Click Me', $js); +     + + +

    form_close()

    + +

    Produces a closing </form> tag. The only advantage to using this function is it permits you to pass data to it +which will be added below the tag. For example:

    + +$string = "</div></div>";
    +
    +echo form_close($string);
    +
    +// Would produce:
    +
    +</form>
    +</div></div>     + + + + + +

    form_prep()

    + +

    Allows you to safely use HTML and characters such as quotes within form elements without breaking out of the form. Consider this example:

    + +$string = 'Here is a string containing "quoted" text.';
    +
    +<input type="text" name="myform" value="$string" />     + +

    Since the above string contains a set of quotes it will cause the form to break. +The form_prep function converts HTML so that it can be used safely:

    + +<input type="text" name="myform" value="<?php echo form_prep($string); ?>" /> + +

    Note: If you use any of the form helper functions listed in this page the form +values will be prepped automatically, so there is no need to call this function. Use it only if you are +creating your own form elements.

    + + +

    set_value()

    + +

    Permits you to set the value of an input form or textarea. You must supply the field name via the first parameter of the function. +The second (optional) parameter allows you to set a default value for the form. Example:

    + +<input type="text" name="quantity" value="<?php echo set_value('quantity', '0'); ?>" size="50" /> + +

    The above form will show "0" when loaded for the first time.

    + +

    set_select()

    + +

    If you use a <select> menu, this function permits you to display the menu item that was selected. The first parameter +must contain the name of the select menu, the second parameter must contain the value of +each item, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE).

    + +

    Example:

    + + +<select name="myselect">
    +<option value="one" <?php echo set_select('myselect', 'one', TRUE); ?> >One</option>
    +<option value="two" <?php echo set_select('myselect', 'two'); ?> >Two</option>
    +<option value="three" <?php echo set_select('myselect', 'three'); ?> >Three</option>
    +</select> +     + + +

    set_checkbox()

    + +

    Permits you to display a checkbox in the state it was submitted. The first parameter +must contain the name of the checkbox, the second parameter must contain its value, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE). Example:

    + +<input type="checkbox" name="mycheck" value="1" <?php echo set_checkbox('mycheck', '1'); ?> />
    +<input type="checkbox" name="mycheck" value="2" <?php echo set_checkbox('mycheck', '2'); ?> />     + + +

    set_radio()

    + +

    Permits you to display radio buttons in the state they were submitted. This function is identical to the set_checkbox() function above.

    + +<input type="radio" name="myradio" value="1" <?php echo set_radio('myradio', '1', TRUE); ?> />
    +<input type="radio" name="myradio" value="2" <?php echo set_radio('myradio', '2'); ?> />     + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 98b2c255..3b4ffb13 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -1,368 +1,368 @@ - - - - - -HTML Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    HTML Helper

    - -

    The HTML Helper file contains functions that assist in working with HTML.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('html'); - -

    The following functions are available:

    - -

    br()

    -

    Generates line break tags (<br />) based on the number you submit. Example:

    -echo br(3); -

    The above would produce: <br /><br /><br />

    - -

    heading()

    -

    Lets you create HTML <h1> tags. The first parameter will contain the data, the -second the size of the heading. Example:

    -echo heading('Welcome!', 3); -

    The above would produce: <h3>Welcome!</h3>

    -

    img()

    -

    Lets you create HTML <img /> tags. The first parameter contains the image source. Example:

    -echo img('images/picture.jpg');
    -// gives <img src="http://site.com/images/picture.jpg" />     -

    There is an optional second parameter that is a TRUE/FALSE value that specifics if the src should have the page specified by $config['index_page'] added to the address it creates. Presumably, this would be if you were using a media controller.

    -

    echo img('images/picture.jpg', TRUE);
    -// gives <img src="http://site.com/index.php/images/picture.jpg" />

    -

    Additionally, an associative array can be passed to the img() function for complete control over all attributes and values.

    -

    $image_properties = array(
    -           'src' => 'images/picture.jpg',
    -           'alt' => 'Me, demonstrating how to eat 4 slices of pizza at one time',
    -           'class' => 'post_images',
    -           'width' => '200',
    -           'height' => '200',
    -           'title' => 'That was quite a night',
    -           'rel' => 'lightbox',
    - );
    -
    - img($image_properties);
    - // <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />

    -

    link_tag()

    -

    Lets you create HTML <link /> tags. This is useful for stylesheet links, as well as other links. The parameters are href, with optional rel, type, title, media and index_page. index_page is a TRUE/FALSE value that specifics if the href should have the page specified by $config['index_page'] added to the address it creates. -echo link_tag('css/mystyles.css');
    -// gives <link href="http://site.com/css/mystyles.css" rel="stylesheet" type="text/css" />

    -

    Further examples:

    - - - echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
    - // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" /> -
    -
    - echo link('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
    - // <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />     -

    Additionally, an associative array can be passed to the link() function for complete control over all attributes and values.

    -

    - $link = array(
    -           'href' => 'css/printer.css',
    -           'rel' => 'stylesheet',
    -           'type' => 'text/css',
    -           'media' => 'print'
    - );
    -
    - echo link_tag($link);
    - // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />

    - -

    nbs()

    -

    Generates non-breaking spaces (&nbsp;) based on the number you submit. Example:

    -echo nbs(3); -

    The above would produce: &nbsp;&nbsp;&nbsp;

    - -

    ol()  and  ul()

    - -

    Permits you to generate ordered or unordered HTML lists from simple or multi-dimensional arrays. Example:

    - - -$this->load->helper('html');
    -
    -$list = array(
    -            'red',
    -            'blue',
    -            'green',
    -            'yellow'
    -            );
    -
    -$attributes = array(
    -                    'class' => 'boldlist',
    -                    'id'    => 'mylist'
    -                    );
    -
    -echo ul($list, $attributes);
    -     - -

    The above code will produce this:

    - - -<ul class="boldlist" id="mylist">
    -  <li>red</li>
    -  <li>blue</li>
    -  <li>green</li>
    -  <li>yellow</li>
    -</ul> -     - -

    Here is a more complex example, using a multi-dimensional array:

    - - -$this->load->helper('html');
    -
    -$list = array(
    -            'colors' => array(
    -                                'red',
    -                                'blue',
    -                                'green'
    -                            ),
    -            'shapes' => array(
    -                                'round',
    -                                'square',
    -                                'circles' => array(
    -                                                    'ellipse',
    -                                                    'oval',
    -                                                    'sphere'
    -                                                    )
    -                            ),
    -            'moods'    => array(
    -                                'happy',
    -                                'upset' => array(
    -                                                    'defeated' => array(
    -                                                                        'dejected',
    -                                                                        'disheartened',
    -                                                                        'depressed'
    -                                                                        ),
    -                                                    'annoyed',
    -                                                    'cross',
    -                                                    'angry'
    -                                                )
    -                            )
    -            );
    -
    -
    -echo ul($list);     - -

    The above code will produce this:

    - - -<ul class="boldlist" id="mylist">
    -  <li>colors
    -    <ul>
    -      <li>red</li>
    -      <li>blue</li>
    -      <li>green</li>
    -    </ul>
    -  </li>
    -  <li>shapes
    -    <ul>
    -      <li>round</li>
    -      <li>suare</li>
    -      <li>circles
    -        <ul>
    -          <li>elipse</li>
    -          <li>oval</li>
    -          <li>sphere</li>
    -        </ul>
    -      </li>
    -    </ul>
    -  </li>
    -  <li>moods
    -    <ul>
    -      <li>happy</li>
    -      <li>upset
    -        <ul>
    -          <li>defeated
    -            <ul>
    -              <li>dejected</li>
    -              <li>disheartened</li>
    -              <li>depressed</li>
    -            </ul>
    -          </li>
    -          <li>annoyed</li>
    -          <li>cross</li>
    -          <li>angry</li>
    -        </ul>
    -      </li>
    -    </ul>
    -  </li>
    -</ul> -     - - - -

    meta()

    - -

    Helps you generate meta tags. You can pass strings to the function, or simple arrays, or multidimensional ones. Examples:

    - - -echo meta('description', 'My Great site');
    -// Generates: <meta name="description" content="My Great Site" />
    -

    - -echo meta('Content-type', 'text/html; charset=utf-8', 'equiv'); // Note the third parameter. Can be "equiv" or "name"
    -// Generates: <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
    - -

    - -echo meta(array('name' => 'robots', 'content' => 'no-cache'));
    -// Generates: <meta name="robots" content="no-cache" />
    - -

    - -$meta = array(
    -        array('name' => 'robots', 'content' => 'no-cache'),
    -        array('name' => 'description', 'content' => 'My Great Site'),
    -        array('name' => 'keywords', 'content' => 'love, passion, intrigue, deception'),
    -        array('name' => 'robots', 'content' => 'no-cache'),
    -        array('name' => 'Content-type', 'content' => 'text/html; charset=utf-8', 'type' => 'equiv')
    -    );
    -
    -echo meta($meta); -
    -// Generates:
    -// <meta name="robots" content="no-cache" />
    -// <meta name="description" content="My Great Site" />
    -// <meta name="keywords" content="love, passion, intrigue, deception" />
    -// <meta name="robots" content="no-cache" />
    -// <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> -     - - -

    doctype()

    - -

    Helps you generate document type declarations, or DTD's. XHTML 1.0 Strict is used by default, but many doctypes are available.

    - - -echo docytype();
    -// <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    -
    -echo doctype('html4-trans');
    -// <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -     - -

    The following is a list of doctype choices. These are configurable, and pulled from application/config/doctypes.php

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    DoctypeOptionResult
    XHTML 1.1doctype('xhtml11')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
    XHTML 1.0 Strictdoctype('xhtml1-strict')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    XHTML 1.0 Transitionaldoctype('xhtml1-trans')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    XHTML 1.0 Framesetdoctype('xhtml1-frame')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    HTML 5doctype('html5')<!DOCTYPE html>
    HTML 4 Strictdoctype('html4-strict')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    HTML 4 Transitionaldoctype('html4-trans')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
    HTML 4 Framesetdoctype('html4-frame')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
    - - - - -
    - - - - - - + + + + + +HTML Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    HTML Helper

    + +

    The HTML Helper file contains functions that assist in working with HTML.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('html'); + +

    The following functions are available:

    + +

    br()

    +

    Generates line break tags (<br />) based on the number you submit. Example:

    +echo br(3); +

    The above would produce: <br /><br /><br />

    + +

    heading()

    +

    Lets you create HTML <h1> tags. The first parameter will contain the data, the +second the size of the heading. Example:

    +echo heading('Welcome!', 3); +

    The above would produce: <h3>Welcome!</h3>

    +

    img()

    +

    Lets you create HTML <img /> tags. The first parameter contains the image source. Example:

    +echo img('images/picture.jpg');
    +// gives <img src="http://site.com/images/picture.jpg" />     +

    There is an optional second parameter that is a TRUE/FALSE value that specifics if the src should have the page specified by $config['index_page'] added to the address it creates. Presumably, this would be if you were using a media controller.

    +

    echo img('images/picture.jpg', TRUE);
    +// gives <img src="http://site.com/index.php/images/picture.jpg" />

    +

    Additionally, an associative array can be passed to the img() function for complete control over all attributes and values.

    +

    $image_properties = array(
    +           'src' => 'images/picture.jpg',
    +           'alt' => 'Me, demonstrating how to eat 4 slices of pizza at one time',
    +           'class' => 'post_images',
    +           'width' => '200',
    +           'height' => '200',
    +           'title' => 'That was quite a night',
    +           'rel' => 'lightbox',
    + );
    +
    + img($image_properties);
    + // <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />

    +

    link_tag()

    +

    Lets you create HTML <link /> tags. This is useful for stylesheet links, as well as other links. The parameters are href, with optional rel, type, title, media and index_page. index_page is a TRUE/FALSE value that specifics if the href should have the page specified by $config['index_page'] added to the address it creates. +echo link_tag('css/mystyles.css');
    +// gives <link href="http://site.com/css/mystyles.css" rel="stylesheet" type="text/css" />

    +

    Further examples:

    + + + echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
    + // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" /> +
    +
    + echo link('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
    + // <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />     +

    Additionally, an associative array can be passed to the link() function for complete control over all attributes and values.

    +

    + $link = array(
    +           'href' => 'css/printer.css',
    +           'rel' => 'stylesheet',
    +           'type' => 'text/css',
    +           'media' => 'print'
    + );
    +
    + echo link_tag($link);
    + // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />

    + +

    nbs()

    +

    Generates non-breaking spaces (&nbsp;) based on the number you submit. Example:

    +echo nbs(3); +

    The above would produce: &nbsp;&nbsp;&nbsp;

    + +

    ol()  and  ul()

    + +

    Permits you to generate ordered or unordered HTML lists from simple or multi-dimensional arrays. Example:

    + + +$this->load->helper('html');
    +
    +$list = array(
    +            'red',
    +            'blue',
    +            'green',
    +            'yellow'
    +            );
    +
    +$attributes = array(
    +                    'class' => 'boldlist',
    +                    'id'    => 'mylist'
    +                    );
    +
    +echo ul($list, $attributes);
    +     + +

    The above code will produce this:

    + + +<ul class="boldlist" id="mylist">
    +  <li>red</li>
    +  <li>blue</li>
    +  <li>green</li>
    +  <li>yellow</li>
    +</ul> +     + +

    Here is a more complex example, using a multi-dimensional array:

    + + +$this->load->helper('html');
    +
    +$list = array(
    +            'colors' => array(
    +                                'red',
    +                                'blue',
    +                                'green'
    +                            ),
    +            'shapes' => array(
    +                                'round',
    +                                'square',
    +                                'circles' => array(
    +                                                    'ellipse',
    +                                                    'oval',
    +                                                    'sphere'
    +                                                    )
    +                            ),
    +            'moods'    => array(
    +                                'happy',
    +                                'upset' => array(
    +                                                    'defeated' => array(
    +                                                                        'dejected',
    +                                                                        'disheartened',
    +                                                                        'depressed'
    +                                                                        ),
    +                                                    'annoyed',
    +                                                    'cross',
    +                                                    'angry'
    +                                                )
    +                            )
    +            );
    +
    +
    +echo ul($list);     + +

    The above code will produce this:

    + + +<ul class="boldlist" id="mylist">
    +  <li>colors
    +    <ul>
    +      <li>red</li>
    +      <li>blue</li>
    +      <li>green</li>
    +    </ul>
    +  </li>
    +  <li>shapes
    +    <ul>
    +      <li>round</li>
    +      <li>suare</li>
    +      <li>circles
    +        <ul>
    +          <li>elipse</li>
    +          <li>oval</li>
    +          <li>sphere</li>
    +        </ul>
    +      </li>
    +    </ul>
    +  </li>
    +  <li>moods
    +    <ul>
    +      <li>happy</li>
    +      <li>upset
    +        <ul>
    +          <li>defeated
    +            <ul>
    +              <li>dejected</li>
    +              <li>disheartened</li>
    +              <li>depressed</li>
    +            </ul>
    +          </li>
    +          <li>annoyed</li>
    +          <li>cross</li>
    +          <li>angry</li>
    +        </ul>
    +      </li>
    +    </ul>
    +  </li>
    +</ul> +     + + + +

    meta()

    + +

    Helps you generate meta tags. You can pass strings to the function, or simple arrays, or multidimensional ones. Examples:

    + + +echo meta('description', 'My Great site');
    +// Generates: <meta name="description" content="My Great Site" />
    +

    + +echo meta('Content-type', 'text/html; charset=utf-8', 'equiv'); // Note the third parameter. Can be "equiv" or "name"
    +// Generates: <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
    + +

    + +echo meta(array('name' => 'robots', 'content' => 'no-cache'));
    +// Generates: <meta name="robots" content="no-cache" />
    + +

    + +$meta = array(
    +        array('name' => 'robots', 'content' => 'no-cache'),
    +        array('name' => 'description', 'content' => 'My Great Site'),
    +        array('name' => 'keywords', 'content' => 'love, passion, intrigue, deception'),
    +        array('name' => 'robots', 'content' => 'no-cache'),
    +        array('name' => 'Content-type', 'content' => 'text/html; charset=utf-8', 'type' => 'equiv')
    +    );
    +
    +echo meta($meta); +
    +// Generates:
    +// <meta name="robots" content="no-cache" />
    +// <meta name="description" content="My Great Site" />
    +// <meta name="keywords" content="love, passion, intrigue, deception" />
    +// <meta name="robots" content="no-cache" />
    +// <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> +     + + +

    doctype()

    + +

    Helps you generate document type declarations, or DTD's. XHTML 1.0 Strict is used by default, but many doctypes are available.

    + + +echo docytype();
    +// <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    +
    +echo doctype('html4-trans');
    +// <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +     + +

    The following is a list of doctype choices. These are configurable, and pulled from application/config/doctypes.php

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    DoctypeOptionResult
    XHTML 1.1doctype('xhtml11')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
    XHTML 1.0 Strictdoctype('xhtml1-strict')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    XHTML 1.0 Transitionaldoctype('xhtml1-trans')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    XHTML 1.0 Framesetdoctype('xhtml1-frame')<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    HTML 5doctype('html5')<!DOCTYPE html>
    HTML 4 Strictdoctype('html4-strict')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    HTML 4 Transitionaldoctype('html4-trans')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
    HTML 4 Framesetdoctype('html4-frame')<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index b93a9c01..323caf5c 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -1,151 +1,151 @@ - - - - - -Inflector Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Inflector Helper

    - -

    The Inflector Helper file contains functions that permits you to change words to plural, singular, camel case, etc.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('inflector'); - -

    The following functions are available:

    - - -

    singular()

    - -

    Changes a plural word to singular. Example:

    - - -$word = "dogs";
    -echo singular($word); // Returns "dog" -     - - -

    plural()

    - -

    Changes a singular word to plural. Example:

    - - -$word = "dog";
    -echo plural($word); // Returns "dogs" -     - - -

    To force a word to end with "es" use a second "true" argument.

    - $word = "pass";
    -echo plural($word, TRUE); // Returns "passes"     - -

    camelize()

    -

    Changes a string of words separated by spaces or underscores to camel case. Example:

    - - -$word = "my_dog_spot";
    -echo camelize($word); // Returns "myDogSpot" -     - - -

    underscore()

    - -

    Takes multiple words separated by spaces and underscores them. Example:

    - - -$word = "my dog spot";
    -echo underscore($word); // Returns "my_dog_spot" -     - - -

    humanize()

    - -

    Takes multiple words separated by underscores and adds spaces between them. Each word is capitalized. Example:

    - - -$word = "my_dog_spot";
    -echo humanize($word); // Returns "My Dog Spot" -     - - - - - - - - - - - - -
    - - - - - - + + + + + +Inflector Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Inflector Helper

    + +

    The Inflector Helper file contains functions that permits you to change words to plural, singular, camel case, etc.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('inflector'); + +

    The following functions are available:

    + + +

    singular()

    + +

    Changes a plural word to singular. Example:

    + + +$word = "dogs";
    +echo singular($word); // Returns "dog" +     + + +

    plural()

    + +

    Changes a singular word to plural. Example:

    + + +$word = "dog";
    +echo plural($word); // Returns "dogs" +     + + +

    To force a word to end with "es" use a second "true" argument.

    + $word = "pass";
    +echo plural($word, TRUE); // Returns "passes"     + +

    camelize()

    +

    Changes a string of words separated by spaces or underscores to camel case. Example:

    + + +$word = "my_dog_spot";
    +echo camelize($word); // Returns "myDogSpot" +     + + +

    underscore()

    + +

    Takes multiple words separated by spaces and underscores them. Example:

    + + +$word = "my dog spot";
    +echo underscore($word); // Returns "my_dog_spot" +     + + +

    humanize()

    + +

    Takes multiple words separated by underscores and adds spaces between them. Each word is capitalized. Example:

    + + +$word = "my_dog_spot";
    +echo humanize($word); // Returns "My Dog Spot" +     + + + + + + + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index cad1ef49..9c60759d 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -1,98 +1,98 @@ - - - - - -Language Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - - -
    - - -
    - - - -
    - - -

    Language Helper

    - -

    The Language Helper file contains functions that assist in working with language files.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('language'); - -

    The following functions are available:

    - -

    lang('language line', 'element id')

    - -

    This function returns a line of text from a loaded language file with simplified syntax - that may be more desirable for view files than calling $this->lang->line(). - The optional second parameter will also output a form label for you. Example:

    - -echo lang('language_key', 'form_item_id');
    -// becomes <label for="form_item_id">language_key</label>     - - -
    - - - - - - + + + + + +Language Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + + +
    + + +
    + + + +
    + + +

    Language Helper

    + +

    The Language Helper file contains functions that assist in working with language files.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('language'); + +

    The following functions are available:

    + +

    lang('language line', 'element id')

    + +

    This function returns a line of text from a loaded language file with simplified syntax + that may be more desirable for view files than calling $this->lang->line(). + The optional second parameter will also output a form label for you. Example:

    + +echo lang('language_key', 'form_item_id');
    +// becomes <label for="form_item_id">language_key</label>     + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index fea4cbf6..6ce6d76b 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -1,107 +1,107 @@ - - - - - -Number Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Number Helper

    - -

    The Number Helper file contains functions that help you work with numeric data.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('number'); - -

    The following functions are available:

    - - -

    byte_format()

    - -

    Formats a numbers as bytes, based on size, and adds the appropriate suffix. Examples:

    - - -echo byte_format(456); // Returns 456 Bytes
    -echo byte_format(4567); // Returns 4.5 KB
    -echo byte_format(45678); // Returns 44.8 KB
    -echo byte_format(456789); // Returns 447.8 KB
    -echo byte_format(3456789); // Returns 3.3 MB
    -echo byte_format(12345678912345); // Returns 1.8 GB
    -echo byte_format(123456789123456789); // Returns 11,228.3 TB -     - -

    -Note: -The text generated by this function is found in the following language file: language//number_lang.php -

    - -
    - - - - - - + + + + + +Number Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Number Helper

    + +

    The Number Helper file contains functions that help you work with numeric data.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('number'); + +

    The following functions are available:

    + + +

    byte_format()

    + +

    Formats a numbers as bytes, based on size, and adds the appropriate suffix. Examples:

    + + +echo byte_format(456); // Returns 456 Bytes
    +echo byte_format(4567); // Returns 4.5 KB
    +echo byte_format(45678); // Returns 44.8 KB
    +echo byte_format(456789); // Returns 447.8 KB
    +echo byte_format(3456789); // Returns 3.3 MB
    +echo byte_format(12345678912345); // Returns 1.8 GB
    +echo byte_format(123456789123456789); // Returns 11,228.3 TB +     + +

    +Note: +The text generated by this function is found in the following language file: language//number_lang.php +

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index ca3fb646..6c0d7602 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -1,106 +1,106 @@ - - - - - -Path Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Path Helper

    - -

    The Path Helper file contains functions that permits you to work with file paths on the server.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('path'); - -

    The following functions are available:

    - - -

    set_realpath()

    - -

    Checks to see if the path exists. This function will return a server path without symbolic links or relative directory structures. An optional second argument will cause an error to be triggered if the path cannot be resolved.

    - -$directory = '/etc/passwd';
    -echo set_realpath($directory);
    -// returns "/etc/passwd"
    -
    -$non_existent_directory = '/path/to/nowhere';
    -echo set_realpath($non_existent_directory, TRUE);
    -// returns an error, as the path could not be resolved -

    -echo set_realpath($non_existent_directory, FALSE);
    -// returns "/path/to/nowhere" - - - -     -

     

    -
    - - - - - - + + + + + +Path Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Path Helper

    + +

    The Path Helper file contains functions that permits you to work with file paths on the server.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('path'); + +

    The following functions are available:

    + + +

    set_realpath()

    + +

    Checks to see if the path exists. This function will return a server path without symbolic links or relative directory structures. An optional second argument will cause an error to be triggered if the path cannot be resolved.

    + +$directory = '/etc/passwd';
    +echo set_realpath($directory);
    +// returns "/etc/passwd"
    +
    +$non_existent_directory = '/path/to/nowhere';
    +echo set_realpath($non_existent_directory, TRUE);
    +// returns an error, as the path could not be resolved +

    +echo set_realpath($non_existent_directory, FALSE);
    +// returns "/path/to/nowhere" + + + +     +

     

    +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 588cafef..57b4c1d4 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -1,125 +1,125 @@ - - - - - -Security Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Security Helper

    - -

    The Security Helper file contains security related functions.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('security'); - -

    The following functions are available:

    - - -

    xss_clean()

    - -

    Provides Cross Site Script Hack filtering. This function is an alias to the one in the -Input class. More info can be found there.

    - - -

    dohash()

    - -

    Permits you to create SHA1 or MD5 one way hashes suitable for encrypting passwords. Will create SHA1 by default. Examples:

    - - -$str = dohash($str); // SHA1
    -
    -$str = dohash($str, 'md5'); // MD5 -     - - - - -

    strip_image_tags()

    - -

    This is a security function that will strip image tags from a string. It leaves the image URL as plain text.

    - -$string = strip_image_tags($string); - - -

    encode_php_tags()

    - -

    This is a security function that converts PHP tags to entities. Note: If you use the XSS filtering function it does this automatically.

    - -$string = encode_php_tags($string); - - - - - - - -
    - - - - - - + + + + + +Security Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Security Helper

    + +

    The Security Helper file contains security related functions.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('security'); + +

    The following functions are available:

    + + +

    xss_clean()

    + +

    Provides Cross Site Script Hack filtering. This function is an alias to the one in the +Input class. More info can be found there.

    + + +

    dohash()

    + +

    Permits you to create SHA1 or MD5 one way hashes suitable for encrypting passwords. Will create SHA1 by default. Examples:

    + + +$str = dohash($str); // SHA1
    +
    +$str = dohash($str, 'md5'); // MD5 +     + + + + +

    strip_image_tags()

    + +

    This is a security function that will strip image tags from a string. It leaves the image URL as plain text.

    + +$string = strip_image_tags($string); + + +

    encode_php_tags()

    + +

    This is a security function that converts PHP tags to entities. Note: If you use the XSS filtering function it does this automatically.

    + +$string = encode_php_tags($string); + + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 05f536e9..e81fceb8 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -1,204 +1,204 @@ - - - - - -Smiley Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Smiley Helper

    - -

    The Smiley Helper file contains functions that let you manage smileys (emoticons).

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('smiley'); - -

    Overview

    - -

    The Smiley helper has a renderer that takes plain text simileys, like :-) and turns -them into a image representation, like smile!

    - -

    It also lets you display a set of smiley images that when clicked will be inserted into a form field. -For example, if you have a blog that allows user commenting you can show the smileys next to the comment form. -Your users can click a desired smiley and with the help of some JavaScript it will be placed into the form field.

    - - - -

    Clickable Smileys Tutorial

    - -

    Here is an example demonstrating how you might create a set of clickable smileys next to a form field. This example -requires that you first download and install the smiley images, then create a controller and the View as described.

    - -

    Important: Before you begin, please download the smiley images and put them in -a publicly accessible place on your server. This helper also assumes you have the smiley replacement array located at -application/config/smileys.php

    - - -

    The Controller

    - -

    In your application/controllers/ folder, create a file called smileys.php and place the code below in it.

    - -

    Important: Change the URL in the get_clickable_smileys() function below so that it points to -your smiley folder.

    - -

    You'll notice that in addition to the smiley helper we are using the Table Class.

    - - - -

    In your application/views/ folder, create a file called smiley_view.php and place this code in it:

    - - - - - -

    When you have created the above controller and view, load it by visiting http://www.your=site.com/index.php/smileys/

    - -

    Function Reference

    - - -

    get_clickable_smileys()

    - -

    Returns an array containing your smiley images wrapped in a clickable link. You must supply the URL to your smiley folder -via the first parameter:

    - -$image_array = get_clickable_smileys("http://example.com/images/smileys/"); - - -

    js_insert_smiley()

    - -

    Generates the JavaScript that allows the images to be clicked and inserted into a form field. -The first parameter must contain the name of your form, the second parameter must contain the name of the -form field. This function is designed to be placed into the <head> area of your web page.

    - -<?php echo js_insert_smiley('blog', 'comments'); ?> - - -

    parse_smileys()

    - -

    Takes a string of text as input and replaces any contained plain text smileys into the image -equivalent. The first parameter must contain your string, the second must contain the URL to your smiley folder:

    - - - -$str = 'Here are some simileys: :-) ;-)'; - -$str = parse_smileys($str, "http://example.com/images/smileys/"); - -echo $str; - -
    - - - - - - + + + + + +Smiley Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Smiley Helper

    + +

    The Smiley Helper file contains functions that let you manage smileys (emoticons).

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('smiley'); + +

    Overview

    + +

    The Smiley helper has a renderer that takes plain text simileys, like :-) and turns +them into a image representation, like smile!

    + +

    It also lets you display a set of smiley images that when clicked will be inserted into a form field. +For example, if you have a blog that allows user commenting you can show the smileys next to the comment form. +Your users can click a desired smiley and with the help of some JavaScript it will be placed into the form field.

    + + + +

    Clickable Smileys Tutorial

    + +

    Here is an example demonstrating how you might create a set of clickable smileys next to a form field. This example +requires that you first download and install the smiley images, then create a controller and the View as described.

    + +

    Important: Before you begin, please download the smiley images and put them in +a publicly accessible place on your server. This helper also assumes you have the smiley replacement array located at +application/config/smileys.php

    + + +

    The Controller

    + +

    In your application/controllers/ folder, create a file called smileys.php and place the code below in it.

    + +

    Important: Change the URL in the get_clickable_smileys() function below so that it points to +your smiley folder.

    + +

    You'll notice that in addition to the smiley helper we are using the Table Class.

    + + + +

    In your application/views/ folder, create a file called smiley_view.php and place this code in it:

    + + + + + +

    When you have created the above controller and view, load it by visiting http://www.your=site.com/index.php/smileys/

    + +

    Function Reference

    + + +

    get_clickable_smileys()

    + +

    Returns an array containing your smiley images wrapped in a clickable link. You must supply the URL to your smiley folder +via the first parameter:

    + +$image_array = get_clickable_smileys("http://example.com/images/smileys/"); + + +

    js_insert_smiley()

    + +

    Generates the JavaScript that allows the images to be clicked and inserted into a form field. +The first parameter must contain the name of your form, the second parameter must contain the name of the +form field. This function is designed to be placed into the <head> area of your web page.

    + +<?php echo js_insert_smiley('blog', 'comments'); ?> + + +

    parse_smileys()

    + +

    Takes a string of text as input and replaces any contained plain text smileys into the image +equivalent. The first parameter must contain your string, the second must contain the URL to your smiley folder:

    + + + +$str = 'Here are some simileys: :-) ;-)'; + +$str = parse_smileys($str, "http://example.com/images/smileys/"); + +echo $str; + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 67318e8c..06d13c3b 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -1,176 +1,176 @@ - - - - - -String Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    String Helper

    - -

    The String Helper file contains functions that assist in working with strings.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('string'); - -

    The following functions are available:

    - -

    random_string()

    - -

    Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes.

    - -

    The first parameter specifies the type of string, the second parameter specifies the length. The following choices are available:

    - - -
      -
    • alnum:  Alpha-numeric string with lower and uppercase characters.
      • -
    • numeric:  Numeric string.
      • -
    • nozero:  Numeric string with no zeros.
      • -
    • unique:  Encrypted with MD5 and uniqid(). Note: The length parameter is not available for this type. -Returns a fixed length 32 character string.
      • -
    - -

    Usage example:

    - -echo random_string('alnum', 16); - - -

    alternator()

    - -

    Allows two or more items to be alternated between, when cycling through a loop. Example:

    - -for ($i = 0; $i < 10; $i++)
    -{
    -    echo alternator('string one', 'string two');
    -}
    -     - -

    You can add as many parameters as you want, and with each iteration of your loop the next item will be returned.

    - -for ($i = 0; $i < 10; $i++)
    -{
    -    echo alternator('one', 'two', 'three', 'four', 'five');
    -}
    -     - -

    Note: To use multiple separate calls to this function simply call the function with no arguments to re-initialize.

    - - - -

    repeater()

    -

    Generates repeating copies of the data you submit. Example:

    -$string = "\n";
    -echo repeater($string, 30);     - -

    The above would generate 30 newlines.

    -

    reduce_double_slashes()

    -

    Converts double slashes in a string to a single slash, except those found in http://. Example:

    -$string = "http://example.com//index.php";
    -echo reduce_double_slashes($string); // results in "http://example.com/index.php"     -

    trim_slashes()

    -

    Removes any leading/trailing slashes from a string. Example:
    -
    - $string = "/this/that/theother/";
    -echo trim_slashes($string); // results in this/that/theother

    - - -

    reduce_multiples()

    -

    Reduces multiple instances of a particular character occuring directly after each other. Example:

    - -$string="Fred, Bill,, Joe, Jimmy";
    -$string=reduce_multiples($string,","); //results in "Fred, Bill, Joe, Jimmy" -     -

    The function accepts the following parameters: -reduce_multiples(string: text to search in, string: character to reduce, boolean: whether to remove the character from the front and end of the string) - -The first parameter contains the string in which you want to reduce the multiplies. The second parameter contains the character you want to have reduced. -The third parameter is FALSE by default; if set to TRUE it will remove occurences of the character at the beginning and the end of the string. Example: - - -$string=",Fred, Bill,, Joe, Jimmy,";
    -$string=reduce_multiples($string, ", ", TRUE); //results in "Fred, Bill, Joe, Jimmy" -     -

    - -

    quotes_to_entities()

    -

    Converts single and double quotes in a string to the corresponding HTML entities. Example:

    -$string="Joe's \"dinner\"";
    -$string=quotes_to_entities($string); //results in "Joe&#39;s &quot;dinner&quot;" -     - -

    strip_quotes()

    -

    Removes single and double quotes from a string. Example:

    -$string="Joe's \"dinner\"";
    -$string=strip_quotes($string); //results in "Joes dinner" -     - -
    - - - - - - + + + + + +String Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    String Helper

    + +

    The String Helper file contains functions that assist in working with strings.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('string'); + +

    The following functions are available:

    + +

    random_string()

    + +

    Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes.

    + +

    The first parameter specifies the type of string, the second parameter specifies the length. The following choices are available:

    + + +
      +
    • alnum:  Alpha-numeric string with lower and uppercase characters.
      • +
    • numeric:  Numeric string.
      • +
    • nozero:  Numeric string with no zeros.
      • +
    • unique:  Encrypted with MD5 and uniqid(). Note: The length parameter is not available for this type. +Returns a fixed length 32 character string.
      • +
    + +

    Usage example:

    + +echo random_string('alnum', 16); + + +

    alternator()

    + +

    Allows two or more items to be alternated between, when cycling through a loop. Example:

    + +for ($i = 0; $i < 10; $i++)
    +{
    +    echo alternator('string one', 'string two');
    +}
    +     + +

    You can add as many parameters as you want, and with each iteration of your loop the next item will be returned.

    + +for ($i = 0; $i < 10; $i++)
    +{
    +    echo alternator('one', 'two', 'three', 'four', 'five');
    +}
    +     + +

    Note: To use multiple separate calls to this function simply call the function with no arguments to re-initialize.

    + + + +

    repeater()

    +

    Generates repeating copies of the data you submit. Example:

    +$string = "\n";
    +echo repeater($string, 30);     + +

    The above would generate 30 newlines.

    +

    reduce_double_slashes()

    +

    Converts double slashes in a string to a single slash, except those found in http://. Example:

    +$string = "http://example.com//index.php";
    +echo reduce_double_slashes($string); // results in "http://example.com/index.php"     +

    trim_slashes()

    +

    Removes any leading/trailing slashes from a string. Example:
    +
    + $string = "/this/that/theother/";
    +echo trim_slashes($string); // results in this/that/theother

    + + +

    reduce_multiples()

    +

    Reduces multiple instances of a particular character occuring directly after each other. Example:

    + +$string="Fred, Bill,, Joe, Jimmy";
    +$string=reduce_multiples($string,","); //results in "Fred, Bill, Joe, Jimmy" +     +

    The function accepts the following parameters: +reduce_multiples(string: text to search in, string: character to reduce, boolean: whether to remove the character from the front and end of the string) + +The first parameter contains the string in which you want to reduce the multiplies. The second parameter contains the character you want to have reduced. +The third parameter is FALSE by default; if set to TRUE it will remove occurences of the character at the beginning and the end of the string. Example: + + +$string=",Fred, Bill,, Joe, Jimmy,";
    +$string=reduce_multiples($string, ", ", TRUE); //results in "Fred, Bill, Joe, Jimmy" +     +

    + +

    quotes_to_entities()

    +

    Converts single and double quotes in a string to the corresponding HTML entities. Example:

    +$string="Joe's \"dinner\"";
    +$string=quotes_to_entities($string); //results in "Joe&#39;s &quot;dinner&quot;" +     + +

    strip_quotes()

    +

    Removes single and double quotes from a string. Example:

    +$string="Joe's \"dinner\"";
    +$string=strip_quotes($string); //results in "Joes dinner" +     + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 71047981..16d16fc9 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -1,192 +1,192 @@ - - - - - -Text Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Text Helper

    - -

    The Text Helper file contains functions that assist in working with text.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('text'); - -

    The following functions are available:

    - - -

    word_limiter()

    - -

    Truncates a string to the number of words specified. Example:

    - - -$string = "Here is a nice text string consisting of eleven words.";
    -
    -$string = word_limiter($string, 4);

    - -// Returns: Here is a nice… -     - -

    The third parameter is an optional suffix added to the string. By default it adds an ellipsis.

    - - -

    character_limiter()

    - -

    Truncates a string to the number of characters specified. It maintains the integrity -of words so the character count may be slightly more or less then what you specify. Example:

    - - -$string = "Here is a nice text string consisting of eleven words.";
    -
    -$string = character_limiter($string, 20);

    - -// Returns: Here is a nice text string… -     - -

    The third parameter is an optional suffix added to the string, if undeclared this helper uses an ellipsis.

    - - - -

    ascii_to_entities()

    - -

    Converts ASCII values to character entities, including high ASCII and MS Word characters that can cause problems when used in a web page, -so that they can be shown consistently regardless of browser settings or stored reliably in a database. -There is some dependence on your server's supported character sets, so it may not be 100% reliable in all cases, but for the most -part it should correctly identify characters outside the normal range (like accented characters). Example:

    - -$string = ascii_to_entities($string); - - -

    entities_to_ascii()

    - -

    This function does the opposite of the previous one; it turns character entities back into ASCII.

    - - -

    word_censor()

    - -

    Enables you to censor words within a text string. The first parameter will contain the original string. The -second will contain an array of words which you disallow. The third (optional) parameter can contain a replacement value -for the words. If not specified they are replaced with pound signs: ####. Example:

    - - -$disallowed = array('darn', 'shucks', 'golly', 'phooey');
    -
    -$string = word_censor($string, $disallowed, 'Beep!');     - - -

    highlight_code()

    - -

    Colorizes a string of code (PHP, HTML, etc.). Example:

    - -$string = highlight_code($string); - -

    The function uses PHP's highlight_string() function, so the colors used are the ones specified in your php.ini file.

    - - -

    highlight_phrase()

    - -

    Will highlight a phrase within a text string. The first parameter will contain the original string, the second will -contain the phrase you wish to highlight. The third and fourth parameters will contain the opening/closing HTML tags -you would like the phrase wrapped in. Example:

    - - -$string = "Here is a nice text string about nothing in particular.";
    -
    -$string = highlight_phrase($string, "nice text", '<span style="color:#990000">', '</span>'); -     - -

    The above text returns:

    - -

    Here is a nice text string about nothing in particular.

    - - - -

    word_wrap()

    - -

    Wraps text at the specified character count while maintaining complete words. Example:

    - -$string = "Here is a simple string of text that will help us demonstrate this function.";
    -
    -echo word_wrap($string, 25);
    -
    -// Would produce:
    -
    -Here is a simple string
    -of text that will help
    -us demonstrate this
    -function     - - - - -
    - - - - - - + + + + + +Text Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Text Helper

    + +

    The Text Helper file contains functions that assist in working with text.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('text'); + +

    The following functions are available:

    + + +

    word_limiter()

    + +

    Truncates a string to the number of words specified. Example:

    + + +$string = "Here is a nice text string consisting of eleven words.";
    +
    +$string = word_limiter($string, 4);

    + +// Returns: Here is a nice… +     + +

    The third parameter is an optional suffix added to the string. By default it adds an ellipsis.

    + + +

    character_limiter()

    + +

    Truncates a string to the number of characters specified. It maintains the integrity +of words so the character count may be slightly more or less then what you specify. Example:

    + + +$string = "Here is a nice text string consisting of eleven words.";
    +
    +$string = character_limiter($string, 20);

    + +// Returns: Here is a nice text string… +     + +

    The third parameter is an optional suffix added to the string, if undeclared this helper uses an ellipsis.

    + + + +

    ascii_to_entities()

    + +

    Converts ASCII values to character entities, including high ASCII and MS Word characters that can cause problems when used in a web page, +so that they can be shown consistently regardless of browser settings or stored reliably in a database. +There is some dependence on your server's supported character sets, so it may not be 100% reliable in all cases, but for the most +part it should correctly identify characters outside the normal range (like accented characters). Example:

    + +$string = ascii_to_entities($string); + + +

    entities_to_ascii()

    + +

    This function does the opposite of the previous one; it turns character entities back into ASCII.

    + + +

    word_censor()

    + +

    Enables you to censor words within a text string. The first parameter will contain the original string. The +second will contain an array of words which you disallow. The third (optional) parameter can contain a replacement value +for the words. If not specified they are replaced with pound signs: ####. Example:

    + + +$disallowed = array('darn', 'shucks', 'golly', 'phooey');
    +
    +$string = word_censor($string, $disallowed, 'Beep!');     + + +

    highlight_code()

    + +

    Colorizes a string of code (PHP, HTML, etc.). Example:

    + +$string = highlight_code($string); + +

    The function uses PHP's highlight_string() function, so the colors used are the ones specified in your php.ini file.

    + + +

    highlight_phrase()

    + +

    Will highlight a phrase within a text string. The first parameter will contain the original string, the second will +contain the phrase you wish to highlight. The third and fourth parameters will contain the opening/closing HTML tags +you would like the phrase wrapped in. Example:

    + + +$string = "Here is a nice text string about nothing in particular.";
    +
    +$string = highlight_phrase($string, "nice text", '<span style="color:#990000">', '</span>'); +     + +

    The above text returns:

    + +

    Here is a nice text string about nothing in particular.

    + + + +

    word_wrap()

    + +

    Wraps text at the specified character count while maintaining complete words. Example:

    + +$string = "Here is a simple string of text that will help us demonstrate this function.";
    +
    +echo word_wrap($string, 25);
    +
    +// Would produce:
    +
    +Here is a simple string
    +of text that will help
    +us demonstrate this
    +function     + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index d72cdd90..b64f5436 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -1,112 +1,112 @@ - - - - - -Typography Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Typography Helper

    - -

    The Typography Helper file contains functions that help your format text in semantically relevant ways.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('typography'); - -

    The following functions are available:

    - - -

    auto_typography()

    - -

    Formats text so that it is semantically and typographically correct HTML. Please see the Typography Class for more info.

    - -

    Usage example:

    - -$string = auto_typography($string); - -

    Note: Typographic formatting can be processor intensive, particularly if you have a lot of content being formatted. -If you choose to use this function you may want to consider -caching your pages.

    - - -

    nl2br_except_pre()

    - -

    Converts newlines to <br /> tags unless they appear within <pre> tags. -This function is identical to the native PHP nl2br() function, except that it ignores <pre> tags.

    - -

    Usage example:

    - -$string = nl2br_except_pre($string); - - - -
    - - - - - - + + + + + +Typography Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Typography Helper

    + +

    The Typography Helper file contains functions that help your format text in semantically relevant ways.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('typography'); + +

    The following functions are available:

    + + +

    auto_typography()

    + +

    Formats text so that it is semantically and typographically correct HTML. Please see the Typography Class for more info.

    + +

    Usage example:

    + +$string = auto_typography($string); + +

    Note: Typographic formatting can be processor intensive, particularly if you have a lot of content being formatted. +If you choose to use this function you may want to consider +caching your pages.

    + + +

    nl2br_except_pre()

    + +

    Converts newlines to <br /> tags unless they appear within <pre> tags. +This function is identical to the native PHP nl2br() function, except that it ignores <pre> tags.

    + +

    Usage example:

    + +$string = nl2br_except_pre($string); + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index dcf02082..53fde2c3 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -1,281 +1,281 @@ - - - - - -URL Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    URL Helper

    - -

    The URL Helper file contains functions that assist in working with URLs.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('url'); - -

    The following functions are available:

    - -

    site_url()

    - -

    Returns your site URL, as specified in your config file. The index.php file (or whatever you have set as your -site index_page in your config file) will be added to the URL, as will any URI segments you pass to the function.

    - -

    You are encouraged to use this function any time you need to generate a local URL so that your pages become more portable -in the event your URL changes.

    - -

    Segments can be optionally passed to the function as a string or an array. Here is a string example:

    - -echo site_url("news/local/123"); - -

    The above example would return something like: http://example.com/index.php/news/local/123

    - -

    Here is an example of segments passed as an array:

    - - -$segments = array('news', 'local', '123');
    -
    -echo site_url($segments);     - - -

    base_url()

    -

    Returns your site base URL, as specified in your config file. Example:

    -echo base_url(); - - -

    current_url()

    -

    Returns the full URL (including segments) of the page being currently viewed.

    - - -

    uri_string()

    -

    Returns the URI segments of any page that contains this function. For example, if your URL was this:

    -http://some-site.com/blog/comments/123 - -

    The function would return:

    -blog/comments/123 - - -

    index_page()

    -

    Returns your site "index" page, as specified in your config file. Example:

    -echo index_page(); - - - -

    anchor()

    - -

    Creates a standard HTML anchor link based on your local site URL:

    - -<a href="http://example.com">Click Here</a> - -

    The tag has three optional parameters:

    - -anchor(uri segments, text, attributes) - -

    The first parameter can contain any segments you wish appended to the URL. As with the site_url() function above, -segments can be a string or an array.

    - -

    Note:  If you are building links that are internal to your application do not include the base URL (http://...). This -will be added automatically from the information specified in your config file. Include only the URI segments you wish appended to the URL.

    - -

    The second segment is the text you would like the link to say. If you leave it blank, the URL will be used.

    - -

    The third parameter can contain a list of attributes you would like added to the link. The attributes can be a simple string or an associative array.

    - -

    Here are some examples:

    - -echo anchor('news/local/123', 'My News'); - -

    Would produce: <a href="http://example.com/index.php/news/local/123" title="My News">My News</a>

    - -echo anchor('news/local/123', 'My News', array('title' => 'The best news!')); - -

    Would produce: <a href="http://example.com/index.php/news/local/123" title="The best news!">My News</a>

    - - -

    anchor_popup()

    - -

    Nearly identical to the anchor() function except that it opens the URL in a new window. - -You can specify JavaScript window attributes in the third parameter to control how the window is opened. If -the third parameter is not set it will simply open a new window with your own browser settings. Here is an example -with attributes:

    - - - -$atts = array(
    -              'width'      => '800',
    -              'height'     => '600',
    -              'scrollbars' => 'yes',
    -              'status'     => 'yes',
    -              'resizable'  => 'yes',
    -              'screenx'    => '0',
    -              'screeny'    => '0'
    -            );
    -
    -echo anchor_popup('news/local/123', 'Click Me!', $atts);     - -

    Note: The above attributes are the function defaults so you only need to set the ones that are different from what you need. -If you want the function to use all of its defaults simply pass an empty array in the third parameter:

    - -echo anchor_popup('news/local/123', 'Click Me!', array()); - - -

    mailto()

    - -

    Creates a standard HTML email link. Usage example:

    - -echo mailto('me@my-site.com', 'Click Here to Contact Me'); - -

    As with the anchor() tab above, you can set attributes using the third parameter.

    - - -

    safe_mailto()

    - -

    Identical to the above function except it writes an obfuscated version of the mailto tag using ordinal numbers -written with JavaScript to help prevent the email address from being harvested by spam bots.

    - - -

    auto_link()

    - -

    Automatically turns URLs and email addresses contained in a string into links. Example:

    - -$string = auto_link($string); - -

    The second parameter determines whether URLs and emails are converted or just one or the other. Default behavior is both -if the parameter is not specified. Email links are encoded as safe_mailto() as shown above.

    - -

    Converts only URLs:

    -$string = auto_link($string, 'url'); - -

    Converts only Email addresses:

    -$string = auto_link($string, 'email'); - -

    The third parameter determines whether links are shown in a new window. The value can be TRUE or FALSE (boolean):

    -$string = auto_link($string, 'both', TRUE); - - -

    url_title()

    -

    Takes a string as input and creates a human-friendly URL string. This is useful if, for example, you have a blog -in which you'd like to use the title of your entries in the URL. Example:

    - -$title = "What's wrong with CSS?";
    -
    -$url_title = url_title($title);
    -
    -// Produces: whats-wrong-with-css -     - - -

    The second parameter determines the word delimiter. By default dashes are used. Options are: dash, or underscore:

    - -$title = "What's wrong with CSS?";
    -
    -$url_title = url_title($title, 'underscore');
    -
    -// Produces: whats_wrong_with_css -     - - -

    prep_url()

    -

    This function will add http:// in the event it is missing from a URL. Pass the URL string to the function like this:

    - -$url = "example.com";

    -$url = prep_url($url);     - - - - -

    redirect()

    - -

    Does a "header redirect" to the local URI specified. Just like other functions in this helper, this one is designed -to redirect to a local URL within your site. You will not specify the full site URL, but rather simply the URI segments -to the controller you want to direct to. The function will build the URL based on your config file values.

    - -

    The optional second parameter allows you to choose between the "location" -method (default) or the "refresh" method. Location is faster, but on Windows servers it can sometimes be a problem. The optional third parameter allows you to send a specific HTTP Response Code - this could be used for example to create 301 redirects for search engine purposes. The default Response Code is 302. The third parameter is only available with 'location' redirects, and not 'refresh'. Examples:

    - -if ($logged_in == FALSE)
    -{
    -     redirect('/login/form/', 'refresh');
    -}
    -
    -// with 301 redirect
    -redirect('/article/13', 'location', 301);     - -

    Note: In order for this function to work it must be used before anything is outputted -to the browser since it utilizes server headers.
    -Note: For very fine grained control over headers, you should use the Output Library's set_header() function.

    - - - - - - -
    - - - - - - + + + + + +URL Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    URL Helper

    + +

    The URL Helper file contains functions that assist in working with URLs.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('url'); + +

    The following functions are available:

    + +

    site_url()

    + +

    Returns your site URL, as specified in your config file. The index.php file (or whatever you have set as your +site index_page in your config file) will be added to the URL, as will any URI segments you pass to the function.

    + +

    You are encouraged to use this function any time you need to generate a local URL so that your pages become more portable +in the event your URL changes.

    + +

    Segments can be optionally passed to the function as a string or an array. Here is a string example:

    + +echo site_url("news/local/123"); + +

    The above example would return something like: http://example.com/index.php/news/local/123

    + +

    Here is an example of segments passed as an array:

    + + +$segments = array('news', 'local', '123');
    +
    +echo site_url($segments);     + + +

    base_url()

    +

    Returns your site base URL, as specified in your config file. Example:

    +echo base_url(); + + +

    current_url()

    +

    Returns the full URL (including segments) of the page being currently viewed.

    + + +

    uri_string()

    +

    Returns the URI segments of any page that contains this function. For example, if your URL was this:

    +http://some-site.com/blog/comments/123 + +

    The function would return:

    +blog/comments/123 + + +

    index_page()

    +

    Returns your site "index" page, as specified in your config file. Example:

    +echo index_page(); + + + +

    anchor()

    + +

    Creates a standard HTML anchor link based on your local site URL:

    + +<a href="http://example.com">Click Here</a> + +

    The tag has three optional parameters:

    + +anchor(uri segments, text, attributes) + +

    The first parameter can contain any segments you wish appended to the URL. As with the site_url() function above, +segments can be a string or an array.

    + +

    Note:  If you are building links that are internal to your application do not include the base URL (http://...). This +will be added automatically from the information specified in your config file. Include only the URI segments you wish appended to the URL.

    + +

    The second segment is the text you would like the link to say. If you leave it blank, the URL will be used.

    + +

    The third parameter can contain a list of attributes you would like added to the link. The attributes can be a simple string or an associative array.

    + +

    Here are some examples:

    + +echo anchor('news/local/123', 'My News'); + +

    Would produce: <a href="http://example.com/index.php/news/local/123" title="My News">My News</a>

    + +echo anchor('news/local/123', 'My News', array('title' => 'The best news!')); + +

    Would produce: <a href="http://example.com/index.php/news/local/123" title="The best news!">My News</a>

    + + +

    anchor_popup()

    + +

    Nearly identical to the anchor() function except that it opens the URL in a new window. + +You can specify JavaScript window attributes in the third parameter to control how the window is opened. If +the third parameter is not set it will simply open a new window with your own browser settings. Here is an example +with attributes:

    + + + +$atts = array(
    +              'width'      => '800',
    +              'height'     => '600',
    +              'scrollbars' => 'yes',
    +              'status'     => 'yes',
    +              'resizable'  => 'yes',
    +              'screenx'    => '0',
    +              'screeny'    => '0'
    +            );
    +
    +echo anchor_popup('news/local/123', 'Click Me!', $atts);     + +

    Note: The above attributes are the function defaults so you only need to set the ones that are different from what you need. +If you want the function to use all of its defaults simply pass an empty array in the third parameter:

    + +echo anchor_popup('news/local/123', 'Click Me!', array()); + + +

    mailto()

    + +

    Creates a standard HTML email link. Usage example:

    + +echo mailto('me@my-site.com', 'Click Here to Contact Me'); + +

    As with the anchor() tab above, you can set attributes using the third parameter.

    + + +

    safe_mailto()

    + +

    Identical to the above function except it writes an obfuscated version of the mailto tag using ordinal numbers +written with JavaScript to help prevent the email address from being harvested by spam bots.

    + + +

    auto_link()

    + +

    Automatically turns URLs and email addresses contained in a string into links. Example:

    + +$string = auto_link($string); + +

    The second parameter determines whether URLs and emails are converted or just one or the other. Default behavior is both +if the parameter is not specified. Email links are encoded as safe_mailto() as shown above.

    + +

    Converts only URLs:

    +$string = auto_link($string, 'url'); + +

    Converts only Email addresses:

    +$string = auto_link($string, 'email'); + +

    The third parameter determines whether links are shown in a new window. The value can be TRUE or FALSE (boolean):

    +$string = auto_link($string, 'both', TRUE); + + +

    url_title()

    +

    Takes a string as input and creates a human-friendly URL string. This is useful if, for example, you have a blog +in which you'd like to use the title of your entries in the URL. Example:

    + +$title = "What's wrong with CSS?";
    +
    +$url_title = url_title($title);
    +
    +// Produces: whats-wrong-with-css +     + + +

    The second parameter determines the word delimiter. By default dashes are used. Options are: dash, or underscore:

    + +$title = "What's wrong with CSS?";
    +
    +$url_title = url_title($title, 'underscore');
    +
    +// Produces: whats_wrong_with_css +     + + +

    prep_url()

    +

    This function will add http:// in the event it is missing from a URL. Pass the URL string to the function like this:

    + +$url = "example.com";

    +$url = prep_url($url);     + + + + +

    redirect()

    + +

    Does a "header redirect" to the local URI specified. Just like other functions in this helper, this one is designed +to redirect to a local URL within your site. You will not specify the full site URL, but rather simply the URI segments +to the controller you want to direct to. The function will build the URL based on your config file values.

    + +

    The optional second parameter allows you to choose between the "location" +method (default) or the "refresh" method. Location is faster, but on Windows servers it can sometimes be a problem. The optional third parameter allows you to send a specific HTTP Response Code - this could be used for example to create 301 redirects for search engine purposes. The default Response Code is 302. The third parameter is only available with 'location' redirects, and not 'refresh'. Examples:

    + +if ($logged_in == FALSE)
    +{
    +     redirect('/login/form/', 'refresh');
    +}
    +
    +// with 301 redirect
    +redirect('/article/13', 'location', 301);     + +

    Note: In order for this function to work it must be used before anything is outputted +to the browser since it utilizes server headers.
    +Note: For very fine grained control over headers, you should use the Output Library's set_header() function.

    + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 6971115e..17cdd247 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -1,105 +1,105 @@ - - - - - -XML Helper : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    XML Helper

    - -

    The XML Helper file contains functions that assist in working with XML data.

    - - -

    Loading this Helper

    - -

    This helper is loaded using the following code:

    -$this->load->helper('xml'); - -

    The following functions are available:

    - -

    xml_convert('string')

    - -

    Takes a string as input and converts the following reserved XML characters to entities:

    - -

    -Ampersands: &
    -Less then and greater than characters: < >
    -Single and double quotes: '  "
    -Dashes: -

    - -

    This function ignores ampersands if they are part of existing character entities. Example:

    - -$string = xml_convert($string); - - - - - - -
    - - - - - - + + + + + +XML Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    XML Helper

    + +

    The XML Helper file contains functions that assist in working with XML data.

    + + +

    Loading this Helper

    + +

    This helper is loaded using the following code:

    +$this->load->helper('xml'); + +

    The following functions are available:

    + +

    xml_convert('string')

    + +

    Takes a string as input and converts the following reserved XML characters to entities:

    + +

    +Ampersands: &
    +Less then and greater than characters: < >
    +Single and double quotes: '  "
    +Dashes: -

    + +

    This function ignores ampersands if they are part of existing character entities. Example:

    + +$string = xml_convert($string); + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/index.html b/user_guide/index.html index fc1f7204..c64981c3 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -1,99 +1,99 @@ - - - - - -Welcome to CodeIgniter : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - -
    - - - -
    - -
    CodeIgniter
    - - - -
    - - - -

    Welcome to CodeIgniter

    - -

    CodeIgniter is an Application Development Framework - a toolkit - for people who build web sites using PHP. -Its goal is to enable you to develop projects much faster than you could if you were writing code -from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and -logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by -minimizing the amount of code needed for a given task.

    - - -

    Who is CodeIgniter For?

    - -

    CodeIgniter is right for you if:

    - -
      -
    • You want a framework with a small footprint.
      • -
    • You need exceptional performance.
      • -
    • You need broad compatibility with standard hosting accounts that run a variety of PHP versions and configurations.
      • -
    • You want a framework that requires nearly zero configuration.
      • -
    • You want a framework that does not require you to use the command line.
      • -
    • You want a framework that does not require you to adhere to restrictive coding rules.
      • -
    • You are not interested in large-scale monolithic libraries like PEAR.
      • -
    • You do not want to be forced to learn a templating language (although a template parser is optionally available if you desire one).
      • -
    • You eschew complexity, favoring simple solutions.
      • -
    • You need clear, thorough documentation.
      • -
    - - -
    - - - - - - - - + + + + + +Welcome to CodeIgniter : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + +
    + + + +
    + +
    CodeIgniter
    + + + +
    + + + +

    Welcome to CodeIgniter

    + +

    CodeIgniter is an Application Development Framework - a toolkit - for people who build web sites using PHP. +Its goal is to enable you to develop projects much faster than you could if you were writing code +from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and +logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by +minimizing the amount of code needed for a given task.

    + + +

    Who is CodeIgniter For?

    + +

    CodeIgniter is right for you if:

    + +
      +
    • You want a framework with a small footprint.
      • +
    • You need exceptional performance.
      • +
    • You need broad compatibility with standard hosting accounts that run a variety of PHP versions and configurations.
      • +
    • You want a framework that requires nearly zero configuration.
      • +
    • You want a framework that does not require you to use the command line.
      • +
    • You want a framework that does not require you to adhere to restrictive coding rules.
      • +
    • You are not interested in large-scale monolithic libraries like PEAR.
      • +
    • You do not want to be forced to learn a templating language (although a template parser is optionally available if you desire one).
      • +
    • You eschew complexity, favoring simple solutions.
      • +
    • You need clear, thorough documentation.
      • +
    + + +
    + + + + + + + + \ No newline at end of file diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 3d4e7248..559cabd8 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -1,103 +1,103 @@ - - - - - -Downloading CodeIgniter : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Downloading CodeIgniter

    - - - - - - -

    Subversion Server

    -

    Subversion is a version control system.

    -

    Public subversion access is now available via http://dev.ellislab.com/svn/CodeIgniter/trunk please note that while every effort is made to keep this codebase functional, we cannot guarantee the functionality of code taken from the repository.

    -

    Beginning with version 1.6.1, version snapshots (tags) are also available via the Subversion server via http://dev.ellislab.com/svn/CodeIgniter/tags.

    -
    - - - - - - + + + + + +Downloading CodeIgniter : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Downloading CodeIgniter

    + + + + + + +

    Subversion Server

    +

    Subversion is a version control system.

    +

    Public subversion access is now available via http://dev.ellislab.com/svn/CodeIgniter/trunk please note that while every effort is made to keep this codebase functional, we cannot guarantee the functionality of code taken from the repository.

    +

    Beginning with version 1.6.1, version snapshots (tags) are also available via the Subversion server via http://dev.ellislab.com/svn/CodeIgniter/tags.

    +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 701cdac7..01d4db7c 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -1,97 +1,97 @@ - - - - - -Installation Instructions : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Installation Instructions

    - -

    CodeIgniter is installed in four steps:

    - -
      -
    1. Unzip the package.
      2. -
    2. Upload the CodeIgniter folders and files to your server. Normally the index.php file will be at your root.
      3. -
    3. Open the application/config/config.php file with a text editor and set your base URL. If you intend to use encryption or sessions, set your encryption key.
      4. -
    4. If you intend to use a database, open the application/config/database.php file with a text editor and set your database settings.
      5. -
    - -

    If you wish to increase security by hiding the location of your CodeIgniter files you can rename the system folder -to something more private. If you do rename it, you must open your main index.php file and set the $system_folder -variable at the top of the page with the new name you've chosen.

    - -

    That's it!

    - -

    If you're new to CodeIgniter, please read the Getting Started section of the User Guide to begin learning how -to build dynamic PHP applications. Enjoy!

    - - - -
    - - - - - - + + + + + +Installation Instructions : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Installation Instructions

    + +

    CodeIgniter is installed in four steps:

    + +
      +
    1. Unzip the package.
      2. +
    2. Upload the CodeIgniter folders and files to your server. Normally the index.php file will be at your root.
      3. +
    3. Open the application/config/config.php file with a text editor and set your base URL. If you intend to use encryption or sessions, set your encryption key.
      4. +
    4. If you intend to use a database, open the application/config/database.php file with a text editor and set your database settings.
      5. +
    + +

    If you wish to increase security by hiding the location of your CodeIgniter files you can rename the system folder +to something more private. If you do rename it, you must open your main index.php file and set the $system_folder +variable at the top of the page with the new name you've chosen.

    + +

    That's it!

    + +

    If you're new to CodeIgniter, please read the Getting Started section of the User Guide to begin learning how +to build dynamic PHP applications. Enjoy!

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index abdf5194..3383662d 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -1,90 +1,90 @@ - - - - - -Troubleshooting : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Troubleshooting

    - -

    If you find that no matter what you put in your URL only your default page is loading, it might be that your server -does not support the PATH_INFO variable needed to serve search-engine friendly URLs. - -As a first step, open your application/config/config.php file and look for the URI Protocol -information. It will recommend that you try a couple alternate settings. If it still doesn't work after you've tried this you'll need -to force CodeIgniter to add a question mark to your URLs. To do this open your application/config/config.php file and change this:

    - -$config['index_page'] = "index.php"; - -

    To this:

    - -$config['index_page'] = "index.php?"; - - -
    - - - - - - + + + + + +Troubleshooting : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Troubleshooting

    + +

    If you find that no matter what you put in your URL only your default page is loading, it might be that your server +does not support the PATH_INFO variable needed to serve search-engine friendly URLs. + +As a first step, open your application/config/config.php file and look for the URI Protocol +information. It will recommend that you try a couple alternate settings. If it still doesn't work after you've tried this you'll need +to force CodeIgniter to add a question mark to your URLs. To do this open your application/config/config.php file and change this:

    + +$config['index_page'] = "index.php"; + +

    To this:

    + +$config['index_page'] = "index.php?"; + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index e77d325e..69349ec4 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -1,92 +1,92 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading From Beta 1.0 to Final 1.2

    - -

    To upgrade to Version 1.2 please replace the following directories with the new versions:

    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - -
      -
    • drivers
      • -
    • helpers
      • -
    • init
      • -
    • language
      • -
    • libraries
      • -
    • plugins
      • -
    • scaffolding
      • -
    - -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading From Beta 1.0 to Final 1.2

    + +

    To upgrade to Version 1.2 please replace the following directories with the new versions:

    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +
      +
    • drivers
      • +
    • helpers
      • +
    • init
      • +
    • language
      • +
    • libraries
      • +
    • plugins
      • +
    • scaffolding
      • +
    + +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index c2739777..9c83c185 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -1,203 +1,203 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.2 to 1.3

    - -

    Note: The instructions on this page assume you are running version 1.2. If you -have not upgraded to that version please do so first.

    - - -

    Before performing an update you should take your site offline by replacing the index.php file -with a static one.

    - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace the following directories in your "system" folder with the new versions:

    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - -
      -
    • application/models/   (new for 1.3)
      • -
    • codeigniter   (new for 1.3)
      • -
    • drivers
      • -
    • helpers
      • -
    • init
      • -
    • language
      • -
    • libraries
      • -
    • plugins
      • -
    • scaffolding
      • -
    - - -

    Step 2: Update your error files

    - -

    Version 1.3 contains two new error templates located in application/errors, and for naming consistency the other error templates have -been renamed.

    - -

    If you have not customized any of the error templates simply -replace this folder:

    - -
      -
    • application/errors/
      • -
    - -

    If you have customized your error templates, rename them as follows:

    - - -
      -
    • 404.php   =  error_404.php
      • -
    • error.php   =  error_general.php
      • -
    • error_db.php   (new)
      • -
    • error_php.php   (new)
      • -
    - - -

    Step 3: Update your index.php file

    - -

    Please open your main index.php file (located at your root). At the very bottom of the file, change this:

    - -require_once BASEPATH.'libraries/Front_controller'.EXT; - -

    To this:

    - -require_once BASEPATH.'codeigniter/CodeIgniter'.EXT; - - -

    Step 4: Update your config.php file

    - -

    Open your application/config/config.php file and add these new items:

    - -
    -/*
-|------------------------------------------------
-| URL suffix
-|------------------------------------------------
-|
-| This option allows you to add a suffix to all URLs.
-| For example, if a URL is this:
-|
-| example.com/index.php/products/view/shoes
-|
-| You can optionally add a suffix, like ".html",
-| making the page appear to be of a certain type:
-|
-| example.com/index.php/products/view/shoes.html
-|
-*/
-$config['url_suffix'] = "";
-
-
-/*
-|------------------------------------------------
-| Enable Query Strings
-|------------------------------------------------
-|
-| By default CodeIgniter uses search-engine and
-| human-friendly segment based URLs:
-|
-| example.com/who/what/where/
-|
-| You can optionally enable standard query string
-| based URLs:
-|
-| example.com?who=me&what=something&where=here
-|
-| Options are: TRUE or FALSE (boolean)
-|
-| The two other items let you set the query string "words"
-| that will invoke your controllers and functions:
-| example.com/index.php?c=controller&m=function
-|
-*/
-$config['enable_query_strings'] = FALSE;
-$config['controller_trigger'] = 'c';
-$config['function_trigger'] = 'm';
-
    - - -

    Step 5: Update your database.php file

    - -

    Open your application/config/database.php file and add these new items:

    - -
    -$db['default']['dbprefix'] = "";
-$db['default']['active_r'] = TRUE;
-
    - - -

    Step 6: Update your user guide

    - -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.2 to 1.3

    + +

    Note: The instructions on this page assume you are running version 1.2. If you +have not upgraded to that version please do so first.

    + + +

    Before performing an update you should take your site offline by replacing the index.php file +with a static one.

    + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace the following directories in your "system" folder with the new versions:

    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +
      +
    • application/models/   (new for 1.3)
      • +
    • codeigniter   (new for 1.3)
      • +
    • drivers
      • +
    • helpers
      • +
    • init
      • +
    • language
      • +
    • libraries
      • +
    • plugins
      • +
    • scaffolding
      • +
    + + +

    Step 2: Update your error files

    + +

    Version 1.3 contains two new error templates located in application/errors, and for naming consistency the other error templates have +been renamed.

    + +

    If you have not customized any of the error templates simply +replace this folder:

    + +
      +
    • application/errors/
      • +
    + +

    If you have customized your error templates, rename them as follows:

    + + +
      +
    • 404.php   =  error_404.php
      • +
    • error.php   =  error_general.php
      • +
    • error_db.php   (new)
      • +
    • error_php.php   (new)
      • +
    + + +

    Step 3: Update your index.php file

    + +

    Please open your main index.php file (located at your root). At the very bottom of the file, change this:

    + +require_once BASEPATH.'libraries/Front_controller'.EXT; + +

    To this:

    + +require_once BASEPATH.'codeigniter/CodeIgniter'.EXT; + + +

    Step 4: Update your config.php file

    + +

    Open your application/config/config.php file and add these new items:

    + +
    +/*
+|------------------------------------------------
+| URL suffix
+|------------------------------------------------
+|
+| This option allows you to add a suffix to all URLs.
+| For example, if a URL is this:
+|
+| example.com/index.php/products/view/shoes
+|
+| You can optionally add a suffix, like ".html",
+| making the page appear to be of a certain type:
+|
+| example.com/index.php/products/view/shoes.html
+|
+*/
+$config['url_suffix'] = "";
+
+
+/*
+|------------------------------------------------
+| Enable Query Strings
+|------------------------------------------------
+|
+| By default CodeIgniter uses search-engine and
+| human-friendly segment based URLs:
+|
+| example.com/who/what/where/
+|
+| You can optionally enable standard query string
+| based URLs:
+|
+| example.com?who=me&what=something&where=here
+|
+| Options are: TRUE or FALSE (boolean)
+|
+| The two other items let you set the query string "words"
+| that will invoke your controllers and functions:
+| example.com/index.php?c=controller&m=function
+|
+*/
+$config['enable_query_strings'] = FALSE;
+$config['controller_trigger'] = 'c';
+$config['function_trigger'] = 'm';
+
    + + +

    Step 5: Update your database.php file

    + +

    Open your application/config/database.php file and add these new items:

    + +
    +$db['default']['dbprefix'] = "";
+$db['default']['active_r'] = TRUE;
+
    + + +

    Step 6: Update your user guide

    + +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 890e37dd..028faf2d 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -1,102 +1,102 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.3 to 1.3.1

    - -

    Note: The instructions on this page assume you are running version 1.3. If you -have not upgraded to that version please do so first.

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace the following directories in your "system" folder with the new versions:

    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - -
      -
    • drivers
      • -
    • init/init_unit_test.php (new for 1.3.1)
      • -
    • language/
      • -
    • libraries
      • -
    • scaffolding
      • -
    - - -

    Step 2: Update your user guide

    - -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.3 to 1.3.1

    + +

    Note: The instructions on this page assume you are running version 1.3. If you +have not upgraded to that version please do so first.

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace the following directories in your "system" folder with the new versions:

    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +
      +
    • drivers
      • +
    • init/init_unit_test.php (new for 1.3.1)
      • +
    • language/
      • +
    • libraries
      • +
    • scaffolding
      • +
    + + +

    Step 2: Update your user guide

    + +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 333d8ca9..1344a333 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -1,100 +1,100 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.3.1 to 1.3.2

    - -

    Note: The instructions on this page assume you are running version 1.3.1. If you -have not upgraded to that version please do so first.

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace the following directories in your "system" folder with the new versions:

    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - -
      -
    • drivers
      • -
    • init
      • -
    • libraries
      • -
    - - -

    Step 2: Update your user guide

    - -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.3.1 to 1.3.2

    + +

    Note: The instructions on this page assume you are running version 1.3.1. If you +have not upgraded to that version please do so first.

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace the following directories in your "system" folder with the new versions:

    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +
      +
    • drivers
      • +
    • init
      • +
    • libraries
      • +
    + + +

    Step 2: Update your user guide

    + +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 41c131bc..3944dd3e 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -1,112 +1,112 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.3.2 to 1.3.3

    - -

    Note: The instructions on this page assume you are running version 1.3.2. If you -have not upgraded to that version please do so first.

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace the following directories in your "system" folder with the new versions:

    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - -
      -
    • codeigniter
      • -
    • drivers
      • -
    • helpers
      • -
    • init
      • -
    • libraries
      • -
    - - -

    Step 2: Update your Models

    - -

    If you are NOT using CodeIgniter's Models feature disregard this step.

    - -

    As of version 1.3.3, CodeIgniter does not connect automatically to your database when a model is loaded. This -allows you greater flexibility in determining which databases you would like used with your models. If your application is not connecting -to your database prior to a model being loaded you will have to update your code. There are several options for connecting, -as described here.

    - - -

    Step 3: Update your user guide

    - -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.3.2 to 1.3.3

    + +

    Note: The instructions on this page assume you are running version 1.3.2. If you +have not upgraded to that version please do so first.

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace the following directories in your "system" folder with the new versions:

    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +
      +
    • codeigniter
      • +
    • drivers
      • +
    • helpers
      • +
    • init
      • +
    • libraries
      • +
    + + +

    Step 2: Update your Models

    + +

    If you are NOT using CodeIgniter's Models feature disregard this step.

    + +

    As of version 1.3.3, CodeIgniter does not connect automatically to your database when a model is loaded. This +allows you greater flexibility in determining which databases you would like used with your models. If your application is not connecting +to your database prior to a model being loaded you will have to update your code. There are several options for connecting, +as described here.

    + + +

    Step 3: Update your user guide

    + +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 1e593739..3d6d29ca 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -1,145 +1,145 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.3.3 to 1.4.0

    - -

    Note: The instructions on this page assume you are running version 1.3.3. If you -have not upgraded to that version please do so first.

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace the following directories in your "system" folder with the new versions:

    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - -
      -
    • application/config/hooks.php
      • -
    • application/config/mimes.php
      • -
    • codeigniter
      • -
    • drivers
      • -
    • helpers
      • -
    • init
      • -
    • language
      • -
    • libraries
      • -
    • scaffolding
      • -
    - - -

    Step 2: Update your config.php file

    - -

    Open your application/config/config.php file and add these new items:

    - -
    -
-/*
-|--------------------------------------------------------------------------
-| Enable/Disable System Hooks
-|--------------------------------------------------------------------------
-|
-| 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.
-|
-*/
-$config['enable_hooks'] = FALSE;
-
-
-/*
-|--------------------------------------------------------------------------
-| Allowed URL Characters
-|--------------------------------------------------------------------------
-|
-| This lets you specify which characters are permitted 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~%.:_-
-|
-| Leave blank to allow all characters -- but only if you are insane.
-|
-| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
-|
-*/
-$config['permitted_uri_chars'] = 'a-z 0-9~%.:_-';
-
    - - -

    Step 3: Update your user guide

    - -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.3.3 to 1.4.0

    + +

    Note: The instructions on this page assume you are running version 1.3.3. If you +have not upgraded to that version please do so first.

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace the following directories in your "system" folder with the new versions:

    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +
      +
    • application/config/hooks.php
      • +
    • application/config/mimes.php
      • +
    • codeigniter
      • +
    • drivers
      • +
    • helpers
      • +
    • init
      • +
    • language
      • +
    • libraries
      • +
    • scaffolding
      • +
    + + +

    Step 2: Update your config.php file

    + +

    Open your application/config/config.php file and add these new items:

    + +
    +
+/*
+|--------------------------------------------------------------------------
+| Enable/Disable System Hooks
+|--------------------------------------------------------------------------
+|
+| 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.
+|
+*/
+$config['enable_hooks'] = FALSE;
+
+
+/*
+|--------------------------------------------------------------------------
+| Allowed URL Characters
+|--------------------------------------------------------------------------
+|
+| This lets you specify which characters are permitted 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~%.:_-
+|
+| Leave blank to allow all characters -- but only if you are insane.
+|
+| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
+|
+*/
+$config['permitted_uri_chars'] = 'a-z 0-9~%.:_-';
+
    + + +

    Step 3: Update your user guide

    + +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index c1b667a8..182abbde 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -1,148 +1,148 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.4.0 to 1.4.1

    - -

    Note: The instructions on this page assume you are running version 1.4.0. If you -have not upgraded to that version please do so first.

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace the following directories in your "system" folder with the new versions:

    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - -
      -
    • codeigniter
      • -
    • drivers
      • -
    • helpers
      • -
    • libraries
      • -
    - - -

    Step 2: Update your config.php file

    - -

    Open your application/config/config.php file and add this new item:

    - -
    -
-/*
-|--------------------------------------------------------------------------
-| Output Compression
-|--------------------------------------------------------------------------
-|
-| 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
-| 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
-| 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.
-|
-*/
-$config['compress_output'] = FALSE;
-
-
    - - - -

    Step 3: Rename an Autoload Item

    - -

    Open the following file: application/config/autoload.php

    - -

    Find this array item:

    - -$autoload['core'] = array(); - -

    And rename it to this:

    - -$autoload['libraries'] = array(); - -

    This change was made to improve clarity since some users were not sure that their own libraries could be auto-loaded.

    - - - - - - -

    Step 4: Update your user guide

    - -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.4.0 to 1.4.1

    + +

    Note: The instructions on this page assume you are running version 1.4.0. If you +have not upgraded to that version please do so first.

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace the following directories in your "system" folder with the new versions:

    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +
      +
    • codeigniter
      • +
    • drivers
      • +
    • helpers
      • +
    • libraries
      • +
    + + +

    Step 2: Update your config.php file

    + +

    Open your application/config/config.php file and add this new item:

    + +
    +
+/*
+|--------------------------------------------------------------------------
+| Output Compression
+|--------------------------------------------------------------------------
+|
+| 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
+| 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
+| 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.
+|
+*/
+$config['compress_output'] = FALSE;
+
+
    + + + +

    Step 3: Rename an Autoload Item

    + +

    Open the following file: application/config/autoload.php

    + +

    Find this array item:

    + +$autoload['core'] = array(); + +

    And rename it to this:

    + +$autoload['libraries'] = array(); + +

    This change was made to improve clarity since some users were not sure that their own libraries could be auto-loaded.

    + + + + + + +

    Step 4: Update your user guide

    + +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 2a418087..afb1d49f 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -1,178 +1,178 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.4.1 to 1.5.0

    - -

    Note: The instructions on this page assume you are running version 1.4.1. If you -have not upgraded to that version please do so first.

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace these files and directories in your "system" folder with the new versions:

    - -
      - -
    • application/config/user_agents.php (new file for 1.5)
      • -
    • application/config/smileys.php (new file for 1.5)
      • -
    • codeigniter/
      • -
    • database/ (new folder for 1.5. Replaces the "drivers" folder)
      • -
    • helpers/
      • -
    • language/
      • -
    • libraries/
      • -
    • scaffolding/
      • -
    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - - -

    Step 2: Update your database.php file

    - -

    Open your application/config/database.php file and add these new items:

    - -
    -$db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = '';
-
    - - - -

    Step 3: Update your config.php file

    - -

    Open your application/config/config.php file and ADD these new items:

    - -
    -/*
-|--------------------------------------------------------------------------
-| Class Extension Prefix
-|--------------------------------------------------------------------------
-|
-| This item allows you to set the filename/classname prefix when extending
-| 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
-|
-*/
-$config['subclass_prefix'] = 'MY_';
-
-/*
-|--------------------------------------------------------------------------
-| Rewrite PHP Short Tags
-|--------------------------------------------------------------------------
-|
-| 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)
-|
-*/
-$config['rewrite_short_tags'] = FALSE;
-
    - -

    In that same file REMOVE this item:

    - - -
    -/*
-|--------------------------------------------------------------------------
-| Enable/Disable Error Logging
-|--------------------------------------------------------------------------
-|
-| If you would like errors or debug messages logged set this variable to
-| TRUE (boolean).  Note: You must set the file permissions on the "logs" folder
-| such that it is writable.
-|
-*/
-$config['log_errors'] = FALSE;
-
    - -

    Error logging is now disabled simply by setting the threshold to zero.

    - - - -

    Step 4: Update your main index.php file

    - -

    If you are running a stock index.php file simply replace your version with the new one.

    - -

    If your index.php file has internal modifications, please add your modifications to the new file and use it.

    - - - -

    Step 5: Update your user guide

    - -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.4.1 to 1.5.0

    + +

    Note: The instructions on this page assume you are running version 1.4.1. If you +have not upgraded to that version please do so first.

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • application/config/user_agents.php (new file for 1.5)
      • +
    • application/config/smileys.php (new file for 1.5)
      • +
    • codeigniter/
      • +
    • database/ (new folder for 1.5. Replaces the "drivers" folder)
      • +
    • helpers/
      • +
    • language/
      • +
    • libraries/
      • +
    • scaffolding/
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + + +

    Step 2: Update your database.php file

    + +

    Open your application/config/database.php file and add these new items:

    + +
    +$db['default']['cache_on'] = FALSE;
+$db['default']['cachedir'] = '';
+
    + + + +

    Step 3: Update your config.php file

    + +

    Open your application/config/config.php file and ADD these new items:

    + +
    +/*
+|--------------------------------------------------------------------------
+| Class Extension Prefix
+|--------------------------------------------------------------------------
+|
+| This item allows you to set the filename/classname prefix when extending
+| 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
+|
+*/
+$config['subclass_prefix'] = 'MY_';
+
+/*
+|--------------------------------------------------------------------------
+| Rewrite PHP Short Tags
+|--------------------------------------------------------------------------
+|
+| 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)
+|
+*/
+$config['rewrite_short_tags'] = FALSE;
+
    + +

    In that same file REMOVE this item:

    + + +
    +/*
+|--------------------------------------------------------------------------
+| Enable/Disable Error Logging
+|--------------------------------------------------------------------------
+|
+| If you would like errors or debug messages logged set this variable to
+| TRUE (boolean).  Note: You must set the file permissions on the "logs" folder
+| such that it is writable.
+|
+*/
+$config['log_errors'] = FALSE;
+
    + +

    Error logging is now disabled simply by setting the threshold to zero.

    + + + +

    Step 4: Update your main index.php file

    + +

    If you are running a stock index.php file simply replace your version with the new one.

    + +

    If your index.php file has internal modifications, please add your modifications to the new file and use it.

    + + + +

    Step 5: Update your user guide

    + +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 789f21bf..223eef6b 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -1,111 +1,111 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.5.0 to 1.5.2

    - -

    Note: The instructions on this page assume you are running version 1.5.0 or 1.5.1. If you -have not upgraded to that version please do so first.

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace these files and directories in your "system" folder with the new versions:

    - -
      - -
    • system/helpers/download_helper.php
      • -
    • system/helpers/form_helper.php
      • -
    • system/libraries/Table.php
      • -
    • system/libraries/User_agent.php
      • -
    • system/libraries/Exceptions.php
      • -
    • system/libraries/Input.php
      • -
    • system/libraries/Router.php
      • -
    • system/libraries/Loader.php
      • -
    • system/libraries/Image_lib.php
      • -
    • system/language/english/unit_test_lang.php
      • -
    • system/database/DB_active_rec.php
      • -
    • system/database/drivers/mysqli/mysqli_driver.php
      • -
    • codeigniter/
      • -
    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - - -

    Step 2: Update your user guide

    - -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.5.0 to 1.5.2

    + +

    Note: The instructions on this page assume you are running version 1.5.0 or 1.5.1. If you +have not upgraded to that version please do so first.

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • system/helpers/download_helper.php
      • +
    • system/helpers/form_helper.php
      • +
    • system/libraries/Table.php
      • +
    • system/libraries/User_agent.php
      • +
    • system/libraries/Exceptions.php
      • +
    • system/libraries/Input.php
      • +
    • system/libraries/Router.php
      • +
    • system/libraries/Loader.php
      • +
    • system/libraries/Image_lib.php
      • +
    • system/language/english/unit_test_lang.php
      • +
    • system/database/DB_active_rec.php
      • +
    • system/database/drivers/mysqli/mysqli_driver.php
      • +
    • codeigniter/
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + + +

    Step 2: Update your user guide

    + +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 66ca76e4..c15579b6 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -1,100 +1,100 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.5.2 to 1.5.3

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace these files and directories in your "system" folder with the new versions:

    - -
      - -
    • system/database/drivers
      • -
    • system/helpers
      • -
    • system/libraries/Input.php
      • -
    • system/libraries/Loader.php
      • -
    • system/libraries/Profiler.php
      • -
    • system/libraries/Table.php
      • -
    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - - -

    Step 2: Update your user guide

    - -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.5.2 to 1.5.3

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • system/database/drivers
      • +
    • system/helpers
      • +
    • system/libraries/Input.php
      • +
    • system/libraries/Loader.php
      • +
    • system/libraries/Profiler.php
      • +
    • system/libraries/Table.php
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + + +

    Step 2: Update your user guide

    + +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 5e6dfb9c..7750a35e 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -1,116 +1,116 @@ - - - - - -Upgrading from 1.5.3 to 1.5.4 : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.5.3 to 1.5.4

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace these files and directories in your "system" folder with the new versions:

    - -
      - -
    • system/application/config/mimes.php
      • -
    • system/codeigniter
      • -
    • system/database
      • -
    • system/helpers
      • -
    • system/libraries
      • -
    • system/plugins
      • -
    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - -

    Step 2: Add charset to your config.php

    -

    Add the following to system/application/config/config.php

    -/*
    - |--------------------------------------------------------------------------
    - | Default Character Set
    - |--------------------------------------------------------------------------
    - |
    - | This determines which character set is used by default in various methods
    - | that require a character set to be provided.
    - |
    - */
    - $config['charset'] = "UTF-8";     - -

    Step 3: Autoloading language files

    -

    If you want to autoload any language files, add this line to system/application/config/autoload.php

    -$autoload['language'] = array(); - -

    Step 4: Update your user guide

    -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +Upgrading from 1.5.3 to 1.5.4 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.5.3 to 1.5.4

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • system/application/config/mimes.php
      • +
    • system/codeigniter
      • +
    • system/database
      • +
    • system/helpers
      • +
    • system/libraries
      • +
    • system/plugins
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +

    Step 2: Add charset to your config.php

    +

    Add the following to system/application/config/config.php

    +/*
    + |--------------------------------------------------------------------------
    + | Default Character Set
    + |--------------------------------------------------------------------------
    + |
    + | This determines which character set is used by default in various methods
    + | that require a character set to be provided.
    + |
    + */
    + $config['charset'] = "UTF-8";     + +

    Step 3: Autoloading language files

    +

    If you want to autoload any language files, add this line to system/application/config/autoload.php

    +$autoload['language'] = array(); + +

    Step 4: Update your user guide

    +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index f9b4c3b9..3ca7372b 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -1,125 +1,125 @@ - - - - - -Upgrading from 1.5.4 to 1.6.0 : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.5.4 to 1.6.0

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace these files and directories in your "system" folder with the new versions:

    - -
      - -
    • system/codeigniter
      • -
    • system/database
      • -
    • system/helpers
      • -
    • system/libraries
      • -
    • system/plugins
      • -
    • system/language
      • -
    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - -

    Step 2: Add time_to_update to your config.php

    -

    Add the following to system/application/config/config.php with the other session configuration options

    -

    $config['sess_time_to_update'] = 300;

    -

    Step 3: Add $autoload['model']

    -

    Add the following to system/application/autoload.php

    -

    /*
    - | -------------------------------------------------------------------
    - | Auto-load Model files
    - | -------------------------------------------------------------------
    - | Prototype:
    - |
    - | $autoload['model'] = array('my_model');
    - |
    - */
    -
    - $autoload['model'] = array();

    -

    Step 4: Add to your database.php

    -

    Make the following changes to your system/application/config/database.php file:

    -

    Add the following variable above the database configuration options, with $active_group

    -

    $active_record = TRUE;

    -

    Remove the following from your database configuration options

    -

    $db['default']['active_r'] = TRUE;

    -

    Add the following to your database configuration options

    -

    $db['default']['char_set'] = "utf8";
    -$db['default']['dbcollat'] = "utf8_general_ci";

    - -

    Step 5: Update your user guide

    -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +Upgrading from 1.5.4 to 1.6.0 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.5.4 to 1.6.0

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • system/codeigniter
      • +
    • system/database
      • +
    • system/helpers
      • +
    • system/libraries
      • +
    • system/plugins
      • +
    • system/language
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +

    Step 2: Add time_to_update to your config.php

    +

    Add the following to system/application/config/config.php with the other session configuration options

    +

    $config['sess_time_to_update'] = 300;

    +

    Step 3: Add $autoload['model']

    +

    Add the following to system/application/autoload.php

    +

    /*
    + | -------------------------------------------------------------------
    + | Auto-load Model files
    + | -------------------------------------------------------------------
    + | Prototype:
    + |
    + | $autoload['model'] = array('my_model');
    + |
    + */
    +
    + $autoload['model'] = array();

    +

    Step 4: Add to your database.php

    +

    Make the following changes to your system/application/config/database.php file:

    +

    Add the following variable above the database configuration options, with $active_group

    +

    $active_record = TRUE;

    +

    Remove the following from your database configuration options

    +

    $db['default']['active_r'] = TRUE;

    +

    Add the following to your database configuration options

    +

    $db['default']['char_set'] = "utf8";
    +$db['default']['dbcollat'] = "utf8_general_ci";

    + +

    Step 5: Update your user guide

    +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index 24d34fd7..49715eec 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -1,98 +1,98 @@ - - - - - -Upgrading from 1.6.0 to 1.6.1 : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.6.0 to 1.6.1

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace these files and directories in your "system" folder with the new versions:

    - -
      - -
    • system/codeigniter
      • -
    • system/database
      • -
    • system/helpers
      • -
    • system/language
      • -
    • system/libraries
      • -
    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - -

    Step 2: Update your user guide

    -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +Upgrading from 1.6.0 to 1.6.1 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.6.0 to 1.6.1

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • system/codeigniter
      • +
    • system/database
      • +
    • system/helpers
      • +
    • system/language
      • +
    • system/libraries
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +

    Step 2: Update your user guide

    +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index 258df2a5..942be9f0 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -1,106 +1,106 @@ - - - - - -Upgrading from 1.6.1 to 1.6.2 : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.6.1 to 1.6.2

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace these files and directories in your "system" folder with the new versions:

    - -
      - -
    • system/codeigniter
      • -
    • system/database
      • -
    • system/helpers
      • -
    • system/language
      • -
    • system/libraries
      • -
    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - - -

    Step 2: Encryption Key

    -

    If you are using sessions, open up system/application/config/config.php and verify you've set an encryption key.

    - -

    Step 3: Constants File

    -

    Copy /system/application/config/constants.php to your installation, and modify if necessary.

    -

    Step 4: Mimes File

    -

    Replace /system/application/config/mimes.php with the dowloaded version. If you've added custom mime types, you'll need to re-add them.

    -

    Step 5: Update your user guide

    -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +Upgrading from 1.6.1 to 1.6.2 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.6.1 to 1.6.2

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • system/codeigniter
      • +
    • system/database
      • +
    • system/helpers
      • +
    • system/language
      • +
    • system/libraries
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + + +

    Step 2: Encryption Key

    +

    If you are using sessions, open up system/application/config/config.php and verify you've set an encryption key.

    + +

    Step 3: Constants File

    +

    Copy /system/application/config/constants.php to your installation, and modify if necessary.

    +

    Step 4: Mimes File

    +

    Replace /system/application/config/mimes.php with the dowloaded version. If you've added custom mime types, you'll need to re-add them.

    +

    Step 5: Update your user guide

    +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 784ada8b..f9056b6a 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -1,99 +1,99 @@ - - - - - -Upgrading from 1.6.2 to 1.6.3 : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.6.2 to 1.6.3

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace these files and directories in your "system" folder with the new versions:

    - -
      - -
    • system/codeigniter
      • -
    • system/database
      • -
    • system/helpers
      • -
    • system/language
      • -
    • system/libraries
      • -
    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - - -

    Step 2: Update your user guide

    -

    Please also replace your local copy of the user guide with the new version.

    - -
    - - - - - - + + + + + +Upgrading from 1.6.2 to 1.6.3 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.6.2 to 1.6.3

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • system/codeigniter
      • +
    • system/database
      • +
    • system/helpers
      • +
    • system/language
      • +
    • system/libraries
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + + +

    Step 2: Update your user guide

    +

    Please also replace your local copy of the user guide with the new version.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 1e69b3f2..006172d4 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -1,121 +1,121 @@ - - - - - -Upgrading from 1.6.3 to 1.7.0 : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading from 1.6.3 to 1.7.0

    - -

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    - - - -

    Step 1: Update your CodeIgniter files

    - -

    Replace these files and directories in your "system" folder with the new versions:

    - -
      - -
    • system/codeigniter
      • -
    • system/database
      • -
    • system/helpers
      • -
    • system/language
      • -
    • system/libraries
      • -
    - -

    Note: If you have any custom developed files in these folders please make copies of them first.

    - - -

    Step 2: Update your Session Table

    - -

    If you are using the Session class in your application, AND if you are storing session data to a database, you must add a new column named user_data to your session table. -Here is an example of what this column might look like for MySQL: - -user_data text NOT NULL - -

    To add this column you will run a query similar to this:

    - -ALTER TABLE `ci_sessions` ADD `user_data` text NOT NULL - -

    You'll find more information regarding the new Session functionality in the Session class page.

    - - -

    Step 3: Update your Validation Syntax

    - -

    This is an optional, but recommended step, for people currently using the Validation class. CI 1.7 introduces a new Form Validation class, which -deprecates the old Validation library. We have left the old one in place so that existing applications that use it will not break, but you are encouraged to -migrate to the new version as soon as possible. Please read the user guide carefully as the new library works a little differently, and has several new features.

    - - - -

    Step 4: Update your user guide

    -

    Please replace your local copy of the user guide with the new version, including the image files.

    - -
    - - - - - - + + + + + +Upgrading from 1.6.3 to 1.7.0 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.6.3 to 1.7.0

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • system/codeigniter
      • +
    • system/database
      • +
    • system/helpers
      • +
    • system/language
      • +
    • system/libraries
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + + +

    Step 2: Update your Session Table

    + +

    If you are using the Session class in your application, AND if you are storing session data to a database, you must add a new column named user_data to your session table. +Here is an example of what this column might look like for MySQL: + +user_data text NOT NULL + +

    To add this column you will run a query similar to this:

    + +ALTER TABLE `ci_sessions` ADD `user_data` text NOT NULL + +

    You'll find more information regarding the new Session functionality in the Session class page.

    + + +

    Step 3: Update your Validation Syntax

    + +

    This is an optional, but recommended step, for people currently using the Validation class. CI 1.7 introduces a new Form Validation class, which +deprecates the old Validation library. We have left the old one in place so that existing applications that use it will not break, but you are encouraged to +migrate to the new version as soon as possible. Please read the user guide carefully as the new library works a little differently, and has several new features.

    + + + +

    Step 4: Update your user guide

    +

    Please replace your local copy of the user guide with the new version, including the image files.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 8360a2b3..58ade4fe 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -1,144 +1,144 @@ - - - - - -CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading From Beta 1.0 to Beta 1.1

    - -

    To upgrade to Beta 1.1 please perform the following steps:

    - -

    Step 1: Replace your index file

    - -

    Replace your main index.php file with the new index.php file. Note: If you have renamed your "system" folder you will need to edit this info in the new file.

    - -

    Step 2: Relocate your config folder

    - -

    This version of CodeIgniter now permits multiple sets of "applications" to all share a common set of backend files. In order to enable -each application to have its own configuration values, the config directory must now reside -inside of your application folder, so please move it there.

    - - -

    Step 3: Replace directories

    - -

    Replace the following directories with the new versions:

    - -
      -
    • drivers
      • -
    • helpers
      • -
    • init
      • -
    • libraries
      • -
    • scaffolding
      • -
    - - -

    Step 4: Add the calendar language file

    - -

    There is a new language file corresponding to the new calendaring class which must be added to your language folder. Add -the following item to your version: language/english/calendar_lang.php

    - - -

    Step 5: Edit your config file

    - -

    The original application/config/config.php file has a typo in it Open the file and look for the items related to cookies:

    - -$conf['cookie_prefix'] = "";
    -$conf['cookie_domain'] = "";
    -$conf['cookie_path'] = "/";     - -

    Change the array name from $conf to $config, like this:

    - -$config['cookie_prefix'] = "";
    -$config['cookie_domain'] = "";
    -$config['cookie_path'] = "/";     - -

    Lastly, add the following new item to the config file (and edit the option if needed):

    - -
    -/*
    -|------------------------------------------------
    -| URI PROTOCOL
    -|------------------------------------------------
    -|
    -| 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
    -| 'query_string' Uses the QUERY_STRING
    -*/
    -
    -$config['uri_protocol'] = "auto";     - - -
    - - - - - - + + + + + +CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading From Beta 1.0 to Beta 1.1

    + +

    To upgrade to Beta 1.1 please perform the following steps:

    + +

    Step 1: Replace your index file

    + +

    Replace your main index.php file with the new index.php file. Note: If you have renamed your "system" folder you will need to edit this info in the new file.

    + +

    Step 2: Relocate your config folder

    + +

    This version of CodeIgniter now permits multiple sets of "applications" to all share a common set of backend files. In order to enable +each application to have its own configuration values, the config directory must now reside +inside of your application folder, so please move it there.

    + + +

    Step 3: Replace directories

    + +

    Replace the following directories with the new versions:

    + +
      +
    • drivers
      • +
    • helpers
      • +
    • init
      • +
    • libraries
      • +
    • scaffolding
      • +
    + + +

    Step 4: Add the calendar language file

    + +

    There is a new language file corresponding to the new calendaring class which must be added to your language folder. Add +the following item to your version: language/english/calendar_lang.php

    + + +

    Step 5: Edit your config file

    + +

    The original application/config/config.php file has a typo in it Open the file and look for the items related to cookies:

    + +$conf['cookie_prefix'] = "";
    +$conf['cookie_domain'] = "";
    +$conf['cookie_path'] = "/";     + +

    Change the array name from $conf to $config, like this:

    + +$config['cookie_prefix'] = "";
    +$config['cookie_domain'] = "";
    +$config['cookie_path'] = "/";     + +

    Lastly, add the following new item to the config file (and edit the option if needed):

    + +
    +/*
    +|------------------------------------------------
    +| URI PROTOCOL
    +|------------------------------------------------
    +|
    +| 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
    +| 'query_string' Uses the QUERY_STRING
    +*/
    +
    +$config['uri_protocol'] = "auto";     + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 78b5433c..78dd0f29 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -1,99 +1,99 @@ - - - - - -Upgrading From a Previous Version : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Upgrading From a Previous Version

    - -

    Please read the upgrade notes corresponding to the version you are upgrading from.

    - - - - -
    - - - - - - + + + + + +Upgrading From a Previous Version : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading From a Previous Version

    + +

    Please read the upgrade notes corresponding to the version you are upgrading from.

    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 67c36135..9f83a8de 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -1,197 +1,197 @@ - - - - - -Benchmarking Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Benchmarking Class

    - -

    CodeIgniter has a Benchmarking class that is always active, enabling the time difference between any -two marked points to be calculated.

    - -

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    - - -

    In addition, the benchmark is always started the moment the framework is -invoked, and ended by the output class right before sending the final view to the browser, enabling a very accurate -timing of the entire system execution to be shown.

    - - -

    Table of Contents

    - - - - - - -

    Using the Benchmark Class

    - -

    The Benchmark class can be used within your controllers, views, or your Models. The process for usage is this:

    - -
      -
    1. Mark a start point
      2. -
    2. Mark an end point
      3. -
    3. Run the "elapsed time" function to view the results
      4. -
    - -

    Here's an example using real code:

    - -$this->benchmark->mark('code_start');
    -
    -// Some code happens here
    -
    -$this->benchmark->mark('code_end');
    -
    -echo $this->benchmark->elapsed_time('code_start', 'code_end');     - -

    Note: The words "code_start" and "code_end" are arbitrary. They are simply words used to set two markers. You can -use any words you want, and you can set multiple sets of markers. Consider this example:

    - -$this->benchmark->mark('dog');
    -
    -// Some code happens here
    -
    -$this->benchmark->mark('cat');
    -
    -// More code happens here
    -
    -$this->benchmark->mark('bird');
    -
    -echo $this->benchmark->elapsed_time('dog', 'cat');
    -echo $this->benchmark->elapsed_time('cat', 'bird');
    -echo $this->benchmark->elapsed_time('dog', 'bird');     - - - -

    Profiling Your Benchmark Points

    - -

    If you want your benchmark data to be available to the -Profiler all of your marked points must be set up in pairs, and -each mark point name must end with _start and _end. -Each pair of points must otherwise be named identically. Example:

    - - -$this->benchmark->mark('my_mark_start');
    -
    -// Some code happens here...
    -
    -$this->benchmark->mark('my_mark_end'); -

    - -$this->benchmark->mark('another_mark_start');
    -
    -// Some more code happens here...
    -
    -$this->benchmark->mark('another_mark_end'); -     - -

    Please read the Profiler page for more information.

    - - - -

    Displaying Total Execution Time

    - -

    If you would like to display the total elapsed time from the moment CodeIgniter starts to the moment the final output -is sent to the browser, simply place this in one of your view templates:

    - -<?php echo $this->benchmark->elapsed_time();?> - -

    You'll notice that it's the same function used in the examples above to calculate the time between two point, except you are -not using any parameters. When the parameters are absent, CodeIgniter does not stop the benchmark until right before the final -output is sent to the browser. It doesn't matter where you use the function call, the timer will continue to run until the very end.

    - -

    An alternate way to show your elapsed time in your view files is to use this pseudo-variable, if you prefer not to use the pure PHP:

    -{elapsed_time} - -

    Note: If you want to benchmark anything within your controller -functions you must set your own start/end points.

    - - -

    Displaying Memory Consumption

    - -

    If your PHP installation is configured with --enable-memory-limit, you can display the amount of memory consumed by the entire -system using the following code in one of your view file:

    - -<?php echo $this->benchmark->memory_usage();?> -

    Note: This function can only be used in your view files. The consumption will reflect the total memory used by the entire app.

    - -

    An alternate way to show your memory usage in your view files is to use this pseudo-variable, if you prefer not to use the pure PHP:

    -{memory_usage} - - - - -
    - - - - - - + + + + + +Benchmarking Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Benchmarking Class

    + +

    CodeIgniter has a Benchmarking class that is always active, enabling the time difference between any +two marked points to be calculated.

    + +

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    + + +

    In addition, the benchmark is always started the moment the framework is +invoked, and ended by the output class right before sending the final view to the browser, enabling a very accurate +timing of the entire system execution to be shown.

    + + +

    Table of Contents

    + + + + + + +

    Using the Benchmark Class

    + +

    The Benchmark class can be used within your controllers, views, or your Models. The process for usage is this:

    + +
      +
    1. Mark a start point
      2. +
    2. Mark an end point
      3. +
    3. Run the "elapsed time" function to view the results
      4. +
    + +

    Here's an example using real code:

    + +$this->benchmark->mark('code_start');
    +
    +// Some code happens here
    +
    +$this->benchmark->mark('code_end');
    +
    +echo $this->benchmark->elapsed_time('code_start', 'code_end');     + +

    Note: The words "code_start" and "code_end" are arbitrary. They are simply words used to set two markers. You can +use any words you want, and you can set multiple sets of markers. Consider this example:

    + +$this->benchmark->mark('dog');
    +
    +// Some code happens here
    +
    +$this->benchmark->mark('cat');
    +
    +// More code happens here
    +
    +$this->benchmark->mark('bird');
    +
    +echo $this->benchmark->elapsed_time('dog', 'cat');
    +echo $this->benchmark->elapsed_time('cat', 'bird');
    +echo $this->benchmark->elapsed_time('dog', 'bird');     + + + +

    Profiling Your Benchmark Points

    + +

    If you want your benchmark data to be available to the +Profiler all of your marked points must be set up in pairs, and +each mark point name must end with _start and _end. +Each pair of points must otherwise be named identically. Example:

    + + +$this->benchmark->mark('my_mark_start');
    +
    +// Some code happens here...
    +
    +$this->benchmark->mark('my_mark_end'); +

    + +$this->benchmark->mark('another_mark_start');
    +
    +// Some more code happens here...
    +
    +$this->benchmark->mark('another_mark_end'); +     + +

    Please read the Profiler page for more information.

    + + + +

    Displaying Total Execution Time

    + +

    If you would like to display the total elapsed time from the moment CodeIgniter starts to the moment the final output +is sent to the browser, simply place this in one of your view templates:

    + +<?php echo $this->benchmark->elapsed_time();?> + +

    You'll notice that it's the same function used in the examples above to calculate the time between two point, except you are +not using any parameters. When the parameters are absent, CodeIgniter does not stop the benchmark until right before the final +output is sent to the browser. It doesn't matter where you use the function call, the timer will continue to run until the very end.

    + +

    An alternate way to show your elapsed time in your view files is to use this pseudo-variable, if you prefer not to use the pure PHP:

    +{elapsed_time} + +

    Note: If you want to benchmark anything within your controller +functions you must set your own start/end points.

    + + +

    Displaying Memory Consumption

    + +

    If your PHP installation is configured with --enable-memory-limit, you can display the amount of memory consumed by the entire +system using the following code in one of your view file:

    + +<?php echo $this->benchmark->memory_usage();?> +

    Note: This function can only be used in your view files. The consumption will reflect the total memory used by the entire app.

    + +

    An alternate way to show your memory usage in your view files is to use this pseudo-variable, if you prefer not to use the pure PHP:

    +{memory_usage} + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 1c849939..9daf2651 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -1,249 +1,249 @@ - - - - - -Calendaring Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - - - -

    Calendaring Class

    - -

    The Calendar class enables you to dynamically create calendars. Your calendars can be formatted through the use of a calendar -template, allowing 100% control over every aspect of its design. In addition, you can pass data to your calendar cells.

    - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the Calendar class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('calendar'); -

    Once loaded, the Calendar object will be available using: $this->calendar

    - - -

    Displaying a Calendar

    - -

    Here is a very simple example showing how you can display a calendar:

    - -$this->load->library('calendar');
    -
    -echo $this->calendar->generate();     - -

    The above code will generate a calendar for the current month/year based on your server time. -To show a calendar for a specific month and year you will pass this information to the calendar generating function:

    - -$this->load->library('calendar');
    -
    -echo $this->calendar->generate(2006, 6);     - -

    The above code will generate a calendar showing the month of June in 2006. The first parameter specifies the year, the second parameter specifies the month.

    - -

    Passing Data to your Calendar Cells

    - -

    To add data to your calendar cells involves creating an associative array in which the keys correspond to the days -you wish to populate and the array value contains the data. The array is passed to the third parameter of the calendar -generating function. Consider this example:

    - -$this->load->library('calendar');
    -
    -$data = array(
    -               3  => 'http://example.com/news/article/2006/03/',
    -               7  => 'http://example.com/news/article/2006/07/',
    -               13 => 'http://example.com/news/article/2006/13/',
    -               26 => 'http://example.com/news/article/2006/26/'
    -             );
    -
    -echo $this->calendar->generate(2006, 6, $data);     - -

    Using the above example, day numbers 3, 7, 13, and 26 will become links pointing to the URLs you've provided.

    - -

    Note: By default it is assumed that your array will contain links. -In the section that explains the calendar template below you'll see how you can customize -how data passed to your cells is handled so you can pass different types of information.

    - - -

    Setting Display Preferences

    - -

    There are seven preferences you can set to control various aspects of the calendar. Preferences are set by passing an -array of preferences in the second parameter of the loading function. Here is an example:

    - - - -$prefs = array (
    -               'start_day'    => 'saturday',
    -               'month_type'   => 'long',
    -               'day_type'     => 'short'
    -             );
    -
    -$this->load->library('calendar', $prefs);
    -
    -echo $this->calendar->generate();     - -

    The above code would start the calendar on saturday, use the "long" month heading, and the "short" day names. More information -regarding preferences below.

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefault ValueOptionsDescription
    templateNoneNoneA string containing your calendar template. See the template section below.
    local_timetime()NoneA Unix timestamp corresponding to the current time.
    start_daysundayAny week day (sunday, monday, tuesday, etc.)Sets the day of the week the calendar should start on.
    month_typelonglong, shortDetermines what version of the month name to use in the header. long = January, short = Jan.
    day_typeabrlong, short, abrDetermines what version of the weekday names to use in the column headers. long = Sunday, short = Sun, abr = Su.
    show_next_prevFALSETRUE/FALSE (boolean)Determines whether to display links allowing you to toggle to next/previous months. See information on this feature below.
    next_prev_urlNoneA URLSets the basepath used in the next/previous calendar links.
    - - - -

    Showing Next/Previous Month Links

    - -

    To allow your calendar to dynamically increment/decrement via the next/previous links requires that you set up your calendar -code similar to this example:

    - - -$prefs = array (
    -               'show_next_prev'  => TRUE,
    -               'next_prev_url'   => 'http://example.com/index.php/calendar/show/'
    -             );
    -
    -$this->load->library('calendar', $prefs);
    -
    -echo $this->calendar->generate($this->uri->segment(3), $this->uri->segment(4));     - -

    You'll notice a few things about the above example:

    - -
      -
    • You must set the "show_next_prev" to TRUE.
      • -
    • You must supply the URL to the controller containing your calendar in the "next_prev_url" preference.
      • -
    • You must supply the "year" and "month" to the calendar generating function via the URI segments where they appear (Note: The calendar class automatically adds the year/month to the base URL you provide.).
      • -
    - - - -

    Creating a Calendar Template

    - -

    By creating a calendar template you have 100% control over the design of your calendar. Each component of your -calendar will be placed within a pair of pseudo-variables as shown here:

    - - - -$prefs['template'] = '

    -   {table_open}<table border="0" cellpadding="0" cellspacing="0">{/table_open}
    -
    -   {heading_row_start}<tr>{/heading_row_start}
    -
    -   {heading_previous_cell}<th><a href="{previous_url}">&lt;&lt;</a></th>{/heading_previous_cell}
    -   {heading_title_cell}<th colspan="{colspan}">{heading}</th>{/heading_title_cell}
    -   {heading_next_cell}<th><a href="{next_url}">&gt;&gt;</a></th>{/heading_next_cell}
    -
    -   {heading_row_end}</tr>{/heading_row_end}
    -
    -   {week_row_start}<tr>{/week_row_start}
    -   {week_day_cell}<td>{week_day}</td>{/week_day_cell}
    -   {week_row_end}</tr>{/week_row_end}
    -
    -   {cal_row_start}<tr>{/cal_row_start}
    -   {cal_cell_start}<td>{/cal_cell_start}
    -
    -   {cal_cell_content}<a href="{content}">{day}</a>{/cal_cell_content}
    -   {cal_cell_content_today}<div class="highlight"><a href="{content}">{day}</a></div>{/cal_cell_content_today}
    -
    -   {cal_cell_no_content}{day}{/cal_cell_no_content}
    -   {cal_cell_no_content_today}<div class="highlight">{day}</div>{/cal_cell_no_content_today}
    -
    -   {cal_cell_blank}&nbsp;{/cal_cell_blank}
    -
    -   {cal_cell_end}</td>{/cal_cell_end}
    -   {cal_row_end}</tr>{/cal_row_end}
    -
    -   {table_close}</table>{/table_close}
    -';
    -
    -$this->load->library('calendar', $prefs);
    -
    -echo $this->calendar->generate();     - - - -
    - - - - - - + + + + + +Calendaring Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + + + +

    Calendaring Class

    + +

    The Calendar class enables you to dynamically create calendars. Your calendars can be formatted through the use of a calendar +template, allowing 100% control over every aspect of its design. In addition, you can pass data to your calendar cells.

    + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the Calendar class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('calendar'); +

    Once loaded, the Calendar object will be available using: $this->calendar

    + + +

    Displaying a Calendar

    + +

    Here is a very simple example showing how you can display a calendar:

    + +$this->load->library('calendar');
    +
    +echo $this->calendar->generate();     + +

    The above code will generate a calendar for the current month/year based on your server time. +To show a calendar for a specific month and year you will pass this information to the calendar generating function:

    + +$this->load->library('calendar');
    +
    +echo $this->calendar->generate(2006, 6);     + +

    The above code will generate a calendar showing the month of June in 2006. The first parameter specifies the year, the second parameter specifies the month.

    + +

    Passing Data to your Calendar Cells

    + +

    To add data to your calendar cells involves creating an associative array in which the keys correspond to the days +you wish to populate and the array value contains the data. The array is passed to the third parameter of the calendar +generating function. Consider this example:

    + +$this->load->library('calendar');
    +
    +$data = array(
    +               3  => 'http://example.com/news/article/2006/03/',
    +               7  => 'http://example.com/news/article/2006/07/',
    +               13 => 'http://example.com/news/article/2006/13/',
    +               26 => 'http://example.com/news/article/2006/26/'
    +             );
    +
    +echo $this->calendar->generate(2006, 6, $data);     + +

    Using the above example, day numbers 3, 7, 13, and 26 will become links pointing to the URLs you've provided.

    + +

    Note: By default it is assumed that your array will contain links. +In the section that explains the calendar template below you'll see how you can customize +how data passed to your cells is handled so you can pass different types of information.

    + + +

    Setting Display Preferences

    + +

    There are seven preferences you can set to control various aspects of the calendar. Preferences are set by passing an +array of preferences in the second parameter of the loading function. Here is an example:

    + + + +$prefs = array (
    +               'start_day'    => 'saturday',
    +               'month_type'   => 'long',
    +               'day_type'     => 'short'
    +             );
    +
    +$this->load->library('calendar', $prefs);
    +
    +echo $this->calendar->generate();     + +

    The above code would start the calendar on saturday, use the "long" month heading, and the "short" day names. More information +regarding preferences below.

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescription
    templateNoneNoneA string containing your calendar template. See the template section below.
    local_timetime()NoneA Unix timestamp corresponding to the current time.
    start_daysundayAny week day (sunday, monday, tuesday, etc.)Sets the day of the week the calendar should start on.
    month_typelonglong, shortDetermines what version of the month name to use in the header. long = January, short = Jan.
    day_typeabrlong, short, abrDetermines what version of the weekday names to use in the column headers. long = Sunday, short = Sun, abr = Su.
    show_next_prevFALSETRUE/FALSE (boolean)Determines whether to display links allowing you to toggle to next/previous months. See information on this feature below.
    next_prev_urlNoneA URLSets the basepath used in the next/previous calendar links.
    + + + +

    Showing Next/Previous Month Links

    + +

    To allow your calendar to dynamically increment/decrement via the next/previous links requires that you set up your calendar +code similar to this example:

    + + +$prefs = array (
    +               'show_next_prev'  => TRUE,
    +               'next_prev_url'   => 'http://example.com/index.php/calendar/show/'
    +             );
    +
    +$this->load->library('calendar', $prefs);
    +
    +echo $this->calendar->generate($this->uri->segment(3), $this->uri->segment(4));     + +

    You'll notice a few things about the above example:

    + +
      +
    • You must set the "show_next_prev" to TRUE.
      • +
    • You must supply the URL to the controller containing your calendar in the "next_prev_url" preference.
      • +
    • You must supply the "year" and "month" to the calendar generating function via the URI segments where they appear (Note: The calendar class automatically adds the year/month to the base URL you provide.).
      • +
    + + + +

    Creating a Calendar Template

    + +

    By creating a calendar template you have 100% control over the design of your calendar. Each component of your +calendar will be placed within a pair of pseudo-variables as shown here:

    + + + +$prefs['template'] = '

    +   {table_open}<table border="0" cellpadding="0" cellspacing="0">{/table_open}
    +
    +   {heading_row_start}<tr>{/heading_row_start}
    +
    +   {heading_previous_cell}<th><a href="{previous_url}">&lt;&lt;</a></th>{/heading_previous_cell}
    +   {heading_title_cell}<th colspan="{colspan}">{heading}</th>{/heading_title_cell}
    +   {heading_next_cell}<th><a href="{next_url}">&gt;&gt;</a></th>{/heading_next_cell}
    +
    +   {heading_row_end}</tr>{/heading_row_end}
    +
    +   {week_row_start}<tr>{/week_row_start}
    +   {week_day_cell}<td>{week_day}</td>{/week_day_cell}
    +   {week_row_end}</tr>{/week_row_end}
    +
    +   {cal_row_start}<tr>{/cal_row_start}
    +   {cal_cell_start}<td>{/cal_cell_start}
    +
    +   {cal_cell_content}<a href="{content}">{day}</a>{/cal_cell_content}
    +   {cal_cell_content_today}<div class="highlight"><a href="{content}">{day}</a></div>{/cal_cell_content_today}
    +
    +   {cal_cell_no_content}{day}{/cal_cell_no_content}
    +   {cal_cell_no_content_today}<div class="highlight">{day}</div>{/cal_cell_no_content_today}
    +
    +   {cal_cell_blank}&nbsp;{/cal_cell_blank}
    +
    +   {cal_cell_end}</td>{/cal_cell_end}
    +   {cal_row_end}</tr>{/cal_row_end}
    +
    +   {table_close}</table>{/table_close}
    +';
    +
    +$this->load->library('calendar', $prefs);
    +
    +echo $this->calendar->generate();     + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 41a89566..8bc0a905 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -1,181 +1,181 @@ - - - - - -Config Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Config Class

    - -

    The Config class provides a means to retrieve configuration preferences. These preferences can -come from the default config file (application/config/config.php) or from your own custom config files.

    - -

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    - - -

    Anatomy of a Config File

    - -

    By default, CodeIgniter has a one primary config file, located at application/config/config.php. If you open the file using -your text editor you'll see that config items are stored in an array called $config.

    - -

    You can add your own config items to -this file, or if you prefer to keep your configuration items separate (assuming you even need config items), -simply create your own file and save it in config folder.

    - -

    Note: If you do create your own config files use the same format as the primary one, storing your items in -an array called $config. CodeIgniter will intelligently manage these files so there will be no conflict even though -the array has the same name (assuming an array index is not named the same as another).

    - -

    Loading a Config File

    - -

    Note: CodeIgniter automatically loads the primary config file (application/config/config.php), -so you will only need to load a config file if you have created your own.

    - -

    There are two ways to load a config file:

    - -
    1. Manual Loading - -

      To load one of your custom config files you will use the following function within the controller that needs it:

      - -$this->config->load('filename'); - -

      Where filename is the name of your config file, without the .php file extension.

      - -

      If you need to load multiple config files normally they will be merged into one master config array. Name collisions can occur, however, if -you have identically named array indexes in different config files. To avoid collisions you can set the second parameter to TRUE -and each config file will be stored in an array index corresponding to the name of the config file. Example:

      - - -// Stored in an array with this prototype: $this->config['blog_settings'] = $config
      -$this->config->load('blog_settings', TRUE);       - -

      Please see the section entitled Fetching Config Items below to learn how to retrieve config items set this way.

      - -

      The third parameter allows you to suppress errors in the event that a config file does not exist:

      - -$this->config->load('blog_settings', FALSE, TRUE); - -
      2. -
    2. Auto-loading - -

      If you find that you need a particular config file globally, you can have it loaded automatically by the system. To do this, -open the autoload.php file, located at application/config/autoload.php, and add your config file as -indicated in the file.

      -
      3. -
    - - -

    Fetching Config Items

    - -

    To retrieve an item from your config file, use the following function:

    - -$this->config->item('item name'); - -

    Where item name is the $config array index you want to retrieve. For example, to fetch your language choice you'll do this:

    - -$lang = $this->config->item('language'); - -

    The function returns FALSE (boolean) if the item you are trying to fetch does not exist.

    - -

    If you are using the second parameter of the $this->config->load function in order to assign your config items to a specific index -you can retrieve it by specifying the index name in the second parameter of the $this->config->item() function. Example:

    - - -// Loads a config file named blog_settings.php and assigns it to an index named "blog_settings"
    -$this->config->load('blog_settings', TRUE);

    - -// Retrieve a config item named site_name contained within the blog_settings array
    -$site_name = $this->config->item('site_name', 'blog_settings');

    - -// An alternate way to specify the same item:
    -$blog_config = $this->config->item('blog_settings');
    -$site_name = $blog_config['site_name'];     - -

    Setting a Config Item

    - -

    If you would like to dynamically set a config item or change an existing one, you can so using:

    - -$this->config->set_item('item_name', 'item_value'); - -

    Where item_name is the $config array index you want to change, and item_value is its value.

    - - -

    Helper Functions

    - -

    The config class has the following helper functions:

    - -

    $this->config->site_url();

    -

    This function retrieves the URL to your site, along with the "index" value you've specified in the config file.

    - -

    $this->config->system_url();

    -

    This function retrieves the URL to your system folder.

    - - -
    - - - - - - + + + + + +Config Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Config Class

    + +

    The Config class provides a means to retrieve configuration preferences. These preferences can +come from the default config file (application/config/config.php) or from your own custom config files.

    + +

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    + + +

    Anatomy of a Config File

    + +

    By default, CodeIgniter has a one primary config file, located at application/config/config.php. If you open the file using +your text editor you'll see that config items are stored in an array called $config.

    + +

    You can add your own config items to +this file, or if you prefer to keep your configuration items separate (assuming you even need config items), +simply create your own file and save it in config folder.

    + +

    Note: If you do create your own config files use the same format as the primary one, storing your items in +an array called $config. CodeIgniter will intelligently manage these files so there will be no conflict even though +the array has the same name (assuming an array index is not named the same as another).

    + +

    Loading a Config File

    + +

    Note: CodeIgniter automatically loads the primary config file (application/config/config.php), +so you will only need to load a config file if you have created your own.

    + +

    There are two ways to load a config file:

    + +
    1. Manual Loading + +

      To load one of your custom config files you will use the following function within the controller that needs it:

      + +$this->config->load('filename'); + +

      Where filename is the name of your config file, without the .php file extension.

      + +

      If you need to load multiple config files normally they will be merged into one master config array. Name collisions can occur, however, if +you have identically named array indexes in different config files. To avoid collisions you can set the second parameter to TRUE +and each config file will be stored in an array index corresponding to the name of the config file. Example:

      + + +// Stored in an array with this prototype: $this->config['blog_settings'] = $config
      +$this->config->load('blog_settings', TRUE);       + +

      Please see the section entitled Fetching Config Items below to learn how to retrieve config items set this way.

      + +

      The third parameter allows you to suppress errors in the event that a config file does not exist:

      + +$this->config->load('blog_settings', FALSE, TRUE); + +
      2. +
    2. Auto-loading + +

      If you find that you need a particular config file globally, you can have it loaded automatically by the system. To do this, +open the autoload.php file, located at application/config/autoload.php, and add your config file as +indicated in the file.

      +
      3. +
    + + +

    Fetching Config Items

    + +

    To retrieve an item from your config file, use the following function:

    + +$this->config->item('item name'); + +

    Where item name is the $config array index you want to retrieve. For example, to fetch your language choice you'll do this:

    + +$lang = $this->config->item('language'); + +

    The function returns FALSE (boolean) if the item you are trying to fetch does not exist.

    + +

    If you are using the second parameter of the $this->config->load function in order to assign your config items to a specific index +you can retrieve it by specifying the index name in the second parameter of the $this->config->item() function. Example:

    + + +// Loads a config file named blog_settings.php and assigns it to an index named "blog_settings"
    +$this->config->load('blog_settings', TRUE);

    + +// Retrieve a config item named site_name contained within the blog_settings array
    +$site_name = $this->config->item('site_name', 'blog_settings');

    + +// An alternate way to specify the same item:
    +$blog_config = $this->config->item('blog_settings');
    +$site_name = $blog_config['site_name'];     + +

    Setting a Config Item

    + +

    If you would like to dynamically set a config item or change an existing one, you can so using:

    + +$this->config->set_item('item_name', 'item_value'); + +

    Where item_name is the $config array index you want to change, and item_value is its value.

    + + +

    Helper Functions

    + +

    The config class has the following helper functions:

    + +

    $this->config->site_url();

    +

    This function retrieves the URL to your site, along with the "index" value you've specified in the config file.

    + +

    $this->config->system_url();

    +

    This function retrieves the URL to your system folder.

    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 64f56aca..22643ef1 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -1,307 +1,307 @@ - - - - - -Email Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Email Class

    - -

    CodeIgniter's robust Email Class supports the following features:

    - - -
      -
    • Multiple Protocols: Mail, Sendmail, and SMTP
      • -
    • Multiple recipients
      • -
    • CC and BCCs
      • -
    • HTML or Plaintext email
      • -
    • Attachments
      • -
    • Word wrapping
      • -
    • Priorities
      • -
    • BCC Batch Mode, enabling large email lists to be broken into small BCC batches.
      • -
    • Email Debugging tools
      • -
    - - -

    Sending Email

    - -

    Sending email is not only simple, but you can configure it on the fly or set your preferences in a config file.

    - -

    Here is a basic example demonstrating how you might send email. Note: This example assumes you are sending the email from one of your -controllers.

    - -$this->load->library('email');
    -
    -$this->email->from('your@example.com', 'Your Name');
    -$this->email->to('someone@example.com');
    -$this->email->cc('another@another-example.com');
    -$this->email->bcc('them@their-example.com');
    -
    -$this->email->subject('Email Test');
    -$this->email->message('Testing the email class.');
    -
    -$this->email->send();
    -
    -echo $this->email->print_debugger();     - - - - -

    Setting Email Preferences

    - -

    There are 17 different preferences available to tailor how your email messages are sent. You can either set them manually -as described here, or automatically via preferences stored in your config file, described below:

    - -

    Preferences are set by passing an array of preference values to the email initialize function. Here is an example of how you might set some preferences:

    - -$config['protocol'] = 'sendmail';
    -$config['mailpath'] = '/usr/sbin/sendmail';
    -$config['charset'] = 'iso-8859-1';
    -$config['wordwrap'] = TRUE;
    -
    -$this->email->initialize($config);     - -

    Note: Most of the preferences have default values that will be used if you do not set them.

    Setting Email Preferences in a Config File

    - -

    If you prefer not to set preferences using the above method, you can instead put them into a config file. -Simply create a new file called the email.php, add the $config -array in that file. Then save the file at config/email.php and it will be used automatically. You -will NOT need to use the $this->email->initialize() function if you save your preferences in a config file.

    - - - - -

    Email Preferences

    - -

    The following is a list of all the preferences that can be set when sending email.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefault ValueOptionsDescription
    useragentCodeIgniterNoneThe "user agent".
    protocolmailmail, sendmail, or smtpThe mail sending protocol.
    mailpath/usr/sbin/sendmailNoneThe server path to Sendmail.
    smtp_hostNo DefaultNoneSMTP Server Address.
    smtp_userNo DefaultNoneSMTP Username.
    smtp_passNo DefaultNoneSMTP Password.
    smtp_port25NoneSMTP Port.
    smtp_timeout5NoneSMTP Timeout (in seconds).
    wordwrapTRUETRUE or FALSE (boolean)Enable word-wrap.
    wrapchars76 Character count to wrap at.
    mailtypetexttext or htmlType of mail. If you send HTML email you must send it as a complete web page. Make sure you don't have any relative links or relative image paths otherwise they will not work.
    charsetutf-8Character set (utf-8, iso-8859-1, etc.).
    validateFALSETRUE or FALSE (boolean)Whether to validate the email address.
    priority31, 2, 3, 4, 5Email Priority. 1 = highest. 5 = lowest. 3 = normal.
    crlf\n"\r\n" or "\n" or "\r"Newline character. (Use "\r\n" to comply with RFC 822).
    newline\n"\r\n" or "\n" or "\r"Newline character. (Use "\r\n" to comply with RFC 822).
    bcc_batch_modeFALSETRUE or FALSE (boolean)Enable BCC Batch Mode.
    bcc_batch_size200NoneNumber of emails in each BCC batch.
    - - -

    Email Function Reference

    - -

    $this->email->from()

    -

    Sets the email address and name of the person sending the email:

    -$this->email->from('you@example.com', 'Your Name'); - -

    $this->email->reply_to()

    -

    Sets the reply-to address. If the information is not provided the information in the "from" function is used. Example:

    -$this->email->reply_to('you@example.com', 'Your Name'); - - -

    $this->email->to()

    -

    Sets the email address(s) of the recipient(s). Can be a single email, a comma-delimited list or an array:

    - -$this->email->to('someone@example.com'); -$this->email->to('one@example.com, two@example.com, three@example.com'); - -$list = array('one@example.com', 'two@example.com', 'three@example.com');
    -
    -$this->email->to($list);     - -

    $this->email->cc()

    -

    Sets the CC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

    - -

    $this->email->bcc()

    -

    Sets the BCC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

    - - -

    $this->email->subject()

    -

    Sets the email subject:

    -$this->email->subject('This is my subject'); - -

    $this->email->message()

    -

    Sets the email message body:

    -$this->email->message('This is my message'); - -

    $this->email->set_alt_message()

    -

    Sets the alternative email message body:

    -$this->email->set_alt_message('This is the alternative message'); - -

    This is an optional message string which can be used if you send HTML formatted email. It lets you specify an alternative -message with no HTML formatting which is added to the header string for people who do not accept HTML email. -If you do not set your own message CodeIgniter will extract the message from your HTML email and strip the tags.

    - - - -

    $this->email->clear()

    -

    Initializes all the email variables to an empty state. This function is intended for use if you run the email sending function -in a loop, permitting the data to be reset between cycles.

    -foreach ($list as $name => $address)
    -{
    -    $this->email->clear();

    - -    $this->email->to($address);
    -    $this->email->from('your@example.com');
    -    $this->email->subject('Here is your info '.$name);
    -    $this->email->message('Hi '.$name.' Here is the info you requested.');
    -    $this->email->send();
    -}     - -

    If you set the parameter to TRUE any attachments will be cleared as well:

    - -$this->email->clear(TRUE); - - -

    $this->email->send()

    -

    The Email sending function. Returns boolean TRUE or FALSE based on success or failure, enabling it to be used -conditionally:

    - -if ( ! $this->email->send())
    -{
    -    // Generate error
    -}     - - -

    $this->email->attach()

    -

    Enables you to send an attachment. Put the file path/name in the first parameter. Note: Use a file path, not a URL. -For multiple attachments use the function multiple times. For example:

    - -$this->email->attach('/path/to/photo1.jpg');
    -$this->email->attach('/path/to/photo2.jpg');
    -$this->email->attach('/path/to/photo3.jpg');
    -
    -$this->email->send();     - - -

    $this->email->print_debugger()

    -

    Returns a string containing any server messages, the email headers, and the email messsage. Useful for debugging.

    - - -

    Overriding Word Wrapping

    - -

    If you have word wrapping enabled (recommended to comply with RFC 822) and you have a very long link in your email it can -get wrapped too, causing it to become un-clickable by the person receiving it. CodeIgniter lets you manually override -word wrapping within part of your message like this:

    - -The text of your email that
    -gets wrapped normally.
    -
    -{unwrap}http://example.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}
    -
    -More text that will be
    -wrapped normally.     - -

    Place the item you do not want word-wrapped between: {unwrap} {/unwrap}

    - - -
    - - - - - - + + + + + +Email Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Email Class

    + +

    CodeIgniter's robust Email Class supports the following features:

    + + +
      +
    • Multiple Protocols: Mail, Sendmail, and SMTP
      • +
    • Multiple recipients
      • +
    • CC and BCCs
      • +
    • HTML or Plaintext email
      • +
    • Attachments
      • +
    • Word wrapping
      • +
    • Priorities
      • +
    • BCC Batch Mode, enabling large email lists to be broken into small BCC batches.
      • +
    • Email Debugging tools
      • +
    + + +

    Sending Email

    + +

    Sending email is not only simple, but you can configure it on the fly or set your preferences in a config file.

    + +

    Here is a basic example demonstrating how you might send email. Note: This example assumes you are sending the email from one of your +controllers.

    + +$this->load->library('email');
    +
    +$this->email->from('your@example.com', 'Your Name');
    +$this->email->to('someone@example.com');
    +$this->email->cc('another@another-example.com');
    +$this->email->bcc('them@their-example.com');
    +
    +$this->email->subject('Email Test');
    +$this->email->message('Testing the email class.');
    +
    +$this->email->send();
    +
    +echo $this->email->print_debugger();     + + + + +

    Setting Email Preferences

    + +

    There are 17 different preferences available to tailor how your email messages are sent. You can either set them manually +as described here, or automatically via preferences stored in your config file, described below:

    + +

    Preferences are set by passing an array of preference values to the email initialize function. Here is an example of how you might set some preferences:

    + +$config['protocol'] = 'sendmail';
    +$config['mailpath'] = '/usr/sbin/sendmail';
    +$config['charset'] = 'iso-8859-1';
    +$config['wordwrap'] = TRUE;
    +
    +$this->email->initialize($config);     + +

    Note: Most of the preferences have default values that will be used if you do not set them.

    Setting Email Preferences in a Config File

    + +

    If you prefer not to set preferences using the above method, you can instead put them into a config file. +Simply create a new file called the email.php, add the $config +array in that file. Then save the file at config/email.php and it will be used automatically. You +will NOT need to use the $this->email->initialize() function if you save your preferences in a config file.

    + + + + +

    Email Preferences

    + +

    The following is a list of all the preferences that can be set when sending email.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescription
    useragentCodeIgniterNoneThe "user agent".
    protocolmailmail, sendmail, or smtpThe mail sending protocol.
    mailpath/usr/sbin/sendmailNoneThe server path to Sendmail.
    smtp_hostNo DefaultNoneSMTP Server Address.
    smtp_userNo DefaultNoneSMTP Username.
    smtp_passNo DefaultNoneSMTP Password.
    smtp_port25NoneSMTP Port.
    smtp_timeout5NoneSMTP Timeout (in seconds).
    wordwrapTRUETRUE or FALSE (boolean)Enable word-wrap.
    wrapchars76 Character count to wrap at.
    mailtypetexttext or htmlType of mail. If you send HTML email you must send it as a complete web page. Make sure you don't have any relative links or relative image paths otherwise they will not work.
    charsetutf-8Character set (utf-8, iso-8859-1, etc.).
    validateFALSETRUE or FALSE (boolean)Whether to validate the email address.
    priority31, 2, 3, 4, 5Email Priority. 1 = highest. 5 = lowest. 3 = normal.
    crlf\n"\r\n" or "\n" or "\r"Newline character. (Use "\r\n" to comply with RFC 822).
    newline\n"\r\n" or "\n" or "\r"Newline character. (Use "\r\n" to comply with RFC 822).
    bcc_batch_modeFALSETRUE or FALSE (boolean)Enable BCC Batch Mode.
    bcc_batch_size200NoneNumber of emails in each BCC batch.
    + + +

    Email Function Reference

    + +

    $this->email->from()

    +

    Sets the email address and name of the person sending the email:

    +$this->email->from('you@example.com', 'Your Name'); + +

    $this->email->reply_to()

    +

    Sets the reply-to address. If the information is not provided the information in the "from" function is used. Example:

    +$this->email->reply_to('you@example.com', 'Your Name'); + + +

    $this->email->to()

    +

    Sets the email address(s) of the recipient(s). Can be a single email, a comma-delimited list or an array:

    + +$this->email->to('someone@example.com'); +$this->email->to('one@example.com, two@example.com, three@example.com'); + +$list = array('one@example.com', 'two@example.com', 'three@example.com');
    +
    +$this->email->to($list);     + +

    $this->email->cc()

    +

    Sets the CC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

    + +

    $this->email->bcc()

    +

    Sets the BCC email address(s). Just like the "to", can be a single email, a comma-delimited list or an array.

    + + +

    $this->email->subject()

    +

    Sets the email subject:

    +$this->email->subject('This is my subject'); + +

    $this->email->message()

    +

    Sets the email message body:

    +$this->email->message('This is my message'); + +

    $this->email->set_alt_message()

    +

    Sets the alternative email message body:

    +$this->email->set_alt_message('This is the alternative message'); + +

    This is an optional message string which can be used if you send HTML formatted email. It lets you specify an alternative +message with no HTML formatting which is added to the header string for people who do not accept HTML email. +If you do not set your own message CodeIgniter will extract the message from your HTML email and strip the tags.

    + + + +

    $this->email->clear()

    +

    Initializes all the email variables to an empty state. This function is intended for use if you run the email sending function +in a loop, permitting the data to be reset between cycles.

    +foreach ($list as $name => $address)
    +{
    +    $this->email->clear();

    + +    $this->email->to($address);
    +    $this->email->from('your@example.com');
    +    $this->email->subject('Here is your info '.$name);
    +    $this->email->message('Hi '.$name.' Here is the info you requested.');
    +    $this->email->send();
    +}     + +

    If you set the parameter to TRUE any attachments will be cleared as well:

    + +$this->email->clear(TRUE); + + +

    $this->email->send()

    +

    The Email sending function. Returns boolean TRUE or FALSE based on success or failure, enabling it to be used +conditionally:

    + +if ( ! $this->email->send())
    +{
    +    // Generate error
    +}     + + +

    $this->email->attach()

    +

    Enables you to send an attachment. Put the file path/name in the first parameter. Note: Use a file path, not a URL. +For multiple attachments use the function multiple times. For example:

    + +$this->email->attach('/path/to/photo1.jpg');
    +$this->email->attach('/path/to/photo2.jpg');
    +$this->email->attach('/path/to/photo3.jpg');
    +
    +$this->email->send();     + + +

    $this->email->print_debugger()

    +

    Returns a string containing any server messages, the email headers, and the email messsage. Useful for debugging.

    + + +

    Overriding Word Wrapping

    + +

    If you have word wrapping enabled (recommended to comply with RFC 822) and you have a very long link in your email it can +get wrapped too, causing it to become un-clickable by the person receiving it. CodeIgniter lets you manually override +word wrapping within part of your message like this:

    + +The text of your email that
    +gets wrapped normally.
    +
    +{unwrap}http://example.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}
    +
    +More text that will be
    +wrapped normally.     + +

    Place the item you do not want word-wrapped between: {unwrap} {/unwrap}

    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 092dad2a..a0733ab1 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -1,182 +1,182 @@ - - - - - -Encryption Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Encryption Class

    - -

    The Encryption Class provides two-way data encryption. It uses a scheme that pre-compiles -the message using a randomly hashed bitwise XOR encoding scheme, which is then encrypted using -the Mcrypt library. If Mcrypt is not available on your server the encoded message will -still provide a reasonable degree of security for encrypted sessions or other such "light" purposes. -If Mcrypt is available, you'll effectively end up with a double-encrypted message string, which should -provide a very high degree of security.

    - - -

    Setting your Key

    - -

    A key is a piece of information that controls the cryptographic process and permits an encrypted string to be decoded. -In fact, the key you chose will provide the only means to decode data that was encrypted with that key, -so not only must you choose the key carefully, you must never change it if you intend use it for persistent data.

    - -

    It goes without saying that you should guard your key carefully. -Should someone gain access to your key, the data will be easily decoded. If your server is not totally under your control -it's impossible to ensure key security so you may want to think carefully before using it for anything -that requires high security, like storing credit card numbers.

    - -

    To take maximum advantage of the encryption algorithm, your key should be 32 characters in length (128 bits). -The key should be as random a string as you can concoct, with numbers and uppercase and lowercase letters. -Your key should not be a simple text string. In order to be cryptographically secure it -needs to be as random as possible.

    - -

    Your key can be either stored in your application/config/config.php, or you can design your own -storage mechanism and pass the key dynamically when encoding/decoding.

    - -

    To save your key to your application/config/config.php, open the file and set:

    -$config['encryption_key'] = "YOUR KEY"; - - -

    Message Length

    - -

    It's important for you to know that the encoded messages the encryption function generates will be approximately 2.6 times longer than the original -message. For example, if you encrypt the string "my super secret data", which is 21 characters in length, you'll end up -with an encoded string that is roughly 55 characters (we say "roughly" because the encoded string length increments in -64 bit clusters, so it's not exactly linear). Keep this information in mind when selecting your data storage mechanism. Cookies, -for example, can only hold 4K of information.

    - - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the Encryption class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('encrypt'); -

    Once loaded, the Encrypt library object will be available using: $this->encrypt

    - - -

    $this->encrypt->encode()

    - -

    Performs the data encryption and returns it as a string. Example:

    - -$msg = 'My secret message';
    -
    -$encrypted_string = $this->encrypt->encode($msg);     - -

    You can optionally pass your encryption key via the second parameter if you don't want to use the one in your config file:

    - - -$msg = 'My secret message';
    -$key = 'super-secret-key';
    -
    -$encrypted_string = $this->encrypt->encode($msg, $key);     - - -

    $this->encrypt->decode()

    - -

    Decrypts an encoded string. Example:

    - - -$encrypted_string = 'APANtByIGI1BpVXZTJgcsAG8GZl8pdwwa84';
    -
    -$plaintext_string = $this->encrypt->decode($encrypted_string);     - - -

    $this->encrypt->set_cipher();

    - -

    Permits you to set an Mcrypt cipher. By default it uses MCRYPT_RIJNDAEL_256. Example:

    -$this->encrypt->set_cipher(MCRYPT_BLOWFISH); -

    Please visit php.net for a list of available ciphers.

    - -

    If you'd like to manually test whether your server supports Mcrypt you can use:

    -echo ( ! function_exists('mcrypt_encrypt')) ? 'Nope' : 'Yup'; - - -

    $this->encrypt->set_mode();

    - -

    Permits you to set an Mcrypt mode. By default it uses MCRYPT_MODE_ECB. Example:

    -$this->encrypt->set_mode(MCRYPT_MODE_CFB); -

    Please visit php.net for a list of available modes.

    - - -

    $this->encrypt->sha1();

    -

    SHA1 encoding function. Provide a string and it will return a 160 bit one way hash. Note: SHA1, just like MD5 is non-decodable. Example:

    -$hash = $this->encrypt->sha1('Some string'); - -

    Many PHP installations have SHA1 support by default so if all you need is to encode a hash it's simpler to use the native -function:

    - -$hash = sha1('Some string'); - -

    If your server does not support SHA1 you can use the provided function.

    - - - -
    - - - - - - + + + + + +Encryption Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Encryption Class

    + +

    The Encryption Class provides two-way data encryption. It uses a scheme that pre-compiles +the message using a randomly hashed bitwise XOR encoding scheme, which is then encrypted using +the Mcrypt library. If Mcrypt is not available on your server the encoded message will +still provide a reasonable degree of security for encrypted sessions or other such "light" purposes. +If Mcrypt is available, you'll effectively end up with a double-encrypted message string, which should +provide a very high degree of security.

    + + +

    Setting your Key

    + +

    A key is a piece of information that controls the cryptographic process and permits an encrypted string to be decoded. +In fact, the key you chose will provide the only means to decode data that was encrypted with that key, +so not only must you choose the key carefully, you must never change it if you intend use it for persistent data.

    + +

    It goes without saying that you should guard your key carefully. +Should someone gain access to your key, the data will be easily decoded. If your server is not totally under your control +it's impossible to ensure key security so you may want to think carefully before using it for anything +that requires high security, like storing credit card numbers.

    + +

    To take maximum advantage of the encryption algorithm, your key should be 32 characters in length (128 bits). +The key should be as random a string as you can concoct, with numbers and uppercase and lowercase letters. +Your key should not be a simple text string. In order to be cryptographically secure it +needs to be as random as possible.

    + +

    Your key can be either stored in your application/config/config.php, or you can design your own +storage mechanism and pass the key dynamically when encoding/decoding.

    + +

    To save your key to your application/config/config.php, open the file and set:

    +$config['encryption_key'] = "YOUR KEY"; + + +

    Message Length

    + +

    It's important for you to know that the encoded messages the encryption function generates will be approximately 2.6 times longer than the original +message. For example, if you encrypt the string "my super secret data", which is 21 characters in length, you'll end up +with an encoded string that is roughly 55 characters (we say "roughly" because the encoded string length increments in +64 bit clusters, so it's not exactly linear). Keep this information in mind when selecting your data storage mechanism. Cookies, +for example, can only hold 4K of information.

    + + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the Encryption class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('encrypt'); +

    Once loaded, the Encrypt library object will be available using: $this->encrypt

    + + +

    $this->encrypt->encode()

    + +

    Performs the data encryption and returns it as a string. Example:

    + +$msg = 'My secret message';
    +
    +$encrypted_string = $this->encrypt->encode($msg);     + +

    You can optionally pass your encryption key via the second parameter if you don't want to use the one in your config file:

    + + +$msg = 'My secret message';
    +$key = 'super-secret-key';
    +
    +$encrypted_string = $this->encrypt->encode($msg, $key);     + + +

    $this->encrypt->decode()

    + +

    Decrypts an encoded string. Example:

    + + +$encrypted_string = 'APANtByIGI1BpVXZTJgcsAG8GZl8pdwwa84';
    +
    +$plaintext_string = $this->encrypt->decode($encrypted_string);     + + +

    $this->encrypt->set_cipher();

    + +

    Permits you to set an Mcrypt cipher. By default it uses MCRYPT_RIJNDAEL_256. Example:

    +$this->encrypt->set_cipher(MCRYPT_BLOWFISH); +

    Please visit php.net for a list of available ciphers.

    + +

    If you'd like to manually test whether your server supports Mcrypt you can use:

    +echo ( ! function_exists('mcrypt_encrypt')) ? 'Nope' : 'Yup'; + + +

    $this->encrypt->set_mode();

    + +

    Permits you to set an Mcrypt mode. By default it uses MCRYPT_MODE_ECB. Example:

    +$this->encrypt->set_mode(MCRYPT_MODE_CFB); +

    Please visit php.net for a list of available modes.

    + + +

    $this->encrypt->sha1();

    +

    SHA1 encoding function. Provide a string and it will return a 160 bit one way hash. Note: SHA1, just like MD5 is non-decodable. Example:

    +$hash = $this->encrypt->sha1('Some string'); + +

    Many PHP installations have SHA1 support by default so if all you need is to encode a hash it's simpler to use the native +function:

    + +$hash = sha1('Some string'); + +

    If your server does not support SHA1 you can use the provided function.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index fb976975..a840c1ec 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -1,438 +1,438 @@ - - - - - -File Uploading Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    File Uploading Class

    - -

    CodeIgniter's File Uploading Class permits files to be uploaded. You can set various -preferences, restricting the type and size of the files.

    - - -

    The Process

    - -

    Uploading a file involves the following general process:

    - - -
      -
    • An upload form is displayed, allowing a user to select a file and upload it.
      • -
    • When the form is submitted, the file is uploaded to the destination you specify.
      • -
    • Along the way, the file is validated to make sure it is allowed to be uploaded based on the preferences you set.
      • -
    • Once uploaded, the user will be shown a success message.
      • -
    - -

    To demonstrate this process here is brief tutorial. Afterward you'll find reference information.

    - -

    Creating the Upload Form

    - - - -

    Using a text editor, create a form called upload_form.php. In it, place this code and save it to your applications/views/ -folder:

    - - - - -

    You'll notice we are using a form helper to create the opening form tag. File uploads require a multipart form, so the helper -creates the proper syntax for you. You'll also notice we have an $error variable. This is so we can show error messages in the event -the user does something wrong.

    - - -

    The Success Page

    - -

    Using a text editor, create a form called upload_success.php. -In it, place this code and save it to your applications/views/ folder:

    - - - - -

    The Controller

    - -

    Using a text editor, create a controller called upload.php. In it, place this code and save it to your applications/controllers/ -folder:

    - - - - - -

    The Upload Folder

    - -

    You'll need a destination folder for your uploaded images. Create a folder at the root of your CodeIgniter installation called -uploads and set its file permissions to 777.

    - - -

    Try it!

    - -

    To try your form, visit your site using a URL similar to this one:

    - -example.com/index.php/upload/ - -

    You should see an upload form. Try uploading an image file (either a jpg, gif, or png). If the path in your -controller is correct it should work.

    - - -

     

    - -

    Reference Guide

    - - -

    Initializing the Upload Class

    - -

    Like most other classes in CodeIgniter, the Upload class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('upload'); -

    Once the Upload class is loaded, the object will be available using: $this->upload

    - - -

    Setting Preferences

    - -

    Similar to other libraries, you'll control what is allowed to be upload based on your preferences. In the controller you -built above you set the following preferences:

    - -$config['upload_path'] = './uploads/';
    -$config['allowed_types'] = 'gif|jpg|png';
    -$config['max_size'] = '100';
    -$config['max_width'] = '1024';
    -$config['max_height'] = '768';
    -
    -$this->load->library('upload', $config);

    - -// Alternately you can set preferences by calling the initialize function. Useful if you auto-load the class:
    -$this->upload->initialize($config);     - -

    The above preferences should be fairly self-explanatory. Below is a table describing all available preferences.

    - - -

    Preferences

    - -

    The following preferences are available. The default value indicates what will be used if you do not specify that preference.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefault ValueOptionsDescription
    upload_pathNoneNoneThe path to the folder where the upload should be placed. The folder must be writable and the path can be absolute or relative.
    allowed_typesNoneNoneThe mime types corresponding to the types of files you allow to be uploaded. Usually the file extension can be used as the mime type. Separate multiple types with a pipe.
    overwriteFALSETRUE/FALSE (boolean)If set to true, if a file with the same name as the one you are uploading exists, it will be overwritten. If set to false, a number will be appended to the filename if another with the same name exists.
    max_size0NoneThe maximum size (in kilobytes) that the file can be. Set to zero for no limit. Note: Most PHP installations have their own limit, as specified in the php.ini file. Usually 2 MB (or 2048 KB) by default.
    max_width0NoneThe maximum width (in pixels) that the file can be. Set to zero for no limit.
    max_height0NoneThe maximum height (in pixels) that the file can be. Set to zero for no limit.
    max_filename0NoneThe maximum length that a file name can be. Set to zero for no limit.
    encrypt_nameFALSETRUE/FALSE (boolean)If set to TRUE the file name will be converted to a random encrypted string. This can be useful if you would like the file saved with a name that can not be discerned by the person uploading it.
    remove_spacesTRUETRUE/FALSE (boolean)If set to TRUE, any spaces in the file name will be converted to underscores. This is recommended.
    - - -

    Setting preferences in a config file

    - -

    If you prefer not to set preferences using the above method, you can instead put them into a config file. -Simply create a new file called the upload.php, add the $config -array in that file. Then save the file in: config/upload.php and it will be used automatically. You -will NOT need to use the $this->upload->initialize function if you save your preferences in a config file.

    - - -

    Function Reference

    - -

    The following functions are available

    - - -

    $this->upload->do_upload()

    - -

    Performs the upload based on the preferences you've set. Note: By default the upload routine expects the file to come from a form field -called userfile, and the form must be a "multipart type:

    - -<form method="post" action="some_action" enctype="multipart/form-data" /> - -

    If you would like to set your own field name simply pass its value to the do_upload function:

    - - -$field_name = "some_field_name";
    -$this->upload->do_upload($field_name)     - - -

    $this->upload->display_errors()

    - -

    Retrieves any error messages if the do_upload() function returned false. The function does not echo automatically, it -returns the data so you can assign it however you need.

    - -

    Formatting Errors

    -

    By default the above function wraps any errors within <p> tags. You can set your own delimiters like this:

    - -$this->upload->display_errors('<p>', '</p>'); - -

    $this->upload->data()

    - -

    This is a helper function that returns an array containing all of the data related to the file you uploaded. -Here is the array prototype:

    - -Array
    -(
    -    [file_name]    => mypic.jpg
    -    [file_type]    => image/jpeg
    -    [file_path]    => /path/to/your/upload/
    -    [full_path]    => /path/to/your/upload/jpg.jpg
    -    [raw_name]     => mypic
    -    [orig_name]    => mypic.jpg
    -    [file_ext]     => .jpg
    -    [file_size]    => 22.2
    -    [is_image]     => 1
    -    [image_width]  => 800
    -    [image_height] => 600
    -    [image_type]   => jpeg
    -    [image_size_str] => width="800" height="200"
    -)     - -

    Explanation

    - -

    Here is an explanation of the above array items.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ItemDescription
    file_nameThe name of the file that was uploaded including the file extension.
    file_typeThe file's Mime type
    file_pathThe absolute server path to the file
    full_pathThe absolute server path including the file name
    raw_nameThe file name without the extension
    orig_nameThe original file name. This is only useful if you use the encrypted name option.
    file_extThe file extension with period
    file_sizeThe file size in kilobytes
    is_imageWhether the file is an image or not. 1 = image. 0 = not.
    image_widthImage width.
    image_heigthImage height
    image_typeImage type. Typically the file extension without the period.
    image_size_strA string containing the width and height. Useful to put into an image tag.
    - -
    - - - - - - + + + + + +File Uploading Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    File Uploading Class

    + +

    CodeIgniter's File Uploading Class permits files to be uploaded. You can set various +preferences, restricting the type and size of the files.

    + + +

    The Process

    + +

    Uploading a file involves the following general process:

    + + +
      +
    • An upload form is displayed, allowing a user to select a file and upload it.
      • +
    • When the form is submitted, the file is uploaded to the destination you specify.
      • +
    • Along the way, the file is validated to make sure it is allowed to be uploaded based on the preferences you set.
      • +
    • Once uploaded, the user will be shown a success message.
      • +
    + +

    To demonstrate this process here is brief tutorial. Afterward you'll find reference information.

    + +

    Creating the Upload Form

    + + + +

    Using a text editor, create a form called upload_form.php. In it, place this code and save it to your applications/views/ +folder:

    + + + + +

    You'll notice we are using a form helper to create the opening form tag. File uploads require a multipart form, so the helper +creates the proper syntax for you. You'll also notice we have an $error variable. This is so we can show error messages in the event +the user does something wrong.

    + + +

    The Success Page

    + +

    Using a text editor, create a form called upload_success.php. +In it, place this code and save it to your applications/views/ folder:

    + + + + +

    The Controller

    + +

    Using a text editor, create a controller called upload.php. In it, place this code and save it to your applications/controllers/ +folder:

    + + + + + +

    The Upload Folder

    + +

    You'll need a destination folder for your uploaded images. Create a folder at the root of your CodeIgniter installation called +uploads and set its file permissions to 777.

    + + +

    Try it!

    + +

    To try your form, visit your site using a URL similar to this one:

    + +example.com/index.php/upload/ + +

    You should see an upload form. Try uploading an image file (either a jpg, gif, or png). If the path in your +controller is correct it should work.

    + + +

     

    + +

    Reference Guide

    + + +

    Initializing the Upload Class

    + +

    Like most other classes in CodeIgniter, the Upload class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('upload'); +

    Once the Upload class is loaded, the object will be available using: $this->upload

    + + +

    Setting Preferences

    + +

    Similar to other libraries, you'll control what is allowed to be upload based on your preferences. In the controller you +built above you set the following preferences:

    + +$config['upload_path'] = './uploads/';
    +$config['allowed_types'] = 'gif|jpg|png';
    +$config['max_size'] = '100';
    +$config['max_width'] = '1024';
    +$config['max_height'] = '768';
    +
    +$this->load->library('upload', $config);

    + +// Alternately you can set preferences by calling the initialize function. Useful if you auto-load the class:
    +$this->upload->initialize($config);     + +

    The above preferences should be fairly self-explanatory. Below is a table describing all available preferences.

    + + +

    Preferences

    + +

    The following preferences are available. The default value indicates what will be used if you do not specify that preference.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescription
    upload_pathNoneNoneThe path to the folder where the upload should be placed. The folder must be writable and the path can be absolute or relative.
    allowed_typesNoneNoneThe mime types corresponding to the types of files you allow to be uploaded. Usually the file extension can be used as the mime type. Separate multiple types with a pipe.
    overwriteFALSETRUE/FALSE (boolean)If set to true, if a file with the same name as the one you are uploading exists, it will be overwritten. If set to false, a number will be appended to the filename if another with the same name exists.
    max_size0NoneThe maximum size (in kilobytes) that the file can be. Set to zero for no limit. Note: Most PHP installations have their own limit, as specified in the php.ini file. Usually 2 MB (or 2048 KB) by default.
    max_width0NoneThe maximum width (in pixels) that the file can be. Set to zero for no limit.
    max_height0NoneThe maximum height (in pixels) that the file can be. Set to zero for no limit.
    max_filename0NoneThe maximum length that a file name can be. Set to zero for no limit.
    encrypt_nameFALSETRUE/FALSE (boolean)If set to TRUE the file name will be converted to a random encrypted string. This can be useful if you would like the file saved with a name that can not be discerned by the person uploading it.
    remove_spacesTRUETRUE/FALSE (boolean)If set to TRUE, any spaces in the file name will be converted to underscores. This is recommended.
    + + +

    Setting preferences in a config file

    + +

    If you prefer not to set preferences using the above method, you can instead put them into a config file. +Simply create a new file called the upload.php, add the $config +array in that file. Then save the file in: config/upload.php and it will be used automatically. You +will NOT need to use the $this->upload->initialize function if you save your preferences in a config file.

    + + +

    Function Reference

    + +

    The following functions are available

    + + +

    $this->upload->do_upload()

    + +

    Performs the upload based on the preferences you've set. Note: By default the upload routine expects the file to come from a form field +called userfile, and the form must be a "multipart type:

    + +<form method="post" action="some_action" enctype="multipart/form-data" /> + +

    If you would like to set your own field name simply pass its value to the do_upload function:

    + + +$field_name = "some_field_name";
    +$this->upload->do_upload($field_name)     + + +

    $this->upload->display_errors()

    + +

    Retrieves any error messages if the do_upload() function returned false. The function does not echo automatically, it +returns the data so you can assign it however you need.

    + +

    Formatting Errors

    +

    By default the above function wraps any errors within <p> tags. You can set your own delimiters like this:

    + +$this->upload->display_errors('<p>', '</p>'); + +

    $this->upload->data()

    + +

    This is a helper function that returns an array containing all of the data related to the file you uploaded. +Here is the array prototype:

    + +Array
    +(
    +    [file_name]    => mypic.jpg
    +    [file_type]    => image/jpeg
    +    [file_path]    => /path/to/your/upload/
    +    [full_path]    => /path/to/your/upload/jpg.jpg
    +    [raw_name]     => mypic
    +    [orig_name]    => mypic.jpg
    +    [file_ext]     => .jpg
    +    [file_size]    => 22.2
    +    [is_image]     => 1
    +    [image_width]  => 800
    +    [image_height] => 600
    +    [image_type]   => jpeg
    +    [image_size_str] => width="800" height="200"
    +)     + +

    Explanation

    + +

    Here is an explanation of the above array items.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ItemDescription
    file_nameThe name of the file that was uploaded including the file extension.
    file_typeThe file's Mime type
    file_pathThe absolute server path to the file
    full_pathThe absolute server path including the file name
    raw_nameThe file name without the extension
    orig_nameThe original file name. This is only useful if you use the encrypted name option.
    file_extThe file extension with period
    file_sizeThe file size in kilobytes
    is_imageWhether the file is an image or not. 1 = image. 0 = not.
    image_widthImage width.
    image_heigthImage height
    image_typeImage type. Typically the file extension without the period.
    image_size_strA string containing the width and height. Useful to put into an image tag.
    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 63111919..684fe9b5 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -1,1221 +1,1221 @@ - - - - - -Form Validation : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Form Validation

    - -

    CodeIgniter provides a comprehensive form validation and data prepping class that helps minimize the amount of code you'll write.

    - -

    Note:  As of CodeIgniter 1.7.0, this Form Validation class supercedes the old Validation class, which is now deprecated. We -have left the old class in the library so applications currently using it will not break, but you are encouraged to migrate to this new version.

    - - - - - - - - -

     

    - - -

    Overview

    - - -

    Before explaining CodeIgniter's approach to data validation, let's describe the ideal scenario:

    - -
      -
    1. A form is displayed.
      2. -
    2. You fill it in and submit it.
      3. -
    3. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data -along with an error message describing the problem.
      4. -
    4. This process continues until you have submitted a valid form.
      5. -
    - -

    On the receiving end, the script must:

    - -
      -
    1. Check for required data.
      2. -
    2. Verify that the data is of the correct type, and meets the correct criteria. For example, if a username is submitted -it must be validated to contain only permitted characters. It must be of a minimum length, -and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.
      3. -
    3. Sanitize the data for security.
      4. -
    4. Pre-format the data if needed (Does the data need to be trimmed? HTML encoded? Etc.)
      5. -
    5. Prep the data for insertion in the database.
      6. -
    - - -

    Although there is nothing terribly complex about the above process, it usually requires a significant -amount of code, and to display error messages, various control structures are usually placed within the form HTML. -Form validation, while simple to create, is generally very messy and tedious to implement.

    - -

     

    - - - -

    Form Validation Tutorial

    - -

    What follows is a "hands on" tutorial for implementing CodeIgniters Form Validation.

    - - -

    In order to implement form validation you'll need three things:

    - -
      -
    1. A View file containing a form.
      2. -
    2. A View file containing a "success" message to be displayed upon successful submission.
      3. -
    3. A controller function to receive and process the submitted data.
      4. -
    - -

    Let's create those three things, using a member sign-up form as the example.

    - - - - - -

    The Form

    - -

    Using a text editor, create a form called myform.php. In it, place this code and save it to your applications/views/ -folder:

    - - - - - - - - -

    The Success Page

    - - -

    Using a text editor, create a form called formsuccess.php. In it, place this code and save it to your applications/views/ -folder:

    - - - - - - - -

    The Controller

    - -

    Using a text editor, create a controller called form.php. In it, place this code and save it to your applications/controllers/ -folder:

    - - - - - -

    Try it!

    - -

    To try your form, visit your site using a URL similar to this one:

    - -example.com/index.php/form/ - -

    If you submit the form you should simply see the form reload. That's because you haven't set up any validation -rules yet.

    - -

    Since you haven't told the Form Validation class to validate anything yet, it returns FALSE (boolean false) by default. The run() -function only returns TRUE if it has successfully applied your rules without any of them failing.

    - - -

    Explanation

    - -

    You'll notice several things about the above pages:

    - -

    The form (myform.php) is a standard web form with a couple exceptions:

    - -
      -
    1. It uses a form helper to create the form opening. -Technically, this isn't necessary. You could create the form using standard HTML. However, the benefit of using the helper -is that it generates the action URL for you, based on the URL in your config file. This makes your application more portable in the event your URLs change.
      2. - -
    2. At the top of the form you'll notice the following function call: -<?php echo validation_errors(); ?> - -

      This function will return any error messages sent back by the validator. If there are no messages it returns an empty string.

      -
      3. -
    - -

    The controller (form.php) has one function: index(). This function initializes the validation class and -loads the form helper and URL helper used by your view files. It also runs -the validation routine. Based on -whether the validation was successful it either presents the form or the success page.

    - - - - - - -

    Setting Validation Rules

    - -

    CodeIgniter lets you set as many validation rules as you need for a given field, cascading them in order, and it even lets you prep and pre-process the field data -at the same time. To set validation rules you will use the set_rules() function:

    - -$this->form_validation->set_rules(); - -

    The above function takes three parameters as input:

    - -
      -
    1. The field name - the exact name you've given the form field.
      2. -
    2. A "human" name for this field, which will be inserted into the error message. For example, if your field is named "user" you might give it a human name of "Username". Note: If you would like the field name to be stored in a language file, please see Translating Field Names.
      3. -
    3. The validation rules for this form field.
      4. -
    - - -


    Here is an example. In your controller (form.php), add this code just below the validation initialization function:

    - - -$this->form_validation->set_rules('username', 'Username', 'required');
    -$this->form_validation->set_rules('password', 'Password', 'required');
    -$this->form_validation->set_rules('passconf', 'Password Confirmation', 'required');
    -$this->form_validation->set_rules('email', 'Email', 'required');
    -     - -

    Your controller should now look like this:

    - - - -

    Now submit the form with the fields blank and you should see the error messages. -If you submit the form with all the fields populated you'll see your success page.

    - -

    Note: The form fields are not yet being re-populated with the data when -there is an error. We'll get to that shortly.

    - - - - - -

    Setting Rules Using an Array

    - -

    Before moving on it should be noted that the rule setting function can be passed an array if you prefer to set all your rules in one action. -If you use this approach you must name your array keys as indicated:

    - - -$config = array(
    -               array(
    -                     'field'   => 'username',
    -                     'label'   => 'Username',
    -                     'rules'   => 'required'
    -                  ),
    -               array(
    -                     'field'   => 'password',
    -                     'label'   => 'Password',
    -                     'rules'   => 'required'
    -                  ),
    -               array(
    -                     'field'   => 'passconf',
    -                     'label'   => 'Password Confirmation',
    -                     'rules'   => 'required'
    -                  ),   
    -               array(
    -                     'field'   => 'email',
    -                     'label'   => 'Email',
    -                     'rules'   => 'required'
    -                  )
    -            );
    -
    -$this->form_validation->set_rules($config); -     - - - - - - - -

    Cascading Rules

    - -

    CodeIgniter lets you pipe multiple rules together. Let's try it. Change your rules in the third parameter of rule setting function, like this:

    - - -$this->form_validation->set_rules('username', 'Username', 'required|min_length[5]|max_length[12]');
    -$this->form_validation->set_rules('password', 'Password', 'required|matches[passconf]');
    -$this->form_validation->set_rules('passconf', 'Password Confirmation', 'required');
    -$this->form_validation->set_rules('email', 'Email', 'required|valid_email');
    -     - -

    The above code sets the following rules:

    - -
      -
    1. The username field be no shorter than 5 characters and no longer than 12.
      2. -
    2. The password field must match the password confirmation field.
      3. -
    3. The email field must contain a valid email address.
      4. -
    - -

    Give it a try! Submit your form without the proper data and you'll see new error messages that correspond to your new rules. -There are numerous rules available which you can read about in the validation reference.

    - - - - -

    Prepping Data

    - -

    In addition to the validation functions like the ones we used above, you can also prep your data in various ways. -For example, you can set up rules like this:

    - - -$this->form_validation->set_rules('username', 'Username', 'trim|required|min_length[5]|max_length[12]|xss_clean');
    -$this->form_validation->set_rules('password', 'Password', 'trim|required|matches[passconf]|md5');
    -$this->form_validation->set_rules('passconf', 'Password Confirmation', 'trim|required');
    -$this->form_validation->set_rules('email', 'Email', 'trim|required|valid_email');
    -     - - -

    In the above example, we are "trimming" the fields, converting the password to MD5, and running the username through -the "xss_clean" function, which removes malicious data.

    - -

    Any native PHP function that accepts one parameter can be used as a rule, like htmlspecialchars, -trim, MD5, etc.

    - -

    Note: You will generally want to use the prepping functions after -the validation rules so if there is an error, the original data will be shown in the form.

    - - - - - -

    Re-populating the form

    - -

    Thus far we have only been dealing with errors. It's time to repopulate the form field with the submitted data. CodeIgniter offers several helper functions -that permit you to do this. The one you will use most commonly is:

    - -set_value('field name') - - -

    Open your myform.php view file and update the value in each field using the set_value() function:

    - -

    Don't forget to include each. field name in the set_value() functions!

    - - - - - -

    Now reload your page and submit the form so that it triggers an error. Your form fields should now be re-populated

    - -

    Note: The Function Reference section below contains functions that -permit you to re-populate <select> menus, radio buttons, and checkboxes.

    - - -

    Important Note: If you use an array as the name of a form field, you must supply it as an array to the function. Example:

    - -<input type="text" name="colors[]" value="<?php echo set_value('colors[]'); ?>" size="50" /> - -

    For more info please see the Using Arrays as Field Names section below.

    - - - - - - -

    Callbacks: Your own Validation Functions

    - -

    The validation system supports callbacks to your own validation functions. This permits you to extend the validation class -to meet your needs. For example, if you need to run a database query to see if the user is choosing a unique username, you can -create a callback function that does that. Let's create a example of this.

    - -

    In your controller, change the "username" rule to this:

    - -$this->form_validation->set_rules('username', 'Username', 'callback_username_check'); - - -

    Then add a new function called username_check to your controller. Here's how your controller should now look:

    - - - - -

    Reload your form and submit it with the word "test" as the username. You can see that the form field data was passed to your -callback function for you to process.

    - -

    To invoke a callback just put the function name in a rule, with "callback_" as the rule prefix.

    - -

    You can also process the form data that is passed to your callback and return it. If your callback returns anything other than a boolean TRUE/FALSE -it is assumed that the data is your newly processed form data.

    - - - - - -

    Setting Error Messages

    - - -

    All of the native error messages are located in the following language file: language/english/form_validation_lang.php

    - -

    To set your own custom message you can either edit that file, or use the following function:

    - -$this->form_validation->set_message('rule', 'Error Message'); - -

    Where rule corresponds to the name of a particular rule, and Error Message is the text you would like displayed.

    - -

    If you include %s in your error string, it will be replaced with the "human" name you used for your field when you set your rules.

    - -

    In the "callback" example above, the error message was set by passing the name of the function:

    - -$this->form_validation->set_message('username_check') - -

    You can also override any error message found in the language file. For example, to change the message for the "required" rule you will do this:

    - -$this->form_validation->set_message('required', 'Your custom message here'); - - - - -

    Translating Field Names

    - -

    If you would like to store the "human" name you passed to the set_rules() function in a language file, and therefore make the name able to be translated, here's how:

    - -

    First, prefix your "human" name with lang:, as in this example:

    - - -$this->form_validation->set_rules('first_name', 'lang:first_name', 'required');
    -     - -

    Then, store the name in one of your language file arrays (without the prefix):

    - -$lang['first_name'] = 'First Name'; - -

    Note: If you store your array item in a language file that is not loaded automatically by CI, you'll need to remember to load it in your controller using:

    - -$this->lang->load('file_name'); - -

    See the Language Class page for more info regarding language files.

    - - - -

    Changing the Error Delimiters

    - -

    By default, the Form Validation class adds a paragraph tag (<p>) around each error message shown. You can either change these delimiters globally or -individually.

    - -
      - -
    1. Changing delimiters Globally - -

      To globally change the error delimiters, in your controller function, just after loading the Form Validation class, add this:

      - -$this->form_validation->set_error_delimiters('<div class="error">', '</div>'); - -

      In this example, we've switched to using div tags.

      - -
      2. - -
    2. Changing delimiters Individually - -

      Each of the two error generating functions shown in this tutorial can be supplied their own delimiters as follows:

      - -<?php echo form_error('field name', '<div class="error">', '</div>'); ?> - -

      Or:

      - -<?php echo validation_errors('<div class="error">', '</div>'); ?> - -
      3. -
    - - - - - -

    Showing Errors Individually

    - -

    If you prefer to show an error message next to each form field, rather than as a list, you can use the form_error() function.

    - -

    Try it! Change your form so that it looks like this:

    - - - -

    If there are no errors, nothing will be shown. If there is an error, the message will appear.

    - -

    Important Note: If you use an array as the name of a form field, you must supply it as an array to the function. Example:

    - -<?php echo form_error('options[size]'); ?>
    -<input type="text" name="options[size]" value="<?php echo set_value("options[size]"); ?>" size="50" /> -     - -

    For more info please see the Using Arrays as Field Names section below.

    - - - - -

     

    - - - -

    Saving Sets of Validation Rules to a Config File

    - -

    A nice feature of the Form Validation class is that it permits you to store all your validation rules for your entire application in a config file. You -can organize these rules into "groups". These groups can either be loaded automatically when a matching controller/function is called, or -you can manually call each set as needed.

    - -

    How to save your rules

    - -

    To store your validation rules, simply create a file named form_validation.php in your application/config/ folder. -In that file you will place an array named $config with your rules. As shown earlier, the validation array will have this prototype:

    - - -$config = array(
    -               array(
    -                     'field'   => 'username',
    -                     'label'   => 'Username',
    -                     'rules'   => 'required'
    -                  ),
    -               array(
    -                     'field'   => 'password',
    -                     'label'   => 'Password',
    -                     'rules'   => 'required'
    -                  ),
    -               array(
    -                     'field'   => 'passconf',
    -                     'label'   => 'Password Confirmation',
    -                     'rules'   => 'required'
    -                  ),   
    -               array(
    -                     'field'   => 'email',
    -                     'label'   => 'Email',
    -                     'rules'   => 'required'
    -                  )
    -            );
    -     - -

    Your validation rule file will be loaded automatically and used when you call the run() function.

    - -

    Please note that you MUST name your array $config.

    - -

    Creating Sets of Rules

    - -

    In order to organize your rules into "sets" requires that you place them into "sub arrays". Consider the following example, showing two sets of rules. -We've arbitrarily called these two rules "signup" and "email". You can name your rules anything you want:

    - - -$config = array(
    -                 'signup' => array(
    -                                    array(
    -                                            'field' => 'username',
    -                                            'label' => 'Username',
    -                                            'rules' => 'required'
    -                                         ),
    -                                    array(
    -                                            'field' => 'password',
    -                                            'label' => 'Password',
    -                                            'rules' => 'required'
    -                                         ),
    -                                    array(
    -                                            'field' => 'passconf',
    -                                            'label' => 'PasswordConfirmation',
    -                                            'rules' => 'required'
    -                                         ),
    -                                    array(
    -                                            'field' => 'email',
    -                                            'label' => 'Email',
    -                                            'rules' => 'required'
    -                                         )
    -                                    ),
    -                 'email' => array(
    -                                    array(
    -                                            'field' => 'emailaddress',
    -                                            'label' => 'EmailAddress',
    -                                            'rules' => 'required|valid_email'
    -                                         ),
    -                                    array(
    -                                            'field' => 'name',
    -                                            'label' => 'Name',
    -                                            'rules' => 'required|alpha'
    -                                         ),
    -                                    array(
    -                                            'field' => 'title',
    -                                            'label' => 'Title',
    -                                            'rules' => 'required'
    -                                         ),
    -                                    array(
    -                                            'field' => 'message',
    -                                            'label' => 'MessageBody',
    -                                            'rules' => 'required'
    -                                         )
    -                                    )                          
    -               );
    -     - - -

    Calling a Specific Rule Group

    - -

    In order to call a specific group you will pass its name to the run() function. For example, to call the signup rule you will do this:

    - - -if ($this->form_validation->run('signup') == FALSE)
    -{
    -   $this->load->view('myform');
    -}
    -else
    -{
    -   $this->load->view('formsuccess');
    -}
    -     - - - -

    Associating a Controller Function with a Rule Group

    - -

    An alternate (and more automatic) method of calling a rule group is to name it according to the controller class/function you intend to use it with. For example, let's say you -have a controller named Member and a function named signup. Here's what your class might look like:

    - - -<?php

    -class Member extends Controller {
    -
    -   function signup()
    -   {      
    -      $this->load->library('form_validation');
    -            
    -      if ($this->form_validation->run() == FALSE)
    -      {
    -         $this->load->view('myform');
    -      }
    -      else
    -      {
    -         $this->load->view('formsuccess');
    -      }
    -   }
    -}
    -?>     - -

    In your validation config file, you will name your rule group member/signup:

    - - -$config = array(
    -           'member/signup' = array(
    -                                    array(
    -                                            'field' => 'username',
    -                                            'label' => 'Username',
    -                                            'rules' => 'required'
    -                                         ),
    -                                    array(
    -                                            'field' => 'password',
    -                                            'label' => 'Password',
    -                                            'rules' => 'required'
    -                                         ),
    -                                    array(
    -                                            'field' => 'passconf',
    -                                            'label' => 'PasswordConfirmation',
    -                                            'rules' => 'required'
    -                                         ),
    -                                    array(
    -                                            'field' => 'email',
    -                                            'label' => 'Email',
    -                                            'rules' => 'required'
    -                                         )
    -                                    )
    -               );
    -     - -

    When a rule group is named identically to a controller class/function it will be used automatically when the run() function is invoked from that class/function.

    - -

     

    - - - -

    Using Arrays as Field Names

    - -

    The Form Validation class supports the use of arrays as field names. Consider this example:

    - -<input type="text" name="options[]" value="" size="50" /> - -

    If you do use an array as a field name, you must use the EXACT array name in the Helper Functions that require the field name, -and as your Validation Rule field name.

    - -

    For example, to set a rule for the above field you would use:

    - -$this->form_validation->set_rules('options[]', 'Options', 'required'); - -

    Or, to show an error for the above field you would use:

    - -<?php echo form_error('options[]'); ?> - -

    Or to re-populate the field you would use:

    - -<input type="text" name="options[]" value="<?php echo set_value('options[]'); ?>" size="50" /> - -

    You can use multidimensional arrays as field names as well. For example:

    - -<input type="text" name="options[size]" value="" size="50" /> - -

    Or even:

    - -<input type="text" name="sports[nba][basketball]" value="" size="50" /> - -

    As with our first example, you must use the exact array name in the helper functions:

    - -<?php echo form_error('sports[nba][basketball]'); ?> - -

    If you are using checkboxes (or other fields) that have multiple options, don't forget to leave an empty bracket after each option, so that all selections will be added to the -POST array:

    - - -<input type="checkbox" name="options[]" value="red" />
    -<input type="checkbox" name="options[]" value="blue" />
    -<input type="checkbox" name="options[]" value="green" /> -     - -

    Or if you use a multidimensional array:

    - - -<input type="checkbox" name="options[color][]" value="red" />
    -<input type="checkbox" name="options[color][]" value="blue" />
    -<input type="checkbox" name="options[color][]" value="green" /> -     - -

    When you use a helper function you'll include the bracket as well:

    - -<?php echo form_error('options[color][]'); ?> - - - - -

     

    - - - -

    Rule Reference

    - -

    The following is a list of all the native rules that are available to use:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    RuleParameterDescriptionExample
    requiredNoReturns FALSE if the form element is empty. 
    matchesYesReturns FALSE if the form element does not match the one in the parameter.matches[form_item]
    min_lengthYesReturns FALSE if the form element is shorter then the parameter value.min_length[6]
    max_lengthYesReturns FALSE if the form element is longer then the parameter value.max_length[12]
    exact_lengthYesReturns FALSE if the form element is not exactly the parameter value.exact_length[8]
    alphaNoReturns FALSE if the form element contains anything other than alphabetical characters. 
    alpha_numericNoReturns FALSE if the form element contains anything other than alpha-numeric characters. 
    alpha_dashNoReturns FALSE if the form element contains anything other than alpha-numeric characters, underscores or dashes. 
    numericNoReturns FALSE if the form element contains anything other than numeric characters. 
    integerNoReturns FALSE if the form element contains anything other than an integer. 
    is_naturalNoReturns FALSE if the form element contains anything other than a natural number: 0, 1, 2, 3, etc. 
    is_natural_no_zeroNoReturns FALSE if the form element contains anything other than a natural number, but not zero: 1, 2, 3, etc. 
    valid_emailNoReturns FALSE if the form element does not contain a valid email address. 
    valid_emailsNoReturns FALSE if any value provided in a comma separated list is not a valid email. 
    valid_ipNoReturns FALSE if the supplied IP is not valid. 
    valid_base64NoReturns FALSE if the supplied string contains anything other than valid Base64 characters. 
    - -

    Note: These rules can also be called as discrete functions. For example:

    - -$this->form_validation->required($string); - -

    Note: You can also use any native PHP functions that permit one parameter.

    - - - -

     

    - - -

    Prepping Reference

    - -

    The following is a list of all the prepping functions that are available to use:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    NameParameterDescription
    xss_cleanNoRuns the data through the XSS filtering function, described in the Input Class page.
    prep_for_formNoConverts special characters so that HTML data can be shown in a form field without breaking it.
    prep_urlNoAdds "http://" to URLs if missing.
    strip_image_tagsNoStrips the HTML from image tags leaving the raw URL.
    encode_php_tagsNoConverts PHP tags to entities.
    - -

    Note: You can also use any native PHP functions that permit one parameter, -like trim, htmlspecialchars, urldecode, etc.

    - - - - - - - -

     

    - - -

    Function Reference

    - -

    The following functions are intended for use in your controller functions.

    - -

    $this->form_validation->set_rule();

    - -

    Permits you to set validation rules, as described in the tutorial sections above:

    - - - - -

    $this->form_validation->run();

    - -

    Runs the validation routines. Returns boolean TRUE on success and FALSE on failure. You can optionally pass the name of the validation -group via the function, as described in: Saving Groups of Validation Rules to a Config File.

    - - -

    $this->form_validation->set_message();

    - -

    Permits you to set custom error messages. See Setting Error Messages above.

    - - -

     

    - - -

    Helper Reference

    - -

    The following helper functions are available for use in the view files containing your forms. Note that these are procedural functions, so they -do not require you to prepend them with $this->form_validation.

    - -

    form_error()

    - -

    Shows an individual error message associated with the field name supplied to the function. Example:

    - -<?php echo form_error('username'); ?> - -

    The error delimiters can be optionally specified. See the Changing the Error Delimiters section above.

    - - - -

    validation_errors()

    -

    Shows all error messages as a string: Example:

    - -<?php echo validation_errors(); ?> - -

    The error delimiters can be optionally specified. See the Changing the Error Delimiters section above.

    - - - -

    set_value()

    - -

    Permits you to set the value of an input form or textarea. You must supply the field name via the first parameter of the function. -The second (optional) parameter allows you to set a default value for the form. Example:

    - -<input type="text" name="quantity" value="<?php echo set_value('quantity', '0'); ?>" size="50" /> - -

    The above form will show "0" when loaded for the first time.

    - -

    set_select()

    - -

    If you use a <select> menu, this function permits you to display the menu item that was selected. The first parameter -must contain the name of the select menu, the second parameter must contain the value of -each item, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE).

    - -

    Example:

    - - -<select name="myselect">
    -<option value="one" <?php echo set_select('myselect', 'one', TRUE); ?> >One</option>
    -<option value="two" <?php echo set_select('myselect', 'two'); ?> >Two</option>
    -<option value="three" <?php echo set_select('myselect', 'three'); ?> >Three</option>
    -</select> -     - - -

    set_checkbox()

    - -

    Permits you to display a checkbox in the state it was submitted. The first parameter -must contain the name of the checkbox, the second parameter must contain its value, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE). Example:

    - -<input type="checkbox" name="mycheck[]" value="1" <?php echo set_checkbox('mycheck[]', '1'); ?> />
    -<input type="checkbox" name="mycheck[]" value="2" <?php echo set_checkbox('mycheck[]', '2'); ?> />     - - -

    set_radio()

    - -

    Permits you to display radio buttons in the state they were submitted. This function is identical to the set_checkbox() function above.

    - -<input type="radio" name="myradio" value="1" <?php echo set_radio('myradio', '1', TRUE); ?> />
    -<input type="radio" name="myradio" value="2" <?php echo set_radio('myradio', '2'); ?> />     - - - -
    - - - - - - + + + + + +Form Validation : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Form Validation

    + +

    CodeIgniter provides a comprehensive form validation and data prepping class that helps minimize the amount of code you'll write.

    + +

    Note:  As of CodeIgniter 1.7.0, this Form Validation class supercedes the old Validation class, which is now deprecated. We +have left the old class in the library so applications currently using it will not break, but you are encouraged to migrate to this new version.

    + + + + + + + + +

     

    + + +

    Overview

    + + +

    Before explaining CodeIgniter's approach to data validation, let's describe the ideal scenario:

    + +
      +
    1. A form is displayed.
      2. +
    2. You fill it in and submit it.
      3. +
    3. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data +along with an error message describing the problem.
      4. +
    4. This process continues until you have submitted a valid form.
      5. +
    + +

    On the receiving end, the script must:

    + +
      +
    1. Check for required data.
      2. +
    2. Verify that the data is of the correct type, and meets the correct criteria. For example, if a username is submitted +it must be validated to contain only permitted characters. It must be of a minimum length, +and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.
      3. +
    3. Sanitize the data for security.
      4. +
    4. Pre-format the data if needed (Does the data need to be trimmed? HTML encoded? Etc.)
      5. +
    5. Prep the data for insertion in the database.
      6. +
    + + +

    Although there is nothing terribly complex about the above process, it usually requires a significant +amount of code, and to display error messages, various control structures are usually placed within the form HTML. +Form validation, while simple to create, is generally very messy and tedious to implement.

    + +

     

    + + + +

    Form Validation Tutorial

    + +

    What follows is a "hands on" tutorial for implementing CodeIgniters Form Validation.

    + + +

    In order to implement form validation you'll need three things:

    + +
      +
    1. A View file containing a form.
      2. +
    2. A View file containing a "success" message to be displayed upon successful submission.
      3. +
    3. A controller function to receive and process the submitted data.
      4. +
    + +

    Let's create those three things, using a member sign-up form as the example.

    + + + + + +

    The Form

    + +

    Using a text editor, create a form called myform.php. In it, place this code and save it to your applications/views/ +folder:

    + + + + + + + + +

    The Success Page

    + + +

    Using a text editor, create a form called formsuccess.php. In it, place this code and save it to your applications/views/ +folder:

    + + + + + + + +

    The Controller

    + +

    Using a text editor, create a controller called form.php. In it, place this code and save it to your applications/controllers/ +folder:

    + + + + + +

    Try it!

    + +

    To try your form, visit your site using a URL similar to this one:

    + +example.com/index.php/form/ + +

    If you submit the form you should simply see the form reload. That's because you haven't set up any validation +rules yet.

    + +

    Since you haven't told the Form Validation class to validate anything yet, it returns FALSE (boolean false) by default. The run() +function only returns TRUE if it has successfully applied your rules without any of them failing.

    + + +

    Explanation

    + +

    You'll notice several things about the above pages:

    + +

    The form (myform.php) is a standard web form with a couple exceptions:

    + +
      +
    1. It uses a form helper to create the form opening. +Technically, this isn't necessary. You could create the form using standard HTML. However, the benefit of using the helper +is that it generates the action URL for you, based on the URL in your config file. This makes your application more portable in the event your URLs change.
      2. + +
    2. At the top of the form you'll notice the following function call: +<?php echo validation_errors(); ?> + +

      This function will return any error messages sent back by the validator. If there are no messages it returns an empty string.

      +
      3. +
    + +

    The controller (form.php) has one function: index(). This function initializes the validation class and +loads the form helper and URL helper used by your view files. It also runs +the validation routine. Based on +whether the validation was successful it either presents the form or the success page.

    + + + + + + +

    Setting Validation Rules

    + +

    CodeIgniter lets you set as many validation rules as you need for a given field, cascading them in order, and it even lets you prep and pre-process the field data +at the same time. To set validation rules you will use the set_rules() function:

    + +$this->form_validation->set_rules(); + +

    The above function takes three parameters as input:

    + +
      +
    1. The field name - the exact name you've given the form field.
      2. +
    2. A "human" name for this field, which will be inserted into the error message. For example, if your field is named "user" you might give it a human name of "Username". Note: If you would like the field name to be stored in a language file, please see Translating Field Names.
      3. +
    3. The validation rules for this form field.
      4. +
    + + +


    Here is an example. In your controller (form.php), add this code just below the validation initialization function:

    + + +$this->form_validation->set_rules('username', 'Username', 'required');
    +$this->form_validation->set_rules('password', 'Password', 'required');
    +$this->form_validation->set_rules('passconf', 'Password Confirmation', 'required');
    +$this->form_validation->set_rules('email', 'Email', 'required');
    +     + +

    Your controller should now look like this:

    + + + +

    Now submit the form with the fields blank and you should see the error messages. +If you submit the form with all the fields populated you'll see your success page.

    + +

    Note: The form fields are not yet being re-populated with the data when +there is an error. We'll get to that shortly.

    + + + + + +

    Setting Rules Using an Array

    + +

    Before moving on it should be noted that the rule setting function can be passed an array if you prefer to set all your rules in one action. +If you use this approach you must name your array keys as indicated:

    + + +$config = array(
    +               array(
    +                     'field'   => 'username',
    +                     'label'   => 'Username',
    +                     'rules'   => 'required'
    +                  ),
    +               array(
    +                     'field'   => 'password',
    +                     'label'   => 'Password',
    +                     'rules'   => 'required'
    +                  ),
    +               array(
    +                     'field'   => 'passconf',
    +                     'label'   => 'Password Confirmation',
    +                     'rules'   => 'required'
    +                  ),   
    +               array(
    +                     'field'   => 'email',
    +                     'label'   => 'Email',
    +                     'rules'   => 'required'
    +                  )
    +            );
    +
    +$this->form_validation->set_rules($config); +     + + + + + + + +

    Cascading Rules

    + +

    CodeIgniter lets you pipe multiple rules together. Let's try it. Change your rules in the third parameter of rule setting function, like this:

    + + +$this->form_validation->set_rules('username', 'Username', 'required|min_length[5]|max_length[12]');
    +$this->form_validation->set_rules('password', 'Password', 'required|matches[passconf]');
    +$this->form_validation->set_rules('passconf', 'Password Confirmation', 'required');
    +$this->form_validation->set_rules('email', 'Email', 'required|valid_email');
    +     + +

    The above code sets the following rules:

    + +
      +
    1. The username field be no shorter than 5 characters and no longer than 12.
      2. +
    2. The password field must match the password confirmation field.
      3. +
    3. The email field must contain a valid email address.
      4. +
    + +

    Give it a try! Submit your form without the proper data and you'll see new error messages that correspond to your new rules. +There are numerous rules available which you can read about in the validation reference.

    + + + + +

    Prepping Data

    + +

    In addition to the validation functions like the ones we used above, you can also prep your data in various ways. +For example, you can set up rules like this:

    + + +$this->form_validation->set_rules('username', 'Username', 'trim|required|min_length[5]|max_length[12]|xss_clean');
    +$this->form_validation->set_rules('password', 'Password', 'trim|required|matches[passconf]|md5');
    +$this->form_validation->set_rules('passconf', 'Password Confirmation', 'trim|required');
    +$this->form_validation->set_rules('email', 'Email', 'trim|required|valid_email');
    +     + + +

    In the above example, we are "trimming" the fields, converting the password to MD5, and running the username through +the "xss_clean" function, which removes malicious data.

    + +

    Any native PHP function that accepts one parameter can be used as a rule, like htmlspecialchars, +trim, MD5, etc.

    + +

    Note: You will generally want to use the prepping functions after +the validation rules so if there is an error, the original data will be shown in the form.

    + + + + + +

    Re-populating the form

    + +

    Thus far we have only been dealing with errors. It's time to repopulate the form field with the submitted data. CodeIgniter offers several helper functions +that permit you to do this. The one you will use most commonly is:

    + +set_value('field name') + + +

    Open your myform.php view file and update the value in each field using the set_value() function:

    + +

    Don't forget to include each. field name in the set_value() functions!

    + + + + + +

    Now reload your page and submit the form so that it triggers an error. Your form fields should now be re-populated

    + +

    Note: The Function Reference section below contains functions that +permit you to re-populate <select> menus, radio buttons, and checkboxes.

    + + +

    Important Note: If you use an array as the name of a form field, you must supply it as an array to the function. Example:

    + +<input type="text" name="colors[]" value="<?php echo set_value('colors[]'); ?>" size="50" /> + +

    For more info please see the Using Arrays as Field Names section below.

    + + + + + + +

    Callbacks: Your own Validation Functions

    + +

    The validation system supports callbacks to your own validation functions. This permits you to extend the validation class +to meet your needs. For example, if you need to run a database query to see if the user is choosing a unique username, you can +create a callback function that does that. Let's create a example of this.

    + +

    In your controller, change the "username" rule to this:

    + +$this->form_validation->set_rules('username', 'Username', 'callback_username_check'); + + +

    Then add a new function called username_check to your controller. Here's how your controller should now look:

    + + + + +

    Reload your form and submit it with the word "test" as the username. You can see that the form field data was passed to your +callback function for you to process.

    + +

    To invoke a callback just put the function name in a rule, with "callback_" as the rule prefix.

    + +

    You can also process the form data that is passed to your callback and return it. If your callback returns anything other than a boolean TRUE/FALSE +it is assumed that the data is your newly processed form data.

    + + + + + +

    Setting Error Messages

    + + +

    All of the native error messages are located in the following language file: language/english/form_validation_lang.php

    + +

    To set your own custom message you can either edit that file, or use the following function:

    + +$this->form_validation->set_message('rule', 'Error Message'); + +

    Where rule corresponds to the name of a particular rule, and Error Message is the text you would like displayed.

    + +

    If you include %s in your error string, it will be replaced with the "human" name you used for your field when you set your rules.

    + +

    In the "callback" example above, the error message was set by passing the name of the function:

    + +$this->form_validation->set_message('username_check') + +

    You can also override any error message found in the language file. For example, to change the message for the "required" rule you will do this:

    + +$this->form_validation->set_message('required', 'Your custom message here'); + + + + +

    Translating Field Names

    + +

    If you would like to store the "human" name you passed to the set_rules() function in a language file, and therefore make the name able to be translated, here's how:

    + +

    First, prefix your "human" name with lang:, as in this example:

    + + +$this->form_validation->set_rules('first_name', 'lang:first_name', 'required');
    +     + +

    Then, store the name in one of your language file arrays (without the prefix):

    + +$lang['first_name'] = 'First Name'; + +

    Note: If you store your array item in a language file that is not loaded automatically by CI, you'll need to remember to load it in your controller using:

    + +$this->lang->load('file_name'); + +

    See the Language Class page for more info regarding language files.

    + + + +

    Changing the Error Delimiters

    + +

    By default, the Form Validation class adds a paragraph tag (<p>) around each error message shown. You can either change these delimiters globally or +individually.

    + +
      + +
    1. Changing delimiters Globally + +

      To globally change the error delimiters, in your controller function, just after loading the Form Validation class, add this:

      + +$this->form_validation->set_error_delimiters('<div class="error">', '</div>'); + +

      In this example, we've switched to using div tags.

      + +
      2. + +
    2. Changing delimiters Individually + +

      Each of the two error generating functions shown in this tutorial can be supplied their own delimiters as follows:

      + +<?php echo form_error('field name', '<div class="error">', '</div>'); ?> + +

      Or:

      + +<?php echo validation_errors('<div class="error">', '</div>'); ?> + +
      3. +
    + + + + + +

    Showing Errors Individually

    + +

    If you prefer to show an error message next to each form field, rather than as a list, you can use the form_error() function.

    + +

    Try it! Change your form so that it looks like this:

    + + + +

    If there are no errors, nothing will be shown. If there is an error, the message will appear.

    + +

    Important Note: If you use an array as the name of a form field, you must supply it as an array to the function. Example:

    + +<?php echo form_error('options[size]'); ?>
    +<input type="text" name="options[size]" value="<?php echo set_value("options[size]"); ?>" size="50" /> +     + +

    For more info please see the Using Arrays as Field Names section below.

    + + + + +

     

    + + + +

    Saving Sets of Validation Rules to a Config File

    + +

    A nice feature of the Form Validation class is that it permits you to store all your validation rules for your entire application in a config file. You +can organize these rules into "groups". These groups can either be loaded automatically when a matching controller/function is called, or +you can manually call each set as needed.

    + +

    How to save your rules

    + +

    To store your validation rules, simply create a file named form_validation.php in your application/config/ folder. +In that file you will place an array named $config with your rules. As shown earlier, the validation array will have this prototype:

    + + +$config = array(
    +               array(
    +                     'field'   => 'username',
    +                     'label'   => 'Username',
    +                     'rules'   => 'required'
    +                  ),
    +               array(
    +                     'field'   => 'password',
    +                     'label'   => 'Password',
    +                     'rules'   => 'required'
    +                  ),
    +               array(
    +                     'field'   => 'passconf',
    +                     'label'   => 'Password Confirmation',
    +                     'rules'   => 'required'
    +                  ),   
    +               array(
    +                     'field'   => 'email',
    +                     'label'   => 'Email',
    +                     'rules'   => 'required'
    +                  )
    +            );
    +     + +

    Your validation rule file will be loaded automatically and used when you call the run() function.

    + +

    Please note that you MUST name your array $config.

    + +

    Creating Sets of Rules

    + +

    In order to organize your rules into "sets" requires that you place them into "sub arrays". Consider the following example, showing two sets of rules. +We've arbitrarily called these two rules "signup" and "email". You can name your rules anything you want:

    + + +$config = array(
    +                 'signup' => array(
    +                                    array(
    +                                            'field' => 'username',
    +                                            'label' => 'Username',
    +                                            'rules' => 'required'
    +                                         ),
    +                                    array(
    +                                            'field' => 'password',
    +                                            'label' => 'Password',
    +                                            'rules' => 'required'
    +                                         ),
    +                                    array(
    +                                            'field' => 'passconf',
    +                                            'label' => 'PasswordConfirmation',
    +                                            'rules' => 'required'
    +                                         ),
    +                                    array(
    +                                            'field' => 'email',
    +                                            'label' => 'Email',
    +                                            'rules' => 'required'
    +                                         )
    +                                    ),
    +                 'email' => array(
    +                                    array(
    +                                            'field' => 'emailaddress',
    +                                            'label' => 'EmailAddress',
    +                                            'rules' => 'required|valid_email'
    +                                         ),
    +                                    array(
    +                                            'field' => 'name',
    +                                            'label' => 'Name',
    +                                            'rules' => 'required|alpha'
    +                                         ),
    +                                    array(
    +                                            'field' => 'title',
    +                                            'label' => 'Title',
    +                                            'rules' => 'required'
    +                                         ),
    +                                    array(
    +                                            'field' => 'message',
    +                                            'label' => 'MessageBody',
    +                                            'rules' => 'required'
    +                                         )
    +                                    )                          
    +               );
    +     + + +

    Calling a Specific Rule Group

    + +

    In order to call a specific group you will pass its name to the run() function. For example, to call the signup rule you will do this:

    + + +if ($this->form_validation->run('signup') == FALSE)
    +{
    +   $this->load->view('myform');
    +}
    +else
    +{
    +   $this->load->view('formsuccess');
    +}
    +     + + + +

    Associating a Controller Function with a Rule Group

    + +

    An alternate (and more automatic) method of calling a rule group is to name it according to the controller class/function you intend to use it with. For example, let's say you +have a controller named Member and a function named signup. Here's what your class might look like:

    + + +<?php

    +class Member extends Controller {
    +
    +   function signup()
    +   {      
    +      $this->load->library('form_validation');
    +            
    +      if ($this->form_validation->run() == FALSE)
    +      {
    +         $this->load->view('myform');
    +      }
    +      else
    +      {
    +         $this->load->view('formsuccess');
    +      }
    +   }
    +}
    +?>     + +

    In your validation config file, you will name your rule group member/signup:

    + + +$config = array(
    +           'member/signup' = array(
    +                                    array(
    +                                            'field' => 'username',
    +                                            'label' => 'Username',
    +                                            'rules' => 'required'
    +                                         ),
    +                                    array(
    +                                            'field' => 'password',
    +                                            'label' => 'Password',
    +                                            'rules' => 'required'
    +                                         ),
    +                                    array(
    +                                            'field' => 'passconf',
    +                                            'label' => 'PasswordConfirmation',
    +                                            'rules' => 'required'
    +                                         ),
    +                                    array(
    +                                            'field' => 'email',
    +                                            'label' => 'Email',
    +                                            'rules' => 'required'
    +                                         )
    +                                    )
    +               );
    +     + +

    When a rule group is named identically to a controller class/function it will be used automatically when the run() function is invoked from that class/function.

    + +

     

    + + + +

    Using Arrays as Field Names

    + +

    The Form Validation class supports the use of arrays as field names. Consider this example:

    + +<input type="text" name="options[]" value="" size="50" /> + +

    If you do use an array as a field name, you must use the EXACT array name in the Helper Functions that require the field name, +and as your Validation Rule field name.

    + +

    For example, to set a rule for the above field you would use:

    + +$this->form_validation->set_rules('options[]', 'Options', 'required'); + +

    Or, to show an error for the above field you would use:

    + +<?php echo form_error('options[]'); ?> + +

    Or to re-populate the field you would use:

    + +<input type="text" name="options[]" value="<?php echo set_value('options[]'); ?>" size="50" /> + +

    You can use multidimensional arrays as field names as well. For example:

    + +<input type="text" name="options[size]" value="" size="50" /> + +

    Or even:

    + +<input type="text" name="sports[nba][basketball]" value="" size="50" /> + +

    As with our first example, you must use the exact array name in the helper functions:

    + +<?php echo form_error('sports[nba][basketball]'); ?> + +

    If you are using checkboxes (or other fields) that have multiple options, don't forget to leave an empty bracket after each option, so that all selections will be added to the +POST array:

    + + +<input type="checkbox" name="options[]" value="red" />
    +<input type="checkbox" name="options[]" value="blue" />
    +<input type="checkbox" name="options[]" value="green" /> +     + +

    Or if you use a multidimensional array:

    + + +<input type="checkbox" name="options[color][]" value="red" />
    +<input type="checkbox" name="options[color][]" value="blue" />
    +<input type="checkbox" name="options[color][]" value="green" /> +     + +

    When you use a helper function you'll include the bracket as well:

    + +<?php echo form_error('options[color][]'); ?> + + + + +

     

    + + + +

    Rule Reference

    + +

    The following is a list of all the native rules that are available to use:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RuleParameterDescriptionExample
    requiredNoReturns FALSE if the form element is empty. 
    matchesYesReturns FALSE if the form element does not match the one in the parameter.matches[form_item]
    min_lengthYesReturns FALSE if the form element is shorter then the parameter value.min_length[6]
    max_lengthYesReturns FALSE if the form element is longer then the parameter value.max_length[12]
    exact_lengthYesReturns FALSE if the form element is not exactly the parameter value.exact_length[8]
    alphaNoReturns FALSE if the form element contains anything other than alphabetical characters. 
    alpha_numericNoReturns FALSE if the form element contains anything other than alpha-numeric characters. 
    alpha_dashNoReturns FALSE if the form element contains anything other than alpha-numeric characters, underscores or dashes. 
    numericNoReturns FALSE if the form element contains anything other than numeric characters. 
    integerNoReturns FALSE if the form element contains anything other than an integer. 
    is_naturalNoReturns FALSE if the form element contains anything other than a natural number: 0, 1, 2, 3, etc. 
    is_natural_no_zeroNoReturns FALSE if the form element contains anything other than a natural number, but not zero: 1, 2, 3, etc. 
    valid_emailNoReturns FALSE if the form element does not contain a valid email address. 
    valid_emailsNoReturns FALSE if any value provided in a comma separated list is not a valid email. 
    valid_ipNoReturns FALSE if the supplied IP is not valid. 
    valid_base64NoReturns FALSE if the supplied string contains anything other than valid Base64 characters. 
    + +

    Note: These rules can also be called as discrete functions. For example:

    + +$this->form_validation->required($string); + +

    Note: You can also use any native PHP functions that permit one parameter.

    + + + +

     

    + + +

    Prepping Reference

    + +

    The following is a list of all the prepping functions that are available to use:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NameParameterDescription
    xss_cleanNoRuns the data through the XSS filtering function, described in the Input Class page.
    prep_for_formNoConverts special characters so that HTML data can be shown in a form field without breaking it.
    prep_urlNoAdds "http://" to URLs if missing.
    strip_image_tagsNoStrips the HTML from image tags leaving the raw URL.
    encode_php_tagsNoConverts PHP tags to entities.
    + +

    Note: You can also use any native PHP functions that permit one parameter, +like trim, htmlspecialchars, urldecode, etc.

    + + + + + + + +

     

    + + +

    Function Reference

    + +

    The following functions are intended for use in your controller functions.

    + +

    $this->form_validation->set_rule();

    + +

    Permits you to set validation rules, as described in the tutorial sections above:

    + + + + +

    $this->form_validation->run();

    + +

    Runs the validation routines. Returns boolean TRUE on success and FALSE on failure. You can optionally pass the name of the validation +group via the function, as described in: Saving Groups of Validation Rules to a Config File.

    + + +

    $this->form_validation->set_message();

    + +

    Permits you to set custom error messages. See Setting Error Messages above.

    + + +

     

    + + +

    Helper Reference

    + +

    The following helper functions are available for use in the view files containing your forms. Note that these are procedural functions, so they +do not require you to prepend them with $this->form_validation.

    + +

    form_error()

    + +

    Shows an individual error message associated with the field name supplied to the function. Example:

    + +<?php echo form_error('username'); ?> + +

    The error delimiters can be optionally specified. See the Changing the Error Delimiters section above.

    + + + +

    validation_errors()

    +

    Shows all error messages as a string: Example:

    + +<?php echo validation_errors(); ?> + +

    The error delimiters can be optionally specified. See the Changing the Error Delimiters section above.

    + + + +

    set_value()

    + +

    Permits you to set the value of an input form or textarea. You must supply the field name via the first parameter of the function. +The second (optional) parameter allows you to set a default value for the form. Example:

    + +<input type="text" name="quantity" value="<?php echo set_value('quantity', '0'); ?>" size="50" /> + +

    The above form will show "0" when loaded for the first time.

    + +

    set_select()

    + +

    If you use a <select> menu, this function permits you to display the menu item that was selected. The first parameter +must contain the name of the select menu, the second parameter must contain the value of +each item, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE).

    + +

    Example:

    + + +<select name="myselect">
    +<option value="one" <?php echo set_select('myselect', 'one', TRUE); ?> >One</option>
    +<option value="two" <?php echo set_select('myselect', 'two'); ?> >Two</option>
    +<option value="three" <?php echo set_select('myselect', 'three'); ?> >Three</option>
    +</select> +     + + +

    set_checkbox()

    + +

    Permits you to display a checkbox in the state it was submitted. The first parameter +must contain the name of the checkbox, the second parameter must contain its value, and the third (optional) parameter lets you set an item as the default (use boolean TRUE/FALSE). Example:

    + +<input type="checkbox" name="mycheck[]" value="1" <?php echo set_checkbox('mycheck[]', '1'); ?> />
    +<input type="checkbox" name="mycheck[]" value="2" <?php echo set_checkbox('mycheck[]', '2'); ?> />     + + +

    set_radio()

    + +

    Permits you to display radio buttons in the state they were submitted. This function is identical to the set_checkbox() function above.

    + +<input type="radio" name="myradio" value="1" <?php echo set_radio('myradio', '1', TRUE); ?> />
    +<input type="radio" name="myradio" value="2" <?php echo set_radio('myradio', '2'); ?> />     + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 1d52a290..08a0df41 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -1,303 +1,303 @@ - - - - - -FTP Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    FTP Class

    - -

    CodeIgniter's FTP Class permits files to be transfered to a remote server. Remote files can also be moved, renamed, -and deleted. The FTP class also includes a "mirroring" function that permits an entire local directory to be recreated remotely via FTP.

    - -

    Note:  SFTP and SSL FTP protocols are not supported, only standard FTP.

    - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the FTP class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('ftp'); -

    Once loaded, the FTP object will be available using: $this->ftp

    - - -

    Usage Examples

    - -

    In this example a connection is opened to the FTP server, and a local file is read and uploaded in ASCII mode. The -file permissions are set to 755. Note: Setting permissions requires PHP 5.

    - - -$this->load->library('ftp');
    -
    -$config['hostname'] = 'ftp.example.com';
    -$config['username'] = 'your-username';
    -$config['password'] = 'your-password';
    -$config['debug'] = TRUE;
    -
    -$this->ftp->connect($config);
    -
    -$this->ftp->upload('/local/path/to/myfile.html', '/public_html/myfile.html', 'ascii', 0775);
    -
    -$this->ftp->close(); - -     - - -

    In this example a list of files is retrieved from the server.

    - - -$this->load->library('ftp');
    -
    -$config['hostname'] = 'ftp.example.com';
    -$config['username'] = 'your-username';
    -$config['password'] = 'your-password';
    -$config['debug'] = TRUE;
    -
    -$this->ftp->connect($config);
    -
    -$list = $this->ftp->list_files('/public_html/');
    -
    -print_r($list);
    -
    -$this->ftp->close(); -     - -

    In this example a local directory is mirrored on the server.

    - - - -$this->load->library('ftp');
    -
    -$config['hostname'] = 'ftp.example.com';
    -$config['username'] = 'your-username';
    -$config['password'] = 'your-password';
    -$config['debug'] = TRUE;
    -
    -$this->ftp->connect($config);
    -
    -$this->ftp->mirror('/path/to/myfolder/', '/public_html/myfolder/');
    -
    -$this->ftp->close(); -     - - -

    Function Reference

    - -

    $this->ftp->connect()

    - -

    Connects and logs into to the FTP server. Connection preferences are set by passing an array -to the function, or you can store them in a config file.

    - - -

    Here is an example showing how you set preferences manually:

    - - -$this->load->library('ftp');
    -
    -$config['hostname'] = 'ftp.example.com';
    -$config['username'] = 'your-username';
    -$config['password'] = 'your-password';
    -$config['port']     = 21;
    -$config['passive']  = FALSE;
    -$config['debug']    = TRUE;
    -
    -$this->ftp->connect($config);
    -     - -

    Setting FTP Preferences in a Config File

    - -

    If you prefer you can store your FTP preferences in a config file. -Simply create a new file called the ftp.php, add the $config -array in that file. Then save the file at config/ftp.php and it will be used automatically.

    - -

    Available connection options:

    - - -
      -
    • hostname - the FTP hostname. Usually something like:  ftp.example.com
      • -
    • username - the FTP username.
      • -
    • password - the FTP password.
      • -
    • port - The port number. Set to 21 by default.
      • -
    • debug - TRUE/FALSE (boolean). Whether to enable debugging to display error messages.
      • -
    • passive - TRUE/FALSE (boolean). Whether to use passive mode. Passive is set automatically by default.
      • -
    - - - -

    $this->ftp->upload()

    - -

    Uploads a file to your server. You must supply the local path and the remote path, and you can optionally set the mode and permissions. -Example:

    - - -$this->ftp->upload('/local/path/to/myfile.html', '/public_html/myfile.html', 'ascii', 0775); - -

    Mode options are:  ascii, binary, and auto (the default). If -auto is used it will base the mode on the file extension of the source file.

    - -

    Permissions are available if you are running PHP 5 and can be passed as an octal value in the fourth parameter.

    - - -

    $this->ftp->rename()

    -

    Permits you to rename a file. Supply the source file name/path and the new file name/path.

    - - -// Renames green.html to blue.html
    -$this->ftp->rename('/public_html/foo/green.html', '/public_html/foo/blue.html'); -     - -

    $this->ftp->move()

    -

    Lets you move a file. Supply the source and destination paths:

    - - -// Moves blog.html from "joe" to "fred"
    -$this->ftp->move('/public_html/joe/blog.html', '/public_html/fred/blog.html'); -     - -

    Note: if the destination file name is different the file will be renamed.

    - - -

    $this->ftp->delete_file()

    -

    Lets you delete a file. Supply the source path with the file name.

    - - -$this->ftp->delete_file('/public_html/joe/blog.html'); - - - -

    $this->ftp->delete_dir()

    -

    Lets you delete a directory and everything it contains. Supply the source path to the directory with a trailing slash.

    - -

    Important  Be VERY careful with this function. It will recursively delete -everything within the supplied path, including sub-folders and all files. Make absolutely sure your path is correct. -Try using the list_files() function first to verify that your path is correct.

    - - -$this->ftp->delete_dir('/public_html/path/to/folder/'); - - - - -

    $this->ftp->list_files()

    -

    Permits you to retrieve a list of files on your server returned as an array. You must supply -the path to the desired directory.

    - - -$list = $this->ftp->list_files('/public_html/');
    -
    -print_r($list); -     - - -

    $this->ftp->mirror()

    - -

    Recursively reads a local folder and everything it contains (including sub-folders) and creates a -mirror via FTP based on it. Whatever the directory structure of the original file path will be recreated on the server. -You must supply a source path and a destination path:

    - - -$this->ftp->mirror('/path/to/myfolder/', '/public_html/myfolder/'); - - - - -

    $this->ftp->mkdir()

    - -

    Lets you create a directory on your server. Supply the path ending in the folder name you wish to create, with a trailing slash. -Permissions can be set by passed an octal value in the second parameter (if you are running PHP 5).

    - - -// Creates a folder named "bar"
    -$this->ftp->mkdir('/public_html/foo/bar/', DIR_WRITE_MODE); -     - - -

    $this->ftp->chmod()

    - -

    Permits you to set file permissions. Supply the path to the file or folder you wish to alter permissions on:

    - - -// Chmod "bar" to 777
    -$this->ftp->chmod('/public_html/foo/bar/', DIR_WRITE_MODE); -     - - - - -

    $this->ftp->close();

    -

    Closes the connection to your server. It's recommended that you use this when you are finished uploading.

    - - - - - - - - -
    - - - - - - + + + + + +FTP Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    FTP Class

    + +

    CodeIgniter's FTP Class permits files to be transfered to a remote server. Remote files can also be moved, renamed, +and deleted. The FTP class also includes a "mirroring" function that permits an entire local directory to be recreated remotely via FTP.

    + +

    Note:  SFTP and SSL FTP protocols are not supported, only standard FTP.

    + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the FTP class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('ftp'); +

    Once loaded, the FTP object will be available using: $this->ftp

    + + +

    Usage Examples

    + +

    In this example a connection is opened to the FTP server, and a local file is read and uploaded in ASCII mode. The +file permissions are set to 755. Note: Setting permissions requires PHP 5.

    + + +$this->load->library('ftp');
    +
    +$config['hostname'] = 'ftp.example.com';
    +$config['username'] = 'your-username';
    +$config['password'] = 'your-password';
    +$config['debug'] = TRUE;
    +
    +$this->ftp->connect($config);
    +
    +$this->ftp->upload('/local/path/to/myfile.html', '/public_html/myfile.html', 'ascii', 0775);
    +
    +$this->ftp->close(); + +     + + +

    In this example a list of files is retrieved from the server.

    + + +$this->load->library('ftp');
    +
    +$config['hostname'] = 'ftp.example.com';
    +$config['username'] = 'your-username';
    +$config['password'] = 'your-password';
    +$config['debug'] = TRUE;
    +
    +$this->ftp->connect($config);
    +
    +$list = $this->ftp->list_files('/public_html/');
    +
    +print_r($list);
    +
    +$this->ftp->close(); +     + +

    In this example a local directory is mirrored on the server.

    + + + +$this->load->library('ftp');
    +
    +$config['hostname'] = 'ftp.example.com';
    +$config['username'] = 'your-username';
    +$config['password'] = 'your-password';
    +$config['debug'] = TRUE;
    +
    +$this->ftp->connect($config);
    +
    +$this->ftp->mirror('/path/to/myfolder/', '/public_html/myfolder/');
    +
    +$this->ftp->close(); +     + + +

    Function Reference

    + +

    $this->ftp->connect()

    + +

    Connects and logs into to the FTP server. Connection preferences are set by passing an array +to the function, or you can store them in a config file.

    + + +

    Here is an example showing how you set preferences manually:

    + + +$this->load->library('ftp');
    +
    +$config['hostname'] = 'ftp.example.com';
    +$config['username'] = 'your-username';
    +$config['password'] = 'your-password';
    +$config['port']     = 21;
    +$config['passive']  = FALSE;
    +$config['debug']    = TRUE;
    +
    +$this->ftp->connect($config);
    +     + +

    Setting FTP Preferences in a Config File

    + +

    If you prefer you can store your FTP preferences in a config file. +Simply create a new file called the ftp.php, add the $config +array in that file. Then save the file at config/ftp.php and it will be used automatically.

    + +

    Available connection options:

    + + +
      +
    • hostname - the FTP hostname. Usually something like:  ftp.example.com
      • +
    • username - the FTP username.
      • +
    • password - the FTP password.
      • +
    • port - The port number. Set to 21 by default.
      • +
    • debug - TRUE/FALSE (boolean). Whether to enable debugging to display error messages.
      • +
    • passive - TRUE/FALSE (boolean). Whether to use passive mode. Passive is set automatically by default.
      • +
    + + + +

    $this->ftp->upload()

    + +

    Uploads a file to your server. You must supply the local path and the remote path, and you can optionally set the mode and permissions. +Example:

    + + +$this->ftp->upload('/local/path/to/myfile.html', '/public_html/myfile.html', 'ascii', 0775); + +

    Mode options are:  ascii, binary, and auto (the default). If +auto is used it will base the mode on the file extension of the source file.

    + +

    Permissions are available if you are running PHP 5 and can be passed as an octal value in the fourth parameter.

    + + +

    $this->ftp->rename()

    +

    Permits you to rename a file. Supply the source file name/path and the new file name/path.

    + + +// Renames green.html to blue.html
    +$this->ftp->rename('/public_html/foo/green.html', '/public_html/foo/blue.html'); +     + +

    $this->ftp->move()

    +

    Lets you move a file. Supply the source and destination paths:

    + + +// Moves blog.html from "joe" to "fred"
    +$this->ftp->move('/public_html/joe/blog.html', '/public_html/fred/blog.html'); +     + +

    Note: if the destination file name is different the file will be renamed.

    + + +

    $this->ftp->delete_file()

    +

    Lets you delete a file. Supply the source path with the file name.

    + + +$this->ftp->delete_file('/public_html/joe/blog.html'); + + + +

    $this->ftp->delete_dir()

    +

    Lets you delete a directory and everything it contains. Supply the source path to the directory with a trailing slash.

    + +

    Important  Be VERY careful with this function. It will recursively delete +everything within the supplied path, including sub-folders and all files. Make absolutely sure your path is correct. +Try using the list_files() function first to verify that your path is correct.

    + + +$this->ftp->delete_dir('/public_html/path/to/folder/'); + + + + +

    $this->ftp->list_files()

    +

    Permits you to retrieve a list of files on your server returned as an array. You must supply +the path to the desired directory.

    + + +$list = $this->ftp->list_files('/public_html/');
    +
    +print_r($list); +     + + +

    $this->ftp->mirror()

    + +

    Recursively reads a local folder and everything it contains (including sub-folders) and creates a +mirror via FTP based on it. Whatever the directory structure of the original file path will be recreated on the server. +You must supply a source path and a destination path:

    + + +$this->ftp->mirror('/path/to/myfolder/', '/public_html/myfolder/'); + + + + +

    $this->ftp->mkdir()

    + +

    Lets you create a directory on your server. Supply the path ending in the folder name you wish to create, with a trailing slash. +Permissions can be set by passed an octal value in the second parameter (if you are running PHP 5).

    + + +// Creates a folder named "bar"
    +$this->ftp->mkdir('/public_html/foo/bar/', DIR_WRITE_MODE); +     + + +

    $this->ftp->chmod()

    + +

    Permits you to set file permissions. Supply the path to the file or folder you wish to alter permissions on:

    + + +// Chmod "bar" to 777
    +$this->ftp->chmod('/public_html/foo/bar/', DIR_WRITE_MODE); +     + + + + +

    $this->ftp->close();

    +

    Closes the connection to your server. It's recommended that you use this when you are finished uploading.

    + + + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 1bbb842c..3d427891 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -1,666 +1,666 @@ - - - - - -Image Manipulation Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Image Manipulation Class

    - -

    CodeIgniter's Image Manipulation class lets you perform the following actions:

    - -
      -
    • Image Resizing
      • -
    • Thumbnail Creation
      • -
    • Image Cropping
      • -
    • Image Rotating
      • -
    • Image Watermarking
      • -
    - -

    All three major image libraries are supported: GD/GD2, NetPBM, and ImageMagick

    - -

    Note: Watermarking is only available using the GD/GD2 library. -In addition, even though other libraries are supported, GD is required in -order for the script to calculate the image properties. The image processing, however, will be performed with the -library you specify.

    - - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the image class is initialized in your controller -using the $this->load->library function:

    -$this->load->library('image_lib'); - -

    Once the library is loaded it will be ready for use. The image library object you will use to call all functions is: $this->image_lib

    - - -

    Processing an Image

    - -

    Regardless of the type of processing you would like to perform (resizing, cropping, rotation, or watermarking), the general process is -identical. You will set some preferences corresponding to the action you intend to perform, then -call one of four available processing functions. For example, to create an image thumbnail you'll do this:

    - -$config['image_library'] = 'gd2';
    -$config['source_image'] = '/path/to/image/mypic.jpg';
    -$config['create_thumb'] = TRUE;
    -$config['maintain_ratio'] = TRUE;
    -$config['width'] = 75;
    -$config['height'] = 50;
    -
    -$this->load->library('image_lib', $config); -
    -
    -$this->image_lib->resize();     - -

    The above code tells the image_resize function to look for an image called mypic.jpg -located in the source_image folder, then create a thumbnail that is 75 X 50 pixels using the GD2 image_library. -Since the maintain_ratio option is enabled, the thumb will be as close to the target width and -height as possible while preserving the original aspect ratio. The thumbnail will be called mypic_thumb.jpg -

    - -

    Note: In order for the image class to be allowed to do any processing, the -folder containing the image files must have write permissions.

    - - -

    Processing Functions

    - -

    There are four available processing functions:

    - -
      -
    • $this->image_lib->resize()
      • -
    • $this->image_lib->crop()
      • -
    • $this->image_lib->rotate()
      • -
    • $this->image_lib->watermark()
      • -
    • $this->image_lib->clear()
      • -
    - -

    These functions return boolean TRUE upon success and FALSE for failure. If they fail you can retrieve the -error message using this function:

    - -echo $this->image_lib->display_errors(); - -

    A good practice is use the processing function conditionally, showing an error upon failure, like this:

    - -if ( ! $this->image_lib->resize())
    -{
    -    echo $this->image_lib->display_errors();
    -}     - -

    Note: You can optionally specify the HTML formatting to be applied to the errors, by submitting the opening/closing -tags in the function, like this:

    - -$this->image_lib->display_errors('<p>', '</p>'); - - -

    Preferences

    - -

    The preferences described below allow you to tailor the image processing to suit your needs.

    - -

    Note that not all preferences are available for every -function. For example, the x/y axis preferences are only available for image cropping. Likewise, the width and height -preferences have no effect on cropping. The "availability" column indicates which functions support a given preference.

    - -

    Availability Legend:

    - -
      -
    • R - Image Resizing
      • -
    • C - Image Cropping
      • -
    • X - Image Rotation
      • -
    • W - Image Watermarking
      • - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefault ValueOptionsDescriptionAvailability
    image_libraryGD2GD, GD2, ImageMagick, NetPBMSets the image library to be used.R, C, X, W
    library_pathNoneNoneSets the server path to your ImageMagick or NetPBM library. If you use either of those libraries you must supply the path.R, C, X
    source_imageNoneNoneSets the source image name/path. The path must be a relative or absolute server path, not a URL.R, C, S, W
    dynamic_outputFALSETRUE/FALSE (boolean)Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers.R, C, X, W
    quality90%1 - 100%Sets the quality of the image. The higher the quality the larger the file size.R, C, X, W
    new_imageNoneNoneSets the destination image name/path. You'll use this preference when creating an image copy. The path must be a relative or absolute server path, not a URL.R, C, X, W
    widthNoneNoneSets the width you would like the image set to.R, C
    heightNoneNoneSets the height you would like the image set to.R, C
    create_thumbFALSETRUE/FALSE (boolean)Tells the image processing function to create a thumb.R
    thumb_marker_thumbNoneSpecifies the thumbnail indicator. It will be inserted just before the file extension, so mypic.jpg would become mypic_thumb.jpgR
    maintain_ratioTRUETRUE/FALSE (boolean)Specifies whether to maintain the original aspect ratio when resizing or use hard values.R, C
    master_dimautoauto, width, heightSpecifies what to use as the master axis when resizing or creating thumbs. For example, let's say you want to resize an image to 100 X 75 pixels. If the source image size does not allow perfect resizing to those dimensions, this setting determines which axis should be used as the hard value. "auto" sets the axis automatically based on whether the image is taller then wider, or vice versa.R
    rotation_angleNone90, 180, 270, vrt, horSpecifies the angle of rotation when rotating images. Note that PHP rotates counter-clockwise, so a 90 degree rotation to the right must be specified as 270.X
    x_axisNoneNoneSets the X coordinate in pixels for image cropping. For example, a setting of 30 will crop an image 30 pixels from the left.C
    y_axisNoneNoneSets the Y coordinate in pixels for image cropping. For example, a setting of 30 will crop an image 30 pixels from the top.C
    - - -

    Setting preferences in a config file

    - -

    If you prefer not to set preferences using the above method, you can instead put them into a config file. -Simply create a new file called image_lib.php, add the $config -array in that file. Then save the file in: config/image_lib.php and it will be used automatically. You -will NOT need to use the $this->image_lib->initialize function if you save your preferences in a config file.

    - - -

    $this->image_lib->resize()

    - -

    The image resizing function lets you resize the original image, create a copy (with or without resizing), -or create a thumbnail image.

    - -

    For practical purposes there is no difference between creating a copy and creating -a thumbnail except a thumb will have the thumbnail marker as part of the name (ie, mypic_thumb.jpg).

    - -

    All preferences listed in the table above are available for this function except these three: rotation_angle, x_axis, and y_axis.

    - -

    Creating a Thumbnail

    - -

    The resizing function will create a thumbnail file (and preserve the original) if you set this preference to TRUE:

    - -$config['create_thumb'] = TRUE; - -

    This single preference determines whether a thumbnail is created or not.

    - -

    Creating a Copy

    - -

    The resizing function will create a copy of the image file (and preserve the original) if you set -a path and/or a new filename using this preference:

    - -$config['new_image'] = '/path/to/new_image.jpg'; - -

    Notes regarding this preference:

    -
      -
    • If only the new image name is specified it will be placed in the same folder as the original
      • -
    • If only the path is specified, the new image will be placed in the destination with the same name as the original.
      • -
    • If both the path and image name are specified it will placed in its own destination and given the new name.
      • -
    - - -

    Resizing the Original Image

    - -

    If neither of the two preferences listed above (create_thumb, and new_image) are used, the resizing function will instead -target the original image for processing.

    - - -

    $this->image_lib->crop()

    - -

    The cropping function works nearly identically to the resizing function except it requires that you set -preferences for the X and Y axis (in pixels) specifying where to crop, like this:

    - -$config['x_axis'] = '100';
    -$config['y_axis'] = '40';     - -

    All preferences listed in the table above are available for this function except these: rotation_angle, width, height, create_thumb, new_image.

    - -

    Here's an example showing how you might crop an image:

    - -$config['image_library'] = 'imagemagick';
    -$config['library_path'] = '/usr/X11R6/bin/';
    -$config['source_image'] = '/path/to/image/mypic.jpg';
    -$config['x_axis'] = '100';
    -$config['y_axis'] = '60';
    -
    -$this->image_lib->initialize($config); -
    -
    -if ( ! $this->image_lib->crop())
    -{
    -    echo $this->image_lib->display_errors();
    -}     - - -

    Note: Without a visual interface it is difficult to crop images, so this function is not very useful -unless you intend to build such an interface. That's exactly what we did using for the photo -gallery module in ExpressionEngine, the CMS we develop. We added a JavaScript UI that lets the cropping -area be selected.

    - -

    $this->image_lib->rotate()

    - -

    The image rotation function requires that the angle of rotation be set via its preference:

    - -$config['rotation_angle'] = '90'; - -

    There are 5 rotation options:

    - -
      -
    1. 90 - rotates counter-clockwise by 90 degrees.
      2. -
    2. 180 - rotates counter-clockwise by 180 degrees.
      3. -
    3. 270 - rotates counter-clockwise by 270 degrees.
      4. -
    4. hor - flips the image horizontally.
      5. -
    5. vrt - flips the image vertically.
      6. -
    - -

    Here's an example showing how you might rotate an image:

    - -$config['image_library'] = 'netpbm';
    -$config['library_path'] = '/usr/bin/';
    -$config['source_image'] = '/path/to/image/mypic.jpg';
    -$config['rotation_angle'] = 'hor';
    -
    -$this->image_lib->initialize($config); -
    -
    -if ( ! $this->image_lib->rotate())
    -{
    -    echo $this->image_lib->display_errors();
    -}     - - - -

    $this->image_lib->clear()

    -

    The clear function resets all of the values used when processing an image. You will want to call this if you are processing images in a loop.

    -

    $this->image_lib->clear();

    -

     

    -

    Image Watermarking

    - -

    The Watermarking feature requires the GD/GD2 library.

    - - -

    Two Types of Watermarking

    - -

    There are two types of watermarking that you can use:

    - -
      -
    • Text: The watermark message will be generating using text, either with a True Type font that you specify, or -using the native text output that the GD library supports. If you use the True Type version your GD installation -must be compiled with True Type support (most are, but not all).
      • - -
    • Overlay: The watermark message will be generated by overlaying an image (usually a transparent PNG or GIF) -containing your watermark over the source image.
      • - -
    - - -

    Watermarking an Image

    - -

    Just as with the other functions (resizing, cropping, and rotating) the general process for watermarking -involves setting the preferences corresponding to the action you intend to perform, then -calling the watermark function. Here is an example:

    - - -$config['source_image'] = '/path/to/image/mypic.jpg';
    -$config['wm_text'] = 'Copyright 2006 - John Doe';
    -$config['wm_type'] = 'text';
    -$config['wm_font_path'] = './system/fonts/texb.ttf';
    -$config['wm_font_size'] = '16';
    -$config['wm_font_color'] = 'ffffff';
    -$config['wm_vrt_alignment'] = 'bottom';
    -$config['wm_hor_alignment'] = 'center';
    -$config['wm_padding'] = '20';
    -
    -$this->image_lib->initialize($config); -
    -
    -$this->image_lib->watermark();     - - -

    The above example will use a 16 pixel True Type font to create the text "Copyright 2006 - John Doe". The watermark -will be positioned at the bottom/center of the image, 20 pixels from the bottom of the image.

    - -

    Note: In order for the image class to be allowed to do any processing, the image file must have "write" file permissions. For example, 777.

    - - -

    Watermarking Preferences

    - -

    This table shown the preferences that are available for both types of watermarking (text or overlay)

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefault ValueOptionsDescription
    wm_typetexttext, overlaySets the type of watermarking that should be used.
    source_imageNoneNoneSets the source image name/path. The path must be a relative or absolute server path, not a URL.
    dynamic_outputFALSETRUE/FALSE (boolean)Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers.
    quality90%1 - 100%Sets the quality of the image. The higher the quality the larger the file size.
    paddingNoneA numberThe amount of padding, set in pixels, that will be applied to the watermark to set it away from the edge of your images.
    wm_vrt_alignmentbottomtop, middle, bottomSets the vertical alignment for the watermark image.
    wm_hor_alignmentcenterleft, center, rightSets the horizontal alignment for the watermark image.
    wm_hor_offsetNoneNoneYou may specify a horizontal offset (in pixels) to apply to the watermark position. The offset normally moves the watermark to the right, except if you have your alignment set to "right" then your offset value will move the watermark toward the left of the image.
    wm_vrt_offsetNoneNoneYou may specify a vertical offset (in pixels) to apply to the watermark position. The offset normally moves the watermark down, except if you have your alignment set to "bottom" then your offset value will move the watermark toward the top of the image.
    - - - -

    Text Preferences

    -

    This table shown the preferences that are available for the text type of watermarking.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefault ValueOptionsDescription
    wm_textNoneNoneThe text you would like shown as the watermark. Typically this will be a copyright notice.
    wm_font_pathNoneNoneThe server path to the True Type Font you would like to use. If you do not use this option, the native GD font will be used.
    wm_font_size16NoneThe size of the text. Note: If you are not using the True Type option above, the number is set using a range of 1 - 5. Otherwise, you can use any valid pixel size for the font you're using.
    wm_font_colorffffffNoneThe font color, specified in hex. Note, you must use the full 6 character hex value (ie, 993300), rather than the three character abbreviated version (ie fff).
    wm_shadow_colorNoneNoneThe color of the drop shadow, specified in hex. If you leave this blank a drop shadow will not be used. Note, you must use the full 6 character hex value (ie, 993300), rather than the three character abbreviated version (ie fff).
    wm_shadow_distance3NoneThe distance (in pixels) from the font that the drop shadow should appear.
    - - - - -

    Overlay Preferences

    -

    This table shown the preferences that are available for the overlay type of watermarking.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefault ValueOptionsDescription
    wm_overlay_pathNoneNoneThe server path to the image you wish to use as your watermark. Required only if you are using the overlay method.
    wm_opacity501 - 100Image opacity. You may specify the opacity (i.e. transparency) of your watermark image. This allows the watermark to be faint and not completely obscure the details from the original image behind it. A 50% opacity is typical.
    wm_x_transp4A numberIf your watermark image is a PNG or GIF image, you may specify a color on the image to be "transparent". This setting (along with the next) will allow you to specify that color. This works by specifying the "X" and "Y" coordinate pixel (measured from the upper left) within the image that corresponds to a pixel representative of the color you want to be transparent.
    wm_y_transp4A numberAlong with the previous setting, this allows you to specify the coordinate to a pixel representative of the color you want to be transparent.
    - -
    - - - - - - + + + + + +Image Manipulation Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Image Manipulation Class

    + +

    CodeIgniter's Image Manipulation class lets you perform the following actions:

    + +
      +
    • Image Resizing
      • +
    • Thumbnail Creation
      • +
    • Image Cropping
      • +
    • Image Rotating
      • +
    • Image Watermarking
      • +
    + +

    All three major image libraries are supported: GD/GD2, NetPBM, and ImageMagick

    + +

    Note: Watermarking is only available using the GD/GD2 library. +In addition, even though other libraries are supported, GD is required in +order for the script to calculate the image properties. The image processing, however, will be performed with the +library you specify.

    + + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the image class is initialized in your controller +using the $this->load->library function:

    +$this->load->library('image_lib'); + +

    Once the library is loaded it will be ready for use. The image library object you will use to call all functions is: $this->image_lib

    + + +

    Processing an Image

    + +

    Regardless of the type of processing you would like to perform (resizing, cropping, rotation, or watermarking), the general process is +identical. You will set some preferences corresponding to the action you intend to perform, then +call one of four available processing functions. For example, to create an image thumbnail you'll do this:

    + +$config['image_library'] = 'gd2';
    +$config['source_image'] = '/path/to/image/mypic.jpg';
    +$config['create_thumb'] = TRUE;
    +$config['maintain_ratio'] = TRUE;
    +$config['width'] = 75;
    +$config['height'] = 50;
    +
    +$this->load->library('image_lib', $config); +
    +
    +$this->image_lib->resize();     + +

    The above code tells the image_resize function to look for an image called mypic.jpg +located in the source_image folder, then create a thumbnail that is 75 X 50 pixels using the GD2 image_library. +Since the maintain_ratio option is enabled, the thumb will be as close to the target width and +height as possible while preserving the original aspect ratio. The thumbnail will be called mypic_thumb.jpg +

    + +

    Note: In order for the image class to be allowed to do any processing, the +folder containing the image files must have write permissions.

    + + +

    Processing Functions

    + +

    There are four available processing functions:

    + +
      +
    • $this->image_lib->resize()
      • +
    • $this->image_lib->crop()
      • +
    • $this->image_lib->rotate()
      • +
    • $this->image_lib->watermark()
      • +
    • $this->image_lib->clear()
      • +
    + +

    These functions return boolean TRUE upon success and FALSE for failure. If they fail you can retrieve the +error message using this function:

    + +echo $this->image_lib->display_errors(); + +

    A good practice is use the processing function conditionally, showing an error upon failure, like this:

    + +if ( ! $this->image_lib->resize())
    +{
    +    echo $this->image_lib->display_errors();
    +}     + +

    Note: You can optionally specify the HTML formatting to be applied to the errors, by submitting the opening/closing +tags in the function, like this:

    + +$this->image_lib->display_errors('<p>', '</p>'); + + +

    Preferences

    + +

    The preferences described below allow you to tailor the image processing to suit your needs.

    + +

    Note that not all preferences are available for every +function. For example, the x/y axis preferences are only available for image cropping. Likewise, the width and height +preferences have no effect on cropping. The "availability" column indicates which functions support a given preference.

    + +

    Availability Legend:

    + +
      +
    • R - Image Resizing
      • +
    • C - Image Cropping
      • +
    • X - Image Rotation
      • +
    • W - Image Watermarking
      • + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescriptionAvailability
    image_libraryGD2GD, GD2, ImageMagick, NetPBMSets the image library to be used.R, C, X, W
    library_pathNoneNoneSets the server path to your ImageMagick or NetPBM library. If you use either of those libraries you must supply the path.R, C, X
    source_imageNoneNoneSets the source image name/path. The path must be a relative or absolute server path, not a URL.R, C, S, W
    dynamic_outputFALSETRUE/FALSE (boolean)Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers.R, C, X, W
    quality90%1 - 100%Sets the quality of the image. The higher the quality the larger the file size.R, C, X, W
    new_imageNoneNoneSets the destination image name/path. You'll use this preference when creating an image copy. The path must be a relative or absolute server path, not a URL.R, C, X, W
    widthNoneNoneSets the width you would like the image set to.R, C
    heightNoneNoneSets the height you would like the image set to.R, C
    create_thumbFALSETRUE/FALSE (boolean)Tells the image processing function to create a thumb.R
    thumb_marker_thumbNoneSpecifies the thumbnail indicator. It will be inserted just before the file extension, so mypic.jpg would become mypic_thumb.jpgR
    maintain_ratioTRUETRUE/FALSE (boolean)Specifies whether to maintain the original aspect ratio when resizing or use hard values.R, C
    master_dimautoauto, width, heightSpecifies what to use as the master axis when resizing or creating thumbs. For example, let's say you want to resize an image to 100 X 75 pixels. If the source image size does not allow perfect resizing to those dimensions, this setting determines which axis should be used as the hard value. "auto" sets the axis automatically based on whether the image is taller then wider, or vice versa.R
    rotation_angleNone90, 180, 270, vrt, horSpecifies the angle of rotation when rotating images. Note that PHP rotates counter-clockwise, so a 90 degree rotation to the right must be specified as 270.X
    x_axisNoneNoneSets the X coordinate in pixels for image cropping. For example, a setting of 30 will crop an image 30 pixels from the left.C
    y_axisNoneNoneSets the Y coordinate in pixels for image cropping. For example, a setting of 30 will crop an image 30 pixels from the top.C
    + + +

    Setting preferences in a config file

    + +

    If you prefer not to set preferences using the above method, you can instead put them into a config file. +Simply create a new file called image_lib.php, add the $config +array in that file. Then save the file in: config/image_lib.php and it will be used automatically. You +will NOT need to use the $this->image_lib->initialize function if you save your preferences in a config file.

    + + +

    $this->image_lib->resize()

    + +

    The image resizing function lets you resize the original image, create a copy (with or without resizing), +or create a thumbnail image.

    + +

    For practical purposes there is no difference between creating a copy and creating +a thumbnail except a thumb will have the thumbnail marker as part of the name (ie, mypic_thumb.jpg).

    + +

    All preferences listed in the table above are available for this function except these three: rotation_angle, x_axis, and y_axis.

    + +

    Creating a Thumbnail

    + +

    The resizing function will create a thumbnail file (and preserve the original) if you set this preference to TRUE:

    + +$config['create_thumb'] = TRUE; + +

    This single preference determines whether a thumbnail is created or not.

    + +

    Creating a Copy

    + +

    The resizing function will create a copy of the image file (and preserve the original) if you set +a path and/or a new filename using this preference:

    + +$config['new_image'] = '/path/to/new_image.jpg'; + +

    Notes regarding this preference:

    +
      +
    • If only the new image name is specified it will be placed in the same folder as the original
      • +
    • If only the path is specified, the new image will be placed in the destination with the same name as the original.
      • +
    • If both the path and image name are specified it will placed in its own destination and given the new name.
      • +
    + + +

    Resizing the Original Image

    + +

    If neither of the two preferences listed above (create_thumb, and new_image) are used, the resizing function will instead +target the original image for processing.

    + + +

    $this->image_lib->crop()

    + +

    The cropping function works nearly identically to the resizing function except it requires that you set +preferences for the X and Y axis (in pixels) specifying where to crop, like this:

    + +$config['x_axis'] = '100';
    +$config['y_axis'] = '40';     + +

    All preferences listed in the table above are available for this function except these: rotation_angle, width, height, create_thumb, new_image.

    + +

    Here's an example showing how you might crop an image:

    + +$config['image_library'] = 'imagemagick';
    +$config['library_path'] = '/usr/X11R6/bin/';
    +$config['source_image'] = '/path/to/image/mypic.jpg';
    +$config['x_axis'] = '100';
    +$config['y_axis'] = '60';
    +
    +$this->image_lib->initialize($config); +
    +
    +if ( ! $this->image_lib->crop())
    +{
    +    echo $this->image_lib->display_errors();
    +}     + + +

    Note: Without a visual interface it is difficult to crop images, so this function is not very useful +unless you intend to build such an interface. That's exactly what we did using for the photo +gallery module in ExpressionEngine, the CMS we develop. We added a JavaScript UI that lets the cropping +area be selected.

    + +

    $this->image_lib->rotate()

    + +

    The image rotation function requires that the angle of rotation be set via its preference:

    + +$config['rotation_angle'] = '90'; + +

    There are 5 rotation options:

    + +
      +
    1. 90 - rotates counter-clockwise by 90 degrees.
      2. +
    2. 180 - rotates counter-clockwise by 180 degrees.
      3. +
    3. 270 - rotates counter-clockwise by 270 degrees.
      4. +
    4. hor - flips the image horizontally.
      5. +
    5. vrt - flips the image vertically.
      6. +
    + +

    Here's an example showing how you might rotate an image:

    + +$config['image_library'] = 'netpbm';
    +$config['library_path'] = '/usr/bin/';
    +$config['source_image'] = '/path/to/image/mypic.jpg';
    +$config['rotation_angle'] = 'hor';
    +
    +$this->image_lib->initialize($config); +
    +
    +if ( ! $this->image_lib->rotate())
    +{
    +    echo $this->image_lib->display_errors();
    +}     + + + +

    $this->image_lib->clear()

    +

    The clear function resets all of the values used when processing an image. You will want to call this if you are processing images in a loop.

    +

    $this->image_lib->clear();

    +

     

    +

    Image Watermarking

    + +

    The Watermarking feature requires the GD/GD2 library.

    + + +

    Two Types of Watermarking

    + +

    There are two types of watermarking that you can use:

    + +
      +
    • Text: The watermark message will be generating using text, either with a True Type font that you specify, or +using the native text output that the GD library supports. If you use the True Type version your GD installation +must be compiled with True Type support (most are, but not all).
      • + +
    • Overlay: The watermark message will be generated by overlaying an image (usually a transparent PNG or GIF) +containing your watermark over the source image.
      • + +
    + + +

    Watermarking an Image

    + +

    Just as with the other functions (resizing, cropping, and rotating) the general process for watermarking +involves setting the preferences corresponding to the action you intend to perform, then +calling the watermark function. Here is an example:

    + + +$config['source_image'] = '/path/to/image/mypic.jpg';
    +$config['wm_text'] = 'Copyright 2006 - John Doe';
    +$config['wm_type'] = 'text';
    +$config['wm_font_path'] = './system/fonts/texb.ttf';
    +$config['wm_font_size'] = '16';
    +$config['wm_font_color'] = 'ffffff';
    +$config['wm_vrt_alignment'] = 'bottom';
    +$config['wm_hor_alignment'] = 'center';
    +$config['wm_padding'] = '20';
    +
    +$this->image_lib->initialize($config); +
    +
    +$this->image_lib->watermark();     + + +

    The above example will use a 16 pixel True Type font to create the text "Copyright 2006 - John Doe". The watermark +will be positioned at the bottom/center of the image, 20 pixels from the bottom of the image.

    + +

    Note: In order for the image class to be allowed to do any processing, the image file must have "write" file permissions. For example, 777.

    + + +

    Watermarking Preferences

    + +

    This table shown the preferences that are available for both types of watermarking (text or overlay)

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescription
    wm_typetexttext, overlaySets the type of watermarking that should be used.
    source_imageNoneNoneSets the source image name/path. The path must be a relative or absolute server path, not a URL.
    dynamic_outputFALSETRUE/FALSE (boolean)Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers.
    quality90%1 - 100%Sets the quality of the image. The higher the quality the larger the file size.
    paddingNoneA numberThe amount of padding, set in pixels, that will be applied to the watermark to set it away from the edge of your images.
    wm_vrt_alignmentbottomtop, middle, bottomSets the vertical alignment for the watermark image.
    wm_hor_alignmentcenterleft, center, rightSets the horizontal alignment for the watermark image.
    wm_hor_offsetNoneNoneYou may specify a horizontal offset (in pixels) to apply to the watermark position. The offset normally moves the watermark to the right, except if you have your alignment set to "right" then your offset value will move the watermark toward the left of the image.
    wm_vrt_offsetNoneNoneYou may specify a vertical offset (in pixels) to apply to the watermark position. The offset normally moves the watermark down, except if you have your alignment set to "bottom" then your offset value will move the watermark toward the top of the image.
    + + + +

    Text Preferences

    +

    This table shown the preferences that are available for the text type of watermarking.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescription
    wm_textNoneNoneThe text you would like shown as the watermark. Typically this will be a copyright notice.
    wm_font_pathNoneNoneThe server path to the True Type Font you would like to use. If you do not use this option, the native GD font will be used.
    wm_font_size16NoneThe size of the text. Note: If you are not using the True Type option above, the number is set using a range of 1 - 5. Otherwise, you can use any valid pixel size for the font you're using.
    wm_font_colorffffffNoneThe font color, specified in hex. Note, you must use the full 6 character hex value (ie, 993300), rather than the three character abbreviated version (ie fff).
    wm_shadow_colorNoneNoneThe color of the drop shadow, specified in hex. If you leave this blank a drop shadow will not be used. Note, you must use the full 6 character hex value (ie, 993300), rather than the three character abbreviated version (ie fff).
    wm_shadow_distance3NoneThe distance (in pixels) from the font that the drop shadow should appear.
    + + + + +

    Overlay Preferences

    +

    This table shown the preferences that are available for the overlay type of watermarking.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefault ValueOptionsDescription
    wm_overlay_pathNoneNoneThe server path to the image you wish to use as your watermark. Required only if you are using the overlay method.
    wm_opacity501 - 100Image opacity. You may specify the opacity (i.e. transparency) of your watermark image. This allows the watermark to be faint and not completely obscure the details from the original image behind it. A 50% opacity is typical.
    wm_x_transp4A numberIf your watermark image is a PNG or GIF image, you may specify a color on the image to be "transparent". This setting (along with the next) will allow you to specify that color. This works by specifying the "X" and "Y" coordinate pixel (measured from the upper left) within the image that corresponds to a pixel representative of the color you want to be transparent.
    wm_y_transp4A numberAlong with the previous setting, this allows you to specify the coordinate to a pixel representative of the color you want to be transparent.
    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index ad73dffb..f210c18f 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -1,231 +1,231 @@ - - - - - -Input Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Input Class

    - -

    The Input Class serves two purposes:

    - -
      -
    1. It pre-processes global input data for security.
      2. -
    2. It provides some helper functions for fetching input data and pre-processing it.
      3. -
    - -

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    - - -

    Security Filtering

    - -

    The security filtering function is called automatically when a new controller is invoked. It does the following:

    - -
      -
    • Destroys the global GET array. Since CodeIgniter does not utilize GET strings, there is no reason to allow it.
      • -
    • Destroys all global variables in the event register_globals is turned on.
      • -
    • Filters the POST/COOKIE array keys, permitting only alpha-numeric (and a few other) characters.
      • -
    • Provides XSS (Cross-site Scripting Hacks) filtering. This can be enabled globally, or upon request.
      • -
    • Standardizes newline characters to \n
      • -
    - - -

    XSS Filtering

    - -

    CodeIgniter comes with a Cross Site Scripting Hack prevention filter which can either run automatically to filter -all POST and COOKIE data that is encountered, or you can run it on a per item basis. By default it does not -run globally since it requires a bit of processing overhead, and since you may not need it in all cases.

    - -

    The XSS filter looks for commonly used techniques to trigger Javascript or other types of code that attempt to hijack cookies -or do other malicious things. If anything disallowed is encountered it is rendered safe by converting the data to character entities.

    - -

    -Note: This function should only be used to deal with data upon submission. It's not something that should be used for general runtime processing since it requires a fair amount of processing overhead.

    - - -

    To filter data through the XSS filter use this function:

    - -

    $this->input->xss_clean()

    - -

    Here is an usage example:

    - -$data = $this->input->xss_clean($data); - -

    If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your -application/config/config.php file and setting this:

    - -$config['global_xss_filtering'] = TRUE; - -

    Note: If you use the form validation class, it gives you the option of XSS filtering as well.

    - -

    An optional second parameter, is_image, allows this function to be used to test images for potential XSS attacks, useful for file upload security. When this second parameter is set to TRUE, instead of returning an altered string, the function returns TRUE if the image is safe, and FALSE if it contained potentially malicious information that a browser may attempt to execute.

    - -if ($this->input->xss_clean($file, TRUE) === FALSE)
    -{
    -    // file failed the XSS test
    -}     - - -

    Using POST, COOKIE, or SERVER Data

    - -

    CodeIgniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided -functions rather than fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and -return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first. -In other words, normally you might do something like this:

    - - -if ( ! isset($_POST['something']))
    -{
    -    $something = FALSE;
    -}
    -else
    -{
    -    $something = $_POST['something'];
    -}     - -

    With CodeIgniter's built in functions you can simply do this:

    - -$something = $this->input->post('something'); - -

    The three functions are:

    - -
      -
    • $this->input->post()
      • -
    • $this->input->cookie()
      • -
    • $this->input->server()
      • -
    - -

    $this->input->post()

    - -

    The first parameter will contain the name of the POST item you are looking for:

    - -$this->input->post('some_data'); - -

    The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

    - -

    The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

    - -$this->input->post('some_data', TRUE); - -

    $this->input->get()

    - -

    This function is identical to the post function, only it fetches get data:

    - -$this->input->get('some_data', TRUE); - -

    $this->input->get_post()

    - -

    This function will search through both the post and get streams for data, looking first in post, and then in get:

    - -$this->input->get_post('some_data', TRUE); - -

    $this->input->cookie()

    - -

    This function is identical to the post function, only it fetches cookie data:

    - -$this->input->cookie('some_data', TRUE); - -

    $this->input->server()

    - -

    This function is identical to the above functions, only it fetches server data:

    - -$this->input->server('some_data'); - - - - -

    $this->input->ip_address()

    -

    Returns the IP address for the current user. If the IP address is not valid, the function will return an IP of: 0.0.0.0

    -echo $this->input->ip_address(); - - -

    $this->input->valid_ip($ip)

    - -

    Takes an IP address as input and returns TRUE or FALSE (boolean) if it is valid or not. Note: The $this->input->ip_address() function above -validates the IP automatically.

    - -if ( ! $this->input->valid_ip($ip))
    -{
    -     echo 'Not Valid';
    -}
    -else
    -{
    -     echo 'Valid';
    -}     - - -

    $this->input->user_agent()

    -

    Returns the user agent (web browser) being used by the current user. Returns FALSE if it's not available.

    -echo $this->input->user_agent(); - - - - -
    - - - - - - + + + + + +Input Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Input Class

    + +

    The Input Class serves two purposes:

    + +
      +
    1. It pre-processes global input data for security.
      2. +
    2. It provides some helper functions for fetching input data and pre-processing it.
      3. +
    + +

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    + + +

    Security Filtering

    + +

    The security filtering function is called automatically when a new controller is invoked. It does the following:

    + +
      +
    • Destroys the global GET array. Since CodeIgniter does not utilize GET strings, there is no reason to allow it.
      • +
    • Destroys all global variables in the event register_globals is turned on.
      • +
    • Filters the POST/COOKIE array keys, permitting only alpha-numeric (and a few other) characters.
      • +
    • Provides XSS (Cross-site Scripting Hacks) filtering. This can be enabled globally, or upon request.
      • +
    • Standardizes newline characters to \n
      • +
    + + +

    XSS Filtering

    + +

    CodeIgniter comes with a Cross Site Scripting Hack prevention filter which can either run automatically to filter +all POST and COOKIE data that is encountered, or you can run it on a per item basis. By default it does not +run globally since it requires a bit of processing overhead, and since you may not need it in all cases.

    + +

    The XSS filter looks for commonly used techniques to trigger Javascript or other types of code that attempt to hijack cookies +or do other malicious things. If anything disallowed is encountered it is rendered safe by converting the data to character entities.

    + +

    +Note: This function should only be used to deal with data upon submission. It's not something that should be used for general runtime processing since it requires a fair amount of processing overhead.

    + + +

    To filter data through the XSS filter use this function:

    + +

    $this->input->xss_clean()

    + +

    Here is an usage example:

    + +$data = $this->input->xss_clean($data); + +

    If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your +application/config/config.php file and setting this:

    + +$config['global_xss_filtering'] = TRUE; + +

    Note: If you use the form validation class, it gives you the option of XSS filtering as well.

    + +

    An optional second parameter, is_image, allows this function to be used to test images for potential XSS attacks, useful for file upload security. When this second parameter is set to TRUE, instead of returning an altered string, the function returns TRUE if the image is safe, and FALSE if it contained potentially malicious information that a browser may attempt to execute.

    + +if ($this->input->xss_clean($file, TRUE) === FALSE)
    +{
    +    // file failed the XSS test
    +}     + + +

    Using POST, COOKIE, or SERVER Data

    + +

    CodeIgniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided +functions rather than fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and +return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first. +In other words, normally you might do something like this:

    + + +if ( ! isset($_POST['something']))
    +{
    +    $something = FALSE;
    +}
    +else
    +{
    +    $something = $_POST['something'];
    +}     + +

    With CodeIgniter's built in functions you can simply do this:

    + +$something = $this->input->post('something'); + +

    The three functions are:

    + +
      +
    • $this->input->post()
      • +
    • $this->input->cookie()
      • +
    • $this->input->server()
      • +
    + +

    $this->input->post()

    + +

    The first parameter will contain the name of the POST item you are looking for:

    + +$this->input->post('some_data'); + +

    The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

    + +

    The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

    + +$this->input->post('some_data', TRUE); + +

    $this->input->get()

    + +

    This function is identical to the post function, only it fetches get data:

    + +$this->input->get('some_data', TRUE); + +

    $this->input->get_post()

    + +

    This function will search through both the post and get streams for data, looking first in post, and then in get:

    + +$this->input->get_post('some_data', TRUE); + +

    $this->input->cookie()

    + +

    This function is identical to the post function, only it fetches cookie data:

    + +$this->input->cookie('some_data', TRUE); + +

    $this->input->server()

    + +

    This function is identical to the above functions, only it fetches server data:

    + +$this->input->server('some_data'); + + + + +

    $this->input->ip_address()

    +

    Returns the IP address for the current user. If the IP address is not valid, the function will return an IP of: 0.0.0.0

    +echo $this->input->ip_address(); + + +

    $this->input->valid_ip($ip)

    + +

    Takes an IP address as input and returns TRUE or FALSE (boolean) if it is valid or not. Note: The $this->input->ip_address() function above +validates the IP automatically.

    + +if ( ! $this->input->valid_ip($ip))
    +{
    +     echo 'Not Valid';
    +}
    +else
    +{
    +     echo 'Valid';
    +}     + + +

    $this->input->user_agent()

    +

    Returns the user agent (web browser) being used by the current user. Returns FALSE if it's not available.

    +echo $this->input->user_agent(); + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 0b5e8a21..4967fe0f 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -1,137 +1,137 @@ - - - - - -Language Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Language Class

    - -

    The Language Class provides functions to retrieve language files and lines of text for purposes of internationalization.

    - -

    In your CodeIgniter system folder you'll find one called language containing sets of language files. You can create -your own language files as needed in order to display error and other messages in other languages.

    - -

    Language files are typically stored in your system/language directory. Alternately you can create a folder called language inside -your application folder and store them there. CodeIgniter will look first in your system/application/language -directory. If the directory does not exist or the specified language is not located there CI will instead look in your global -system/language folder.

    - -

    Note:  Each language should be stored in its own folder. For example, the English files are located at: -system/language/english

    - - - -

    Creating Language Files

    - -

    Language files must be named with _lang.php as the file extension. For example, let's say you want to create a file -containing error messages. You might name it: error_lang.php

    - -

    Within the file you will assign each line of text to an array called $lang with this prototype:

    - -$lang['language_key'] = "The actual message to be shown"; - -

    Note: It's a good practice to use a common prefix for all messages in a given file to avoid collisions with -similarly named items in other files. For example, if you are creating error messages you might prefix them with error_

    - -$lang['error_email_missing'] = "You must submit an email address";
    -$lang['error_url_missing'] = "You must submit a URL";
    -$lang['error_username_missing'] = "You must submit a username";     - - -

    Loading A Language File

    - -

    In order to fetch a line from a particular file you must load the file first. Loading a language file is done with the following code:

    - -$this->lang->load('filename', 'language'); - -

    Where filename is the name of the file you wish to load (without the file extension), and language -is the language set containing it (ie, english). If the second parameter is missing, the default language set in your -application/config/config.php file will be used.

    - - -

    Fetching a Line of Text

    - -

    Once your desired language file is loaded you can access any line of text using this function:

    - -$this->lang->line('language_key'); - -

    Where language_key is the array key corresponding to the line you wish to show.

    - -

    Note: This function simply returns the line. It does not echo it for you.

    - -

    Using language lines as form labels

    - -

    This feature has been deprecated from the language library and moved to the lang() function of the Language helper.

    - -

    Auto-loading Languages

    -

    If you find that you need a particular language globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. This is done by opening the application/config/autoload.php file and adding the language(s) to the autoload array.

    -

     

    -
    - - - - - - + + + + + +Language Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Language Class

    + +

    The Language Class provides functions to retrieve language files and lines of text for purposes of internationalization.

    + +

    In your CodeIgniter system folder you'll find one called language containing sets of language files. You can create +your own language files as needed in order to display error and other messages in other languages.

    + +

    Language files are typically stored in your system/language directory. Alternately you can create a folder called language inside +your application folder and store them there. CodeIgniter will look first in your system/application/language +directory. If the directory does not exist or the specified language is not located there CI will instead look in your global +system/language folder.

    + +

    Note:  Each language should be stored in its own folder. For example, the English files are located at: +system/language/english

    + + + +

    Creating Language Files

    + +

    Language files must be named with _lang.php as the file extension. For example, let's say you want to create a file +containing error messages. You might name it: error_lang.php

    + +

    Within the file you will assign each line of text to an array called $lang with this prototype:

    + +$lang['language_key'] = "The actual message to be shown"; + +

    Note: It's a good practice to use a common prefix for all messages in a given file to avoid collisions with +similarly named items in other files. For example, if you are creating error messages you might prefix them with error_

    + +$lang['error_email_missing'] = "You must submit an email address";
    +$lang['error_url_missing'] = "You must submit a URL";
    +$lang['error_username_missing'] = "You must submit a username";     + + +

    Loading A Language File

    + +

    In order to fetch a line from a particular file you must load the file first. Loading a language file is done with the following code:

    + +$this->lang->load('filename', 'language'); + +

    Where filename is the name of the file you wish to load (without the file extension), and language +is the language set containing it (ie, english). If the second parameter is missing, the default language set in your +application/config/config.php file will be used.

    + + +

    Fetching a Line of Text

    + +

    Once your desired language file is loaded you can access any line of text using this function:

    + +$this->lang->line('language_key'); + +

    Where language_key is the array key corresponding to the line you wish to show.

    + +

    Note: This function simply returns the line. It does not echo it for you.

    + +

    Using language lines as form labels

    + +

    This feature has been deprecated from the language library and moved to the lang() function of the Language helper.

    + +

    Auto-loading Languages

    +

    If you find that you need a particular language globally throughout your application, you can tell CodeIgniter to auto-load it during system initialization. This is done by opening the application/config/autoload.php file and adding the language(s) to the autoload array.

    +

     

    +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 0e13d86b..2680dfab 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -1,214 +1,214 @@ - - - - - -Loader Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Loader Class

    - -

    Loader, as the name suggests, is used to load elements. These elements can be libraries (classes) View files, -Helpers, Plugins, or your own files.

    - -

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    - -

    The following functions are available in this class:

    - - -

    $this->load->library('class_name', $config, 'object name')

    - - -

    This function is used to load core classes. Where class_name is the name of the class you want to load. -Note: We use the terms "class" and "library" interchangeably.

    - -

    For example, if you would like to send email with CodeIgniter, the first step is to load the email class within your controller:

    - -$this->load->library('email'); - -

    Once loaded, the library will be ready for use, using $this->email->some_function(). - -

    Library files can be stored in subdirectories within the main "libraries" folder, or within your personal application/libraries folder. -To load a file located in a subdirectory, simply include the path, relative to the "libraries" folder. -For example, if you have file located at:

    - -libraries/flavors/chocolate.php - -

    You will load it using:

    - -$this->load->library('flavors/chocolate'); - -

    You may nest the file in as many subdirectories as you want.

    - -

    Setting options

    - -

    The second (optional) parameter allows you to optionally pass configuration setting. You will typically pass these as an array:

    - - -$config = array (
    -                  'mailtype' => 'html',
    -                  'charset'  => 'utf-8,
    -                  'priority' => '1'
    -               );
    -
    -$this->load->library('email', $config);     - -

    Config options can usually also be set via a config file. Each library is explained in detail in its own page, so please read the information regarding each one you would like to use.

    - -

    Assigning a Library to a different object name

    - -

    If the third (optional) parameter is blank, the library will usually be assigned to an object with the same name as the library. For example, if the library is named Session, it -will be assigned to a variable named $this->session.

    - -

    If you prefer to set your own class names you can pass its value to the third parameter:

    - -$this->load->library('session', '', 'my_session');

    - -// Session class is now accessed using:

    - -$this->my_session - -     - - - -

    $this->load->view('file_name', $data, true/false)

    - -

    This function is used to load your View files. If you haven't read the Views section of the -user guide it is recommended that you do since it shows you how this function is typically used.

    - -

    The first parameter is required. It is the name of the view file you would like to load.  Note: The .php file extension does not need to be specified unless you use something other than .php.

    - -

    The second optional parameter can take -an associative array or an object as input, which it runs through the PHP extract function to -convert to variables that can be used in your view files. Again, read the Views page to learn -how this might be useful.

    - -

    The third optional parameter lets you change the behavior of the function so that it returns data as a string -rather than sending it to your browser. This can be useful if you want to process the data in some way. If you -set the parameter to true (boolean) it will return data. The default behavior is false, which sends it -to your browser. Remember to assign it to a variable if you want the data returned:

    - -$string = $this->load->view('myfile', '', true); - - -

    $this->load->model('Model_name');

    -

    $this->load->model('Model_name');

    -

    If your model is located in a sub-folder, include the relative path from your models folder. For example, if you have a model located at application/models/blog/queries.php you'll load it using:

    -

    $this->load->model('blog/queries');

    -

    If you would like your model assigned to a different object name you can specify it via the second parameter of the loading - function:

    - $this->load->model('Model_name', 'fubar');
    -
    -$this->fubar->function();     -

    $this->load->database('options', true/false)

    -

    This function lets you load the database class. The two parameters are optional. Please see the -database section for more info.

    - - -

    $this->load->scaffolding('table_name')

    - -

    This function lets you enable scaffolding. Please see the -scaffolding section for more info.

    - - - -

    $this->load->vars($array)

    - -

    This function takes an associative array as input and generates variables using the PHP extract function. -This function produces the same result as using the second parameter of the $this->load->view() function above. The reason you might -want to use this function independently is if you would like to set some global variables in the constructor of your controller -and have them become available in any view file loaded from any function. You can have multiple calls to this function. The data get cached -and merged into one array for conversion to variables. -

    - - -

    $this->load->helper('file_name')

    -

    This function loads helper files, where file_name is the name of the file, without the _helper.php extension.

    - - -

    $this->load->plugin('file_name')

    -

    This function loads plugins files, where file_name is the name of the file, without the _plugin.php extension.

    - -

    $this->load->file('filepath/filename', true/false)

    -

    This is a generic file loading function. Supply the filepath and name in the first parameter and it will open and read the file. -By default the data is sent to your browser, just like a View file, but if you set the second parameter to true (boolean) -it will instead return the data as a string.

    - - -

    $this->load->lang('file_name')

    -

    This function is an alias of the language loading function: $this->lang->load()

    - -

    $this->load->config('file_name')

    -

    This function is an alias of the config file loading function: $this->config->load()

    - - - - -
    - - - - - - + + + + + +Loader Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Loader Class

    + +

    Loader, as the name suggests, is used to load elements. These elements can be libraries (classes) View files, +Helpers, Plugins, or your own files.

    + +

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    + +

    The following functions are available in this class:

    + + +

    $this->load->library('class_name', $config, 'object name')

    + + +

    This function is used to load core classes. Where class_name is the name of the class you want to load. +Note: We use the terms "class" and "library" interchangeably.

    + +

    For example, if you would like to send email with CodeIgniter, the first step is to load the email class within your controller:

    + +$this->load->library('email'); + +

    Once loaded, the library will be ready for use, using $this->email->some_function(). + +

    Library files can be stored in subdirectories within the main "libraries" folder, or within your personal application/libraries folder. +To load a file located in a subdirectory, simply include the path, relative to the "libraries" folder. +For example, if you have file located at:

    + +libraries/flavors/chocolate.php + +

    You will load it using:

    + +$this->load->library('flavors/chocolate'); + +

    You may nest the file in as many subdirectories as you want.

    + +

    Setting options

    + +

    The second (optional) parameter allows you to optionally pass configuration setting. You will typically pass these as an array:

    + + +$config = array (
    +                  'mailtype' => 'html',
    +                  'charset'  => 'utf-8,
    +                  'priority' => '1'
    +               );
    +
    +$this->load->library('email', $config);     + +

    Config options can usually also be set via a config file. Each library is explained in detail in its own page, so please read the information regarding each one you would like to use.

    + +

    Assigning a Library to a different object name

    + +

    If the third (optional) parameter is blank, the library will usually be assigned to an object with the same name as the library. For example, if the library is named Session, it +will be assigned to a variable named $this->session.

    + +

    If you prefer to set your own class names you can pass its value to the third parameter:

    + +$this->load->library('session', '', 'my_session');

    + +// Session class is now accessed using:

    + +$this->my_session + +     + + + +

    $this->load->view('file_name', $data, true/false)

    + +

    This function is used to load your View files. If you haven't read the Views section of the +user guide it is recommended that you do since it shows you how this function is typically used.

    + +

    The first parameter is required. It is the name of the view file you would like to load.  Note: The .php file extension does not need to be specified unless you use something other than .php.

    + +

    The second optional parameter can take +an associative array or an object as input, which it runs through the PHP extract function to +convert to variables that can be used in your view files. Again, read the Views page to learn +how this might be useful.

    + +

    The third optional parameter lets you change the behavior of the function so that it returns data as a string +rather than sending it to your browser. This can be useful if you want to process the data in some way. If you +set the parameter to true (boolean) it will return data. The default behavior is false, which sends it +to your browser. Remember to assign it to a variable if you want the data returned:

    + +$string = $this->load->view('myfile', '', true); + + +

    $this->load->model('Model_name');

    +

    $this->load->model('Model_name');

    +

    If your model is located in a sub-folder, include the relative path from your models folder. For example, if you have a model located at application/models/blog/queries.php you'll load it using:

    +

    $this->load->model('blog/queries');

    +

    If you would like your model assigned to a different object name you can specify it via the second parameter of the loading + function:

    + $this->load->model('Model_name', 'fubar');
    +
    +$this->fubar->function();     +

    $this->load->database('options', true/false)

    +

    This function lets you load the database class. The two parameters are optional. Please see the +database section for more info.

    + + +

    $this->load->scaffolding('table_name')

    + +

    This function lets you enable scaffolding. Please see the +scaffolding section for more info.

    + + + +

    $this->load->vars($array)

    + +

    This function takes an associative array as input and generates variables using the PHP extract function. +This function produces the same result as using the second parameter of the $this->load->view() function above. The reason you might +want to use this function independently is if you would like to set some global variables in the constructor of your controller +and have them become available in any view file loaded from any function. You can have multiple calls to this function. The data get cached +and merged into one array for conversion to variables. +

    + + +

    $this->load->helper('file_name')

    +

    This function loads helper files, where file_name is the name of the file, without the _helper.php extension.

    + + +

    $this->load->plugin('file_name')

    +

    This function loads plugins files, where file_name is the name of the file, without the _plugin.php extension.

    + +

    $this->load->file('filepath/filename', true/false)

    +

    This is a generic file loading function. Supply the filepath and name in the first parameter and it will open and read the file. +By default the data is sent to your browser, just like a View file, but if you set the second parameter to true (boolean) +it will instead return the data as a string.

    + + +

    $this->load->lang('file_name')

    +

    This function is an alias of the language loading function: $this->lang->load()

    + +

    $this->load->config('file_name')

    +

    This function is an alias of the config file loading function: $this->config->load()

    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 7af2b358..004e0420 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -1,145 +1,145 @@ - - - - - -Output Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Output Class

    - -

    The Output class is a small class with one main function: To send the finalized web page to the requesting browser. It is -also responsible for caching your web pages, if you use that feature.

    - -

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    - -

    Under normal circumstances you won't even notice the Output class since it works transparently without your intervention. -For example, when you use the Loader class to load a view file, it's automatically -passed to the Output class, which will be called automatically by CodeIgniter at the end of system execution. -It is possible, however, for you to manually intervene with the output if you need to, using either of the two following functions:

    - -

    $this->output->set_output();

    - -

    Permits you to manually set the final output string. Usage example:

    - -$this->output->set_output($data); - -

    Important: If you do set your output manually, it must be the last thing done in the function you call it from. -For example, if you build a page in one of your controller functions, don't set the output until the end.

    - - -

    $this->output->get_output();

    - -

    Permits you to manually retrieve any output that has been sent for storage in the output class. Usage example:

    -$string = $this->output->get_output(); - -

    Note that data will only be retrievable from this function if it has been previously sent to the output class by one of the -CodeIgniter functions like $this->load->view().

    - - -

    $this->output->set_header();

    - -

    Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:

    - - -$this->output->set_header("HTTP/1.0 200 OK");
    -$this->output->set_header("HTTP/1.1 200 OK");
    -$this->output->set_header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_update).' GMT');
    -$this->output->set_header("Cache-Control: no-store, no-cache, must-revalidate");
    -$this->output->set_header("Cache-Control: post-check=0, pre-check=0");
    -$this->output->set_header("Pragma: no-cache");     - - -

    $this->output->set_status_header();

    - -

    Permits you to manually set a server status header. Example:

    - -$this->output->set_status_header('401');
    -// Sets the header as: Unauthorized     - -

    See here for a full list of headers.

    - -

    $this->output->enable_profiler();

    - -

    Permits you to enable/disable the Profiler, which will display benchmark and other data -at the bottom of your pages for debugging and optimization purposes.

    - -

    To enable the profiler place the following function anywhere within your Controller functions:

    -$this->output->enable_profiler(TRUE); - -

    When enabled a report will be generated and inserted at the bottom of your pages.

    - -

    To disable the profiler you will use:

    -$this->output->enable_profiler(FALSE); - - -

    $this->output->cache();

    -

    The CodeIgniter output library also controls caching. For more information, please see the caching documentation.

    - -
    - - - - - - + + + + + +Output Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Output Class

    + +

    The Output class is a small class with one main function: To send the finalized web page to the requesting browser. It is +also responsible for caching your web pages, if you use that feature.

    + +

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    + +

    Under normal circumstances you won't even notice the Output class since it works transparently without your intervention. +For example, when you use the Loader class to load a view file, it's automatically +passed to the Output class, which will be called automatically by CodeIgniter at the end of system execution. +It is possible, however, for you to manually intervene with the output if you need to, using either of the two following functions:

    + +

    $this->output->set_output();

    + +

    Permits you to manually set the final output string. Usage example:

    + +$this->output->set_output($data); + +

    Important: If you do set your output manually, it must be the last thing done in the function you call it from. +For example, if you build a page in one of your controller functions, don't set the output until the end.

    + + +

    $this->output->get_output();

    + +

    Permits you to manually retrieve any output that has been sent for storage in the output class. Usage example:

    +$string = $this->output->get_output(); + +

    Note that data will only be retrievable from this function if it has been previously sent to the output class by one of the +CodeIgniter functions like $this->load->view().

    + + +

    $this->output->set_header();

    + +

    Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:

    + + +$this->output->set_header("HTTP/1.0 200 OK");
    +$this->output->set_header("HTTP/1.1 200 OK");
    +$this->output->set_header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_update).' GMT');
    +$this->output->set_header("Cache-Control: no-store, no-cache, must-revalidate");
    +$this->output->set_header("Cache-Control: post-check=0, pre-check=0");
    +$this->output->set_header("Pragma: no-cache");     + + +

    $this->output->set_status_header();

    + +

    Permits you to manually set a server status header. Example:

    + +$this->output->set_status_header('401');
    +// Sets the header as: Unauthorized     + +

    See here for a full list of headers.

    + +

    $this->output->enable_profiler();

    + +

    Permits you to enable/disable the Profiler, which will display benchmark and other data +at the bottom of your pages for debugging and optimization purposes.

    + +

    To enable the profiler place the following function anywhere within your Controller functions:

    +$this->output->enable_profiler(TRUE); + +

    When enabled a report will be generated and inserted at the bottom of your pages.

    + +

    To disable the profiler you will use:

    +$this->output->enable_profiler(FALSE); + + +

    $this->output->cache();

    +

    The CodeIgniter output library also controls caching. For more information, please see the caching documentation.

    + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 452a4d21..79e5a5bd 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -1,218 +1,218 @@ - - - - - -Pagination Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Pagination Class

    - -

    CodeIgniter's Pagination class is very easy to use, and it is 100% customizable, either dynamically or via stored preferences.

    - -

    If you are not familiar with the term "pagination", it refers to links that allows you to navigate from page to page, like this:

    - -« First  < 1 2 3 4 5 >  Last » - -

    Example

    - -

    Here is a simple example showing how to create pagination in one of your controller functions:

    - - -$this->load->library('pagination');

    -$config['base_url'] = 'http://example.com/index.php/test/page/';
    -$config['total_rows'] = '200';
    -$config['per_page'] = '20'; -

    -$this->pagination->initialize($config); - -

    -echo $this->pagination->create_links();     - -

    Notes:

    - -

    The $config array contains your configuration variables. It is passed to the $this->pagination->initialize function as shown above. Although there are some twenty items you can configure, at -minimum you need the three shown. Here is a description of what those items represent:

    - -
      -
    • base_url This is the full URL to the controller class/function containing your pagination. In the example - above, it is pointing to a controller called "Test" and a function called "page". Keep in mind that you can - re-route your URI if you need a different structure.
      • -
    • total_rows This number represents the total rows in the result set you are creating pagination for. - Typically this number will be the total rows that your database query returned. -
      • -
    • per_page The number of items you intend to show per page. In the above example, you would be showing 20 items per page.
      • -
    - -

    The create_links() function returns an empty string when there is no pagination to show.

    - - -

    Setting preferences in a config file

    - -

    If you prefer not to set preferences using the above method, you can instead put them into a config file. -Simply create a new file called pagination.php, add the $config -array in that file. Then save the file in: config/pagination.php and it will be used automatically. You -will NOT need to use the $this->pagination->initialize function if you save your preferences in a config file.

    - - -

    Customizing the Pagination

    - -

    The following is a list of all the preferences you can pass to the initialization function to tailor the display.

    - - -

    $config['uri_segment'] = 3;

    - -

    The pagination function automatically determines which segment of your URI contains the page number. If you need -something different you can specify it.

    - -

    $config['num_links'] = 2;

    - -

    The number of "digit" links you would like before and after the selected page number. For example, the number 2 - will place two digits on either side, as in the example links at the very top of this page.

    -

    $config['page_query_string'] = TRUE

    -

    By default, the pagination library assume you are using URI Segments, and constructs your links something like

    -

    http://example.com/index.php/test/page/20

    -

    If you have $config['enable_query_strings'] set to TRUE your links will automatically be re-written using Query Strings. This option can also be explictly set. Using $config['page_query_string'] set to TRUE, the pagination link will become.

    -

    http://example.com/index.php?c=test&m=page&per_page=20

    -

    Note that "per_page" is the default query string passed, however can be configured using $config['query_string_segment'] = 'your_string'

    -

    Adding Enclosing Markup

    - -

    If you would like to surround the entire pagination with some markup you can do it with these two prefs:

    - -

    $config['full_tag_open'] = '<p>';

    -

    The opening tag placed on the left side of the entire result.

    - -

    $config['full_tag_close'] = '</p>';

    -

    The closing tag placed on the right side of the entire result.

    - - -

    Customizing the First Link

    - -

    $config['first_link'] = 'First';

    -

    The text you would like shown in the "first" link on the left.

    - -

    $config['first_tag_open'] = '<div>';

    -

    The opening tag for the "first" link.

    - -

    $config['first_tag_close'] = '</div>';

    -

    The closing tag for the "first" link.

    - -

    Customizing the Last Link

    - -

    $config['last_link'] = 'Last';

    -

    The text you would like shown in the "last" link on the right.

    - -

    $config['last_tag_open'] = '<div>';

    -

    The opening tag for the "last" link.

    - -

    $config['last_tag_close'] = '</div>';

    -

    The closing tag for the "last" link.

    - -

    Customizing the "Next" Link

    - -

    $config['next_link'] = '&gt;';

    -

    The text you would like shown in the "next" page link.

    - -

    $config['next_tag_open'] = '<div>';

    -

    The opening tag for the "next" link.

    - -

    $config['next_tag_close'] = '</div>';

    -

    The closing tag for the "next" link.

    - -

    Customizing the "Previous" Link

    - -

    $config['prev_link'] = '&lt;';

    -

    The text you would like shown in the "previous" page link.

    - -

    $config['prev_tag_open'] = '<div>';

    -

    The opening tag for the "previous" link.

    - -

    $config['prev_tag_close'] = '</div>';

    -

    The closing tag for the "previous" link.

    - -

    Customizing the "Current Page" Link

    - -

    $config['cur_tag_open'] = '<b>';

    -

    The opening tag for the "current" link.

    - -

    $config['cur_tag_close'] = '</b>';

    -

    The closing tag for the "current" link.

    - - -

    Customizing the "Digit" Link

    - -

    $config['num_tag_open'] = '<div>';

    -

    The opening tag for the "digit" link.

    - -

    $config['num_tag_close'] = '</div>';

    -

    The closing tag for the "digit" link.

    - - - -
    - - - - - - + + + + + +Pagination Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Pagination Class

    + +

    CodeIgniter's Pagination class is very easy to use, and it is 100% customizable, either dynamically or via stored preferences.

    + +

    If you are not familiar with the term "pagination", it refers to links that allows you to navigate from page to page, like this:

    + +« First  < 1 2 3 4 5 >  Last » + +

    Example

    + +

    Here is a simple example showing how to create pagination in one of your controller functions:

    + + +$this->load->library('pagination');

    +$config['base_url'] = 'http://example.com/index.php/test/page/';
    +$config['total_rows'] = '200';
    +$config['per_page'] = '20'; +

    +$this->pagination->initialize($config); + +

    +echo $this->pagination->create_links();     + +

    Notes:

    + +

    The $config array contains your configuration variables. It is passed to the $this->pagination->initialize function as shown above. Although there are some twenty items you can configure, at +minimum you need the three shown. Here is a description of what those items represent:

    + +
      +
    • base_url This is the full URL to the controller class/function containing your pagination. In the example + above, it is pointing to a controller called "Test" and a function called "page". Keep in mind that you can + re-route your URI if you need a different structure.
      • +
    • total_rows This number represents the total rows in the result set you are creating pagination for. + Typically this number will be the total rows that your database query returned. +
      • +
    • per_page The number of items you intend to show per page. In the above example, you would be showing 20 items per page.
      • +
    + +

    The create_links() function returns an empty string when there is no pagination to show.

    + + +

    Setting preferences in a config file

    + +

    If you prefer not to set preferences using the above method, you can instead put them into a config file. +Simply create a new file called pagination.php, add the $config +array in that file. Then save the file in: config/pagination.php and it will be used automatically. You +will NOT need to use the $this->pagination->initialize function if you save your preferences in a config file.

    + + +

    Customizing the Pagination

    + +

    The following is a list of all the preferences you can pass to the initialization function to tailor the display.

    + + +

    $config['uri_segment'] = 3;

    + +

    The pagination function automatically determines which segment of your URI contains the page number. If you need +something different you can specify it.

    + +

    $config['num_links'] = 2;

    + +

    The number of "digit" links you would like before and after the selected page number. For example, the number 2 + will place two digits on either side, as in the example links at the very top of this page.

    +

    $config['page_query_string'] = TRUE

    +

    By default, the pagination library assume you are using URI Segments, and constructs your links something like

    +

    http://example.com/index.php/test/page/20

    +

    If you have $config['enable_query_strings'] set to TRUE your links will automatically be re-written using Query Strings. This option can also be explictly set. Using $config['page_query_string'] set to TRUE, the pagination link will become.

    +

    http://example.com/index.php?c=test&m=page&per_page=20

    +

    Note that "per_page" is the default query string passed, however can be configured using $config['query_string_segment'] = 'your_string'

    +

    Adding Enclosing Markup

    + +

    If you would like to surround the entire pagination with some markup you can do it with these two prefs:

    + +

    $config['full_tag_open'] = '<p>';

    +

    The opening tag placed on the left side of the entire result.

    + +

    $config['full_tag_close'] = '</p>';

    +

    The closing tag placed on the right side of the entire result.

    + + +

    Customizing the First Link

    + +

    $config['first_link'] = 'First';

    +

    The text you would like shown in the "first" link on the left.

    + +

    $config['first_tag_open'] = '<div>';

    +

    The opening tag for the "first" link.

    + +

    $config['first_tag_close'] = '</div>';

    +

    The closing tag for the "first" link.

    + +

    Customizing the Last Link

    + +

    $config['last_link'] = 'Last';

    +

    The text you would like shown in the "last" link on the right.

    + +

    $config['last_tag_open'] = '<div>';

    +

    The opening tag for the "last" link.

    + +

    $config['last_tag_close'] = '</div>';

    +

    The closing tag for the "last" link.

    + +

    Customizing the "Next" Link

    + +

    $config['next_link'] = '&gt;';

    +

    The text you would like shown in the "next" page link.

    + +

    $config['next_tag_open'] = '<div>';

    +

    The opening tag for the "next" link.

    + +

    $config['next_tag_close'] = '</div>';

    +

    The closing tag for the "next" link.

    + +

    Customizing the "Previous" Link

    + +

    $config['prev_link'] = '&lt;';

    +

    The text you would like shown in the "previous" page link.

    + +

    $config['prev_tag_open'] = '<div>';

    +

    The opening tag for the "previous" link.

    + +

    $config['prev_tag_close'] = '</div>';

    +

    The closing tag for the "previous" link.

    + +

    Customizing the "Current Page" Link

    + +

    $config['cur_tag_open'] = '<b>';

    +

    The opening tag for the "current" link.

    + +

    $config['cur_tag_close'] = '</b>';

    +

    The closing tag for the "current" link.

    + + +

    Customizing the "Digit" Link

    + +

    $config['num_tag_open'] = '<div>';

    +

    The opening tag for the "digit" link.

    + +

    $config['num_tag_close'] = '</div>';

    +

    The closing tag for the "digit" link.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 7d6b2afa..8151eb12 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -1,208 +1,208 @@ - - - - - -Template Parser Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - - - -

    Template Parser Class

    - -

    The Template Parser Class enables you to parse pseudo-variables contained within your view files. It can parse simple -variables or variable tag pairs. If you've never used a template engine, pseudo-variables look like this:

    - -<html>
    -<head>
    -<title>{blog_title}</title>
    -</head>
    -<body>
    -
    -<h3>{blog_heading}</h3>
    -
    -{blog_entries}
    -<h5>{title}</h5>
    -<p>{body}</p>
    -{/blog_entries}
    - -</body>
    -</html>     - -

    These variables are not actual PHP variables, but rather plain text representations that allow you to eliminate -PHP from your templates (view files).

    - -

    Note: CodeIgniter does not require you to use this class -since using pure PHP in your view pages lets them run a little faster. However, some developers prefer to use a template engine if -they work with designers who they feel would find some confusion working with PHP.

    - -

    Also Note: The Template Parser Class is not a -full-blown template parsing solution. We've kept it very lean on purpose in order to maintain maximum performance.

    - - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the Parser class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('parser'); -

    Once loaded, the Parser library object will be available using: $this->parser

    - - -

    The following functions are available in this library:

    - -

    $this->parser->parse()

    - -

    This method accepts a template name and data array as input, and it generates a parsed version. Example:

    - -$this->load->library('parser');
    -
    -$data = array(
    -            'blog_title' => 'My Blog Title',
    -            'blog_heading' => 'My Blog Heading'
    -            );
    -
    -$this->parser->parse('blog_template', $data);     - -

    The first parameter contains the name of the view file (in this example the file would be called blog_template.php), -and the second parameter contains an associative array of data to be replaced in the template. In the above example, the -template would contain two variables: {blog_title} and {blog_heading}

    - -

    There is no need to "echo" or do something with the data returned by $this->parser->parse(). It is automatically -passed to the output class to be sent to the browser. However, if you do want the data returned instead of sent to the output class you can -pass TRUE (boolean) to the third parameter:

    - -$string = $this->parser->parse('blog_template', $data, TRUE); - - -

    Variable Pairs

    - -

    The above example code allows simple variables to be replaced. What if you would like an entire block of variables to be -repeated, with each iteration containing new values? Consider the template example we showed at the top of the page:

    - -<html>
    -<head>
    -<title>{blog_title}</title>
    -</head>
    -<body>
    -
    -<h3>{blog_heading}</h3>
    -
    -{blog_entries}
    -<h5>{title}</h5>
    -<p>{body}</p>
    -{/blog_entries}
    - -</body>
    -</html>     - -

    In the above code you'll notice a pair of variables: {blog_entries} data... {/blog_entries}. -In a case like this, the entire chunk of data between these pairs would be repeated multiple times, corresponding -to the number of rows in a result.

    - -

    Parsing variable pairs is done using the identical code shown above to parse single variables, -except, you will add a multi-dimensional array corresponding to your variable pair data. -Consider this example:

    - - -$this->load->library('parser');
    -
    -$data = array(
    -              'blog_title'   => 'My Blog Title',
    -              'blog_heading' => 'My Blog Heading',
    -              'blog_entries' => array(
    -                                      array('title' => 'Title 1', 'body' => 'Body 1'),
    -                                      array('title' => 'Title 2', 'body' => 'Body 2'),
    -                                      array('title' => 'Title 3', 'body' => 'Body 3'),
    -                                      array('title' => 'Title 4', 'body' => 'Body 4'),
    -                                      array('title' => 'Title 5', 'body' => 'Body 5')
    -                                      )
    -            );
    -
    -$this->parser->parse('blog_template', $data);     - -

    If your "pair" data is coming from a database result, which is already a multi-dimensional array, you can simply -use the database result_array() function:

    - - -$query = $this->db->query("SELECT * FROM blog");
    -
    -$this->load->library('parser');
    -
    -$data = array(
    -              'blog_title'   => 'My Blog Title',
    -              'blog_heading' => 'My Blog Heading',
    -              'blog_entries' => $query->result_array()
    -            );
    -
    -$this->parser->parse('blog_template', $data);     - - - - -
    - - - - - - + + + + + +Template Parser Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + + + +

    Template Parser Class

    + +

    The Template Parser Class enables you to parse pseudo-variables contained within your view files. It can parse simple +variables or variable tag pairs. If you've never used a template engine, pseudo-variables look like this:

    + +<html>
    +<head>
    +<title>{blog_title}</title>
    +</head>
    +<body>
    +
    +<h3>{blog_heading}</h3>
    +
    +{blog_entries}
    +<h5>{title}</h5>
    +<p>{body}</p>
    +{/blog_entries}
    + +</body>
    +</html>     + +

    These variables are not actual PHP variables, but rather plain text representations that allow you to eliminate +PHP from your templates (view files).

    + +

    Note: CodeIgniter does not require you to use this class +since using pure PHP in your view pages lets them run a little faster. However, some developers prefer to use a template engine if +they work with designers who they feel would find some confusion working with PHP.

    + +

    Also Note: The Template Parser Class is not a +full-blown template parsing solution. We've kept it very lean on purpose in order to maintain maximum performance.

    + + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the Parser class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('parser'); +

    Once loaded, the Parser library object will be available using: $this->parser

    + + +

    The following functions are available in this library:

    + +

    $this->parser->parse()

    + +

    This method accepts a template name and data array as input, and it generates a parsed version. Example:

    + +$this->load->library('parser');
    +
    +$data = array(
    +            'blog_title' => 'My Blog Title',
    +            'blog_heading' => 'My Blog Heading'
    +            );
    +
    +$this->parser->parse('blog_template', $data);     + +

    The first parameter contains the name of the view file (in this example the file would be called blog_template.php), +and the second parameter contains an associative array of data to be replaced in the template. In the above example, the +template would contain two variables: {blog_title} and {blog_heading}

    + +

    There is no need to "echo" or do something with the data returned by $this->parser->parse(). It is automatically +passed to the output class to be sent to the browser. However, if you do want the data returned instead of sent to the output class you can +pass TRUE (boolean) to the third parameter:

    + +$string = $this->parser->parse('blog_template', $data, TRUE); + + +

    Variable Pairs

    + +

    The above example code allows simple variables to be replaced. What if you would like an entire block of variables to be +repeated, with each iteration containing new values? Consider the template example we showed at the top of the page:

    + +<html>
    +<head>
    +<title>{blog_title}</title>
    +</head>
    +<body>
    +
    +<h3>{blog_heading}</h3>
    +
    +{blog_entries}
    +<h5>{title}</h5>
    +<p>{body}</p>
    +{/blog_entries}
    + +</body>
    +</html>     + +

    In the above code you'll notice a pair of variables: {blog_entries} data... {/blog_entries}. +In a case like this, the entire chunk of data between these pairs would be repeated multiple times, corresponding +to the number of rows in a result.

    + +

    Parsing variable pairs is done using the identical code shown above to parse single variables, +except, you will add a multi-dimensional array corresponding to your variable pair data. +Consider this example:

    + + +$this->load->library('parser');
    +
    +$data = array(
    +              'blog_title'   => 'My Blog Title',
    +              'blog_heading' => 'My Blog Heading',
    +              'blog_entries' => array(
    +                                      array('title' => 'Title 1', 'body' => 'Body 1'),
    +                                      array('title' => 'Title 2', 'body' => 'Body 2'),
    +                                      array('title' => 'Title 3', 'body' => 'Body 3'),
    +                                      array('title' => 'Title 4', 'body' => 'Body 4'),
    +                                      array('title' => 'Title 5', 'body' => 'Body 5')
    +                                      )
    +            );
    +
    +$this->parser->parse('blog_template', $data);     + +

    If your "pair" data is coming from a database result, which is already a multi-dimensional array, you can simply +use the database result_array() function:

    + + +$query = $this->db->query("SELECT * FROM blog");
    +
    +$this->load->library('parser');
    +
    +$data = array(
    +              'blog_title'   => 'My Blog Title',
    +              'blog_heading' => 'My Blog Heading',
    +              'blog_entries' => $query->result_array()
    +            );
    +
    +$this->parser->parse('blog_template', $data);     + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 8ceadf24..fbbaa64e 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -1,311 +1,311 @@ - - - - - -Session Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Session Class

    - -

    The Session class permits you maintain a user's "state" and track their activity while they browse your site. -The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie. -It can also store the session data in a database table for added security, as this permits the session ID in the -user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to -use the database option you'll need to create the session table as indicated below. -

    - -

    Note: The Session class does not utilize native PHP sessions. It -generates its own session data, offering more flexibility for developers.

    - -

    Initializing a Session

    - -

    Sessions will typically run globally with each page load, so the session class must either be -initialized in your -controller constructors, or it can be -auto-loaded by the system. -For the most part the session class will run unattended in the background, so simply initializing the class -will cause it to read, create, and update sessions.

    - - -

    To initialize the Session class manually in your controller constructor, use the $this->load->library function:

    - -$this->load->library('session'); -

    Once loaded, the Sessions library object will be available using: $this->session

    - - -

    How do Sessions work?

    - -

    When a page is loaded, the session class will check to see if valid session data exists in the user's session cookie. -If sessions data does not exist (or if it has expired) a new session will be created and saved in the cookie. -If a session does exist, its information will be updated and the cookie will be updated. With each update, the session_id will be regenerated.

    - -

    It's important for you to understand that once initialized, the Session class runs automatically. There is nothing -you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or -even add your own data to a user's session, but the process of reading, writing, and updating a session is automatic.

    - - -

    What is Session Data?

    - -

    A session, as far as CodeIgniter is concerned, is simply an array containing the following information:

    - -
      -
    • The user's unique Session ID (this is a statistically random string with very strong entropy, hashed with MD5 for portability, and regenerated (by default) every five minutes)
      • -
    • The user's IP Address
      • -
    • The user's User Agent data (the first 50 characters of the browser data string)
      • -
    • The "last activity" time stamp.
      • -
    - -

    The above data is stored in a cookie as a serialized array with this prototype:

    - -[array]
    -(
    -     'session_id'    => random hash,
    -     'ip_address'    => 'string - user IP address',
    -     'user_agent'    => 'string - user agent data',
    -     'last_activity' => timestamp
    -)     - -

    If you have the encryption option enabled, the serialized array will be encrypted before being stored in the cookie, -making the data highly secure and impervious to being read or altered by someone. More info regarding encryption -can be found here, although the Session class will take care of initializing -and encrypting the data automatically.

    - -

    Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page -you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time -the cookie was written. This time is configurable by changing the $config['time_to_update'] line in your system/config/config.php file.

    - -

    Retrieving Session Data

    - -

    Any piece of information from the session array is available using the following function:

    - -$this->session->userdata('item'); - -

    Where item is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you -will do this:

    - -$session_id = $this->session->userdata('session_id'); - -

    Note: The function returns FALSE (boolean) if the item you are trying to access does not exist.

    - - -

    Adding Custom Session Data

    - -

    A useful aspect of the session array is that you can add your own data to it and it will be stored in the user's cookie. -Why would you want to do this? Here's one example:

    - -

    Let's say a particular user logs into your site. Once authenticated, -you could add their username and email address to the session cookie, making that data globally available to you without -having to run a database query when you need it.

    - -

    To add your data to the session array involves passing an array containing your new data to this function:

    - -$this->session->set_userdata($array); - -

    Where $array is an associative array containing your new data. Here's an example:

    - - -

    $newdata = array(
    -                    'username'  => 'johndoe',
    -                    'email'     => 'johndoe@some-site.com',
    -                    'logged_in' => TRUE
    -                );
    -
    - $this->session->set_userdata($newdata);

    -

    If you want to add userdata one value at a time, set_userdata() also supports this syntax.

    -

    $this->session->set_userdata('some_name', 'some_value');

    -

    Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The -encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

    - -

    Removing Session Data

    -

    Just as set_userdata() can be used to add information into a session, unset_userdata() can be used to remove it, by passing the session key. For example, if you wanted to remove 'some_name' from your session information:

    -

    $this->session->unset_userdata('some_name');

    -

    This function can also be passed an associative array of items to unset.

    -

    $array_items = array('username' => '', 'email' => '');
    -
    -$this->session->unset_userdata($array_items);

    -

    Flashdata

    -

    CodeIgniter supports "flashdata", or session data that will only be available for the next server request, and are then automatically cleared. These can be very useful, and are typically used for informational or status messages (for example: "record 2 deleted").

    -

    Note: Flash variables are prefaced with "flash_" so avoid this prefix in your own session names.

    -

    To add flashdata:

    -

    $this->session->set_flashdata('item', 'value');

    -

    You can also pass an array to set_flashdata(), in the same manner as set_userdata().

    -

    To read a flashdata variable:

    -

    $this->session->flashdata('item');

    -

    If you find that you need to preserve a flashdata variable through an additional request, you can do so using the keep_flashdata() function.

    -

    $this->session->keep_flashdata('item');

    -

    Saving Session Data to a Database

    -

    While the session data array stored in the user's cookie contains a Session ID, -unless you store session data in a database there is no way to validate it. For some applications that require little or no -security, session ID validation may not be needed, but if your application requires security, validation is mandatory.

    - -

    When session data is available in a database, every time a valid session is found in the user's cookie, a database -query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never -be updated, they can only be generated when a new session is created.

    - -

    In order to store sessions, you must first create a database table for this purpose. Here is the basic -prototype (for MySQL) required by the session class:

    - - - -

    Note: By default the table is called ci_sessions, but you can name it anything you want -as long as you update the application/config/config.php file so that it contains the name you have chosen. -Once you have created your database table you can enable the database option in your config.php file as follows:

    - -$config['sess_use_database'] = TRUE; - -

    Once enabled, the Session class will store session data in the DB.

    - -

    Make sure you've specified the table name in your config file as well:

    - -$config['sess_table_name'] = 'ci_sessions"; - -

    Note: The Session class has built-in garbage collection which clears out expired sessions so you -do not need to write your own routine to do it.

    - - -

    Destroying a Session

    -

    To clear the current session:

    -$this->session->sess_destroy(); -

    Note: This function should be the last one called, and even flash variables will no longer be available. If you only want some items destroyed and not all, use unset_userdata().

    - - - -

    Session Preferences

    -

    You'll find the following Session related preferences in your application/config/config.php file:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    PreferenceDefaultOptionsDescription
    sess_cookie_nameci_sessionNoneThe name you want the session cookie saved as.
    sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). If you would like a non-expiring session set the value to zero: 0
    sess_encrypt_cookieFALSETRUE/FALSE (boolean)Whether to encrypt the session data.
    sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database. You must create the table before enabling this option.
    sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.
    sess_time_to_update300Time in secondsThis options controls how often the session class will regenerate itself and create a new session id.
    sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data. Note that some ISPs dynamically - changes the IP, so if you want a non-expiring session you will likely set this to FALSE.
    sess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.
    - - -
    - - - - - - + + + + + +Session Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Session Class

    + +

    The Session class permits you maintain a user's "state" and track their activity while they browse your site. +The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie. +It can also store the session data in a database table for added security, as this permits the session ID in the +user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to +use the database option you'll need to create the session table as indicated below. +

    + +

    Note: The Session class does not utilize native PHP sessions. It +generates its own session data, offering more flexibility for developers.

    + +

    Initializing a Session

    + +

    Sessions will typically run globally with each page load, so the session class must either be +initialized in your +controller constructors, or it can be +auto-loaded by the system. +For the most part the session class will run unattended in the background, so simply initializing the class +will cause it to read, create, and update sessions.

    + + +

    To initialize the Session class manually in your controller constructor, use the $this->load->library function:

    + +$this->load->library('session'); +

    Once loaded, the Sessions library object will be available using: $this->session

    + + +

    How do Sessions work?

    + +

    When a page is loaded, the session class will check to see if valid session data exists in the user's session cookie. +If sessions data does not exist (or if it has expired) a new session will be created and saved in the cookie. +If a session does exist, its information will be updated and the cookie will be updated. With each update, the session_id will be regenerated.

    + +

    It's important for you to understand that once initialized, the Session class runs automatically. There is nothing +you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or +even add your own data to a user's session, but the process of reading, writing, and updating a session is automatic.

    + + +

    What is Session Data?

    + +

    A session, as far as CodeIgniter is concerned, is simply an array containing the following information:

    + +
      +
    • The user's unique Session ID (this is a statistically random string with very strong entropy, hashed with MD5 for portability, and regenerated (by default) every five minutes)
      • +
    • The user's IP Address
      • +
    • The user's User Agent data (the first 50 characters of the browser data string)
      • +
    • The "last activity" time stamp.
      • +
    + +

    The above data is stored in a cookie as a serialized array with this prototype:

    + +[array]
    +(
    +     'session_id'    => random hash,
    +     'ip_address'    => 'string - user IP address',
    +     'user_agent'    => 'string - user agent data',
    +     'last_activity' => timestamp
    +)     + +

    If you have the encryption option enabled, the serialized array will be encrypted before being stored in the cookie, +making the data highly secure and impervious to being read or altered by someone. More info regarding encryption +can be found here, although the Session class will take care of initializing +and encrypting the data automatically.

    + +

    Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page +you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time +the cookie was written. This time is configurable by changing the $config['time_to_update'] line in your system/config/config.php file.

    + +

    Retrieving Session Data

    + +

    Any piece of information from the session array is available using the following function:

    + +$this->session->userdata('item'); + +

    Where item is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you +will do this:

    + +$session_id = $this->session->userdata('session_id'); + +

    Note: The function returns FALSE (boolean) if the item you are trying to access does not exist.

    + + +

    Adding Custom Session Data

    + +

    A useful aspect of the session array is that you can add your own data to it and it will be stored in the user's cookie. +Why would you want to do this? Here's one example:

    + +

    Let's say a particular user logs into your site. Once authenticated, +you could add their username and email address to the session cookie, making that data globally available to you without +having to run a database query when you need it.

    + +

    To add your data to the session array involves passing an array containing your new data to this function:

    + +$this->session->set_userdata($array); + +

    Where $array is an associative array containing your new data. Here's an example:

    + + +

    $newdata = array(
    +                    'username'  => 'johndoe',
    +                    'email'     => 'johndoe@some-site.com',
    +                    'logged_in' => TRUE
    +                );
    +
    + $this->session->set_userdata($newdata);

    +

    If you want to add userdata one value at a time, set_userdata() also supports this syntax.

    +

    $this->session->set_userdata('some_name', 'some_value');

    +

    Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The +encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

    + +

    Removing Session Data

    +

    Just as set_userdata() can be used to add information into a session, unset_userdata() can be used to remove it, by passing the session key. For example, if you wanted to remove 'some_name' from your session information:

    +

    $this->session->unset_userdata('some_name');

    +

    This function can also be passed an associative array of items to unset.

    +

    $array_items = array('username' => '', 'email' => '');
    +
    +$this->session->unset_userdata($array_items);

    +

    Flashdata

    +

    CodeIgniter supports "flashdata", or session data that will only be available for the next server request, and are then automatically cleared. These can be very useful, and are typically used for informational or status messages (for example: "record 2 deleted").

    +

    Note: Flash variables are prefaced with "flash_" so avoid this prefix in your own session names.

    +

    To add flashdata:

    +

    $this->session->set_flashdata('item', 'value');

    +

    You can also pass an array to set_flashdata(), in the same manner as set_userdata().

    +

    To read a flashdata variable:

    +

    $this->session->flashdata('item');

    +

    If you find that you need to preserve a flashdata variable through an additional request, you can do so using the keep_flashdata() function.

    +

    $this->session->keep_flashdata('item');

    +

    Saving Session Data to a Database

    +

    While the session data array stored in the user's cookie contains a Session ID, +unless you store session data in a database there is no way to validate it. For some applications that require little or no +security, session ID validation may not be needed, but if your application requires security, validation is mandatory.

    + +

    When session data is available in a database, every time a valid session is found in the user's cookie, a database +query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never +be updated, they can only be generated when a new session is created.

    + +

    In order to store sessions, you must first create a database table for this purpose. Here is the basic +prototype (for MySQL) required by the session class:

    + + + +

    Note: By default the table is called ci_sessions, but you can name it anything you want +as long as you update the application/config/config.php file so that it contains the name you have chosen. +Once you have created your database table you can enable the database option in your config.php file as follows:

    + +$config['sess_use_database'] = TRUE; + +

    Once enabled, the Session class will store session data in the DB.

    + +

    Make sure you've specified the table name in your config file as well:

    + +$config['sess_table_name'] = 'ci_sessions"; + +

    Note: The Session class has built-in garbage collection which clears out expired sessions so you +do not need to write your own routine to do it.

    + + +

    Destroying a Session

    +

    To clear the current session:

    +$this->session->sess_destroy(); +

    Note: This function should be the last one called, and even flash variables will no longer be available. If you only want some items destroyed and not all, use unset_userdata().

    + + + +

    Session Preferences

    +

    You'll find the following Session related preferences in your application/config/config.php file:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PreferenceDefaultOptionsDescription
    sess_cookie_nameci_sessionNoneThe name you want the session cookie saved as.
    sess_expiration7200NoneThe number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). If you would like a non-expiring session set the value to zero: 0
    sess_encrypt_cookieFALSETRUE/FALSE (boolean)Whether to encrypt the session data.
    sess_use_databaseFALSETRUE/FALSE (boolean)Whether to save the session data to a database. You must create the table before enabling this option.
    sess_table_nameci_sessionsAny valid SQL table nameThe name of the session database table.
    sess_time_to_update300Time in secondsThis options controls how often the session class will regenerate itself and create a new session id.
    sess_match_ipFALSETRUE/FALSE (boolean)Whether to match the user's IP address when reading the session data. Note that some ISPs dynamically + changes the IP, so if you want a non-expiring session you will likely set this to FALSE.
    sess_match_useragentTRUETRUE/FALSE (boolean)Whether to match the User Agent when reading the session data.
    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 7671d2aa..92fcc9c7 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -1,292 +1,292 @@ - - - - - -HTML Table Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    HTML Table Class

    - -

    The Table Class provides functions that enable you to auto-generate HTML tables from arrays or database result sets.

    - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the Table class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('table'); -

    Once loaded, the Table library object will be available using: $this->table

    - - -

    Examples

    - -

    Here is an example showing how you can create a table from a multi-dimensional array. -Note that the first array index will become the table heading (or you can set your own headings using the -set_heading() function described in the function reference below).

    - - -$this->load->library('table');
    -
    -$data = array(
    -             array('Name', 'Color', 'Size'),
    -             array('Fred', 'Blue', 'Small'),
    -             array('Mary', 'Red', 'Large'),
    -             array('John', 'Green', 'Medium')
    -             );
    -
    -echo $this->table->generate($data); -     - -

    Here is an example of a table created from a database query result. The table class will automatically generate the -headings based on the table names (or you can set your own headings using the set_heading() function described -in the function reference below).

    - - -$this->load->library('table');
    -
    -$query = $this->db->query("SELECT * FROM my_table");
    -
    -echo $this->table->generate($query); -     - - -

    Here is an example showing how you might create a table using discrete parameters:

    - - -$this->load->library('table');
    -
    -$this->table->set_heading('Name', 'Color', 'Size');
    -
    -$this->table->add_row('Fred', 'Blue', 'Small');
    -$this->table->add_row('Mary', 'Red', 'Large');
    -$this->table->add_row('John', 'Green', 'Medium');
    -
    -echo $this->table->generate(); -     - -

    Here is the same example, except instead of individual parameters, arrays are used:

    - - -$this->load->library('table');
    -
    -$this->table->set_heading(array('Name', 'Color', 'Size'));
    -
    -$this->table->add_row(array('Fred', 'Blue', 'Small'));
    -$this->table->add_row(array('Mary', 'Red', 'Large'));
    -$this->table->add_row(array('John', 'Green', 'Medium'));
    -
    -echo $this->table->generate(); -     - - -

    Changing the Look of Your Table

    - -

    The Table Class permits you to set a table template with which you can specify the design of your layout. Here is the template -prototype:

    - - -$tmpl = array (
    -                    'table_open'          => '<table border="0" cellpadding="4" cellspacing="0">',
    -
    -                    'heading_row_start'   => '<tr>',
    -                    'heading_row_end'     => '</tr>',
    -                    'heading_cell_start'  => '<th>',
    -                    'heading_cell_end'    => '</th>',
    -
    -                    'row_start'           => '<tr>',
    -                    'row_end'             => '</tr>',
    -                    'cell_start'          => '<td>',
    -                    'cell_end'            => '</td>',
    -
    -                    'row_alt_start'       => '<tr>',
    -                    'row_alt_end'         => '</tr>',
    -                    'cell_alt_start'      => '<td>',
    -                    'cell_alt_end'        => '</td>',
    -
    -                    'table_close'         => '</table>'
    -              );
    - -
    -$this->table->set_template($tmpl); -     - -

    Note:  You'll notice there are two sets of "row" blocks in the template. These permit you to create alternating row colors or design elements that alternate with each -iteration of the row data.

    - -

    You are NOT required to submit a complete template. If you only need to change parts of the layout you can simply submit those elements. -In this example, only the table opening tag is being changed:

    - - -$tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );
    - -
    -$this->table->set_template($tmpl); -     - -
    -

    Function Reference

    - -

    $this->table->generate()

    -

    Returns a string containing the generated table. Accepts an optional parameter which can be an array or a database result object.

    - -

    $this->table->set_caption()

    - -

    Permits you to add a caption to the table.

    - -$this->table->set_caption('Colors'); - -

    $this->table->set_heading()

    - -

    Permits you to set the table heading. You can submit an array or discrete params:

    - -$this->table->set_heading('Name', 'Color', 'Size'); -$this->table->set_heading(array('Name', 'Color', 'Size')); - -

    $this->table->add_row()

    - -

    Permits you to add a row to your table. You can submit an array or discrete params:

    - -$this->table->add_row('Blue', 'Red', 'Green'); -$this->table->add_row(array('Blue', 'Red', 'Green')); - - -

    $this->table->make_columns()

    - -

    This function takes a one-dimensional array as input and creates -a multi-dimensional array with a depth equal to the number of -columns desired. This allows a single array with many elements to be -displayed in a table that has a fixed column count. Consider this example:

    - - -$list = array('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve');
    -
    -$new_list = $this->table->make_columns($list, 3);
    -
    -$this->table->generate($new_list);
    -
    -// Generates a table with this prototype
    -
    -<table border="0" cellpadding="4" cellspacing="0">
    -<tr>
    -<td>one</td><td>two</td><td>three</td>
    -</tr><tr>
    -<td>four</td><td>five</td><td>six</td>
    -</tr><tr>
    -<td>seven</td><td>eight</td><td>nine</td>
    -</tr><tr>
    -<td>ten</td><td>eleven</td><td>twelve</td></tr>
    -</table>     - - - -

    $this->table->set_template()

    - -

    Permits you to set your template. You can submit a full or partial template.

    - - -$tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );
    - -
    -$this->table->set_template($tmpl); -     - - -

    $this->table->set_empty()

    - -

    Let's you set a default value for use in any table cells that are empty. You might, for example, set a non-breaking space:

    - - -$this->table->set_empty("&nbsp;"); - - -

    $this->table->clear()

    - -

    Lets you clear the table heading and row data. If you need to show multiple tables with different data you should -to call this function after each table has been generated to empty the previous table information. Example:

    - - -$this->load->library('table');
    -
    -$this->table->set_heading('Name', 'Color', 'Size');
    -$this->table->add_row('Fred', 'Blue', 'Small');
    -$this->table->add_row('Mary', 'Red', 'Large');
    -$this->table->add_row('John', 'Green', 'Medium');
    -
    -echo $this->table->generate();
    -
    -$this->table->clear();
    -
    -$this->table->set_heading('Name', 'Day', 'Delivery');
    -$this->table->add_row('Fred', 'Wednesday', 'Express');
    -$this->table->add_row('Mary', 'Monday', 'Air');
    -$this->table->add_row('John', 'Saturday', 'Overnight');
    -
    -echo $this->table->generate(); -     - -
    - - - - - - + + + + + +HTML Table Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    HTML Table Class

    + +

    The Table Class provides functions that enable you to auto-generate HTML tables from arrays or database result sets.

    + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the Table class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('table'); +

    Once loaded, the Table library object will be available using: $this->table

    + + +

    Examples

    + +

    Here is an example showing how you can create a table from a multi-dimensional array. +Note that the first array index will become the table heading (or you can set your own headings using the +set_heading() function described in the function reference below).

    + + +$this->load->library('table');
    +
    +$data = array(
    +             array('Name', 'Color', 'Size'),
    +             array('Fred', 'Blue', 'Small'),
    +             array('Mary', 'Red', 'Large'),
    +             array('John', 'Green', 'Medium')
    +             );
    +
    +echo $this->table->generate($data); +     + +

    Here is an example of a table created from a database query result. The table class will automatically generate the +headings based on the table names (or you can set your own headings using the set_heading() function described +in the function reference below).

    + + +$this->load->library('table');
    +
    +$query = $this->db->query("SELECT * FROM my_table");
    +
    +echo $this->table->generate($query); +     + + +

    Here is an example showing how you might create a table using discrete parameters:

    + + +$this->load->library('table');
    +
    +$this->table->set_heading('Name', 'Color', 'Size');
    +
    +$this->table->add_row('Fred', 'Blue', 'Small');
    +$this->table->add_row('Mary', 'Red', 'Large');
    +$this->table->add_row('John', 'Green', 'Medium');
    +
    +echo $this->table->generate(); +     + +

    Here is the same example, except instead of individual parameters, arrays are used:

    + + +$this->load->library('table');
    +
    +$this->table->set_heading(array('Name', 'Color', 'Size'));
    +
    +$this->table->add_row(array('Fred', 'Blue', 'Small'));
    +$this->table->add_row(array('Mary', 'Red', 'Large'));
    +$this->table->add_row(array('John', 'Green', 'Medium'));
    +
    +echo $this->table->generate(); +     + + +

    Changing the Look of Your Table

    + +

    The Table Class permits you to set a table template with which you can specify the design of your layout. Here is the template +prototype:

    + + +$tmpl = array (
    +                    'table_open'          => '<table border="0" cellpadding="4" cellspacing="0">',
    +
    +                    'heading_row_start'   => '<tr>',
    +                    'heading_row_end'     => '</tr>',
    +                    'heading_cell_start'  => '<th>',
    +                    'heading_cell_end'    => '</th>',
    +
    +                    'row_start'           => '<tr>',
    +                    'row_end'             => '</tr>',
    +                    'cell_start'          => '<td>',
    +                    'cell_end'            => '</td>',
    +
    +                    'row_alt_start'       => '<tr>',
    +                    'row_alt_end'         => '</tr>',
    +                    'cell_alt_start'      => '<td>',
    +                    'cell_alt_end'        => '</td>',
    +
    +                    'table_close'         => '</table>'
    +              );
    + +
    +$this->table->set_template($tmpl); +     + +

    Note:  You'll notice there are two sets of "row" blocks in the template. These permit you to create alternating row colors or design elements that alternate with each +iteration of the row data.

    + +

    You are NOT required to submit a complete template. If you only need to change parts of the layout you can simply submit those elements. +In this example, only the table opening tag is being changed:

    + + +$tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );
    + +
    +$this->table->set_template($tmpl); +     + +
    +

    Function Reference

    + +

    $this->table->generate()

    +

    Returns a string containing the generated table. Accepts an optional parameter which can be an array or a database result object.

    + +

    $this->table->set_caption()

    + +

    Permits you to add a caption to the table.

    + +$this->table->set_caption('Colors'); + +

    $this->table->set_heading()

    + +

    Permits you to set the table heading. You can submit an array or discrete params:

    + +$this->table->set_heading('Name', 'Color', 'Size'); +$this->table->set_heading(array('Name', 'Color', 'Size')); + +

    $this->table->add_row()

    + +

    Permits you to add a row to your table. You can submit an array or discrete params:

    + +$this->table->add_row('Blue', 'Red', 'Green'); +$this->table->add_row(array('Blue', 'Red', 'Green')); + + +

    $this->table->make_columns()

    + +

    This function takes a one-dimensional array as input and creates +a multi-dimensional array with a depth equal to the number of +columns desired. This allows a single array with many elements to be +displayed in a table that has a fixed column count. Consider this example:

    + + +$list = array('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve');
    +
    +$new_list = $this->table->make_columns($list, 3);
    +
    +$this->table->generate($new_list);
    +
    +// Generates a table with this prototype
    +
    +<table border="0" cellpadding="4" cellspacing="0">
    +<tr>
    +<td>one</td><td>two</td><td>three</td>
    +</tr><tr>
    +<td>four</td><td>five</td><td>six</td>
    +</tr><tr>
    +<td>seven</td><td>eight</td><td>nine</td>
    +</tr><tr>
    +<td>ten</td><td>eleven</td><td>twelve</td></tr>
    +</table>     + + + +

    $this->table->set_template()

    + +

    Permits you to set your template. You can submit a full or partial template.

    + + +$tmpl = array ( 'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">' );
    + +
    +$this->table->set_template($tmpl); +     + + +

    $this->table->set_empty()

    + +

    Let's you set a default value for use in any table cells that are empty. You might, for example, set a non-breaking space:

    + + +$this->table->set_empty("&nbsp;"); + + +

    $this->table->clear()

    + +

    Lets you clear the table heading and row data. If you need to show multiple tables with different data you should +to call this function after each table has been generated to empty the previous table information. Example:

    + + +$this->load->library('table');
    +
    +$this->table->set_heading('Name', 'Color', 'Size');
    +$this->table->add_row('Fred', 'Blue', 'Small');
    +$this->table->add_row('Mary', 'Red', 'Large');
    +$this->table->add_row('John', 'Green', 'Medium');
    +
    +echo $this->table->generate();
    +
    +$this->table->clear();
    +
    +$this->table->set_heading('Name', 'Day', 'Delivery');
    +$this->table->add_row('Fred', 'Wednesday', 'Express');
    +$this->table->add_row('Mary', 'Monday', 'Air');
    +$this->table->add_row('John', 'Saturday', 'Overnight');
    +
    +echo $this->table->generate(); +     + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 177ccb06..1c40a454 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -1,246 +1,246 @@ - - - - - -Trackback Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Trackback Class

    - -

    The Trackback Class provides functions that enable you to send and receive Trackback data.

    - - -

    If you are not familiar with Trackbacks you'll find more information here.

    - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the Trackback class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('trackback'); -

    Once loaded, the Trackback library object will be available using: $this->trackback

    - - -

    Sending Trackbacks

    - -

    A Trackback can be sent from any of your controller functions using code similar to this example:

    - -$this->load->library('trackback');
    -
    -$tb_data = array(
    -                'ping_url'  => 'http://example.com/trackback/456',
    -                'url'       => 'http://www.my-example.com/blog/entry/123',
    -                'title'     => 'The Title of My Entry',
    -                'excerpt'   => 'The entry content.',
    -                'blog_name' => 'My Blog Name',
    -                'charset'   => 'utf-8'
    -                );
    -
    -if ( ! $this->trackback->send($tb_data))
    -{
    -     echo $this->trackback->display_errors();
    -}
    -else
    -{
    -     echo 'Trackback was sent!';
    -}     - -

    Description of array data:

    - -
      -
    • ping_url - The URL of the site you are sending the Trackback to. You can send Trackbacks to multiple URLs by separating each URL with a comma.
      • -
    • url - The URL to YOUR site where the weblog entry can be seen.
      • -
    • title - The title of your weblog entry.
      • -
    • excerpt - The content of your weblog entry. Note: the Trackback class will automatically send only the first 500 characters of your entry. It will also strip all HTML.
      • -
    • blog_name - The name of your weblog.
      • -
    • charset - The character encoding your weblog is written in. If omitted, UTF-8 will be used.
      • -
    - -

    The Trackback sending function returns TRUE/FALSE (boolean) on success or failure. If it fails, you can retrieve the error message using:

    - -$this->trackback->display_errors(); - - -

    Receiving Trackbacks

    - -

    Before you can receive Trackbacks you must create a weblog. If you don't have a blog yet there's no point in continuing.

    - -

    Receiving Trackbacks is a little more complex than sending them, only because you will need a database table in which to store them, -and you will need to validate the incoming trackback data. You are encouraged to implement a thorough validation process to -guard against spam and duplicate data. You may also want to limit the number of Trackbacks you allow from a particular IP within -a given span of time to further curtail spam. The process of receiving a Trackback is quite simple; -the validation is what takes most of the effort.

    - -

    Your Ping URL

    - -

    In order to accept Trackbacks you must display a Trackback URL next to each one of your weblog entries. This will be the URL -that people will use to send you Trackbacks (we will refer to this as your "Ping URL").

    - -

    Your Ping URL must point to a controller function where your Trackback receiving code is located, and the URL -must contain the ID number for each particular entry, so that when the Trackback is received you'll be -able to associate it with a particular entry.

    - -

    For example, if your controller class is called Trackback, and the receiving function is called receive, your -Ping URLs will look something like this:

    - -http://example.com/index.php/trackback/receive/entry_id - -

    Where entry_id represents the individual ID number for each of your entries.

    - - -

    Creating a Trackback Table

    - -

    Before you can receive Trackbacks you must create a table in which to store them. Here is a basic prototype for such a table:

    - - - - -

    The Trackback specification only requires four pieces of information to be sent in a Trackback (url, title, excerpt, blog_name), -but to make the data more useful we've added a few more fields in the above table schema (date, IP address, etc.).

    - -

    Processing a Trackback

    - -

    Here is an example showing how you will receive and process a Trackback. The following -code is intended for use within the controller function where you expect to receive Trackbacks.

    - -$this->load->library('trackback');
    -$this->load->database();
    -
    -if ($this->uri->segment(3) == FALSE)
    -{
    -    $this->trackback->send_error("Unable to determine the entry ID");
    -}
    -
    -if ( ! $this->trackback->receive())
    -{
    -    $this->trackback->send_error("The Trackback did not contain valid data");
    -}
    -
    -$data = array(
    -                'tb_id'      => '',
    -                'entry_id'   => $this->uri->segment(3),
    -                'url'        => $this->trackback->data('url'),
    -                'title'      => $this->trackback->data('title'),
    -                'excerpt'    => $this->trackback->data('excerpt'),
    -                'blog_name'  => $this->trackback->data('blog_name'),
    -                'tb_date'    => time(),
    -                'ip_address' => $this->input->ip_address()
    -                );
    -
    -$sql = $this->db->insert_string('trackbacks', $data);
    -$this->db->query($sql);
    -
    -$this->trackback->send_success();     - -

    Notes:

    - -

    The entry ID number is expected in the third segment of your URL. This is based on the URI example we gave earlier:

    - -http://example.com/index.php/trackback/receive/entry_id - -

    Notice the entry_id is in the third URI segment, which you can retrieve using:

    - -$this->uri->segment(3); - -

    In our Trackback receiving code above, if the third segment is missing, we will issue an error. Without a valid entry ID, there's no -reason to continue.

    - -

    The $this->trackback->receive() function is simply a validation function that looks at the incoming data -and makes sure it contains the four pieces of data that are required (url, title, excerpt, blog_name). -It returns TRUE on success and FALSE on failure. If it fails you will issue an error message.

    - -

    The incoming Trackback data can be retrieved using this function:

    - -$this->trackback->data('item') - -

    Where item represents one of these four pieces of info: url, title, excerpt, or blog_name

    - -

    If the Trackback data is successfully received, you will issue a success message using:

    - -$this->trackback->send_success(); - -

    Note: The above code contains no data validation, which you are encouraged to add.

    - - - - - -
    - - - - - - + + + + + +Trackback Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Trackback Class

    + +

    The Trackback Class provides functions that enable you to send and receive Trackback data.

    + + +

    If you are not familiar with Trackbacks you'll find more information here.

    + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the Trackback class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('trackback'); +

    Once loaded, the Trackback library object will be available using: $this->trackback

    + + +

    Sending Trackbacks

    + +

    A Trackback can be sent from any of your controller functions using code similar to this example:

    + +$this->load->library('trackback');
    +
    +$tb_data = array(
    +                'ping_url'  => 'http://example.com/trackback/456',
    +                'url'       => 'http://www.my-example.com/blog/entry/123',
    +                'title'     => 'The Title of My Entry',
    +                'excerpt'   => 'The entry content.',
    +                'blog_name' => 'My Blog Name',
    +                'charset'   => 'utf-8'
    +                );
    +
    +if ( ! $this->trackback->send($tb_data))
    +{
    +     echo $this->trackback->display_errors();
    +}
    +else
    +{
    +     echo 'Trackback was sent!';
    +}     + +

    Description of array data:

    + +
      +
    • ping_url - The URL of the site you are sending the Trackback to. You can send Trackbacks to multiple URLs by separating each URL with a comma.
      • +
    • url - The URL to YOUR site where the weblog entry can be seen.
      • +
    • title - The title of your weblog entry.
      • +
    • excerpt - The content of your weblog entry. Note: the Trackback class will automatically send only the first 500 characters of your entry. It will also strip all HTML.
      • +
    • blog_name - The name of your weblog.
      • +
    • charset - The character encoding your weblog is written in. If omitted, UTF-8 will be used.
      • +
    + +

    The Trackback sending function returns TRUE/FALSE (boolean) on success or failure. If it fails, you can retrieve the error message using:

    + +$this->trackback->display_errors(); + + +

    Receiving Trackbacks

    + +

    Before you can receive Trackbacks you must create a weblog. If you don't have a blog yet there's no point in continuing.

    + +

    Receiving Trackbacks is a little more complex than sending them, only because you will need a database table in which to store them, +and you will need to validate the incoming trackback data. You are encouraged to implement a thorough validation process to +guard against spam and duplicate data. You may also want to limit the number of Trackbacks you allow from a particular IP within +a given span of time to further curtail spam. The process of receiving a Trackback is quite simple; +the validation is what takes most of the effort.

    + +

    Your Ping URL

    + +

    In order to accept Trackbacks you must display a Trackback URL next to each one of your weblog entries. This will be the URL +that people will use to send you Trackbacks (we will refer to this as your "Ping URL").

    + +

    Your Ping URL must point to a controller function where your Trackback receiving code is located, and the URL +must contain the ID number for each particular entry, so that when the Trackback is received you'll be +able to associate it with a particular entry.

    + +

    For example, if your controller class is called Trackback, and the receiving function is called receive, your +Ping URLs will look something like this:

    + +http://example.com/index.php/trackback/receive/entry_id + +

    Where entry_id represents the individual ID number for each of your entries.

    + + +

    Creating a Trackback Table

    + +

    Before you can receive Trackbacks you must create a table in which to store them. Here is a basic prototype for such a table:

    + + + + +

    The Trackback specification only requires four pieces of information to be sent in a Trackback (url, title, excerpt, blog_name), +but to make the data more useful we've added a few more fields in the above table schema (date, IP address, etc.).

    + +

    Processing a Trackback

    + +

    Here is an example showing how you will receive and process a Trackback. The following +code is intended for use within the controller function where you expect to receive Trackbacks.

    + +$this->load->library('trackback');
    +$this->load->database();
    +
    +if ($this->uri->segment(3) == FALSE)
    +{
    +    $this->trackback->send_error("Unable to determine the entry ID");
    +}
    +
    +if ( ! $this->trackback->receive())
    +{
    +    $this->trackback->send_error("The Trackback did not contain valid data");
    +}
    +
    +$data = array(
    +                'tb_id'      => '',
    +                'entry_id'   => $this->uri->segment(3),
    +                'url'        => $this->trackback->data('url'),
    +                'title'      => $this->trackback->data('title'),
    +                'excerpt'    => $this->trackback->data('excerpt'),
    +                'blog_name'  => $this->trackback->data('blog_name'),
    +                'tb_date'    => time(),
    +                'ip_address' => $this->input->ip_address()
    +                );
    +
    +$sql = $this->db->insert_string('trackbacks', $data);
    +$this->db->query($sql);
    +
    +$this->trackback->send_success();     + +

    Notes:

    + +

    The entry ID number is expected in the third segment of your URL. This is based on the URI example we gave earlier:

    + +http://example.com/index.php/trackback/receive/entry_id + +

    Notice the entry_id is in the third URI segment, which you can retrieve using:

    + +$this->uri->segment(3); + +

    In our Trackback receiving code above, if the third segment is missing, we will issue an error. Without a valid entry ID, there's no +reason to continue.

    + +

    The $this->trackback->receive() function is simply a validation function that looks at the incoming data +and makes sure it contains the four pieces of data that are required (url, title, excerpt, blog_name). +It returns TRUE on success and FALSE on failure. If it fails you will issue an error message.

    + +

    The incoming Trackback data can be retrieved using this function:

    + +$this->trackback->data('item') + +

    Where item represents one of these four pieces of info: url, title, excerpt, or blog_name

    + +

    If the Trackback data is successfully received, you will issue a success message using:

    + +$this->trackback->send_success(); + +

    Note: The above code contains no data validation, which you are encouraged to add.

    + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index cd161016..2c7e06c9 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -1,160 +1,160 @@ - - - - - -Typography Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Typography Class

    - -

    The Typography Class provides functions that help you format text.

    - - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the Typography class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('typography'); -

    Once loaded, the Typography library object will be available using: $this->typography

    - - -

    auto_typography()

    - -

    Formats text so that it is semantically and typographically correct HTML. Takes a string as input and returns it with -the following formatting:

    - -
      -
    • Surrounds paragraphs within <p></p> (looks for double line breaks to identify paragraphs).
      • -
    • Single line breaks are converted to <br />, except those that appear within <pre> tags.
      • -
    • Block level elements, like <div> tags, are not wrapped within paragraphs, but their contained text is if it contains paragraphs.
      • -
    • Quotes are converted to correctly facing curly quote entities, except those that appear within tags.
      • -
    • Apostrophes are converted to curly apostrophy entities.
      • -
    • Double dashes (either like -- this or like--this) are converted to em—dashes.
      • -
    • Three consecutive periods either preceding or following a word are converted to ellipsis…
      • -
    • Double spaces following sentences are converted to non-breaking spaces to mimic double spacing.
      • -
    - -

    Usage example:

    - -$string = $this->typography->auto_typography($string); - -

    Parameters

    - -

    There is one optional parameters that determines whether the parser should reduce more then two consecutive linebreaks down to two. Use bolean TRUE or FALSE. - -

    By default the parser does not reduce line breaks. In other words, if no parameters are submitted, it is the same as doing this:

    - -$string = $this->typography->auto_typography($string, FALSE); - - -

    Note: Typographic formatting can be processor intensive, particularly if you have a lot of content being formatted. -If you choose to use this function you may want to consider -caching your pages.

    - - - -

    convert_characters()

    - -

    This function is similiar to the auto_typography function above, except that it only does character conversion:

    - -
      -
    • Quotes are converted to correctly facing curly quote entities, except those that appear within tags.
      • -
    • Apostrophes are converted to curly apostrophy entities.
      • -
    • Double dashes (either like -- this or like--this) are converted to em—dashes.
      • -
    • Three consecutive periods either preceding or following a word are converted to ellipsis…
      • -
    • Double spaces following sentences are converted to non-breaking spaces to mimic double spacing.
      • -
    - -

    Usage example:

    - -$string = $this->typography->convert_characters($string); - - -

    nl2br_except_pre()

    - -

    Converts newlines to <br /> tags unless they appear within <pre> tags. -This function is identical to the native PHP nl2br() function, except that it ignores <pre> tags.

    - -

    Usage example:

    - -$string = $this->typography->nl2br_except_pre($string); - -

    protect_braced_quotes

    - -

    When using the Typography library in conjunction with the Template Parser library it can often be desirable to protect single - and double quotes within curly braces. To enable this, set the protect_braced_quotes class property to TRUE. - -

    Usage example:

    - -$this->load->library('typography');
    -$this->typography->protect_braced_quotes = TRUE; -     - -
    - - - - - - + + + + + +Typography Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Typography Class

    + +

    The Typography Class provides functions that help you format text.

    + + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the Typography class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('typography'); +

    Once loaded, the Typography library object will be available using: $this->typography

    + + +

    auto_typography()

    + +

    Formats text so that it is semantically and typographically correct HTML. Takes a string as input and returns it with +the following formatting:

    + +
      +
    • Surrounds paragraphs within <p></p> (looks for double line breaks to identify paragraphs).
      • +
    • Single line breaks are converted to <br />, except those that appear within <pre> tags.
      • +
    • Block level elements, like <div> tags, are not wrapped within paragraphs, but their contained text is if it contains paragraphs.
      • +
    • Quotes are converted to correctly facing curly quote entities, except those that appear within tags.
      • +
    • Apostrophes are converted to curly apostrophy entities.
      • +
    • Double dashes (either like -- this or like--this) are converted to em—dashes.
      • +
    • Three consecutive periods either preceding or following a word are converted to ellipsis…
      • +
    • Double spaces following sentences are converted to non-breaking spaces to mimic double spacing.
      • +
    + +

    Usage example:

    + +$string = $this->typography->auto_typography($string); + +

    Parameters

    + +

    There is one optional parameters that determines whether the parser should reduce more then two consecutive linebreaks down to two. Use bolean TRUE or FALSE. + +

    By default the parser does not reduce line breaks. In other words, if no parameters are submitted, it is the same as doing this:

    + +$string = $this->typography->auto_typography($string, FALSE); + + +

    Note: Typographic formatting can be processor intensive, particularly if you have a lot of content being formatted. +If you choose to use this function you may want to consider +caching your pages.

    + + + +

    convert_characters()

    + +

    This function is similiar to the auto_typography function above, except that it only does character conversion:

    + +
      +
    • Quotes are converted to correctly facing curly quote entities, except those that appear within tags.
      • +
    • Apostrophes are converted to curly apostrophy entities.
      • +
    • Double dashes (either like -- this or like--this) are converted to em—dashes.
      • +
    • Three consecutive periods either preceding or following a word are converted to ellipsis…
      • +
    • Double spaces following sentences are converted to non-breaking spaces to mimic double spacing.
      • +
    + +

    Usage example:

    + +$string = $this->typography->convert_characters($string); + + +

    nl2br_except_pre()

    + +

    Converts newlines to <br /> tags unless they appear within <pre> tags. +This function is identical to the native PHP nl2br() function, except that it ignores <pre> tags.

    + +

    Usage example:

    + +$string = $this->typography->nl2br_except_pre($string); + +

    protect_braced_quotes

    + +

    When using the Typography library in conjunction with the Template Parser library it can often be desirable to protect single + and double quotes within curly braces. To enable this, set the protect_braced_quotes class property to TRUE. + +

    Usage example:

    + +$this->load->library('typography');
    +$this->typography->protect_braced_quotes = TRUE; +     + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 37632327..35bd347f 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -1,205 +1,205 @@ - - - - - -Unit Testing Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Unit Testing Class

    - -

    Unit testing is an approach to software development in which tests are written for each function in your application. -If you are not familiar with the concept you might do a little googling on the subject.

    - -

    CodeIgniter's Unit Test class is quite simple, consisting of an evaluation function and two result functions. -It's not intended to be a full-blown test suite but rather a simple mechanism to evaluate your code -to determine if it is producing the correct data type and result. -

    - - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the Unit Test class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('unit_test'); -

    Once loaded, the Unit Test object will be available using: $this->unit

    - - -

    Running Tests

    - -

    Running a test involves supplying a test and an expected result to the following function:

    - -

    $this->unit->run( test, expected result, 'test name' );

    - -

    Where test is the result of the code you wish to test, -expected result is the data type you expect, and test name is an optional name you can give your test. Example:

    - -$test = 1 + 1;
    -
    -$expected_result = 2;
    -
    -$test_name = 'Adds one plus one';
    -
    -$this->unit->run($test, $expected_result, $test_name);     - -

    The expected result you supply can either be a literal match, or a data type match. Here's an example of a literal:

    - -$this->unit->run('Foo', 'Foo'); - -

    Here is an example of a data type match:

    - -$this->unit->run('Foo', 'is_string'); - -

    Notice the use of "is_string" in the second parameter? This tells the function to evaluate whether your test is producing a string -as the result. Here is a list of allowed comparison types:

    - -
      -
    • is_string
      • -
    • is_bool
      • -
    • is_true
      • -
    • is_false
      • -
    • is_int
      • -
    • is_numeric
      • -
    • is_float
      • -
    • is_double
      • -
    • is_array
      • -
    • is_null
      • -
    - - -

    Generating Reports

    - -

    You can either display results after each test, or your can run several tests and generate a report at the end. -To show a report directly simply echo or return the run function:

    - -echo $this->unit->run($test, $expected_result); - -

    To run a full report of all tests, use this:

    - -echo $this->unit->report(); - -

    The report will be formatted in an HTML table for viewing. If you prefer the raw data you can retrieve an array using:

    - -echo $this->unit->result(); - - -

    Strict Mode

    - -

    By default the unit test class evaluates literal matches loosely. Consider this example:

    - -$this->unit->run(1, TRUE); - -

    The test is evaluating an integer, but the expected result is a boolean. PHP, however, due to it's loose data-typing -will evaluate the above code as TRUE using a normal equality test:

    - -if (1 == TRUE) echo 'This evaluates as true'; - -

    If you prefer, you can put the unit test class in to strict mode, which will compare the data type as well as the value:

    - -if (1 === TRUE) echo 'This evaluates as FALSE'; - -

    To enable strict mode use this:

    - -$this->unit->use_strict(TRUE); - -

    Enabling/Disabling Unit Testing

    - -

    If you would like to leave some testing in place in your scripts, but not have it run unless you need it, you can disable -unit testing using:

    - -$this->unit->active(FALSE) - - - -

    Creating a Template

    - -

    If you would like your test results formatted differently then the default you can set your own template. Here is an -example of a simple template. Note the required pseudo-variables:

    - - -$str = '
    -<table border="0" cellpadding="4" cellspacing="1">
    -    {rows}
    -        <tr>
    -        <td>{item}</td>
    -        <td>{result}</td>
    -        </tr>
    -    {/rows}
    -</table>';
    -
    -$this->unit->set_template($str); -     - -

    Note: Your template must be declared before running the unit test process.

    - - - - - -
    - - - - - - + + + + + +Unit Testing Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Unit Testing Class

    + +

    Unit testing is an approach to software development in which tests are written for each function in your application. +If you are not familiar with the concept you might do a little googling on the subject.

    + +

    CodeIgniter's Unit Test class is quite simple, consisting of an evaluation function and two result functions. +It's not intended to be a full-blown test suite but rather a simple mechanism to evaluate your code +to determine if it is producing the correct data type and result. +

    + + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the Unit Test class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('unit_test'); +

    Once loaded, the Unit Test object will be available using: $this->unit

    + + +

    Running Tests

    + +

    Running a test involves supplying a test and an expected result to the following function:

    + +

    $this->unit->run( test, expected result, 'test name' );

    + +

    Where test is the result of the code you wish to test, +expected result is the data type you expect, and test name is an optional name you can give your test. Example:

    + +$test = 1 + 1;
    +
    +$expected_result = 2;
    +
    +$test_name = 'Adds one plus one';
    +
    +$this->unit->run($test, $expected_result, $test_name);     + +

    The expected result you supply can either be a literal match, or a data type match. Here's an example of a literal:

    + +$this->unit->run('Foo', 'Foo'); + +

    Here is an example of a data type match:

    + +$this->unit->run('Foo', 'is_string'); + +

    Notice the use of "is_string" in the second parameter? This tells the function to evaluate whether your test is producing a string +as the result. Here is a list of allowed comparison types:

    + +
      +
    • is_string
      • +
    • is_bool
      • +
    • is_true
      • +
    • is_false
      • +
    • is_int
      • +
    • is_numeric
      • +
    • is_float
      • +
    • is_double
      • +
    • is_array
      • +
    • is_null
      • +
    + + +

    Generating Reports

    + +

    You can either display results after each test, or your can run several tests and generate a report at the end. +To show a report directly simply echo or return the run function:

    + +echo $this->unit->run($test, $expected_result); + +

    To run a full report of all tests, use this:

    + +echo $this->unit->report(); + +

    The report will be formatted in an HTML table for viewing. If you prefer the raw data you can retrieve an array using:

    + +echo $this->unit->result(); + + +

    Strict Mode

    + +

    By default the unit test class evaluates literal matches loosely. Consider this example:

    + +$this->unit->run(1, TRUE); + +

    The test is evaluating an integer, but the expected result is a boolean. PHP, however, due to it's loose data-typing +will evaluate the above code as TRUE using a normal equality test:

    + +if (1 == TRUE) echo 'This evaluates as true'; + +

    If you prefer, you can put the unit test class in to strict mode, which will compare the data type as well as the value:

    + +if (1 === TRUE) echo 'This evaluates as FALSE'; + +

    To enable strict mode use this:

    + +$this->unit->use_strict(TRUE); + +

    Enabling/Disabling Unit Testing

    + +

    If you would like to leave some testing in place in your scripts, but not have it run unless you need it, you can disable +unit testing using:

    + +$this->unit->active(FALSE) + + + +

    Creating a Template

    + +

    If you would like your test results formatted differently then the default you can set your own template. Here is an +example of a simple template. Note the required pseudo-variables:

    + + +$str = '
    +<table border="0" cellpadding="4" cellspacing="1">
    +    {rows}
    +        <tr>
    +        <td>{item}</td>
    +        <td>{result}</td>
    +        </tr>
    +    {/rows}
    +</table>';
    +
    +$this->unit->set_template($str); +     + +

    Note: Your template must be declared before running the unit test process.

    + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 7bebbf38..fb8deb25 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -1,252 +1,252 @@ - - - - - -URI Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    URI Class

    - -

    The URI Class provides functions that help you retrieve information from your URI strings. If you use URI routing, you can -also retrieve information about the re-routed segments.

    - -

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    - -

    $this->uri->segment(n)

    - -

    Permits you to retrieve a specific segment. Where n is the segment number you wish to retrieve. -Segments are numbered from left to right. For example, if your full URL is this:

    - -http://example.com/index.php/news/local/metro/crime_is_up - -

    The segment numbers would be this:

    - -
      -
    1. news
      2. -
    2. local
      3. -
    3. metro
      4. -
    4. crime_is_up
      5. -
    - -

    By default the function returns FALSE (boolean) if the segment does not exist. There is an optional second parameter that -permits you to set your own default value if the segment is missing. -For example, this would tell the function to return the number zero in the event of failure:

    - -$product_id = $this->uri->segment(3, 0); - -

    It helps avoid having to write code like this:

    - -if ($this->uri->segment(3) === FALSE)
    -{
    -    $product_id = 0;
    -}
    -else
    -{
    -    $product_id = $this->uri->segment(3);
    -}
    -     - -

    $this->uri->rsegment(n)

    - -

    This function is identical to the previous one, except that it lets you retrieve a specific segment from your -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - -

    $this->uri->slash_segment(n)

    - -

    This function is almost identical to $this->uri->segment(), except it adds a trailing and/or leading slash based on the second -parameter. If the parameter is not used, a trailing slash added. Examples:

    - -$this->uri->slash_segment(3);
    -$this->uri->slash_segment(3, 'leading');
    -$this->uri->slash_segment(3, 'both');     - -

    Returns:

    - -
      -
    1. segment/
      2. -
    2. /segment
      3. -
    3. /segment/
      4. -
    - - -

    $this->uri->slash_rsegment(n)

    - -

    This function is identical to the previous one, except that it lets you add slashes a specific segment from your -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - - -

    $this->uri->uri_to_assoc(n)

    - -

    This function lets you turn URI segments into and associative array of key/value pairs. Consider this URI:

    - -index.php/user/search/name/joe/location/UK/gender/male - -

    Using this function you can turn the URI into an associative array with this prototype:

    - -[array]
    -(
    -    'name' => 'joe'
    -    'location' => 'UK'
    -    'gender' => 'male'
    -)     - -

    The first parameter of the function lets you set an offset. By default it is set to 3 since your -URI will normally contain a controller/function in the first and second segments. Example:

    - - -$array = $this->uri->uri_to_assoc(3);
    -
    -echo $array['name']; -     - - -

    The second parameter lets you set default key names, so that the array returned by the function will always contain expected indexes, even if missing from the URI. Example:

    - - -$default = array('name', 'gender', 'location', 'type', 'sort');
    -
    -$array = $this->uri->uri_to_assoc(3, $default);     - -

    If the URI does not contain a value in your default, an array index will be set to that name, with a value of FALSE.

    - -

    Lastly, if a corresponding value is not found for a given key (if there is an odd number of URI segments) the value will be set to FALSE (boolean).

    - - -

    $this->uri->ruri_to_assoc(n)

    - -

    This function is identical to the previous one, except that it creates an associative array using the -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - -

    $this->uri->assoc_to_uri()

    - -

    Takes an associative array as input and generates a URI string from it. The array keys will be included in the string. Example:

    - -$array = array('product' => 'shoes', 'size' => 'large', 'color' => 'red');
    -
    -$str = $this->uri->assoc_to_uri($array);
    -
    -// Produces: product/shoes/size/large/color/red -     - - -

    $this->uri->uri_string()

    - -

    Returns a string with the complete URI. For example, if this is your full URL:

    - -http://example.com/index.php/news/local/345 - -

    The function would return this:

    - -/news/local/345 - - -

    $this->uri->ruri_string(n)

    - -

    This function is identical to the previous one, except that it returns the -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - - -

    $this->uri->total_segments()

    - -

    Returns the total number of segments.

    - - -

    $this->uri->total_rsegments()

    - -

    This function is identical to the previous one, except that it returns the total number of segments in your -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - - -

    $this->uri->segment_array()

    - -

    Returns an array containing the URI segments. For example:

    - - -$segs = $this->uri->segment_array();
    -
    -foreach ($segs as $segment)
    -{
    -    echo $segment;
    -    echo '<br />';
    -}     - -

    $this->uri->rsegment_array()

    - -

    This function is identical to the previous one, except that it returns the array of segments in your -re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    - - - -
    - - - - - - + + + + + +URI Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    URI Class

    + +

    The URI Class provides functions that help you retrieve information from your URI strings. If you use URI routing, you can +also retrieve information about the re-routed segments.

    + +

    Note: This class is initialized automatically by the system so there is no need to do it manually.

    + +

    $this->uri->segment(n)

    + +

    Permits you to retrieve a specific segment. Where n is the segment number you wish to retrieve. +Segments are numbered from left to right. For example, if your full URL is this:

    + +http://example.com/index.php/news/local/metro/crime_is_up + +

    The segment numbers would be this:

    + +
      +
    1. news
      2. +
    2. local
      3. +
    3. metro
      4. +
    4. crime_is_up
      5. +
    + +

    By default the function returns FALSE (boolean) if the segment does not exist. There is an optional second parameter that +permits you to set your own default value if the segment is missing. +For example, this would tell the function to return the number zero in the event of failure:

    + +$product_id = $this->uri->segment(3, 0); + +

    It helps avoid having to write code like this:

    + +if ($this->uri->segment(3) === FALSE)
    +{
    +    $product_id = 0;
    +}
    +else
    +{
    +    $product_id = $this->uri->segment(3);
    +}
    +     + +

    $this->uri->rsegment(n)

    + +

    This function is identical to the previous one, except that it lets you retrieve a specific segment from your +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + +

    $this->uri->slash_segment(n)

    + +

    This function is almost identical to $this->uri->segment(), except it adds a trailing and/or leading slash based on the second +parameter. If the parameter is not used, a trailing slash added. Examples:

    + +$this->uri->slash_segment(3);
    +$this->uri->slash_segment(3, 'leading');
    +$this->uri->slash_segment(3, 'both');     + +

    Returns:

    + +
      +
    1. segment/
      2. +
    2. /segment
      3. +
    3. /segment/
      4. +
    + + +

    $this->uri->slash_rsegment(n)

    + +

    This function is identical to the previous one, except that it lets you add slashes a specific segment from your +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + + +

    $this->uri->uri_to_assoc(n)

    + +

    This function lets you turn URI segments into and associative array of key/value pairs. Consider this URI:

    + +index.php/user/search/name/joe/location/UK/gender/male + +

    Using this function you can turn the URI into an associative array with this prototype:

    + +[array]
    +(
    +    'name' => 'joe'
    +    'location' => 'UK'
    +    'gender' => 'male'
    +)     + +

    The first parameter of the function lets you set an offset. By default it is set to 3 since your +URI will normally contain a controller/function in the first and second segments. Example:

    + + +$array = $this->uri->uri_to_assoc(3);
    +
    +echo $array['name']; +     + + +

    The second parameter lets you set default key names, so that the array returned by the function will always contain expected indexes, even if missing from the URI. Example:

    + + +$default = array('name', 'gender', 'location', 'type', 'sort');
    +
    +$array = $this->uri->uri_to_assoc(3, $default);     + +

    If the URI does not contain a value in your default, an array index will be set to that name, with a value of FALSE.

    + +

    Lastly, if a corresponding value is not found for a given key (if there is an odd number of URI segments) the value will be set to FALSE (boolean).

    + + +

    $this->uri->ruri_to_assoc(n)

    + +

    This function is identical to the previous one, except that it creates an associative array using the +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + +

    $this->uri->assoc_to_uri()

    + +

    Takes an associative array as input and generates a URI string from it. The array keys will be included in the string. Example:

    + +$array = array('product' => 'shoes', 'size' => 'large', 'color' => 'red');
    +
    +$str = $this->uri->assoc_to_uri($array);
    +
    +// Produces: product/shoes/size/large/color/red +     + + +

    $this->uri->uri_string()

    + +

    Returns a string with the complete URI. For example, if this is your full URL:

    + +http://example.com/index.php/news/local/345 + +

    The function would return this:

    + +/news/local/345 + + +

    $this->uri->ruri_string(n)

    + +

    This function is identical to the previous one, except that it returns the +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + + +

    $this->uri->total_segments()

    + +

    Returns the total number of segments.

    + + +

    $this->uri->total_rsegments()

    + +

    This function is identical to the previous one, except that it returns the total number of segments in your +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + + +

    $this->uri->segment_array()

    + +

    Returns an array containing the URI segments. For example:

    + + +$segs = $this->uri->segment_array();
    +
    +foreach ($segs as $segment)
    +{
    +    echo $segment;
    +    echo '<br />';
    +}     + +

    $this->uri->rsegment_array()

    + +

    This function is identical to the previous one, except that it returns the array of segments in your +re-routed URI in the event you are using CodeIgniter's URI Routing feature.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 0a012608..39337dbd 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -1,201 +1,201 @@ - - - - - -User Agent Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    User Agent Class

    - -

    The User Agent Class provides functions that help identify information about the browser, mobile device, or robot visiting your site. -In addition you can get referrer information as well as language and supported character-set information.

    - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the User Agent class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('user_agent'); -

    Once loaded, the object will be available using: $this->agent

    - -

    User Agent Definitions

    - -

    The user agent name definitions are located in a config file located at: application/config/user_agents.php. You may add items to the -various user agent arrays if needed.

    - -

    Example

    - -

    When the User Agent class is initialized it will attempt to determine whether the user agent browsing your site is -a web browser, a mobile device, or a robot. It will also gather the platform information if it is available.

    - - - -$this->load->library('user_agent');
    -
    -if ($this->agent->is_browser())
    -{
    -    $agent = $this->agent->browser().' '.$this->agent->version();
    -}
    -elseif ($this->agent->is_robot())
    -{
    -    $agent = $this->agent->robot();
    -}
    -elseif ($this->agent->is_mobile())
    -{
    -    $agent = $this->agent->mobile();
    -}
    -else
    -{
    -    $agent = 'Unidentified User Agent';
    -}
    -
    -echo $agent;
    -
    -echo $this->agent->platform(); // Platform info (Windows, Linux, Mac, etc.) -     - - -

    Function Reference

    - - -

    $this->agent->is_browser()

    -

    Returns TRUE/FALSE (boolean) if the user agent is a known web browser.

    - -

    $this->agent->is_mobile()

    -

    Returns TRUE/FALSE (boolean) if the user agent is a known mobile device.

    - -

    $this->agent->is_robot()

    -

    Returns TRUE/FALSE (boolean) if the user agent is a known robot.

    - -

    Note:  The user agent library only contains the most common robot -definitions. It is not a complete list of bots. There are hundreds of them so searching for each one would not be -very efficient. If you find that some bots that commonly visit your site are missing from the list you can add them to your -application/config/user_agents.php file.

    - -

    $this->agent->is_referral()

    -

    Returns TRUE/FALSE (boolean) if the user agent was referred from another site.

    - - -

    $this->agent->browser()

    -

    Returns a string containing the name of the web browser viewing your site.

    - -

    $this->agent->version()

    -

    Returns a string containing the version number of the web browser viewing your site.

    - -

    $this->agent->mobile()

    -

    Returns a string containing the name of the mobile device viewing your site.

    - -

    $this->agent->robot()

    -

    Returns a string containing the name of the robot viewing your site.

    - -

    $this->agent->platform()

    -

    Returns a string containing the platform viewing your site (Linux, Windows, OS X, etc.).

    - -

    $this->agent->referrer()

    -

    The referrer, if the user agent was referred from another site. Typically you'll test for this as follows:

    - - if ($this->agent->is_referral())
    -{
    -    echo $this->agent->referrer();
    -}     - - -

    $this->agent->agent_string()

    -

    Returns a string containing the full user agent string. Typically it will be something like this:

    - -Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.0.4) Gecko/20060613 Camino/1.0.2 - - -

    $this->agent->accept_lang()

    -

    Lets you determine if the user agent accepts a particular language. Example:

    - -if ($this->agent->accept_lang('en'))
    -{
    -    echo 'You accept English!';
    -}     - -

    Note: This function is not typically very reliable -since some browsers do not provide language info, and even among those that do, it is not always accurate.

    - - - -

    $this->agent->accept_charset()

    -

    Lets you determine if the user agent accepts a particular character set. Example:

    - -if ($this->agent->accept_charset('utf-8'))
    -{
    -    echo 'You browser supports UTF-8!';
    -}     - -

    Note: This function is not typically very reliable -since some browsers do not provide character-set info, and even among those that do, it is not always accurate.

    - - - -
    - - - - - - + + + + + +User Agent Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    User Agent Class

    + +

    The User Agent Class provides functions that help identify information about the browser, mobile device, or robot visiting your site. +In addition you can get referrer information as well as language and supported character-set information.

    + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the User Agent class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('user_agent'); +

    Once loaded, the object will be available using: $this->agent

    + +

    User Agent Definitions

    + +

    The user agent name definitions are located in a config file located at: application/config/user_agents.php. You may add items to the +various user agent arrays if needed.

    + +

    Example

    + +

    When the User Agent class is initialized it will attempt to determine whether the user agent browsing your site is +a web browser, a mobile device, or a robot. It will also gather the platform information if it is available.

    + + + +$this->load->library('user_agent');
    +
    +if ($this->agent->is_browser())
    +{
    +    $agent = $this->agent->browser().' '.$this->agent->version();
    +}
    +elseif ($this->agent->is_robot())
    +{
    +    $agent = $this->agent->robot();
    +}
    +elseif ($this->agent->is_mobile())
    +{
    +    $agent = $this->agent->mobile();
    +}
    +else
    +{
    +    $agent = 'Unidentified User Agent';
    +}
    +
    +echo $agent;
    +
    +echo $this->agent->platform(); // Platform info (Windows, Linux, Mac, etc.) +     + + +

    Function Reference

    + + +

    $this->agent->is_browser()

    +

    Returns TRUE/FALSE (boolean) if the user agent is a known web browser.

    + +

    $this->agent->is_mobile()

    +

    Returns TRUE/FALSE (boolean) if the user agent is a known mobile device.

    + +

    $this->agent->is_robot()

    +

    Returns TRUE/FALSE (boolean) if the user agent is a known robot.

    + +

    Note:  The user agent library only contains the most common robot +definitions. It is not a complete list of bots. There are hundreds of them so searching for each one would not be +very efficient. If you find that some bots that commonly visit your site are missing from the list you can add them to your +application/config/user_agents.php file.

    + +

    $this->agent->is_referral()

    +

    Returns TRUE/FALSE (boolean) if the user agent was referred from another site.

    + + +

    $this->agent->browser()

    +

    Returns a string containing the name of the web browser viewing your site.

    + +

    $this->agent->version()

    +

    Returns a string containing the version number of the web browser viewing your site.

    + +

    $this->agent->mobile()

    +

    Returns a string containing the name of the mobile device viewing your site.

    + +

    $this->agent->robot()

    +

    Returns a string containing the name of the robot viewing your site.

    + +

    $this->agent->platform()

    +

    Returns a string containing the platform viewing your site (Linux, Windows, OS X, etc.).

    + +

    $this->agent->referrer()

    +

    The referrer, if the user agent was referred from another site. Typically you'll test for this as follows:

    + + if ($this->agent->is_referral())
    +{
    +    echo $this->agent->referrer();
    +}     + + +

    $this->agent->agent_string()

    +

    Returns a string containing the full user agent string. Typically it will be something like this:

    + +Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.0.4) Gecko/20060613 Camino/1.0.2 + + +

    $this->agent->accept_lang()

    +

    Lets you determine if the user agent accepts a particular language. Example:

    + +if ($this->agent->accept_lang('en'))
    +{
    +    echo 'You accept English!';
    +}     + +

    Note: This function is not typically very reliable +since some browsers do not provide language info, and even among those that do, it is not always accurate.

    + + + +

    $this->agent->accept_charset()

    +

    Lets you determine if the user agent accepts a particular character set. Example:

    + +if ($this->agent->accept_charset('utf-8'))
    +{
    +    echo 'You browser supports UTF-8!';
    +}     + +

    Note: This function is not typically very reliable +since some browsers do not provide character-set info, and even among those that do, it is not always accurate.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 6037a24e..394be190 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -1,736 +1,736 @@ - - - - - -Form Validation : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Form Validation

    - -

    Before explaining CodeIgniter's approach to data validation, let's describe the ideal scenario:

    - -
      -
    1. A form is displayed.
      2. -
    2. You fill it in and submit it.
      3. -
    3. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data along with an error message describing the problem.
      4. -
    4. This process continues until you have submitted a valid form.
      5. -
    - -

    On the receiving end, the script must:

    - -
      -
    1. Check for required data.
      2. -
    2. Verify that the data is of the correct type, and meets the correct criteria. (For example, if a username is submitted -it must be validated to contain only permitted characters. It must be of a minimum length, -and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.)
      3. -
    3. Sanitize the data for security.
      4. -
    4. Pre-format the data if needed (Does the data need to be trimmed? HTML encoded? Etc.)
      5. -
    5. Prep the data for insertion in the database.
      6. -
    - - -

    Although there is nothing complex about the above process, it usually requires a significant -amount of code, and to display error messages, various control structures are usually placed within the form HTML. -Form validation, while simple to create, is generally very messy and tedious to implement.

    - -CodeIgniter provides a comprehensive validation framework that truly minimizes the amount of code you'll write. -It also removes all control structures from your form HTML, permitting it to be clean and free of code. - -

    Overview

    - -

    In order to implement CodeIgniter's form validation you'll need three things:

    - -
      -
    1. A View file containing the form.
      2. -
    2. A View file containing a "success" message to be displayed upon successful submission.
      3. -
    3. A controller function to receive and process the submitted data.
      4. -
    - -

    Let's create those three things, using a member sign-up form as the example.

    - -

    The Form

    - -

    Using a text editor, create a form called myform.php. In it, place this code and save it to your applications/views/ -folder:

    - - - - - -

    The Success Page

    - - -

    Using a text editor, create a form called formsuccess.php. In it, place this code and save it to your applications/views/ -folder:

    - - - - - -

    The Controller

    - -

    Using a text editor, create a controller called form.php. In it, place this code and save it to your applications/controllers/ -folder:

    - - - - - -

    Try it!

    - -

    To try your form, visit your site using a URL similar to this one:

    - -example.com/index.php/form/ - -

    If you submit the form you should simply see the form reload. That's because you haven't set up any validation -rules yet, which we'll get to in a moment.

    - - -

    Explanation

    - -

    You'll notice several things about the above pages:

    - -

    The form (myform.php) is a standard web form with a couple exceptions:

    - -
      -
    1. It uses a form helper to create the form opening. -Technically, this isn't necessary. You could create the form using standard HTML. However, the benefit of using the helper -is that it generates the action URL for you, based on the URL in your config file. This makes your application more portable -and flexible in the event your URLs change.
      2. - -
    2. At the top of the form you'll notice the following variable: -<?php echo $this->validation->error_string; ?> - -

      This variable will display any error messages sent back by the validator. If there are no messages it returns nothing.

      -
      3. -
    - -

    The controller (form.php) has one function: index(). This function initializes the validation class and -loads the form helper and URL helper used by your view files. It also runs -the validation routine. Based on -whether the validation was successful it either presents the form or the success page.

    - -

    Since you haven't told the validation class to validate anything yet, it returns "false" (boolean false) by default. The run() -function only returns "true" if it has successfully applied your rules without any of them failing.

    - - -

    Setting Validation Rules

    - -

    CodeIgniter lets you set as many validation rules as you need for a given field, cascading them in order, and it even lets you prep and pre-process the field data -at the same time. Let's see it in action, we'll explain it afterwards.

    - -

    In your controller (form.php), add this code just below the validation initialization function:

    - -$rules['username'] = "required";
    -$rules['password'] = "required";
    -$rules['passconf'] = "required";
    -$rules['email'] = "required";
    -
    -$this->validation->set_rules($rules);     - -

    Your controller should now look like this:

    - - - -

    Now submit the form with the fields blank and you should see the error message. -If you submit the form with all the fields populated you'll see your success page.

    - -

    Note: The form fields are not yet being re-populated with the data when -there is an error. We'll get to that shortly, once we're through explaining the validation rules.

    - - -

    Changing the Error Delimiters

    - -

    By default, the system adds a paragraph tag (<p>) around each error message shown. You can easily change these delimiters with -this code, placed in your controller:

    - -$this->validation->set_error_delimiters('<div class="error">', '</div>'); - -

    In this example, we've switched to using div tags.

    - -

    Cascading Rules

    - -

    CodeIgniter lets you pipe multiple rules together. Let's try it. Change your rules array like this:

    - - -$rules['username'] = "required|min_length[5]|max_length[12]";
    -$rules['password'] = "required|matches[passconf]";
    -$rules['passconf'] = "required";
    -$rules['email'] = "required|valid_email";     - -

    The above code requires that:

    - -
      -
    1. The username field be no shorter than 5 characters and no longer than 12.
      2. -
    2. The password field must match the password confirmation field.
      3. -
    3. The email field must contain a valid email address.
      4. -
    - -

    Give it a try!

    - -

    Note: There are numerous rules available which you can read about in the validation reference.

    - - -

    Prepping Data

    - -

    In addition to the validation functions like the ones we used above, you can also prep your data in various ways. -For example, you can set up rules like this:

    - -$rules['username'] = "trim|required|min_length[5]|max_length[12]|xss_clean";
    -$rules['password'] = "trim|required|matches[passconf]|md5";
    -$rules['passconf'] = "trim|required";
    -$rules['email'] = "trim|required|valid_email";     - -

    In the above example, we are "trimming" the fields, converting the password to MD5, and running the username through -the "xss_clean" function, which removes malicious data.

    - -

    Any native PHP function that accepts one parameter can be used as a rule, like htmlspecialchars, -trim, MD5, etc.

    - -

    Note: You will generally want to use the prepping functions after -the validation rules so if there is an error, the original data will be shown in the form.

    - -

    Callbacks: Your own Validation Functions

    - -

    The validation system supports callbacks to your own validation functions. This permits you to extend the validation class -to meet your needs. For example, if you need to run a database query to see if the user is choosing a unique username, you can -create a callback function that does that. Let's create a simple example.

    - -

    In your controller, change the "username" rule to this:

    - -$rules['username'] = "callback_username_check"; - -

    Then add a new function called username_check to your controller. Here's how your controller should look:

    - - - - -

    Reload your form and submit it with the word "test" as the username. You can see that the form field data was passed to your -callback function for you to process.

    - -

    To invoke a callback just put the function name in a rule, with "callback_" as the rule prefix.

    - -

    The error message was set using the $this->validation->set_message function. -Just remember that the message key (the first parameter) must match your function name.

    - -

    Note: You can apply your own custom error messages to any rule, just by setting the -message similarly. For example, to change the message for the "required" rule you will do this:

    - -$this->validation->set_message('required', 'Your custom message here'); - -

    Re-populating the form

    - -

    Thus far we have only been dealing with errors. It's time to repopulate the form field with the submitted data. -This is done similarly to your rules. Add the following code to your controller, just below your rules:

    - -$fields['username'] = 'Username';
    -$fields['password'] = 'Password';
    -$fields['passconf'] = 'Password Confirmation';
    -$fields['email'] = 'Email Address';
    -
    -$this->validation->set_fields($fields);     - -

    The array keys are the actual names of the form fields, the value represents the full name that you want shown in the -error message.

    - -

    The index function of your controller should now look like this:

    - - - - - -

    Now open your myform.php view file and update the value in each field so that it has an attribute corresponding to its name:

    - - - - - -

    Now reload your page and submit the form so that it triggers an error. Your form fields should be populated -and the error messages will contain a more relevant field name.

    - - - -

    Showing Errors Individually

    - -

    If you prefer to show an error message next to each form field, rather than as a list, you can change your form so that it looks like this:

    - - - - -

    If there are no errors, nothing will be shown. If there is an error, the message will appear, wrapped in the delimiters you -have set (<p> tags by default).

    - -

    Note: To display errors this way you must remember to set your fields using the $this->validation->set_fields -function described earlier. The errors will be turned into variables that have "_error" after your field name. -For example, your "username" error will be available at:
    $this->validation->username_error.

    - - -

    Rule Reference

    - -

    The following is a list of all the native rules that are available to use:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    RuleParameterDescriptionExample
    requiredNoReturns FALSE if the form element is empty. 
    matchesYesReturns FALSE if the form element does not match the one in the parameter.matches[form_item]
    min_lengthYesReturns FALSE if the form element is shorter then the parameter value.min_length[6]
    max_lengthYesReturns FALSE if the form element is longer then the parameter value.max_length[12]
    exact_lengthYesReturns FALSE if the form element is not exactly the parameter value.exact_length[8]
    alphaNoReturns FALSE if the form element contains anything other than alphabetical characters. 
    alpha_numericNoReturns FALSE if the form element contains anything other than alpha-numeric characters. 
    alpha_dashNoReturns FALSE if the form element contains anything other than alpha-numeric characters, underscores or dashes. 
    numericNoReturns FALSE if the form element contains anything other than numeric characters. 
    integerNoReturns FALSE if the form element contains anything other than an integer. 
    valid_emailNoReturns FALSE if the form element does not contain a valid email address. 
    valid_emailsNoReturns FALSE if any value provided in a comma separated list is not a valid email. 
    valid_ipNoReturns FALSE if the supplied IP is not valid. 
    valid_base64NoReturns FALSE if the supplied string contains anything other than valid Base64 characters. 
    - -

    Note: These rules can also be called as discrete functions. For example:

    - -$this->validation->required($string); - -

    Note: You can also use any native PHP functions that permit one parameter.

    - - - -

    Prepping Reference

    - -

    The following is a list of all the prepping functions that are available to use:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    NameParameterDescription
    xss_cleanNoRuns the data through the XSS filtering function, described in the Input Class page.
    prep_for_formNoConverts special characters so that HTML data can be shown in a form field without breaking it.
    prep_urlNoAdds "http://" to URLs if missing.
    strip_image_tagsNoStrips the HTML from image tags leaving the raw URL.
    encode_php_tagsNoConverts PHP tags to entities.
    - -

    Note: You can also use any native PHP functions that permit one parameter, -like trim, htmlspecialchars, urldecode, etc.

    - - -

    Setting Custom Error Messages

    - -

    All of the native error messages are located in the following language file: language/english/validation_lang.php

    - -

    To set your own custom message you can either edit that file, or use the following function:

    - -$this->validation->set_message('rule', 'Error Message'); - -

    Where rule corresponds to the name of a particular rule, and Error Message is the text you would like displayed.

    - - -

    Dealing with Select Menus, Radio Buttons, and Checkboxes

    - -

    If you use select menus, radio buttons or checkboxes, you will want the state of -these items to be retained in the event of an error. The Validation class has three functions that help you do this:

    - -

    set_select()

    - -

    Permits you to display the menu item that was selected. The first parameter -must contain the name of the select menu, the second parameter must contain the value of -each item. Example:

    - - -<select name="myselect">
    -<option value="one" <?php echo $this->validation->set_select('myselect', 'one'); ?> >One</option>
    -<option value="two" <?php echo $this->validation->set_select('myselect', 'two'); ?> >Two</option>
    -<option value="three" <?php echo $this->validation->set_select('myselect', 'three'); ?> >Three</option>
    -</select> -     - - -

    set_checkbox()

    - -

    Permits you to display a checkbox in the state it was submitted. The first parameter -must contain the name of the checkbox, the second parameter must contain its value. Example:

    - -<input type="checkbox" name="mycheck" value="1" <?php echo $this->validation->set_checkbox('mycheck', '1'); ?> /> - - -

    set_radio()

    - -

    Permits you to display radio buttons in the state they were submitted. The first parameter -must contain the name of the radio button, the second parameter must contain its value. Example:

    - -<input type="radio" name="myradio" value="1" <?php echo $this->validation->set_radio('myradio', '1'); ?> /> - - - - - -
    - - - - - - + + + + + +Form Validation : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Form Validation

    + +

    Before explaining CodeIgniter's approach to data validation, let's describe the ideal scenario:

    + +
      +
    1. A form is displayed.
      2. +
    2. You fill it in and submit it.
      3. +
    3. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data along with an error message describing the problem.
      4. +
    4. This process continues until you have submitted a valid form.
      5. +
    + +

    On the receiving end, the script must:

    + +
      +
    1. Check for required data.
      2. +
    2. Verify that the data is of the correct type, and meets the correct criteria. (For example, if a username is submitted +it must be validated to contain only permitted characters. It must be of a minimum length, +and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.)
      3. +
    3. Sanitize the data for security.
      4. +
    4. Pre-format the data if needed (Does the data need to be trimmed? HTML encoded? Etc.)
      5. +
    5. Prep the data for insertion in the database.
      6. +
    + + +

    Although there is nothing complex about the above process, it usually requires a significant +amount of code, and to display error messages, various control structures are usually placed within the form HTML. +Form validation, while simple to create, is generally very messy and tedious to implement.

    + +CodeIgniter provides a comprehensive validation framework that truly minimizes the amount of code you'll write. +It also removes all control structures from your form HTML, permitting it to be clean and free of code. + +

    Overview

    + +

    In order to implement CodeIgniter's form validation you'll need three things:

    + +
      +
    1. A View file containing the form.
      2. +
    2. A View file containing a "success" message to be displayed upon successful submission.
      3. +
    3. A controller function to receive and process the submitted data.
      4. +
    + +

    Let's create those three things, using a member sign-up form as the example.

    + +

    The Form

    + +

    Using a text editor, create a form called myform.php. In it, place this code and save it to your applications/views/ +folder:

    + + + + + +

    The Success Page

    + + +

    Using a text editor, create a form called formsuccess.php. In it, place this code and save it to your applications/views/ +folder:

    + + + + + +

    The Controller

    + +

    Using a text editor, create a controller called form.php. In it, place this code and save it to your applications/controllers/ +folder:

    + + + + + +

    Try it!

    + +

    To try your form, visit your site using a URL similar to this one:

    + +example.com/index.php/form/ + +

    If you submit the form you should simply see the form reload. That's because you haven't set up any validation +rules yet, which we'll get to in a moment.

    + + +

    Explanation

    + +

    You'll notice several things about the above pages:

    + +

    The form (myform.php) is a standard web form with a couple exceptions:

    + +
      +
    1. It uses a form helper to create the form opening. +Technically, this isn't necessary. You could create the form using standard HTML. However, the benefit of using the helper +is that it generates the action URL for you, based on the URL in your config file. This makes your application more portable +and flexible in the event your URLs change.
      2. + +
    2. At the top of the form you'll notice the following variable: +<?php echo $this->validation->error_string; ?> + +

      This variable will display any error messages sent back by the validator. If there are no messages it returns nothing.

      +
      3. +
    + +

    The controller (form.php) has one function: index(). This function initializes the validation class and +loads the form helper and URL helper used by your view files. It also runs +the validation routine. Based on +whether the validation was successful it either presents the form or the success page.

    + +

    Since you haven't told the validation class to validate anything yet, it returns "false" (boolean false) by default. The run() +function only returns "true" if it has successfully applied your rules without any of them failing.

    + + +

    Setting Validation Rules

    + +

    CodeIgniter lets you set as many validation rules as you need for a given field, cascading them in order, and it even lets you prep and pre-process the field data +at the same time. Let's see it in action, we'll explain it afterwards.

    + +

    In your controller (form.php), add this code just below the validation initialization function:

    + +$rules['username'] = "required";
    +$rules['password'] = "required";
    +$rules['passconf'] = "required";
    +$rules['email'] = "required";
    +
    +$this->validation->set_rules($rules);     + +

    Your controller should now look like this:

    + + + +

    Now submit the form with the fields blank and you should see the error message. +If you submit the form with all the fields populated you'll see your success page.

    + +

    Note: The form fields are not yet being re-populated with the data when +there is an error. We'll get to that shortly, once we're through explaining the validation rules.

    + + +

    Changing the Error Delimiters

    + +

    By default, the system adds a paragraph tag (<p>) around each error message shown. You can easily change these delimiters with +this code, placed in your controller:

    + +$this->validation->set_error_delimiters('<div class="error">', '</div>'); + +

    In this example, we've switched to using div tags.

    + +

    Cascading Rules

    + +

    CodeIgniter lets you pipe multiple rules together. Let's try it. Change your rules array like this:

    + + +$rules['username'] = "required|min_length[5]|max_length[12]";
    +$rules['password'] = "required|matches[passconf]";
    +$rules['passconf'] = "required";
    +$rules['email'] = "required|valid_email";     + +

    The above code requires that:

    + +
      +
    1. The username field be no shorter than 5 characters and no longer than 12.
      2. +
    2. The password field must match the password confirmation field.
      3. +
    3. The email field must contain a valid email address.
      4. +
    + +

    Give it a try!

    + +

    Note: There are numerous rules available which you can read about in the validation reference.

    + + +

    Prepping Data

    + +

    In addition to the validation functions like the ones we used above, you can also prep your data in various ways. +For example, you can set up rules like this:

    + +$rules['username'] = "trim|required|min_length[5]|max_length[12]|xss_clean";
    +$rules['password'] = "trim|required|matches[passconf]|md5";
    +$rules['passconf'] = "trim|required";
    +$rules['email'] = "trim|required|valid_email";     + +

    In the above example, we are "trimming" the fields, converting the password to MD5, and running the username through +the "xss_clean" function, which removes malicious data.

    + +

    Any native PHP function that accepts one parameter can be used as a rule, like htmlspecialchars, +trim, MD5, etc.

    + +

    Note: You will generally want to use the prepping functions after +the validation rules so if there is an error, the original data will be shown in the form.

    + +

    Callbacks: Your own Validation Functions

    + +

    The validation system supports callbacks to your own validation functions. This permits you to extend the validation class +to meet your needs. For example, if you need to run a database query to see if the user is choosing a unique username, you can +create a callback function that does that. Let's create a simple example.

    + +

    In your controller, change the "username" rule to this:

    + +$rules['username'] = "callback_username_check"; + +

    Then add a new function called username_check to your controller. Here's how your controller should look:

    + + + + +

    Reload your form and submit it with the word "test" as the username. You can see that the form field data was passed to your +callback function for you to process.

    + +

    To invoke a callback just put the function name in a rule, with "callback_" as the rule prefix.

    + +

    The error message was set using the $this->validation->set_message function. +Just remember that the message key (the first parameter) must match your function name.

    + +

    Note: You can apply your own custom error messages to any rule, just by setting the +message similarly. For example, to change the message for the "required" rule you will do this:

    + +$this->validation->set_message('required', 'Your custom message here'); + +

    Re-populating the form

    + +

    Thus far we have only been dealing with errors. It's time to repopulate the form field with the submitted data. +This is done similarly to your rules. Add the following code to your controller, just below your rules:

    + +$fields['username'] = 'Username';
    +$fields['password'] = 'Password';
    +$fields['passconf'] = 'Password Confirmation';
    +$fields['email'] = 'Email Address';
    +
    +$this->validation->set_fields($fields);     + +

    The array keys are the actual names of the form fields, the value represents the full name that you want shown in the +error message.

    + +

    The index function of your controller should now look like this:

    + + + + + +

    Now open your myform.php view file and update the value in each field so that it has an attribute corresponding to its name:

    + + + + + +

    Now reload your page and submit the form so that it triggers an error. Your form fields should be populated +and the error messages will contain a more relevant field name.

    + + + +

    Showing Errors Individually

    + +

    If you prefer to show an error message next to each form field, rather than as a list, you can change your form so that it looks like this:

    + + + + +

    If there are no errors, nothing will be shown. If there is an error, the message will appear, wrapped in the delimiters you +have set (<p> tags by default).

    + +

    Note: To display errors this way you must remember to set your fields using the $this->validation->set_fields +function described earlier. The errors will be turned into variables that have "_error" after your field name. +For example, your "username" error will be available at:
    $this->validation->username_error.

    + + +

    Rule Reference

    + +

    The following is a list of all the native rules that are available to use:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RuleParameterDescriptionExample
    requiredNoReturns FALSE if the form element is empty. 
    matchesYesReturns FALSE if the form element does not match the one in the parameter.matches[form_item]
    min_lengthYesReturns FALSE if the form element is shorter then the parameter value.min_length[6]
    max_lengthYesReturns FALSE if the form element is longer then the parameter value.max_length[12]
    exact_lengthYesReturns FALSE if the form element is not exactly the parameter value.exact_length[8]
    alphaNoReturns FALSE if the form element contains anything other than alphabetical characters. 
    alpha_numericNoReturns FALSE if the form element contains anything other than alpha-numeric characters. 
    alpha_dashNoReturns FALSE if the form element contains anything other than alpha-numeric characters, underscores or dashes. 
    numericNoReturns FALSE if the form element contains anything other than numeric characters. 
    integerNoReturns FALSE if the form element contains anything other than an integer. 
    valid_emailNoReturns FALSE if the form element does not contain a valid email address. 
    valid_emailsNoReturns FALSE if any value provided in a comma separated list is not a valid email. 
    valid_ipNoReturns FALSE if the supplied IP is not valid. 
    valid_base64NoReturns FALSE if the supplied string contains anything other than valid Base64 characters. 
    + +

    Note: These rules can also be called as discrete functions. For example:

    + +$this->validation->required($string); + +

    Note: You can also use any native PHP functions that permit one parameter.

    + + + +

    Prepping Reference

    + +

    The following is a list of all the prepping functions that are available to use:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NameParameterDescription
    xss_cleanNoRuns the data through the XSS filtering function, described in the Input Class page.
    prep_for_formNoConverts special characters so that HTML data can be shown in a form field without breaking it.
    prep_urlNoAdds "http://" to URLs if missing.
    strip_image_tagsNoStrips the HTML from image tags leaving the raw URL.
    encode_php_tagsNoConverts PHP tags to entities.
    + +

    Note: You can also use any native PHP functions that permit one parameter, +like trim, htmlspecialchars, urldecode, etc.

    + + +

    Setting Custom Error Messages

    + +

    All of the native error messages are located in the following language file: language/english/validation_lang.php

    + +

    To set your own custom message you can either edit that file, or use the following function:

    + +$this->validation->set_message('rule', 'Error Message'); + +

    Where rule corresponds to the name of a particular rule, and Error Message is the text you would like displayed.

    + + +

    Dealing with Select Menus, Radio Buttons, and Checkboxes

    + +

    If you use select menus, radio buttons or checkboxes, you will want the state of +these items to be retained in the event of an error. The Validation class has three functions that help you do this:

    + +

    set_select()

    + +

    Permits you to display the menu item that was selected. The first parameter +must contain the name of the select menu, the second parameter must contain the value of +each item. Example:

    + + +<select name="myselect">
    +<option value="one" <?php echo $this->validation->set_select('myselect', 'one'); ?> >One</option>
    +<option value="two" <?php echo $this->validation->set_select('myselect', 'two'); ?> >Two</option>
    +<option value="three" <?php echo $this->validation->set_select('myselect', 'three'); ?> >Three</option>
    +</select> +     + + +

    set_checkbox()

    + +

    Permits you to display a checkbox in the state it was submitted. The first parameter +must contain the name of the checkbox, the second parameter must contain its value. Example:

    + +<input type="checkbox" name="mycheck" value="1" <?php echo $this->validation->set_checkbox('mycheck', '1'); ?> /> + + +

    set_radio()

    + +

    Permits you to display radio buttons in the state they were submitted. The first parameter +must contain the name of the radio button, the second parameter must contain its value. Example:

    + +<input type="radio" name="myradio" value="1" <?php echo $this->validation->set_radio('myradio', '1'); ?> /> + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 9c1b7145..e329e4a9 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -1,517 +1,517 @@ - - - - - -XML-RPC and XML-RPC Server Classes : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    XML-RPC and XML-RPC Server Classes

    - - -

    CodeIgniter's XML-RPC classes permit you to send requests to another server, or set up -your own XML-RPC server to receive requests.

    - - -

    What is XML-RPC?

    - -

    Quite simply it is a way for two computers to communicate over the internet using XML. -One computer, which we will call the client, sends an XML-RPC request to -another computer, which we will call the server. Once the server receives and processes the request it -will send back a response to the client.

    - -

    For example, using the MetaWeblog API, an XML-RPC Client (usually a desktop publishing tool) will -send a request to an XML-RPC Server running on your site. This request might be a new weblog entry -being sent for publication, or it could be a request for an existing entry for editing. - -When the XML-RPC Server receives this request it will examine it to determine which class/method should be called to process the request. -Once processed, the server will then send back a response message.

    - -

    For detailed specifications, you can visit the XML-RPC site.

    - -

    Initializing the Class

    - -

    Like most other classes in CodeIgniter, the XML-RPC and XML-RPCS classes are initialized in your controller using the $this->load->library function:

    - -

    To load the XML-RPC class you will use:

    -$this->load->library('xmlrpc'); -

    Once loaded, the xml-rpc library object will be available using: $this->xmlrpc

    - -

    To load the XML-RPC Server class you will use:

    - -$this->load->library('xmlrpc');
    -$this->load->library('xmlrpcs'); -     -

    Once loaded, the xml-rpcs library object will be available using: $this->xmlrpcs

    - -

    Note:  When using the XML-RPC Server class you must load BOTH the XML-RPC class and the XML-RPC Server class.

    - - - -

    Sending XML-RPC Requests

    - -

    To send a request to an XML-RPC server you must specify the following information:

    - -
      -
    • The URL of the server
      • -
    • The method on the server you wish to call
      • -
    • The request data (explained below).
      • -
    - -

    Here is a basic example that sends a simple Weblogs.com ping to the Ping-o-Matic

    - - -$this->load->library('xmlrpc');
    -
    -$this->xmlrpc->server('http://rpc.pingomatic.com/', 80);
    -$this->xmlrpc->method('weblogUpdates.ping');
    - -
    -$request = array('My Photoblog', 'http://www.my-site.com/photoblog/');
    -$this->xmlrpc->request($request);
    -
    -if ( ! $this->xmlrpc->send_request())
    -{
    -    echo $this->xmlrpc->display_error();
    -}     - -

    Explanation

    - -

    The above code initializes the XML-RPC class, sets the server URL and method to be called (weblogUpdates.ping). The -request (in this case, the title and URL of your site) is placed into an array for transportation, and -compiled using the request() function. -Lastly, the full request is sent. If the send_request() method returns false we will display the error message -sent back from the XML-RPC Server.

    - -

    Anatomy of a Request

    - -

    An XML-RPC request is simply the data you are sending to the XML-RPC server. Each piece of data in a request -is referred to as a request parameter. The above example has two parameters: -The URL and title of your site. When the XML-RPC server receives your request, it will look for parameters it requires.

    - -

    Request parameters must be placed into an array for transportation, and each parameter can be one -of seven data types (strings, numbers, dates, etc.). If your parameters are something other than strings -you will have to include the data type in the request array.

    - -

    Here is an example of a simple array with three parameters:

    - -$request = array('John', 'Doe', 'www.some-site.com');
    -$this->xmlrpc->request($request);     - -

    If you use data types other than strings, or if you have several different data types, you will place -each parameter into its own array, with the data type in the second position:

    - - -$request = array (
    -                   array('John', 'string'),
    -                   array('Doe', 'string'),
    -                   array(FALSE, 'boolean'),
    -                   array(12345, 'int')
    -                 ); -
    -$this->xmlrpc->request($request);     - -The Data Types section below has a full list of data types. - - - -

    Creating an XML-RPC Server

    - -

    An XML-RPC Server acts as a traffic cop of sorts, waiting for incoming requests and redirecting them to the -appropriate functions for processing.

    - -

    To create your own XML-RPC server involves initializing the XML-RPC Server class in your controller where you expect the incoming -request to appear, then setting up an array with mapping instructions so that incoming requests can be sent to the appropriate -class and method for processing.

    - -

    Here is an example to illustrate:

    - - -$this->load->library('xmlrpc');
    -$this->load->library('xmlrpcs');
    -
    -$config['functions']['new_post'] = array('function' => 'My_blog.new_entry'),
    -$config['functions']['update_post'] = array('function' => 'My_blog.update_entry');
    -$config['object'] = $this;
    -
    -$this->xmlrpcs->initialize($config);
    -$this->xmlrpcs->serve();     - -

    The above example contains an array specifying two method requests that the Server allows. -The allowed methods are on the left side of the array. When either of those are received, they will be mapped to the class and method on the right.

    - -

    The 'object' key is a special key that you pass an instantiated class object with, which is necessary when the method you are mapping to is not - part of the CodeIgniter super object.

    - -

    In other words, if an XML-RPC Client sends a request for the new_post method, your -server will load the My_blog class and call the new_entry function. -If the request is for the update_post method, your -server will load the My_blog class and call the update_entry function.

    - -

    The function names in the above example are arbitrary. You'll decide what they should be called on your server, -or if you are using standardized APIs, like the Blogger or MetaWeblog API, you'll use their function names.

    - -

    Processing Server Requests

    - -

    When the XML-RPC Server receives a request and loads the class/method for processing, it will pass -an object to that method containing the data sent by the client.

    - -

    Using the above example, if the new_post method is requested, the server will expect a class -to exist with this prototype:

    - -class My_blog extends Controller {
    -
    -    function new_post($request)
    -    {
    -
    -    }
    -} -     - -

    The $request variable is an object compiled by the Server, which contains the data sent by the XML-RPC Client. -Using this object you will have access to the request parameters enabling you to process the request. When -you are done you will send a Response back to the Client.

    - -

    Below is a real-world example, using the Blogger API. One of the methods in the Blogger API is getUserInfo(). -Using this method, an XML-RPC Client can send the Server a username and password, in return the Server sends -back information about that particular user (nickname, user ID, email address, etc.). Here is how the processing -function might look:

    - - -class My_blog extends Controller {
    -
    -    function getUserInfo($request)
    -    {
    - -        $username = 'smitty';
    -        $password = 'secretsmittypass';

    - -        $this->load->library('xmlrpc');
    -    
    -        $parameters = $request->output_parameters();
    -    
    -        if ($parameters['1'] != $username AND $parameters['2'] != $password)
    -        {
    -            return $this->xmlrpc->send_error_message('100', 'Invalid Access');
    -        }
    -    
    -        $response = array(array('nickname'  => array('Smitty','string'),
    -                                'userid'    => array('99','string'),
    -                                'url'       => array('http://yoursite.com','string'),
    -                                'email'     => array('jsmith@yoursite.com','string'),
    -                                'lastname'  => array('Smith','string'),
    -                                'firstname' => array('John','string')
    -                                ),
    -                         'struct');
    -
    -        return $this->xmlrpc->send_response($response);
    -    }
    -} -     - -

    Notes:

    -

    The output_parameters() function retrieves an indexed array corresponding to the request parameters sent by the client. -In the above example, the output parameters will be the username and password.

    - -

    If the username and password sent by the client were not valid, and error message is returned using send_error_message().

    - -

    If the operation was successful, the client will be sent back a response array containing the user's info.

    - - -

    Formatting a Response

    - -

    Similar to Requests, Responses must be formatted as an array. However, unlike requests, a response is an array -that contains a single item. This item can be an array with several additional arrays, but there -can be only one primary array index. In other words, the basic prototype is this:

    - -$response = array('Response data', 'array'); - -

    Responses, however, usually contain multiple pieces of information. In order to accomplish this we must put the response into its own -array so that the primary array continues to contain a single piece of data. Here's an example showing how this might be accomplished:

    - - -$response = array (
    -                   array(
    -                         'first_name' => array('John', 'string'),
    -                         'last_name' => array('Doe', 'string'),
    -                         'member_id' => array(123435, 'int'),
    -                         'todo_list' => array(array('clean house', 'call mom', 'water plants'), 'array'),
    -                        ),
    -                 'struct'
    -                 ); -     - -

    Notice that the above array is formatted as a struct. This is the most common data type for responses.

    - -

    As with Requests, a response can be one of the seven data types listed in the Data Types section.

    - - -

    Sending an Error Response

    - -

    If you need to send the client an error response you will use the following:

    - -return $this->xmlrpc->send_error_message('123', 'Requested data not available'); - -

    The first parameter is the error number while the second parameter is the error message.

    - - - - - - -

    Creating Your Own Client and Server

    - -

    To help you understand everything we've covered thus far, let's create a couple controllers that act as -XML-RPC Client and Server. You'll use the Client to send a request to the Server and receive a response.

    - -

    The Client

    - -

    Using a text editor, create a controller called xmlrpc_client.php. -In it, place this code and save it to your applications/controllers/ folder:

    - - - -

    Note: In the above code we are using a "url helper". You can find more information in the Helpers Functions page.

    - -

    The Server

    - -

    Using a text editor, create a controller called xmlrpc_server.php. -In it, place this code and save it to your applications/controllers/ folder:

    - - - -

    Try it!

    - -

    Now visit the your site using a URL similar to this:

    -example.com/index.php/xmlrpc_client/ - -

    You should now see the message you sent to the server, and its response back to you.

    - -

    The client you created sends a message ("How's is going?") to the server, along with a request for the "Greetings" method. -The Server receives the request and maps it to the "process" function, where a response is sent back.

    - -

    Using Associative Arrays In a Request Parameter

    - -

    If you wish to use an associative array in your method parameters you will need to use a struct datatype:

    - -$request = array(
    -                  array(
    -                        // Param 0
    -                        array(
    -                              'name'=>'John'
    -                              ),
    -                              'struct'
    -                        ),
    -                        array(
    -                              // Param 1
    -                              array(
    -                                    'size'=>'large',
    -                                    'shape'=>'round'
    -                                    ),
    -                              'struct'
    -                        )
    -                  );
    - $this->xmlrpc->request($request);     - -

    You can retrieve the associative array when processing the request in the Server.

    - -$parameters = $request->output_parameters();
    - $name = $parameters['0']['name'];
    - $size = $parameters['1']['size'];
    - $size = $parameters['1']['shape'];     - -

    XML-RPC Function Reference

    - -

    $this->xmlrpc->server()

    -

    Sets the URL and port number of the server to which a request is to be sent:

    -$this->xmlrpc->server('http://www.sometimes.com/pings.php', 80); - -

    $this->xmlrpc->timeout()

    -

    Set a time out period (in seconds) after which the request will be canceled:

    -$this->xmlrpc->timeout(6); - -

    $this->xmlrpc->method()

    -

    Sets the method that will be requested from the XML-RPC server:

    -$this->xmlrpc->method('method'); - -

    Where method is the name of the method.

    - -

    $this->xmlrpc->request()

    -

    Takes an array of data and builds request to be sent to XML-RPC server:

    -$request = array(array('My Photoblog', 'string'), 'http://www.yoursite.com/photoblog/');
    -$this->xmlrpc->request($request);     - -

    $this->xmlrpc->send_request()

    -

    The request sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

    - -

    $this->xmlrpc->set_debug(TRUE);

    -

    Enables debugging, which will display a variety of information and error data helpful during development.

    - - -

    $this->xmlrpc->display_error()

    -

    Returns an error message as a string if your request failed for some reason.

    -echo $this->xmlrpc->display_error(); - -

    $this->xmlrpc->display_response()

    -

    Returns the response from the remote server once request is received. The response will typically be an associative array.

    -$this->xmlrpc->display_response(); - -

    $this->xmlrpc->send_error_message()

    -

    This function lets you send an error message from your server to the client. First parameter is the error number while the second parameter -is the error message.

    -return $this->xmlrpc->send_error_message('123', 'Requested data not available'); - -

    $this->xmlrpc->send_response()

    -

    Lets you send the response from your server to the client. An array of valid data values must be sent with this method.

    -$response = array(
    -                 array(
    -                        'flerror' => array(FALSE, 'boolean'),
    -                        'message' => "Thanks for the ping!")
    -                     )
    -                 'struct');
    -return $this->xmlrpc->send_response($response);     - - - -

    Data Types

    - -

    According to the XML-RPC spec there are seven types -of values that you can send via XML-RPC:

    - -
      -
    • int or i4
      • -
    • boolean
      • -
    • string
      • -
    • double
      • -
    • dateTime.iso8601
      • -
    • base64
      • -
    • struct (contains array of values)
      • -
    • array (contains array of values)
      • -
    - - -
    - - - - - - + + + + + +XML-RPC and XML-RPC Server Classes : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    XML-RPC and XML-RPC Server Classes

    + + +

    CodeIgniter's XML-RPC classes permit you to send requests to another server, or set up +your own XML-RPC server to receive requests.

    + + +

    What is XML-RPC?

    + +

    Quite simply it is a way for two computers to communicate over the internet using XML. +One computer, which we will call the client, sends an XML-RPC request to +another computer, which we will call the server. Once the server receives and processes the request it +will send back a response to the client.

    + +

    For example, using the MetaWeblog API, an XML-RPC Client (usually a desktop publishing tool) will +send a request to an XML-RPC Server running on your site. This request might be a new weblog entry +being sent for publication, or it could be a request for an existing entry for editing. + +When the XML-RPC Server receives this request it will examine it to determine which class/method should be called to process the request. +Once processed, the server will then send back a response message.

    + +

    For detailed specifications, you can visit the XML-RPC site.

    + +

    Initializing the Class

    + +

    Like most other classes in CodeIgniter, the XML-RPC and XML-RPCS classes are initialized in your controller using the $this->load->library function:

    + +

    To load the XML-RPC class you will use:

    +$this->load->library('xmlrpc'); +

    Once loaded, the xml-rpc library object will be available using: $this->xmlrpc

    + +

    To load the XML-RPC Server class you will use:

    + +$this->load->library('xmlrpc');
    +$this->load->library('xmlrpcs'); +     +

    Once loaded, the xml-rpcs library object will be available using: $this->xmlrpcs

    + +

    Note:  When using the XML-RPC Server class you must load BOTH the XML-RPC class and the XML-RPC Server class.

    + + + +

    Sending XML-RPC Requests

    + +

    To send a request to an XML-RPC server you must specify the following information:

    + +
      +
    • The URL of the server
      • +
    • The method on the server you wish to call
      • +
    • The request data (explained below).
      • +
    + +

    Here is a basic example that sends a simple Weblogs.com ping to the Ping-o-Matic

    + + +$this->load->library('xmlrpc');
    +
    +$this->xmlrpc->server('http://rpc.pingomatic.com/', 80);
    +$this->xmlrpc->method('weblogUpdates.ping');
    + +
    +$request = array('My Photoblog', 'http://www.my-site.com/photoblog/');
    +$this->xmlrpc->request($request);
    +
    +if ( ! $this->xmlrpc->send_request())
    +{
    +    echo $this->xmlrpc->display_error();
    +}     + +

    Explanation

    + +

    The above code initializes the XML-RPC class, sets the server URL and method to be called (weblogUpdates.ping). The +request (in this case, the title and URL of your site) is placed into an array for transportation, and +compiled using the request() function. +Lastly, the full request is sent. If the send_request() method returns false we will display the error message +sent back from the XML-RPC Server.

    + +

    Anatomy of a Request

    + +

    An XML-RPC request is simply the data you are sending to the XML-RPC server. Each piece of data in a request +is referred to as a request parameter. The above example has two parameters: +The URL and title of your site. When the XML-RPC server receives your request, it will look for parameters it requires.

    + +

    Request parameters must be placed into an array for transportation, and each parameter can be one +of seven data types (strings, numbers, dates, etc.). If your parameters are something other than strings +you will have to include the data type in the request array.

    + +

    Here is an example of a simple array with three parameters:

    + +$request = array('John', 'Doe', 'www.some-site.com');
    +$this->xmlrpc->request($request);     + +

    If you use data types other than strings, or if you have several different data types, you will place +each parameter into its own array, with the data type in the second position:

    + + +$request = array (
    +                   array('John', 'string'),
    +                   array('Doe', 'string'),
    +                   array(FALSE, 'boolean'),
    +                   array(12345, 'int')
    +                 ); +
    +$this->xmlrpc->request($request);     + +The Data Types section below has a full list of data types. + + + +

    Creating an XML-RPC Server

    + +

    An XML-RPC Server acts as a traffic cop of sorts, waiting for incoming requests and redirecting them to the +appropriate functions for processing.

    + +

    To create your own XML-RPC server involves initializing the XML-RPC Server class in your controller where you expect the incoming +request to appear, then setting up an array with mapping instructions so that incoming requests can be sent to the appropriate +class and method for processing.

    + +

    Here is an example to illustrate:

    + + +$this->load->library('xmlrpc');
    +$this->load->library('xmlrpcs');
    +
    +$config['functions']['new_post'] = array('function' => 'My_blog.new_entry'),
    +$config['functions']['update_post'] = array('function' => 'My_blog.update_entry');
    +$config['object'] = $this;
    +
    +$this->xmlrpcs->initialize($config);
    +$this->xmlrpcs->serve();     + +

    The above example contains an array specifying two method requests that the Server allows. +The allowed methods are on the left side of the array. When either of those are received, they will be mapped to the class and method on the right.

    + +

    The 'object' key is a special key that you pass an instantiated class object with, which is necessary when the method you are mapping to is not + part of the CodeIgniter super object.

    + +

    In other words, if an XML-RPC Client sends a request for the new_post method, your +server will load the My_blog class and call the new_entry function. +If the request is for the update_post method, your +server will load the My_blog class and call the update_entry function.

    + +

    The function names in the above example are arbitrary. You'll decide what they should be called on your server, +or if you are using standardized APIs, like the Blogger or MetaWeblog API, you'll use their function names.

    + +

    Processing Server Requests

    + +

    When the XML-RPC Server receives a request and loads the class/method for processing, it will pass +an object to that method containing the data sent by the client.

    + +

    Using the above example, if the new_post method is requested, the server will expect a class +to exist with this prototype:

    + +class My_blog extends Controller {
    +
    +    function new_post($request)
    +    {
    +
    +    }
    +} +     + +

    The $request variable is an object compiled by the Server, which contains the data sent by the XML-RPC Client. +Using this object you will have access to the request parameters enabling you to process the request. When +you are done you will send a Response back to the Client.

    + +

    Below is a real-world example, using the Blogger API. One of the methods in the Blogger API is getUserInfo(). +Using this method, an XML-RPC Client can send the Server a username and password, in return the Server sends +back information about that particular user (nickname, user ID, email address, etc.). Here is how the processing +function might look:

    + + +class My_blog extends Controller {
    +
    +    function getUserInfo($request)
    +    {
    + +        $username = 'smitty';
    +        $password = 'secretsmittypass';

    + +        $this->load->library('xmlrpc');
    +    
    +        $parameters = $request->output_parameters();
    +    
    +        if ($parameters['1'] != $username AND $parameters['2'] != $password)
    +        {
    +            return $this->xmlrpc->send_error_message('100', 'Invalid Access');
    +        }
    +    
    +        $response = array(array('nickname'  => array('Smitty','string'),
    +                                'userid'    => array('99','string'),
    +                                'url'       => array('http://yoursite.com','string'),
    +                                'email'     => array('jsmith@yoursite.com','string'),
    +                                'lastname'  => array('Smith','string'),
    +                                'firstname' => array('John','string')
    +                                ),
    +                         'struct');
    +
    +        return $this->xmlrpc->send_response($response);
    +    }
    +} +     + +

    Notes:

    +

    The output_parameters() function retrieves an indexed array corresponding to the request parameters sent by the client. +In the above example, the output parameters will be the username and password.

    + +

    If the username and password sent by the client were not valid, and error message is returned using send_error_message().

    + +

    If the operation was successful, the client will be sent back a response array containing the user's info.

    + + +

    Formatting a Response

    + +

    Similar to Requests, Responses must be formatted as an array. However, unlike requests, a response is an array +that contains a single item. This item can be an array with several additional arrays, but there +can be only one primary array index. In other words, the basic prototype is this:

    + +$response = array('Response data', 'array'); + +

    Responses, however, usually contain multiple pieces of information. In order to accomplish this we must put the response into its own +array so that the primary array continues to contain a single piece of data. Here's an example showing how this might be accomplished:

    + + +$response = array (
    +                   array(
    +                         'first_name' => array('John', 'string'),
    +                         'last_name' => array('Doe', 'string'),
    +                         'member_id' => array(123435, 'int'),
    +                         'todo_list' => array(array('clean house', 'call mom', 'water plants'), 'array'),
    +                        ),
    +                 'struct'
    +                 ); +     + +

    Notice that the above array is formatted as a struct. This is the most common data type for responses.

    + +

    As with Requests, a response can be one of the seven data types listed in the Data Types section.

    + + +

    Sending an Error Response

    + +

    If you need to send the client an error response you will use the following:

    + +return $this->xmlrpc->send_error_message('123', 'Requested data not available'); + +

    The first parameter is the error number while the second parameter is the error message.

    + + + + + + +

    Creating Your Own Client and Server

    + +

    To help you understand everything we've covered thus far, let's create a couple controllers that act as +XML-RPC Client and Server. You'll use the Client to send a request to the Server and receive a response.

    + +

    The Client

    + +

    Using a text editor, create a controller called xmlrpc_client.php. +In it, place this code and save it to your applications/controllers/ folder:

    + + + +

    Note: In the above code we are using a "url helper". You can find more information in the Helpers Functions page.

    + +

    The Server

    + +

    Using a text editor, create a controller called xmlrpc_server.php. +In it, place this code and save it to your applications/controllers/ folder:

    + + + +

    Try it!

    + +

    Now visit the your site using a URL similar to this:

    +example.com/index.php/xmlrpc_client/ + +

    You should now see the message you sent to the server, and its response back to you.

    + +

    The client you created sends a message ("How's is going?") to the server, along with a request for the "Greetings" method. +The Server receives the request and maps it to the "process" function, where a response is sent back.

    + +

    Using Associative Arrays In a Request Parameter

    + +

    If you wish to use an associative array in your method parameters you will need to use a struct datatype:

    + +$request = array(
    +                  array(
    +                        // Param 0
    +                        array(
    +                              'name'=>'John'
    +                              ),
    +                              'struct'
    +                        ),
    +                        array(
    +                              // Param 1
    +                              array(
    +                                    'size'=>'large',
    +                                    'shape'=>'round'
    +                                    ),
    +                              'struct'
    +                        )
    +                  );
    + $this->xmlrpc->request($request);     + +

    You can retrieve the associative array when processing the request in the Server.

    + +$parameters = $request->output_parameters();
    + $name = $parameters['0']['name'];
    + $size = $parameters['1']['size'];
    + $size = $parameters['1']['shape'];     + +

    XML-RPC Function Reference

    + +

    $this->xmlrpc->server()

    +

    Sets the URL and port number of the server to which a request is to be sent:

    +$this->xmlrpc->server('http://www.sometimes.com/pings.php', 80); + +

    $this->xmlrpc->timeout()

    +

    Set a time out period (in seconds) after which the request will be canceled:

    +$this->xmlrpc->timeout(6); + +

    $this->xmlrpc->method()

    +

    Sets the method that will be requested from the XML-RPC server:

    +$this->xmlrpc->method('method'); + +

    Where method is the name of the method.

    + +

    $this->xmlrpc->request()

    +

    Takes an array of data and builds request to be sent to XML-RPC server:

    +$request = array(array('My Photoblog', 'string'), 'http://www.yoursite.com/photoblog/');
    +$this->xmlrpc->request($request);     + +

    $this->xmlrpc->send_request()

    +

    The request sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

    + +

    $this->xmlrpc->set_debug(TRUE);

    +

    Enables debugging, which will display a variety of information and error data helpful during development.

    + + +

    $this->xmlrpc->display_error()

    +

    Returns an error message as a string if your request failed for some reason.

    +echo $this->xmlrpc->display_error(); + +

    $this->xmlrpc->display_response()

    +

    Returns the response from the remote server once request is received. The response will typically be an associative array.

    +$this->xmlrpc->display_response(); + +

    $this->xmlrpc->send_error_message()

    +

    This function lets you send an error message from your server to the client. First parameter is the error number while the second parameter +is the error message.

    +return $this->xmlrpc->send_error_message('123', 'Requested data not available'); + +

    $this->xmlrpc->send_response()

    +

    Lets you send the response from your server to the client. An array of valid data values must be sent with this method.

    +$response = array(
    +                 array(
    +                        'flerror' => array(FALSE, 'boolean'),
    +                        'message' => "Thanks for the ping!")
    +                     )
    +                 'struct');
    +return $this->xmlrpc->send_response($response);     + + + +

    Data Types

    + +

    According to the XML-RPC spec there are seven types +of values that you can send via XML-RPC:

    + +
      +
    • int or i4
      • +
    • boolean
      • +
    • string
      • +
    • double
      • +
    • dateTime.iso8601
      • +
    • base64
      • +
    • struct (contains array of values)
      • +
    • array (contains array of values)
      • +
    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index c789c85f..ebd5b49a 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -1,278 +1,278 @@ - - - - - -Zip Encoding Class : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Zip Encoding Class

    -

    CodeIgniter's Zip Encoding Class classes permit you to create Zip archives. Archives can be downloaded to your -desktop or saved to a directory.

    - - -

    Initializing the Class

    -

    Like most other classes in CodeIgniter, the Zip class is initialized in your controller using the $this->load->library function:

    - -$this->load->library('zip'); -

    Once loaded, the Zip library object will be available using: $this->zip

    - - -

    Usage Example

    - -

    This example demonstrates how to compress a file, save it to a folder on your server, and download it to your desktop.

    - - -$name = 'mydata1.txt';
    -$data = 'A Data String!';
    -
    -$this->zip->add_data($name, $data);
    -
    -// Write the zip file to a folder on your server. Name it "my_backup.zip"
    -$this->zip->archive('/path/to/directory/my_backup.zip'); -

    - // Download the file to your desktop. Name it "my_backup.zip"
    -$this->zip->download('my_backup.zip'); -     - -

    Function Reference

    - -

    $this->zip->add_data()

    - -

    Permits you to add data to the Zip archive. The first parameter must contain the name you would like -given to the file, the second parameter must contain the file data as a string:

    - - -$name = 'my_bio.txt';
    -$data = 'I was born in an elevator...';
    -
    -$this->zip->add_data($name, $data); -     - -

    You are allowed multiple calls to this function in order to -add several files to your archive. Example:

    - - -$name = 'mydata1.txt';
    -$data = 'A Data String!';
    -$this->zip->add_data($name, $data);
    -
    -$name = 'mydata2.txt';
    -$data = 'Another Data String!';
    -$this->zip->add_data($name, $data);
    -     - -

    Or you can pass multiple files using an array:

    - - -$data = array(
    -                'mydata1.txt' => 'A Data String!',
    -                'mydata2.txt' => 'Another Data String!'
    -            );
    -
    -$this->zip->add_data($data);
    -
    -$this->zip->download('my_backup.zip'); -     - -

    If you would like your compressed data organized into sub-folders, include the path as part of the filename:

    - - -$name = 'personal/my_bio.txt';
    -$data = 'I was born in an elevator...';
    -
    -$this->zip->add_data($name, $data); -     - -

    The above example will place my_bio.txt inside a folder called personal.

    - - -

    $this->zip->add_dir()

    - -

    Permits you to add a directory. Usually this function is unnecessary since you can place your data into folders when -using $this->zip->add_data(), but if you would like to create an empty folder you can do so. Example:

    - -$this->zip->add_dir('myfolder'); // Creates a folder called "myfolder" - - - -

    $this->zip->read_file()

    - -

    Permits you to compress a file that already exists somewhere on your server. Supply a file path and the zip class will -read it and add it to the archive:

    - - -$path = '/path/to/photo.jpg';

    -$this->zip->read_file($path); -

    - // Download the file to your desktop. Name it "my_backup.zip"
    -$this->zip->download('my_backup.zip'); -     - -

    If you would like the Zip archive to maintain the directory structure of the file in it, pass TRUE (boolean) in the -second parameter. Example:

    - - - -$path = '/path/to/photo.jpg';

    -$this->zip->read_file($path, TRUE); -

    - // Download the file to your desktop. Name it "my_backup.zip"
    -$this->zip->download('my_backup.zip'); -     - -

    In the above example, photo.jpg will be placed inside two folders: path/to/

    - - - -

    $this->zip->read_dir()

    - -

    Permits you to compress a folder (and its contents) that already exists somewhere on your server. Supply a file path to the -directory and the zip class will recursively read it and recreate it as a Zip archive. All files contained within the -supplied path will be encoded, as will any sub-folders contained within it. Example:

    - - -$path = '/path/to/your/directory/';

    -$this->zip->read_dir($path); -

    - // Download the file to your desktop. Name it "my_backup.zip"
    -$this->zip->download('my_backup.zip'); -     - - - - -

    $this->zip->archive()

    - -

    Writes the Zip-encoded file to a directory on your server. Submit a valid server path ending in the file name. Make sure the -directory is writable (666 or 777 is usually OK). Example:

    - -$this->zip->archive('/path/to/folder/myarchive.zip'); // Creates a file named myarchive.zip - - -

    $this->zip->download()

    - -

    Causes the Zip file to be downloaded from your server. The function must be passed the name you would like the zip file called. -Example:

    - -$this->zip->download('latest_stuff.zip'); // File will be named "latest_stuff.zip" - -

    Note:  Do not display any data in the controller in which you call this function since it sends various server headers -that cause the download to happen and the file to be treated as binary.

    - - -

    $this->zip->get_zip()

    - -

    Returns the Zip-compressed file data. Generally you will not need this function unless you want to do something unique with the data. -Example:

    - - -$name = 'my_bio.txt';
    -$data = 'I was born in an elevator...';
    -
    -$this->zip->add_data($name, $data);

    - -$zip_file = $this->zip->get_zip(); -     - - -

    $this->zip->clear_data()

    - -

    The Zip class caches your zip data so that it doesn't need to recompile the Zip archive for each function you use above. -If, however, you need to create multiple Zips, each with different data, you can clear the cache between calls. Example:

    - - -$name = 'my_bio.txt';
    -$data = 'I was born in an elevator...';
    -
    -$this->zip->add_data($name, $data);
    -$zip_file = $this->zip->get_zip();
    -
    -$this->zip->clear_data(); -

    - -$name = 'photo.jpg';
    -$this->zip->read_file("/path/to/photo.jpg"); // Read the file's contents
    -

    -$this->zip->download('myphotos.zip'); -     - - - - - - - - - - - - - -
    - - - - - - + + + + + +Zip Encoding Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Zip Encoding Class

    +

    CodeIgniter's Zip Encoding Class classes permit you to create Zip archives. Archives can be downloaded to your +desktop or saved to a directory.

    + + +

    Initializing the Class

    +

    Like most other classes in CodeIgniter, the Zip class is initialized in your controller using the $this->load->library function:

    + +$this->load->library('zip'); +

    Once loaded, the Zip library object will be available using: $this->zip

    + + +

    Usage Example

    + +

    This example demonstrates how to compress a file, save it to a folder on your server, and download it to your desktop.

    + + +$name = 'mydata1.txt';
    +$data = 'A Data String!';
    +
    +$this->zip->add_data($name, $data);
    +
    +// Write the zip file to a folder on your server. Name it "my_backup.zip"
    +$this->zip->archive('/path/to/directory/my_backup.zip'); +

    + // Download the file to your desktop. Name it "my_backup.zip"
    +$this->zip->download('my_backup.zip'); +     + +

    Function Reference

    + +

    $this->zip->add_data()

    + +

    Permits you to add data to the Zip archive. The first parameter must contain the name you would like +given to the file, the second parameter must contain the file data as a string:

    + + +$name = 'my_bio.txt';
    +$data = 'I was born in an elevator...';
    +
    +$this->zip->add_data($name, $data); +     + +

    You are allowed multiple calls to this function in order to +add several files to your archive. Example:

    + + +$name = 'mydata1.txt';
    +$data = 'A Data String!';
    +$this->zip->add_data($name, $data);
    +
    +$name = 'mydata2.txt';
    +$data = 'Another Data String!';
    +$this->zip->add_data($name, $data);
    +     + +

    Or you can pass multiple files using an array:

    + + +$data = array(
    +                'mydata1.txt' => 'A Data String!',
    +                'mydata2.txt' => 'Another Data String!'
    +            );
    +
    +$this->zip->add_data($data);
    +
    +$this->zip->download('my_backup.zip'); +     + +

    If you would like your compressed data organized into sub-folders, include the path as part of the filename:

    + + +$name = 'personal/my_bio.txt';
    +$data = 'I was born in an elevator...';
    +
    +$this->zip->add_data($name, $data); +     + +

    The above example will place my_bio.txt inside a folder called personal.

    + + +

    $this->zip->add_dir()

    + +

    Permits you to add a directory. Usually this function is unnecessary since you can place your data into folders when +using $this->zip->add_data(), but if you would like to create an empty folder you can do so. Example:

    + +$this->zip->add_dir('myfolder'); // Creates a folder called "myfolder" + + + +

    $this->zip->read_file()

    + +

    Permits you to compress a file that already exists somewhere on your server. Supply a file path and the zip class will +read it and add it to the archive:

    + + +$path = '/path/to/photo.jpg';

    +$this->zip->read_file($path); +

    + // Download the file to your desktop. Name it "my_backup.zip"
    +$this->zip->download('my_backup.zip'); +     + +

    If you would like the Zip archive to maintain the directory structure of the file in it, pass TRUE (boolean) in the +second parameter. Example:

    + + + +$path = '/path/to/photo.jpg';

    +$this->zip->read_file($path, TRUE); +

    + // Download the file to your desktop. Name it "my_backup.zip"
    +$this->zip->download('my_backup.zip'); +     + +

    In the above example, photo.jpg will be placed inside two folders: path/to/

    + + + +

    $this->zip->read_dir()

    + +

    Permits you to compress a folder (and its contents) that already exists somewhere on your server. Supply a file path to the +directory and the zip class will recursively read it and recreate it as a Zip archive. All files contained within the +supplied path will be encoded, as will any sub-folders contained within it. Example:

    + + +$path = '/path/to/your/directory/';

    +$this->zip->read_dir($path); +

    + // Download the file to your desktop. Name it "my_backup.zip"
    +$this->zip->download('my_backup.zip'); +     + + + + +

    $this->zip->archive()

    + +

    Writes the Zip-encoded file to a directory on your server. Submit a valid server path ending in the file name. Make sure the +directory is writable (666 or 777 is usually OK). Example:

    + +$this->zip->archive('/path/to/folder/myarchive.zip'); // Creates a file named myarchive.zip + + +

    $this->zip->download()

    + +

    Causes the Zip file to be downloaded from your server. The function must be passed the name you would like the zip file called. +Example:

    + +$this->zip->download('latest_stuff.zip'); // File will be named "latest_stuff.zip" + +

    Note:  Do not display any data in the controller in which you call this function since it sends various server headers +that cause the download to happen and the file to be treated as binary.

    + + +

    $this->zip->get_zip()

    + +

    Returns the Zip-compressed file data. Generally you will not need this function unless you want to do something unique with the data. +Example:

    + + +$name = 'my_bio.txt';
    +$data = 'I was born in an elevator...';
    +
    +$this->zip->add_data($name, $data);

    + +$zip_file = $this->zip->get_zip(); +     + + +

    $this->zip->clear_data()

    + +

    The Zip class caches your zip data so that it doesn't need to recompile the Zip archive for each function you use above. +If, however, you need to create multiple Zips, each with different data, you can clear the cache between calls. Example:

    + + +$name = 'my_bio.txt';
    +$data = 'I was born in an elevator...';
    +
    +$this->zip->add_data($name, $data);
    +$zip_file = $this->zip->get_zip();
    +
    +$this->zip->clear_data(); +

    + +$name = 'photo.jpg';
    +$this->zip->read_file("/path/to/photo.jpg"); // Read the file's contents
    +

    +$this->zip->download('myphotos.zip'); +     + + + + + + + + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/license.html b/user_guide/license.html index 646389ea..c17e7bf6 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -1,107 +1,107 @@ - - - - - -CodeIgniter License Agreement : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - - -
    - - - - -
    - - - -
    - -

    CodeIgniter License Agreement

    - -

    Copyright (c) 2008, 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 agree to comply with the terms and conditions of this license.

    - -

    Permitted Use

    -

    You are permitted to use, copy, modify, and distribute the Software and its documentation, with or without modification, for any purpose, provided that the following conditions are met:

    - -
      -
    1. A copy of this license agreement must be included with the distribution.
      2. -
    2. Redistributions of source code must retain the above copyright notice in all source code files.
      3. -
    3. Redistributions in binary form must reproduce the above copyright notice in the documentation and/or other materials provided with the distribution.
      4. -
    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. -
    5. Products derived from the Software must include an acknowledgment that they are derived from CodeIgniter in their documentation and/or other materials provided with the distribution.
      6. -
    6. Products derived from the Software may not be called "CodeIgniter", nor may "CodeIgniter" appear in their name, without prior written permission from EllisLab, Inc.
      7. -
    - -

    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 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.

    - -

    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 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.

    - - - -
    - - - - - - + + + + + +CodeIgniter License Agreement : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + + +
    + + + + +
    + + + +
    + +

    CodeIgniter License Agreement

    + +

    Copyright (c) 2008, 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 agree to comply with the terms and conditions of this license.

    + +

    Permitted Use

    +

    You are permitted to use, copy, modify, and distribute the Software and its documentation, with or without modification, for any purpose, provided that the following conditions are met:

    + +
      +
    1. A copy of this license agreement must be included with the distribution.
      2. +
    2. Redistributions of source code must retain the above copyright notice in all source code files.
      3. +
    3. Redistributions in binary form must reproduce the above copyright notice in the documentation and/or other materials provided with the distribution.
      4. +
    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. +
    5. Products derived from the Software must include an acknowledgment that they are derived from CodeIgniter in their documentation and/or other materials provided with the distribution.
      6. +
    6. Products derived from the Software may not be called "CodeIgniter", nor may "CodeIgniter" appear in their name, without prior written permission from EllisLab, Inc.
      7. +
    + +

    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 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.

    + +

    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 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.

    + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/nav/hacks.txt b/user_guide/nav/hacks.txt index 081eecef..f29e5a77 100644 --- a/user_guide/nav/hacks.txt +++ b/user_guide/nav/hacks.txt @@ -1,9 +1,9 @@ -I did the following hack in moo.fx.js: - -At line 79 in the toggle: function() function, I added: - -document.getElementById('nav').style.display = 'block'; - - - +I did the following hack in moo.fx.js: + +At line 79 in the toggle: function() function, I added: + +document.getElementById('nav').style.display = 'block'; + + + -- Rick Ellis \ No newline at end of file diff --git a/user_guide/nav/moo.fx.js b/user_guide/nav/moo.fx.js index 953e87c6..53cfa925 100755 --- a/user_guide/nav/moo.fx.js +++ b/user_guide/nav/moo.fx.js @@ -1,119 +1,119 @@ -/* -moo.fx, simple effects library built with prototype.js (http://prototype.conio.net). -by Valerio Proietti (http://mad4milk.net) MIT-style LICENSE. -for more info (http://moofx.mad4milk.net). -10/24/2005 -v(1.0.2) -*/ - -//base -var fx = new Object(); -fx.Base = function(){}; -fx.Base.prototype = { - setOptions: function(options) { - this.options = { - duration: 500, - onComplete: '' - } - Object.extend(this.options, options || {}); - }, - - go: function() { - this.duration = this.options.duration; - this.startTime = (new Date).getTime(); - this.timer = setInterval (this.step.bind(this), 13); - }, - - step: function() { - var time = (new Date).getTime(); - var Tpos = (time - this.startTime) / (this.duration); - if (time >= this.duration+this.startTime) { - this.now = this.to; - clearInterval (this.timer); - this.timer = null; - if (this.options.onComplete) setTimeout(this.options.onComplete.bind(this), 10); - } - else { - this.now = ((-Math.cos(Tpos*Math.PI)/2) + 0.5) * (this.to-this.from) + this.from; - //this time-position, sinoidal transition thing is from script.aculo.us - } - this.increase(); - }, - - custom: function(from, to) { - if (this.timer != null) return; - this.from = from; - this.to = to; - this.go(); - }, - - hide: function() { - this.now = 0; - this.increase(); - }, - - clearTimer: function() { - clearInterval(this.timer); - this.timer = null; - } -} - -//stretchers -fx.Layout = Class.create(); -fx.Layout.prototype = Object.extend(new fx.Base(), { - initialize: function(el, options) { - this.el = $(el); - this.el.style.overflow = "hidden"; - this.el.iniWidth = this.el.offsetWidth; - this.el.iniHeight = this.el.offsetHeight; - this.setOptions(options); - } -}); - -fx.Height = Class.create(); -Object.extend(Object.extend(fx.Height.prototype, fx.Layout.prototype), { - increase: function() { - this.el.style.height = this.now + "px"; - }, - - toggle: function() { - if (this.el.offsetHeight > 0) this.custom(this.el.offsetHeight, 0); - else this.custom(0, this.el.scrollHeight); - } -}); - -fx.Width = Class.create(); -Object.extend(Object.extend(fx.Width.prototype, fx.Layout.prototype), { - increase: function() { - this.el.style.width = this.now + "px"; - }, - - toggle: function(){ - if (this.el.offsetWidth > 0) this.custom(this.el.offsetWidth, 0); - else this.custom(0, this.el.iniWidth); - } -}); - -//fader -fx.Opacity = Class.create(); -fx.Opacity.prototype = Object.extend(new fx.Base(), { - initialize: function(el, options) { - this.el = $(el); - this.now = 1; - this.increase(); - this.setOptions(options); - }, - - increase: function() { - if (this.now == 1) this.now = 0.9999; - if (this.now > 0 && this.el.style.visibility == "hidden") this.el.style.visibility = "visible"; - if (this.now == 0) this.el.style.visibility = "hidden"; - if (window.ActiveXObject) this.el.style.filter = "alpha(opacity=" + this.now*100 + ")"; - this.el.style.opacity = this.now; - }, - - toggle: function() { - if (this.now > 0) this.custom(1, 0); - else this.custom(0, 1); - } +/* +moo.fx, simple effects library built with prototype.js (http://prototype.conio.net). +by Valerio Proietti (http://mad4milk.net) MIT-style LICENSE. +for more info (http://moofx.mad4milk.net). +10/24/2005 +v(1.0.2) +*/ + +//base +var fx = new Object(); +fx.Base = function(){}; +fx.Base.prototype = { + setOptions: function(options) { + this.options = { + duration: 500, + onComplete: '' + } + Object.extend(this.options, options || {}); + }, + + go: function() { + this.duration = this.options.duration; + this.startTime = (new Date).getTime(); + this.timer = setInterval (this.step.bind(this), 13); + }, + + step: function() { + var time = (new Date).getTime(); + var Tpos = (time - this.startTime) / (this.duration); + if (time >= this.duration+this.startTime) { + this.now = this.to; + clearInterval (this.timer); + this.timer = null; + if (this.options.onComplete) setTimeout(this.options.onComplete.bind(this), 10); + } + else { + this.now = ((-Math.cos(Tpos*Math.PI)/2) + 0.5) * (this.to-this.from) + this.from; + //this time-position, sinoidal transition thing is from script.aculo.us + } + this.increase(); + }, + + custom: function(from, to) { + if (this.timer != null) return; + this.from = from; + this.to = to; + this.go(); + }, + + hide: function() { + this.now = 0; + this.increase(); + }, + + clearTimer: function() { + clearInterval(this.timer); + this.timer = null; + } +} + +//stretchers +fx.Layout = Class.create(); +fx.Layout.prototype = Object.extend(new fx.Base(), { + initialize: function(el, options) { + this.el = $(el); + this.el.style.overflow = "hidden"; + this.el.iniWidth = this.el.offsetWidth; + this.el.iniHeight = this.el.offsetHeight; + this.setOptions(options); + } +}); + +fx.Height = Class.create(); +Object.extend(Object.extend(fx.Height.prototype, fx.Layout.prototype), { + increase: function() { + this.el.style.height = this.now + "px"; + }, + + toggle: function() { + if (this.el.offsetHeight > 0) this.custom(this.el.offsetHeight, 0); + else this.custom(0, this.el.scrollHeight); + } +}); + +fx.Width = Class.create(); +Object.extend(Object.extend(fx.Width.prototype, fx.Layout.prototype), { + increase: function() { + this.el.style.width = this.now + "px"; + }, + + toggle: function(){ + if (this.el.offsetWidth > 0) this.custom(this.el.offsetWidth, 0); + else this.custom(0, this.el.iniWidth); + } +}); + +//fader +fx.Opacity = Class.create(); +fx.Opacity.prototype = Object.extend(new fx.Base(), { + initialize: function(el, options) { + this.el = $(el); + this.now = 1; + this.increase(); + this.setOptions(options); + }, + + increase: function() { + if (this.now == 1) this.now = 0.9999; + if (this.now > 0 && this.el.style.visibility == "hidden") this.el.style.visibility = "visible"; + if (this.now == 0) this.el.style.visibility = "hidden"; + if (window.ActiveXObject) this.el.style.filter = "alpha(opacity=" + this.now*100 + ")"; + this.el.style.opacity = this.now; + }, + + toggle: function() { + if (this.now > 0) this.custom(1, 0); + else this.custom(0, 1); + } }); \ No newline at end of file diff --git a/user_guide/nav/moo.fx.pack.js b/user_guide/nav/moo.fx.pack.js index b5c360c3..574f27cf 100755 --- a/user_guide/nav/moo.fx.pack.js +++ b/user_guide/nav/moo.fx.pack.js @@ -1,241 +1,241 @@ -/* -moo.fx pack, effects extensions for moo.fx. -by Valerio Proietti (http://mad4milk.net) MIT-style LICENSE -for more info visit (http://moofx.mad4milk.net). -Wednesday, November 16, 2005 -v1.0.4 -*/ - -//text size modify, now works with pixels too. -fx.Text = Class.create(); -fx.Text.prototype = Object.extend(new fx.Base(), { - initialize: function(el, options) { - this.el = $(el); - this.setOptions(options); - if (!this.options.unit) this.options.unit = "em"; - }, - - increase: function() { - this.el.style.fontSize = this.now + this.options.unit; - } -}); - -//composition effect, calls Width and Height alltogheter -fx.Resize = Class.create(); -fx.Resize.prototype = { - initialize: function(el, options) { - this.h = new fx.Height(el, options); - if (options) options.onComplete = null; - this.w = new fx.Width(el, options); - this.el = $(el); - }, - - toggle: function(){ - this.h.toggle(); - this.w.toggle(); - }, - - modify: function(hto, wto) { - this.h.custom(this.el.offsetHeight, this.el.offsetHeight + hto); - this.w.custom(this.el.offsetWidth, this.el.offsetWidth + wto); - }, - - custom: function(hto, wto) { - this.h.custom(this.el.offsetHeight, hto); - this.w.custom(this.el.offsetWidth, wto); - }, - - hide: function(){ - this.h.hide(); - this.w.hide(); - } -} - -//composition effect, calls Opacity and (Width and/or Height) alltogheter -fx.FadeSize = Class.create(); -fx.FadeSize.prototype = { - initialize: function(el, options) { - this.el = $(el); - this.el.o = new fx.Opacity(el, options); - if (options) options.onComplete = null; - this.el.h = new fx.Height(el, options); - this.el.w = new fx.Width(el, options); - }, - - toggle: function() { - this.el.o.toggle(); - for (var i = 0; i < arguments.length; i++) { - if (arguments[i] == 'height') this.el.h.toggle(); - if (arguments[i] == 'width') this.el.w.toggle(); - } - }, - - hide: function(){ - this.el.o.hide(); - for (var i = 0; i < arguments.length; i++) { - if (arguments[i] == 'height') this.el.h.hide(); - if (arguments[i] == 'width') this.el.w.hide(); - } - } -} - -//intended to work with arrays. -var Multi = new Object(); -Multi = function(){}; -Multi.prototype = { - initialize: function(elements, options){ - this.options = options; - this.el = this.getElementsFromArray(elements); - for (i=0;i 0 && this.el[i] != el && this.el[i].h.timer == null && el.h.timer == null){ - this.el[i].fs.toggle(mode); - setTimeout(function(){el.fs.toggle(mode);}.bind(el), delay); - } - - } - }, - - hide: function(el, mode){ - el.fs.hide(mode); - } -}); - -var Remember = new Object(); -Remember = function(){}; -Remember.prototype = { - initialize: function(el, options){ - this.el = $(el); - this.days = 365; - this.options = options; - this.effect(); - var cookie = this.readCookie(); - if (cookie) { - this.fx.now = cookie; - this.fx.increase(); - } - }, - - //cookie functions based on code by Peter-Paul Koch - setCookie: function(value) { - var date = new Date(); - date.setTime(date.getTime()+(this.days*24*60*60*1000)); - var expires = "; expires="+date.toGMTString(); - document.cookie = this.el+this.el.id+this.prefix+"="+value+expires+"; path=/"; - }, - - readCookie: function() { - var nameEQ = this.el+this.el.id+this.prefix + "="; - var ca = document.cookie.split(';'); - for(var i=0;i < ca.length;i++) { - var c = ca[i]; - while (c.charAt(0)==' ') c = c.substring(1,c.length); - if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); - } - return false; - }, - - custom: function(from, to){ - if (this.fx.now != to) { - this.setCookie(to); - this.fx.custom(from, to); - } - } -} - -fx.RememberHeight = Class.create(); -fx.RememberHeight.prototype = Object.extend(new Remember(), { - effect: function(){ - this.fx = new fx.Height(this.el, this.options); - this.prefix = 'height'; - }, - - toggle: function(){ - if (this.el.offsetHeight == 0) this.setCookie(this.el.scrollHeight); - else this.setCookie(0); - this.fx.toggle(); - }, - - resize: function(to){ - this.setCookie(this.el.offsetHeight+to); - this.fx.custom(this.el.offsetHeight,this.el.offsetHeight+to); - }, - - hide: function(){ - if (!this.readCookie()) { - this.fx.hide(); - } - } -}); - -fx.RememberText = Class.create(); -fx.RememberText.prototype = Object.extend(new Remember(), { - effect: function(){ - this.fx = new fx.Text(this.el, this.options); - this.prefix = 'text'; - } -}); - - -//use to attach effects without using js code, just classnames and rel attributes. -ParseClassNames = Class.create(); -ParseClassNames.prototype = { - initialize: function(options){ - var babies = document.getElementsByTagName('*') || document.all; - for (var i = 0; i < babies.length; i++) { - var el = babies[i]; - //attach the effect, from the classNames; - var effects = this.getEffects(el); - for (var j = 0; j < effects.length; j++) { - if (j == 1 && options) options.onComplete = null; - el[effects[j]+"fx"] = new fx[effects[j]](el, options); - } - //execute methods, from rel - if (el.rel) { - el.crel = el.rel.split(' '); - if (el.crel[0].indexOf("fx_") > -1) { - var event = el.crel[0].replace('fx_', ''); - var tocompute = this.getEffects($(el.crel[1])); - el["on"+event] = function(){ - for (var f = 0; f < tocompute.length; f++) { - $(this.crel[1])[tocompute[f]+"fx"][this.crel[2] || "toggle"](this.crel[3] || null, this.crel[4] || null); - } - } - } - } - } - }, - - getEffects: function(el){ - var effects = new Array(); - var css = el.className.split(' '); - for (var i = 0; i < css.length; i++) { - if (css[i].indexOf('fx_') > -1) { - var effect = css[i].replace('fx_', ''); - effects.push(effect); - } - } - return effects; - } +/* +moo.fx pack, effects extensions for moo.fx. +by Valerio Proietti (http://mad4milk.net) MIT-style LICENSE +for more info visit (http://moofx.mad4milk.net). +Wednesday, November 16, 2005 +v1.0.4 +*/ + +//text size modify, now works with pixels too. +fx.Text = Class.create(); +fx.Text.prototype = Object.extend(new fx.Base(), { + initialize: function(el, options) { + this.el = $(el); + this.setOptions(options); + if (!this.options.unit) this.options.unit = "em"; + }, + + increase: function() { + this.el.style.fontSize = this.now + this.options.unit; + } +}); + +//composition effect, calls Width and Height alltogheter +fx.Resize = Class.create(); +fx.Resize.prototype = { + initialize: function(el, options) { + this.h = new fx.Height(el, options); + if (options) options.onComplete = null; + this.w = new fx.Width(el, options); + this.el = $(el); + }, + + toggle: function(){ + this.h.toggle(); + this.w.toggle(); + }, + + modify: function(hto, wto) { + this.h.custom(this.el.offsetHeight, this.el.offsetHeight + hto); + this.w.custom(this.el.offsetWidth, this.el.offsetWidth + wto); + }, + + custom: function(hto, wto) { + this.h.custom(this.el.offsetHeight, hto); + this.w.custom(this.el.offsetWidth, wto); + }, + + hide: function(){ + this.h.hide(); + this.w.hide(); + } +} + +//composition effect, calls Opacity and (Width and/or Height) alltogheter +fx.FadeSize = Class.create(); +fx.FadeSize.prototype = { + initialize: function(el, options) { + this.el = $(el); + this.el.o = new fx.Opacity(el, options); + if (options) options.onComplete = null; + this.el.h = new fx.Height(el, options); + this.el.w = new fx.Width(el, options); + }, + + toggle: function() { + this.el.o.toggle(); + for (var i = 0; i < arguments.length; i++) { + if (arguments[i] == 'height') this.el.h.toggle(); + if (arguments[i] == 'width') this.el.w.toggle(); + } + }, + + hide: function(){ + this.el.o.hide(); + for (var i = 0; i < arguments.length; i++) { + if (arguments[i] == 'height') this.el.h.hide(); + if (arguments[i] == 'width') this.el.w.hide(); + } + } +} + +//intended to work with arrays. +var Multi = new Object(); +Multi = function(){}; +Multi.prototype = { + initialize: function(elements, options){ + this.options = options; + this.el = this.getElementsFromArray(elements); + for (i=0;i 0 && this.el[i] != el && this.el[i].h.timer == null && el.h.timer == null){ + this.el[i].fs.toggle(mode); + setTimeout(function(){el.fs.toggle(mode);}.bind(el), delay); + } + + } + }, + + hide: function(el, mode){ + el.fs.hide(mode); + } +}); + +var Remember = new Object(); +Remember = function(){}; +Remember.prototype = { + initialize: function(el, options){ + this.el = $(el); + this.days = 365; + this.options = options; + this.effect(); + var cookie = this.readCookie(); + if (cookie) { + this.fx.now = cookie; + this.fx.increase(); + } + }, + + //cookie functions based on code by Peter-Paul Koch + setCookie: function(value) { + var date = new Date(); + date.setTime(date.getTime()+(this.days*24*60*60*1000)); + var expires = "; expires="+date.toGMTString(); + document.cookie = this.el+this.el.id+this.prefix+"="+value+expires+"; path=/"; + }, + + readCookie: function() { + var nameEQ = this.el+this.el.id+this.prefix + "="; + var ca = document.cookie.split(';'); + for(var i=0;i < ca.length;i++) { + var c = ca[i]; + while (c.charAt(0)==' ') c = c.substring(1,c.length); + if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); + } + return false; + }, + + custom: function(from, to){ + if (this.fx.now != to) { + this.setCookie(to); + this.fx.custom(from, to); + } + } +} + +fx.RememberHeight = Class.create(); +fx.RememberHeight.prototype = Object.extend(new Remember(), { + effect: function(){ + this.fx = new fx.Height(this.el, this.options); + this.prefix = 'height'; + }, + + toggle: function(){ + if (this.el.offsetHeight == 0) this.setCookie(this.el.scrollHeight); + else this.setCookie(0); + this.fx.toggle(); + }, + + resize: function(to){ + this.setCookie(this.el.offsetHeight+to); + this.fx.custom(this.el.offsetHeight,this.el.offsetHeight+to); + }, + + hide: function(){ + if (!this.readCookie()) { + this.fx.hide(); + } + } +}); + +fx.RememberText = Class.create(); +fx.RememberText.prototype = Object.extend(new Remember(), { + effect: function(){ + this.fx = new fx.Text(this.el, this.options); + this.prefix = 'text'; + } +}); + + +//use to attach effects without using js code, just classnames and rel attributes. +ParseClassNames = Class.create(); +ParseClassNames.prototype = { + initialize: function(options){ + var babies = document.getElementsByTagName('*') || document.all; + for (var i = 0; i < babies.length; i++) { + var el = babies[i]; + //attach the effect, from the classNames; + var effects = this.getEffects(el); + for (var j = 0; j < effects.length; j++) { + if (j == 1 && options) options.onComplete = null; + el[effects[j]+"fx"] = new fx[effects[j]](el, options); + } + //execute methods, from rel + if (el.rel) { + el.crel = el.rel.split(' '); + if (el.crel[0].indexOf("fx_") > -1) { + var event = el.crel[0].replace('fx_', ''); + var tocompute = this.getEffects($(el.crel[1])); + el["on"+event] = function(){ + for (var f = 0; f < tocompute.length; f++) { + $(this.crel[1])[tocompute[f]+"fx"][this.crel[2] || "toggle"](this.crel[3] || null, this.crel[4] || null); + } + } + } + } + } + }, + + getEffects: function(el){ + var effects = new Array(); + var css = el.className.split(' '); + for (var i = 0; i < css.length; i++) { + if (css[i].indexOf('fx_') > -1) { + var effect = css[i].replace('fx_', ''); + effects.push(effect); + } + } + return effects; + } } \ No newline at end of file diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index f8320ddd..d9131aab 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -1,137 +1,137 @@ -function create_menu(basepath) -{ - var base = (basepath == 'null') ? '' : basepath; - - document.write( - '' + - '
    ' + - - '' + - - '

    Basic Info

    ' + - '' + - - '

    Installation

    ' + - '' + - - '

    Introduction

    ' + - '' + - - - '    		' + - - '

    General Topics

    ' + - '' + - - '    		' + - - - '

    Class Reference

    ' + - '' + - - '    		' + - - '

    Helper Reference

    ' + - '' + - - - '

    Additional Resources

    ' + - '' + - - '
    '); +function create_menu(basepath) +{ + var base = (basepath == 'null') ? '' : basepath; + + document.write( + '' + + '
    ' + + + '' + + + '

    Basic Info

    ' + + '' + + + '

    Installation

    ' + + '' + + + '

    Introduction

    ' + + '' + + + + '    		' + + + '

    General Topics

    ' + + '' + + + '    		' + + + + '

    Class Reference

    ' + + '' + + + '    		' + + + '

    Helper Reference

    ' + + '' + + + + '

    Additional Resources

    ' + + '' + + + '
    '); } \ No newline at end of file diff --git a/user_guide/nav/prototype.lite.js b/user_guide/nav/prototype.lite.js index d294fd7f..e6c36227 100755 --- a/user_guide/nav/prototype.lite.js +++ b/user_guide/nav/prototype.lite.js @@ -1,127 +1,127 @@ -/* Prototype JavaScript framework - * (c) 2005 Sam Stephenson - * - * Prototype is freely distributable under the terms of an MIT-style license. - * - * For details, see the Prototype web site: http://prototype.conio.net/ - * -/*--------------------------------------------------------------------------*/ - - -//note: this is a stripped down version of prototype, to be used with moo.fx by mad4milk (http://moofx.mad4milk.net). - -var Class = { - create: function() { - return function() { - this.initialize.apply(this, arguments); - } - } -} - -Object.extend = function(destination, source) { - for (property in source) { - destination[property] = source[property]; - } - return destination; -} - -Function.prototype.bind = function(object) { - var __method = this; - return function() { - return __method.apply(object, arguments); - } -} - -function $() { - var elements = new Array(); - - for (var i = 0; i < arguments.length; i++) { - var element = arguments[i]; - if (typeof element == 'string') - element = document.getElementById(element); - - if (arguments.length == 1) - return element; - - elements.push(element); - } - - return elements; -} - -//------------------------- - -document.getElementsByClassName = function(className) { - var children = document.getElementsByTagName('*') || document.all; - var elements = new Array(); - - for (var i = 0; i < children.length; i++) { - var child = children[i]; - var classNames = child.className.split(' '); - for (var j = 0; j < classNames.length; j++) { - if (classNames[j] == className) { - elements.push(child); - break; - } - } - } - - return elements; -} - -//------------------------- - -if (!window.Element) { - var Element = new Object(); -} - -Object.extend(Element, { - remove: function(element) { - element = $(element); - element.parentNode.removeChild(element); - }, - - hasClassName: function(element, className) { - element = $(element); - if (!element) - return; - var a = element.className.split(' '); - for (var i = 0; i < a.length; i++) { - if (a[i] == className) - return true; - } - return false; - }, - - addClassName: function(element, className) { - element = $(element); - Element.removeClassName(element, className); - element.className += ' ' + className; - }, - - removeClassName: function(element, className) { - element = $(element); - if (!element) - return; - var newClassName = ''; - var a = element.className.split(' '); - for (var i = 0; i < a.length; i++) { - if (a[i] != className) { - if (i > 0) - newClassName += ' '; - newClassName += a[i]; - } - } - element.className = newClassName; - }, - - // removes whitespace-only text node children - cleanWhitespace: function(element) { - element = $(element); - for (var i = 0; i < element.childNodes.length; i++) { - var node = element.childNodes[i]; - if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) - Element.remove(node); - } - } +/* Prototype JavaScript framework + * (c) 2005 Sam Stephenson + * + * Prototype is freely distributable under the terms of an MIT-style license. + * + * For details, see the Prototype web site: http://prototype.conio.net/ + * +/*--------------------------------------------------------------------------*/ + + +//note: this is a stripped down version of prototype, to be used with moo.fx by mad4milk (http://moofx.mad4milk.net). + +var Class = { + create: function() { + return function() { + this.initialize.apply(this, arguments); + } + } +} + +Object.extend = function(destination, source) { + for (property in source) { + destination[property] = source[property]; + } + return destination; +} + +Function.prototype.bind = function(object) { + var __method = this; + return function() { + return __method.apply(object, arguments); + } +} + +function $() { + var elements = new Array(); + + for (var i = 0; i < arguments.length; i++) { + var element = arguments[i]; + if (typeof element == 'string') + element = document.getElementById(element); + + if (arguments.length == 1) + return element; + + elements.push(element); + } + + return elements; +} + +//------------------------- + +document.getElementsByClassName = function(className) { + var children = document.getElementsByTagName('*') || document.all; + var elements = new Array(); + + for (var i = 0; i < children.length; i++) { + var child = children[i]; + var classNames = child.className.split(' '); + for (var j = 0; j < classNames.length; j++) { + if (classNames[j] == className) { + elements.push(child); + break; + } + } + } + + return elements; +} + +//------------------------- + +if (!window.Element) { + var Element = new Object(); +} + +Object.extend(Element, { + remove: function(element) { + element = $(element); + element.parentNode.removeChild(element); + }, + + hasClassName: function(element, className) { + element = $(element); + if (!element) + return; + var a = element.className.split(' '); + for (var i = 0; i < a.length; i++) { + if (a[i] == className) + return true; + } + return false; + }, + + addClassName: function(element, className) { + element = $(element); + Element.removeClassName(element, className); + element.className += ' ' + className; + }, + + removeClassName: function(element, className) { + element = $(element); + if (!element) + return; + var newClassName = ''; + var a = element.className.split(' '); + for (var i = 0; i < a.length; i++) { + if (a[i] != className) { + if (i > 0) + newClassName += ' '; + newClassName += a[i]; + } + } + element.className = newClassName; + }, + + // removes whitespace-only text node children + cleanWhitespace: function(element) { + element = $(element); + for (var i = 0; i < element.childNodes.length; i++) { + var node = element.childNodes[i]; + if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) + Element.remove(node); + } + } }); \ No newline at end of file diff --git a/user_guide/nav/user_guide_menu.js b/user_guide/nav/user_guide_menu.js index f24f5d4e..ce5d0776 100644 --- a/user_guide/nav/user_guide_menu.js +++ b/user_guide/nav/user_guide_menu.js @@ -1,4 +1,4 @@ -window.onload = function() { - myHeight = new fx.Height('nav', {duration: 400}); - myHeight.hide(); +window.onload = function() { + myHeight = new fx.Height('nav', {duration: 400}); + myHeight.hide(); } \ No newline at end of file diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 8850b63e..cdc6ac20 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -1,95 +1,95 @@ - - - - - -Application Flow Chart : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Application Flow Chart

    - -

    The following graphic illustrates how data flows throughout the system:

    - -
    CodeIgniter application flow
    - - -
      -
    1. The index.php serves as the front controller, initializing the base resources needed to run CodeIgniter.
      2. -
    2. The Router examines the HTTP request to determine what should be done with it.
      3. -
    3. If a cache file exists, it is sent directly to the browser, bypassing the normal system execution.
      4. -
    4. Security. Before the application controller is loaded, the HTTP request and any user submitted data is filtered for security.
      5. -
    5. The Controller loads the model, core libraries, plugins, helpers, and any other resources needed to process the specific request.
      6. -
    6. The finalized View is rendered then sent to the web browser to be seen. If caching is enabled, the view is cached first so -that on subsequent requests it can be served.
      7. -
    - - - - -
    - - - - - - + + + + + +Application Flow Chart : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Application Flow Chart

    + +

    The following graphic illustrates how data flows throughout the system:

    + +
    CodeIgniter application flow
    + + +
      +
    1. The index.php serves as the front controller, initializing the base resources needed to run CodeIgniter.
      2. +
    2. The Router examines the HTTP request to determine what should be done with it.
      3. +
    3. If a cache file exists, it is sent directly to the browser, bypassing the normal system execution.
      4. +
    4. Security. Before the application controller is loaded, the HTTP request and any user submitted data is filtered for security.
      5. +
    5. The Controller loads the model, core libraries, plugins, helpers, and any other resources needed to process the specific request.
      6. +
    6. The finalized View is rendered then sent to the web browser to be seen. If caching is enabled, the view is cached first so +that on subsequent requests it can be served.
      7. +
    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 5688f907..a9a45833 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -1,172 +1,172 @@ - - - - - -CodeIgniter at a Glance : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    CodeIgniter at a Glance

    - - -

    CodeIgniter is an Application Framework

    - -

    CodeIgniter is a toolkit for people who build web application using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code -from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and -logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by -minimizing the amount of code needed for a given task.

    - -

    CodeIgniter is Free

    -

    CodeIgniter is licensed under an Apache/BSD-style open source license so you can use it however you please. -For more information please read the license agreement.

    - - -

    CodeIgniter Runs on PHP 4

    -

    CodeIgniter is written to be compatible with PHP 4. Although we would have loved to take advantage of the better object handling -in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance), -at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our -potential audience. Major OS vendors like RedHat are moving slowly to support PHP 5, and they are unlikely to do so in the short term, so -we felt that it did not serve the best interests of the PHP community to write CodeIgniter in PHP 5.

    - -

    Note: CodeIgniter will run on PHP 5. It simply does not take advantage of any native features that are only available in that version.

    - -

    CodeIgniter is Light Weight

    -

    Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. -Additional libraries are loaded dynamically upon request, based on your needs for a given process, so the base system -is very lean and quite fast. -

    - -

    CodeIgniter is Fast

    -

    Really fast. We challenge you to find a framework that has better performance than CodeIgniter.

    - - -

    CodeIgniter Uses M-V-C

    -

    CodeIgniter uses the Model-View-Controller approach, which allows great separation between logic and presentation. -This is particularly good for projects in which designers are working with your template files, as the code these file contain will be minimized. We describe MVC in more detail on its own page.

    - -

    CodeIgniter Generates Clean URLs

    -

    The URLs generated by CodeIgniter are clean and search-engine friendly. Rather than using the standard "query string" -approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a segment-based approach:

    - -example.com/news/article/345 - -

    Note: By default the index.php file is included in the URL but it can be removed using a simple .htaccess file.

    - -

    CodeIgniter Packs a Punch

    -

    CodeIgniter comes with full-range of libraries that enable the most commonly needed web development tasks, -like accessing a database, sending email, validating form data, maintaining sessions, manipulating images, working with XML-RPC data and -much more.

    - -

    CodeIgniter is Extensible

    -

    The system can be easily extended through the use of plugins and helper libraries, or through class extensions or system hooks.

    - - -

    CodeIgniter Does Not Require a Template Engine

    -

    Although CodeIgniter does come with a simple template parser that can be optionally used, it does not force you to use one. - -Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template -engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:

    - -<ul>
    -
    -<?php foreach ($addressbook as $name):?>
    -
    -<li><?=$name?></li>
    -
    -<?php endforeach; ?>
    -
    -</ul>     - -

    Contrast this with the pseudo-code used by a template engine:

    - -<ul>
    -
    -{foreach from=$addressbook item="name"}
    -
    -<li>{$name}</li>
    -
    -{/foreach}
    -
    -</ul>     - -

    Yes, the template engine example is a bit cleaner, but it comes at the price of performance, as the pseudo-code must be converted -back into PHP to run. Since one of our goals is maximum performance, we opted to not require the use of a template engine.

    - - -

    CodeIgniter is Thoroughly Documented

    -

    Programmers love to code and hate to write documentation. We're no different, of course, but -since documentation is as important as the code itself, -we are committed to doing it. Our source code is extremely clean and well commented as well.

    - - -

    CodeIgniter has a Friendly Community of Users

    - -

    Our growing community of users can be seen actively participating in our Community Forums.

    - - -
    - - - - - - + + + + + +CodeIgniter at a Glance : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    CodeIgniter at a Glance

    + + +

    CodeIgniter is an Application Framework

    + +

    CodeIgniter is a toolkit for people who build web application using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code +from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and +logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by +minimizing the amount of code needed for a given task.

    + +

    CodeIgniter is Free

    +

    CodeIgniter is licensed under an Apache/BSD-style open source license so you can use it however you please. +For more information please read the license agreement.

    + + +

    CodeIgniter Runs on PHP 4

    +

    CodeIgniter is written to be compatible with PHP 4. Although we would have loved to take advantage of the better object handling +in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance), +at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our +potential audience. Major OS vendors like RedHat are moving slowly to support PHP 5, and they are unlikely to do so in the short term, so +we felt that it did not serve the best interests of the PHP community to write CodeIgniter in PHP 5.

    + +

    Note: CodeIgniter will run on PHP 5. It simply does not take advantage of any native features that are only available in that version.

    + +

    CodeIgniter is Light Weight

    +

    Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. +Additional libraries are loaded dynamically upon request, based on your needs for a given process, so the base system +is very lean and quite fast. +

    + +

    CodeIgniter is Fast

    +

    Really fast. We challenge you to find a framework that has better performance than CodeIgniter.

    + + +

    CodeIgniter Uses M-V-C

    +

    CodeIgniter uses the Model-View-Controller approach, which allows great separation between logic and presentation. +This is particularly good for projects in which designers are working with your template files, as the code these file contain will be minimized. We describe MVC in more detail on its own page.

    + +

    CodeIgniter Generates Clean URLs

    +

    The URLs generated by CodeIgniter are clean and search-engine friendly. Rather than using the standard "query string" +approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a segment-based approach:

    + +example.com/news/article/345 + +

    Note: By default the index.php file is included in the URL but it can be removed using a simple .htaccess file.

    + +

    CodeIgniter Packs a Punch

    +

    CodeIgniter comes with full-range of libraries that enable the most commonly needed web development tasks, +like accessing a database, sending email, validating form data, maintaining sessions, manipulating images, working with XML-RPC data and +much more.

    + +

    CodeIgniter is Extensible

    +

    The system can be easily extended through the use of plugins and helper libraries, or through class extensions or system hooks.

    + + +

    CodeIgniter Does Not Require a Template Engine

    +

    Although CodeIgniter does come with a simple template parser that can be optionally used, it does not force you to use one. + +Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template +engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:

    + +<ul>
    +
    +<?php foreach ($addressbook as $name):?>
    +
    +<li><?=$name?></li>
    +
    +<?php endforeach; ?>
    +
    +</ul>     + +

    Contrast this with the pseudo-code used by a template engine:

    + +<ul>
    +
    +{foreach from=$addressbook item="name"}
    +
    +<li>{$name}</li>
    +
    +{/foreach}
    +
    +</ul>     + +

    Yes, the template engine example is a bit cleaner, but it comes at the price of performance, as the pseudo-code must be converted +back into PHP to run. Since one of our goals is maximum performance, we opted to not require the use of a template engine.

    + + +

    CodeIgniter is Thoroughly Documented

    +

    Programmers love to code and hate to write documentation. We're no different, of course, but +since documentation is as important as the code itself, +we are committed to doing it. Our source code is extremely clean and well commented as well.

    + + +

    CodeIgniter has a Friendly Community of Users

    + +

    Our growing community of users can be seen actively participating in our Community Forums.

    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 31f0c305..9710ca90 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -1,120 +1,120 @@ - - - - - -CodeIgniter Features : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    CodeIgniter Features

    - -

    Features in and of themselves are a very poor way to judge an application since they tell you nothing -about the user experience, or how intuitively or intelligently it is designed. Features -don't reveal anything about the quality of the code, or the performance, or the attention to detail, or security practices. -The only way to really judge an app is to try it and get to know the code. Installing -CodeIgniter is child's play so we encourage you to do just that. In the mean time here's a list of CodeIgniter's main features.

    - -
      -
    • Model-View-Controller Based System
      • -
    • PHP 4 Compatible
      • -
    • Extremely Light Weight
      • -
    • Full Featured database classes with support for several platforms.
      • -
    • Active Record Database Support
      • -
    • Form and Data Validation
      • -
    • Security and XSS Filtering
      • -
    • Session Management
      • -
    • Email Sending Class. Supports Attachments, HTML/Text email, multiple protocols (sendmail, SMTP, and Mail) and more.
      • -
    • Image Manipulation Library (cropping, resizing, rotating, etc.). Supports GD, ImageMagick, and NetPBM
      • -
    • File Uploading Class
      • -
    • FTP Class
      • -
    • Localization
      • -
    • Pagination
      • -
    • Data Encryption
      • -
    • Benchmarking
      • -
    • Full Page Caching
      • -
    • Error Logging
      • -
    • Application Profiling
      • -
    • Scaffolding
      • -
    • Calendaring Class
      • -
    • User Agent Class
      • -
    • Zip Encoding Class
      • -
    • Template Engine Class
      • -
    • Trackback Class
      • -
    • XML-RPC Library
      • -
    • Unit Testing Class
      • -
    • Search-engine Friendly URLs
      • -
    • Flexible URI Routing
      • -
    • Support for Hooks, Class Extensions, and Plugins
      • -
    • Large library of "helper" functions
      • -
    - - - - -
    - - - - - - + + + + + +CodeIgniter Features : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    CodeIgniter Features

    + +

    Features in and of themselves are a very poor way to judge an application since they tell you nothing +about the user experience, or how intuitively or intelligently it is designed. Features +don't reveal anything about the quality of the code, or the performance, or the attention to detail, or security practices. +The only way to really judge an app is to try it and get to know the code. Installing +CodeIgniter is child's play so we encourage you to do just that. In the mean time here's a list of CodeIgniter's main features.

    + +
      +
    • Model-View-Controller Based System
      • +
    • PHP 4 Compatible
      • +
    • Extremely Light Weight
      • +
    • Full Featured database classes with support for several platforms.
      • +
    • Active Record Database Support
      • +
    • Form and Data Validation
      • +
    • Security and XSS Filtering
      • +
    • Session Management
      • +
    • Email Sending Class. Supports Attachments, HTML/Text email, multiple protocols (sendmail, SMTP, and Mail) and more.
      • +
    • Image Manipulation Library (cropping, resizing, rotating, etc.). Supports GD, ImageMagick, and NetPBM
      • +
    • File Uploading Class
      • +
    • FTP Class
      • +
    • Localization
      • +
    • Pagination
      • +
    • Data Encryption
      • +
    • Benchmarking
      • +
    • Full Page Caching
      • +
    • Error Logging
      • +
    • Application Profiling
      • +
    • Scaffolding
      • +
    • Calendaring Class
      • +
    • User Agent Class
      • +
    • Zip Encoding Class
      • +
    • Template Engine Class
      • +
    • Trackback Class
      • +
    • XML-RPC Library
      • +
    • Unit Testing Class
      • +
    • Search-engine Friendly URLs
      • +
    • Flexible URI Routing
      • +
    • Support for Hooks, Class Extensions, and Plugins
      • +
    • Large library of "helper" functions
      • +
    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index 2061467b..7439bea5 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -1,92 +1,92 @@ - - - - - -Getting Started With CodeIgniter : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    Getting Started With CodeIgniter

    - -

    Any software application requires some effort to learn. We've done our best to minimize the learning -curve while making the process as enjoyable as possible. -

    - -

    The first step is to install CodeIgniter, then read -all the topics in the Introduction section of the Table of Contents.

    - -

    Next, read each of the General Topics pages in order. -Each topic builds on the previous one, and includes code examples that you are encouraged to try.

    - -

    Once you understand the basics you'll be ready to explore the Class Reference and -Helper Reference pages to learn to utilize the native libraries and helper files.

    - -

    Feel free to take advantage of our Community Forums -if you have questions or problems, and -our Wiki to see code examples posted by other users.

    - - -
    - - - - - - + + + + + +Getting Started With CodeIgniter : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Getting Started With CodeIgniter

    + +

    Any software application requires some effort to learn. We've done our best to minimize the learning +curve while making the process as enjoyable as possible. +

    + +

    The first step is to install CodeIgniter, then read +all the topics in the Introduction section of the Table of Contents.

    + +

    Next, read each of the General Topics pages in order. +Each topic builds on the previous one, and includes code examples that you are encouraged to try.

    + +

    Once you understand the basics you'll be ready to explore the Class Reference and +Helper Reference pages to learn to utilize the native libraries and helper files.

    + +

    Feel free to take advantage of our Community Forums +if you have questions or problems, and +our Wiki to see code examples posted by other users.

    + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 67c6cdc6..ded76204 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -1,98 +1,98 @@ - - - - - -Design and Architectural Goals : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - - -

    Design and Architectural Goals

    - -

    Our goal for CodeIgniter is maximum performance, capability, and flexibility in the smallest, lightest possible package.

    - -

    To meet this goal we are committed to benchmarking, re-factoring, and simplifying at every step of the development process, -rejecting anything that doesn't further the stated objective.

    - -

    From a technical and architectural standpoint, CodeIgniter was created with the following objectives:

    - -
      -
    • Dynamic Instantiation. In CodeIgniter, components are loaded and routines executed only when requested, rather than globally. No assumptions are made by the system regarding what may be needed beyond the minimal core resources, so the system is very light-weight by default. The events, as triggered by the HTTP request, and the controllers and views you design will determine what is invoked.
      • -
    • Loose Coupling. Coupling is the degree to which components of a system rely on each other. The less components depend on each other the more reusable and flexible the system becomes. Our goal was a very loosely coupled system.
      • -
    • Component Singularity. Singularity is the degree to which components have a narrowly focused purpose. In CodeIgniter, each class and its functions are highly autonomous in order to allow maximum usefulness.
      • -
    - -

    CodeIgniter is a dynamically instantiated, loosely coupled system with high component singularity. It strives for simplicity, flexibility, and high performance in a small footprint package.

    - - - - - - -
    - - - - - - + + + + + +Design and Architectural Goals : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + + +

    Design and Architectural Goals

    + +

    Our goal for CodeIgniter is maximum performance, capability, and flexibility in the smallest, lightest possible package.

    + +

    To meet this goal we are committed to benchmarking, re-factoring, and simplifying at every step of the development process, +rejecting anything that doesn't further the stated objective.

    + +

    From a technical and architectural standpoint, CodeIgniter was created with the following objectives:

    + +
      +
    • Dynamic Instantiation. In CodeIgniter, components are loaded and routines executed only when requested, rather than globally. No assumptions are made by the system regarding what may be needed beyond the minimal core resources, so the system is very light-weight by default. The events, as triggered by the HTTP request, and the controllers and views you design will determine what is invoked.
      • +
    • Loose Coupling. Coupling is the degree to which components of a system rely on each other. The less components depend on each other the more reusable and flexible the system becomes. Our goal was a very loosely coupled system.
      • +
    • Component Singularity. Singularity is the degree to which components have a narrowly focused purpose. In CodeIgniter, each class and its functions are highly autonomous in order to allow maximum usefulness.
      • +
    + +

    CodeIgniter is a dynamically instantiated, loosely coupled system with high component singularity. It strives for simplicity, flexibility, and high performance in a small footprint package.

    + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 9bb1e6b7..bf977a25 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -1,84 +1,84 @@ - - - - - -CodeIgniter Overview : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    CodeIgniter Overview

    - -

    The following pages describe the broad concepts behind CodeIgniter:

    - - - - - - -
    - - - - - - + + + + + +CodeIgniter Overview : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    CodeIgniter Overview

    + +

    The following pages describe the broad concepts behind CodeIgniter:

    + + + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 9a6267f9..964ca588 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -1,100 +1,100 @@ - - - - - -Model-View-Controller : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - -
    - - -
    - - - -
    - - -

    Model-View-Controller

    - -

    CodeIgniter is based on the Model-View-Controller development pattern. - -MVC is a software approach that separates application logic from presentation. In practice, it permits your web pages to contain minimal scripting since the presentation is separate from the PHP scripting.

    - -
      -
    • The Model represents your data structures. Typically your model classes will contain functions that help you -retrieve, insert, and update information in your database.
      • -
    • The View is the information that is being presented to a user. A View will normally be a web page, but -in CodeIgniter, a view can also be a page fragment like a header or footer. It can also be an RSS page, or any other type of "page".
      • -
    • The Controller serves as an intermediary between the Model, the View, -and any other resources needed to process the HTTP request and generate a web page.
      • - -
    - -

    CodeIgniter has a fairly loose approach to MVC since Models are not required. -If you don't need the added separation, or find that maintaining models requires more complexity than you -want, you can ignore them and build your application minimally using Controllers and Views. CodeIgniter also -enables you to incorporate your own existing scripts, or even develop core libraries for the system, - enabling you to work in a way that makes the most sense to you.

    - - - - -
    - - - - - - + + + + + +Model-View-Controller : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + +
    + + +
    + + + +
    + + +

    Model-View-Controller

    + +

    CodeIgniter is based on the Model-View-Controller development pattern. + +MVC is a software approach that separates application logic from presentation. In practice, it permits your web pages to contain minimal scripting since the presentation is separate from the PHP scripting.

    + +
      +
    • The Model represents your data structures. Typically your model classes will contain functions that help you +retrieve, insert, and update information in your database.
      • +
    • The View is the information that is being presented to a user. A View will normally be a web page, but +in CodeIgniter, a view can also be a page fragment like a header or footer. It can also be an RSS page, or any other type of "page".
      • +
    • The Controller serves as an intermediary between the Model, the View, +and any other resources needed to process the HTTP request and generate a web page.
      • + +
    + +

    CodeIgniter has a fairly loose approach to MVC since Models are not required. +If you don't need the added separation, or find that maintaining models requires more complexity than you +want, you can ignore them and build your application minimally using Controllers and Views. CodeIgniter also +enables you to incorporate your own existing scripts, or even develop core libraries for the system, + enabling you to work in a way that makes the most sense to you.

    + + + + +
    + + + + + + \ No newline at end of file diff --git a/user_guide/toc.html b/user_guide/toc.html index a87139b9..b9898b5c 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -1,207 +1,207 @@ - - - - - -Table of Contents : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -

    CodeIgniter User Guide Version 1.7

    -
    - - - - - - - - - - -
    - - -
    - - -
    - - -

    Table of Contents

    - - - - - - - - -
    - -

    Basic Info

    - - -

    Installation

    - - -

    Introduction

    - - - -    		 - -

    General Topics

    - - -    		 - - -

    Class Reference

    - - - -    		 - -

    Helper Reference

    - - -

    Additional Resources

    - - - - -
    - -
    - - - - - - - + + + + + +Table of Contents : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + + +
    + + + + +

    CodeIgniter User Guide Version 1.7

    +
    + + + + + + + + + + +
    + + +
    + + +
    + + +

    Table of Contents

    + + + + + + + + +
    + +

    Basic Info

    + + +

    Installation

    + + +

    Introduction

    + + + +    		 + +

    General Topics

    + + +    		 + + +

    Class Reference

    + + + +    		 + +

    Helper Reference

    + + +

    Additional Resources

    + + + + +
    + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/userguide.css b/user_guide/userguide.css index 45663882..0f850009 100644 --- a/user_guide/userguide.css +++ b/user_guide/userguide.css @@ -1,406 +1,406 @@ -body { - margin: 0; - padding: 0; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 14px; - color: #333; - background-color: #fff; -} - -a { - color: #0134c5; - background-color: transparent; - text-decoration: none; - font-weight: normal; -} -a:visited { - color: #0134c5; - background-color: transparent; - text-decoration: none; -} -a:hover { - color: #000; - text-decoration: none; - background-color: transparent; -} - -#breadcrumb { - float: left; - background-color: transparent; - margin: 10px 0 0 42px; - padding: 0; - font-size: 10px; - color: #666; -} -#breadcrumb_right { - float: right; - width: 175px; - background-color: transparent; - padding: 8px 8px 3px 0; - text-align: right; - font-size: 10px; - color: #666; -} -#nav { - background-color: #494949; - margin: 0; - padding: 0; -} -#nav2 { - background: #fff url(images/nav_bg_darker.jpg) repeat-x left top; - padding: 0 310px 0 0; - margin: 0; - text-align: right; -} -#nav_inner { - background-color: transparent; - padding: 8px 12px 0 20px; - margin: 0; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; -} - -#nav_inner h3 { - font-size: 12px; - color: #fff; - margin: 0; - padding: 0; -} - -#nav_inner .td_sep { - background: transparent url(images/nav_separator_darker.jpg) repeat-y left top; - width: 25%; - padding: 0 0 0 20px; -} -#nav_inner .td { - width: 25%; -} -#nav_inner p { - color: #eee; - background-color: transparent; - padding:0; - margin: 0 0 10px 0; -} -#nav_inner ul { - list-style-image: url(images/arrow.gif); - padding: 0 0 0 18px; - margin: 8px 0 12px 0; -} -#nav_inner li { - padding: 0; - margin: 0 0 4px 0; -} - -#nav_inner a { - color: #eee; - background-color: transparent; - text-decoration: none; - font-weight: normal; -} - -#nav_inner a:visited { - color: #eee; - background-color: transparent; - text-decoration: none; -} - -#nav_inner a:hover { - color: #ccc; - text-decoration: none; - background-color: transparent; -} - -#masthead { - margin: 0 40px 0 35px; - padding: 0 0 0 6px; - border-bottom: 1px solid #999; -} - -#masthead h1 { -background-color: transparent; -color: #e13300; -font-size: 18px; -font-weight: normal; -margin: 0; -padding: 0 0 6px 0; -} - -#searchbox { - background-color: transparent; - padding: 6px 40px 0 0; - text-align: right; - font-size: 10px; - color: #666; -} - -#img_welcome { - border-bottom: 1px solid #D0D0D0; - margin: 0 40px 0 40px; - padding: 0; - text-align: center; -} - -#content { - margin: 20px 40px 0 40px; - padding: 0; -} - -#content p { - margin: 12px 20px 12px 0; -} - -#content h1 { -color: #e13300; -border-bottom: 1px solid #666; -background-color: transparent; -font-weight: normal; -font-size: 24px; -margin: 0 0 20px 0; -padding: 3px 0 7px 3px; -} - -#content h2 { - background-color: transparent; - border-bottom: 1px solid #999; - color: #000; - font-size: 18px; - font-weight: bold; - margin: 28px 0 16px 0; - padding: 5px 0 6px 0; -} - -#content h3 { - background-color: transparent; - color: #333; - font-size: 16px; - font-weight: bold; - margin: 16px 0 15px 0; - padding: 0 0 0 0; -} - -#content h4 { - background-color: transparent; - color: #444; - font-size: 14px; - font-weight: bold; - margin: 22px 0 0 0; - padding: 0 0 0 0; -} - -#content img { - margin: auto; - padding: 0; -} - -#content code { - font-family: Monaco, Verdana, Sans-serif; - font-size: 12px; - background-color: #f9f9f9; - border: 1px solid #D0D0D0; - color: #002166; - display: block; - margin: 14px 0 14px 0; - padding: 12px 10px 12px 10px; -} - -#content pre { - font-family: Monaco, Verdana, Sans-serif; - font-size: 12px; - background-color: #f9f9f9; - border: 1px solid #D0D0D0; - color: #002166; - display: block; - margin: 14px 0 14px 0; - padding: 12px 10px 12px 10px; -} - -#content .path { - background-color: #EBF3EC; - border: 1px solid #99BC99; - color: #005702; - text-align: center; - margin: 0 0 14px 0; - padding: 5px 10px 5px 8px; -} - -#content dfn { - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - color: #00620C; - font-weight: bold; - font-style: normal; -} -#content var { - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - color: #8F5B00; - font-weight: bold; - font-style: normal; -} -#content samp { - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - color: #480091; - font-weight: bold; - font-style: normal; -} -#content kbd { - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - color: #A70000; - font-weight: bold; - font-style: normal; -} - -#content ul { - list-style-image: url(images/arrow.gif); - margin: 10px 0 12px 0; -} - -#content li { - margin-bottom: 9px; -} - -#content li p { - margin-left: 0; - margin-right: 0; -} - -#content .tableborder { - border: 1px solid #999; -} -#content th { - font-weight: bold; - text-align: left; - font-size: 12px; - background-color: #666; - color: #fff; - padding: 4px; -} - -#content .td { - font-weight: normal; - font-size: 12px; - padding: 6px; - background-color: #f3f3f3; -} - -#content .tdpackage { - font-weight: normal; - font-size: 12px; -} - -#content .important { - background: #FBE6F2; - border: 1px solid #D893A1; - color: #333; - margin: 10px 0 5px 0; - padding: 10px; -} - -#content .important p { - margin: 6px 0 8px 0; - padding: 0; -} - -#content .important .leftpad { - margin: 6px 0 8px 0; - padding-left: 20px; -} - -#content .critical { - background: #FBE6F2; - border: 1px solid #E68F8F; - color: #333; - margin: 10px 0 5px 0; - padding: 10px; -} - -#content .critical p { - margin: 5px 0 6px 0; - padding: 0; -} - - -#footer { -background-color: transparent; -font-size: 10px; -padding: 16px 0 15px 0; -margin: 20px 0 0 0; -text-align: center; -} - -#footer p { - font-size: 10px; - color: #999; - text-align: center; -} -#footer address { - font-style: normal; -} - -.center { - text-align: center; -} - -img { - padding:0; - border: 0; - margin: 0; -} - -.nopad { - padding:0; - border: 0; - margin: 0; -} - - -form { - margin: 0; - padding: 0; -} - -.input { - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - color: #333; - border: 1px solid #B3B4BD; - width: 100%; - font-size: 11px; - height: 1.5em; - padding: 0; - margin: 0; -} - -.textarea { - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 14px; - color: #143270; - background-color: #f9f9f9; - border: 1px solid #B3B4BD; - width: 100%; - padding: 6px; - margin: 0; -} - -.select { - background-color: #fff; - font-size: 11px; - font-weight: normal; - color: #333; - padding: 0; - margin: 0 0 3px 0; -} - -.checkbox { - background-color: transparent; - padding: 0; - border: 0; -} - -.submit { - background-color: #000; - color: #fff; - font-weight: normal; - font-size: 10px; - border: 1px solid #fff; - margin: 0; - padding: 1px 5px 2px 5px; +body { + margin: 0; + padding: 0; + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 14px; + color: #333; + background-color: #fff; +} + +a { + color: #0134c5; + background-color: transparent; + text-decoration: none; + font-weight: normal; +} +a:visited { + color: #0134c5; + background-color: transparent; + text-decoration: none; +} +a:hover { + color: #000; + text-decoration: none; + background-color: transparent; +} + +#breadcrumb { + float: left; + background-color: transparent; + margin: 10px 0 0 42px; + padding: 0; + font-size: 10px; + color: #666; +} +#breadcrumb_right { + float: right; + width: 175px; + background-color: transparent; + padding: 8px 8px 3px 0; + text-align: right; + font-size: 10px; + color: #666; +} +#nav { + background-color: #494949; + margin: 0; + padding: 0; +} +#nav2 { + background: #fff url(images/nav_bg_darker.jpg) repeat-x left top; + padding: 0 310px 0 0; + margin: 0; + text-align: right; +} +#nav_inner { + background-color: transparent; + padding: 8px 12px 0 20px; + margin: 0; + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 11px; +} + +#nav_inner h3 { + font-size: 12px; + color: #fff; + margin: 0; + padding: 0; +} + +#nav_inner .td_sep { + background: transparent url(images/nav_separator_darker.jpg) repeat-y left top; + width: 25%; + padding: 0 0 0 20px; +} +#nav_inner .td { + width: 25%; +} +#nav_inner p { + color: #eee; + background-color: transparent; + padding:0; + margin: 0 0 10px 0; +} +#nav_inner ul { + list-style-image: url(images/arrow.gif); + padding: 0 0 0 18px; + margin: 8px 0 12px 0; +} +#nav_inner li { + padding: 0; + margin: 0 0 4px 0; +} + +#nav_inner a { + color: #eee; + background-color: transparent; + text-decoration: none; + font-weight: normal; +} + +#nav_inner a:visited { + color: #eee; + background-color: transparent; + text-decoration: none; +} + +#nav_inner a:hover { + color: #ccc; + text-decoration: none; + background-color: transparent; +} + +#masthead { + margin: 0 40px 0 35px; + padding: 0 0 0 6px; + border-bottom: 1px solid #999; +} + +#masthead h1 { +background-color: transparent; +color: #e13300; +font-size: 18px; +font-weight: normal; +margin: 0; +padding: 0 0 6px 0; +} + +#searchbox { + background-color: transparent; + padding: 6px 40px 0 0; + text-align: right; + font-size: 10px; + color: #666; +} + +#img_welcome { + border-bottom: 1px solid #D0D0D0; + margin: 0 40px 0 40px; + padding: 0; + text-align: center; +} + +#content { + margin: 20px 40px 0 40px; + padding: 0; +} + +#content p { + margin: 12px 20px 12px 0; +} + +#content h1 { +color: #e13300; +border-bottom: 1px solid #666; +background-color: transparent; +font-weight: normal; +font-size: 24px; +margin: 0 0 20px 0; +padding: 3px 0 7px 3px; +} + +#content h2 { + background-color: transparent; + border-bottom: 1px solid #999; + color: #000; + font-size: 18px; + font-weight: bold; + margin: 28px 0 16px 0; + padding: 5px 0 6px 0; +} + +#content h3 { + background-color: transparent; + color: #333; + font-size: 16px; + font-weight: bold; + margin: 16px 0 15px 0; + padding: 0 0 0 0; +} + +#content h4 { + background-color: transparent; + color: #444; + font-size: 14px; + font-weight: bold; + margin: 22px 0 0 0; + padding: 0 0 0 0; +} + +#content img { + margin: auto; + padding: 0; +} + +#content code { + font-family: Monaco, Verdana, Sans-serif; + font-size: 12px; + background-color: #f9f9f9; + border: 1px solid #D0D0D0; + color: #002166; + display: block; + margin: 14px 0 14px 0; + padding: 12px 10px 12px 10px; +} + +#content pre { + font-family: Monaco, Verdana, Sans-serif; + font-size: 12px; + background-color: #f9f9f9; + border: 1px solid #D0D0D0; + color: #002166; + display: block; + margin: 14px 0 14px 0; + padding: 12px 10px 12px 10px; +} + +#content .path { + background-color: #EBF3EC; + border: 1px solid #99BC99; + color: #005702; + text-align: center; + margin: 0 0 14px 0; + padding: 5px 10px 5px 8px; +} + +#content dfn { + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + color: #00620C; + font-weight: bold; + font-style: normal; +} +#content var { + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + color: #8F5B00; + font-weight: bold; + font-style: normal; +} +#content samp { + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + color: #480091; + font-weight: bold; + font-style: normal; +} +#content kbd { + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + color: #A70000; + font-weight: bold; + font-style: normal; +} + +#content ul { + list-style-image: url(images/arrow.gif); + margin: 10px 0 12px 0; +} + +#content li { + margin-bottom: 9px; +} + +#content li p { + margin-left: 0; + margin-right: 0; +} + +#content .tableborder { + border: 1px solid #999; +} +#content th { + font-weight: bold; + text-align: left; + font-size: 12px; + background-color: #666; + color: #fff; + padding: 4px; +} + +#content .td { + font-weight: normal; + font-size: 12px; + padding: 6px; + background-color: #f3f3f3; +} + +#content .tdpackage { + font-weight: normal; + font-size: 12px; +} + +#content .important { + background: #FBE6F2; + border: 1px solid #D893A1; + color: #333; + margin: 10px 0 5px 0; + padding: 10px; +} + +#content .important p { + margin: 6px 0 8px 0; + padding: 0; +} + +#content .important .leftpad { + margin: 6px 0 8px 0; + padding-left: 20px; +} + +#content .critical { + background: #FBE6F2; + border: 1px solid #E68F8F; + color: #333; + margin: 10px 0 5px 0; + padding: 10px; +} + +#content .critical p { + margin: 5px 0 6px 0; + padding: 0; +} + + +#footer { +background-color: transparent; +font-size: 10px; +padding: 16px 0 15px 0; +margin: 20px 0 0 0; +text-align: center; +} + +#footer p { + font-size: 10px; + color: #999; + text-align: center; +} +#footer address { + font-style: normal; +} + +.center { + text-align: center; +} + +img { + padding:0; + border: 0; + margin: 0; +} + +.nopad { + padding:0; + border: 0; + margin: 0; +} + + +form { + margin: 0; + padding: 0; +} + +.input { + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 11px; + color: #333; + border: 1px solid #B3B4BD; + width: 100%; + font-size: 11px; + height: 1.5em; + padding: 0; + margin: 0; +} + +.textarea { + font-family: Lucida Grande, Verdana, Geneva, Sans-serif; + font-size: 14px; + color: #143270; + background-color: #f9f9f9; + border: 1px solid #B3B4BD; + width: 100%; + padding: 6px; + margin: 0; +} + +.select { + background-color: #fff; + font-size: 11px; + font-weight: normal; + color: #333; + padding: 0; + margin: 0 0 3px 0; +} + +.checkbox { + background-color: transparent; + padding: 0; + border: 0; +} + +.submit { + background-color: #000; + color: #fff; + font-weight: normal; + font-size: 10px; + border: 1px solid #fff; + margin: 0; + padding: 1px 5px 2px 5px; } \ No newline at end of file From 9babd66d3f0a115ce2113ca9ed6f4ab10af090e9 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 14 Nov 2008 02:09:00 +0000 Subject: [PATCH 1558/2544] added file format guidelines --- user_guide/general/styleguide.html | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 43385d06..feccbd7b 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -69,6 +69,7 @@

    General Style and Syntax

    Table of Contents

    +
  • + +

    File Format

    +
    +

    Files should be saved with Unicode (UTF-8) encoding. The BOM + should not be used. Unlike UTF-16 and UTF-32, there's no byte order to indicate in + a UTF-8 encoded file, and the BOM can have a negative side effect in PHP of sending output, + preventing the application from being able to set its own headers. Unix line endings should + be used (LF).

    + +

    Here is how to apply these settings in some of the more common text editors. Instructions for your + text editor may vary; check your text editor's documentation.

    + +
    TextMate
    + +
      +
    1. Open the Application Preferences
      2. +
    2. Click Advanced, and then the "Saving" tab
      3. +
    3. In "File Encoding", select "UTF-8 (recommended)"
      4. +
    4. In "Line Endings", select "LF (recommended)"
      5. +
    5. Optional: Check "Use for existing files as well" if you wish to modify the line + endings of files you open to your new preference.
      6. +
    + +
    BBEdit
    + +
      +
    1. Open the Application Preferences
      2. +
    2. Select "Text Encodings" on the left.
      3. +
    3. In "Default text encoding for new documents", select "Unicode (UTF-8, no BOM)"
      4. +
    4. Optional: In "If file's encoding can't be guessed, use", select + "Unicode (UTF-8, no BOM)"
      5. +
    5. Select "Text Files" on the left.
      6. +
    6. In "Default line breaks", select "Mac OS X and Unix (LF)"
      7. +
    +
    +

    PHP Closing Tag

    The PHP closing tag on a PHP document ?> is optional to the PHP parser. However, if used, any whitespace following the closing tag, whether introduced From d5738d9fcafa831be8a1e709e42fdafb70d4330f Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 14 Nov 2008 16:53:34 +0000 Subject: [PATCH 1559/2544] added some block level tag tracking so we can add inner block level elements when required --- system/libraries/Typography.php | 82 ++++++++++----------------------- 1 file changed, 25 insertions(+), 57 deletions(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 29b871e2..0502eef1 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -34,7 +34,13 @@ class CI_Typography { // Tags we want the parser to completely ignore when splitting the string. var $inline_elements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var'; - + + // array of block level elements that require inner content to be within another block level element + var $inner_block_required = array('blockquote'); + + // the last block element parsed + var $last_block_element = ''; + // whether or not to protect quotes within { curly braces } var $protect_braced_quotes = FALSE; @@ -80,7 +86,7 @@ function auto_typography($str, $reduce_linebreaks = FALSE) if ($reduce_linebreaks === TRUE) { $str = preg_replace("/\n\n+/", "\n\n", $str); - } + } // Convert quotes within tags to temporary markers. We don't want quotes converted // within tags so we'll temporarily convert them to {@DQ} and {@SQ} @@ -133,37 +139,30 @@ function auto_typography($str, $reduce_linebreaks = FALSE) { // Are we dealing with a tag? If so, we'll skip the processing for this cycle. // Well also set the "process" flag which allows us to skip 

     tags and a few other things.
-			if (preg_match("#<(/*)(".$this->block_elements.").*?>#", $chunk, $match))
+			if (preg_match("#<(/*)(".$this->block_elements.").*?\>#", $chunk, $match))
 			{
 				if (preg_match("#".$this->skip_elements."#", $match[2]))
 				{
 					$process =  ($match[1] == '/') ? TRUE : FALSE;
 				}
 				
-				$str .= $chunk;
-				continue;
-			}
-			elseif (preg_match('/<(\/?)([a-z]*).*?>/s', $chunk, $tagmatch))
-			{
-				if ($tagmatch[1] == '/' && $tagmatch[2] == $this->last_tag)
+				if ($match[1] == '')
 				{
-					$process = FALSE;
+					$this->last_block_element = $match[2];
 				}
-				else
-				{
-					$process = TRUE;
-					$this->last_tag = $tagmatch[2];					
-				}
-			}
 
+				$str .= $chunk;
+				continue;
+			}
+			
 			if ($process == FALSE)
 			{
 				$str .= $chunk;
 				continue;
 			}
-			
+
 			//  Convert Newlines into 
     and 
     tags
-			$str .= $this->format_characters($this->_format_newlines($chunk));			
+			$str .= $this->_format_newlines($chunk);
 		}
 
 		// is the whole of the content inside a block level element?
@@ -171,20 +170,16 @@ function auto_typography($str, $reduce_linebreaks = FALSE)
 		{
 			$str = "
    {$str}
    ";
 		}
-
-
-		// some special linebreak cleanup
-		$str = preg_replace_callback('#<(?!/|'.$this->block_elements.')([^>]*)>
    (.*?)
    <(\w*)#si', array($this, '_linebreak_cleanup'), $str);
-		
-		// and cleanup empty paragraph tags sitting between two closing tags
-		$str = preg_replace('#()
    (\s*)
    ()#si', '$1$2$3', $str);
 		
+		// Convert quotes, elipsis, and em-dashes
+		$str = $this->format_characters($str);
+	
 		// Final clean up
 		$table = array(
 		
 						// If the user submitted their own paragraph tags within the text
 						// we will retain them instead of using our tags.
-						'/(*?]>)
    /'	=> '$1', // *?]>)
    /'		=> '$1', // )+#'			=> '
    ',
@@ -192,13 +187,10 @@ function auto_typography($str, $reduce_linebreaks = FALSE)
 						
 						// Clean up stray paragraph tags that appear before block level elements
 						'#
    <('.$this->block_elements.')#'	=> '<$1',
-						
-						// Clean up open paragraph tags that appear before block level elements
-						'#
    (\W)<('.$this->block_elements.')#'	=> '
    $1<$2',
 
 						// Clean up stray non-breaking spaces preceeding block elements
 						'#[  ]+<('.$this->block_elements.')#'	=> '  <$1',
-			
+
 						// Replace the temporary markers we added earlier
 						'/\{@TAG\}/'		=> '<',
 						'/\{@DQ\}/'			=> '"',
@@ -207,7 +199,7 @@ function auto_typography($str, $reduce_linebreaks = FALSE)
 						'/\{@NBS\}/'		=> '  '
 
 						);
-
+	
 		// Do we need to reduce empty lines?
 		if ($reduce_linebreaks === TRUE)
 		{
@@ -226,30 +218,6 @@ function auto_typography($str, $reduce_linebreaks = FALSE)
 	
 	// --------------------------------------------------------------------
 	
-	/**
-	 * Linebreak Cleanup
-	 *
-	 * Removes paragraph and line break tags inserted inbetween
-	 * inline content and a new opening block level element
-	 *
-	 * @access	private
-	 * @param	array
-	 * @return	string
-	 */
-	function _linebreak_cleanup($match)
-	{
-		if (in_array($match[3], explode('|', $this->block_elements)))
-		{
-			return "<{$match[1]}>".str_replace('
    ', '', $match[2])."<{$match[3]}";
-		}
-		else
-		{
-			return $match[0];
-		}
-	}
-
-	// --------------------------------------------------------------------
-	
 	/**
 	 * Format Characters
 	 *
@@ -320,8 +288,8 @@ function _format_newlines($str)
 		{
 			return $str;
 		}
-
-		if (strpos($str, "\n") === FALSE)
+		
+		if (strpos($str, "\n") === FALSE  && ! in_array($this->last_block_element, $this->inner_block_required))
 		{
 			return $str;
 		}

From 89cd0a752fd6f165f06a345bb04ce45529c618fc Mon Sep 17 00:00:00 2001
From: Derek Jones 
Date: Fri, 14 Nov 2008 17:12:14 +0000
Subject: [PATCH 1560/2544] switched order of parsing opening and closing curly
 quotes for greater accuracy

---
 system/libraries/Typography.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 0502eef1..808a7695 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -246,13 +246,13 @@ function format_characters($str)
 							'/"\'(\s|\W|$)/'				=> '”’$1',
 
 							// single quote smart quotes
-							'/\'(\s|\W|$)/'					=> '’$1',
 							'/(^|\W|\s)\'/'					=> '$1‘',
+							'/\'(\s|\W|$)/'					=> '’$1',
 
 							// double quote smart quotes
-							'/"(\s|\W|$)/'					=> '”$1',
 							'/(^|\W|\s)"/'					=> '$1“',
-
+							'/"(\s|\W|$)/'					=> '”$1',
+							
 							// apostrophes
 							"/(\w)'(\w)/"       	    	=> '$1’$2',
 

From 7b49203821a1e36ef566e0e08e4f658b8232f10c Mon Sep 17 00:00:00 2001
From: Derek Allard 
Date: Sat, 15 Nov 2008 22:26:13 +0000
Subject: [PATCH 1561/2544] fix broken link to getting started page

---
 user_guide/installation/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html
index 01d4db7c..d64c13ee 100644
--- a/user_guide/installation/index.html
+++ b/user_guide/installation/index.html
@@ -72,7 +72,7 @@ 
    Installation Instructions
    
 
 
    That's it!
    
 
-
    If you're new to CodeIgniter, please read the Getting Started section of the User Guide to begin learning how
+
    If you're new to CodeIgniter, please read the Getting Started section of the User Guide to begin learning how
 to build dynamic PHP applications. Enjoy!
    
 
 

From c630bcfca816f625b8cd70a1a7467a77c8065bbd Mon Sep 17 00:00:00 2001
From: Derek Jones 
Date: Mon, 17 Nov 2008 21:09:45 +0000
Subject: [PATCH 1562/2544] added sendmail debugging and fixed a bug with
 single to double quoted string syntax in from()

---
 system/libraries/Email.php | 18 ++++++++++++------
 user_guide/changelog.html  |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 94f517c4..89d0976a 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -189,7 +189,7 @@ function from($from, $name = '')
 			if ( ! preg_match('/[\200-\377]/', $name))
 			{
 				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
-				$name = '"'.addcslashes($name, '\0..\37\177"\\').'"';
+				$name = '"'.addcslashes($name, "\0..\37\177'\"\\").'"';
 			}
 			else
 			{
@@ -1539,16 +1539,22 @@ function _send_with_sendmail()
 	{
 		$fp = @popen($this->mailpath . " -oi -f ".$this->clean_email($this->_headers['From'])." -t", 'w');
 
-		if ( ! is_resource($fp))
+		fputs($fp, $this->_header_str);
+		fputs($fp, $this->_finalbody);
+
+	    $status = pclose($fp);
+	    
+		if (version_compare(PHP_VERSION, '4.2.3') == -1)
+		{
+			$status = $status >> 8 & 0xFF;
+	    }
+	
+		if ($status == 0)
 		{
 			$this->_set_error_message('email_no_socket');
 			return FALSE;
 		}
 
-		fputs($fp, $this->_header_str);
-		fputs($fp, $this->_finalbody);
-		pclose($fp) >> 8 & 0xFF;
-
 		return TRUE;
 	}
   
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 6f23617b..670e82c3 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -67,6 +67,7 @@ 
    Version 1.7.1
    
 			
  • Changed default current page indicator in the Pagination library to use <strong> instead of <b>
    • 
 			
  • A "HTTP/1.1 400 Bad Request" header is now sent when disallowed characters are encountered.
    • 
 			
  • Added <big>, <small>, <q>, and <tt> to the Typography parser's inline elements.
    • 
+			
  • Added more accurate error reporting for the Email library when using sendmail.
    •
  • Helpers From b859df894145b8a41609958917cf394fc46b8b10 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 18 Nov 2008 15:24:20 +0000 Subject: [PATCH 1563/2544] Smart curly quotes! Spaces trump all, then worry about \W, you can't convert them all at once or either your opening or your ending (whichever you process first) is going to be too greedy. --- system/libraries/Typography.php | 37 +++++++++++++++++++++------------ user_guide/changelog.html | 1 + 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index 808a7695..27fa4219 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -235,26 +235,37 @@ function format_characters($str) if ( ! isset($table)) { - $table = array( + $table = array( // nested smart quotes, opening and closing // note that rules for grammar (English) allow only for two levels deep // and that single quotes are _supposed_ to always be on the outside // but we'll accommodate both - '/(^|\W|\s)\'"/' => '$1‘“', - '/\'"(\s|\W|$)/' => '’”$1', - '/(^|\W|\s)"\'/' => '$1“‘', - '/"\'(\s|\W|$)/' => '”’$1', + // Note that in all cases, whitespace is the primary determining factor + // on which direction to curl, with non-word characters like punctuation + // being a secondary factor only after whitespace is addressed. + '/\'"(\s|$)/' => '’”$1', + '/(^|\s)\'"/' => '$1‘“', + '/\'"(\W)/' => '’”$1', + '/(\W)\'"/' => '$1‘“', + '/"\'(\s|$)/' => '”’$1', + '/(^|\s)"\'/' => '$1“‘', + '/"\'(\W)/' => '”’$1', + '/(\W)"\'/' => '$1“‘', // single quote smart quotes - '/(^|\W|\s)\'/' => '$1‘', - '/\'(\s|\W|$)/' => '’$1', + '/\'(\s|$)/' => '’$1', + '/(^|\s)\'/' => '$1‘', + '/\'(\W)/' => '’$1', + '/(\W)\'/' => '$1‘', // double quote smart quotes - '/(^|\W|\s)"/' => '$1“', - '/"(\s|\W|$)/' => '”$1', - + '/"(\s|$)/' => '”$1', + '/(^|\s)"/' => '$1“', + '/"(\W)/' => '”$1', + '/(\W)"/' => '$1“', + // apostrophes - "/(\w)'(\w)/" => '$1’$2', + "/(\w)'(\w)/" => '$1’$2', // Em dash and ellipses dots '/\s?\-\-\s?/' => '—', @@ -265,8 +276,8 @@ function format_characters($str) // ampersands, if not a character entity '/&(?!#?[a-zA-Z0-9]{2,};)/' => '&' - ); - } + ); + } return preg_replace(array_keys($table), $table, $str); } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 670e82c3..7aea9a6c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -85,6 +85,7 @@

    Bug fixes for 1.7.1

  • Fixed a bug with the regular expression used to protect submitted paragraph tags in auto typography.
  • Fixed a bug where double dashes within tag attributes were being converted to em dash entities.
  • Fixed a bug where double spaces within tag attributes were being converted to non-breaking space entities.
    • +
  • Fixed some accuracy issues with curly quotes in Typography::format_characters()
  • Changed a few docblock comments to reflect actual return values.
  • Fixed a bug with high ascii characters in subject and from email headers.
    • From 604873fe068c39c55afa1deaafaf34a95fd3359e Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 18 Nov 2008 15:57:24 +0000 Subject: [PATCH 1564/2544] better error messages for sendmail failure --- system/language/english/email_lang.php | 1 + system/libraries/Email.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index 93242778..e3bd113c 100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php @@ -17,6 +17,7 @@ $lang['email_smtp_auth_un'] = "Failed to authenticate username. Error: %s"; $lang['email_smtp_auth_pw'] = "Failed to authenticate password. Error: %s"; $lang['email_smtp_data_failure'] = "Unable to send data: %s"; +$lang['email_exit_status'] = "Exit status code: %s"; /* End of file email_lang.php */ diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 89d0976a..99a5ea38 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1549,8 +1549,9 @@ function _send_with_sendmail() $status = $status >> 8 & 0xFF; } - if ($status == 0) + if ($status != 0) { + $this->_set_error_message('email_exit_status', $status); $this->_set_error_message('email_no_socket'); return FALSE; } From ef22efd7c7b0a9006d43ef207450768722815453 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 20 Nov 2008 15:25:45 +0000 Subject: [PATCH 1565/2544] Added where_in to the list of expected arguments received by delete() --- system/database/DB_active_rec.php | 2 +- user_guide/changelog.html | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index e8cefa2d..b8dce6df 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1374,7 +1374,7 @@ function delete($table = '', $where = '', $limit = NULL, $reset_data = TRUE) $this->limit($limit); } - if (count($this->ar_where) == 0 && count($this->ar_like) == 0) + if (count($this->ar_where) == 0 && count($this->ar_wherein) == 0 && count($this->ar_like)) { if ($this->db_debug) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7aea9a6c..a0c0fd06 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -70,7 +70,11 @@

    Version 1.7.1

  • Added more accurate error reporting for the Email library when using sendmail.
    • -
  • Helpers +
  • Database +
      +
    • Added where_in to the list of expected arguments received by delete().
      • +
    +
  • Helpers From d9c7f031cf525229238c1f8ab02a44436ee2c32e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 1 Dec 2008 20:18:00 +0000 Subject: [PATCH 1566/2544] Removed a strict type check from the rotate() function of the Image Manipulation Class. --- system/libraries/Image_lib.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 16201ee9..1b2d33de 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -397,7 +397,7 @@ function rotate() // Allowed rotation values $degs = array(90, 180, 270, 'vrt', 'hor'); - if ($this->rotation_angle == '' OR ! in_array($this->rotation_angle, $degs, TRUE)) + if ($this->rotation_angle == '' OR ! in_array($this->rotation_angle, $degs)) { $this->set_error('imglib_rotation_angle_required'); return FALSE; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a0c0fd06..2c2f63ba 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -68,6 +68,7 @@

    Version 1.7.1

  • A "HTTP/1.1 400 Bad Request" header is now sent when disallowed characters are encountered.
  • Added <big>, <small>, <q>, and <tt> to the Typography parser's inline elements.
  • Added more accurate error reporting for the Email library when using sendmail.
    • +
  • Removed a strict type check from the rotate() function of the Image Manipulation Class.
  • Database From 272d30a8ec4fc2a6ff42359cff859f9c030a6a1d Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Dec 2008 15:25:19 +0000 Subject: [PATCH 1567/2544] spelling --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 2c2f63ba..48b19708 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -185,7 +185,7 @@

    Bug fixes for 1.7.0

  • Fixed a Form Validation bug in which the "isset" error message was being trigged by the "required" rule.
  • Fixed a spelling error in a Loader error message.
  • Fixed a bug (5050) with IP validation with empty segments.
    • -
  • Fixed a bug in which the parser was being greedy if multiple identical sets of tags were enountered.
    • +
  • Fixed a bug in which the parser was being greedy if multiple identical sets of tags were encountered.

    • Version 1.6.3

    From ab0e31f09a8cf3596e6547fc47fd085a0d2bcdd0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Dec 2008 22:03:47 +0000 Subject: [PATCH 1568/2544] fixed a bug where whitespace would be lost if a string was forced into a character entity e.g. &foo you know? would become &foo;you know? instead of &foo; you know? --- system/libraries/Input.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index f26df755..347aac3a 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -555,7 +555,7 @@ function xss_clean($str, $is_image = FALSE) * the conversion of entities to ASCII later. * */ - $str = preg_replace('#(&\#?[0-9a-z]{2,})[\x00-\x20]*;?#i', "\\1;", $str); + $str = preg_replace('#(&\#?[0-9a-z]{2,})([\x00-\x20])*;?#i', "\\1;\\2", $str); /* * Validate UTF16 two byte encoding (x00) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 48b19708..19681755 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -93,6 +93,7 @@

    Bug fixes for 1.7.1

  • Fixed some accuracy issues with curly quotes in Typography::format_characters()
  • Changed a few docblock comments to reflect actual return values.
  • Fixed a bug with high ascii characters in subject and from email headers.
    • +
  • Fixed a bug in xss_clean() where whitespace following a validated character entity would not be preserved.
    • From 3f45bbdcfabac41fa3ee33277a21727f71de991a Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 7 Dec 2008 17:00:09 +0000 Subject: [PATCH 1569/2544] fixed a broken link, fixed a typo --- user_guide/changelog.html | 1 + user_guide/database/connecting.html | 2 +- user_guide/libraries/loader.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 19681755..3dd056d0 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -84,6 +84,7 @@

    Version 1.7.1

    Bug fixes for 1.7.1

      +
    • Fixed assorted user guide typos or examples.
    • Fixed a bug in the MySQLi driver when no port is specified
    • Fixed a bug (#5702), in which the field label was not being fetched properly, when "matching" one field to another.
    • Fixed a bug in which identifers were not being escaped properly when reserved characters were used.
      • diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 90f90110..373c0567 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -89,7 +89,7 @@

      Available Parameters

      -

      Manuallly Connecting to a Database

      +

      Manually Connecting to a Database

      The first parameter of this function can optionally be used to specify a particular database group from your config file, or you can even submit connection values for a database that is not specified in your config file. diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 2680dfab..5bf938c0 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -153,7 +153,7 @@

      $this->load->model('Model_name');

      $this->fubar->function();

      $this->load->database('options', true/false)

      This function lets you load the database class. The two parameters are optional. Please see the -database section for more info.

      +database section for more info.

      $this->load->scaffolding('table_name')

      From 4b6d493593b7400b7fa81d976fd3dc07ad30fe86 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 7 Dec 2008 17:04:56 +0000 Subject: [PATCH 1570/2544] changed some code in examples from Let's try it:  Hello World! @@ -150,7 +150,7 @@

      Functions

      Now load the following URL to see the comment function:

      diff --git a/user_guide/general/views.html b/user_guide/general/views.html index a8c3d602..120e7bbf 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -97,7 +97,7 @@

      Loading a View

      diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index a840c1ec..ef8ecf18 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -142,7 +142,7 @@

      The Controller

      folder:

      - +?>

      The Upload Folder

      diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 684fe9b5..b49117ed 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -313,7 +313,7 @@

      Setting Validation Rules

      Your controller should now look like this:

      - + + + +

       

      + + +

      Function Reference

      + +

      $this->cart->insert();

      + +

      Permits you to add items to the shopping cart, as outlined above.

      + + +

      $this->cart->update();

      + +

      Permits you to update items in the shopping cart, as outlined above.

      + + +

      $this->cart->total();

      + +

      Displays the total amount in the cart.

      + + +

      $this->cart->total_items();

      + +

      Displays the total number of items in the cart.

      + + +

      $this->cart->contents();

      + +

      Returns an array containing everything in the cart.

      + + + +

      $this->cart->has_options(rowid);

      + +

      Returns TRUE (boolean) if a particular row in the cart contains options. This function is designed to be used in a loop with $this->cart->contents(), since you must pass the rowid to this function, as shown in the Displaying the Cart example above.

      + + +

      $this->cart->options(rowid);

      + +

      Returns an array of options for a particular product. This function is designed to be used in a loop with $this->cart->contents(), since you must pass the rowid to this function, as shown in the Displaying the Cart example above.

      + + + +

      $this->cart->destroy();

      + +

      Permits you to destroy the cart. This function will likely be called when you are finished processing the customer's order.

      + + + + +
    + + + + + + + \ No newline at end of file From edac17e48ca6b81fbf6ed5913322cc289ba2164e Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 17 Feb 2009 02:28:47 +0000 Subject: [PATCH 1632/2544] Tweaked nav --- user_guide/libraries/benchmark.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index f76dba9c..a3ce0e4e 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -182,13 +182,14 @@

    Displaying Memory Consumption

    + From 134bdde1b8d46d026b472cfebcb6f6df58c93f05 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 17 Feb 2009 02:29:11 +0000 Subject: [PATCH 1633/2544] Tweaked nav --- user_guide/libraries/calendar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index f166cf8b..941ebf5c 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -236,7 +236,7 @@

    Creating a Calendar Template

    From 0837e24c4f4bdfa24f74e85f17c9ad7e4a19cb9f Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 17 Feb 2009 02:33:29 +0000 Subject: [PATCH 1641/2544] --- user_guide/libraries/calendar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 941ebf5c..abfcee5b 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -236,11 +236,11 @@

    Creating a Calendar Template

    From fd50315792307240cdf9ab17b950f5a02bfd5b04 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 17 Feb 2009 02:33:53 +0000 Subject: [PATCH 1642/2544] --- user_guide/libraries/cart.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index 7c709d39..4649c5dd 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -368,11 +368,11 @@

    $this->cart->destroy();

    From c7d12d369209bd9c7abba8e6536e3a7fe66ec172 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 17 Feb 2009 02:35:08 +0000 Subject: [PATCH 1643/2544] --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 19d85c07..384e0ef3 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -64,6 +64,7 @@

    Version 1.7.2

    • Libraries
      • From 9c86ce5ca11c2d7471d016a7195254c1934472e2 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 17 Feb 2009 19:54:14 +0000 Subject: [PATCH 1644/2544] Updated the destroy function to only remove the cart session and not kill the general session data --- system/libraries/Cart.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index a0b782bb..61223c59 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -517,7 +517,7 @@ function destroy() $this->_cart_contents['cart_total'] = 0; $this->_cart_contents['total_items'] = 0; - $this->CI->session->sess_destroy(); + $this->CI->session->unset_userdata('cart_contents'); } From 3343f462766d110e8c15c6f52d1ef047418c2c98 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 18 Feb 2009 01:29:50 +0000 Subject: [PATCH 1645/2544] added a missing bracket --- system/libraries/Upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 03a7b21f..9a47aa88 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -187,7 +187,7 @@ function do_upload($field = 'userfile') // Set the uploaded data as class variables $this->file_temp = $_FILES[$field]['tmp_name']; - $this->file_name = $this->_prep_filename($_FILES[$field]['name']; + $this->file_name = $this->_prep_filename($_FILES[$field]['name']); $this->file_size = $_FILES[$field]['size']; $this->file_type = preg_replace("/^(.+?);.*$/", "\\1", $_FILES[$field]['type']); $this->file_type = strtolower($this->file_type); From 9c023d4325d9b6cc1e9fd0eb9212763ffcf1a288 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 18 Feb 2009 14:36:59 +0000 Subject: [PATCH 1646/2544] little tweak for ORIG_PATH_INFO servers so the URI isn't left with just a / --- system/libraries/URI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/URI.php b/system/libraries/URI.php index b95c74e1..e74af31f 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -89,11 +89,11 @@ function _fetch_uri_string() } // No QUERY_STRING?... Maybe the ORIG_PATH_INFO variable exists? - $path = (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO'); + $path = str_replace($_SERVER['SCRIPT_NAME'], '', (isset($_SERVER['ORIG_PATH_INFO'])) ? $_SERVER['ORIG_PATH_INFO'] : @getenv('ORIG_PATH_INFO')); if (trim($path, '/') != '' && $path != "/".SELF) { // remove path and script information so we have good URI data - $this->uri_string = str_replace($_SERVER['SCRIPT_NAME'], '', $path); + $this->uri_string = $path; return; } From 85a7cfb75616fb5d41496bb009adbdab0b3f6165 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 18 Feb 2009 14:42:07 +0000 Subject: [PATCH 1647/2544] changelog note for ORIG_PATH_INFO fix --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 384e0ef3..f48bb0be 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -79,6 +79,7 @@

      Version 1.7.2

      Bug fixes for 1.7.2

      • Fixed assorted user guide typos or examples (#6743).
        • +
      • Fixed a bug with ORIG_PATH_INFO that was allowing URIs of just a slash through.

      Version 1.7.1

      From 436e6e2583c574a4628984c4a95c5d3da5fcce1f Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 20 Feb 2009 20:10:00 +0000 Subject: [PATCH 1648/2544] $CI->_remove_invisible_characters($str); fixed to $CI->input->_remove_invisible_characters($str); --- system/database/drivers/oci8/oci8_driver.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index b949a962..42dd5176 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -375,7 +375,7 @@ function escape_str($str) // Access the CI object $CI =& get_instance(); - return $CI->_remove_invisible_characters($str); + return $CI->input->_remove_invisible_characters($str); } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f48bb0be..06375d6f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -136,6 +136,7 @@

      Bug fixes for 1.7.1

    • Fixed a bug where TRUNCATE was not considered a "write" query (#6619).
    • Fixed a bug where csv_from_result() was checking for a nonexistent method.
    • Fixed a bug _protect_identifiers() where it was improperly removing all pipe symbols from items
      • +
    • Fixed a fatal error in the Oracle driver (#6752)
  • Fixed assorted user guide typos or examples (#5998, #6093, #6259, #6339, #6432, #6521).
    • From e4ed583067095144eb20aefc61d4499d8386532a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 20 Feb 2009 21:44:59 +0000 Subject: [PATCH 1649/2544] added LIKE condition escaping to all drivers and Active Record updated all DB drivers to accept arrays in escape_str() --- system/database/DB_active_rec.php | 8 ++++- system/database/DB_driver.php | 19 ++++++++++- .../database/drivers/mssql/mssql_driver.php | 30 +++++++++++++++-- .../database/drivers/mysql/mysql_driver.php | 25 ++++++++++---- .../database/drivers/mysqli/mysqli_driver.php | 31 ++++++++++++++--- system/database/drivers/oci8/oci8_driver.php | 31 +++++++++++++++-- system/database/drivers/odbc/odbc_driver.php | 33 ++++++++++++++++--- .../drivers/postgre/postgre_driver.php | 31 +++++++++++++++-- .../database/drivers/sqlite/sqlite_driver.php | 29 ++++++++++++++-- user_guide/changelog.html | 5 ++- user_guide/database/queries.html | 9 ++++- 11 files changed, 223 insertions(+), 28 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index c757e6ae..d48f43e5 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -707,7 +707,7 @@ function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '') $prefix = (count($this->ar_like) == 0) ? '' : $type; - $v = $this->escape_str($v); + $v = $this->escape_like_str($v); if ($side == 'before') { @@ -722,6 +722,12 @@ function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '') $like_statement = $prefix." $k $not LIKE '%{$v}%'"; } + // some platforms require an escape sequence definition for LIKE wildcards + if ($this->_like_escape_str != '') + { + $like_statement = $like_statement.sprintf($this->_like_escape_str, $this->_like_escape_char); + } + $this->ar_like[] = $like_statement; if ($this->ar_caching === TRUE) { diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 9385870e..729af5bf 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -670,7 +670,7 @@ function last_query() * * @access public * @param string - * @return integer + * @return mixed */ function escape($str) { @@ -691,7 +691,24 @@ function escape($str) } // -------------------------------------------------------------------- + + /** + * Smart Escape LIKE String + * + * Calls the individual driver for platform + * specific escaping for LIKE conditions + * + * @access public + * @param string + * @return mixed + */ + function escape_like_str($str) + { + return $this->escape_str($str, TRUE); + } + // -------------------------------------------------------------------- + /** * Primary * diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index addbd6b9..c89e2549 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -34,6 +34,11 @@ class CI_DB_mssql_driver extends CI_DB { // The character used for escaping var $_escape_char = ''; + + // clause and character used for LIKE escape sequences + var $_like_escape_str = " ESCAPE '%s' "; + var $_like_escape_chr = '!'; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is @@ -225,15 +230,36 @@ function trans_rollback() * * @access public * @param string + * @param bool whether or not the string will be used in a LIKE condition * @return string */ - function escape_str($str) + function escape_str($str, $like = FALSE) { + if (is_array($str)) + { + foreach($str as $key => $val) + { + $str[$key] = $this->escape_str($val, $like); + } + + return $str; + } + // Access the CI object $CI =& get_instance(); // Escape single quotes - return str_replace("'", "''", $CI->input->_remove_invisible_characters($str)); + $str = str_replace("'", "''", $CI->input->_remove_invisible_characters($str)); + + // escape LIKE condition wildcards + if ($like === TRUE) + { + $str = str_replace( array('%', '_', $this->_like_escape_chr), + array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr), + $str); + } + + return $str; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index a0cdb58a..5b2ba62b 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -34,7 +34,11 @@ class CI_DB_mysql_driver extends CI_DB { // The character used for escaping var $_escape_char = '`'; - + + // clause and character used for LIKE escape sequences - not used in MySQL + var $_like_escape_str = ''; + var $_like_escape_chr = ''; + /** * Whether to use the MySQL "delete hack" which allows the number * of affected rows to be shown. Uses a preg_replace when enabled, @@ -256,15 +260,16 @@ function trans_rollback() * * @access public * @param string + * @param bool whether or not the string will be used in a LIKE condition * @return string */ - function escape_str($str) + function escape_str($str, $like = FALSE) { if (is_array($str)) { foreach($str as $key => $val) { - $str[$key] = $this->escape_str($val); + $str[$key] = $this->escape_str($val, $like); } return $str; @@ -272,16 +277,24 @@ function escape_str($str) if (function_exists('mysql_real_escape_string') AND is_resource($this->conn_id)) { - return mysql_real_escape_string($str, $this->conn_id); + $str = mysql_real_escape_string($str, $this->conn_id); } elseif (function_exists('mysql_escape_string')) { - return mysql_escape_string($str); + $str = mysql_escape_string($str); } else { - return addslashes($str); + $str = addslashes($str); } + + // escape LIKE condition wildcards + if ($like === TRUE) + { + $str = str_replace(array('%', '_'), array('\\%', '\\_'), $str); + } + + return $str; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 9ef18e02..92d87111 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -35,6 +35,10 @@ class CI_DB_mysqli_driver extends CI_DB { // The character used for escaping var $_escape_char = '`'; + // clause and character used for LIKE escape sequences - not used in MySQL + var $_like_escape_str = ''; + var $_like_escape_chr = ''; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is @@ -257,22 +261,41 @@ function trans_rollback() * * @access public * @param string + * @param bool whether or not the string will be used in a LIKE condition * @return string */ - function escape_str($str) + function escape_str($str, $like = FALSE) { + if (is_array($str)) + { + foreach($str as $key => $val) + { + $str[$key] = $this->escape_str($val, $like); + } + + return $str; + } + if (function_exists('mysqli_real_escape_string') AND is_object($this->conn_id)) { - return mysqli_real_escape_string($this->conn_id, $str); + $str = mysqli_real_escape_string($this->conn_id, $str); } elseif (function_exists('mysql_escape_string')) { - return mysql_escape_string($str); + $str = mysql_escape_string($str); } else { - return addslashes($str); + $str = addslashes($str); } + + // escape LIKE condition wildcards + if ($like === TRUE) + { + $str = str_replace(array('%', '_'), array('\\%', '\\_'), $str); + } + + return $str; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 42dd5176..1fdb1bc4 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -47,7 +47,11 @@ class CI_DB_oci8_driver extends CI_DB { // The character used for excaping var $_escape_char = '"'; - + + // clause and character used for LIKE escape sequences + var $_like_escape_str = " escape '%s' "; + var $_like_escape_chr = '!'; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is @@ -368,14 +372,35 @@ function trans_rollback() * * @access public * @param string + * @param bool whether or not the string will be used in a LIKE condition * @return string */ - function escape_str($str) + function escape_str($str, $like = FALSE) { + if (is_array($str)) + { + foreach($str as $key => $val) + { + $str[$key] = $this->escape_str($val, $like); + } + + return $str; + } + // Access the CI object $CI =& get_instance(); - return $CI->input->_remove_invisible_characters($str); + $str = $CI->input->_remove_invisible_characters($str); + + // escape LIKE condition wildcards + if ($like === TRUE) + { + $str = str_replace( array('%', '_', $this->_like_escape_chr), + array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr), + $str); + } + + return $str; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 0f8b4200..a14aaa1f 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -34,7 +34,11 @@ class CI_DB_odbc_driver extends CI_DB { // the character used to excape - not necessary for ODBC var $_escape_char = ''; - + + // clause and character used for LIKE escape sequences + var $_like_escape_str = " {escape '%s'} "; + var $_like_escape_chr = '!'; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is @@ -237,15 +241,36 @@ function trans_rollback() * * @access public * @param string + * @param bool whether or not the string will be used in a LIKE condition * @return string */ - function escape_str($str) + function escape_str($str, $like = FALSE) { + if (is_array($str)) + { + foreach($str as $key => $val) + { + $str[$key] = $this->escape_str($val, $like); + } + + return $str; + } + // Access the CI object $CI =& get_instance(); - + // ODBC doesn't require escaping - return $CI->_remove_invisible_characters($str); + $str = $CI->input->_remove_invisible_characters($str); + + // escape LIKE condition wildcards + if ($like === TRUE) + { + $str = str_replace( array('%', '_', $this->_like_escape_chr), + array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr), + $str); + } + + return $str; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 9d53b1ef..8d0d8901 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -34,6 +34,10 @@ class CI_DB_postgre_driver extends CI_DB { var $_escape_char = '"'; + // clause and character used for LIKE escape sequences + var $_like_escape_str = " ESCAPE '%s' "; + var $_like_escape_chr = '!'; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is @@ -253,11 +257,32 @@ function trans_rollback() * * @access public * @param string + * @param bool whether or not the string will be used in a LIKE condition * @return string */ - function escape_str($str) - { - return pg_escape_string($str); + function escape_str($str, $like = FALSE) + { + if (is_array($str)) + { + foreach($str as $key => $val) + { + $str[$key] = $this->escape_str($val, $like); + } + + return $str; + } + + $str = pg_escape_string($str); + + // escape LIKE condition wildcards + if ($like === TRUE) + { + $str = str_replace( array('%', '_', $this->_like_escape_chr), + array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr), + $str); + } + + return $str; } // -------------------------------------------------------------------- diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 3ef88dbb..104a3bc3 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -37,6 +37,10 @@ class CI_DB_sqlite_driver extends CI_DB { // The character used to escape with - not needed for SQLite var $_escape_char = ''; + // clause and character used for LIKE escape sequences + var $_like_escape_str = " ESCAPE '%s' "; + var $_like_escape_chr = '!'; + /** * The syntax to count rows is slightly different across different * database engines, so this string appears in each driver and is @@ -253,11 +257,32 @@ function trans_rollback() * * @access public * @param string + * @param bool whether or not the string will be used in a LIKE condition * @return string */ - function escape_str($str) + function escape_str($str, $like = FALSE) { - return sqlite_escape_string($str); + if (is_array($str)) + { + foreach($str as $key => $val) + { + $str[$key] = $this->escape_str($val, $like); + } + + return $str; + } + + $str = sqlite_escape_string($str); + + // escape LIKE condition wildcards + if ($like === TRUE) + { + $str = str_replace( array('%', '_', $this->_like_escape_chr), + array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr), + $str); + } + + return $str; } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 06375d6f..cdbfbbd0 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,6 +71,9 @@

    Version 1.7.2

  • Database
    • Switched from using gettype() in escape() to is_* methods, since future PHP versions might change its output.
      • +
    • Updated all database drivers to handle arrays in escape_str()
      • +
    • Added escape_like_str() method for escaping strings to be used in LIKE conditions
      • +
    • Updated Active Record to utilize the new LIKE escaping mechanism.
    • @@ -80,6 +83,7 @@

    Bug fixes for 1.7.2

    • Fixed assorted user guide typos or examples (#6743).
    • Fixed a bug with ORIG_PATH_INFO that was allowing URIs of just a slash through.
      • +
    • Fixed a fatal error in the Oracle and ODBC drivers (#6752)

    Version 1.7.1

    @@ -136,7 +140,6 @@

    Bug fixes for 1.7.1

  • Fixed a bug where TRUNCATE was not considered a "write" query (#6619).
  • Fixed a bug where csv_from_result() was checking for a nonexistent method.
  • Fixed a bug _protect_identifiers() where it was improperly removing all pipe symbols from items
    • -
  • Fixed a fatal error in the Oracle driver (#6752)
  • Fixed assorted user guide typos or examples (#5998, #6093, #6259, #6339, #6432, #6521).
    • diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index f42e179a..9665af23 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -96,7 +96,7 @@

    Protecting identifiers

    Escaping Queries

    It's a very good security practice to escape your data before submitting it into your database. -CodeIgniter has two functions that help you do this:

    +CodeIgniter has three methods that help you do this:

    1. $this->db->escape() This function determines the data type so that it @@ -108,6 +108,13 @@

      Escaping Queries

      Most of the time you'll use the above function rather than this one. Use the function like this: $sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')";
      2. + +
    2. $this->db->escape_like_str() This method should be used when strings are to be used in LIKE +conditions so that LIKE wildcards ('%', '_') in the string are also properly escaped. + +$search = '20% raise';
      +$sql = "SELECT id FROM table WHERE column LIKE '%".$this->db->escape_like_str($search)."%'";       +
    From bdc7fb907f04469f526868058103e35460f4e52d Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 20 Feb 2009 21:55:10 +0000 Subject: [PATCH 1650/2544] fixed docblock --- system/database/DB_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 729af5bf..161569d3 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -693,7 +693,7 @@ function escape($str) // -------------------------------------------------------------------- /** - * Smart Escape LIKE String + * Escape LIKE String * * Calls the individual driver for platform * specific escaping for LIKE conditions From 3c11b6f5dee83ebe11dfdcec3022313c45a4a4e2 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 20 Feb 2009 22:36:27 +0000 Subject: [PATCH 1651/2544] updated _list_tables() in db drivers to escape the db prefix for LIKE wildcards --- system/database/drivers/mssql/mssql_driver.php | 2 +- system/database/drivers/mysql/mysql_driver.php | 2 +- system/database/drivers/mysqli/mysqli_driver.php | 2 +- system/database/drivers/oci8/oci8_driver.php | 2 +- system/database/drivers/odbc/odbc_driver.php | 2 +- system/database/drivers/postgre/postgre_driver.php | 2 +- system/database/drivers/sqlite/sqlite_driver.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index c89e2549..ddc036da 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -373,7 +373,7 @@ function _list_tables($prefix_limit = FALSE) // for future compatibility if ($prefix_limit !== FALSE AND $this->dbprefix != '') { - //$sql .= " LIKE '".$this->dbprefix."%'"; + //$sql .= " LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_char); return FALSE; // not currently supported } diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 5b2ba62b..2b05c3f1 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -370,7 +370,7 @@ function _list_tables($prefix_limit = FALSE) if ($prefix_limit !== FALSE AND $this->dbprefix != '') { - $sql .= " LIKE '".$this->dbprefix."%'"; + $sql .= " LIKE '".$this->escape_like_str($this->dbprefix)."%'"; } return $sql; diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 92d87111..6558112c 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -371,7 +371,7 @@ function _list_tables($prefix_limit = FALSE) if ($prefix_limit !== FALSE AND $this->dbprefix != '') { - $sql .= " LIKE '".$this->dbprefix."%'"; + $sql .= " LIKE '".$this->escape_like_str($this->dbprefix)."%'"; } return $sql; diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 1fdb1bc4..4dfec2e3 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -477,7 +477,7 @@ function _list_tables($prefix_limit = FALSE) if ($prefix_limit !== FALSE AND $this->dbprefix != '') { - $sql .= " WHERE TABLE_NAME LIKE '".$this->dbprefix."%'"; + $sql .= " WHERE TABLE_NAME LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_char); } return $sql; diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index a14aaa1f..f7db4ca4 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -346,7 +346,7 @@ function _list_tables($prefix_limit = FALSE) if ($prefix_limit !== FALSE AND $this->dbprefix != '') { - //$sql .= " LIKE '".$this->dbprefix."%'"; + //$sql .= " LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_char); return FALSE; // not currently supported } diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 8d0d8901..4bc5b7d9 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -386,7 +386,7 @@ function _list_tables($prefix_limit = FALSE) if ($prefix_limit !== FALSE AND $this->dbprefix != '') { - $sql .= " AND table_name LIKE '".$this->dbprefix."%'"; + $sql .= " AND table_name LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_char); } return $sql; diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 104a3bc3..bb1e6d02 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -358,7 +358,7 @@ function _list_tables($prefix_limit = FALSE) if ($prefix_limit !== FALSE AND $this->dbprefix != '') { - $sql .= " AND 'name' LIKE '".$this->dbprefix."%'"; + $sql .= " AND 'name' LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_char); } return $sql; } From a34a2b2c6761e7a331934f948db6b334a6316cd0 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 24 Feb 2009 22:04:25 +0000 Subject: [PATCH 1652/2544] Updated the "update cart" information, as it was incorrect. --- user_guide/libraries/cart.html | 150 +++++++++++++-------------------- 1 file changed, 58 insertions(+), 92 deletions(-) diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index 4649c5dd..d63be495 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -155,98 +155,6 @@

    Adding Multiple Items to The Cart

    -

    Updating The Cart

    - -

    To update the information in your cart, pass an array containing the product ID and quantity to the $this->cart->update() function:

    - - - -$data = array(
    -               'id'  => '123XYZ',
    -               'qty' => 3
    -            );
    -
    - -$this->cart->update($data); - -     - -

    Just as you can when inserting, you may use a multi-dimensional array in order to update multiple items simultaneously:

    - - - -$data = array(
    - -               array(
    -                       'id'      => 'sku_123ABC',
    -                       'qty'     => 3
    -                    ),
    - -               array(
    -                       'id'      => 'sku_567ZYX',
    -                       'qty'     => 4
    -                    ),
    - -               array(
    -                       'id'      => 'sku_965QRS',
    -                       'qty'     => 2
    -                    )
    - -            );
    -
    - -$this->cart->update($data); - -     - - - - -

    Deleting an Item From The Cart

    - -

    To delete an item from your cart, pass an array containing the product ID and a quantity of zero to the $this->cart->update() function:

    - - - -$data = array(
    -               'id'  => '123XYZ',
    -               'qty' => 0
    -            );
    -
    - -$this->cart->update($data); - -     - - -

    You may use a multi-dimensional array in order to delete multiple items simultaneously:

    - - - -$data = array(
    - -               array(
    -                       'id'      => 'sku_123ABC',
    -                       'qty'     => 0
    -                    ),
    - -               array(
    -                       'id'      => 'sku_567ZYX',
    -                       'qty'     => 0
    -                    ),
    - -               array(
    -                       'id'      => 'sku_965QRS',
    -                       'qty'     => 0
    -                    )
    - -            );
    -
    - -$this->cart->update($data); - -     -

    Displaying the Cart

    @@ -313,6 +221,64 @@

    Displaying the Cart

    + + +

    Updating The Cart

    + +

    To update the information in your cart, you must pass an array containing the Row ID and quantity to the $this->cart->update() function:

    + +

    Note: If the quantity is set to zero, the item will be removed from the cart.

    + + +$data = array(
    +               'rowid' => 'b99ccdf16028f015540f341130b6d8ec',
    +               'qty'   => 3
    +            );
    +
    + +$this->cart->update($data); +

    +// Or a multi-dimensional array

    +$data = array(
    + +               array(
    +                       'rowid'   => 'b99ccdf16028f015540f341130b6d8ec',
    +                       'qty'     => 3
    +                    ),
    + +               array(
    +                       'rowid'   => 'xw82g9q3r495893iajdh473990rikw23',
    +                       'qty'     => 4
    +                    ),
    + +               array(
    +                       'rowid'   => 'fh4kdkkkaoe30njgoe92rkdkkobec333',
    +                       'qty'     => 2
    +                    )
    + +            );
    +
    + +$this->cart->update($data); + + + + +     + +

    What is a Row ID?  The row ID is a unique identifier that is generated by the cart code when an item is added to the cart. The reason a +unique ID is created is so that identical products with different options can be managed by the cart.

    + +

    For example, let's say someone buys two identical t-shirts (same product ID), but in different sizes. The product ID (and other attributes) will be +identical for both sizes because it's the same shirt. The only difference will be the size. The cart must therefore have a means of identifying this +difference so that the two sizes of shirts can be managed independently. It does so by creating a unique "row ID" based on the product ID and any options associated with it.

    + +

    In nearly all cases, updating the cart will be something the user does via the "view cart" page, so as a developer, it is unlikely that you will ever have to concern yourself +with the "row ID", other then making sure your "view cart" page contains this information in a hidden form field, and making sure it gets passed to the update +function when the update form is submitted. Please examine the construction of the "view cart" page above for more information.

    + + +

     

    From df39d51e3d4f18343666a2e4b991c656d0e61a13 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 24 Feb 2009 22:29:37 +0000 Subject: [PATCH 1653/2544] Removed the hard coded number formatting and added a "format number" function. --- system/libraries/Cart.php | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index 61223c59..800c21f7 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -32,7 +32,7 @@ class CI_Cart { // Private variables. Do not change! var $CI; - var $_cart_contents = array(); + var $_cart_contents = array(); /** @@ -382,7 +382,7 @@ function _save_cart() // Set the subtotal // Note: "subtotal" is a reserved array index. We need to make a note of that in the docs - $this->_cart_contents[$key]['subtotal'] = number_format(($this->_cart_contents[$key]['price'] * $this->_cart_contents[$key]['qty']), 2); + $this->_cart_contents[$key]['subtotal'] = ($this->_cart_contents[$key]['price'] * $this->_cart_contents[$key]['qty']); } // Unset these so our total can be calculated correctly below @@ -420,7 +420,7 @@ function _save_cart() */ function total() { - return number_format($this->_cart_contents['cart_total'], 2); + return $this->_cart_contents['cart_total']; } // -------------------------------------------------------------------- @@ -499,7 +499,30 @@ function product_options($rowid = '') return $this->_cart_contents[$rowid]['options']; } + + // -------------------------------------------------------------------- + /** + * Format Number + * + * Returns the supplied number with commas and a decimal point. + * + * @access public + * @return integer + */ + function format_number($n = '') + { + if ($n == '') + { + return ''; + } + + // Remove anything that isn't a number or decimal point. + $n = trim(preg_replace('/([^0-9\.])/i', '', $n)); + + return number_format($n, 2, '.', ','); + } + // -------------------------------------------------------------------- /** From f4ed69e80c553486a8f3d69e46911fcb25c73b9e Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 24 Feb 2009 22:31:49 +0000 Subject: [PATCH 1654/2544] Updated the view cart info in light of the changes to the cart class. --- user_guide/libraries/cart.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index d63be495..bd3caef9 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -200,8 +200,8 @@

    Displaying the Cart

    <?php endif; ?> </td> - <td style="text-align:right"><?php echo $items['price']; ?></td> - <td style="text-align:right">$<?php echo $items['subtotal']; ?></td> + <td style="text-align:right"><?php echo $this->cart->format_number($items['price']); ?></td> + <td style="text-align:right">$<?php echo $this->cart->format_number($items['subtotal']); ?></td> </tr> <?php $i++; ?> @@ -211,7 +211,7 @@

    Displaying the Cart

    <tr> <td colspan="2"> </td> <td class="right"><strong>Total</strong></td> - <td class="right">$<?php echo $this->cart->total(); ?></td> + <td class="right">$<?php echo $this->cart->format_number($this->cart->total()); ?></td> </tr> </table> @@ -222,7 +222,6 @@

    Displaying the Cart

    -

    Updating The Cart

    To update the information in your cart, you must pass an array containing the Row ID and quantity to the $this->cart->update() function:

    From af4fb22745413cac182064a495da83318a41fde9 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Tue, 24 Feb 2009 22:44:22 +0000 Subject: [PATCH 1655/2544] Fixed a bug in the "save cart" function that was causing the total to be calcluated incorrectly --- system/libraries/Cart.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index 800c21f7..2eb8b75b 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -368,12 +368,16 @@ function _update($items = array()) */ function _save_cart() { - // First we add up the individual prices and get the cart total + // Unset these so our total can be calculated correctly below + unset($this->_cart_contents['total_items']); + unset($this->_cart_contents['cart_total']); + + // Lets add up the individual prices and set the cart sub-total $total = 0; foreach ($this->_cart_contents as $key => $val) { // We make sure the array contains the proper indexes - if ( ! isset($val['price']) or ! isset($val['qty'])) + if ( ! is_array($val) OR ! isset($val['price']) OR ! isset($val['qty'])) { continue; } @@ -381,14 +385,9 @@ function _save_cart() $total += ($val['price'] * $val['qty']); // Set the subtotal - // Note: "subtotal" is a reserved array index. We need to make a note of that in the docs $this->_cart_contents[$key]['subtotal'] = ($this->_cart_contents[$key]['price'] * $this->_cart_contents[$key]['qty']); } - // Unset these so our total can be calculated correctly below - unset($this->_cart_contents['total_items']); - unset($this->_cart_contents['cart_total']); - // Set the cart total and total items. $this->_cart_contents['total_items'] = count($this->_cart_contents); $this->_cart_contents['cart_total'] = $total; From 87cbafce2d6803af78714baf8bba64309c01fc33 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 27 Feb 2009 16:29:59 +0000 Subject: [PATCH 1656/2544] added reconnect() method to db drivers --- .../database/drivers/mssql/mssql_driver.php | 16 ++++++++++++++++ .../database/drivers/mysql/mysql_driver.php | 19 +++++++++++++++++++ .../database/drivers/mysqli/mysqli_driver.php | 19 +++++++++++++++++++ system/database/drivers/oci8/oci8_driver.php | 16 ++++++++++++++++ system/database/drivers/odbc/odbc_driver.php | 16 ++++++++++++++++ .../drivers/postgre/postgre_driver.php | 19 +++++++++++++++++++ .../database/drivers/sqlite/sqlite_driver.php | 16 ++++++++++++++++ user_guide/changelog.html | 1 + user_guide/database/connecting.html | 5 +++++ 9 files changed, 127 insertions(+) diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index ddc036da..241b280d 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -82,7 +82,23 @@ function db_pconnect() } // -------------------------------------------------------------------- + + /** + * Reconnect + * + * Keep / reestablish the db connection if no queries have been + * sent for a length of time exceeding the server's idle timeout + * + * @access public + * @return void + */ + function reconnect() + { + // not implemented in MSSQL + } + // -------------------------------------------------------------------- + /** * Select the database * diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 2b05c3f1..334daf3a 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -90,6 +90,25 @@ function db_pconnect() // -------------------------------------------------------------------- + /** + * Reconnect + * + * Keep / reestablish the db connection if no queries have been + * sent for a length of time exceeding the server's idle timeout + * + * @access public + * @return void + */ + function reconnect() + { + if (mysql_ping($this->conn_id) === FALSE) + { + $this->conn_id = FALSE; + } + } + + // -------------------------------------------------------------------- + /** * Select the database * diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 6558112c..74cfff44 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -90,6 +90,25 @@ function db_pconnect() // -------------------------------------------------------------------- + /** + * Reconnect + * + * Keep / reestablish the db connection if no queries have been + * sent for a length of time exceeding the server's idle timeout + * + * @access public + * @return void + */ + function reconnect() + { + if (mysqli_ping($this->conn_id) === FALSE) + { + $this->conn_id = FALSE; + } + } + + // -------------------------------------------------------------------- + /** * Select the database * diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 4dfec2e3..f4ef42a1 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -97,6 +97,22 @@ function db_pconnect() // -------------------------------------------------------------------- + /** + * Reconnect + * + * Keep / reestablish the db connection if no queries have been + * sent for a length of time exceeding the server's idle timeout + * + * @access public + * @return void + */ + function reconnect() + { + // not implemented in oracle + } + + // -------------------------------------------------------------------- + /** * Select the database * diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index f7db4ca4..2e529f32 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -81,6 +81,22 @@ function db_pconnect() // -------------------------------------------------------------------- + /** + * Reconnect + * + * Keep / reestablish the db connection if no queries have been + * sent for a length of time exceeding the server's idle timeout + * + * @access public + * @return void + */ + function reconnect() + { + // not implemented in odbc + } + + // -------------------------------------------------------------------- + /** * Select the database * diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 4bc5b7d9..db3a3f29 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -101,6 +101,25 @@ function db_pconnect() // -------------------------------------------------------------------- + /** + * Reconnect + * + * Keep / reestablish the db connection if no queries have been + * sent for a length of time exceeding the server's idle timeout + * + * @access public + * @return void + */ + function reconnect() + { + if (pg_ping($this->conn_id) === FALSE) + { + $this->conn_id = FALSE; + } + } + + // -------------------------------------------------------------------- + /** * Select the database * diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index bb1e6d02..cd7b26bc 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -99,6 +99,22 @@ function db_pconnect() // -------------------------------------------------------------------- + /** + * Reconnect + * + * Keep / reestablish the db connection if no queries have been + * sent for a length of time exceeding the server's idle timeout + * + * @access public + * @return void + */ + function reconnect() + { + // not implemented in SQLite + } + + // -------------------------------------------------------------------- + /** * Select the database * diff --git a/user_guide/changelog.html b/user_guide/changelog.html index cdbfbbd0..3ddaf8d0 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -74,6 +74,7 @@

    Version 1.7.2

  • Updated all database drivers to handle arrays in escape_str()
  • Added escape_like_str() method for escaping strings to be used in LIKE conditions
  • Updated Active Record to utilize the new LIKE escaping mechanism.
    • +
  • Added reconnect() method to DB drivers to try to keep alive / reestablish a connection after a long idle.
    • diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 3579e1af..b4d51794 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -158,6 +158,11 @@

    Connecting to Multiple Databases

    +

    Reconnecting / Keeping the Connection Alive

    + +

    If the database server's idle timeout is exceeded while you're doing some heavy PHP lifting (processing an image, for instance), you should consider pinging the server by using the reconnect() method before sending further queries, which can gracefully keep the connection alive or re-establish it.

    + +$this->db->reconnect(); From 8a54ef21839dd970c85491cddff836b391d48882 Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Wed, 4 Mar 2009 14:49:53 +0000 Subject: [PATCH 1657/2544] Altered modify_column and add_column to loop through multiple fields rather than returning after first field. --- system/database/DB_forge.php | 56 ++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index f708910f..c4597bd1 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -257,18 +257,28 @@ function add_column($table = '', $field = array(), $after_field = '') } // add field info into field array, but we can only do one at a time - // so only grab the first field in the event there are more then one - $this->add_field(array_slice($field, 0, 1)); + // so we cycle through - if (count($this->fields) == 0) - { - show_error('Field information is required.'); - } + foreach ($field as $k => $v) + { + $this->add_field(array($k => $field[$k])); - $sql = $this->_alter_table('ADD', $this->db->dbprefix.$table, $this->fields, $after_field); + if (count($this->fields) == 0) + { + show_error('Field information is required.'); + } + + $sql = $this->_alter_table('ADD', $this->db->dbprefix.$table, $this->fields, $after_field); - $this->_reset(); - return $this->db->query($sql); + $this->_reset(); + + if ($this->db->query($sql) === FALSE) + { + return FALSE; + } + } + + return TRUE; } // -------------------------------------------------------------------- @@ -318,18 +328,28 @@ function modify_column($table = '', $field = array()) } // add field info into field array, but we can only do one at a time - // so only grab the first field in the event there are more then one - $this->add_field(array_slice($field, 0, 1)); + // so we cycle through - if (count($this->fields) == 0) - { - show_error('Field information is required.'); - } + foreach ($field as $k => $v) + { + $this->add_field(array($k => $field[$k])); - $sql = $this->_alter_table('CHANGE', $this->db->dbprefix.$table, $this->fields); + if (count($this->fields) == 0) + { + show_error('Field information is required.'); + } + + $sql = $this->_alter_table('CHANGE', $this->db->dbprefix.$table, $this->fields); - $this->_reset(); - return $this->db->query($sql); + $this->_reset(); + + if ($this->db->query($sql) === FALSE) + { + return FALSE; + } + } + + return TRUE; } // -------------------------------------------------------------------- From 6559ec305aeddf5fc13b2c0b460d7c22e8ded191 Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Wed, 4 Mar 2009 14:50:59 +0000 Subject: [PATCH 1658/2544] Altered modify_column and add_column to loop through multiple fields rather than returning after first field. --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3ddaf8d0..3650e03a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -85,6 +85,7 @@

    Bug fixes for 1.7.2

  • Fixed assorted user guide typos or examples (#6743).
  • Fixed a bug with ORIG_PATH_INFO that was allowing URIs of just a slash through.
  • Fixed a fatal error in the Oracle and ODBC drivers (#6752)
    • +
  • Fixed a bug where Database Forge's add_column and modify_column were not looping through when sent multiple fields.

    • Version 1.7.1

    From 7523ef1012514bb382b06f2169b4b419b4ed0e7d Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 6 Mar 2009 22:31:19 +0000 Subject: [PATCH 1659/2544] Removed the "index.php" portion from the FCPATH constant, as it was not needed. --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 39aeda5c..bac85d9a 100644 --- a/index.php +++ b/index.php @@ -79,15 +79,15 @@ |--------------------------------------------------------------- | | EXT - The file extension. Typically ".php" -| FCPATH - The full server path to THIS file | SELF - The name of THIS file (typically "index.php") +| FCPATH - The full server path to THIS file | BASEPATH - The full server path to the "system" folder | APPPATH - The full server path to the "application" folder | */ define('EXT', '.'.pathinfo(__FILE__, PATHINFO_EXTENSION)); -define('FCPATH', __FILE__); define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); +define('FCPATH', str_replace(SELF, '', __FILE__)); define('BASEPATH', $system_folder.'/'); if (is_dir($application_folder)) From f88ad5e88fded3d1bfbf71ef9c194ebcc433c5e0 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 6 Mar 2009 22:32:23 +0000 Subject: [PATCH 1660/2544] Updated _parse_request_uri to reflect the fact that FCPATH no longer contains index.php as part of the path. --- system/libraries/URI.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/URI.php b/system/libraries/URI.php index e74af31f..73ddec87 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -146,7 +146,7 @@ function _parse_request_uri() return ''; } - $fc_path = FCPATH; + $fc_path = FCPATH.SELF; if (strpos($request_uri, '?') !== FALSE) { $fc_path .= '?'; From faac15e56fd45a18049f83d4282436c3d86f6939 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 7 Mar 2009 17:17:58 +0000 Subject: [PATCH 1661/2544] spaces for tabs --- system/libraries/Pagination.php | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 09b5bec8..629cbf14 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -63,14 +63,14 @@ function CI_Pagination($params = array()) { if (count($params) > 0) { - $this->initialize($params); + $this->initialize($params); } - + log_message('debug', "Pagination Class Initialized"); } - + // -------------------------------------------------------------------- - + /** * Initialize Preferences * @@ -91,21 +91,21 @@ function initialize($params = array()) } } } - + // -------------------------------------------------------------------- - + /** * Generate the pagination links * * @access public * @return string - */ + */ function create_links() { // If our item count or per-page total is zero there is no need to continue. if ($this->total_rows == 0 OR $this->per_page == 0) { - return ''; + return ''; } // Calculate the total number of pages @@ -117,15 +117,15 @@ function create_links() return ''; } - // Determine the current page number. + // Determine the current page number. $CI =& get_instance(); - + if ($CI->config->item('enable_query_strings') === TRUE OR $this->page_query_string === TRUE) { if ($CI->input->get($this->query_string_segment) != 0) { $this->cur_page = $CI->input->get($this->query_string_segment); - + // Prep the current page - no funny business! $this->cur_page = (int) $this->cur_page; } @@ -135,31 +135,31 @@ function create_links() if ($CI->uri->segment($this->uri_segment) != 0) { $this->cur_page = $CI->uri->segment($this->uri_segment); - + // Prep the current page - no funny business! $this->cur_page = (int) $this->cur_page; } } $this->num_links = (int)$this->num_links; - + if ($this->num_links < 1) { show_error('Your number of links must be a positive number.'); } - + if ( ! is_numeric($this->cur_page)) { $this->cur_page = 0; } - + // Is the page number beyond the result range? // If so we show the last page if ($this->cur_page > $this->total_rows) { $this->cur_page = ($num_pages - 1) * $this->per_page; } - + $uri_page_number = $this->cur_page; $this->cur_page = floor(($this->cur_page/$this->per_page) + 1); @@ -200,7 +200,7 @@ function create_links() for ($loop = $start -1; $loop <= $end; $loop++) { $i = ($loop * $this->per_page) - $this->per_page; - + if ($i >= 0) { if ($this->cur_page == $loop) @@ -234,8 +234,8 @@ function create_links() // Add the wrapper HTML if exists $output = $this->full_tag_open.$output.$this->full_tag_close; - - return $output; + + return $output; } } // END Pagination Class From 28e5c8fc0ed79017a67b896613698e98fa7da8b3 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Mon, 9 Mar 2009 22:36:48 +0000 Subject: [PATCH 1662/2544] Fixed a bug that was not setting the default checkbox/radio/pull-down value correctly --- system/helpers/form_helper.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 4a62cdb5..05616f70 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -644,7 +644,7 @@ function set_select($field = '', $value = '', $default = FALSE) { if ( ! isset($_POST[$field])) { - if (count($_POST) === 0) + if (count($_POST) === 0 AND $default == TRUE) { return ' selected="selected"'; } @@ -699,7 +699,7 @@ function set_checkbox($field = '', $value = '', $default = FALSE) { if ( ! isset($_POST[$field])) { - if (count($_POST) === 0) + if (count($_POST) === 0 AND $default == TRUE) { return ' checked="checked"'; } @@ -754,7 +754,7 @@ function set_radio($field = '', $value = '', $default = FALSE) { if ( ! isset($_POST[$field])) { - if (count($_POST) === 0) + if (count($_POST) === 0 AND $default == TRUE) { return ' checked="checked"'; } From 1322ec54289f09f7e176924902d5642f269aec48 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 11 Mar 2009 17:01:14 +0000 Subject: [PATCH 1663/2544] ereg eradication --- system/helpers/date_helper.php | 2 +- system/libraries/Image_lib.php | 8 ++++---- system/libraries/Trackback.php | 7 ++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index dbd7e0ec..7f607342 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -460,7 +460,7 @@ function human_to_unix($datestr = '') $hour = (strlen($ex['0']) == 1) ? '0'.$ex['0'] : $ex['0']; $min = (strlen($ex['1']) == 1) ? '0'.$ex['1'] : $ex['1']; - if (isset($ex['2']) AND ereg("[0-9]{1,2}", $ex['2'])) + if (isset($ex['2']) && preg_match('/[0-9]{1,2}/', $ex['2'])) { $sec = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; } diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 2896c9e0..1e1ae7db 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -350,7 +350,7 @@ function resize() { $protocol = 'image_process_'.$this->image_library; - if (eregi("gd2$", $protocol)) + if (preg_match('/gd2$/i', $protocol)) { $protocol = 'image_process_gd'; } @@ -373,7 +373,7 @@ function crop() { $protocol = 'image_process_'.$this->image_library; - if (eregi("gd2$", $protocol)) + if (preg_match('/gd2$/i', $protocol)) { $protocol = 'image_process_gd'; } @@ -559,9 +559,9 @@ function image_process_imagemagick($action = 'resize') return FALSE; } - if ( ! eregi("convert$", $this->library_path)) + if ( ! preg_match("/convert$/i", $this->library_path)) { - if ( ! eregi("/$", $this->library_path)) $this->library_path .= "/"; + $this->library_path = rtrim($this->library_path, '/').'/'; $this->library_path .= 'convert'; } diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php index 844e5036..d53f17fe 100644 --- a/system/libraries/Trackback.php +++ b/system/libraries/Trackback.php @@ -267,7 +267,7 @@ function process($url, $data) } @fclose($fp); - if ( ! eregi("0", $this->response)) + if (stristr($this->response, '0') === FALSE) { $message = 'An unknown error was encountered'; @@ -370,10 +370,7 @@ function get_id($url) } else { - if (ereg("/$", $url)) - { - $url = substr($url, 0, -1); - } + $url = rtrim($url, '/'); $tb_array = explode('/', $url); $tb_id = $tb_array[count($tb_array)-1]; From 50d45c0c4332e942a2f11d37f5f6fe0f0efc79e3 Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Thu, 26 Mar 2009 18:58:38 +0000 Subject: [PATCH 1664/2544] Modified form_hidden() to accept multi-dimensional arrays. --- user_guide/changelog.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3650e03a..e4d57f6b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -77,7 +77,11 @@

    Version 1.7.2

  • Added reconnect() method to DB drivers to try to keep alive / reestablish a connection after a long idle.
    • - +
  • Helpers +
      +
    • Modified form_hidden() in the Form helper to accept multi-dimensional arrays.
      • +
    +

    • Bug fixes for 1.7.2

    From 57fe41072c9d97d3cba2cd5faef529ac94571bfb Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Thu, 26 Mar 2009 18:58:46 +0000 Subject: [PATCH 1665/2544] Modified form_hidden() to accept multi-dimensional arrays. --- system/helpers/form_helper.php | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 05616f70..0173340c 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -103,19 +103,35 @@ function form_open_multipart($action, $attributes = array(), $hidden = array()) */ if ( ! function_exists('form_hidden')) { - function form_hidden($name, $value = '') + function form_hidden($name, $value = '', $recursing = FALSE) { - if ( ! is_array($name)) + static $form; + + if ($recursing === FALSE) { - return ''; + $form = "\n"; } - $form = ''; + if (is_array($name)) + { + foreach ($name as $key => $val) + { + form_hidden($key, $val, TRUE); + } + return $form; + } - foreach ($name as $name => $value) + if ( ! is_array($value)) + { + $form .= ''."\n"; + } + else { - $form .= "\n"; - $form .= ''; + foreach ($value as $k => $v) + { + $k = (is_int($k)) ? '' : $k; + form_hidden($name.'['.$k.']', $v, TRUE); + } } return $form; @@ -264,7 +280,7 @@ function form_dropdown($name = '', $options = array(), $selected = array(), $ext $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; $form = '"; + return ""; } } From b8d3c3defbef3563889641bf4448eeaa51519e42 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 24 Jun 2009 15:27:01 +0000 Subject: [PATCH 1679/2544] some mods to xmlrpc library to handle data types better, and to exit() content so Output class does not muck with it --- system/libraries/Xmlrpc.php | 6 +++--- system/libraries/Xmlrpcs.php | 2 +- user_guide/changelog.html | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index 4a5b97fb..2022a7eb 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -1351,13 +1351,13 @@ function serializedata($typ, $val) switch ($typ) { case $this->xmlrpcBase64: - $rs .= "<{$typ}>" . base64_encode($val) . "\n"; + $rs .= "<{$typ}>" . base64_encode((string)$val) . "\n"; break; case $this->xmlrpcBoolean: - $rs .= "<{$typ}>" . ($val ? '1' : '0') . "\n"; + $rs .= "<{$typ}>" . ((bool)$val ? '1' : '0') . "\n"; break; case $this->xmlrpcString: - $rs .= "<{$typ}>" . htmlspecialchars($val). "\n"; + $rs .= "<{$typ}>" . htmlspecialchars((string)$val). "\n"; break; default: $rs .= "<{$typ}>{$val}\n"; diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php index b7382fae..c7daa600 100644 --- a/system/libraries/Xmlrpcs.php +++ b/system/libraries/Xmlrpcs.php @@ -123,7 +123,7 @@ function serve() header("Content-Type: text/xml"); header("Content-Length: ".strlen($payload)); - echo $payload; + exit($payload); } //------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3ae2cb61..9db5c150 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -96,6 +96,7 @@

    Bug fixes for 1.7.2

  • Fixed a bug where Database Forge's add_column and modify_column were not looping through when sent multiple fields.
  • Fixed a bug where the File Helper was using '/' instead of the DIRECTORY_SEPARATOR constant.
  • Fixed a bug to prevent PHP errors when attempting to use sendmail on servers that have manually disabled the PHP popen() function.
    • +
  • Fixed a bug that would cause PHP errors in XML-RPC data if the PHP data type did not match the specified XML-RPC type.

    • Version 1.7.1

    From 7e39c0cdbaab7be5f8738ee964739e176d1639b7 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 24 Jun 2009 16:25:03 +0000 Subject: [PATCH 1680/2544] fixed dateTime.iso8601 processing in XML-RPC class --- system/libraries/Xmlrpc.php | 4 ++-- user_guide/changelog.html | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index 2022a7eb..4b3470c3 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -38,7 +38,7 @@ class CI_Xmlrpc { var $xmlrpcBoolean = 'boolean'; var $xmlrpcDouble = 'double'; var $xmlrpcString = 'string'; - var $xmlrpcDateTime = 'datetime.iso8601'; + var $xmlrpcDateTime = 'dateTime.iso8601'; var $xmlrpcBase64 = 'base64'; var $xmlrpcArray = 'array'; var $xmlrpcStruct = 'struct'; @@ -231,7 +231,7 @@ function values_parsing($value, $return = FALSE) { if (is_array($value) && isset($value['0'])) { - if ( ! isset($value['1']) OR ! isset($this->xmlrpcTypes[strtolower($value['1'])])) + if ( ! isset($value['1']) OR (! isset($this->xmlrpcTypes[$value['1']]) && ! isset($this->xmlrpcTypes[strtolower($value['1'])]))) { if (is_array($value[0])) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9db5c150..0e127799 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -97,6 +97,7 @@

    Bug fixes for 1.7.2

  • Fixed a bug where the File Helper was using '/' instead of the DIRECTORY_SEPARATOR constant.
  • Fixed a bug to prevent PHP errors when attempting to use sendmail on servers that have manually disabled the PHP popen() function.
  • Fixed a bug that would cause PHP errors in XML-RPC data if the PHP data type did not match the specified XML-RPC type.
    • +
  • Fixed a bug in the XML-RPC class with parsing dateTime.iso8601 data types.

    • Version 1.7.1

    From 626d71d54f3dbbbd67b904f009bda36597757e56 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 24 Jun 2009 16:30:41 +0000 Subject: [PATCH 1681/2544] tweaked and dropped the strtolower altogether from checking xmlrpcTypes array since it's accessed later without changing the type's casing anyway --- system/libraries/Xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index 4b3470c3..5460842b 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -231,7 +231,7 @@ function values_parsing($value, $return = FALSE) { if (is_array($value) && isset($value['0'])) { - if ( ! isset($value['1']) OR (! isset($this->xmlrpcTypes[$value['1']]) && ! isset($this->xmlrpcTypes[strtolower($value['1'])]))) + if ( ! isset($value['1']) OR (! isset($this->xmlrpcTypes[$value['1']]))) { if (is_array($value[0])) { From 15b93ca14fb65565561cc9c38d02dc3df1f8ba07 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 2 Jul 2009 21:23:38 +0000 Subject: [PATCH 1682/2544] changed EXT to always be defined as '.php' to allow the renaming of the index.php file --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index bac85d9a..d60e79f6 100644 --- a/index.php +++ b/index.php @@ -85,7 +85,7 @@ | APPPATH - The full server path to the "application" folder | */ -define('EXT', '.'.pathinfo(__FILE__, PATHINFO_EXTENSION)); +define('EXT', '.php'); define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); define('FCPATH', str_replace(SELF, '', __FILE__)); define('BASEPATH', $system_folder.'/'); From 4e5cf1ca1cfcb4559d8b18898a526181963890f6 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 6 Jul 2009 20:53:41 +0000 Subject: [PATCH 1683/2544] Fixed a bug in the Form Validation library where multiple callbacks weren't working (#6110) --- system/libraries/Form_validation.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index f8077b8e..1497d851 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -601,7 +601,7 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) // If the field isn't required and we just processed a callback we'll move on... if ( ! in_array('required', $rules, TRUE) AND $result !== FALSE) { - return; + continue; } } else diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 0e127799..d99a52f8 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -90,6 +90,7 @@

    Version 1.7.2

    Bug fixes for 1.7.2

    • Fixed assorted user guide typos or examples (#6743, #7214, #7516, #7287).
      • +
    • Fixed a bug in the Form Validation library where multiple callbacks weren't working (#6110)
    • doctype helper default value was missing a "1".
    • Fixed a bug with ORIG_PATH_INFO that was allowing URIs of just a slash through.
    • Fixed a fatal error in the Oracle and ODBC drivers (#6752)
      • From 16d40d713b1d8d924ac20b542d344552a4c29648 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 10 Jul 2009 17:53:57 +0000 Subject: [PATCH 1684/2544] Fixed a case sensitive string replacement, simplified redundant string replacement --- system/libraries/Input.php | 4 ++-- user_guide/changelog.html | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 40799037..e7bf7277 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -656,11 +656,11 @@ function xss_clean($str, $is_image = FALSE) { // Images have a tendency to have the PHP short opening and closing tags every so often // so we skip those and only do the long opening tags. - $str = str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); + $str = str_replace(array(''), array('<?', '?>'), $str); } /* diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d99a52f8..2cd5c68e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -99,6 +99,7 @@

      Bug fixes for 1.7.2

    • Fixed a bug to prevent PHP errors when attempting to use sendmail on servers that have manually disabled the PHP popen() function.
    • Fixed a bug that would cause PHP errors in XML-RPC data if the PHP data type did not match the specified XML-RPC type.
    • Fixed a bug in the XML-RPC class with parsing dateTime.iso8601 data types.
      • +
    • Fixed a case sensitive string replacement in xss_clean()

    Version 1.7.1

    From c8dddd97b96f74ebf080fedde5a2630019783c78 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 10 Jul 2009 18:58:03 +0000 Subject: [PATCH 1685/2544] Simplified some conditional syntax --- system/libraries/Loader.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 715bdf97..d615a136 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -868,12 +868,9 @@ function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NU { include_once(APPPATH.'config/'.strtolower($class).EXT); } - else + elseif (file_exists(APPPATH.'config/'.ucfirst(strtolower($class)).EXT)) { - if (file_exists(APPPATH.'config/'.ucfirst(strtolower($class)).EXT)) - { - include_once(APPPATH.'config/'.ucfirst(strtolower($class)).EXT); - } + include_once(APPPATH.'config/'.ucfirst(strtolower($class)).EXT); } } From 8c5299640fed112bb86e7a3930432bd084e86dad Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 10 Jul 2009 19:05:08 +0000 Subject: [PATCH 1686/2544] removed entity protection from form_prep() so as to preserve the user's input when called back into a form element --- system/helpers/form_helper.php | 11 ----------- user_guide/changelog.html | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index bdc87b86..987ff18e 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -610,22 +610,11 @@ function form_prep($str = '') return ''; } - $temp = '__TEMP_AMPERSANDS__'; - - // Replace entities to temporary markers so that - // htmlspecialchars won't mess them up - $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); - $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); - $str = htmlspecialchars($str); // In case htmlspecialchars misses these. $str = str_replace(array("'", '"'), array("'", """), $str); - // Decode the temp markers back to entities - $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); - $str = preg_replace("/$temp(\w+);/","&\\1;",$str); - return $str; } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 2cd5c68e..b3ac1671 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -100,6 +100,7 @@

    Bug fixes for 1.7.2

  • Fixed a bug that would cause PHP errors in XML-RPC data if the PHP data type did not match the specified XML-RPC type.
  • Fixed a bug in the XML-RPC class with parsing dateTime.iso8601 data types.
  • Fixed a case sensitive string replacement in xss_clean()
    • +
  • Fixed a bug in form_prep() causing it to not preserve entities in the user's original input when called back into a form element

    • Version 1.7.1

    From 55acc8b4d980c43e4bde04f0e0b99a594dea28ff Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sat, 11 Jul 2009 03:38:13 +0000 Subject: [PATCH 1687/2544] fixed a bug with _protect_identifiers() and db/swap prefixes. It was appending the prefix, but not accounting for the need to swap --- system/database/DB_driver.php | 14 +++++++++++++- user_guide/changelog.html | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 54aa5ed7..014dfd44 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1309,7 +1309,13 @@ function _protect_identifiers($item, $prefix_single = FALSE, $protect_identifier { $i++; } - + + // Verify table prefix and replace if necessary + if ($this->swap_pre != '' && strncmp($parts[$i], $this->swap_pre, strlen($this->swap_pre)) === 0) + { + $parts[$i] = preg_replace("/^".$this->swap_pre."(\S+?)/", $this->dbprefix."\\1", $parts[$i]); + } + // We only add the table prefix if it does not already exist if (substr($parts[$i], 0, strlen($this->dbprefix)) != $this->dbprefix) { @@ -1331,6 +1337,12 @@ function _protect_identifiers($item, $prefix_single = FALSE, $protect_identifier // Is there a table prefix? If not, no need to insert it if ($this->dbprefix != '') { + // Verify table prefix and replace if necessary + if ($this->swap_pre != '' && strncmp($item, $this->swap_pre, strlen($this->swap_pre)) === 0) + { + $item = preg_replace("/^".$this->swap_pre."(\S+?)/", $this->dbprefix."\\1", $item); + } + // Do we prefix an item with no segments? if ($prefix_single == TRUE AND substr($item, 0, strlen($this->dbprefix)) != $this->dbprefix) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b3ac1671..323467b6 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -101,6 +101,7 @@

    Bug fixes for 1.7.2

  • Fixed a bug in the XML-RPC class with parsing dateTime.iso8601 data types.
  • Fixed a case sensitive string replacement in xss_clean()
  • Fixed a bug in form_prep() causing it to not preserve entities in the user's original input when called back into a form element
    • +
  • Fixed a bug in _protect_identifiers() where the swap prefix ($swap_pre) was not being observed.

    • Version 1.7.1

    From 817163a1bcff02285f763bcf72ff02e86f218cf8 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sat, 11 Jul 2009 17:05:58 +0000 Subject: [PATCH 1688/2544] Modified show_error() to allow sending of HTTP server response codes. Added set_status_header() to the Common functions to allow use when the Output class is unavailable. Fixed a bug where the 400 status header sent with the 'disallowed URI characters' was not compatible with CGI environments. --- system/codeigniter/Common.php | 89 +++++++++++++++++++++++- system/libraries/Exceptions.php | 4 +- system/libraries/Output.php | 75 +------------------- system/libraries/URI.php | 3 +- user_guide/changelog.html | 7 ++ user_guide/general/common_functions.html | 17 +++++ user_guide/general/errors.html | 3 +- user_guide/libraries/output.html | 2 +- 8 files changed, 121 insertions(+), 79 deletions(-) diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index c7f95688..340be245 100644 --- a/system/codeigniter/Common.php +++ b/system/codeigniter/Common.php @@ -203,10 +203,10 @@ function config_item($item) * @access public * @return void */ -function show_error($message) +function show_error($message, $status_code = 500) { $error =& load_class('Exceptions'); - echo $error->show_error('An Error Was Encountered', $message); + echo $error->show_error('An Error Was Encountered', $message, 'error_general', $status_code); exit; } @@ -252,6 +252,91 @@ function log_message($level = 'error', $message, $php_error = FALSE) $LOG->write_log($level, $message, $php_error); } + +/** + * Set HTTP Status Header + * + * @access public + * @param int the status code + * @param string + * @return void + */ +function set_status_header($code = 200, $text = '') +{ + $stati = array( + 200 => 'OK', + 201 => 'Created', + 202 => 'Accepted', + 203 => 'Non-Authoritative Information', + 204 => 'No Content', + 205 => 'Reset Content', + 206 => 'Partial Content', + + 300 => 'Multiple Choices', + 301 => 'Moved Permanently', + 302 => 'Found', + 304 => 'Not Modified', + 305 => 'Use Proxy', + 307 => 'Temporary Redirect', + + 400 => 'Bad Request', + 401 => 'Unauthorized', + 403 => 'Forbidden', + 404 => 'Not Found', + 405 => 'Method Not Allowed', + 406 => 'Not Acceptable', + 407 => 'Proxy Authentication Required', + 408 => 'Request Timeout', + 409 => 'Conflict', + 410 => 'Gone', + 411 => 'Length Required', + 412 => 'Precondition Failed', + 413 => 'Request Entity Too Large', + 414 => 'Request-URI Too Long', + 415 => 'Unsupported Media Type', + 416 => 'Requested Range Not Satisfiable', + 417 => 'Expectation Failed', + + 500 => 'Internal Server Error', + 501 => 'Not Implemented', + 502 => 'Bad Gateway', + 503 => 'Service Unavailable', + 504 => 'Gateway Timeout', + 505 => 'HTTP Version Not Supported' + ); + + if ($code == '' OR ! is_numeric($code)) + { + show_error('Status codes must be numeric', 500); + } + + if (isset($stati[$code]) AND $text == '') + { + $text = $stati[$code]; + } + + if ($text == '') + { + 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; + + if (substr(php_sapi_name(), 0, 3) == 'cgi') + { + header("Status: {$code} {$text}", TRUE); + } + elseif ($server_protocol == 'HTTP/1.1' OR $server_protocol == 'HTTP/1.0') + { + header($server_protocol." {$code} {$text}", TRUE, $code); + } + else + { + header("HTTP/1.1 {$code} {$text}", TRUE, $code); + } +} + + /** * Exception Handler * diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php index 902b574f..1f99d01c 100644 --- a/system/libraries/Exceptions.php +++ b/system/libraries/Exceptions.php @@ -113,8 +113,10 @@ function show_404($page = '') * @param string the template name * @return string */ - function show_error($heading, $message, $template = 'error_general') + function show_error($heading, $message, $template = 'error_general', $status_code = 500) { + set_status_header($status_code); + $message = '

    '.implode('

    ', ( ! is_array($message)) ? array($message) : $message).'

    '; if (ob_get_level() > $this->ob_level + 1) diff --git a/system/libraries/Output.php b/system/libraries/Output.php index 6bfb9c7e..4423ac72 100644 --- a/system/libraries/Output.php +++ b/system/libraries/Output.php @@ -116,7 +116,8 @@ function set_header($header, $replace = TRUE) /** * Set HTTP Status Header - * + * moved to Common procedural functions in 1.7.2 + * * @access public * @param int the status code * @param string @@ -124,77 +125,7 @@ function set_header($header, $replace = TRUE) */ function set_status_header($code = '200', $text = '') { - $stati = array( - '200' => 'OK', - '201' => 'Created', - '202' => 'Accepted', - '203' => 'Non-Authoritative Information', - '204' => 'No Content', - '205' => 'Reset Content', - '206' => 'Partial Content', - - '300' => 'Multiple Choices', - '301' => 'Moved Permanently', - '302' => 'Found', - '304' => 'Not Modified', - '305' => 'Use Proxy', - '307' => 'Temporary Redirect', - - '400' => 'Bad Request', - '401' => 'Unauthorized', - '403' => 'Forbidden', - '404' => 'Not Found', - '405' => 'Method Not Allowed', - '406' => 'Not Acceptable', - '407' => 'Proxy Authentication Required', - '408' => 'Request Timeout', - '409' => 'Conflict', - '410' => 'Gone', - '411' => 'Length Required', - '412' => 'Precondition Failed', - '413' => 'Request Entity Too Large', - '414' => 'Request-URI Too Long', - '415' => 'Unsupported Media Type', - '416' => 'Requested Range Not Satisfiable', - '417' => 'Expectation Failed', - - '500' => 'Internal Server Error', - '501' => 'Not Implemented', - '502' => 'Bad Gateway', - '503' => 'Service Unavailable', - '504' => 'Gateway Timeout', - '505' => 'HTTP Version Not Supported' - ); - - if ($code == '' OR ! is_numeric($code)) - { - show_error('Status codes must be numeric'); - } - - if (isset($stati[$code]) AND $text == '') - { - $text = $stati[$code]; - } - - if ($text == '') - { - show_error('No status text available. Please check your status code number or supply your own message text.'); - } - - $server_protocol = (isset($_SERVER['SERVER_PROTOCOL'])) ? $_SERVER['SERVER_PROTOCOL'] : FALSE; - - if (substr(php_sapi_name(), 0, 3) == 'cgi') - { - header("Status: {$code} {$text}", TRUE); - } - elseif ($server_protocol == 'HTTP/1.1' OR $server_protocol == 'HTTP/1.0') - { - header($server_protocol." {$code} {$text}", TRUE, $code); - } - else - { - header("HTTP/1.1 {$code} {$text}", TRUE, $code); - } + set_status_header($code, $text); } // -------------------------------------------------------------------- diff --git a/system/libraries/URI.php b/system/libraries/URI.php index f09a5cd7..efc7a18b 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -188,8 +188,7 @@ function _filter_uri($str) { if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str)) { - header('HTTP/1.1 400 Bad Request'); - show_error('The URI you submitted has disallowed characters.'); + show_error('The URI you submitted has disallowed characters.', 400); } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 323467b6..e4199cd3 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -85,6 +85,12 @@

    Version 1.7.2

  • Modified directory_map() in the Directory helper to allow the inclusion of hidden files.
    • +
  • General + +

    • Bug fixes for 1.7.2

    @@ -102,6 +108,7 @@

    Bug fixes for 1.7.2

  • Fixed a case sensitive string replacement in xss_clean()
  • Fixed a bug in form_prep() causing it to not preserve entities in the user's original input when called back into a form element
  • Fixed a bug in _protect_identifiers() where the swap prefix ($swap_pre) was not being observed.
    • +
  • Fixed a bug where the 400 status header sent with the 'disallowed URI characters' was not compatible with CGI environments.

    • Version 1.7.1

    diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index df5dfea6..980a5a96 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -58,8 +58,11 @@

    Common Functions

    CodeIgniter uses a few functions for its operation that are globally defined, and are available to you at any point. These do not require loading any libraries or helpers.

    +

    is_really_writable('path/to/file')

    +

    is_writable() returns TRUE on Windows servers when you really can't write to the file as the OS reports to PHP as FALSE only if the read-only attribute is marked. This function determines if a file is actually writable by attempting to write to it first. Generally only recommended on platforms where this information may be unreliable.

    + if (is_really_writable('file.txt'))
    {
        echo "I could write to this if I wanted to";
    @@ -68,11 +71,25 @@

    is_really_writable('path/to/file')

    {
        echo "File is not writable";
    }     +

    config_item('item_key')

    The Config library is the preferred way of accessing configuration information, however config_item() can be used to retrieve single keys. See Config library documentation for more information.

    +

    show_error('message'), show_404('page'), log_message('level', 'message')

    These are each outlined on the Error Handling page.

    + +

    set_status_header(code, 'text');

    + +

    Permits you to manually set a server status header. Example:

    + +set_status_header(401);
    +// Sets the header as: Unauthorized     + +

    See here for a full list of headers.

    +
    + + diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index c1bb6911..af118459 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -71,9 +71,10 @@

    Error Handling

    The following functions let you generate errors:

    -

    show_error('message')

    +

    show_error('message' [, int $status_code= 500 ] )

    This function will display the error message supplied to it using the following error template:

    application/errors/error_general.php

    +

    The optional parameter $status_code determines what HTTP status code should be sent with the error.

    show_404('page')

    This function will display the 404 error message supplied to it using the following error template:

    diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 6d75fe7b..ba6a0d33 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -100,7 +100,7 @@

    $this->output->set_header();

    $this->output->set_header("Pragma: no-cache"); -

    $this->output->set_status_header();

    +

    $this->output->set_status_header(code, 'text');

    Permits you to manually set a server status header. Example:

    From f6b442bba6666f3265680223e1ef9df08b94eb08 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sat, 11 Jul 2009 18:23:30 +0000 Subject: [PATCH 1689/2544] add 404 headers to show_404() proper instead of in the error_404.php template --- system/application/errors/error_404.php | 1 - system/libraries/Exceptions.php | 2 +- user_guide/changelog.html | 1 + user_guide/installation/upgrade_172.html | 105 +++++++++++++++++++++++ 4 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 user_guide/installation/upgrade_172.html diff --git a/system/application/errors/error_404.php b/system/application/errors/error_404.php index bfe9444b..1c513a20 100644 --- a/system/application/errors/error_404.php +++ b/system/application/errors/error_404.php @@ -1,4 +1,3 @@ - 404 Page Not Found diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php index 1f99d01c..9c655a17 100644 --- a/system/libraries/Exceptions.php +++ b/system/libraries/Exceptions.php @@ -94,7 +94,7 @@ function show_404($page = '') $message = "The page you requested was not found."; log_message('error', '404 Page Not Found --> '.$page); - echo $this->show_error($heading, $message, 'error_404'); + echo $this->show_error($heading, $message, 'error_404', 404); exit; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index e4199cd3..56081456 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -88,6 +88,7 @@

    Version 1.7.2

  • General
    • diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html new file mode 100644 index 00000000..ee775a33 --- /dev/null +++ b/user_guide/installation/upgrade_172.html @@ -0,0 +1,105 @@ + + + + + +Upgrading from 1.7.1 to 1.7.2 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7.1

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.7.1 to 1.7.2

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + +
      + +
    • system/codeigniter
      • +
    • system/database
      • +
    • system/helpers
      • +
    • system/language
      • +
    • system/libraries
      • +
    + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +

    Step 2: Remove header() from 404 error template

    +

    If you are using header() in your 404 error template, such as the case with the default error_404.php template shown below, remove that line of code.

    + +<?php header("HTTP/1.1 404 Not Found"); ?> + +

    404 status headers are now properly handled in the show_404() method itself.

    + +

    Step 2: Update your user guide

    +

    Please replace your local copy of the user guide with the new version, including the image files.

    + +
    + + + + + + + \ No newline at end of file From a14ab128263c4fe107f0412f659e96843a63cf30 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 13 Jul 2009 12:01:01 +0000 Subject: [PATCH 1690/2544] spelling in code comment --- system/libraries/Ftp.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 90c65946..6fb17049 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -154,13 +154,13 @@ function _is_conn() /** - * Change direcotry + * Change directory * * The second parameter lets us momentarily turn off debugging so that - * this function can be used to test for the existance of a folder + * this function can be used to test for the existence of a folder * without throwing an error. There's no FTP equivalent to is_dir() * so we do it by trying to change to a particular directory. - * Internally, this paramter is only used by the "mirror" function below. + * Internally, this parameter is only used by the "mirror" function below. * * @access public * @param string From 94026d914090861da9c2826508a4597badb86af6 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 15 Jul 2009 15:56:58 +0000 Subject: [PATCH 1691/2544] added return FALSE if directory_map() cannot read the directory --- system/helpers/directory_helper.php | 4 ++++ user_guide/changelog.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php index b1c49768..a6fb7841 100644 --- a/system/helpers/directory_helper.php +++ b/system/helpers/directory_helper.php @@ -72,6 +72,10 @@ function directory_map($source_dir, $top_level_only = FALSE, $hidden = FALSE) closedir($fp); return $filedata; } + else + { + return FALSE; + } } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 56081456..2bbe832d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -82,7 +82,7 @@

    Version 1.7.2

    • Added form_multiselect() to the Form helper.
    • Modified form_hidden() in the Form helper to accept multi-dimensional arrays.
      • -
    • Modified directory_map() in the Directory helper to allow the inclusion of hidden files.
      • +
    • Modified directory_map() in the Directory helper to allow the inclusion of hidden files, and to return FALSE on failure to read directory.
  • General From 01a9b107cab449d1ce24746612e9cf7074e6608d Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 17 Jul 2009 18:30:36 +0000 Subject: [PATCH 1692/2544] modified Form Helper so that form_prep() keeps track of strings it's already processed, to prevent encoding and prep from occurring more than once --- system/helpers/form_helper.php | 31 ++++++++++++++++++++++--------- user_guide/changelog.html | 2 ++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 987ff18e..4c229ae9 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -123,7 +123,7 @@ function form_hidden($name, $value = '', $recursing = FALSE) if ( ! is_array($value)) { - $form .= ''."\n"; + $form .= ''."\n"; } else { @@ -239,8 +239,9 @@ function form_textarea($data = '', $value = '', $extra = '') $val = $data['value']; unset($data['value']); // textareas don't use the value attribute } - - return ""; + + $name = (is_array($data)) ? $data['name'] : $data; + return ""; } } @@ -264,7 +265,7 @@ function form_multiselect($name = '', $options = array(), $selected = array(), $ { $extra .= ' multiple="multiple"'; } - + return form_dropdown($name, $options, $selected, $extra); } } @@ -592,8 +593,10 @@ function form_close($extra = '') */ if ( ! function_exists('form_prep')) { - function form_prep($str = '') + function form_prep($str = '', $field_name = '') { + static $prepped_fields = array(); + // if the field name is an array we do this recursively if (is_array($str)) { @@ -610,11 +613,21 @@ function form_prep($str = '') return ''; } + if (isset($prepped_fields[$field_name])) + { + return $prepped_fields[$field_name]; + } + $str = htmlspecialchars($str); // In case htmlspecialchars misses these. $str = str_replace(array("'", '"'), array("'", """), $str); + if ($field_name != '') + { + $prepped_fields[$field_name] = $str; + } + return $str; } } @@ -643,10 +656,10 @@ function set_value($field = '', $default = '') return $default; } - return form_prep($_POST[$field]); + return form_prep($_POST[$field], $field); } - return form_prep($OBJ->set_value($field, $default)); + return form_prep($OBJ->set_value($field, $default), $field); } } @@ -902,12 +915,12 @@ function _parse_form_attributes($attributes, $default) } $att = ''; - + foreach ($default as $key => $val) { if ($key == 'value') { - $val = form_prep($val); + $val = form_prep($val, $default['name']); } $att .= $key . '="' . $val . '" '; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 2bbe832d..42529d1f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -82,6 +82,8 @@

    Version 1.7.2

    • Added form_multiselect() to the Form helper.
    • Modified form_hidden() in the Form helper to accept multi-dimensional arrays.
      • +
    • Modified form_prep() in the Form helper to keep track of prepped fields to avoid multiple prep/mutation from subsequent calls which can occur when using Form Validation + and form helper functions to output form fields.
    • Modified directory_map() in the Directory helper to allow the inclusion of hidden files, and to return FALSE on failure to read directory.
    • From 3eb9faceb9fedb0fa50a2b2d1fc4952c2652af70 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 17 Jul 2009 20:25:13 +0000 Subject: [PATCH 1693/2544] modification to form_prep() solution. A bandaid really, to return the $str if the field has already been prepped --- system/helpers/form_helper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 4c229ae9..c5e977a4 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -613,9 +613,13 @@ function form_prep($str = '', $field_name = '') return ''; } + // we've already prepped a field with this name + // @todo need to figure out a way to namespace this so + // that we know the *exact* field and not just one with + // the same name if (isset($prepped_fields[$field_name])) { - return $prepped_fields[$field_name]; + return $str; } $str = htmlspecialchars($str); From 8db2d5ebf30d7d8e648f36e9d669297a9a52cd3d Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Fri, 17 Jul 2009 22:07:04 +0000 Subject: [PATCH 1694/2544] Added heading tags to skippable elements in the typography class- started as 1.6 EE bug fix- carried over. --- system/libraries/Typography.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index a1683936..242ca3cb 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -30,7 +30,7 @@ class CI_Typography { var $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul'; // Elements that should not have

    and
    tags within them. - var $skip_elements = 'p|pre|ol|ul|dl|object|table'; + var $skip_elements = 'p|pre|ol|ul|dl|object|table|h\d'; // Tags we want the parser to completely ignore when splitting the string. var $inline_elements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var'; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 42529d1f..7bf5028d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -112,6 +112,7 @@

    Bug fixes for 1.7.2

  • Fixed a bug in form_prep() causing it to not preserve entities in the user's original input when called back into a form element
  • Fixed a bug in _protect_identifiers() where the swap prefix ($swap_pre) was not being observed.
  • Fixed a bug where the 400 status header sent with the 'disallowed URI characters' was not compatible with CGI environments.
    • +
  • Fixed a bug in the typography class where heading tags could have paragraph tags inserted when using auto_typography().

    • Version 1.7.1

    From 1414987474e8d9a96e640ba9378d447677cfc387 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Wed, 22 Jul 2009 11:52:09 +0000 Subject: [PATCH 1695/2544] nav links in html helper --- user_guide/helpers/html_helper.html | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index ec924241..94a98b93 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -60,6 +60,16 @@

    HTML Helper

    The HTML Helper file contains functions that assist in working with HTML.

    +

    Loading this Helper

    @@ -68,17 +78,18 @@

    Loading this Helper

    The following functions are available:

    -

    br()

    +

    br()

    Generates line break tags (<br />) based on the number you submit. Example:

    echo br(3);

    The above would produce: <br /><br /><br />

    -

    heading()

    +

    heading()

    Lets you create HTML <h1> tags. The first parameter will contain the data, the second the size of the heading. Example:

    echo heading('Welcome!', 3);

    The above would produce: <h3>Welcome!</h3>

    -

    img()

    + +

    img()

    Lets you create HTML <img /> tags. The first parameter contains the image source. Example:

    echo img('images/picture.jpg');
    // gives <img src="http://site.com/images/picture.jpg" />     @@ -98,7 +109,8 @@

    img()


    img($image_properties);
    // <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />

    -

    link_tag()

    + +

    link_tag()

    Lets you create HTML <link /> tags. This is useful for stylesheet links, as well as other links. The parameters are href, with optional rel, type, title, media and index_page. index_page is a TRUE/FALSE value that specifics if the href should have the page specified by $config['index_page'] added to the address it creates. echo link_tag('css/mystyles.css');
    // gives <link href="http://site.com/css/mystyles.css" rel="stylesheet" type="text/css" />

    @@ -123,12 +135,12 @@

    link_tag()

    echo link_tag($link);
    // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />

    -

    nbs()

    +

    nbs()

    Generates non-breaking spaces (&nbsp;) based on the number you submit. Example:

    echo nbs(3);

    The above would produce: &nbsp;&nbsp;&nbsp;

    -

    ol()  and  ul()

    +

    ol()  and  ul()

    Permits you to generate ordered or unordered HTML lists from simple or multi-dimensional arrays. Example:

    @@ -252,7 +264,7 @@

    ol()  and  ul()

    -

    meta()

    +

    meta()

    Helps you generate meta tags. You can pass strings to the function, or simple arrays, or multidimensional ones. Examples:

    @@ -290,7 +302,7 @@

    meta()

    -

    doctype()

    +

    doctype()

    Helps you generate document type declarations, or DTD's. XHTML 1.0 Strict is used by default, but many doctypes are available.

    From 086ee5a06dc2a9b8273574c8c883efdbaa815765 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 28 Jul 2009 14:42:12 +0000 Subject: [PATCH 1696/2544] add is_php() to Common.php --- system/codeigniter/Common.php | 23 +++++++++++++++++++++++ user_guide/changelog.html | 1 + user_guide/general/common_functions.html | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index 340be245..39005f60 100644 --- a/system/codeigniter/Common.php +++ b/system/codeigniter/Common.php @@ -29,6 +29,29 @@ // ------------------------------------------------------------------------ +/** +* Determines if the current version of PHP is greater then the supplied value +* +* Since there are a few places where we conditionally test for PHP > 5 +* we'll set a static variable. +* +* @access public +* @return bool +*/ + function is_php($version = '5.0.0') + { + static $_is_php; + + if ( ! isset($_is_php[$version])) + { + $_is_php[$version] = (version_compare(PHP_VERSION, $version) < 0) ? FALSE : TRUE; + } + + return $_is_php[$version]; + } + +// ------------------------------------------------------------------------ + /** * Tests for file writability * diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7bf5028d..1de9effe 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -92,6 +92,7 @@

    Version 1.7.2

  • Modified show_error() to allow sending of HTTP server response codes.
  • Modified show_404() to send 404 status code, removing non-CGI compatible header() statement from error_404.php template.
  • Added set_status_header() to the Common functions to allow use when the Output class is unavailable.
    • +
  • Added is_php() to Common functions to facilitate PHP version comparisons.

    • diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 980a5a96..1f439442 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -59,6 +59,18 @@

    Common Functions

    CodeIgniter uses a few functions for its operation that are globally defined, and are available to you at any point. These do not require loading any libraries or helpers.

    +

    is_php('version_number')

    + +

    is_php() determines of the PHP version being used is greater than the supplied version_number.

    + +if (is_php('5.3.0'))
    +{
    +    $str = quoted_printable_encode($str);
    +}     + +

    Returns boolean TRUE if the installed version of PHP is equal to or greater than the supplied version number. Returns FALSE if the installed version of PHP is lower than the supplied version number.

    + +

    is_really_writable('path/to/file')

    is_writable() returns TRUE on Windows servers when you really can't write to the file as the OS reports to PHP as FALSE only if the read-only attribute is marked. This function determines if a file is actually writable by attempting to write to it first. Generally only recommended on platforms where this information may be unreliable.

    From 5bcfd2e83e52155f199058479ac116a136f334a3 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 28 Jul 2009 14:42:42 +0000 Subject: [PATCH 1697/2544] whitespace --- system/codeigniter/Common.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index 39005f60..f45c85c2 100644 --- a/system/codeigniter/Common.php +++ b/system/codeigniter/Common.php @@ -38,18 +38,18 @@ * @access public * @return bool */ - function is_php($version = '5.0.0') - { - static $_is_php; - - if ( ! isset($_is_php[$version])) - { - $_is_php[$version] = (version_compare(PHP_VERSION, $version) < 0) ? FALSE : TRUE; - } +function is_php($version = '5.0.0') +{ + static $_is_php; - return $_is_php[$version]; + if ( ! isset($_is_php[$version])) + { + $_is_php[$version] = (version_compare(PHP_VERSION, $version) < 0) ? FALSE : TRUE; } + return $_is_php[$version]; +} + // ------------------------------------------------------------------------ /** From de8f409e84c4b2c428cba3f2845f2658d3db9b90 Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Wed, 29 Jul 2009 13:46:37 +0000 Subject: [PATCH 1698/2544] Updating the smiley helper to work with more than one field. Also changing insertion position to be at the cursor and using ids instead of form names. --- system/helpers/smiley_helper.php | 140 ++++++++++++++++++++++---- user_guide/changelog.html | 2 + user_guide/helpers/smiley_helper.html | 43 +++++--- 3 files changed, 148 insertions(+), 37 deletions(-) diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index f9a2cf2b..f085e53b 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -28,29 +28,91 @@ // ------------------------------------------------------------------------ /** - * JS Insert Smiley + * Smiley Javascript * - * Generates the javascrip function needed to insert smileys into a form field + * Returns the javascript required for the smiley insertion. Optionally takes + * an array of aliases to loosely couple the smiley array to the view. * * @access public - * @param string form name - * @param string field name - * @return string + * @param mixed alias name or array of alias->field_id pairs + * @param string field_id if alias name was passed in + * @return array */ -if ( ! function_exists('js_insert_smiley')) +if ( ! function_exists('smiley_js')) { - function js_insert_smiley($form_name = '', $form_field = '') - { - return << - function insert_smiley(smiley) + function smiley_js($alias = '', $field_id = '') { - document.{$form_name}.{$form_field}.value += " " + smiley; - } - + static $do_setup = TRUE; + + $r = ''; + + if ($alias != '' && ! is_array($alias)) + { + $alias = array($alias => $field_id); + } + + if ($do_setup === TRUE) + { + $do_setup = FALSE; + + $m = array(); + + if (is_array($alias)) + { + foreach($alias as $name => $id) + { + $m[] = '"'.$name.'" : "'.$id.'"'; + } + } + + $m = '{'.implode(',', $m).'}'; + + $r .= << $id) + { + $r .= 'smiley_map["'.$name.'"] = "'.$id.'";'."\n"; + } + } + } + + return ''; } } + // ------------------------------------------------------------------------ /** @@ -65,8 +127,15 @@ function insert_smiley(smiley) */ if ( ! function_exists('get_clickable_smileys')) { - function get_clickable_smileys($image_url = '', $smileys = NULL) + function get_clickable_smileys($image_url, $alias = '', $smileys = NULL) { + // For backward compatibility with js_insert_smiley + + if (is_array($alias)) + { + $smileys = $alias; + } + if ( ! is_array($smileys)) { if (FALSE === ($smileys = _get_smiley_array())) @@ -76,8 +145,8 @@ function get_clickable_smileys($image_url = '', $smileys = NULL) } // Add a trailing slash to the file path if needed - $image_url = preg_replace("/(.+?)\/*$/", "\\1/", $image_url); - + $image_url = rtrim($image_url, '/').'/'; + $used = array(); foreach ($smileys as $key => $val) { @@ -89,12 +158,12 @@ function get_clickable_smileys($image_url = '', $smileys = NULL) { continue; } - - $link[] = "\"".$smileys[$key][3]."\""; - + + $link[] = "\"".$smileys[$key][3]."\""; + $used[$smileys[$key][0]] = TRUE; } - + return $link; } } @@ -170,6 +239,35 @@ function _get_smiley_array() } } +// ------------------------------------------------------------------------ + +/** + * JS Insert Smiley + * + * Generates the javascript function needed to insert smileys into a form field + * + * DEPRECATED as of version 1.7.2, use smiley_js instead + * + * @access public + * @param string form name + * @param string field name + * @return string + */ +if ( ! function_exists('js_insert_smiley')) +{ + function js_insert_smiley($form_name = '', $form_field = '') + { + return << + function insert_smiley(smiley) + { + document.{$form_name}.{$form_field}.value += " " + smiley; + } + +EOF; + } +} + /* End of file smiley_helper.php */ /* Location: ./system/helpers/smiley_helper.php */ \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 1de9effe..354652fd 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -85,6 +85,7 @@

    Version 1.7.2

  • Modified form_prep() in the Form helper to keep track of prepped fields to avoid multiple prep/mutation from subsequent calls which can occur when using Form Validation and form helper functions to output form fields.
  • Modified directory_map() in the Directory helper to allow the inclusion of hidden files, and to return FALSE on failure to read directory.
    • +
  • Modified the Smiley helper to work with multiple fields and insert the smiley at the last known cursor position.
  • General @@ -110,6 +111,7 @@

    Bug fixes for 1.7.2

  • Fixed a bug that would cause PHP errors in XML-RPC data if the PHP data type did not match the specified XML-RPC type.
  • Fixed a bug in the XML-RPC class with parsing dateTime.iso8601 data types.
  • Fixed a case sensitive string replacement in xss_clean()
    • +
  • Fixed a bug in form_textarea() where form data was not prepped correctly.
  • Fixed a bug in form_prep() causing it to not preserve entities in the user's original input when called back into a form element
  • Fixed a bug in _protect_identifiers() where the swap prefix ($swap_pre) was not being observed.
  • Fixed a bug where the 400 status header sent with the 'disallowed URI characters' was not compatible with CGI environments.
    • diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 3c88bcf7..8c85cb3f 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -111,10 +111,10 @@

    The Controller

    $this->load->helper('smiley'); $this->load->library('table'); - $image_array = get_clickable_smileys('http://example.com/images/smileys/'); - - $col_array = $this->table->make_columns($image_array, 8); - + $image_array = get_clickable_smileys('http://example.com/images/smileys/', 'comments'); + + $col_array = $this->table->make_columns($image_array, 8); + $data['smiley_table'] = $this->table->generate($col_array); $this->load->view('smiley_view', $data); @@ -126,19 +126,18 @@

    The Controller

    In your application/views/ folder, create a file called smiley_view.php and place this code in it:

    - -

    When you have created the above controller and view, load it by visiting http://www.your=site.com/index.php/smileys/

    +

    When you have created the above controller and view, load it by visiting http://www.example.com/index.php/smileys/

    -

    Function Reference

    +

    Field Aliases

    + +

    When making changes to a view it can be inconvenient to have the field id in the controller. To work around this, +you can give your smiley links a generic name that will be tied to a specific id in your view.

    +$image_array = get_smiley_links("http://example.com/images/smileys/", "comment_textarea_alias"); + +

    To map the alias to the field id, pass them both into the smiley_js function:

    +$image_array = smiley_js("comment_textarea_alias", "comments"); + + +

    Function Reference

    get_clickable_smileys()

    Returns an array containing your smiley images wrapped in a clickable link. You must supply the URL to your smiley folder -via the first parameter:

    +and a field id or field alias.

    -$image_array = get_clickable_smileys("http://example.com/images/smileys/"); +$image_array = get_smiley_links("http://example.com/images/smileys/", "comment"); +

    Note: Usage of this function without the second parameter, in combination with js_insert_smiley has been deprecated.

    -

    js_insert_smiley()

    +

    smiley_js()

    Generates the JavaScript that allows the images to be clicked and inserted into a form field. -The first parameter must contain the name of your form, the second parameter must contain the name of the -form field. This function is designed to be placed into the <head> area of your web page.

    +If you supplied an alias instead of an id when generating your smiley links, you need to pass the +alias and corresponding form id into the function. +This function is designed to be placed into the <head> area of your web page.

    -<?php echo js_insert_smiley('blog', 'comments'); ?> +<?php echo smiley_js(); ?> +

    Note: This function replaces js_insert_smiley, which has been deprecated.

    parse_smileys()

    @@ -178,7 +190,6 @@

    parse_smileys()

    equivalent. The first parameter must contain your string, the second must contain the URL to your smiley folder:

    - $str = 'Here are some simileys: :-) ;-)'; $str = parse_smileys($str, "http://example.com/images/smileys/"); From f0a9b332445977cfb05fee2dacc02667946a9cd2 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 29 Jul 2009 14:19:18 +0000 Subject: [PATCH 1699/2544] PHP 5.3.0 compatibility changes --- system/codeigniter/CodeIgniter.php | 6 +++--- system/codeigniter/Common.php | 24 +++++++++++++++++++++--- system/database/DB.php | 2 +- system/libraries/Loader.php | 2 +- system/libraries/Profiler.php | 4 ++-- system/libraries/URI.php | 4 +++- user_guide/changelog.html | 1 + 7 files changed, 32 insertions(+), 11 deletions(-) diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index 68f6c759..b78736a0 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -56,8 +56,8 @@ * Define a custom error handler so we can log PHP errors * ------------------------------------------------------ */ -set_error_handler('_exception_handler'); -set_magic_quotes_runtime(0); // Kill magic quotes +//set_error_handler('_exception_handler'); +@set_magic_quotes_runtime(0); // Kill magic quotes /* * ------------------------------------------------------ @@ -130,7 +130,7 @@ * Note: The Loader class needs to be included first * */ -if (floor(phpversion()) < 5) +if ( ! is_php(5)) { load_class('Loader', FALSE); require(BASEPATH.'codeigniter/Base4'.EXT); diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php index f45c85c2..1ffed6a0 100644 --- a/system/codeigniter/Common.php +++ b/system/codeigniter/Common.php @@ -150,16 +150,34 @@ function &load_class($class, $instantiate = TRUE) if ($is_subclass == TRUE) { $name = config_item('subclass_prefix').$class; - $objects[$class] =& new $name(); + + $objects[$class] =& instantiate_class(new $name()); return $objects[$class]; } $name = ($class != 'Controller') ? 'CI_'.$class : $class; - - $objects[$class] =& new $name(); + + $objects[$class] =& instantiate_class(new $name()); return $objects[$class]; } +/** + * Instantiate Class + * + * Returns a new class object by reference, used by load_class() and the DB class. + * Required to retain PHP 4 compatibility and also not make PHP 5.3 cry. + * + * Use: $obj =& instantiate_class(new Foo()); + * + * @access public + * @param object + * @return object + */ +function &instantiate_class(&$class_object) +{ + return $class_object; +} + /** * Loads the main config.php file * diff --git a/system/database/DB.php b/system/database/DB.php index efe1d388..0f734d74 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -130,7 +130,7 @@ function &DB($params = '', $active_record_override = FALSE) // Instantiate the DB adapter $driver = 'CI_DB_'.$params['dbdriver'].'_driver'; - $DB =& new $driver($params); + $DB =& instantiate_class(new $driver($params)); if ($DB->autoinit == TRUE) { diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index d615a136..781c83c6 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -252,7 +252,7 @@ function dbutil() require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility'.EXT); $class = 'CI_DB_'.$CI->db->dbdriver.'_utility'; - $CI->dbutil =& new $class(); + $CI->dbutil =& instantiate_class(new $class()); $CI->load->_ci_assign_to_models(); } diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 98cec065..ecd0e708 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -103,11 +103,11 @@ function _compile_benchmarks() function _compile_queries() { $dbs = array(); - + // Let's determine which databases are currently connected to foreach (get_object_vars($this->CI) as $CI_object) { - if ( is_subclass_of(get_class($CI_object), 'CI_DB') ) + if (is_object($CI_object) && is_subclass_of(get_class($CI_object), 'CI_DB') ) { $dbs[] = $CI_object; } diff --git a/system/libraries/URI.php b/system/libraries/URI.php index efc7a18b..68b67805 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -186,7 +186,9 @@ function _filter_uri($str) { if ($str != '' && $this->config->item('permitted_uri_chars') != '' && $this->config->item('enable_query_strings') == FALSE) { - if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str)) + // preg_quote() in PHP 5.3 escapes -, so the str_replace() and addition of - to preg_quote() is to maintain backwards + // compatibility as many are unaware of how characters in the permitted_uri_chars will be parsed as a regex pattern + if ( ! preg_match("|^[".str_replace(array('\\-', '\-'), '-', preg_quote($this->config->item('permitted_uri_chars'), '-'))."]+$|i", $str)) { show_error('The URI you submitted has disallowed characters.', 400); } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 354652fd..61a02804 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -90,6 +90,7 @@

    Version 1.7.2

  • General
    • diff --git a/user_guide/images/codeigniter_1.7.1_helper_reference.pdf b/user_guide/images/codeigniter_1.7.1_helper_reference.pdf new file mode 100644 index 0000000000000000000000000000000000000000..85af7c83ba79a27fc075aedcb3cc0cec75656b7b GIT binary patch literal 499096 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

    GGe;-<#0@Qwa!^Z#c_M97Lm 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 +

    + +
    + + + + + +

    CodeIgniter User Guide Version 1.7.1

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    CodeIgniter Cheatsheets

    + +

    Library Reference

    + +
    CodeIgniter Library Reference
    + +

    Helpers Reference

    +
    CodeIgniter Library Reference
    + +
    + + + + + + + \ No newline at end of file diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 7d9875bf..530ee906 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -107,7 +107,7 @@

    CodeIgniter Features

    diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index d6bf9b70..8a4d70b3 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -750,7 +750,7 @@

    $this->db->flush_cache()

    User Guide Home   ·   Next Topic:  Transactions

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index d25e5564..b550a890 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -213,7 +213,7 @@

    $this->db->cache_delete_all()

    User Guide Home   ·   Next Topic:  Database manipulation with Database Forge

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 88e5779a..19c1dd48 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -111,7 +111,7 @@

    $this->db->call_function();

    User Guide Home   ·   Next Topic:  Query Caching

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index c6535db6..dcced6cf 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -150,7 +150,7 @@

    Explanation of Values:

    User Guide Home   ·   Next Topic:  Connecting to your Database

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 700c9ee0..fb766288 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -179,7 +179,7 @@

    Reconnecting / Keeping the Connection Alive

    User Guide Home   ·   Next Topic:  Queries

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 9b7b97a4..d20b77d7 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -210,7 +210,7 @@

    Active Record Insert

    User Guide Home   ·   Next Topic:  Database Configuration

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index a3ad20fd..5cc2441c 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -156,7 +156,7 @@

    $this->db->field_data()

    User Guide Home   ·   Next Topic:  Custom Function Calls

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index 7b7925c6..d02046af 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -227,7 +227,7 @@

    $this->dbforge->modify_column()

    Top of Page   ·   User Guide Home   ·   Next Topic:  Database Utilities Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 641d4411..0d38d8f6 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -144,7 +144,7 @@

    $this->db->update_string();

    User Guide Home   ·   Next Topic:  Active Record Pattern

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 504e0f39..46b299fe 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -92,7 +92,7 @@

    The Database Class

    User Guide Home   ·   Next Topic:  Quick Start: Usage Examples

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 45c53e5a..f51ee07a 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -146,7 +146,7 @@

    Query Bindings

    User Guide Home   ·   Next Topic:  Query Results

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 5fb0961a..f944a64c 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -231,7 +231,7 @@

    $query->free_result()

    User Guide Home   ·   Next Topic:  Query Helper Functions

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index ac9ebd84..2bc75c25 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -106,7 +106,7 @@

    $this->db->table_exists();

    User Guide Home   ·   Next Topic:   Field Metadata

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index ad285cc4..94022f69 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -193,7 +193,7 @@

    Running Transactions Manually

    User Guide Home   ·   Next Topic:  Table Metadata

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 9f37196e..a26e0f35 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -288,7 +288,7 @@

    Description of Backup Preferences

    Top of Page   ·   User Guide Home   ·   Next Topic:   Email Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 2530b392..7021b9d2 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -79,7 +79,7 @@

    Files

    Top of Page   ·   User Guide Home   ·  

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/doc_style/template.html b/user_guide/doc_style/template.html index a6b4b34b..05bdafd0 100644 --- a/user_guide/doc_style/template.html +++ b/user_guide/doc_style/template.html @@ -121,7 +121,7 @@

    $this->foo->bar()

    User Guide Home   ·   Next Topic:  Next Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 961574a3..fc9653de 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -140,7 +140,7 @@

    Alternative Control Structures

    User Guide Home   ·   Next Topic:  Security

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index ab83c5e2..30aa0a61 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -110,7 +110,7 @@

    get_instance()

    User Guide Home   ·   Next Topic:  Auto-loading Resources

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 4ec77471..ba87c771 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -94,7 +94,7 @@

    Auto-loading Resources

    Top of Page   ·   User Guide Home   ·   Next Topic:  Common Functions

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 6a723985..64dbab82 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -108,7 +108,7 @@

    Deleting Caches

    User Guide Home   ·   Next Topic:  Profiling Your Application

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index ae1b99ba..696815e2 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -112,7 +112,7 @@

    set_status_header(code, 'text');

    Top of Page   ·   User Guide Home   ·   Next Topic:  Scaffolding

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 981ab60f..3eda8c4a 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -378,7 +378,7 @@

    That's it!

    Top of Page   ·   User Guide Home   ·   Next Topic:  Reserved Names

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index a27499d2..1f95173f 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -178,7 +178,7 @@

    Setting Your Own Prefix

    User Guide Home   ·   Next Topic:  Hooks - Extending the Core

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index d0facf12..aaecbdc4 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -291,7 +291,7 @@

    Setting Your Own Prefix

    User Guide Home   ·   Next Topic:  Creating Core System Classes

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index d0a692d0..d0597bce 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -79,7 +79,7 @@

    Credits

    User Guide Home   ·   Next Topic:  Downloading CodeIgniter

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 5eb14d4f..cf50319a 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -131,7 +131,7 @@

    log_message('level', 'message')

    User Guide Home   ·   Next Topic:  Page Caching

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 168aac23..80a06c8c 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -178,7 +178,7 @@

    Now What?

    User Guide Home   ·   Next Topic:  Plugins

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 651baefe..eb0d99ac 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -160,7 +160,7 @@

    Hook Points

    User Guide Home   ·   Next Topic:  Auto-loading Resources

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index a51f6fe7..aec9f121 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -87,7 +87,7 @@

    Creating Your Own Libraries

    User Guide Home   ·   Next Topic:  Creating Libraries

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 7862c02a..195480ca 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -126,7 +126,7 @@

    Running Multiple Applications with one CodeIgniter Installation

    User Guide Home   ·   Next Topic:  Alternative PHP Syntax

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/models.html b/user_guide/general/models.html index aeb11b5a..878934bc 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -244,7 +244,7 @@

    Connecting to your Database

    User Guide Home   ·   Next Topic:  Helpers

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index eca425c5..58ae22e7 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -120,7 +120,7 @@

    Using a Plugin

    User Guide Home   ·   Next Topic:  Using Libraries

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 9924df3e..f0c550b1 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -97,7 +97,7 @@

    Setting Benchmark Points

    User Guide Home   ·   Next Topic:  Managing Applications

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 3709dec6..74ea0a7f 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -70,7 +70,7 @@

    Quick Reference Chart

    Top of Page   ·   User Guide Home

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index a45111e5..fab9d6f1 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -75,7 +75,7 @@

    Server Requirements

    User Guide Home   ·   Next Topic:  License Agreement

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 25a24129..2d637e8e 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -149,7 +149,7 @@

    Constants

    Top of Page   ·   User Guide Home   ·   Next Topic:  Views

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 23101230..ab79c926 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -169,7 +169,7 @@

    Reserved Routes

    User Guide Home   ·   Next Topic:  Error Handling

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index 18e0dada..8597b6c1 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -140,7 +140,7 @@

    A Final Note:

    Top of Page   ·   User Guide Home   ·   Next Topic:  URI Routing

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/security.html b/user_guide/general/security.html index ea42013d..40ec5e28 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -146,7 +146,7 @@

    Best Practices

    User Guide Home   ·   Next Topic:  PHP Style Guide

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index c378f8ec..2a5c440b 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -680,7 +680,7 @@

    Overlapping Tag Parameters

    User Guide Home   ·   Next Topic:  Writing Documentation

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 7fe16c33..6a61c340 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -144,7 +144,7 @@

    Enabling Query Strings

    Top of Page   ·   User Guide Home   ·   Next Topic:  Controllers

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 0af60a27..3ad9699e 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -267,7 +267,7 @@

    Returning views as data

    User Guide Home   ·   Next Topic:  Models

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 43781a00..f0986402 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -112,7 +112,7 @@

    random_element()

    Top of Page   ·   User Guide Home   ·   Next Topic:  Compatibility Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/compatibility_helper.html b/user_guide/helpers/compatibility_helper.html index 04c145dd..15712eb4 100644 --- a/user_guide/helpers/compatibility_helper.html +++ b/user_guide/helpers/compatibility_helper.html @@ -111,7 +111,7 @@

    stripos()

    User Guide Home   ·   Next Topic:  Cookie Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index bf148fe1..7b1a171a 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -140,7 +140,7 @@

    delete_cookie()

    Top of Page   ·   User Guide Home   ·   Next Topic:  Date Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index e1d0cc28..2ec17fb3 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -401,7 +401,7 @@

    Timezone Reference

    User Guide Home   ·   Next Topic:  Directory Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index a8badfd1..eae2c52e 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -136,7 +136,7 @@

    directory_map('source directory')

    User Guide Home   ·   Next Topic:  Download Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 511b7d66..5c1c2670 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -105,7 +105,7 @@

    force_download('filename', 'data')

    Top of Page   ·   User Guide Home   ·   Next Topic:  Email Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index b723e538..01579f82 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -95,7 +95,7 @@

    send_email('recipient', 'subject', 'message Top of Page   ·   User Guide Home   ·   Next Topic:  File Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index b3f81be1..358aa982 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -172,7 +172,7 @@

    octal_permissions($perms)

    Top of Page   ·   User Guide Home   ·   Next Topic:  Form Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 4ddde622..06967860 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -477,7 +477,7 @@

    set_radio()

    User Guide Home   ·   Next Topic:  HTML Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index b288e623..a6920ee1 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -378,7 +378,7 @@

    doctype()

    Top of Page   ·   User Guide Home   ·   Next Topic:   Path Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 06262421..ba25e071 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -144,7 +144,7 @@

    humanize()

    User Guide Home   ·   Next Topic:  Number Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index ed6daf35..e21a605a 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -91,7 +91,7 @@

    lang('language line', 'element id')

    User Guide Home   ·   Next Topic:  Download Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index b9b7152b..722b7f6e 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -100,7 +100,7 @@

    byte_format()

    User Guide Home   ·   Next Topic:  Path Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index cf910a93..232c1b6b 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -99,7 +99,7 @@

     

    User Guide Home   ·   Next Topic:  Security Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index dfc813c6..e7320001 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -119,7 +119,7 @@

    encode_php_tags()

    Top of Page   ·   User Guide Home   ·   Next Topic:  Smiley Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 1acfcc9b..5bc58a33 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -208,7 +208,7 @@

    parse_smileys()

    User Guide Home   ·   Next Topic:  String Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 633342cd..36fa40f9 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -169,7 +169,7 @@

    strip_quotes()

    User Guide Home   ·   Next Topic:  Text Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index c7281f50..120b3803 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -185,7 +185,7 @@

    word_wrap()

    User Guide Home   ·   Next Topic:  Typography Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index c84bc000..046da425 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -105,7 +105,7 @@

    nl2br_except_pre()

    User Guide Home   ·   Next Topic:  URL Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index e6fe5f2f..f9435e0b 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -282,7 +282,7 @@

    redirect()

    User Guide Home   ·   Next Topic:  XML Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index afe7c897..495b80b6 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -98,7 +98,7 @@

    xml_convert('string')

    Top of Page   ·   User Guide Home

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/index.html b/user_guide/index.html index e949de59..a234b19b 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -90,7 +90,7 @@

    Who is CodeIgniter For?

    diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index d5010df0..15c0f303 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -98,7 +98,7 @@

    Subversion Server

    User Guide Home   ·   Next Topic:  Installation Instructions

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 3e17b111..f960e285 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -90,7 +90,7 @@

    Installation Instructions

    Next Topic:  Upgrading from a Previous Version

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 430fc281..08c5d9ff 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -83,7 +83,7 @@

    Troubleshooting

    User Guide Home   ·   Next Topic:  CodeIgniter at a Glance

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 91450cb7..2ac9ab26 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -85,7 +85,7 @@

    Upgrading From Beta 1.0 to Final 1.2

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index 37c5c60e..b36f39de 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -196,7 +196,7 @@

    Step 6: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 90b6f181..002f07c5 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -95,7 +95,7 @@

    Step 2: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 53df8050..01a17624 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -93,7 +93,7 @@

    Step 2: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 0b7fb7da..f12a9600 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -105,7 +105,7 @@

    Step 3: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index ee9a431f..e3f6d829 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -138,7 +138,7 @@

    Step 3: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 1c0c7f55..886542d6 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -141,7 +141,7 @@

    Step 4: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 0846ffd3..4ebc78c5 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -171,7 +171,7 @@

    Step 5: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 9ed53530..7930638f 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -104,7 +104,7 @@

    Step 2: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 891d8aa5..52efd708 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -93,7 +93,7 @@

    Step 2: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 5f7f9839..c241160a 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -109,7 +109,7 @@

    Step 4: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index f46f176f..35da95b7 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -118,7 +118,7 @@

    Step 5: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index c0b884d7..2a9d047a 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -91,7 +91,7 @@

    Step 2: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index f20e1a4d..0e86d5c5 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -99,7 +99,7 @@

    Step 5: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 69ae5c25..54a7c559 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -92,7 +92,7 @@

    Step 2: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 61a8833c..d3715e14 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -114,7 +114,7 @@

    Step 4: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index 2f63212f..9b37bd12 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -91,7 +91,7 @@

    Step 2: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index 0fd192b9..f4f3c03f 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -98,7 +98,7 @@

    Step 3: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_173.html b/user_guide/installation/upgrade_173.html index d395c1fd..6f306d19 100644 --- a/user_guide/installation/upgrade_173.html +++ b/user_guide/installation/upgrade_173.html @@ -99,7 +99,7 @@

    Step 3: Update your user guide

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 8c1980d1..647dd885 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -137,7 +137,7 @@

    Step 5: Edit your config file

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 907917ec..14a4455c 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -94,7 +94,7 @@

    Upgrading From a Previous Version

    User Guide Home   ·   Next Topic:  Troubleshooting

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 0a0598f4..30db0deb 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -191,7 +191,7 @@

    Displaying Memory Consumption

    User Guide Home   ·   Next Topic:  Calendar Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 4f28f275..187aade0 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -242,7 +242,7 @@

    Creating a Calendar Template

    User Guide Home   ·   Next Topic:  Cart Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index cb623254..2aec24be 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -339,7 +339,7 @@

    $this->cart->destroy();

    User Guide Home   ·   Next Topic:  Config Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index e4963002..d911a427 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -174,7 +174,7 @@

    $this->config->system_url();

    User Guide Home   ·   Next Topic:  Database Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 20b77eba..3b38b268 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -300,7 +300,7 @@

    Overriding Word Wrapping

    User Guide Home   ·   Next Topic:  Encryption Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 124b6479..3b2846ac 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -183,7 +183,7 @@

    $this->encrypt->sha1();

    User Guide Home   ·   Next Topic:  File Uploading Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 550dc87d..35ef1798 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -441,7 +441,7 @@

    Explanation

    User Guide Home   ·   Next Topic:  Form Validation Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 799a714f..400af0e5 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -1214,7 +1214,7 @@

    set_radio()

    User Guide Home   ·   Next Topic:  FTP Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index bd64690c..c0c8e620 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -296,7 +296,7 @@

    $this->ftp->close();

    User Guide Home   ·   Next Topic:  HTML Table Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 3b81d53c..b6a34472 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -659,7 +659,7 @@

    Overlay Preferences

    User Guide Home   ·   Next Topic:  Input Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index e7c21de3..dbc79257 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -224,7 +224,7 @@

    $this->input->user_agent()

    User Guide Home   ·   Next Topic:  Loader Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index bb102956..eb4835a1 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -130,7 +130,7 @@

    Auto-loading Languages

    User Guide Home   ·   Next Topic:  Output Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index ec73579c..19a10e4d 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -207,7 +207,7 @@

    $this->load->config('file_name')

    User Guide Home   ·   Next Topic:  Language Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index f2bfffbf..1e425910 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -138,7 +138,7 @@

    $this->output->cache();

    User Guide Home   ·   Next Topic:  Pagination Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index c589807d..187b331f 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -211,7 +211,7 @@

    $config['num_tag_close'] = '</div>';

    User Guide Home   ·   Next Topic:  Session Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index a8549f11..4bf63efb 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -201,7 +201,7 @@

    Variable Pairs

    User Guide Home   ·   Next Topic:  Typography

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index eabad035..11313b51 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -304,7 +304,7 @@

    Session Preferences

    User Guide Home   ·   Next Topic:  Trackback Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 8094dab4..1c67e4b8 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -285,7 +285,7 @@

    $this->table->clear()

    User Guide Home   ·   Next Topic:  Image Manipulation Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 4a904bb8..9e54bbfb 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -239,7 +239,7 @@

    Notes:

    User Guide Home   ·   Next Topic:  Template Parser Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index a53d7e73..bcb2e66c 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -153,7 +153,7 @@

    protect_braced_quotes

    User Guide Home   ·   Next Topic:  Unit Testing Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index a30343fb..b9916045 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -199,7 +199,7 @@

    Creating a Template

    User Guide Home   ·   Next Topic:  URI Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 0995f75e..818115ff 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -245,7 +245,7 @@

    $this->uri->rsegment_array()

    User Guide Home   ·   Next Topic:  User Agent Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index bddd77ce..98bd7b12 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -194,7 +194,7 @@

    $this->agent->accept_charset()

    User Guide Home   ·   Next Topic:  XML-RPC Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index a2d6287b..25ea91df 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -733,7 +733,7 @@

    set_radio()

    User Guide Home   ·   Next Topic:  XML-RPC Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index f5ad48b4..cd4ed1c5 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -510,7 +510,7 @@

    Data Types

    User Guide Home   ·   Next Topic:  Zip Encoding Class

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 98a6d511..36b969b7 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -271,7 +271,7 @@

    $this->zip->clear_data()

    User Guide Home   ·   Next Topic:  Array Helper

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/license.html b/user_guide/license.html index 63cf3647..fc79c22f 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -60,7 +60,7 @@

    CodeIgniter License Agreement

    -

    Copyright (c) 2008 - 2009, EllisLab, Inc.
    +

    Copyright (c) 2008 - 2010, 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 agree to comply with the terms and conditions of this license.

    @@ -100,7 +100,7 @@

    Limitations of Liability

    User Guide Home   ·   Next Topic:  Change Log

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index fbc51c9e..8504ae85 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -88,7 +88,7 @@

    Application Flow Chart

    User Guide Home   ·   Next Topic:  Model-View-Controller

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 36ff54d4..1c7aae83 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -165,7 +165,7 @@

    CodeIgniter has a Friendly Community of Users

    User Guide Home   ·   Next Topic:  CodeIgniter Cheatsheets

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index 7a00202d..a34cf719 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -76,7 +76,7 @@

    Helpers Reference

    User Guide Home   ·   Next Topic:  CodeIgniter Features

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 1aa5d1ed..3f584cd9 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -113,7 +113,7 @@

    CodeIgniter Features

    User Guide Home   ·   Next Topic:  Application Flow Chart

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index 6d3e7c77..b37d546b 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -85,7 +85,7 @@

    Getting Started With CodeIgniter

    User Guide Home   ·   Next Topic:  CodeIgniter At a Glance

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index f24d2495..cdd93a35 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -91,7 +91,7 @@

    Design and Architectural Goals

    User Guide Home   ·   Next Topic:  Getting Started

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 2a5fbb48..4dbe55c6 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -77,7 +77,7 @@

    CodeIgniter Overview

    diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 8c5d2be0..67bae89d 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -93,7 +93,7 @@

    Model-View-Controller

    User Guide Home   ·   Next Topic:  Architectural Goals

    -

    CodeIgniter  ·  Copyright © 2006-2009  ·  Ellislab, Inc.

    +

    CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

    diff --git a/user_guide/toc.html b/user_guide/toc.html index ddd249ba..45911d18 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -201,7 +201,7 @@

    Additional Resources

    From 8c4b5e78a8f3a87e30ffc3b09b897153ffe86193 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 6 Jan 2010 22:21:41 +0000 Subject: [PATCH 1755/2544] changed isset() to array_key_exists() in values_parsing() conditional of XML-RPC class to allow for array keys set with NULL values --- system/libraries/Xmlrpc.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index fe5562fe..5a82391d 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -229,7 +229,7 @@ function set_debug($flag = TRUE) function values_parsing($value, $return = FALSE) { - if (is_array($value) && isset($value['0'])) + if (is_array($value) && array_key_exists(0, $value)) { if ( ! isset($value['1']) OR (! isset($this->xmlrpcTypes[$value['1']]))) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 198cef23..93a7025f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -97,6 +97,7 @@

    Bug fixes for 1.7.3

  • Fixed bugs in get_dir_file_info() and get_file_info() in the File Helper with recursion, and file paths on Windows.
  • Fixed a bug where Active Record override parameter would not let you disable Active Record if it was enabled in your database config file.
  • Fixed a bug in reduce_double_slashes() in the String Helper to properly remove duplicate leading slashes (#7585)
    • +
  • Fixed a bug in values_parsing() of the XML-RPC library which prevented NULL variables typed as 'string' from being handled properly.

    • Version 1.7.2

    From 98a447ac363d00d856c18f34ffbd4d14cad51eb3 Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Jan 2010 18:14:28 +0000 Subject: [PATCH 1756/2544] changing the second parameter in directory_map to an integer that controls recursion depth. A depth of 0 is fully recursive to maintain backward compatibility with the boolean values. --- system/helpers/directory_helper.php | 32 +++++++++++------------- user_guide/changelog.html | 1 + user_guide/helpers/directory_helper.html | 6 ++--- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php index 791cf0d1..7de6a3c5 100644 --- a/system/helpers/directory_helper.php +++ b/system/helpers/directory_helper.php @@ -36,32 +36,30 @@ * * @access public * @param string path to source - * @param bool whether to limit the result to the top level only + * @param int depth of directories to traverse (0 = fully recursive, 1 = current dir, etc) * @return array */ if ( ! function_exists('directory_map')) { - function directory_map($source_dir, $top_level_only = FALSE, $hidden = FALSE) - { + function directory_map($source_dir, $directory_depth = 0, $hidden = FALSE) + { if ($fp = @opendir($source_dir)) { - $source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; - $filedata = array(); - + $filedata = array(); + $new_depth = $directory_depth - 1; + $source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; + while (FALSE !== ($file = readdir($fp))) { - if (($hidden == FALSE && strncmp($file, '.', 1) == 0) OR ($file == '.' OR $file == '..')) + // Remove '.', '..', and hidden files [optional] + if ( ! trim($file, '.') OR ($hidden == FALSE && $file[0] == '.')) { continue; } - - if ($top_level_only == FALSE && @is_dir($source_dir.$file)) + + if (($directory_depth < 1 OR $new_depth > 0) && @is_dir($source_dir.$file)) { - $temp_array = array(); - - $temp_array = directory_map($source_dir.$file.DIRECTORY_SEPARATOR, $top_level_only, $hidden); - - $filedata[$file] = $temp_array; + $filedata[$file] = directory_map($source_dir.$file.DIRECTORY_SEPARATOR, $new_depth, $hidden); } else { @@ -72,10 +70,8 @@ function directory_map($source_dir, $top_level_only = FALSE, $hidden = FALSE) closedir($fp); return $filedata; } - else - { - return FALSE; - } + + return FALSE; } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 93a7025f..4758d49b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -81,6 +81,7 @@

    Version 1.7.3

  • Deprecated the dohash() function in favour of do_hash() for naming consistency.
  • Non-backwards compatible change made to get_dir_file_info() in the File Helper. No longer recurses by default so as to encourage responsible use (this function can cause server performance issues when used without caution).
    • +
  • Modified the second parameter of directory_map() in the Directory Helper to accept an integer to specify recursion depth.
    • diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index eae2c52e..3b70799d 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -78,10 +78,10 @@

    directory_map('source directory')

    Note: Paths are almost always relative to your main index.php file.

    -

    Sub-folders contained within the directory will be mapped as well. If you wish to map -only the top level directory set the second parameter to true (boolean):

    +

    Sub-folders contained within the directory will be mapped as well. If you wish to control the recursion depth, +you can do so using the second parameter (integer). A depth of 1 will only map the top level directory:

    -$map = directory_map('./mydirectory/', TRUE); +$map = directory_map('./mydirectory/', 1);

    By default, hidden files will not be included in the returned array. To override this behavior, you may set a third parameter to true (boolean):

    From 0ce9f781778505e7f4b186bc7948b24c6f63a6d3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 8 Jan 2010 12:43:17 +0000 Subject: [PATCH 1757/2544] Table library will generate an empty cell with a blank string, or NULL value. --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4758d49b..3f4fbdb1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -68,6 +68,7 @@

    Version 1.7.3

  • Fixed an error in the Zip library that didn't allow downloading on PHP 4 servers.
  • Fixed a language key in the profiler: "profiler_no_memory_usage" to "profiler_no_memory".
  • Added "is_object" into the list of unit tests capable of being run.
    • +
  • Table library will generate an empty cell with a blank string, or NULL value.
  • Database From a7b2e451ef9f9c471da43442633506bb6e33dde3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 14 Jan 2010 14:35:04 +0000 Subject: [PATCH 1758/2544] added a parse_string() method to the Parser --- user_guide/changelog.html | 1 + user_guide/libraries/parser.html | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3f4fbdb1..f7520194 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,6 +69,7 @@

    Version 1.7.3

  • Fixed a language key in the profiler: "profiler_no_memory_usage" to "profiler_no_memory".
  • Added "is_object" into the list of unit tests capable of being run.
  • Table library will generate an empty cell with a blank string, or NULL value.
    • +
  • Added a parse_string() method to the Parser Class.
  • Database diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 4bf63efb..3dc26815 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -123,6 +123,10 @@

    $this->parser->parse()

    $string = $this->parser->parse('blog_template', $data, TRUE); +

    $this->parser->parse_string()

    + +

    This method works exactly like parse(), only accepts a string as the first parameter in place of a view file.

    +

    Variable Pairs

    From e28c7ae966df7e698727f28b75356f692ae84a8e Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 14 Jan 2010 15:14:51 +0000 Subject: [PATCH 1759/2544] fixing a routing example --- user_guide/general/routing.html | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index ab79c926..01a8aef8 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -96,13 +96,8 @@

    Wildcards

    You can match literal values or you can use two wildcard types:

    -

    -:num
    -:any -

    - -

    :num will match a segment containing only numbers.
    -:any will match a segment containing any character. +

    (:num) will match a segment containing only numbers.
    +(:any) will match a segment containing any character.

    Note: Routes will run in the order they are defined. @@ -118,7 +113,7 @@

    Examples

    $route['blog/joe'] = "blogs/users/34";

    A URL containing the segments blog/joe will be remapped to the "blogs" class and the "users" method. The ID will be set to "34".

    -$route['product/:any'] = "catalog/product_lookup"; +$route['product/(:any)'] = "catalog/product_lookup";

    A URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the "product_lookup" method.

    $route['product/(:num)'] = "catalog/product_lookup_by_id/$1"; From c710211f85e3eb2107c167f6a66161f2b82c1c1c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 14 Jan 2010 15:15:52 +0000 Subject: [PATCH 1760/2544] changelog note about fixing typos/examples. Should probably have added this in the last commit --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f7520194..f54c0076 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -90,6 +90,7 @@

    Version 1.7.3

    Bug fixes for 1.7.3

      +
    • Fixed assorted user guide typos or examples.
    • Increased randomness with is_really_writable() to avoid file collisions when hundreds or thousands of requests occur at once.
    • Fixed or clarified assorted user guide typos or examples.
    • Made get_mime_by_extension() case insensitive.
      • From 3e9519e07af366f9bd7b48de34db689f573d37ea Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Fri, 15 Jan 2010 00:09:34 +0000 Subject: [PATCH 1761/2544] Update to file helper to return FALSE on failure. --- system/helpers/file_helper.php | 8 ++++++-- user_guide/changelog.html | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 114b2927..2be06ac4 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -124,7 +124,9 @@ function delete_files($path, $del_dir = FALSE, $level = 0) $path = rtrim($path, DIRECTORY_SEPARATOR); if ( ! $current_dir = @opendir($path)) - return; + { + return TRUE; + } while(FALSE !== ($filename = @readdir($current_dir))) { @@ -148,8 +150,10 @@ function delete_files($path, $del_dir = FALSE, $level = 0) if ($del_dir == TRUE AND $level > 0) { - @rmdir($path); + return @rmdir($path); } + + return TRUE; } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f54c0076..0e49bbdc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -84,6 +84,7 @@

      Version 1.7.3

    • Non-backwards compatible change made to get_dir_file_info() in the File Helper. No longer recurses by default so as to encourage responsible use (this function can cause server performance issues when used without caution).
    • Modified the second parameter of directory_map() in the Directory Helper to accept an integer to specify recursion depth.
      • +
    • Modified delete_files() in the File Helper to return FALSE on failure.
    • From d827058bb0b1d2b54f7cb0e8343885cedac43334 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 15 Jan 2010 17:10:56 +0000 Subject: [PATCH 1762/2544] adding parse_string method adding null values generating an empty cell in table lib --- system/libraries/Parser.php | 51 ++++++++++++++++++++++++++++++++----- system/libraries/Table.php | 2 +- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php index 399b14b2..56d27e7d 100644 --- a/system/libraries/Parser.php +++ b/system/libraries/Parser.php @@ -29,11 +29,11 @@ class CI_Parser { var $l_delim = '{'; var $r_delim = '}'; var $object; - + /** * Parse a template * - * Parses pseudo-variables contained in the specified template, + * Parses pseudo-variables contained in the specified template view, * replacing them with the data in the second param * * @access public @@ -46,12 +46,50 @@ function parse($template, $data, $return = FALSE) { $CI =& get_instance(); $template = $CI->load->view($template, $data, TRUE); - + + return $this->_parse($template, $data, $return); + } + + // -------------------------------------------------------------------- + + /** + * Parse a String + * + * Parses pseudo-variables contained in the specified string, + * replacing them with the data in the second param + * + * @access public + * @param string + * @param array + * @param bool + * @return string + */ + function parse_string($template, $data, $return = FALSE) + { + return $this->_parse($template, $data, $return); + } + + // -------------------------------------------------------------------- + + /** + * Parse a template + * + * Parses pseudo-variables contained in the specified template, + * replacing them with the data in the second param + * + * @access public + * @param string + * @param array + * @param bool + * @return string + */ + function _parse($template, $data, $return = FALSE) + { if ($template == '') { return FALSE; } - + foreach ($data as $key => $val) { if (is_array($val)) @@ -63,12 +101,13 @@ function parse($template, $data, $return = FALSE) $template = $this->_parse_single($key, (string)$val, $template); } } - + if ($return == FALSE) { + $CI =& get_instance(); $CI->output->append_output($template); } - + return $template; } diff --git a/system/libraries/Table.php b/system/libraries/Table.php index a990d406..6d36121f 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -260,7 +260,7 @@ function generate($table_data = NULL) { $out .= $this->template['cell_'.$name.'start']; - if ($cell === "") + if ($cell === "" OR $cell === NULL) { $out .= $this->empty_cells; } From 03151b09a805f0e91700a7f49a3deffed8beecf8 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 16 Jan 2010 19:06:30 +0000 Subject: [PATCH 1763/2544] preg_quote() in parser --- system/libraries/Parser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php index 56d27e7d..161de613 100644 --- a/system/libraries/Parser.php +++ b/system/libraries/Parser.php @@ -197,7 +197,7 @@ function _parse_pair($variable, $data, $string) */ function _match_pair($string, $variable) { - if ( ! preg_match("|".$this->l_delim . $variable . $this->r_delim."(.+?)".$this->l_delim . '/' . $variable . $this->r_delim."|s", $string, $match)) + if ( ! preg_match("|" . preg_quote($this->l_delim) . $variable . preg_quote($this->r_delim) . "(.+) ". preg_quote($this->l_delim) . '/' . $variable . preg_quote($this->r_delim) . "|s", $string, $match)) { return FALSE; } From 76af409a0157f981c145973e5668052621c38415 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 16 Jan 2010 19:20:49 +0000 Subject: [PATCH 1764/2544] adding http headers and config to CI profiler --- system/language/english/profiler_lang.php | 2 + system/libraries/Profiler.php | 81 +++++++++++++++++++++-- user_guide/changelog.html | 1 + 3 files changed, 78 insertions(+), 6 deletions(-) diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php index 7c40e3f3..bf218300 100644 --- a/system/language/english/profiler_lang.php +++ b/system/language/english/profiler_lang.php @@ -8,6 +8,8 @@ $lang['profiler_post_data'] = 'POST DATA'; $lang['profiler_uri_string'] = 'URI STRING'; $lang['profiler_memory_usage'] = 'MEMORY USAGE'; +$lang['profiler_config'] = 'CONFIG VARIABLES'; +$lang['profiler_headers'] = 'HTTP HEADERS'; $lang['profiler_no_db'] = 'Database driver is not currently loaded'; $lang['profiler_no_queries'] = 'No queries were run'; $lang['profiler_no_post'] = 'No POST data exists'; diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index ec185a1e..ebadf861 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -74,16 +74,16 @@ function _compile_benchmarks() // be modified. We also might want to make this data available to be logged $output = "\n\n"; - $output .= '
    '; + $output .= '
    '; $output .= "\n"; - $output .= '  '.$this->CI->lang->line('profiler_benchmarks').'  '; + $output .= '  '.$this->CI->lang->line('profiler_benchmarks').'  '; $output .= "\n"; $output .= "\n\n\n"; foreach ($profile as $key => $val) { $key = ucwords(str_replace(array('_', '-'), ' ', $key)); - $output .= "\n"; + $output .= "\n"; } $output .= "
    ".$key."  ".$val."
    ".$key."  ".$val."
    \n"; @@ -161,7 +161,7 @@ function _compile_queries() $val = str_replace($bold, ''.$bold.'', $val); } - $output .= "".$time."  ".$val."\n"; + $output .= "".$time."  ".$val."\n"; } } @@ -327,6 +327,7 @@ function _compile_controller_info() return $output; } + // -------------------------------------------------------------------- /** @@ -351,7 +352,7 @@ function _compile_memory_usage() } else { - $output .= "
    ".$this->CI->lang->line('profiler_no_memory')."
    "; + $output .= "
    ".$this->CI->lang->line('profiler_no_memory_usage')."
    "; } $output .= "
    "; @@ -361,6 +362,73 @@ function _compile_memory_usage() // -------------------------------------------------------------------- + /** + * Compile header information + * + * Lists HTTP headers + * + * @access public + * @return string + */ + function _compile_http_headers() + { + $output = "\n\n"; + $output .= '
    '; + $output .= "\n"; + $output .= '  '.$this->CI->lang->line('profiler_headers').'  '; + $output .= "\n"; + + $output .= "\n\n\n"; + + foreach(array('HTTP_ACCEPT', 'HTTP_USER_AGENT', 'HTTP_CONNECTION', 'SERVER_PORT', 'SERVER_NAME', 'REMOTE_ADDR', 'SERVER_SOFTWARE', 'HTTP_ACCEPT_LANGUAGE', 'SCRIPT_NAME', 'REQUEST_METHOD',' HTTP_HOST', 'REMOTE_HOST', 'CONTENT_TYPE', 'SERVER_PROTOCOL', 'QUERY_STRING', 'HTTP_ACCEPT_ENCODING') as $header) + { + $val = (isset($_SERVER[$header])) ? $_SERVER[$header] : ''; + $output .= "\n"; + } + + $output .= "
    ".$header."  ".$val."
    \n"; + $output .= "
    "; + + $output .= "
    "; + + return $output; + } + + // -------------------------------------------------------------------- + + /** + * Compile config information + * + * Lists developer config variables + * + * @access public + * @return string + */ + function _compile_config() + { + $output = "\n\n"; + $output .= '
    '; + $output .= "\n"; + $output .= '  '.$this->CI->lang->line('profiler_config').'  '; + $output .= "\n"; + + $output .= "\n\n\n"; + + foreach($this->CI->config->config as $config=>$val) + { + $output .= "\n"; + } + + $output .= "
    ".$config."  ".$val."
    \n"; + $output .= "
    "; + + $output .= ""; + + return $output; + } + + // -------------------------------------------------------------------- + /** * Run the Profiler * @@ -378,7 +446,8 @@ function run() $output .= $this->_compile_get(); $output .= $this->_compile_post(); $output .= $this->_compile_queries(); - + $output .= $this->_compile_config(); + $output .= $this->_compile_http_headers(); $output .= ''; return $output; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 0e49bbdc..aef9d71a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -70,6 +70,7 @@

    Version 1.7.3

  • Added "is_object" into the list of unit tests capable of being run.
  • Table library will generate an empty cell with a blank string, or NULL value.
  • Added a parse_string() method to the Parser Class.
    • +
  • Added HTTP headers and Config information to the Profiler output.
  • Database From 1ca94e82c8fc8c2acf4bb7b3927abff736779163 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sat, 16 Jan 2010 19:24:21 +0000 Subject: [PATCH 1765/2544] Documented append_output() in the Output Class. --- user_guide/changelog.html | 1 + user_guide/libraries/output.html | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index aef9d71a..ceb016cf 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,6 +71,7 @@

    Version 1.7.3

  • Table library will generate an empty cell with a blank string, or NULL value.
  • Added a parse_string() method to the Parser Class.
  • Added HTTP headers and Config information to the Profiler output.
    • +
  • Documented append_output() in the Output Class.
  • Database diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 1e425910..7be42b44 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -87,6 +87,14 @@

    $this->output->get_output();

    CodeIgniter functions like $this->load->view().

    +

    $this->output->append_output();

    + +

    Appends data onto the output string. Usage example:

    + +$this->output->append_output($data); + + +

    $this->output->set_header();

    Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:

    From 04eb070b87da9ffa40e48ef3660e664b48760c97 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 17 Jan 2010 07:07:13 +0000 Subject: [PATCH 1766/2544] Documentd db->close() --- user_guide/changelog.html | 1 + user_guide/database/connecting.html | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ceb016cf..ba7ab2be 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -77,6 +77,7 @@

    Version 1.7.3

  • Database
    • Semantic change to db->version() function to allow a list of exceptions for databases with functions to return version string instead of specially formed SQL queries. Currently this list only includes Oracle and SQLite.
      • +
    • Documentd db->close().
  • Helpers diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index fb766288..217a2357 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -164,9 +164,11 @@

    Reconnecting / Keeping the Connection Alive

    $this->db->reconnect(); +

    Manually closing the Connection

    - +

    While CodeIgniter intelligently takes care of closing your database connections, you can explicitly close the connection.

    +$this->db->close(); From 33d4b6aac7f33d6cddfa5fb39c5701ecc9cfa80b Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 17 Jan 2010 07:23:00 +0000 Subject: [PATCH 1767/2544] adding the ability for form_open_multipart() to accept string attribute arguments --- system/helpers/form_helper.php | 10 +++++++++- user_guide/changelog.html | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index c78b805e..60d2631e 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -84,7 +84,15 @@ function form_open($action = '', $attributes = '', $hidden = array()) { function form_open_multipart($action, $attributes = array(), $hidden = array()) { - $attributes['enctype'] = 'multipart/form-data'; + if (is_string($attributes)) + { + $attributes .= ' enctype="multipart/form-data"'; + } + else + { + $attributes['enctype'] = 'multipart/form-data'; + } + return form_open($action, $attributes, $hidden); } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ba7ab2be..92765c4e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -106,6 +106,7 @@

    Bug fixes for 1.7.3

  • Fixed a bug where Active Record override parameter would not let you disable Active Record if it was enabled in your database config file.
  • Fixed a bug in reduce_double_slashes() in the String Helper to properly remove duplicate leading slashes (#7585)
  • Fixed a bug in values_parsing() of the XML-RPC library which prevented NULL variables typed as 'string' from being handled properly.
    • +
  • Fixed a bug were form_open_multipart() didn't accept string attribute arguments (#10930).

    • Version 1.7.2

    From 563885b0a62bd4c4251f4df6a81f3e05493f5be1 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 17 Jan 2010 07:31:03 +0000 Subject: [PATCH 1768/2544] fixed an incorrectly labelled config key example --- user_guide/changelog.html | 2 +- user_guide/libraries/sessions.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 92765c4e..a322d357 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -94,7 +94,7 @@

    Version 1.7.3

    Bug fixes for 1.7.3

      -
    • Fixed assorted user guide typos or examples.
      • +
    • Fixed assorted user guide typos or examples (#10693).
    • Increased randomness with is_really_writable() to avoid file collisions when hundreds or thousands of requests occur at once.
    • Fixed or clarified assorted user guide typos or examples.
    • Made get_mime_by_extension() case insensitive.
      • diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 11313b51..c93c7614 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -123,7 +123,7 @@

      What is Session Data?

      Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time -the cookie was written. This time is configurable by changing the $config['time_to_update'] line in your system/config/config.php file.

      +the cookie was written. This time is configurable by changing the $config['sess_time_to_update'] line in your system/config/config.php file.

      Retrieving Session Data

      From f063ed7a0d51fd2abd5dd716ab7f92a54e45cd11 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 17 Jan 2010 07:48:25 +0000 Subject: [PATCH 1769/2544] making get_mime_by_extension case insensitive --- system/helpers/file_helper.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 2be06ac4..9ea5018a 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -346,7 +346,7 @@ function get_file_info($file, $returned_values = array('name', 'server_path', 's { function get_mime_by_extension($file) { - $extension = strtolower(substr(strrchr($file, '.'), 1)); + $extension = strtolower(substr(strrchr(strtolower($file), '.'), 1)); global $mimes; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a322d357..55718c6b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -107,6 +107,7 @@

      Bug fixes for 1.7.3

    • Fixed a bug in reduce_double_slashes() in the String Helper to properly remove duplicate leading slashes (#7585)
    • Fixed a bug in values_parsing() of the XML-RPC library which prevented NULL variables typed as 'string' from being handled properly.
    • Fixed a bug were form_open_multipart() didn't accept string attribute arguments (#10930).
      • +
    • Fixed a bug (#10470) where get_mime_by_extension() case sensitive.

    Version 1.7.2

    From 9502311beeda23042370bb891f850eab3aadad96 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 17 Jan 2010 07:51:21 +0000 Subject: [PATCH 1770/2544] change already made - revert --- system/helpers/file_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 9ea5018a..2be06ac4 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -346,7 +346,7 @@ function get_file_info($file, $returned_values = array('name', 'server_path', 's { function get_mime_by_extension($file) { - $extension = strtolower(substr(strrchr(strtolower($file), '.'), 1)); + $extension = strtolower(substr(strrchr($file, '.'), 1)); global $mimes; From c47eb1e3009cb4d0760748c9c1fe029fb988dd55 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 17 Jan 2010 07:56:56 +0000 Subject: [PATCH 1771/2544] Added "default" to the list Reserved Names --- user_guide/changelog.html | 5 +++++ user_guide/general/reserved_names.html | 1 + 2 files changed, 6 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 55718c6b..bb175c21 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -90,6 +90,11 @@

    Version 1.7.3

  • Modified delete_files() in the File Helper to return FALSE on failure.
    • +
  • Other Changes + +

    • Bug fixes for 1.7.3

    diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 2d637e8e..0d697b38 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -68,6 +68,7 @@

    Controller names

  • CI_Base
  • _ci_initialize
  • _ci_scaffolding
    • +
  • Default (PHP 5)
  • index


    • From 028cbb5de098b74780d57c24d574e531fb23f33c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 17 Jan 2010 08:07:49 +0000 Subject: [PATCH 1772/2544] extra period in a sentence (the horror!) :) --- user_guide/changelog.html | 2 +- user_guide/libraries/form_validation.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index bb175c21..92282323 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -99,7 +99,7 @@

    Version 1.7.3

    Bug fixes for 1.7.3

      -
    • Fixed assorted user guide typos or examples (#10693).
      • +
    • Fixed assorted user guide typos or examples (#10693, #8951).
    • Increased randomness with is_really_writable() to avoid file collisions when hundreds or thousands of requests occur at once.
    • Fixed or clarified assorted user guide typos or examples.
    • Made get_mime_by_extension() case insensitive.
      • diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 400af0e5..49c30ef3 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -449,7 +449,7 @@

      Re-populating the form

      Open your myform.php view file and update the value in each field using the set_value() function:

      -

      Don't forget to include each. field name in the set_value() functions!

      +

      Don't forget to include each field name in the set_value() functions!

      - - - - - - - - - - - - -load->view('footer'); -/* End of file add.php */ -/* Location: ./system/scaffolding/views/add.php */ diff --git a/system/scaffolding/views/delete.php b/system/scaffolding/views/delete.php deleted file mode 100644 index d1954219..00000000 --- a/system/scaffolding/views/delete.php +++ /dev/null @@ -1,9 +0,0 @@ -load->view('header'); ?> - -

      - -

        |   - -load->view('footer'); -/* End of file delete.php */ -/* Location: ./system/scaffolding/views/delete.php */ diff --git a/system/scaffolding/views/edit.php b/system/scaffolding/views/edit.php deleted file mode 100644 index fe553e59..00000000 --- a/system/scaffolding/views/edit.php +++ /dev/null @@ -1,33 +0,0 @@ -load->view('header'); ?> - - -

      - - - - - - - -primary_key == 1) continue; ?> - - - - - type == 'blob'): ?> - - - - - - - -
      name; ?>
      - - - - - -load->view('footer'); -/* End of file edit.php */ -/* Location: ./system/scaffolding/views/edit.php */ \ No newline at end of file diff --git a/system/scaffolding/views/footer.php b/system/scaffolding/views/footer.php deleted file mode 100644 index 0e71401c..00000000 --- a/system/scaffolding/views/footer.php +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/system/scaffolding/views/header.php b/system/scaffolding/views/header.php deleted file mode 100644 index 50f234a4..00000000 --- a/system/scaffolding/views/header.php +++ /dev/null @@ -1,29 +0,0 @@ - - - - -<?php echo $title; ?> - - - - - - - - - - - - -
      -
      \ No newline at end of file diff --git a/system/scaffolding/views/index.html b/system/scaffolding/views/index.html deleted file mode 100644 index c942a79c..00000000 --- a/system/scaffolding/views/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/system/scaffolding/views/no_data.php b/system/scaffolding/views/no_data.php deleted file mode 100644 index bc81e748..00000000 --- a/system/scaffolding/views/no_data.php +++ /dev/null @@ -1,8 +0,0 @@ -load->view('header'); ?> - -

      -

      - -load->view('footer'); -/* End of file no_data.php */ -/* Location: ./system/scaffolding/views/no_data.php */ \ No newline at end of file diff --git a/system/scaffolding/views/stylesheet.css b/system/scaffolding/views/stylesheet.css deleted file mode 100644 index 3f487dd0..00000000 --- a/system/scaffolding/views/stylesheet.css +++ /dev/null @@ -1,143 +0,0 @@ -body { - margin: 0; - padding: 0; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - color: #4F5155; - background: #fff url(background.jpg) repeat-x left top; -} - -a { - color: #8B0D00; - background-color: transparent; - text-decoration: none; - font-weight: bold; -} - -a:visited { - color: #8B0D00; - background-color: transparent; - text-decoration: none; -} - -a:hover { - color: #000; - text-decoration: none; - background-color: transparent; -} - - -#header { - margin: 0; - padding: 0; -} - -#header_left { - background-color: transparent; - float: left; - padding: 21px 0 0 32px; - margin: 0 -} - -#header_right { - background-color: transparent; - float: right; - text-align: right; - padding: 35px 50px 20px 0; - margin: 0 -} - -#footer { - margin: 20px 0 15px 0; - padding: 0; -} - -#footer p { - font-size: 10px; - color: #999; - text-align: center; -} - -#outer { - margin: 30px 40px 0 40px; -} - -img { - padding:0; - border: 0; - margin: 0; -} - -.nopad { - padding:0; - border: 0; - margin: 0; -} - -table { - background-color: #efefef; -} - -th { - background-color: #eee; - font-weight: bold; - padding: 6px; - text-align: left; -} - -td { - background-color: #fff; - padding: 6px; -} - - -form { - margin: 0; - padding: 0; -} - -.input { - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - width: 600px; - color: #333; - border: 1px solid #B3B4BD; - font-size: 11px; - height: 2em; - padding: 0; - margin: 0; -} - -.textarea { - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 12px; - width: 600px; - color: #333; - border: 1px solid #B3B4BD; - padding: 0; - margin: 0; -} - -.select { - background-color: #fff; - font-size: 11px; - font-weight: normal; - color: #333; - padding: 0; - margin: 0 0 3px 0; -} - -.checkbox { - background-color: transparent; - padding: 0; - border: 0; -} - -.submit { - background-color: #8B0D00; - color: #FFF; - font-weight: normal; - border: 1px solid #000; - margin: 6px 0 0 0; - padding: 1px 5px 1px 5px; -} diff --git a/system/scaffolding/views/view.php b/system/scaffolding/views/view.php deleted file mode 100644 index a81241d3..00000000 --- a/system/scaffolding/views/view.php +++ /dev/null @@ -1,27 +0,0 @@ -load->view('header'); ?> - - - - - - - - - - -result() as $row): ?> - - - - - - - - -
      EditDelete
       $primary), $scaff_edit); ?> $primary), $scaff_delete); ?>$field);?>
      - - - -load->view('footer'); -/* End of file view.php */ -/* Location: ./system/scaffolding/views/view.php */ \ No newline at end of file From fcb7bfd9c78f87f93b53c276c92f239794839501 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 15:45:15 -0600 Subject: [PATCH 1822/2544] brought captcha plugin up to date --- system/plugins/captcha_pi.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/system/plugins/captcha_pi.php b/system/plugins/captcha_pi.php index 77f29f8b..7092f28e 100644 --- a/system/plugins/captcha_pi.php +++ b/system/plugins/captcha_pi.php @@ -28,7 +28,7 @@ 'word' => 'Random word', 'img_path' => './captcha/', 'img_url' => 'http://example.com/captcha/', - 'font_path' => './system/fonts/texb.ttf', + 'font_path' => './path/to/fonts/texb.ttf', 'img_width' => '150', 'img_height' => 30, 'expiration' => 7200 @@ -110,7 +110,6 @@ $cap = create_captcha($vals); $data = array( - 'captcha_id' => '', 'captcha_time' => $cap['time'], 'ip_address' => $this->input->ip_address(), 'word' => $cap['word'] @@ -128,7 +127,7 @@ // First, delete old captchas $expiration = time()-7200; // Two hour limit - $DB->query("DELETE FROM captcha WHERE captcha_time < ".$expiration); + $this->db->query("DELETE FROM captcha WHERE captcha_time < ".$expiration); // Then see if a captcha exists: $sql = "SELECT COUNT(*) AS count FROM captcha WHERE word = ? AND ip_address = ? AND date > ?"; @@ -180,7 +179,7 @@ function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = return FALSE; } - if ( ! is_really_writable($img_path)) + if ( ! is_writable($img_path)) { return FALSE; } @@ -243,7 +242,7 @@ function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = // ----------------------------------- // Create image // ----------------------------------- - + // PHP.net recommends imagecreatetruecolor(), but it isn't always available if (function_exists('imagecreatetruecolor')) { From b2fd44474b126ce8fa179651ea8ad1edc110131c Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 15:45:30 -0600 Subject: [PATCH 1823/2544] lowercased all tag attribute values --- system/plugins/js_calendar_pi.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/plugins/js_calendar_pi.php b/system/plugins/js_calendar_pi.php index a35ab56b..f722777b 100644 --- a/system/plugins/js_calendar_pi.php +++ b/system/plugins/js_calendar_pi.php @@ -33,7 +33,7 @@
      -

      Today

      +

      Today

      @@ -210,9 +210,9 @@ function build_calendar() str += '
      '; str += ''; str += ''; - str += ' @@ -83,38 +83,12 @@

      Security Filtering

      XSS Filtering

      -

      CodeIgniter comes with a Cross Site Scripting Hack prevention filter which can either run automatically to filter -all POST and COOKIE data that is encountered, or you can run it on a per item basis. By default it does not -run globally since it requires a bit of processing overhead, and since you may not need it in all cases.

      - -

      The XSS filter looks for commonly used techniques to trigger Javascript or other types of code that attempt to hijack cookies -or do other malicious things. If anything disallowed is encountered it is rendered safe by converting the data to character entities.

      - -

      -Note: This function should only be used to deal with data upon submission. It's not something that should be used for general runtime processing since it requires a fair amount of processing overhead.

      - - -

      To filter data through the XSS filter use this function:

      - -

      $this->input->xss_clean()

      - -

      Here is an usage example:

      - -$data = $this->input->xss_clean($data); - -

      If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your +

      The Input class has the ability to filter input automatically to prevent cross-site scripting attacks. If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your application/config/config.php file and setting this:

      $config['global_xss_filtering'] = TRUE; -

      Note: If you use the form validation class, it gives you the option of XSS filtering as well.

      - -

      An optional second parameter, is_image, allows this function to be used to test images for potential XSS attacks, useful for file upload security. When this second parameter is set to TRUE, instead of returning an altered string, the function returns TRUE if the image is safe, and FALSE if it contained potentially malicious information that a browser may attempt to execute.

      - -if ($this->input->xss_clean($file, TRUE) === FALSE)
      -{
      -    // file failed the XSS test
      -}       +

      Please refer to the Security class documentation for information on using XSS Filtering in your application.

      Using POST, COOKIE, or SERVER Data

      @@ -183,6 +157,55 @@

      $this->input->server()

      $this->input->server('some_data'); +

      $this->input->set_cookie()

      + +

      Sets a cookie containing the values you specify. There are two ways to pass information to this function so that a cookie can be set: +Array Method, and Discrete Parameters:

      + +

      Array Method

      + +

      Using this method, an associative array is passed to the first parameter:

      + +$cookie = array(
      +                   'name'   => 'The Cookie Name',
      +                   'value'  => 'The Value',
      +                   'expire' => '86500',
      +                   'domain' => '.some-domain.com',
      +                   'path'   => '/',
      +                   'prefix' => 'myprefix_',
      +               );
      +
      +$this->input->set_cookie($cookie); +       + +

      Notes:

      + +

      Only the name and value are required. To delete a cookie set it with the expiration blank.

      + +

      The expiration is set in seconds, which will be added to the current time. Do not include the time, but rather only the +number of seconds from now that you wish the cookie to be valid. If the expiration is set to +zero the cookie will only last as long as the browser is open.

      +

      For site-wide cookies regardless of how your site is requested, add your URL to the domain starting with a period, like this: .your-domain.com

      +

      The path is usually not needed since the function sets a root path.

      +

      The prefix is only needed if you need to avoid name collisions with other identically named cookies for your server.

      + +

      Discrete Parameters

      + +

      If you prefer, you can set the cookie by passing data using individual parameters:

      + +$this->input->set_cookie($name, $value, $expire, $domain, $path, $prefix); + +

      $this->input->get_cookie()

      + +

      Lets you fetch a cookie. The first parameter will contain the name of the cookie you are looking for (including any prefixes):

      + +get_cookie('some_cookie'); + +

      The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

      + +

      The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

      + +

      get_cookie('some_cookie', TRUE);

      $this->input->ip_address()

      diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html new file mode 100644 index 00000000..d5d72538 --- /dev/null +++ b/user_guide/libraries/security.html @@ -0,0 +1,123 @@ + + + + + +Security Class : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
      +
      <<<\/td>'; + str += '<<<\/td>'; str += '' + months[this.month] + ' ' + this.year + '<\/td>'; - str += '>><\/td>'; + str += '>><\/td>'; str += '<\/tr>'; // Day Names @@ -242,7 +242,7 @@ function build_calendar() } else if (displayNum == selDate && this.highlight == true) // Selected date { - str += '' + displayNum + '<\/td>'; + str += '' + displayNum + '<\/td>'; } else if (displayNum > this.total_days()) { @@ -250,7 +250,7 @@ function build_calendar() } else // Unselected days { - str += '' + displayNum + '<\/td>'; + str += '' + displayNum + '<\/td>'; } if (j % 7 == 6) From c16f49eebbc00b33902dcdb05c4b652937d4b2e9 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 16:39:47 -0600 Subject: [PATCH 1824/2544] added .htaccess file to cache folder --- system/cache/.htaccess | 1 + 1 file changed, 1 insertion(+) create mode 100644 system/cache/.htaccess diff --git a/system/cache/.htaccess b/system/cache/.htaccess new file mode 100644 index 00000000..3418e55a --- /dev/null +++ b/system/cache/.htaccess @@ -0,0 +1 @@ +deny from all \ No newline at end of file From 71141ce88b5d77e28049b4f641045125921e3dc0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 16:41:20 -0600 Subject: [PATCH 1825/2544] whitespace in Email lib --- system/libraries/Email.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index d0f2ea9a..8014bd21 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1544,7 +1544,7 @@ function _send_with_sendmail() // server probably has popen disabled, so nothing we can do to get a verbose error. return FALSE; } - + fputs($fp, $this->_header_str); fputs($fp, $this->_finalbody); @@ -1554,7 +1554,7 @@ function _send_with_sendmail() { $status = $status >> 8 & 0xFF; } - + if ($status != 0) { $this->_set_error_message('email_exit_status', $status); From d10e89666380d717e3e40dda046be78dbb7a38c4 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 17:10:36 -0600 Subject: [PATCH 1826/2544] added batch insert/update and a replace method to active record --- system/database/DB_active_rec.php | 327 +++++++++++++++++++++++++++++- 1 file changed, 325 insertions(+), 2 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index a3abff11..88690a8f 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -721,13 +721,13 @@ function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '') { $like_statement = $prefix." $k $not LIKE '%{$v}%'"; } - + // some platforms require an escape sequence definition for LIKE wildcards if ($this->_like_escape_str != '') { $like_statement = $like_statement.sprintf($this->_like_escape_str, $this->_like_escape_chr); } - + $this->ar_like[] = $like_statement; if ($this->ar_caching === TRUE) { @@ -1134,7 +1134,127 @@ function getwhere($table = '', $where = null, $limit = null, $offset = null) { return $this->get_where($table, $where, $limit, $offset); } + + // -------------------------------------------------------------------- + + /** + * Insert_Batch + * + * Compiles batch insert strings and runs the queries + * + * @access public + * @param string the table to retrieve the results from + * @param array an associative array of insert values + * @return object + */ + function insert_batch($table = '', $set = NULL) + { + if ( ! is_null($set)) + { + $this->set_insert_batch($set); + } + if (count($this->ar_set) == 0) + { + if ($this->db_debug) + { + //No valid data array. Folds in cases where keys and values did not match up + return $this->display_error('db_must_use_set'); + } + return FALSE; + } + + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + // Batch this baby + for ($i = 0, $total = count($this->ar_set); $i < $total; $i = $i + 100) + { + + $sql = $this->_insert_batch($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_keys, array_slice($this->ar_set, $i, 100)); + + //echo $sql; + + $this->query($sql); + } + + $this->_reset_write(); + + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * The "set_insert_batch" function. Allows key/value pairs to be set for batch inserts + * + * @access public + * @param mixed + * @param string + * @param boolean + * @return object + */ + + function set_insert_batch($key, $value = '', $escape = TRUE) + { + $key = $this->_object_to_array_batch($key); + + if ( ! is_array($key)) + { + $key = array($key => $value); + } + + $keys = array_keys(current($key)); + sort($keys); + + foreach ($key as $row) + { + if (count(array_diff($keys, array_keys($row))) > 0 OR count(array_diff(array_keys($row), $keys)) > 0) + { + // batch function above returns an error on an empty array + $this->ar_set[] = array(); + return; + } + + ksort($row); // puts $row in the same order as our keys + + if ($escape === FALSE) + { + $this->ar_set[] = '('.implode(',', $row).')'; + } + else + { + $clean = array(); + + foreach($row as $value) + { + $clean[] = $this->escape($value); + } + + $this->ar_set[] = '('.implode(',', $clean).')'; + } + } + + foreach ($keys as $k) + { + $this->ar_keys[] = $this->_protect_identifiers($k); + } + + return $this; + } + // -------------------------------------------------------------------- /** @@ -1183,6 +1303,42 @@ function insert($table = '', $set = NULL) return $this->query($sql); } + function replace($table = '', $set = NULL) + { + if ( ! is_null($set)) + { + $this->set($set); + } + + if (count($this->ar_set) == 0) + { + if ($this->db_debug) + { + return $this->display_error('db_must_use_set'); + } + return FALSE; + } + + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + $sql = $this->_replace($this->_protect_identifiers($table, TRUE, NULL, FALSE), array_keys($this->ar_set), array_values($this->ar_set)); + + $this->_reset_write(); + return $this->query($sql); + } + // -------------------------------------------------------------------- /** @@ -1245,6 +1401,133 @@ function update($table = '', $set = NULL, $where = NULL, $limit = NULL) return $this->query($sql); } + + // -------------------------------------------------------------------- + + /** + * Update_Batch + * + * Compiles an update string and runs the query + * + * @access public + * @param string the table to retrieve the results from + * @param array an associative array of update values + * @param string the where key + * @return object + */ + function update_batch($table = '', $set = NULL, $index = NULL) + { + // Combine any cached components with the current statements + $this->_merge_cache(); + + if (is_null($index)) + { + if ($this->db_debug) + { + return $this->display_error('db_myst_use_index'); + } + + return FALSE; + } + + if ( ! is_null($set)) + { + $this->set_update_batch($set, $index); + } + + if (count($this->ar_set) == 0) + { + if ($this->db_debug) + { + return $this->display_error('db_must_use_set'); + } + + return FALSE; + } + + if ($table == '') + { + if ( ! isset($this->ar_from[0])) + { + if ($this->db_debug) + { + return $this->display_error('db_must_set_table'); + } + return FALSE; + } + + $table = $this->ar_from[0]; + } + + // Batch this baby + for ($i = 0, $total = count($this->ar_set); $i < $total; $i = $i + 100) + { + $sql = $this->_update_batch($this->_protect_identifiers($table, TRUE, NULL, FALSE), array_slice($this->ar_set, $i, 100), $this->_protect_identifiers($index), $this->ar_where); + + $this->query($sql); + } + + $this->_reset_write(); + } + + // -------------------------------------------------------------------- + + /** + * The "set_update_batch" function. Allows key/value pairs to be set for batch updating + * + * @access public + * @param array + * @param string + * @param boolean + * @return object + */ + + function set_update_batch($key, $index = '', $escape = TRUE) + { + $key = $this->_object_to_array_batch($key); + + if ( ! is_array($key)) + { + // @todo error + } + + foreach ($key as $k => $v) + { + $index_set = FALSE; + $clean = array(); + + foreach($v as $k2 => $v2) + { + if ($k2 == $index) + { + $index_set = TRUE; + } + else + { + $not[] = $k.'-'.$v; + } + + if ($escape === FALSE) + { + $clean[$this->_protect_identifiers($k2)] = $v2; + } + else + { + $clean[$this->_protect_identifiers($k2)] = $this->escape($v2); + } + } + + if ($index_set == FALSE) + { + return $this->display_error('db_batch_missing_index'); + } + + $this->ar_set[] = $clean; + } + + return $this; + } + // -------------------------------------------------------------------- /** @@ -1638,7 +1921,47 @@ function _object_to_array($object) $array[$key] = $val; } } + + return $array; + } + // -------------------------------------------------------------------- + + /** + * Object to Array + * + * Takes an object as input and converts the class variables to array key/vals + * + * @access public + * @param object + * @return array + */ + function _object_to_array_batch($object) + { + if ( ! is_object($object)) + { + return $object; + } + + $array = array(); + $out = get_object_vars($object); + $fields = array_keys($out); + + foreach ($fields as $val) + { + // There are some built in keys we need to ignore for this conversion + if ($val != '_parent_name' && $val != '_ci_scaffolding' && $val != '_ci_scaff_table') + { + + $i = 0; + foreach ($out[$val] as $data) + { + $array[$i][$val] = $data; + $i++; + } + } + } + return $array; } From e77922026939fed28a607338e24c1c37066a97b4 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 17:24:46 -0600 Subject: [PATCH 1827/2544] whitespace and changes to load_class() to use core --- system/database/DB_driver.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index d7f17ccb..dfef4275 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -261,10 +261,10 @@ function query($sql, $binds = FALSE, $return_object = TRUE) // Verify table prefix and replace if necessary if ( ($this->dbprefix != '' AND $this->swap_pre != '') AND ($this->dbprefix != $this->swap_pre) ) - { + { $sql = preg_replace("/(\W)".$this->swap_pre."(\S+?)/", "\\1".$this->dbprefix."\\2", $sql); } - + // Is query caching enabled? If the query is a "read type" // we will load the caching class and return the previously // cached query if it exists @@ -679,7 +679,7 @@ function last_query() * @return mixed */ function escape($str) - { + { if (is_string($str)) { $str = "'".$this->escape_str($str)."'"; @@ -697,7 +697,7 @@ function escape($str) } // -------------------------------------------------------------------- - + /** * Escape LIKE String * @@ -714,7 +714,7 @@ function escape_like_str($str) } // -------------------------------------------------------------------- - + /** * Primary * @@ -1155,7 +1155,7 @@ function close() */ function display_error($error = '', $swap = '', $native = FALSE) { - $LANG =& load_class('Language'); + $LANG =& load_class('Lang', 'core'); $LANG->load('db'); $heading = $LANG->line('db_error_heading'); @@ -1169,7 +1169,7 @@ function display_error($error = '', $swap = '', $native = FALSE) $message = ( ! is_array($error)) ? array(str_replace('%s', $swap, $LANG->line($error))) : $error; } - $error =& load_class('Exceptions'); + $error =& load_class('Exceptions', 'core'); echo $error->show_error($heading, $message, 'error_db'); exit; } @@ -1315,13 +1315,13 @@ function _protect_identifiers($item, $prefix_single = FALSE, $protect_identifier { $i++; } - + // Verify table prefix and replace if necessary if ($this->swap_pre != '' && strncmp($parts[$i], $this->swap_pre, strlen($this->swap_pre)) === 0) { $parts[$i] = preg_replace("/^".$this->swap_pre."(\S+?)/", $this->dbprefix."\\1", $parts[$i]); } - + // We only add the table prefix if it does not already exist if (substr($parts[$i], 0, strlen($this->dbprefix)) != $this->dbprefix) { From 30b35eb12edef6018fe61f383a002d895683e468 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 17:25:41 -0600 Subject: [PATCH 1828/2544] whitespace --- system/database/DB_forge.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index c5931db2..8be65e0d 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -259,8 +259,8 @@ function add_column($table = '', $field = array(), $after_field = '') // add field info into field array, but we can only do one at a time // so we cycle through - foreach ($field as $k => $v) - { + foreach ($field as $k => $v) + { $this->add_field(array($k => $field[$k])); if (count($this->fields) == 0) @@ -279,6 +279,7 @@ function add_column($table = '', $field = array(), $after_field = '') } return TRUE; + } // -------------------------------------------------------------------- From 20aa2bd6d852530b3d4b2e76076fe7e7b48bf148 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 17:28:07 -0600 Subject: [PATCH 1829/2544] added batch insert/update and replace methods to MySQL driver --- .../database/drivers/mysql/mysql_driver.php | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index bd60d9ff..d684c8a4 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -537,6 +537,44 @@ function _insert($table, $keys, $values) // -------------------------------------------------------------------- + + /** + * Replace statement + * + * Generates a platform-specific replace string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _replace($table, $keys, $values) + { + return "REPLACE INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Insert_batch statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert_batch($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values); + } + + // -------------------------------------------------------------------- + + /** * Update statement * @@ -572,6 +610,60 @@ function _update($table, $values, $where, $orderby = array(), $limit = FALSE) // -------------------------------------------------------------------- + + /** + * Update_Batch statement + * + * Generates a platform-specific batch update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update_batch($table, $values, $index, $where = NULL) + { + $ids = array(); + $where = ($where != '' AND count($where) >=1) ? implode(" ", $where).' AND ' : ''; + + foreach($values as $key => $val) + { + $ids[] = $val[$index]; + + foreach(array_keys($val) as $field) + { + if ($field != $index) + { + $final[$field][] = 'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field]; + } + } + } + + $sql = "UPDATE ".$table." SET "; + $cases = ''; + + foreach($final as $k => $v) + { + $cases .= $k.' = CASE '."\n"; + foreach ($v as $row) + { + $cases .= $row."\n"; + } + + $cases .= 'ELSE '.$k.' END, '; + } + + $sql .= substr($cases, 0, -2); + + $sql .= ' WHERE '.$where.$index.' IN ('.implode(',', $ids).')'; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** * Truncate statement * From c34e578c4bf993481381b1efb8f95089482135a4 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 17:35:55 -0600 Subject: [PATCH 1830/2544] added stricton db config item to force strict mode - good for ensuring strict sql during development --- system/application/config/database.php | 3 +++ system/database/DB.php | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/system/application/config/database.php b/system/application/config/database.php index ee11c8a7..28dfff5c 100644 --- a/system/application/config/database.php +++ b/system/application/config/database.php @@ -26,6 +26,8 @@ | ['cachedir'] The path to the folder where cache files should be stored | ['char_set'] The character set used in communicating with the database | ['dbcollat'] The character collation used in communicating with the database +| ['stricton'] TRUE/FALSE - forces "Strict Mode" connections +| - good for ensuring strict SQL while developing | | The $active_group variable lets you choose which connection group to | make active. By default there is only one group (the "default" group). @@ -49,6 +51,7 @@ $db['default']['cachedir'] = ""; $db['default']['char_set'] = "utf8"; $db['default']['dbcollat'] = "utf8_general_ci"; +$db['default']['stricton'] = FALSE; /* End of file database.php */ diff --git a/system/database/DB.php b/system/database/DB.php index 6930411c..a91ca08f 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -137,6 +137,11 @@ function &DB($params = '', $active_record_override = NULL) $DB->initialize(); } + if (isset($params['stricton']) && $params['stricton'] == TRUE) + { + $DB->query('SET SESSION sql_mode="STRICT_ALL_TABLES"'); + } + return $DB; } From 2a58e7a6945c47929d5003f15f1bdc32a1717270 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 17:53:38 -0600 Subject: [PATCH 1831/2544] bringing language files up to date --- system/language/english/date_lang.php | 1 + system/language/english/db_lang.php | 3 +- system/language/english/scaffolding_lang.php | 17 ---------- system/language/english/validation_lang.php | 33 +++++++++----------- 4 files changed, 18 insertions(+), 36 deletions(-) delete mode 100644 system/language/english/scaffolding_lang.php diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php index 628e55b1..c0ace16e 100644 --- a/system/language/english/date_lang.php +++ b/system/language/english/date_lang.php @@ -56,5 +56,6 @@ $lang['UP13'] = '(UTC +13:00) Phoenix Islands Time, Tonga'; $lang['UP14'] = '(UTC +14:00) Line Islands'; + /* End of file date_lang.php */ /* Location: ./system/language/english/date_lang.php */ \ No newline at end of file diff --git a/system/language/english/db_lang.php b/system/language/english/db_lang.php index dc98afca..79b82c73 100644 --- a/system/language/english/db_lang.php +++ b/system/language/english/db_lang.php @@ -6,8 +6,9 @@ $lang['db_unable_to_create'] = 'Unable to create the specified database: %s'; $lang['db_invalid_query'] = 'The query you submitted is not valid.'; $lang['db_must_set_table'] = 'You must set the database table to be used with your query.'; -$lang['db_must_set_database'] = 'You must set the database name in your database config file.'; $lang['db_must_use_set'] = 'You must use the "set" method to update an entry.'; +$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.'; +$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.'; $lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.'; $lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.'; $lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.'; diff --git a/system/language/english/scaffolding_lang.php b/system/language/english/scaffolding_lang.php deleted file mode 100644 index c4d54d5c..00000000 --- a/system/language/english/scaffolding_lang.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Tue, 2 Mar 2010 18:13:59 -0600 Subject: [PATCH 1832/2544] adding initial Javascript and Jquery libs --- system/libraries/Javascript.php | 847 ++++++++++++++++++++++++ system/libraries/Jquery.php | 1071 +++++++++++++++++++++++++++++++ 2 files changed, 1918 insertions(+) create mode 100644 system/libraries/Javascript.php create mode 100644 system/libraries/Jquery.php diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php new file mode 100644 index 00000000..3b7dcc6f --- /dev/null +++ b/system/libraries/Javascript.php @@ -0,0 +1,847 @@ + 'jquery', 'autoload' => TRUE); + + foreach ($defaults as $key => $val) + { + if (isset($params[$key]) && $params[$key] !== "") + { + $defaults[$key] = $params[$key]; + } + } + + extract($defaults); + + $this->CI =& get_instance(); + + // load the requested js library + $this->CI->load->library($js_library_driver, array('autoload' => $autoload)); + // make js to refer to current library + $this->js =& $this->CI->$js_library_driver; + + log_message('debug', "Javascript Class Initialized and loaded. Driver used: $js_library_driver"); + } + + // -------------------------------------------------------------------- + // Event Code + // -------------------------------------------------------------------- + + /** + * Blur + * + * Outputs a javascript library blur event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function blur($element = 'this', $js = '') + { + return $this->js->_blur($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Change + * + * Outputs a javascript library change event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function change($element = 'this', $js = '') + { + return $this->js->_change($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Click + * + * Outputs a javascript library click event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @param boolean whether or not to return false + * @return string + */ + function click($element = 'this', $js = '', $ret_false = TRUE) + { + return $this->js->_click($element, $js, $ret_false); + } + + // -------------------------------------------------------------------- + + /** + * Double Click + * + * Outputs a javascript library dblclick event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function dblclick($element = 'this', $js = '') + { + return $this->js->_dblclick($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Error + * + * Outputs a javascript library error event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function error($element = 'this', $js = '') + { + return $this->js->_error($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Focus + * + * Outputs a javascript library focus event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function focus($element = 'this', $js = '') + { + return $this->js->__add_event($focus, $js); + } + + // -------------------------------------------------------------------- + + /** + * Hover + * + * Outputs a javascript library hover event + * + * @access public + * @param string - element + * @param string - Javascript code for mouse over + * @param string - Javascript code for mouse out + * @return string + */ + function hover($element = 'this', $over, $out) + { + return $this->js->__hover($element, $over, $out); + } + + // -------------------------------------------------------------------- + + /** + * Keydown + * + * Outputs a javascript library keydown event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function keydown($element = 'this', $js = '') + { + return $this->js->_keydown($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Keyup + * + * Outputs a javascript library keydown event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function keyup($element = 'this', $js = '') + { + return $this->js->_keyup($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Load + * + * Outputs a javascript library load event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function load($element = 'this', $js = '') + { + return $this->js->_load($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Mousedown + * + * Outputs a javascript library mousedown event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function mousedown($element = 'this', $js = '') + { + return $this->js->_mousedown($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Mouse Out + * + * Outputs a javascript library mouseout event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function mouseout($element = 'this', $js = '') + { + return $this->js->_mouseout($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Mouse Over + * + * Outputs a javascript library mouseover event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function mouseover($element = 'this', $js = '') + { + return $this->js->_mouseover($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Mouseup + * + * Outputs a javascript library mouseup event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function mouseup($element = 'this', $js = '') + { + return $this->js->_mouseup($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Output + * + * Outputs the called javascript to the screen + * + * @access public + * @param string The code to output + * @return string + */ + function output($js) + { + return $this->js->_output($js); + } + + // -------------------------------------------------------------------- + + /** + * Ready + * + * Outputs a javascript library mouseup event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function ready($js) + { + return $this->js->_document_ready($js); + } + + // -------------------------------------------------------------------- + + /** + * Resize + * + * Outputs a javascript library resize event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function resize($element = 'this', $js = '') + { + return $this->js->_resize($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Scroll + * + * Outputs a javascript library scroll event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function scroll($element = 'this', $js = '') + { + return $this->js->_scroll($element, $js); + } + + // -------------------------------------------------------------------- + + /** + * Unload + * + * Outputs a javascript library unload event + * + * @access public + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function unload($element = 'this', $js = '') + { + return $this->js->_unload($element, $js); + } + + // -------------------------------------------------------------------- + // Effects + // -------------------------------------------------------------------- + + + /** + * Add Class + * + * Outputs a javascript library addClass event + * + * @access public + * @param string - element + * @param string - Class to add + * @return string + */ + function addClass($element = 'this', $class = '') + { + return $this->js->_addClass($element, $class); + } + + // -------------------------------------------------------------------- + + /** + * Animate + * + * Outputs a javascript library animate event + * + * @access public + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function animate($element = 'this', $params = array(), $speed = '', $extra = '') + { + return $this->js->_animate($element, $params, $speed, $extra); + } + + // -------------------------------------------------------------------- + + /** + * Fade In + * + * Outputs a javascript library hide event + * + * @access public + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function fadeIn($element = 'this', $speed = '', $callback = '') + { + return $this->js->_fadeIn($element, $speed, $callback); + } + + // -------------------------------------------------------------------- + + /** + * Fade Out + * + * Outputs a javascript library hide event + * + * @access public + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function fadeOut($element = 'this', $speed = '', $callback = '') + { + return $this->js->_fadeOut($element, $speed, $callback); + } + // -------------------------------------------------------------------- + + /** + * Slide Up + * + * Outputs a javascript library slideUp event + * + * @access public + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function slideUp($element = 'this', $speed = '', $callback = '') + { + return $this->js->_slideUp($element, $speed, $callback); + + } + + // -------------------------------------------------------------------- + + /** + * Remove Class + * + * Outputs a javascript library removeClass event + * + * @access public + * @param string - element + * @param string - Class to add + * @return string + */ + function removeClass($element = 'this', $class = '') + { + return $this->js->_removeClass($element, $class); + } + + // -------------------------------------------------------------------- + + /** + * Slide Down + * + * Outputs a javascript library slideDown event + * + * @access public + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function slideDown($element = 'this', $speed = '', $callback = '') + { + return $this->js->_slideDown($element, $speed, $callback); + } + + // -------------------------------------------------------------------- + + /** + * Slide Toggle + * + * Outputs a javascript library slideToggle event + * + * @access public + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function slideToggle($element = 'this', $speed = '', $callback = '') + { + return $this->js->_slideToggle($element, $speed, $callback); + + } + + // -------------------------------------------------------------------- + + /** + * Hide + * + * Outputs a javascript library hide action + * + * @access public + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function hide($element = 'this', $speed = '', $callback = '') + { + return $this->js->_hide($element, $speed, $callback); + } + + // -------------------------------------------------------------------- + + /** + * Toggle + * + * Outputs a javascript library toggle event + * + * @access public + * @param string - element + * @return string + */ + function toggle($element = 'this') + { + return $this->js->_toggle($element); + + } + + // -------------------------------------------------------------------- + + /** + * Toggle Class + * + * Outputs a javascript library toggle class event + * + * @access public + * @param string - element + * @return string + */ + function toggleClass($element = 'this', $class='') + { + return $this->js->_toggleClass($element, $class); + } + + // -------------------------------------------------------------------- + + /** + * Show + * + * Outputs a javascript library show event + * + * @access public + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function show($element = 'this', $speed = '', $callback = '') + { + return $this->js->_show($element, $speed, $callback); + } + + + // -------------------------------------------------------------------- + + /** + * Compile + * + * gather together all script needing to be output + * + * @access public + * @param string The element to attach the event to + * @return string + */ + function compile($view_var = 'script_foot', $script_tags = TRUE) + { + $this->js->_compile($view_var, $script_tags); + } + + /** + * Clear Compile + * + * Clears any previous javascript collected for output + * + * @access public + * @return void + */ + function clear_compile() + { + $this->js->_clear_compile(); + } + + // -------------------------------------------------------------------- + + /** + * External + * + * Outputs a + * + * @access private + * @param string + * @return string + */ + function _close_script($extra = "\n") + { + return "$extra"; + } + + + // -------------------------------------------------------------------- + // -------------------------------------------------------------------- + // AJAX-Y STUFF - still a testbed + // -------------------------------------------------------------------- + // -------------------------------------------------------------------- + + /** + * Update + * + * Outputs a javascript library slideDown event + * + * @access public + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function update($element = 'this', $speed = '', $callback = '') + { + return $this->js->_updater($element, $speed, $callback); + } + + // -------------------------------------------------------------------- + + /** + * Generate JSON + * + * Can be passed a database result or associative array and returns a JSON formatted string + * + * @param mixed result set or array + * @param bool match array types (defaults to objects) + * @return string a json formatted string + */ + function generate_json($result = NULL, $match_array_type = FALSE) + { + // JSON data can optionally be passed to this function + // either as a database result object or an array, or a user supplied array + if ( ! is_null($result)) + { + if (is_object($result)) + { + $json_result = $result->result_array(); + } + elseif (is_array($result)) + { + $json_result = $result; + } + else + { + return $this->_prep_args($result); + } + } + else + { + return 'null'; + } + + $json = array(); + $_is_assoc = TRUE; + + if ( ! is_array($json_result) AND empty($json_result)) + { + show_error("Generate JSON Failed - Illegal key, value pair."); + } + elseif ($match_array_type) + { + $_is_assoc = $this->_is_associative_array($json_result); + } + + foreach ($json_result as $k => $v) + { + if ($_is_assoc) + { + $json[] = $this->_prep_args($k, TRUE).':'.$this->generate_json($v, $match_array_type); + } + else + { + $json[] = $this->generate_json($v, $match_array_type); + } + } + + $json = implode(',', $json); + + return $_is_assoc ? "{".$json."}" : "[".$json."]"; + + } + + // -------------------------------------------------------------------- + + /** + * Is associative array + * + * Checks for an associative array + * + * @access public + * @param type + * @return type + */ + function _is_associative_array($arr) + { + foreach (array_keys($arr) as $key => $val) + { + if ($key !== $val) + { + return TRUE; + } + } + + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Prep Args + * + * Ensures a standard json value and escapes values + * + * @access public + * @param type + * @return type + */ + function _prep_args($result, $is_key = FALSE) + { + if (is_null($result)) + { + return 'null'; + } + elseif (is_bool($result)) + { + return ($result === TRUE) ? 'true' : 'false'; + } + elseif (is_string($result) OR $is_key) + { + return '"'.str_replace(array('\\', "\t", "\n", "\r", '"'), array('\\\\', '\\t', '\\n', "\\r", '\"'), $result).'"'; + } + elseif (is_scalar($result)) + { + return $result; + } + } +} + + +/* End of file Javascript.php */ +/* Location: ./system/libraries/Javascript.php */ \ No newline at end of file diff --git a/system/libraries/Jquery.php b/system/libraries/Jquery.php new file mode 100644 index 00000000..c63a7423 --- /dev/null +++ b/system/libraries/Jquery.php @@ -0,0 +1,1071 @@ +CI =& get_instance(); + extract($params); + + if ($autoload === TRUE) + { + $this->script(); + } + + log_message('debug', "Jquery Class Initialized"); + } + + // -------------------------------------------------------------------- + // Event Code + // -------------------------------------------------------------------- + + /** + * Blur + * + * Outputs a jQuery blur event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _blur($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'blur'); + } + + // -------------------------------------------------------------------- + + /** + * Change + * + * Outputs a jQuery change event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _change($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'change'); + } + + // -------------------------------------------------------------------- + + /** + * Click + * + * Outputs a jQuery click event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @param boolean whether or not to return false + * @return string + */ + function _click($element = 'this', $js = '', $ret_false = TRUE) + { + if ( ! is_array($js)) + { + $js = array($js); + } + + if ($ret_false) + { + $js[] = "return false;"; + } + + return $this->_add_event($element, $js, 'click'); + } + + // -------------------------------------------------------------------- + + /** + * Double Click + * + * Outputs a jQuery dblclick event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _dblclick($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'dblclick'); + } + + // -------------------------------------------------------------------- + + /** + * Error + * + * Outputs a jQuery error event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _error($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'error'); + } + + // -------------------------------------------------------------------- + + /** + * Focus + * + * Outputs a jQuery focus event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _focus($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'focus'); + } + + // -------------------------------------------------------------------- + + /** + * Hover + * + * Outputs a jQuery hover event + * + * @access private + * @param string - element + * @param string - Javascript code for mouse over + * @param string - Javascript code for mouse out + * @return string + */ + function _hover($element = 'this', $over, $out) + { + $event = "\n\t$(" . $this->_prep_element($element) . ").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n"; + + $this->jquery_code_for_compile[] = $event; + + return $event; + } + + // -------------------------------------------------------------------- + + /** + * Keydown + * + * Outputs a jQuery keydown event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _keydown($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'keydown'); + } + + // -------------------------------------------------------------------- + + /** + * Keyup + * + * Outputs a jQuery keydown event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _keyup($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'keyup'); + } + + // -------------------------------------------------------------------- + + /** + * Load + * + * Outputs a jQuery load event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _load($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'load'); + } + + // -------------------------------------------------------------------- + + /** + * Mousedown + * + * Outputs a jQuery mousedown event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _mousedown($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'mousedown'); + } + + // -------------------------------------------------------------------- + + /** + * Mouse Out + * + * Outputs a jQuery mouseout event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _mouseout($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'mouseout'); + } + + // -------------------------------------------------------------------- + + /** + * Mouse Over + * + * Outputs a jQuery mouseover event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _mouseover($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'mouseover'); + } + + // -------------------------------------------------------------------- + + /** + * Mouseup + * + * Outputs a jQuery mouseup event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _mouseup($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'mouseup'); + } + + // -------------------------------------------------------------------- + + /** + * Output + * + * Outputs script directly + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _output($array_js = '') + { + if ( ! is_array($array_js)) + { + $array_js = array($array_js); + } + + foreach ($array_js as $js) + { + $this->jquery_code_for_compile[] = "\t$js\n"; + } + } + + // -------------------------------------------------------------------- + + /** + * Resize + * + * Outputs a jQuery resize event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _resize($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'resize'); + } + + // -------------------------------------------------------------------- + + /** + * Scroll + * + * Outputs a jQuery scroll event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _scroll($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'scroll'); + } + + // -------------------------------------------------------------------- + + /** + * Unload + * + * Outputs a jQuery unload event + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @return string + */ + function _unload($element = 'this', $js = '') + { + return $this->_add_event($element, $js, 'unload'); + } + + // -------------------------------------------------------------------- + // Effects + // -------------------------------------------------------------------- + + /** + * Add Class + * + * Outputs a jQuery addClass event + * + * @access private + * @param string - element + * @return string + */ + function _addClass($element = 'this', $class='') + { + $element = $this->_prep_element($element); + $str = "$({$element}).addClass(\"$class\");"; + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Animate + * + * Outputs a jQuery animate event + * + * @access private + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function _animate($element = 'this', $params = array(), $speed = '', $extra = '') + { + $element = $this->_prep_element($element); + $speed = $this->_validate_speed($speed); + + $animations = "\t\t\t"; + + foreach ($params as $param=>$value) + { + $animations .= $param.': \''.$value.'\', '; + } + + $animations = substr($animations, 0, -2); // remove the last ", " + + if ($speed != '') + { + $speed = ', '.$speed; + } + + if ($extra != '') + { + $extra = ', '.$extra; + } + + $str = "$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");"; + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Fade In + * + * Outputs a jQuery hide event + * + * @access private + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function _fadeIn($element = 'this', $speed = '', $callback = '') + { + $element = $this->_prep_element($element); + $speed = $this->_validate_speed($speed); + + if ($callback != '') + { + $callback = ", function(){\n{$callback}\n}"; + } + + $str = "$({$element}).fadeIn({$speed}{$callback});"; + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Fade Out + * + * Outputs a jQuery hide event + * + * @access private + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function _fadeOut($element = 'this', $speed = '', $callback = '') + { + $element = $this->_prep_element($element); + $speed = $this->_validate_speed($speed); + + if ($callback != '') + { + $callback = ", function(){\n{$callback}\n}"; + } + + $str = "$({$element}).fadeOut({$speed}{$callback});"; + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Hide + * + * Outputs a jQuery hide action + * + * @access private + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function _hide($element = 'this', $speed = '', $callback = '') + { + $element = $this->_prep_element($element); + $speed = $this->_validate_speed($speed); + + if ($callback != '') + { + $callback = ", function(){\n{$callback}\n}"; + } + + $str = "$({$element}).hide({$speed}{$callback});"; + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Remove Class + * + * Outputs a jQuery remove class event + * + * @access private + * @param string - element + * @return string + */ + function _removeClass($element = 'this', $class='') + { + $element = $this->_prep_element($element); + $str = "$({$element}).removeClass(\"$class\");"; + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Slide Up + * + * Outputs a jQuery slideUp event + * + * @access private + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function _slideUp($element = 'this', $speed = '', $callback = '') + { + $element = $this->_prep_element($element); + $speed = $this->_validate_speed($speed); + + if ($callback != '') + { + $callback = ", function(){\n{$callback}\n}"; + } + + $str = "$({$element}).slideUp({$speed}{$callback});"; + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Slide Down + * + * Outputs a jQuery slideDown event + * + * @access private + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function _slideDown($element = 'this', $speed = '', $callback = '') + { + $element = $this->_prep_element($element); + $speed = $this->_validate_speed($speed); + + if ($callback != '') + { + $callback = ", function(){\n{$callback}\n}"; + } + + $str = "$({$element}).slideDown({$speed}{$callback});"; + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Slide Toggle + * + * Outputs a jQuery slideToggle event + * + * @access public + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function _slideToggle($element = 'this', $speed = '', $callback = '') + { + $element = $this->_prep_element($element); + $speed = $this->_validate_speed($speed); + + if ($callback != '') + { + $callback = ", function(){\n{$callback}\n}"; + } + + $str = "$({$element}).slideToggle({$speed}{$callback});"; + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Toggle + * + * Outputs a jQuery toggle event + * + * @access private + * @param string - element + * @return string + */ + function _toggle($element = 'this') + { + $element = $this->_prep_element($element); + $str = "$({$element}).toggle();"; + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Toggle Class + * + * Outputs a jQuery toggle class event + * + * @access private + * @param string - element + * @return string + */ + function _toggleClass($element = 'this', $class='') + { + $element = $this->_prep_element($element); + $str = "$({$element}).toggleClass(\"$class\");"; + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Show + * + * Outputs a jQuery show event + * + * @access private + * @param string - element + * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds + * @param string - Javascript callback function + * @return string + */ + function _show($element = 'this', $speed = '', $callback = '') + { + $element = $this->_prep_element($element); + $speed = $this->_validate_speed($speed); + + if ($callback != '') + { + $callback = ", function(){\n{$callback}\n}"; + } + + $str = "$({$element}).show({$speed}{$callback});"; + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Updater + * + * An Ajax call that populates the designated DOM node with + * returned content + * + * @access private + * @param string The element to attach the event to + * @param string the controller to run the call against + * @param string optional parameters + * @return string + */ + + function _updater($container = 'this', $controller, $options = '') + { + $container = $this->_prep_element($container); + + $controller = (strpos('://', $controller) === FALSE) ? $controller : $this->CI->config->site_url($controller); + + // ajaxStart and ajaxStop are better choices here... but this is a stop gap + if ($this->CI->config->item('javascript_ajax_img') == '') + { + $loading_notifier = "Loading..."; + } + else + { + $loading_notifier = 'CI->config->slash_item('base_url') . $this->CI->config->item('javascript_ajax_img') . '\' alt=\'Loading\' />'; + } + + $updater = "$($container).empty();\n"; // anything that was in... get it out + $updater .= "\t\t$($container).prepend(\"$loading_notifier\");\n"; // to replace with an image + + $request_options = ''; + if ($options != '') + { + $request_options .= ", {"; + $request_options .= (is_array($options)) ? "'".implode("', '", $options)."'" : "'".str_replace(":", "':'", $options)."'"; + $request_options .= "}"; + } + + $updater .= "\t\t$($container).load('$controller'$request_options);"; + return $updater; + } + + + // -------------------------------------------------------------------- + // Pre-written handy stuff + // -------------------------------------------------------------------- + + /** + * Zebra tables + * + * @access private + * @param string table name + * @param string plugin location + * @return string + */ + function _zebraTables($class = '', $odd = 'odd', $hover = '') + { + $class = ($class != '') ? '.'.$class : ''; + + $zebra = "\t\$(\"table{$class} tbody tr:nth-child(even)\").addClass(\"{$odd}\");"; + + $this->jquery_code_for_compile[] = $zebra; + + if ($hover != '') + { + $hover = $this->hover("table{$class} tbody tr", "$(this).addClass('hover');", "$(this).removeClass('hover');"); + } + + return $zebra; + } + + + + // -------------------------------------------------------------------- + // Plugins + // -------------------------------------------------------------------- + + /** + * Corner Plugin + * + * http://www.malsup.com/jquery/corner/ + * + * @access public + * @param string target + * @return string + */ + function corner($element = '', $corner_style = '') + { + // may want to make this configurable down the road + $corner_location = '/plugins/jquery.corner.js'; + + if ($corner_style != '') + { + $corner_style = '"'.$corner_style.'"'; + } + + return "$(" . $this->_prep_element($element) . ").corner(".$corner_style.");"; + } + + // -------------------------------------------------------------------- + + /** + * modal window + * + * Load a thickbox modal window + * + * @access public + * @return void + */ + function modal($src, $relative = FALSE) + { + $this->jquery_code_for_load[] = $this->external($src, $relative); + } + + // -------------------------------------------------------------------- + + /** + * Effect + * + * Load an Effect library + * + * @access public + * @return void + */ + function effect($src, $relative = FALSE) + { + $this->jquery_code_for_load[] = $this->external($src, $relative); + } + + // -------------------------------------------------------------------- + + /** + * Plugin + * + * Load a plugin library + * + * @access public + * @return void + */ + function plugin($src, $relative = FALSE) + { + $this->jquery_code_for_load[] = $this->external($src, $relative); + } + + // -------------------------------------------------------------------- + + /** + * UI + * + * Load a user interface library + * + * @access public + * @return void + */ + function ui($src, $relative = FALSE) + { + $this->jquery_code_for_load[] = $this->external($src, $relative); + } + // -------------------------------------------------------------------- + + /** + * Sortable + * + * Creates a jQuery sortable + * + * @access public + * @return void + */ + function sortable($element, $options = array()) + { + + if (count($options) > 0) + { + $sort_options = array(); + foreach ($options as $k=>$v) + { + $sort_options[] = "\n\t\t".$k.': '.$v.""; + } + $sort_options = implode(",", $sort_options); + } + else + { + $sort_options = ''; + } + + return "$(" . $this->_prep_element($element) . ").sortable({".$sort_options."\n\t});"; + } + + // -------------------------------------------------------------------- + + /** + * Table Sorter Plugin + * + * @access public + * @param string table name + * @param string plugin location + * @return string + */ + function tablesorter($table = '', $options = '') + { + $this->jquery_code_for_compile[] = "\t$(" . $this->_prep_element($table) . ").tablesorter($options);\n"; + } + + // -------------------------------------------------------------------- + // Class functions + // -------------------------------------------------------------------- + + /** + * Add Event + * + * Constructs the syntax for an event, and adds to into the array for compilation + * + * @access private + * @param string The element to attach the event to + * @param string The code to execute + * @param string The event to pass + * @return string + */ + function _add_event($element, $js, $event) + { + if (is_array($js)) + { + $js = implode("\n\t\t", $js); + + } + + $event = "\n\t$(" . $this->_prep_element($element) . ").{$event}(function(){\n\t\t{$js}\n\t});\n"; + $this->jquery_code_for_compile[] = $event; + return $event; + } + + // -------------------------------------------------------------------- + + /** + * Compile + * + * As events are specified, they are stored in an array + * This funciton compiles them all for output on a page + * + * @access private + * @return string + */ + function _compile($view_var = 'script_foot', $script_tags = TRUE) + { + // External references + $external_scripts = implode('', $this->jquery_code_for_load); + $this->CI->load->vars(array('library_src' => $external_scripts)); + + if (count($this->jquery_code_for_compile) == 0 ) + { + // no inline references, let's just return + return; + } + + // Inline references + $script = '$(document).ready(function() {' . "\n"; + $script .= implode('', $this->jquery_code_for_compile); + $script .= '});'; + + $output = ($script_tags === FALSE) ? $script : $this->inline($script); + + $this->CI->load->vars(array($view_var => $output)); + + } + + // -------------------------------------------------------------------- + + /** + * Clear Compile + * + * Clears the array of script events collected for output + * + * @access public + * @return void + */ + function _clear_compile() + { + $this->jquery_code_for_compile = array(); + } + + // -------------------------------------------------------------------- + + /** + * Document Ready + * + * A wrapper for writing document.ready() + * + * @access private + * @return string + */ + function _document_ready($js) + { + if ( ! is_array($js)) + { + $js = array ($js); + + } + + foreach ($js as $script) + { + $this->jquery_code_for_compile[] = $script; + } + } + + // -------------------------------------------------------------------- + + /** + * Script Tag + * + * Outputs the script tag that loads the jquery.js file into an HTML document + * + * @access public + * @param string + * @return string + */ + function script($library_src = '', $relative = FALSE) + { + $library_src = $this->external($library_src, $relative); + $this->jquery_code_for_load[] = $library_src; + return $library_src; + } + + // -------------------------------------------------------------------- + + /** + * Prep Element + * + * Puts HTML element in quotes for use in jQuery code + * unless the supplied element is the Javascript 'this' + * object, in which case no quotes are added + * + * @access public + * @param string + * @return string + */ + function _prep_element($element) + { + if ($element != 'this') + { + $element = '"'.$element.'"'; + } + + return $element; + } + + // -------------------------------------------------------------------- + + /** + * Validate Speed + * + * Ensures the speed parameter is valid for jQuery + * + * @access private + * @param string + * @return string + */ + function _validate_speed($speed) + { + if (in_array($speed, array('slow', 'normal', 'fast'))) + { + $speed = '"'.$speed.'"'; + } + elseif (preg_match("/[^0-9]/", $speed)) + { + $speed = ''; + } + + return $speed; + } + +} + +/* End of file Jquery.php */ +/* Location: ./system/libraries/Jquery.php */ \ No newline at end of file From 079303e4240ac6661f21d56bc22001c3963ab599 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 18:16:23 -0600 Subject: [PATCH 1833/2544] adding HTTP_X_FORWARDED_FOR header to Profiler --- system/libraries/Profiler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index ebadf861..bf20f172 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -380,7 +380,7 @@ function _compile_http_headers() $output .= "\n\n\n"; - foreach(array('HTTP_ACCEPT', 'HTTP_USER_AGENT', 'HTTP_CONNECTION', 'SERVER_PORT', 'SERVER_NAME', 'REMOTE_ADDR', 'SERVER_SOFTWARE', 'HTTP_ACCEPT_LANGUAGE', 'SCRIPT_NAME', 'REQUEST_METHOD',' HTTP_HOST', 'REMOTE_HOST', 'CONTENT_TYPE', 'SERVER_PROTOCOL', 'QUERY_STRING', 'HTTP_ACCEPT_ENCODING') as $header) + foreach(array('HTTP_ACCEPT', 'HTTP_USER_AGENT', 'HTTP_CONNECTION', 'SERVER_PORT', 'SERVER_NAME', 'REMOTE_ADDR', 'SERVER_SOFTWARE', 'HTTP_ACCEPT_LANGUAGE', 'SCRIPT_NAME', 'REQUEST_METHOD',' HTTP_HOST', 'REMOTE_HOST', 'CONTENT_TYPE', 'SERVER_PROTOCOL', 'QUERY_STRING', 'HTTP_ACCEPT_ENCODING', 'HTTP_X_FORWARDED_FOR') as $header) { $val = (isset($_SERVER[$header])) ? $_SERVER[$header] : ''; $output .= "\n"; From e701d76c5050b18d576523e5a997fa5ff4ba6251 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 18:17:01 -0600 Subject: [PATCH 1834/2544] added Security library --- system/libraries/Security.php | 710 ++++++++++++++++++++++++++++++++++ 1 file changed, 710 insertions(+) create mode 100644 system/libraries/Security.php diff --git a/system/libraries/Security.php b/system/libraries/Security.php new file mode 100644 index 00000000..93da5920 --- /dev/null +++ b/system/libraries/Security.php @@ -0,0 +1,710 @@ + '[removed]', + 'document.write' => '[removed]', + '.parentNode' => '[removed]', + '.innerHTML' => '[removed]', + 'window.location' => '[removed]', + '-moz-binding' => '[removed]', + '' => '-->', + ' '<![CDATA[' + ); + /* never allowed, regex replacement */ + var $never_allowed_regex = array( + "javascript\s*:" => '[removed]', + "expression\s*(\(|&\#40;)" => '[removed]', // CSS and IE + "vbscript\s*:" => '[removed]', // IE, surprise! + "Redirect\s+302" => '[removed]' + ); + + function CI_Security() + { + // Set the CSRF hash + $this->_csrf_set_hash(); + + log_message('debug', "Security Class Initialized"); + } + + // -------------------------------------------------------------------- + + /** + * Verify Cross Site Request Forgery Protection + * + * @access public + * @return null + */ + function csrf_verify() + { + // If no POST data exists we will set the CSRF cookie + if (count($_POST) == 0) + { + return $this->csrf_set_cookie(); + } + + // Do the tokens exist in both the _POST and _COOKIE arrays? + if ( ! isset($_POST[$this->csrf_token_name]) OR ! isset($_COOKIE[$this->csrf_token_name])) + { + $this->csrf_show_error(); + } + + // Do the tokens match? + if ($_POST[$this->csrf_token_name] != $_COOKIE[$this->csrf_token_name]) + { + $this->csrf_show_error(); + } + + // We kill this since we're done and we don't want to polute the _POST array + unset($_POST[$this->csrf_token_name]); + + log_message('debug', "CSRF token verified "); + } + + // -------------------------------------------------------------------- + + /** + * Set Cross Site Request Forgery Protection Cookie + * + * @access public + * @return null + */ + function csrf_set_cookie() + { + $prefix = ( ! is_string(config_item('cookie_prefix'))) ? '' : config_item('cookie_prefix'); + + $expire = time() + $this->csrf_expire; + + setcookie($prefix.$this->csrf_token_name, $this->csrf_hash, $expire, config_item('cookie_path'), config_item('cookie_domain'), 0); + + log_message('debug', "CRSF cookie Set"); + } + + // -------------------------------------------------------------------- + + /** + * Set Cross Site Request Forgery Protection Cookie + * + * @access public + * @return null + */ + function _csrf_set_hash() + { + if ($this->csrf_hash == '') + { + // If the cookie exists we will use it's value. We don't necessarily want to regenerate it with + // each page load since a page could contain embedded sub-pages causing this feature to fail + if (isset($_COOKIE[$this->csrf_token_name]) AND $_COOKIE[$this->csrf_token_name] != '') + { + $this->csrf_hash = $_COOKIE[$this->csrf_token_name]; + } + else + { + $this->csrf_hash = md5(uniqid(rand(), TRUE)); + } + } + + return $this->csrf_hash; + } + + // -------------------------------------------------------------------- + + /** + * Show CSRF Error + * + * @access public + * @return null + */ + function csrf_show_error() + { + show_error('The action you have requested is not allowed.'); + } + + // -------------------------------------------------------------------- + + /** + * XSS Clean + * + * Sanitizes data so that Cross Site Scripting Hacks can be + * prevented. This function does a fair amount of work but + * it is extremely thorough, designed to prevent even the + * most obscure XSS attempts. Nothing is ever 100% foolproof, + * of course, but I haven't been able to get anything passed + * the filter. + * + * Note: This function should only be used to deal with data + * upon submission. It's not something that should + * be used for general runtime processing. + * + * This function was based in part on some code and ideas I + * got from Bitflux: http://channel.bitflux.ch/wiki/XSS_Prevention + * + * To help develop this script I used this great list of + * vulnerabilities along with a few other hacks I've + * harvested from examining vulnerabilities in other programs: + * http://ha.ckers.org/xss.html + * + * @access public + * @param mixed string or array + * @return string + */ + function xss_clean($str, $is_image = FALSE) + { + /* + * Is the string an array? + * + */ + if (is_array($str)) + { + while (list($key) = each($str)) + { + $str[$key] = $this->xss_clean($str[$key]); + } + + return $str; + } + + /* + * Remove Invisible Characters + */ + $str = $this->_remove_invisible_characters($str); + + /* + * Protect GET variables in URLs + */ + + // 901119URL5918AMP18930PROTECT8198 + + $str = preg_replace('|\&([a-z\_0-9\-]+)\=([a-z\_0-9\-]+)|i', $this->xss_hash()."\\1=\\2", $str); + + /* + * Validate standard character entities + * + * Add a semicolon if missing. We do this to enable + * the conversion of entities to ASCII later. + * + */ + $str = preg_replace('#(&\#?[0-9a-z]{2,})([\x00-\x20])*;?#i', "\\1;\\2", $str); + + /* + * Validate UTF16 two byte encoding (x00) + * + * Just as above, adds a semicolon if missing. + * + */ + $str = preg_replace('#(&\#x?)([0-9A-F]+);?#i',"\\1\\2;",$str); + + /* + * Un-Protect GET variables in URLs + */ + $str = str_replace($this->xss_hash(), '&', $str); + + /* + * URL Decode + * + * Just in case stuff like this is submitted: + * + * Google + * + * Note: Use rawurldecode() so it does not remove plus signs + * + */ + $str = rawurldecode($str); + + /* + * Convert character entities to ASCII + * + * This permits our tests below to work reliably. + * We only convert entities that are within tags since + * these are the ones that will pose security problems. + * + */ + + $str = preg_replace_callback("/[a-z]+=([\'\"]).*?\\1/si", array($this, '_convert_attribute'), $str); + + $str = preg_replace_callback("/<\w+.*?(?=>|<|$)/si", array($this, '_decode_entity'), $str); + + /* + * Remove Invisible Characters Again! + */ + $str = $this->_remove_invisible_characters($str); + + /* + * Convert all tabs to spaces + * + * This prevents strings like this: ja vascript + * NOTE: we deal with spaces between characters later. + * NOTE: preg_replace was found to be amazingly slow here on large blocks of data, + * so we use str_replace. + * + */ + + if (strpos($str, "\t") !== FALSE) + { + $str = str_replace("\t", ' ', $str); + } + + /* + * Capture converted string for later comparison + */ + $converted_string = $str; + + /* + * Not Allowed Under Any Conditions + */ + + foreach ($this->never_allowed_str as $key => $val) + { + $str = str_replace($key, $val, $str); + } + + foreach ($this->never_allowed_regex as $key => $val) + { + $str = preg_replace("#".$key."#i", $val, $str); + } + + /* + * Makes PHP tags safe + * + * Note: XML tags are inadvertently replaced too: + * + * '), array('<?', '?>'), $str); + } + + /* + * Compact any exploded words + * + * This corrects words like: j a v a s c r i p t + * These words are compacted back to their correct state. + * + */ + $words = array('javascript', 'expression', 'vbscript', 'script', 'applet', 'alert', 'document', 'write', 'cookie', 'window'); + foreach ($words as $word) + { + $temp = ''; + + for ($i = 0, $wordlen = strlen($word); $i < $wordlen; $i++) + { + $temp .= substr($word, $i, 1)."\s*"; + } + + // We only want to do this when it is followed by a non-word character + // That way valid stuff like "dealer to" does not become "dealerto" + $str = preg_replace_callback('#('.substr($temp, 0, -3).')(\W)#is', array($this, '_compact_exploded_words'), $str); + } + + /* + * Remove disallowed Javascript in links or img tags + * We used to do some version comparisons and use of stripos for PHP5, but it is dog slow compared + * to these simplified non-capturing preg_match(), especially if the pattern exists in the string + */ + do + { + $original = $str; + + if (preg_match("/]*?)(>|$)#si", array($this, '_js_link_removal'), $str); + } + + if (preg_match("/]*?)(\s?/?>|$)#si", array($this, '_js_img_removal'), $str); + } + + if (preg_match("/script/i", $str) OR preg_match("/xss/i", $str)) + { + $str = preg_replace("#<(/*)(script|xss)(.*?)\>#si", '[removed]', $str); + } + } + while($original != $str); + + unset($original); + + /* + * Remove JavaScript Event Handlers + * + * Note: This code is a little blunt. It removes + * the event handler and anything up to the closing >, + * but it's unlikely to be a problem. + * + */ + $event_handlers = array('[^a-z_\-]on\w*','xmlns'); + + if ($is_image === TRUE) + { + /* + * Adobe Photoshop puts XML metadata into JFIF images, including namespacing, + * so we have to allow this for images. -Paul + */ + unset($event_handlers[array_search('xmlns', $event_handlers)]); + } + + $str = preg_replace("#<([^><]+?)(".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); + + /* + * Sanitize naughty HTML elements + * + * If a tag containing any of the words in the list + * below is found, the tag gets converted to entities. + * + * So this: + * Becomes: <blink> + * + */ + $naughty = 'alert|applet|audio|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|isindex|layer|link|meta|object|plaintext|style|script|textarea|title|video|xml|xss'; + $str = preg_replace_callback('#<(/*\s*)('.$naughty.')([^><]*)([><]*)#is', array($this, '_sanitize_naughty_html'), $str); + + /* + * Sanitize naughty scripting elements + * + * Similar to above, only instead of looking for + * tags it looks for PHP and JavaScript commands + * that are disallowed. Rather than removing the + * code, it simply converts the parenthesis to entities + * rendering the code un-executable. + * + * For example: eval('some code') + * Becomes: eval('some code') + * + */ + $str = preg_replace('#(alert|cmd|passthru|eval|exec|expression|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str); + + /* + * Final clean up + * + * This adds a bit of extra precaution in case + * something got through the above filters + * + */ + foreach ($this->never_allowed_str as $key => $val) + { + $str = str_replace($key, $val, $str); + } + + foreach ($this->never_allowed_regex as $key => $val) + { + $str = preg_replace("#".$key."#i", $val, $str); + } + + /* + * Images are Handled in a Special Way + * - Essentially, we want to know that after all of the character conversion is done whether + * any unwanted, likely XSS, code was found. If not, we return TRUE, as the image is clean. + * However, if the string post-conversion does not matched the string post-removal of XSS, + * then it fails, as there was unwanted XSS code found and removed/changed during processing. + */ + + if ($is_image === TRUE) + { + if ($str == $converted_string) + { + return TRUE; + } + else + { + return FALSE; + } + } + + log_message('debug', "XSS Filtering completed"); + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Random Hash for protecting URLs + * + * @access public + * @return string + */ + function xss_hash() + { + if ($this->xss_hash == '') + { + if (phpversion() >= 4.2) + mt_srand(); + else + mt_srand(hexdec(substr(md5(microtime()), -8)) & 0x7fffffff); + + $this->xss_hash = md5(time() + mt_rand(0, 1999999999)); + } + + return $this->xss_hash; + } + + // -------------------------------------------------------------------- + + /** + * Remove Invisible Characters + * + * This prevents sandwiching null characters + * between ascii characters, like Java\0script. + * + * @access public + * @param string + * @return string + */ + function _remove_invisible_characters($str) + { + static $non_displayables; + + if ( ! isset($non_displayables)) + { + // every control character except newline (dec 10), carriage return (dec 13), and horizontal tab (dec 09), + $non_displayables = array( + '/%0[0-8bcef]/', // url encoded 00-08, 11, 12, 14, 15 + '/%1[0-9a-f]/', // url encoded 16-31 + '/[\x00-\x08]/', // 00-08 + '/\x0b/', '/\x0c/', // 11, 12 + '/[\x0e-\x1f]/' // 14-31 + ); + } + + do + { + $cleaned = $str; + $str = preg_replace($non_displayables, '', $str); + } + while ($cleaned != $str); + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Compact Exploded Words + * + * Callback function for xss_clean() to remove whitespace from + * things like j a v a s c r i p t + * + * @access public + * @param type + * @return type + */ + function _compact_exploded_words($matches) + { + return preg_replace('/\s+/s', '', $matches[1]).$matches[2]; + } + + // -------------------------------------------------------------------- + + /** + * Sanitize Naughty HTML + * + * Callback function for xss_clean() to remove naughty HTML elements + * + * @access private + * @param array + * @return string + */ + function _sanitize_naughty_html($matches) + { + // encode opening brace + $str = '<'.$matches[1].$matches[2].$matches[3]; + + // encode captured opening or closing brace to prevent recursive vectors + $str .= str_replace(array('>', '<'), array('>', '<'), $matches[4]); + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * JS Link Removal + * + * Callback function for xss_clean() to sanitize links + * This limits the PCRE backtracks, making it more performance friendly + * and prevents PREG_BACKTRACK_LIMIT_ERROR from being triggered in + * PHP 5.2+ on link-heavy strings + * + * @access private + * @param array + * @return string + */ + function _js_link_removal($match) + { + $attributes = $this->_filter_attributes(str_replace(array('<', '>'), '', $match[1])); + return str_replace($match[1], preg_replace("#href=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|_filter_attributes(str_replace(array('<', '>'), '', $match[1])); + return str_replace($match[1], preg_replace("#src=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|', '<', '\\'), array('>', '<', '\\\\'), $match[0]); + } + + // -------------------------------------------------------------------- + + /** + * Filter Attributes + * + * Filters tag attributes for consistency and safety + * + * @access public + * @param string + * @return string + */ + function _filter_attributes($str) + { + $out = ''; + + if (preg_match_all('#\s*[a-z\-]+\s*=\s*(\042|\047)([^\\1]*?)\\1#is', $str, $matches)) + { + foreach ($matches[0] as $match) + { + $out .= preg_replace("#/\*.*?\*/#s", '', $match); + } + } + + return $out; + } + + // -------------------------------------------------------------------- + + /** + * HTML Entity Decode Callback + * + * Used as a callback for XSS Clean + * + * @access public + * @param array + * @return string + */ + function _decode_entity($match) + { + $CI =& get_instance(); + $CI->load->helper('typography'); + return entity_decode($match[0], strtoupper($CI->config->item('charset'))); + } + + // -------------------------------------------------------------------- + + /** + * Filename Security + * + * @access public + * @param string + * @return string + */ + function sanitize_filename($str) + { + $bad = array( + "../", + "./", + "", + "<", + ">", + "'", + '"', + '&', + '$', + '#', + '{', + '}', + '[', + ']', + '=', + ';', + '?', + '/', + "%20", + "%22", + "%3c", // < + "%253c", // < + "%3e", // > + "%0e", // > + "%28", // ( + "%29", // ) + "%2528", // ( + "%26", // & + "%24", // $ + "%3f", // ? + "%3b", // ; + "%3d" // = + ); + + return stripslashes(str_replace($bad, '', $str)); + } + +} +// END Security Class + +/* End of file Security.php */ +/* Location: ./system/libraries/Security.php */ \ No newline at end of file From 7b5b0e2d4000fadabcdad894538e42c23ebb9ecd Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 22:48:53 -0600 Subject: [PATCH 1835/2544] expanded abilities of Table library --- system/libraries/Table.php | 138 ++++++++++++++++++++++++++------ user_guide/libraries/table.html | 41 +++++++--- 2 files changed, 145 insertions(+), 34 deletions(-) diff --git a/system/libraries/Table.php b/system/libraries/Table.php index 6d36121f..1f920ea9 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -35,7 +35,7 @@ class CI_Table { var $template = NULL; var $newline = "\n"; var $empty_cells = ""; - + var $function = FALSE; function CI_Table() { @@ -75,7 +75,7 @@ function set_template($template) function set_heading() { $args = func_get_args(); - $this->heading = (is_array($args[0])) ? $args[0] : $args; + $this->heading = $this->_prep_args($args); } // -------------------------------------------------------------------- @@ -110,7 +110,7 @@ function make_columns($array = array(), $col_limit = 0) $new = array(); while(count($array) > 0) { - $temp = array_splice($array, 0, $col_limit); + $temp = array_splice($array, 0, $col_limit); if (count($temp) < $col_limit) { @@ -156,11 +156,59 @@ function set_empty($value) function add_row() { $args = func_get_args(); - $this->rows[] = (is_array($args[0])) ? $args[0] : $args; + $this->rows[] = $this->_prep_args($args); } // -------------------------------------------------------------------- + + /** + * Prep Args + * + * Ensures a standard associative array format for all cell data + * + * @access public + * @param type + * @return type + */ + function _prep_args($args) + { + // If there is no $args[0], skip this and treat as an associative array + // This can happen if there is only a single key, for example this is passed to table->generate + // array(array('foo'=>'bar')) + if (isset($args[0]) AND (count($args) == 1 && is_array($args[0]))) + { + // args sent as indexed array + if ( ! isset($args[0]['data'])) + { + foreach ($args[0] as $key => $val) + { + if (is_array($val) && isset($val['data'])) + { + $args[$key] = $val; + } + else + { + $args[$key] = array('data' => $val); + } + } + } + } + else + { + foreach ($args as $key => $val) + { + if ( ! is_array($val)) + { + $args[$key] = array('data' => $val); + } + } + } + + return $args; + } + // -------------------------------------------------------------------- + /** * Add a table caption * @@ -208,7 +256,9 @@ function generate($table_data = NULL) // Compile and validate the template date $this->_compile_template(); - + // set a custom cell manipulation function to a locally scoped variable so its callable + $function = $this->function; + // Build the table! $out = $this->template['table_open']; @@ -225,23 +275,40 @@ function generate($table_data = NULL) // Is there a table heading to display? if (count($this->heading) > 0) { + $out .= $this->template['thead_open']; + $out .= $this->newline; $out .= $this->template['heading_row_start']; - $out .= $this->newline; + $out .= $this->newline; foreach($this->heading as $heading) { - $out .= $this->template['heading_cell_start']; - $out .= $heading; + $temp = $this->template['heading_cell_start']; + + foreach ($heading as $key => $val) + { + if ($key != 'data') + { + $temp = str_replace('template['heading_cell_end']; } $out .= $this->template['heading_row_end']; - $out .= $this->newline; + $out .= $this->newline; + $out .= $this->template['thead_close']; + $out .= $this->newline; } - + // Build the table rows if (count($this->rows) > 0) { + $out .= $this->template['tbody_open']; + $out .= $this->newline; + $i = 1; foreach($this->rows as $row) { @@ -258,15 +325,33 @@ function generate($table_data = NULL) foreach($row as $cell) { - $out .= $this->template['cell_'.$name.'start']; + $temp = $this->template['cell_'.$name.'start']; + + foreach ($cell as $key => $val) + { + if ($key != 'data') + { + $temp = str_replace('empty_cells; } else { - $out .= $cell; + if ($function !== FALSE && is_callable($function)) + { + $out .= $function($cell); + } + else + { + $out .= $cell; + } } $out .= $this->template['cell_'.$name.'end']; @@ -275,6 +360,9 @@ function generate($table_data = NULL) $out .= $this->template['row_'.$name.'end']; $out .= $this->newline; } + + $out .= $this->template['tbody_close']; + $out .= $this->newline; } $out .= $this->template['table_close']; @@ -321,7 +409,7 @@ function _set_from_object($query) return FALSE; } - $this->heading = $query->list_fields(); + $this->heading = $this->_prep_args($query->list_fields()); } // Next blast through the result array and build out the rows @@ -330,7 +418,7 @@ function _set_from_object($query) { foreach ($query->result_array() as $row) { - $this->rows[] = $row; + $this->rows[] = $this->_prep_args($row); } } } @@ -353,21 +441,15 @@ function _set_from_array($data, $set_heading = TRUE) $i = 0; foreach ($data as $row) - { - if ( ! is_array($row)) - { - $this->rows[] = $data; - break; - } - + { // If a heading hasn't already been set we'll use the first row of the array as the heading if ($i == 0 AND count($data) > 1 AND count($this->heading) == 0 AND $set_heading == TRUE) { - $this->heading = $row; + $this->heading = $this->_prep_args($row); } else { - $this->rows[] = $row; + $this->rows[] = $this->_prep_args($row); } $i++; @@ -391,7 +473,7 @@ function _compile_template() } $this->temp = $this->_default_template(); - foreach (array('table_open','heading_row_start', 'heading_row_end', 'heading_cell_start', 'heading_cell_end', 'row_start', 'row_end', 'cell_start', 'cell_end', 'row_alt_start', 'row_alt_end', 'cell_alt_start', 'cell_alt_end', 'table_close') as $val) + foreach (array('table_open', 'thead_open', 'thead_close', 'heading_row_start', 'heading_row_end', 'heading_cell_start', 'heading_cell_end', 'tbody_open', 'tbody_close', 'row_start', 'row_end', 'cell_start', 'cell_end', 'row_alt_start', 'row_alt_end', 'cell_alt_start', 'cell_alt_end', 'table_close') as $val) { if ( ! isset($this->template[$val])) { @@ -412,12 +494,18 @@ function _default_template() { return array ( 'table_open' => '
      ".$header."  ".$val."
      ', - + + 'thead_open' => '', + 'thead_close' => '', + 'heading_row_start' => '', 'heading_row_end' => '', 'heading_cell_start' => '', + 'tbody_open' => '', + 'tbody_close' => '', + 'row_start' => '', 'row_end' => '', 'cell_start' => ' @@ -55,7 +55,7 @@
      -

      Upgrading from 1.7.2 to 1.7.3

      +

      Upgrading from 1.7.2 to 2.0.0

      Before performing an update you should take your site offline by replacing the index.php file with a static one.

      @@ -78,7 +78,7 @@

      Step 1: Update your CodeIgniter files

      Step 2: Adjust get_dir_file_info() where necessary

      -

      Version 1.7.3 brings a non-backwards compatible change to get_dir_file_info() in the File Helper. Non-backwards compatible changes are extremely rare +

      Version 2.0.0 brings a non-backwards compatible change to get_dir_file_info() in the File Helper. Non-backwards compatible changes are extremely rare in CodeIgniter, but this one we feel was warranted due to how easy it was to create serious server performance issues. If you need recursiveness where you are using this helper function, change such instances, setting the second parameter, $top_level_only to FALSE:

      diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 647dd885..52a6d84e 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -28,7 +28,7 @@
      ', 'heading_cell_end' => '
      ', diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 1c67e4b8..b233dbf8 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -2,17 +2,16 @@ - -HTML Table Class : CodeIgniter User Guide +CodeIgniter User Guide : HTML Table Class - - + - - - - + + + + + @@ -24,7 +23,7 @@ - +
      @@ -199,6 +198,14 @@

      $this->table->add_row()

      $this->table->add_row('Blue', 'Red', 'Green');$this->table->add_row(array('Blue', 'Red', 'Green')); +

      If you would like to set an individual cell's tag attributes, you can use an associative array for that cell. The associative key 'data' defines the cell's data. Any other key => val pairs are added as key='val' attributes to the tag:

      + +$cell = array('data' => 'Blue', 'class' => 'highlight', 'colspan' => 2);
      +$this->table->add_row($cell, 'Red', 'Green');
      +
      +// generates
      +// <td class='highlight' colspan='2'>Blue</td><td>Red</td><td>Green</td> +

      $this->table->make_columns()

      @@ -274,6 +281,22 @@

      $this->table->clear()

      echo $this->table->generate(); +

      $this->table->function

      + +

      Allows you to specify a native PHP function or a valid function array object to be applied to all cell data.

      + +$this->load->library('table');
      +
      +$this->table->set_heading('Name', 'Color', 'Size');
      +$this->table->add_row('Fred', '<strong>Blue</strong>', 'Small');
      +
      +$this->table->function = 'htmlspecialchars';
      +echo $this->table->generate();
      +       + +

      In the above example, all cell data would be ran through PHP's htmlspecialchars() function, resulting in:

      + +<td>Fred</td><td>&lt;strong&gt;Blue&lt;/strong&gt;</td><td>Small</td> From 5052e27db22d41c5d01c65d03ad515041def63a3 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 22:53:38 -0600 Subject: [PATCH 1836/2544] changing casing on some booleans --- system/libraries/Trackback.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php index 9b1737c5..a604c0b2 100644 --- a/system/libraries/Trackback.php +++ b/system/libraries/Trackback.php @@ -128,7 +128,7 @@ function send($tb_data) * Receive Trackback Data * * This function simply validates the incoming TB data. - * It returns false on failure and true on success. + * It returns FALSE on failure and TRUE on success. * If the data is valid it is set to the $this->data array * so that it can be inserted into a database. * @@ -221,7 +221,7 @@ function data($item) * Process Trackback * * Opens a socket connection and passes the data to - * the server. Returns true on success, false on failure + * the server. Returns TRUE on success, FALSE on failure * * @access public * @param string @@ -267,6 +267,7 @@ function process($url, $data) } @fclose($fp); + if (stristr($this->response, '0') === FALSE) { $message = 'An unknown error was encountered'; @@ -383,7 +384,7 @@ function get_id($url) if ( ! preg_match ("/^([0-9]+)$/", $tb_id)) { - return false; + return FALSE; } else { @@ -436,7 +437,7 @@ function limit_characters($str, $n = 500, $end_char = '…') { return $str; } - + $str = preg_replace("/\s+/", ' ', str_replace(array("\r\n", "\r", "\n"), ' ', $str)); if (strlen($str) <= $n) From e12f64e70fad08c02668ab2fda00cd5d56b8116b Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 22:55:08 -0600 Subject: [PATCH 1837/2544] updating Upload features and use of security library --- system/libraries/Upload.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 5ff47826..ac9323c0 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -454,6 +454,11 @@ function set_max_height($n) */ function set_allowed_types($types) { + if ( ! is_array($types) && $types == '*') + { + $this->allowed_types = '*'; + return; + } $this->allowed_types = explode('|', $types); } @@ -551,6 +556,11 @@ function is_image() */ function is_allowed_filetype() { + if ($this->allowed_types == '*') + { + return TRUE; + } + if (count($this->allowed_types) == 0 OR ! is_array($this->allowed_types)) { $this->set_error('upload_no_file_types'); @@ -805,7 +815,7 @@ function do_xss_clean() } $CI =& get_instance(); - $data = $CI->input->xss_clean($data); + $data = $CI->security->xss_clean($data); flock($fp, LOCK_EX); fwrite($fp, $data); From a9647e8ed7eb19ca55e84fba9c5ee62e0045881d Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 22:59:07 -0600 Subject: [PATCH 1838/2544] updating XMLRPC class to use Security lib --- system/libraries/Xmlrpc.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index 5a82391d..c46d52cd 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -513,7 +513,7 @@ function decode($array=FALSE) } else { - $array[$key] = $CI->input->xss_clean($array[$key]); + $array[$key] = $CI->security->xss_clean($array[$key]); } } @@ -529,7 +529,7 @@ function decode($array=FALSE) } else { - $result = $CI->input->xss_clean($result); + $result = $CI->security->xss_clean($result); } } @@ -1127,7 +1127,9 @@ function output_parameters($array=FALSE) } else { - $array[$key] = $CI->input->xss_clean($array[$key]); + // 'bits' is for the MetaWeblog API image bits + // @todo - this needs to be made more general purpose + $array[$key] = ($key == 'bits') ? $array[$key] : $CI->security->xss_clean($array[$key]); } } @@ -1147,7 +1149,7 @@ function output_parameters($array=FALSE) } else { - $parameters[] = $CI->input->xss_clean($a_param); + $parameters[] = $CI->security->xss_clean($a_param); } } } @@ -1322,7 +1324,7 @@ function kindOf() function serializedata($typ, $val) { $rs = ''; - + switch($this->xmlrpcTypes[$typ]) { case 3: From c4c34ee996bfa583b45484b4bc7bbd7dc036bb29 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 23:00:28 -0600 Subject: [PATCH 1839/2544] whitespace --- system/libraries/Xmlrpcs.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php index 429ab847..fe1c99bf 100644 --- a/system/libraries/Xmlrpcs.php +++ b/system/libraries/Xmlrpcs.php @@ -40,10 +40,10 @@ class CI_Xmlrpcs extends CI_Xmlrpc var $debug_msg = ''; // Debug Message var $system_methods = array(); // XML RPC Server methods var $controller_obj; - - var $object = FALSE; - + var $object = FALSE; + + //------------------------------------- // Constructor, more or less //------------------------------------- From 22224b513bf5dcb3f34798f0a9568049966d7ee8 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 23:06:53 -0600 Subject: [PATCH 1840/2544] modified cookie helper to use input class --- system/helpers/cookie_helper.php | 43 +------------------------------- 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php index 40afadb5..4be371ef 100644 --- a/system/helpers/cookie_helper.php +++ b/system/helpers/cookie_helper.php @@ -46,50 +46,9 @@ { function set_cookie($name = '', $value = '', $expire = '', $domain = '', $path = '/', $prefix = '') { - if (is_array($name)) - { - foreach (array('value', 'expire', 'domain', 'path', 'prefix', 'name') as $item) - { - if (isset($name[$item])) - { - $$item = $name[$item]; - } - } - } - // Set the config file options $CI =& get_instance(); - - if ($prefix == '' AND $CI->config->item('cookie_prefix') != '') - { - $prefix = $CI->config->item('cookie_prefix'); - } - if ($domain == '' AND $CI->config->item('cookie_domain') != '') - { - $domain = $CI->config->item('cookie_domain'); - } - if ($path == '/' AND $CI->config->item('cookie_path') != '/') - { - $path = $CI->config->item('cookie_path'); - } - - if ( ! is_numeric($expire)) - { - $expire = time() - 86500; - } - else - { - if ($expire > 0) - { - $expire = time() + $expire; - } - else - { - $expire = 0; - } - } - - setcookie($prefix.$name, $value, $expire, $path, $domain, 0); + $CI->input->set_cookie($name, $value, $expire, $domain, $path, $prefix); } } From 626d39f92bb9185ea85daafd6679529d054b85ab Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 2 Mar 2010 23:14:56 -0600 Subject: [PATCH 1841/2544] code comments fix --- system/helpers/file_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 2be06ac4..274c4ad3 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -125,7 +125,7 @@ function delete_files($path, $del_dir = FALSE, $level = 0) if ( ! $current_dir = @opendir($path)) { - return TRUE; + return FALSE; } while(FALSE !== ($filename = @readdir($current_dir))) @@ -218,7 +218,7 @@ function get_filenames($source_dir, $include_path = FALSE, $_recursion = FALSE) * * @access public * @param string path to source - * @param bool whether to include the path as part of the filename + * @param bool Look only at the top level directory specified? * @param bool internal variable to determine recursion status - do not use in calls * @return array */ From aacfe480da6859cd74b70884de34d987c6682267 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 3 Mar 2010 12:26:31 -0600 Subject: [PATCH 1842/2544] Moving Jquery library to javascript/Jquery.php --- system/libraries/Javascript.php | 2 +- system/libraries/{ => javascript}/Jquery.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename system/libraries/{ => javascript}/Jquery.php (99%) diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php index 3b7dcc6f..af85e650 100644 --- a/system/libraries/Javascript.php +++ b/system/libraries/Javascript.php @@ -23,7 +23,7 @@ function CI_Javascript($params = array()) $this->CI =& get_instance(); // load the requested js library - $this->CI->load->library($js_library_driver, array('autoload' => $autoload)); + $this->CI->load->library('javsacript/'.$js_library_driver, array('autoload' => $autoload)); // make js to refer to current library $this->js =& $this->CI->$js_library_driver; diff --git a/system/libraries/Jquery.php b/system/libraries/javascript/Jquery.php similarity index 99% rename from system/libraries/Jquery.php rename to system/libraries/javascript/Jquery.php index c63a7423..f6b8dce6 100644 --- a/system/libraries/Jquery.php +++ b/system/libraries/javascript/Jquery.php @@ -24,7 +24,7 @@ * @link http://www.codeigniter.com/user_guide/libraries/jquery.html */ -class Jquery extends CI_Javascript { +class CI_Jquery extends CI_Javascript { var $_javascript_folder = 'js'; var $jquery_code_for_load = array(); From 1a445f877bc18bd98d9ef722a775d6def09c0b21 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 09:40:14 -0600 Subject: [PATCH 1843/2544] whitespace --- system/libraries/Image_lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 21e0a709..fc78f6b0 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -349,7 +349,7 @@ function initialize($props = array()) function resize() { $protocol = 'image_process_'.$this->image_library; - + if (preg_match('/gd2$/i', $protocol)) { $protocol = 'image_process_gd'; From f53d1c7e129594d2e38f319d5190e14d7a7c1c98 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 09:40:49 -0600 Subject: [PATCH 1844/2544] more whitespace --- system/libraries/Image_lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index fc78f6b0..21e0a709 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -349,7 +349,7 @@ function initialize($props = array()) function resize() { $protocol = 'image_process_'.$this->image_library; - + if (preg_match('/gd2$/i', $protocol)) { $protocol = 'image_process_gd'; From 9d653edd03fcc325e94a2c9da36eb250f2a8f889 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 09:52:53 -0600 Subject: [PATCH 1845/2544] fixing docblock for Javascript class --- system/libraries/Javascript.php | 36 +++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php index af85e650..efaaab4b 100644 --- a/system/libraries/Javascript.php +++ b/system/libraries/Javascript.php @@ -1,13 +1,35 @@ 'jquery', 'autoload' => TRUE); foreach ($defaults as $key => $val) @@ -23,7 +45,7 @@ function CI_Javascript($params = array()) $this->CI =& get_instance(); // load the requested js library - $this->CI->load->library('javsacript/'.$js_library_driver, array('autoload' => $autoload)); + $this->CI->load->library('javascript/'.$js_library_driver, array('autoload' => $autoload)); // make js to refer to current library $this->js =& $this->CI->$js_library_driver; @@ -840,8 +862,10 @@ function _prep_args($result, $is_key = FALSE) return $result; } } + + // -------------------------------------------------------------------- } - +// END Javascript Class /* End of file Javascript.php */ /* Location: ./system/libraries/Javascript.php */ \ No newline at end of file From 36591099aa01107294f8b2794351b078b7575a25 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 10:05:51 -0600 Subject: [PATCH 1846/2544] little cleaner regex in human_to_unix() --- system/helpers/date_helper.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index 0e978166..2c60f030 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -288,7 +288,7 @@ function days_in_month($month = 0, $year = '') return $days_in_month[$month - 1]; } } - + // ------------------------------------------------------------------------ /** @@ -343,7 +343,7 @@ function gmt_to_local($time = '', $timezone = 'UTC', $dst = FALSE) return $time; } } - + // ------------------------------------------------------------------------ /** @@ -440,14 +440,14 @@ function human_to_unix($datestr = '') } $datestr = trim($datestr); - $datestr = preg_replace("/\040+/", "\040", $datestr); - + $datestr = preg_replace("/\040+/", ' ', $datestr); + if ( ! preg_match('/^[0-9]{2,4}\-[0-9]{1,2}\-[0-9]{1,2}\s[0-9]{1,2}:[0-9]{1,2}(?::[0-9]{1,2})?(?:\s[AP]M)?$/i', $datestr)) { return FALSE; } - - $split = preg_split("/\040/", $datestr); + + $split = explode(' ', $datestr); $ex = explode("-", $split['0']); From 68788d5577d9f101220e3e6e8fba0829feb136de Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 10:11:31 -0600 Subject: [PATCH 1847/2544] bringing form helper in sync --- system/helpers/form_helper.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 60d2631e..5feb3ce6 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -66,7 +66,6 @@ function form_open($action = '', $attributes = '', $hidden = array()) } } - // ------------------------------------------------------------------------ /** @@ -266,7 +265,7 @@ function form_textarea($data = '', $value = '', $extra = '') * @param string * @return type */ -if (! function_exists('form_multiselect')) +if ( ! function_exists('form_multiselect')) { function form_multiselect($name = '', $options = array(), $selected = array(), $extra = '') { @@ -320,7 +319,7 @@ function form_dropdown($name = '', $options = array(), $selected = array(), $ext { $key = (string) $key; - if (is_array($val)) + if (is_array($val) && ! empty($val)) { $form .= ''."\n"; @@ -638,7 +637,7 @@ function form_prep($str = '', $field_name = '') if ($field_name != '') { - $prepped_fields[$field_name] = $str; + $prepped_fields[$field_name] = $field_name; } return $str; From d4433348afe653a0472cbe4d023db883fd142d11 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 10:13:55 -0600 Subject: [PATCH 1848/2544] whitespace --- system/helpers/number_helper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/helpers/number_helper.php b/system/helpers/number_helper.php index 1fdd3032..f7979215 100644 --- a/system/helpers/number_helper.php +++ b/system/helpers/number_helper.php @@ -72,6 +72,5 @@ function byte_format($num, $precision = 1) } - /* End of file number_helper.php */ /* Location: ./system/helpers/number_helper.php */ \ No newline at end of file From 11b1e51f8df7a1e47d002a14a76748f6f629f988 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 10:22:44 -0600 Subject: [PATCH 1849/2544] no in helpers, updated security lib to use Security class instead of Input --- system/helpers/security_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php index 1f0a6290..654cfd10 100644 --- a/system/helpers/security_helper.php +++ b/system/helpers/security_helper.php @@ -40,7 +40,7 @@ function xss_clean($str, $is_image = FALSE) { $CI =& get_instance(); - return $CI->input->xss_clean($str, $is_image); + return $CI->security->xss_clean($str, $is_image); } } @@ -56,7 +56,7 @@ function xss_clean($str, $is_image = FALSE) { function dohash($str, $type = 'sha1') { - return $this->do_hash($str, $type); + return do_hash($str, $type); } } From 48822fa77cd02a7974a56cf92d989aefbd98e9af Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 10:23:39 -0600 Subject: [PATCH 1850/2544] updating attributes to lowercase and added CDATA block around js --- system/helpers/smiley_helper.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 931f1308..775cc1b9 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -68,7 +68,6 @@ function smiley_js($alias = '', $field_id = '') $m = '{'.implode(',', $m).'}'; $r .= <<'.$r.''; + return ''; } } @@ -159,7 +158,7 @@ function get_clickable_smileys($image_url, $alias = '', $smileys = NULL) continue; } - $link[] = "\"".$smileys[$key][3]."\""; + $link[] = "\"".$smileys[$key][3]."\""; $used[$smileys[$key][0]] = TRUE; } From 1e1419229ea85b9928f2b0f7d2bad1f5cefc3946 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 10:24:50 -0600 Subject: [PATCH 1851/2544] whitespace, code comments --- system/helpers/string_helper.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php index 4767f0b5..60f6ed17 100644 --- a/system/helpers/string_helper.php +++ b/system/helpers/string_helper.php @@ -30,7 +30,7 @@ /** * Trim Slashes * - * Removes any leading/traling slashes from a string: + * Removes any leading/trailing slashes from a string: * * /this/that/theother/ * @@ -46,10 +46,10 @@ { function trim_slashes($str) { - return trim($str, '/'); - } + return trim($str, '/'); + } } - + // ------------------------------------------------------------------------ /** @@ -120,6 +120,7 @@ function quotes_to_entities($str) } // ------------------------------------------------------------------------ + /** * Reduce Double Slashes * @@ -143,7 +144,7 @@ function reduce_double_slashes($str) return preg_replace("#(^|[^:])//+#", "\\1/", $str); } } - + // ------------------------------------------------------------------------ /** @@ -173,7 +174,7 @@ function reduce_multiples($str, $character = ',', $trim = FALSE) { $str = trim($str, $character); } - + return $str; } } @@ -238,6 +239,7 @@ function random_string($type = 'alnum', $len = 8) } } } + // ------------------------------------------------------------------------ /** From daf9c01a2c25515eea87fb4f4c905f49c30d0214 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 10:29:30 -0600 Subject: [PATCH 1852/2544] added convert_accented_characters() function to Text Helper --- system/application/config/foreign_chars.php | 64 +++++++++++++++++++++ system/helpers/text_helper.php | 48 ++++++++++++++-- 2 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 system/application/config/foreign_chars.php diff --git a/system/application/config/foreign_chars.php b/system/application/config/foreign_chars.php new file mode 100644 index 00000000..8d70a2f6 --- /dev/null +++ b/system/application/config/foreign_chars.php @@ -0,0 +1,64 @@ + "ss", // ß + '224' => "a", + '225' => "a", + '226' => "a", + '229' => "a", + '227' => "ae", + '230' => "ae", + '228' => "ae", + '231' => "c", + '232' => "e", // è + '233' => "e", // é + '234' => "e", // ê + '235' => "e", // ë + '236' => "i", + '237' => "i", + '238' => "i", + '239' => "i", + '241' => "n", + '242' => "o", + '243' => "o", + '244' => "o", + '245' => "o", + '246' => "oe", // ö + '249' => "u", + '250' => "u", + '251' => "u", + '252' => "ue", // ü + '255' => "y", + '257' => "aa", + '269' => "ch", + '275' => "ee", + '291' => "gj", + '299' => "ii", + '311' => "kj", + '316' => "lj", + '326' => "nj", + '353' => "sh", + '363' => "uu", + '382' => "zh", + '256' => "aa", + '268' => "ch", + '274' => "ee", + '290' => "gj", + '298' => "ii", + '310' => "kj", + '315' => "lj", + '325' => "nj", + '352' => "sh", + '362' => "uu", + '381' => "zh", + ); + + +/* End of file foreign_chars.php */ +/* Location: ./system/application/config/foreign_chars.php */ \ No newline at end of file diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 1e672937..47726021 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -87,7 +87,7 @@ function character_limiter($str, $n = 500, $end_char = '…') { return $str; } - + $out = ""; foreach (explode(' ', trim($str)) as $val) { @@ -136,7 +136,7 @@ function ascii_to_entities($str) $out .= '&#'.array_shift($temp).';'; $count = 1; } - + $out .= $str[$i]; } else @@ -248,7 +248,7 @@ function word_censor($str, $censored, $replacement = '') // \w, \b and a few others do not match on a unicode character // set for performance reasons. As a result words like über // will not match on a word boundary. Instead, we'll assume that - // a bad word will be bookended by any of these characters. + // a bad word will be bookeneded by any of these characters. $delim = '[-_\'\"`(){}<>\[\]|!?@#%&,.:;^~*+=\/ 0-9\n\r\t]'; foreach ($censored as $badword) @@ -352,6 +352,44 @@ function highlight_phrase($str, $phrase, $tag_open = '', $tag_close = '< return $str; } } + +// ------------------------------------------------------------------------ + +/** + * Convert Accented Foreign Characters to ASCII + * + * @access public + * @param string the text string + * @return string + */ +if ( ! function_exists('convert_accented_characters')) +{ + function convert_accented_characters($match) + { + if ( ! file_exists(APPPATH.'config/foreign_chars'.EXT)) + { + return $match; + } + + include APPPATH.'config/foreign_chars'.EXT; + + if ( ! isset($foreign_characters)) + { + return $match; + } + + $ord = ord($match['1']); + + if (isset($foreign_characters[$ord])) + { + return $foreign_characters[$ord]; + } + else + { + return $match['1']; + } + } +} // ------------------------------------------------------------------------ @@ -431,7 +469,7 @@ function word_wrap($str, $charlim = '76') // word into smaller chunks so we'll add it back to our current line if ($temp != '') { - $output .= $temp . "\n" . $line; + $output .= $temp."\n".$line; } else { @@ -456,7 +494,7 @@ function word_wrap($str, $charlim = '76') return $output; } } - + /* End of file text_helper.php */ /* Location: ./system/helpers/text_helper.php */ \ No newline at end of file From 2b7de06bd0e2184c9bffc971490f7f640c736a6a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 10:31:08 -0600 Subject: [PATCH 1853/2544] added entity_decode() to Typography helper, updated auto_typography() --- system/helpers/typography_helper.php | 59 +++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php index 5621e6dd..712b5750 100644 --- a/system/helpers/typography_helper.php +++ b/system/helpers/typography_helper.php @@ -54,16 +54,71 @@ function nl2br_except_pre($str) * * @access public * @param string + * @param bool whether to allow javascript event handlers * @param bool whether to reduce multiple instances of double newlines to two * @return string */ if ( ! function_exists('auto_typography')) { - function auto_typography($str, $reduce_linebreaks = FALSE) + function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebreaks = FALSE) { $CI =& get_instance(); $CI->load->library('typography'); - return $CI->typography->auto_typography($str, $reduce_linebreaks); + return $CI->typography->auto_typography($str, $strip_js_event_handlers, $reduce_linebreaks); + } +} + + +// -------------------------------------------------------------------- + +/** + * HTML Entities Decode + * + * This function is a replacement for html_entity_decode() + * + * In some versions of PHP the native function does not work + * when UTF-8 is the specified character set, so this gives us + * a work-around. More info here: + * http://bugs.php.net/bug.php?id=25670 + * + * NOTE: html_entity_decode() has a bug in some PHP versions when UTF-8 is the + * character set, and the PHP developers said they were not back porting the + * fix to versions other than PHP 5.x. + * + * @access public + * @param string + * @return string + */ +if ( ! function_exists('entity_decode')) +{ + function entity_decode($str, $charset='UTF-8') + { + if (stristr($str, '&') === FALSE) return $str; + + // The reason we are not using html_entity_decode() by itself is because + // while it is not technically correct to leave out the semicolon + // at the end of an entity most browsers will still interpret the entity + // correctly. html_entity_decode() does not convert entities without + // semicolons, so we are left with our own little solution here. Bummer. + + if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR version_compare(phpversion(), '5.0.0', '>='))) + { + $str = html_entity_decode($str, ENT_COMPAT, $charset); + $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str); + return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str); + } + + // Numeric Entities + $str = preg_replace('~&#x(0*[0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str); + $str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str); + + // Literal Entities - Slightly slow so we do another check + if (stristr($str, '&') === FALSE) + { + $str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES))); + } + + return $str; } } From 85b2bb7df5e5308b5283e24a3d83aadd1fa9d4de Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 10:32:03 -0600 Subject: [PATCH 1854/2544] improved xml_convert() of XML helper --- system/helpers/xml_helper.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php index 712f6777..09b7aee4 100644 --- a/system/helpers/xml_helper.php +++ b/system/helpers/xml_helper.php @@ -36,25 +36,33 @@ */ if ( ! function_exists('xml_convert')) { - function xml_convert($str) + function xml_convert($str, $protect_all = FALSE) { $temp = '__TEMP_AMPERSANDS__'; // Replace entities to temporary markers so that - // ampersands won't get messed up + // ampersands won't get messed up $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); - $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); + + if ($protect_all === TRUE) + { + $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); + } $str = str_replace(array("&","<",">","\"", "'", "-"), - array("&", "<", ">", """, "'", "-"), - $str); + array("&", "<", ">", """, "'", "-"), + $str); // Decode the temp markers back to entities $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); - $str = preg_replace("/$temp(\w+);/","&\\1;", $str); - + + if ($protect_all === TRUE) + { + $str = preg_replace("/$temp(\w+);/","&\\1;", $str); + } + return $str; - } + } } From 99111e3abe02e9a40795fa96f33ea08e492eadcd Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 10:39:08 -0600 Subject: [PATCH 1855/2544] added end of function marker --- system/helpers/xml_helper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php index 09b7aee4..56f5e011 100644 --- a/system/helpers/xml_helper.php +++ b/system/helpers/xml_helper.php @@ -65,6 +65,7 @@ function xml_convert($str, $protect_all = FALSE) } } +// ------------------------------------------------------------------------ /* End of file xml_helper.php */ /* Location: ./system/helpers/xml_helper.php */ \ No newline at end of file From b41032d2df1e63566f1183533b388372538c46d0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 11:22:45 -0600 Subject: [PATCH 1856/2544] moved CAPTCHA plugin to a helper --- system/helpers/captcha_helper.php | 246 +++++++++++++++++ system/plugins/captcha_pi.php | 355 ------------------------- user_guide/helpers/captcha_helper.html | 195 ++++++++++++++ 3 files changed, 441 insertions(+), 355 deletions(-) create mode 100644 system/helpers/captcha_helper.php delete mode 100644 system/plugins/captcha_pi.php create mode 100644 user_guide/helpers/captcha_helper.html diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php new file mode 100644 index 00000000..a5878921 --- /dev/null +++ b/system/helpers/captcha_helper.php @@ -0,0 +1,246 @@ + '', 'img_path' => '', 'img_url' => '', 'img_width' => '150', 'img_height' => '30', 'font_path' => '', 'expiration' => 7200); + + foreach ($defaults as $key => $val) + { + if ( ! is_array($data)) + { + if ( ! isset($$key) OR $$key == '') + { + $$key = $val; + } + } + else + { + $$key = ( ! isset($data[$key])) ? $val : $data[$key]; + } + } + + if ($img_path == '' OR $img_url == '') + { + return FALSE; + } + + if ( ! @is_dir($img_path)) + { + return FALSE; + } + + if ( ! is_writable($img_path)) + { + return FALSE; + } + + if ( ! extension_loaded('gd')) + { + return FALSE; + } + + // ----------------------------------- + // Remove old images + // ----------------------------------- + + list($usec, $sec) = explode(" ", microtime()); + $now = ((float)$usec + (float)$sec); + + $current_dir = @opendir($img_path); + + while($filename = @readdir($current_dir)) + { + if ($filename != "." and $filename != ".." and $filename != "index.html") + { + $name = str_replace(".jpg", "", $filename); + + if (($name + $expiration) < $now) + { + @unlink($img_path.$filename); + } + } + } + + @closedir($current_dir); + + // ----------------------------------- + // Do we have a "word" yet? + // ----------------------------------- + + if ($word == '') + { + $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; + + $str = ''; + for ($i = 0; $i < 8; $i++) + { + $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); + } + + $word = $str; + } + + // ----------------------------------- + // Determine angle and position + // ----------------------------------- + + $length = strlen($word); + $angle = ($length >= 6) ? rand(-($length-6), ($length-6)) : 0; + $x_axis = rand(6, (360/$length)-16); + $y_axis = ($angle >= 0 ) ? rand($img_height, $img_width) : rand(6, $img_height); + + // ----------------------------------- + // Create image + // ----------------------------------- + + // PHP.net recommends imagecreatetruecolor(), but it isn't always available + if (function_exists('imagecreatetruecolor')) + { + $im = imagecreatetruecolor($img_width, $img_height); + } + else + { + $im = imagecreate($img_width, $img_height); + } + + // ----------------------------------- + // Assign colors + // ----------------------------------- + + $bg_color = imagecolorallocate ($im, 255, 255, 255); + $border_color = imagecolorallocate ($im, 153, 102, 102); + $text_color = imagecolorallocate ($im, 204, 153, 153); + $grid_color = imagecolorallocate($im, 255, 182, 182); + $shadow_color = imagecolorallocate($im, 255, 240, 240); + + // ----------------------------------- + // Create the rectangle + // ----------------------------------- + + ImageFilledRectangle($im, 0, 0, $img_width, $img_height, $bg_color); + + // ----------------------------------- + // Create the spiral pattern + // ----------------------------------- + + $theta = 1; + $thetac = 7; + $radius = 16; + $circles = 20; + $points = 32; + + for ($i = 0; $i < ($circles * $points) - 1; $i++) + { + $theta = $theta + $thetac; + $rad = $radius * ($i / $points ); + $x = ($rad * cos($theta)) + $x_axis; + $y = ($rad * sin($theta)) + $y_axis; + $theta = $theta + $thetac; + $rad1 = $radius * (($i + 1) / $points); + $x1 = ($rad1 * cos($theta)) + $x_axis; + $y1 = ($rad1 * sin($theta )) + $y_axis; + imageline($im, $x, $y, $x1, $y1, $grid_color); + $theta = $theta - $thetac; + } + + // ----------------------------------- + // Write the text + // ----------------------------------- + + $use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE; + + if ($use_font == FALSE) + { + $font_size = 5; + $x = rand(0, $img_width/($length/3)); + $y = 0; + } + else + { + $font_size = 16; + $x = rand(0, $img_width/($length/1.5)); + $y = $font_size+2; + } + + for ($i = 0; $i < strlen($word); $i++) + { + if ($use_font == FALSE) + { + $y = rand(0 , $img_height/2); + imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color); + $x += ($font_size*2); + } + else + { + $y = rand($img_height/2, $img_height-3); + imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1)); + $x += $font_size; + } + } + + + // ----------------------------------- + // Create the border + // ----------------------------------- + + imagerectangle($im, 0, 0, $img_width-1, $img_height-1, $border_color); + + // ----------------------------------- + // Generate the image + // ----------------------------------- + + $img_name = $now.'.jpg'; + + ImageJPEG($im, $img_path.$img_name); + + $img = "\""; + + ImageDestroy($im); + + return array('word' => $word, 'time' => $now, 'image' => $img); + } +} + +// ------------------------------------------------------------------------ + +/* End of file captcha_pi.php */ +/* Location: ./system/plugins/captcha_pi.php */ \ No newline at end of file diff --git a/system/plugins/captcha_pi.php b/system/plugins/captcha_pi.php deleted file mode 100644 index 7092f28e..00000000 --- a/system/plugins/captcha_pi.php +++ /dev/null @@ -1,355 +0,0 @@ -load->plugin('captcha'); - -Once loaded you can generate a captcha like this: - - $vals = array( - 'word' => 'Random word', - 'img_path' => './captcha/', - 'img_url' => 'http://example.com/captcha/', - 'font_path' => './path/to/fonts/texb.ttf', - 'img_width' => '150', - 'img_height' => 30, - 'expiration' => 7200 - ); - - $cap = create_captcha($vals); - echo $cap['image']; - - -NOTES: - - The captcha function requires the GD image library. - - Only the img_path and img_url are required. - - If a "word" is not supplied, the function will generate a random - ASCII string. You might put together your own word library that - you can draw randomly from. - - If you do not specify a path to a TRUE TYPE font, the native ugly GD - font will be used. - - The "captcha" folder must be writable (666, or 777) - - The "expiration" (in seconds) signifies how long an image will - remain in the captcha folder before it will be deleted. The default - is two hours. - -RETURNED DATA - -The create_captcha() function returns an associative array with this data: - - [array] - ( - 'image' => IMAGE TAG - 'time' => TIMESTAMP (in microtime) - 'word' => CAPTCHA WORD - ) - -The "image" is the actual image tag: - - -The "time" is the micro timestamp used as the image name without the file -extension. It will be a number like this: 1139612155.3422 - -The "word" is the word that appears in the captcha image, which if not -supplied to the function, will be a random string. - - -ADDING A DATABASE - -In order for the captcha function to prevent someone from posting, you will need -to add the information returned from create_captcha() function to your database. -Then, when the data from the form is submitted by the user you will need to verify -that the data exists in the database and has not expired. - -Here is a table prototype: - - CREATE TABLE captcha ( - captcha_id bigint(13) unsigned NOT NULL auto_increment, - captcha_time int(10) unsigned NOT NULL, - ip_address varchar(16) default '0' NOT NULL, - word varchar(20) NOT NULL, - PRIMARY KEY `captcha_id` (`captcha_id`), - KEY `word` (`word`) - ) - - -Here is an example of usage with a DB. - -On the page where the captcha will be shown you'll have something like this: - - $this->load->plugin('captcha'); - $vals = array( - 'img_path' => './captcha/', - 'img_url' => 'http://example.com/captcha/' - ); - - $cap = create_captcha($vals); - - $data = array( - 'captcha_time' => $cap['time'], - 'ip_address' => $this->input->ip_address(), - 'word' => $cap['word'] - ); - - $query = $this->db->insert_string('captcha', $data); - $this->db->query($query); - - echo 'Submit the word you see below:'; - echo $cap['image']; - echo ''; - - -Then, on the page that accepts the submission you'll have something like this: - - // First, delete old captchas - $expiration = time()-7200; // Two hour limit - $this->db->query("DELETE FROM captcha WHERE captcha_time < ".$expiration); - - // Then see if a captcha exists: - $sql = "SELECT COUNT(*) AS count FROM captcha WHERE word = ? AND ip_address = ? AND date > ?"; - $binds = array($_POST['captcha'], $this->input->ip_address(), $expiration); - $query = $this->db->query($sql, $binds); - $row = $query->row(); - - if ($row->count == 0) - { - echo "You must submit the word that appears in the image"; - } - -*/ - - - -/** -|========================================================== -| Create Captcha -|========================================================== -| -*/ -function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = '') -{ - $defaults = array('word' => '', 'img_path' => '', 'img_url' => '', 'img_width' => '150', 'img_height' => '30', 'font_path' => '', 'expiration' => 7200); - - foreach ($defaults as $key => $val) - { - if ( ! is_array($data)) - { - if ( ! isset($$key) OR $$key == '') - { - $$key = $val; - } - } - else - { - $$key = ( ! isset($data[$key])) ? $val : $data[$key]; - } - } - - if ($img_path == '' OR $img_url == '') - { - return FALSE; - } - - if ( ! @is_dir($img_path)) - { - return FALSE; - } - - if ( ! is_writable($img_path)) - { - return FALSE; - } - - if ( ! extension_loaded('gd')) - { - return FALSE; - } - - // ----------------------------------- - // Remove old images - // ----------------------------------- - - list($usec, $sec) = explode(" ", microtime()); - $now = ((float)$usec + (float)$sec); - - $current_dir = @opendir($img_path); - - while($filename = @readdir($current_dir)) - { - if ($filename != "." and $filename != ".." and $filename != "index.html") - { - $name = str_replace(".jpg", "", $filename); - - if (($name + $expiration) < $now) - { - @unlink($img_path.$filename); - } - } - } - - @closedir($current_dir); - - // ----------------------------------- - // Do we have a "word" yet? - // ----------------------------------- - - if ($word == '') - { - $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; - - $str = ''; - for ($i = 0; $i < 8; $i++) - { - $str .= substr($pool, mt_rand(0, strlen($pool) -1), 1); - } - - $word = $str; - } - - // ----------------------------------- - // Determine angle and position - // ----------------------------------- - - $length = strlen($word); - $angle = ($length >= 6) ? rand(-($length-6), ($length-6)) : 0; - $x_axis = rand(6, (360/$length)-16); - $y_axis = ($angle >= 0 ) ? rand($img_height, $img_width) : rand(6, $img_height); - - // ----------------------------------- - // Create image - // ----------------------------------- - - // PHP.net recommends imagecreatetruecolor(), but it isn't always available - if (function_exists('imagecreatetruecolor')) - { - $im = imagecreatetruecolor($img_width, $img_height); - } - else - { - $im = imagecreate($img_width, $img_height); - } - - // ----------------------------------- - // Assign colors - // ----------------------------------- - - $bg_color = imagecolorallocate ($im, 255, 255, 255); - $border_color = imagecolorallocate ($im, 153, 102, 102); - $text_color = imagecolorallocate ($im, 204, 153, 153); - $grid_color = imagecolorallocate($im, 255, 182, 182); - $shadow_color = imagecolorallocate($im, 255, 240, 240); - - // ----------------------------------- - // Create the rectangle - // ----------------------------------- - - ImageFilledRectangle($im, 0, 0, $img_width, $img_height, $bg_color); - - // ----------------------------------- - // Create the spiral pattern - // ----------------------------------- - - $theta = 1; - $thetac = 7; - $radius = 16; - $circles = 20; - $points = 32; - - for ($i = 0; $i < ($circles * $points) - 1; $i++) - { - $theta = $theta + $thetac; - $rad = $radius * ($i / $points ); - $x = ($rad * cos($theta)) + $x_axis; - $y = ($rad * sin($theta)) + $y_axis; - $theta = $theta + $thetac; - $rad1 = $radius * (($i + 1) / $points); - $x1 = ($rad1 * cos($theta)) + $x_axis; - $y1 = ($rad1 * sin($theta )) + $y_axis; - imageline($im, $x, $y, $x1, $y1, $grid_color); - $theta = $theta - $thetac; - } - - // ----------------------------------- - // Write the text - // ----------------------------------- - - $use_font = ($font_path != '' AND file_exists($font_path) AND function_exists('imagettftext')) ? TRUE : FALSE; - - if ($use_font == FALSE) - { - $font_size = 5; - $x = rand(0, $img_width/($length/3)); - $y = 0; - } - else - { - $font_size = 16; - $x = rand(0, $img_width/($length/1.5)); - $y = $font_size+2; - } - - for ($i = 0; $i < strlen($word); $i++) - { - if ($use_font == FALSE) - { - $y = rand(0 , $img_height/2); - imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color); - $x += ($font_size*2); - } - else - { - $y = rand($img_height/2, $img_height-3); - imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1)); - $x += $font_size; - } - } - - - // ----------------------------------- - // Create the border - // ----------------------------------- - - imagerectangle($im, 0, 0, $img_width-1, $img_height-1, $border_color); - - // ----------------------------------- - // Generate the image - // ----------------------------------- - - $img_name = $now.'.jpg'; - - ImageJPEG($im, $img_path.$img_name); - - $img = "\""; - - ImageDestroy($im); - - return array('word' => $word, 'time' => $now, 'image' => $img); -} - - -/* End of file captcha_pi.php */ -/* Location: ./system/plugins/captcha_pi.php */ \ No newline at end of file diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html new file mode 100644 index 00000000..297e47e2 --- /dev/null +++ b/user_guide/helpers/captcha_helper.html @@ -0,0 +1,195 @@ + + + + + +CAPTCHA Helper : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
      +
      + + + + +

      CodeIgniter User Guide Version 1.7.2

      +
      + + + + + + + + + +
      + + +
      + + + +
      + + +

      CAPTCHA Helper

      + +

      The CAPTCHA Helper file contains functions that assist in creating CAPTCHA images.

      + + +

      Loading this Helper

      + +

      This helper is loaded using the following code:

      +$this->load->helper('captcha'); + +

      The following functions are available:

      + +

      captcha_create($data)

      + +

      Takes an array of information to generate the CAPTCHA as input and creates the image to your specifications, returning an array of associative data about the image.

      + +[array]
      +(
      +  'image' => IMAGE TAG
      +  'time' => TIMESTAMP (in microtime)
      +  'word' => CAPTCHA WORD
      +)       + +

      The "image" is the actual image tag: +<img src="http://example.com/captcha/12345.jpg" width="140" height="50" />

      + +

      The "time" is the micro timestamp used as the image name without the file + extension. It will be a number like this: 1139612155.3422

      + +

      The "word" is the word that appears in the captcha image, which if not + supplied to the function, will be a random string.

      + +

      Using the CAPTCHA plugin

      + +

      Once loaded you can generate a captcha like this:

      + +$vals = array(
      +    'word' => 'Random word',
      +    'img_path' => './captcha/',
      +    'img_url' => 'http://example.com/captcha/',
      +    'font_path' => './path/to/fonts/texb.ttf',
      +    'img_width' => '150',
      +    'img_height' => 30,
      +    'expiration' => 7200
      +    );
      +
      +$cap = create_captcha($vals);
      +echo $cap['image'];       + +
        +
      • The captcha function requires the GD image library.
        • +
      • Only the img_path and img_url are required.
        • +
      • If a "word" is not supplied, the function will generate a random + ASCII string. You might put together your own word library that + you can draw randomly from.
        • +
      • If you do not specify a path to a TRUE TYPE font, the native ugly GD + font will be used.
        • +
      • The "captcha" folder must be writable (666, or 777)
        • +
      • The "expiration" (in seconds) signifies how long an image will + remain in the captcha folder before it will be deleted. The default + is two hours.
        • +
      + +

      Adding a Database

      + +

      In order for the captcha function to prevent someone from submitting, you will need + to add the information returned from create_captcha() function to your database. + Then, when the data from the form is submitted by the user you will need to verify + that the data exists in the database and has not expired.

      + +

      Here is a table prototype:

      + +CREATE TABLE captcha (
      + captcha_id bigint(13) unsigned NOT NULL auto_increment,
      + captcha_time int(10) unsigned NOT NULL,
      + ip_address varchar(16) default '0' NOT NULL,
      + word varchar(20) NOT NULL,
      + PRIMARY KEY `captcha_id` (`captcha_id`),
      + KEY `word` (`word`)
      +)       + +

      Here is an example of usage with a database. On the page where the CAPTCHA will be shown you'll have something like this:

      + +$this->load->plugin('captcha');
      +$vals = array(
      +    'img_path' => './captcha/',
      +    'img_url' => 'http://example.com/captcha/'
      +    );
      +
      +$cap = create_captcha($vals);
      +
      +$data = array(
      +    'captcha_time' => $cap['time'],
      +    'ip_address' => $this->input->ip_address(),
      +    'word' => $cap['word']
      +    );
      +
      +$query = $this->db->insert_string('captcha', $data);
      +$this->db->query($query);
      +
      +echo 'Submit the word you see below:';
      +echo $cap['image'];
      +echo '<input type="text" name="captcha" value="" />';       + +

      Then, on the page that accepts the submission you'll have something like this:

      + +// First, delete old captchas
      +$expiration = time()-7200; // Two hour limit
      +$this->db->query("DELETE FROM captcha WHERE captcha_time < ".$expiration);
      +
      +// Then see if a captcha exists:
      +$sql = "SELECT COUNT(*) AS count FROM captcha WHERE word = ? AND ip_address = ? AND date > ?";
      +$binds = array($_POST['captcha'], $this->input->ip_address(), $expiration);
      +$query = $this->db->query($sql, $binds);
      +$row = $query->row();
      +
      +if ($row->count == 0)
      +{
      +    echo "You must submit the word that appears in the image";
      +}       + +
      + + + + + + + \ No newline at end of file From 1c73f4e9a1b8d33e7eeda622b9ae44b9b2f41251 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 11:27:41 -0600 Subject: [PATCH 1857/2544] fixed eof code comment --- system/helpers/captcha_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php index a5878921..67db5094 100644 --- a/system/helpers/captcha_helper.php +++ b/system/helpers/captcha_helper.php @@ -242,5 +242,5 @@ function create_captcha($data = '', $img_path = '', $img_url = '', $font_path = // ------------------------------------------------------------------------ -/* End of file captcha_pi.php */ -/* Location: ./system/plugins/captcha_pi.php */ \ No newline at end of file +/* End of file captcha_helper.php */ +/* Location: ./system/heleprs/captcha_helper.php */ \ No newline at end of file From bb76839b9a2679475399420eaaf56ca7a2e49d39 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 11:32:53 -0600 Subject: [PATCH 1858/2544] killing scaffolding trigger --- system/application/config/routes.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/system/application/config/routes.php b/system/application/config/routes.php index c2f1e99d..4d9f340a 100644 --- a/system/application/config/routes.php +++ b/system/application/config/routes.php @@ -23,25 +23,16 @@ | RESERVED ROUTES | ------------------------------------------------------------------------- | -| There are two reserved routes: +| There is one reserved routes: | | $route['default_controller'] = 'welcome'; | | This route indicates which controller class should be loaded if the | URI contains no data. In the above example, the "welcome" class | would be loaded. -| -| $route['scaffolding_trigger'] = 'scaffolding'; -| -| This route lets you set 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. The reserved -| routes must come before any wildcard or regular expression routes. -| */ $route['default_controller'] = "welcome"; -$route['scaffolding_trigger'] = ""; /* End of file routes.php */ From e659fbbffd63d019b1a3753a8e3b3dd74e1cb225 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 11:34:09 -0600 Subject: [PATCH 1859/2544] moving js cal plugin to a helper --- .../js_calendar_pi.php => helpers/js_calendar_helper.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename system/{plugins/js_calendar_pi.php => helpers/js_calendar_helper.php} (100%) diff --git a/system/plugins/js_calendar_pi.php b/system/helpers/js_calendar_helper.php similarity index 100% rename from system/plugins/js_calendar_pi.php rename to system/helpers/js_calendar_helper.php From b6de7d13eb06d7736d255eaa0b60391a4d2b4bf5 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 11:34:34 -0600 Subject: [PATCH 1860/2544] REMOVING js calendar helper / plugin. No need with the prolific jQuery calendars --- system/helpers/js_calendar_helper.php | 629 -------------------------- 1 file changed, 629 deletions(-) delete mode 100644 system/helpers/js_calendar_helper.php diff --git a/system/helpers/js_calendar_helper.php b/system/helpers/js_calendar_helper.php deleted file mode 100644 index f722777b..00000000 --- a/system/helpers/js_calendar_helper.php +++ /dev/null @@ -1,629 +0,0 @@ -load->plugin('js_calendar'); - -Once loaded you'll add the calendar script to the of your page like this: - - - -The above function will be passed the name of your form. - -Then to show the actual calendar you'll do this: - - -
      - -

      Today

      -
      - - -Note: The first parameter is the name of the field containing your date, the second parameter contains the "now" time, -and the third tells the calendar whether to highlight the current day or not. - -Lastly, you'll need some CSS for your calendar: - -.calendar { - border: 1px #6975A3 solid; - background-color: transparent; -} -.calheading { - background-color: #7C8BC0; - color: #fff; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - font-weight: bold; - text-align: center; -} -.calnavleft { - background-color: #7C8BC0; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 10px; - font-weight: bold; - color: #fff; - padding: 4px; - cursor: pointer; -} -.calnavright { - background-color: #7C8BC0; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 10px; - font-weight: bold; - color: #fff; - text-align: right; - padding: 4px; - cursor: pointer; -} -.caldayheading { - background-color: #000; - color: #fff; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 10px; - text-align: center; - padding: 6px 2px 6px 2px; -} -.caldaycells{ - color: #000; - background-color: #D1D7E6; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - text-align: center; - padding: 4px; - border: 1px #E0E5F1 solid; - cursor: pointer; -} -.caldaycellhover{ - color: #fff; - background-color: #B3BCD4; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - text-align: center; - padding: 4px; - border: 1px #B3BCD4 solid; - cursor: pointer; -} -.caldayselected{ - background-color: #737FAC; - color: #fff; - font-family: Lucida Grande, Verdana, Geneva, Sans-serif; - font-size: 11px; - font-weight: bold; - text-align: center; - border: 1px #566188 solid; - padding: 3px; - cursor: pointer; -} -.calblanktop { - background-color: #fff; - padding: 4px; -} -.calblankbot { - background-color: #fff; - padding: 4px; -} - - -*/ - -function js_calendar_script($form_name = 'entryform') -{ -$CI =& get_instance(); -$CI->load->language('calendar'); -ob_start(); -?> - - - var '.$field_id.' = new calendar("'.$field_id.'", '.$time.', '.(($highlight == TRUE) ? 'true' : 'false').'); - document.write('.$field_id.'.write()); - '; -} - - -/* End of file js_calendar_pi.php */ -/* Location: ./system/plugins/js_calendar_pi.php */ \ No newline at end of file From 8917af710a7698ce64b6004d9157ad2bb0d93652 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 12:41:45 -0600 Subject: [PATCH 1861/2544] changing docs refs to future release 2.0.0 --- user_guide/changelog.html | 21 ++++++++++--------- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/forge.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/doc_style/index.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/common_functions.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/plugins.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/reserved_names.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/scaffolding.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/styleguide.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/captcha_helper.html | 2 +- user_guide/helpers/compatibility_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/email_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/language_helper.html | 2 +- user_guide/helpers/number_helper.html | 2 +- user_guide/helpers/path_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_153.html | 2 +- user_guide/installation/upgrade_154.html | 2 +- user_guide/installation/upgrade_160.html | 2 +- user_guide/installation/upgrade_161.html | 2 +- user_guide/installation/upgrade_162.html | 2 +- user_guide/installation/upgrade_163.html | 2 +- user_guide/installation/upgrade_170.html | 2 +- user_guide/installation/upgrade_171.html | 2 +- user_guide/installation/upgrade_172.html | 2 +- .../{upgrade_173.html => upgrade_200.html} | 10 ++++----- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/cart.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/form_validation.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/typography.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/cheatsheets.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/getting_started.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 126 files changed, 140 insertions(+), 139 deletions(-) rename user_guide/installation/{upgrade_173.html => upgrade_200.html} (94%) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9b62dc89..a136234e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      @@ -57,9 +57,9 @@

      Change Log

      -

      Version 1.7.3

      +

      Version 2.0.0

      Release Date: not yet released
      -SVN Revision:

      +Hg Tag:

      • Libraries @@ -107,7 +107,7 @@

        Version 1.7.3

      -

      Bug fixes for 1.7.3

      +

      Bug fixes for 2.0.0

      • Fixed assorted user guide typos or examples (#10693, #8951, #7825, #8660, #7883, #6771, #10656).
      • Fixed a language key in the profiler: "profiler_no_memory_usage" to "profiler_no_memory".
        • @@ -126,7 +126,7 @@

        Bug fixes for 1.7.3

        Version 1.7.2

        Release Date: September 11, 2009
        -SVN Revision: 1737

        +Hg Tag: v1.7.2

        • Libraries @@ -193,7 +193,7 @@

          Bug fixes for 1.7.2

          Version 1.7.1

          Release Date: February 10, 2009
          -SVN Revision: 1640

          +Hg Tag: 1.7.1

          • Libraries @@ -277,7 +277,7 @@

            Bug fixes for 1.7.1

            Version 1.7

            Release Date: October 23, 2008
            -SVN Revision: 1541

            +Hg Tag: 1.7.0

            • Libraries @@ -369,7 +369,8 @@

              Bug fixes for 1.7.0

              Version 1.6.3

              Release Date: June 26, 2008
              -SVN Revision: 1238

              +Hg Tag: v1.6.3

              +

              Version 1.6.3 is a security and maintenance release and is recommended for all users.

              • Database @@ -428,7 +429,7 @@

                Bug fixes for 1.6.3

                Version 1.6.2

                Release Date: May 13, 2008
                -SVN Revision: 1155

                +Hg Tag: 1.6.2

                • Active Record
                    @@ -531,7 +532,7 @@

                    Bugfixes for 1.6.2

                    Version 1.6.1

                    Release Date: February 12, 2008
                    - SVN Revision: 984

                    +Hg Tag: 1.6.1

                    • Active Record
                        diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 8a4d70b3..5703dcfe 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -27,7 +27,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index b550a890..8064d344 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 19c1dd48..7c01a770 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index dcced6cf..4ef76ed1 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 217a2357..bd910a41 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index d20b77d7..6b4b6390 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 5cc2441c..bbf2912e 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index d02046af..6ba3702c 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 0d38d8f6..d60f1619 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 46b299fe..868e00d2 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index f51ee07a..0fb05c88 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/results.html b/user_guide/database/results.html index f944a64c..784ea324 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 2bc75c25..837e04d2 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 94022f69..19edfb8e 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 7f74abb2..3d08182a 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 7021b9d2..e0dc9741 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index fc9653de..4879076e 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 30aa0a61..9e711a8c 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index ba87c771..8d7f5d8c 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 64dbab82..59edade3 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 696815e2..132287c6 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 3eda8c4a..b0cbc058 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 1f95173f..f67c0053 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index aaecbdc4..4311416e 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index d0597bce..410f9598 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index cf50319a..17e21003 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 80a06c8c..f1aa56e7 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index eb0d99ac..1cda08e6 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index aec9f121..71189dfb 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 195480ca..babed5f6 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 878934bc..91972686 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -27,7 +27,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 58ae22e7..b378ea95 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index f0c550b1..ec71278b 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 74ea0a7f..2b651756 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index fab9d6f1..c74a3c0b 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 0d697b38..c9946e7d 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 11ff4a2f..85e91af7 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html index 8597b6c1..b7217f27 100644 --- a/user_guide/general/scaffolding.html +++ b/user_guide/general/scaffolding.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 40ec5e28..593ffd58 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 2a5c440b..b523d5a1 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -34,7 +34,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 6a61c340..7dbd7fe5 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 3ad9699e..9c124d91 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index f0986402..ede12072 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index 297e47e2..f418823e 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/compatibility_helper.html b/user_guide/helpers/compatibility_helper.html index 15712eb4..d43e7746 100644 --- a/user_guide/helpers/compatibility_helper.html +++ b/user_guide/helpers/compatibility_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 7b1a171a..b73daf66 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 2ec17fb3..a5c46f3d 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 3b70799d..d0799c7c 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index 5c1c2670..b0e7da09 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index 01579f82..01d3faa3 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 358aa982..4c5b4927 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -27,7 +27,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 06967860..fa44f6b0 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index a6920ee1..b79b92b0 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index ba25e071..4ba6820a 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index e21a605a..4dede49c 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index 545c4b76..c2fc685b 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 232c1b6b..15118674 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -27,7 +27,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index e7320001..351a5047 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 5bc58a33..2e050b93 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index b799390c..71a8ef77 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 120b3803..c80300c8 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index 046da425..ae4ade11 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 1ccb8a71..dbc5969f 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -27,7 +27,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index 495b80b6..caf8239b 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/index.html b/user_guide/index.html index a234b19b..f6264fdb 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index ddf75f2c..f5f6b324 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index f960e285..08f37ac9 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index 08c5d9ff..e6ab9a98 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 2ac9ab26..ab09a7bc 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index b36f39de..b85d92d5 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 002f07c5..43fc1680 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 01a17624..52396dca 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index f12a9600..f3dec87f 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index e3f6d829..2d502717 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 886542d6..d400f98b 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 4ebc78c5..07ee9c21 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 7930638f..c8f1ad3e 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 52efd708..042dd9ba 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index c241160a..5e446866 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index 35da95b7..e817e245 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index 2a9d047a..fcfa0a06 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index 0e86d5c5..fd34ab08 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 54a7c559..9f39e21b 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index d3715e14..d3892cf8 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index 9b37bd12..32dab56d 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index f4f3c03f..fb035667 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        diff --git a/user_guide/installation/upgrade_173.html b/user_guide/installation/upgrade_200.html similarity index 94% rename from user_guide/installation/upgrade_173.html rename to user_guide/installation/upgrade_200.html index 6f306d19..bf57fe3c 100644 --- a/user_guide/installation/upgrade_173.html +++ b/user_guide/installation/upgrade_200.html @@ -3,7 +3,7 @@ -Upgrading from 1.7.2 to 1.7.3 : CodeIgniter User Guide +Upgrading from 1.7.2 to 2.0.0 : CodeIgniter User Guide @@ -28,7 +28,7 @@
                        - +

                        CodeIgniter User Guide Version 1.7.2

                        CodeIgniter User Guide Version 2.0.0
                        @@ -42,7 +42,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 14a4455c..41ff226a 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 30db0deb..d82c3223 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 187aade0..f6a96022 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index 2aec24be..698f438b 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index d911a427..54462c79 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 3b38b268..9fa68d79 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 3b2846ac..adcd7dc5 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 35ef1798..151b95cb 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 49c30ef3..ec1357e5 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -27,7 +27,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index c0c8e620..10acdcda 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 0baad8c4..2e92fdf7 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index dbc79257..59198a24 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index eb4835a1..9e50901a 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index cefe8ef0..bb1a9836 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 7be42b44..de22fbe2 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 187b331f..d6b260be 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 3dc26815..19ad6dec 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index c93c7614..059f6fbc 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index b233dbf8..c871d7cb 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -27,7 +27,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 9e54bbfb..30720601 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index bcb2e66c..9db565a1 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index bf86738f..ede938cd 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index af5994cb..ae420d78 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 98bd7b12..6de6b6e6 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 25ea91df..dc7915c6 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -27,7 +27,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index cd4ed1c5..9f163ae5 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 36b969b7..d8b3ea36 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/license.html b/user_guide/license.html index fc79c22f..354c08c4 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 8504ae85..4a1c8a38 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 1c7aae83..56f208a7 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index a34cf719..1232bd67 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 3f584cd9..fe0bbe99 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index b37d546b..3bcfdcc0 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index cdd93a35..f6fa103e 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 4dbe55c6..5b930a48 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 67bae89d..05e22d90 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      diff --git a/user_guide/toc.html b/user_guide/toc.html index 45911d18..70a3f29a 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -29,7 +29,7 @@
      - +

      CodeIgniter User Guide Version 1.7.2

      CodeIgniter User Guide Version 2.0.0
      From b8354c1e8c85399697af2d8ffd3584095594bba2 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 12:47:30 -0600 Subject: [PATCH 1862/2544] adding initial docs for javascript and jquery libs --- user_guide/libraries/javascript.html | 194 ++++++++++++++++++++++ user_guide/libraries/jquery.html | 236 +++++++++++++++++++++++++++ 2 files changed, 430 insertions(+) create mode 100644 user_guide/libraries/javascript.html create mode 100644 user_guide/libraries/jquery.html diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html new file mode 100644 index 00000000..2856fdbf --- /dev/null +++ b/user_guide/libraries/javascript.html @@ -0,0 +1,194 @@ + + + + +CodeIgniter User Guide : Input Class + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + +

      CodeIgniter User Guide Version 2.0.0

      +
      + + + + + + + + + +
      + + +
      + + + +
      + + +

      Javascript Class

      +

      Rewrite this paragraph: jQuery is a fast, concise, JavaScript Library that simplifies how you traverse HTML documents, handle events, perform animations, and add Ajax interactions to your web pages. CodeIgniter provides a library to help you with certain common functions that you may want to use within jQuery. Please note that CodeIgniter does not require the jQuery library to run, and that any scripting library will work equally well. The jQuery library is simply presented as a convenience if you choose to use it.

      +

      Initializing the Class

      +

      To initialize the jQuery class manually in your controller constructor, use the $this->load->library function. Currently, the only available library is jQuery, which will automatically be loaded like this:

      + +$this->load->library('javascript'); + +

      The Javascript class also accepts parameters, js_library_driver (string) default 'jquery' and autoload (bool) default TRUE. You may override the defaults if you wish by sending an associative array:

      + +$this->load->library('javascript', array('js_library_driver' => 'scripto', 'autoload' => FALSE)); + +

      Again, presently only 'jquery' is available. You may wish to set autoload to FALSE, though, if you do not want the jQuery library to automatically include a script tag for the main jQuery script file. This is useful if you are loading it from a location outside of CodeIgniter, or already have the script tag in your markup.

      + +

      Once loaded, the jQuery library object will be available using: $this->javascript

      +

      Setup and Configuration

      +

      Set these variables in your view

      +

      As a javascript library, your files must be available to your application. For your convenience, the needed files to run this library are available for download from our site.

      +

      As javascript is a client side language, the library must be able to write content into your final output. This generally means a view. You'll need to include the following variables in the <head> sections of your output.

      +

      <?php echo $library_src;?>
      +<?php echo $script_head;?> +

      +

      $library_src, is where the actual library file will be loaded, as well as any subsequent plugin script calls; $script_head is where specific events, functions and other commands will be rendered.

      +

      Set the path to the librarys with config items

      +

      There are some configuration items in javascript library. These can either be set in system/application/config.php, within its own confg/javascript.php file, or within any controller usings the set_item() function.

      +

      An image to be used as an "ajax loader", or progress indicator. Without one, the simple text message of "loading" will appear when Ajax calls need to be made.

      +

      $config['javascript_location'] = 'http://localhost/codeigniter/themes/js/jquery/');
      + $config['javascript_ajax_img'] = 'images/ajax-loader.gif';

      +

      If you keep your files in the same directories they were downloaded from, then you need not set this configuration items.

      +

      Events

      +

      Events are set using the following syntax.

      +

      $this->jquery->event('element_path', code_to_run());

      +

      In the above example:

      +
        +
      • "event" is any of blur, change, click, dblclick, error, focus, hover, keydown, keyup, load, mousedown, mouseup, mouseover, mouseup, resize, scroll, or unload.
        • +
      • "element_path" is any valid jQuery selector. Due to jQuery's unique selector syntax, this is usually an element id, or CSS selector. For example "#notice_area" would effect <div id="notice_area">, and "#content a.notice" would effect all anchors with a class of "notice" in the div with id "content".
        • +
      • "code_to_run()" is script your write yourself, or an action such as an effect from the jQuery library below.
        • +
      +

      Effects

      +

      The query library supports a powerful effects repertoire.

      +

      hide() / show()

      +

      Each of this functions will affect the visibility of an item on your page. hide() will set an item invisible, show() will reveal it.

      +

      $this->jquery->hide(target, optional speed, optional extra information);
      + $this->jquery->show(target, optional speed, optional extra information);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
        • +
      • "extra information" is optional, and could include a callback, or other additional information.
        • +
      +

      toggle()

      +

      toggle() will change the visibility of an item to the opposite of its current state, hiding visible elements, and revealing hidden ones.

      +

      $this->jquery->toggle(target);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      +

      animate()

      +

      $this->jquery->animate(target, parameters, optional speed, optional extra information);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "paramters" in jQuery would generally include a series of CSS properties that you wish to change.
        • +
      • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
        • +
      • "extra information" is optional, and could include a callback, or other additional information.
        • +
      +

      For a full summary, see http://docs.jquery.com/Effects/animate

      +

      Here is an example of an animate() called on a div with an id of "note", and triggered by a click using the jQuery library's click() event.

      +

      $params = array(
      + 'height' => 80,
      + 'width' => '50%',
      + 'marginLeft' => 125
      +);
      +$this->jquery->click('#trigger', $this->jquery->animate('#note', $params, normal));

      +

      fadeIn() / fadeOut()

      +

      $this->jquery->fadeIn(target, optional speed, optional extra information);
      + $this->jquery->fadeOut(target, optional speed, optional extra information);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
        • +
      • "extra information" is optional, and could include a callback, or other additional information.
        • +
      +

      toggleClass()

      +

      This function will add or remove a CSS class to its target.

      +

      $this->jquery->toggleClass(target, class)

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "class" is any CSS classname. Note that this class must be defined and available in a CSS that is already loaded.
        • +
      +

      fadeIn() / fadeOut()

      +

      These effects cause an element(s) to disappear or reappear over time.

      +

      $this->jquery->fadeIn(target, optional speed, optional extra information);
      + $this->jquery->fadeOut(target, optional speed, optional extra information);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
        • +
      • "extra information" is optional, and could include a callback, or other additional information.
        • +
      +

      slideUp() / slideDown() / slideToggle()

      +

      These effects cause an element(s) to slide.

      +

      $this->jquery->slideUp(target, optional speed, optional extra information);
      + $this->jquery->slideDown(target, optional speed, optional extra information);
      +$this->jquery->slideToggle(target, optional speed, optional extra information);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
        • +
      • "extra information" is optional, and could include a callback, or other additional information.
        • +
      +

      Plugins

      +

      Some select jQuery plugins are made available using this library.

      +

      corner()

      +

      Used to add distinct corners to page elements. For full details see http://www.malsup.com/jquery/corner/

      +

      $this->jquery->corner(target, corner_style);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "corner_style" is optional, and can be set to any valid style such as round, sharp, bevel, bite, dog, etc. Individual corners can be set by following the style with a space and using "tl" (top left), "tr" (top right), "bl" (bottom left), or "br" (bottom right).
        • +
      +

      $this->jquery->corner("#note", "cool tl br");

      +

      tablesorter()

      +

      description to come

      +

      modal()

      +

      description to come

      +

      calendar()

      +

      description to come

      +
      + + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/jquery.html b/user_guide/libraries/jquery.html new file mode 100644 index 00000000..98c9a9cb --- /dev/null +++ b/user_guide/libraries/jquery.html @@ -0,0 +1,236 @@ + + + + +CodeIgniter User Guide : Input Class + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + +

      CodeIgniter User Guide Version 2.0.0

      +
      + + + + + + + + + +
      + + +
      + + + +
      + + +

      jQuery Class

      + +

      jQuery is a fast, concise, JavaScript Library that simplifies how you traverse HTML documents, handle events, perform animations, and add Ajax interactions to your web pages. CodeIgniter provides a library to help you with certain common functions that you may want to use within jQuery. Please note that CodeIgniter does not require the jQuery library to run, and that any scripting library will work equally well. The jQuery library is simply presented as a convenience if you choose to use it.

      + +

      Initializing the Class

      + +

      To initialize the jQuery class manually in your controller constructor, use the $this->load->library function:

      + +$this->load->library('jquery'); + +

      You may send an optional parameter to determine whether or not a script tag for the main jQuery file will be automatically included when loading the library. It will be created by default. To prevent this, load the library as follows:

      + +$this->load->library('jquery', FALSE); + +

      Once loaded, the jQuery library object will be available using: $this->jquery

      + +

      Setup and Configuration

      + +

      As a javascript library, jquery.js must be available to your application. For your convenience, the needed files to run this library are available for download from our site.

      + +

      As javascript is a client side language, the library must be able to write content into your final output. This generally means a view. You'll need to include the following variables in the <head> sections of your output.

      + +

      <?php echo $jquery_script;?>
      +<?php echo $script_head;?>

      + +

      There are 2 configuration items in jQuery library. These can either be set in system/application/config.php, or within any controller. The first is the path from the root of your site to the jquery library ('js' is the default) and the second is an image to be used as an "ajax loader", or progress indicator. Without one, the simple text message of "loading" will appear when Ajax calls need to be made.

      + +

      $config['javascript_folder'] = 'js';
      + $config['javascript_ajax_img'] = 'images/ajax-loader.gif';

      + +

      If you keep your files in the same directories they were downloaded from, then you needed set this configuration items.

      + +

      Events

      + +

      Events are set using the following syntax.

      + +

      $this->jquery->event('element_path', code_to_run());

      + +

      In the above example:

      + +
        +
      • "event" is any of blur, change, click, dblclick, error, focus, hover, keydown, keyup, load, mousedown, mouseup, mouseover, mouseup, resize, scroll, or unload.
        • +
      • "element_path" is any valid jQuery selector. Due to jQuery's unique selector syntax, this is usually an element id, or CSS selector. For example "#notice_area" would effect <div id="notice_area">, and "#content a.notice" would effect all anchors with a class of "notice" in the div with id "content".
        • +
      • "code_to_run()" is script your write yourself, or an action such as an effect from the jQuery library below.
        • +
      + +

      Effects

      + +

      The query library supports a powerful Effects repertoire. Before an effect can be used, it must be loaded:

      + +

      $this->jquery->effect([optional path] plugin name); +// for example +$this->jquery->effect('bounce'); +

      + +

      hide() / show()

      + +

      Each of this functions will affect the visibility of an item on your page. hide() will set an item invisible, show() will reveal it.

      +

      $this->jquery->hide(target, optional speed, optional extra information);
      + $this->jquery->show(target, optional speed, optional extra information);

      + +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
        • +
      • "extra information" is optional, and could include a callback, or other additional information.
        • +
      + +

      toggle()

      + +

      toggle() will change the visibility of an item to the opposite of its current state, hiding visible elements, and revealing hidden ones.

      +

      $this->jquery->toggle(target);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      + +

      animate()

      + +

      $this->jquery->animate(target, parameters, optional speed, optional extra information);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "paramters" in jQuery would generally include a series of CSS properties that you wish to change.
        • +
      • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
        • +
      • "extra information" is optional, and could include a callback, or other additional information.
        • +
      +

      For a full summary, see http://docs.jquery.com/Effects/animate

      +

      Here is an example of an animate() called on a div with an id of "note", and triggered by a click using the jQuery library's click() event.

      +

      $params = array(
      + 'height' => 80,
      + 'width' => '50%',
      + 'marginLeft' => 125
      +);
      +$this->jquery->click('#trigger', $this->jquery->animate('#note', $params, normal));

      + +

      fadeIn() / fadeOut()

      + +

      $this->jquery->fadeIn(target, optional speed, optional extra information);
      + $this->jquery->fadeOut(target, optional speed, optional extra information);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
        • +
      • "extra information" is optional, and could include a callback, or other additional information.
        • +
      + +

      toggleClass()

      + +

      This function will add or remove a CSS class to its target.

      +

      $this->jquery->toggleClass(target, class)

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "class" is any CSS classname. Note that this class must be defined and available in a CSS that is already loaded.
        • +
      + +

      fadeIn() / fadeOut()

      + +

      These effects cause an element(s) to disappear or reappear over time.

      +

      $this->jquery->fadeIn(target, optional speed, optional extra information);
      + $this->jquery->fadeOut(target, optional speed, optional extra information);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
        • +
      • "extra information" is optional, and could include a callback, or other additional information.
        • +
      + +

      slideUp() / slideDown() / slideToggle()

      + +

      These effects cause an element(s) to slide.

      +

      $this->jquery->slideUp(target, optional speed, optional extra information);
      + $this->jquery->slideDown(target, optional speed, optional extra information);
      +$this->jquery->slideToggle(target, optional speed, optional extra information);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
        • +
      • "extra information" is optional, and could include a callback, or other additional information.
        • +
      + +

      Plugins

      + +

      + +

      Some select jQuery plugins are made available using this library.

      + +

      corner()

      +

      Used to add distinct corners to page elements. For full details see http://www.malsup.com/jquery/corner/

      +

      $this->jquery->corner(target, corner_style);

      +
        +
      • "target" will be any valid jQuery selector or selectors.
        • +
      • "corner_style" is optional, and can be set to any valid style such as round, sharp, bevel, bite, dog, etc. Individual corners can be set by following the style with a space and using "tl" (top left), "tr" (top right), "bl" (bottom left), or "br" (bottom right).
        • +
      +

      $this->jquery->corner("#note", "cool tl br");

      + +

      tablesorter()

      + +

      description to come

      + +

      modal()

      + +

      description to come

      + +

      calendar()

      + +

      description to come

      + +
      + + + + + + + \ No newline at end of file From 8dca04163a79701021043fcd3e267a5d965af993 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 5 Mar 2010 13:01:44 -0600 Subject: [PATCH 1863/2544] added Driver lib --- system/core/Loader.php | 23 ++++ system/libraries/Driver.php | 232 ++++++++++++++++++++++++++++++++++++ 2 files changed, 255 insertions(+) create mode 100644 system/libraries/Driver.php diff --git a/system/core/Loader.php b/system/core/Loader.php index f70ee033..c399f296 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -543,6 +543,29 @@ function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) // -------------------------------------------------------------------- + /** + * Driver + * + * Loads a driver library + * + * @param string the name of the class + * @param mixed the optional parameters + * @param string an optional object name + * @return void + */ + function driver($library = '', $params = NULL, $object_name = NULL) + { + if ( ! class_exists('CI_Driver_Library')) + { + // we aren't instantiating an object here, that'll be done by the Library itself + require_once BASEPATH.'libraries/Driver'.EXT; + } + + return $this->library($library, $params, $object_name); + } + + // -------------------------------------------------------------------- + /** * Add Package Path * diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php new file mode 100644 index 00000000..07ef2e72 --- /dev/null +++ b/system/libraries/Driver.php @@ -0,0 +1,232 @@ +lib_name)) + { + $this->lib_name = get_class($this); + } + + // The class will be prefixed with the parent lib + $child_class = $this->lib_name.'_'.$child; + + if (in_array(strtolower($child_class), array_map('strtolower', $this->valid_drivers))) + { + // check and see if the driver is in a separate file + if ( ! class_exists($child_class)) + { + // check application path first + foreach (array(APPPATH, BASEPATH) as $path) + { + // and check for case sensitivity of both the parent and child libs + foreach (array(ucfirst($this->lib_name), strtolower($this->lib_name)) as $lib) + { + // loves me some nesting! + foreach (array(ucfirst($child_class), strtolower($child_class)) as $class) + { + $filepath = $path.'libraries/'.$this->lib_name.'/drivers/'.$child_class.EXT; + + if (file_exists($filepath)) + { + include_once $filepath; + break; + } + } + } + } + + // it's a valid driver, but the file simply can't be found + if ( ! class_exists($child_class)) + { + log_message('error', "Unable to load the requested driver: ".$child_class); + show_error("Unable to load the requested driver: ".$child_class); + } + } + + $obj = new $child_class; + $obj->decorate($this); + $this->$child = $obj; + return $this->$child; + } + + // The requested driver isn't valid! + log_message('error', "Invalid driver requested: ".$child_class); + show_error("Invalid driver requested: ".$child_class); + } + + // -------------------------------------------------------------------- + +} +// END CI_Driver_Library CLASS + + +/** + * CodeIgniter Driver Class + * + * This class enables you to create drivers for a Library based on the Driver Library. + * It handles the drivers' access to the parent library + * + * @package CodeIgniter + * @subpackage Libraries + * @category Libraries + * @author EllisLab Dev Team + * @link + */ +class CI_Driver { + protected $parent; + + private $methods = array(); + private $properties = array(); + + private static $reflections = array(); + + /** + * Decorate + * + * Decorates the child with the parent driver lib's methods and properties + * + * @access public + * @param object + * @return void + */ + function decorate($parent) + { + $this->parent = $parent; + + // Lock down attributes to what is defined in the class + // and speed up references in magic methods + + $class_name = get_class($parent); + + if ( ! isset(self::$reflections[$class_name])) + { + $r = new ReflectionObject($parent); + + foreach ($r->getMethods() as $method) + { + if ($method->isPublic()) + { + $this->methods[] = $method->getName(); + } + } + + foreach($r->getProperties() as $prop) + { + if ($prop->isPublic()) + { + $this->properties[] = $prop->getName(); + } + } + + self::$reflections[$class_name] = array($this->methods, $this->properties); + } + else + { + list($this->methods, $this->properties) = self::$reflections[$class_name]; + } + } + + // -------------------------------------------------------------------- + + /** + * __call magic method + * + * Handles access to the parent driver library's methods + * + * @access public + * @param string + * @param array + * @return mixed + */ + public function __call($method, $args = array()) + { + if (in_array($method, $this->methods)) + { + return call_user_func_array(array($this->parent, $method), $args); + } + + $trace = debug_backtrace(); + _exception_handler(E_ERROR, "No such method '{$method}'", $trace[1]['file'], $trace[1]['line']); + exit; + } + + // -------------------------------------------------------------------- + + /** + * __get magic method + * + * Handles reading of the parent driver library's properties + * + * @access public + * @param string + * @return mixed + */ + function __get($var) + { + if (in_array($var, $this->properties)) + { + return $this->parent->$var; + } + } + + // -------------------------------------------------------------------- + + /** + * __set magic method + * + * Handles writing to the parent driver library's properties + * + * @access public + * @param string + * @param array + * @return mixed + */ + function __set($var, $val) + { + if (in_array($var, $this->properties)) + { + $this->parent->$var = $val; + } + } + + // -------------------------------------------------------------------- + +} +// END CI_Driver CLASS + +/* End of file Driver.php */ +/* Location: ./system/libraries/Driver.php */ \ No newline at end of file From c64ca0128ab0cc015ed37d1833bd79ee63e35eba Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sun, 7 Mar 2010 07:55:56 -0600 Subject: [PATCH 1864/2544] fixed load_class() call in Hooks to get Config from core --- system/core/Hooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/core/Hooks.php b/system/core/Hooks.php index 5e017ccb..3b063f79 100644 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php @@ -52,7 +52,7 @@ function CI_Hooks() */ function _initialize() { - $CFG =& load_class('Config'); + $CFG =& load_class('Config', 'core'); // If hooks are not enabled in the config file // there is nothing else to do From d5e0cb5fe94fb7a89cc12842511481a3c3d37d8e Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 9 Mar 2010 20:20:46 -0600 Subject: [PATCH 1865/2544] sped up Driver loading slightly by predicting subfolder location --- system/core/Loader.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/core/Loader.php b/system/core/Loader.php index c399f296..1726f0a5 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -558,7 +558,14 @@ function driver($library = '', $params = NULL, $object_name = NULL) if ( ! class_exists('CI_Driver_Library')) { // we aren't instantiating an object here, that'll be done by the Library itself - require_once BASEPATH.'libraries/Driver'.EXT; + require BASEPATH.'libraries/Driver'.EXT; + } + + // We can save the loader some time since Drivers will *always* be in a subfolder, + // and typically identically named to the library + if ( ! strpos($library, '/')) + { + $library = $library.'/'.$library; } return $this->library($library, $params, $object_name); From a9730c337ef046f1c5391cec2a9e54ac613a4e6d Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 9 Mar 2010 20:38:13 -0600 Subject: [PATCH 1866/2544] changed SVN location change to BitBucket --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a136234e..20cb9b75 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -94,7 +94,7 @@

      Version 2.0.0

    • Other Changes
        -
      • The SVN repository for CodeIgniter has moved to http://svn.ellislab.com/CodeIgniter/trunk.
        • +
      • In-development code is now hosted at BitBucket
      • Increased randomness with is_really_writable() to avoid file collisions when hundreds or thousands of requests occur at once.
      • Switched some DIR_WRITE_MODE constant uses to FILE_WRITE_MODE where files and not directories are being operated on.
      • get_mime_by_extension() is now case insensitive.
        • From c6da50384e06c60e242cb4442abb9c6c9b450674 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 9 Mar 2010 20:44:27 -0600 Subject: [PATCH 1867/2544] completely removed Plugins from CodeIgniter --- system/application/config/autoload.php | 19 +--- system/core/Loader.php | 67 +----------- system/plugins/index.html | 10 -- user_guide/changelog.html | 8 +- user_guide/general/autoloader.html | 3 +- user_guide/general/helpers.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/plugins.html | 127 ----------------------- user_guide/general/reserved_names.html | 4 +- user_guide/helpers/captcha_helper.html | 4 +- user_guide/installation/upgrade_200.html | 25 +++-- user_guide/libraries/loader.html | 5 +- user_guide/nav/nav.js | 1 - user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/toc.html | 5 +- 17 files changed, 41 insertions(+), 247 deletions(-) delete mode 100644 system/plugins/index.html delete mode 100644 user_guide/general/plugins.html diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php index 1745d5ca..e7c6f0db 100644 --- a/system/application/config/autoload.php +++ b/system/application/config/autoload.php @@ -20,10 +20,9 @@ | | 1. Libraries | 2. Helper files -| 3. Plugins -| 4. Custom config files -| 5. Language files -| 6. Models +| 3. Custom config files +| 4. Language files +| 5. Models | */ @@ -54,18 +53,6 @@ $autoload['helper'] = array(); -/* -| ------------------------------------------------------------------- -| Auto-load Plugins -| ------------------------------------------------------------------- -| Prototype: -| -| $autoload['plugin'] = array('captcha', 'js_calendar'); -*/ - -$autoload['plugin'] = array(); - - /* | ------------------------------------------------------------------- | Auto-load Config files diff --git a/system/core/Loader.php b/system/core/Loader.php index 1726f0a5..976823f8 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -41,7 +41,6 @@ class CI_Loader { var $_ci_loaded_files = array(); var $_ci_models = array(); var $_ci_helpers = array(); - var $_ci_plugins = array(); var $_ci_varmap = array('unit_test' => 'unit', 'user_agent' => 'agent'); @@ -445,64 +444,6 @@ function helpers($helpers = array()) // -------------------------------------------------------------------- - /** - * Load Plugin - * - * This function loads the specified plugin. - * - * @access public - * @param array - * @return void - */ - function plugin($plugins = array()) - { - foreach ($this->_ci_prep_filename($plugins, '_pi') as $plugin) - { - if (isset($this->_ci_plugins[$plugin])) - { - continue; - } - - if (file_exists(APPPATH.'plugins/'.$plugin.EXT)) - { - include_once(APPPATH.'plugins/'.$plugin.EXT); - } - else - { - if (file_exists(BASEPATH.'plugins/'.$plugin.EXT)) - { - include_once(BASEPATH.'plugins/'.$plugin.EXT); - } - else - { - show_error('Unable to load the requested file: plugins/'.$plugin.EXT); - } - } - - $this->_ci_plugins[$plugin] = TRUE; - log_message('debug', 'Plugin loaded: '.$plugin); - } - } - - // -------------------------------------------------------------------- - - /** - * Load Plugins - * - * This is simply an alias to the above function in case the - * user has written the plural form of this function. - * - * @access public - * @param array - * @return void - */ - function plugins($plugins = array()) - { - $this->plugin($plugins); - } - - // -------------------------------------------------------------------- - /** * Loads a language file * @@ -987,7 +928,7 @@ function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NU * Autoloader * * The config/autoload.php file contains an array that permits sub-systems, - * libraries, plugins, and helpers to be loaded automatically. + * libraries, and helpers to be loaded automatically. * * @access private * @param array @@ -1012,8 +953,8 @@ function _ci_autoloader() } } - // Autoload plugins, helpers and languages - foreach (array('helper', 'plugin', 'language') as $type) + // Autoload helpers and languages + foreach (array('helper', 'language') as $type) { if (isset($autoload[$type]) AND count($autoload[$type]) > 0) { @@ -1058,7 +999,7 @@ function _ci_autoloader() /** * Assign to Models * - * Makes sure that anything loaded by the loader class (libraries, plugins, etc.) + * Makes sure that anything loaded by the loader class (libraries, etc.) * will be available to models, if any exist. * * @access private diff --git a/system/plugins/index.html b/system/plugins/index.html deleted file mode 100644 index c942a79c..00000000 --- a/system/plugins/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

        Directory access is forbidden.

        - - - \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 20cb9b75..4f8c86ff 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -62,6 +62,13 @@

        Version 2.0.0

        Hg Tag:

          +
        • General changes +
            +
          • PHP 4 support is deprecated. Features new to 2.0.0 may not be support PHP 4, and all legacy features will no longer support PHP 4 as of 2.1.0.
            • +
          • Scaffolding, having been deprecated for a number of versions, has been removed.
            • +
          • Plugins have been removed, in favor of Helpers. The CAPTCHA plugin has been converted to a Helper and documented. The JavaScript calendar plugin was removed due to the ready availability of great JavaScript calendars, particularly with jQuery.
            • +
          • In-development code is now hosted at BitBucket.
            • +
        • Libraries
          • Added "is_object" into the list of unit tests capable of being run.
            • @@ -94,7 +101,6 @@

            Version 2.0.0

          • Other Changes
              -
            • In-development code is now hosted at BitBucket
            • Increased randomness with is_really_writable() to avoid file collisions when hundreds or thousands of requests occur at once.
            • Switched some DIR_WRITE_MODE constant uses to FILE_WRITE_MODE where files and not directories are being operated on.
            • get_mime_by_extension() is now case insensitive.
              • diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 8d7f5d8c..d697c8a9 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -57,7 +57,7 @@

              Auto-loading Resources

              -

              CodeIgniter comes with an "Auto-load" feature that permits libraries, helpers, and plugins to be initialized +

              CodeIgniter comes with an "Auto-load" feature that permits libraries, helpers, and models to be initialized automatically every time the system runs. If you need certain resources globally throughout your application you should consider auto-loading them for convenience.

              @@ -66,7 +66,6 @@

              Auto-loading Resources

              • Core classes found in the "libraries" folder
              • Helper files found in the "helpers" folder
                • -
              • Plugins found in the "plugins" folder
              • Custom config files found in the "config" folder
              • Language files found in the "system/language" folder
              • Models found in the "models" folder
                • diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index f1aa56e7..ef24e8c9 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -176,7 +176,7 @@

                Now What?

                   ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  Plugins +Next Topic:  Using Libraries

                CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      • diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 71189dfb..2634b18a 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -81,7 +81,7 @@

      Creating Your Own Libraries

      diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html new file mode 100644 index 00000000..649b6d4d --- /dev/null +++ b/user_guide/general/drivers.html @@ -0,0 +1,104 @@ + + + + + +Using CodeIgniter Drivers : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
      + + + + + +

      CodeIgniter User Guide Version 2.0.0

      +
      + + + + + + + + + +
      + + +
      + + + +
      + +

      Using CodeIgniter Drivers

      + + +

      Drivers are a special type of Library that has a parent class and any number of potential child classes. Child classes have access to the parent class, but not their siblings. Drivers provide an elegant syntax in your controllers for libraries that benefit from or require being broken down into discrete classes.

      + +

      Drivers are found in the system/libraries folder, in their own folder which is identically named to the parent library class. Also inside that folder is a subfolder named drivers, which contains all of the possible child class files.

      + +

      To use a driver you will initialize it within a controller using the following initialization function:

      + +$this->load->driver('class name'); + +

      Where class name is the name of the driver class you want to invoke. For example, to load a driver named "Some Parent" you would do this:

      + +$this->load->driver('some_parent'); + +

      Methods of that class can then be invoked with:

      + +$this->some_parent->some_method(); + +

      The child classes, the drivers themselves, can then be called directly through the parent class, without initializing them:

      + +$this->some_parent->child_one->some_method();
      +$this->some_parent->child_two->another_method();       + +

      Creating Your Own Drivers

      + +

      Please read the section of the user guide that discusses how to create your own drivers.

      + + + +
      + + + + + + + \ No newline at end of file From cc64e97e502ce60491811b27e50b768f2517ba9b Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 9 Mar 2010 21:22:25 -0600 Subject: [PATCH 1869/2544] change log note for Drivers --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4f8c86ff..b196acf4 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -67,6 +67,7 @@

      Version 2.0.0

    • PHP 4 support is deprecated. Features new to 2.0.0 may not be support PHP 4, and all legacy features will no longer support PHP 4 as of 2.1.0.
    • Scaffolding, having been deprecated for a number of versions, has been removed.
    • Plugins have been removed, in favor of Helpers. The CAPTCHA plugin has been converted to a Helper and documented. The JavaScript calendar plugin was removed due to the ready availability of great JavaScript calendars, particularly with jQuery.
      • +
    • Added new special Library type: Drivers.
    • In-development code is now hosted at BitBucket.
    • Libraries From ee71c80dd20bcfc60169af3eb1f628229ca30d67 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 10:05:05 -0600 Subject: [PATCH 1870/2544] added ability to enable/disable individual sections of the Profiler --- system/application/config/profiler.php | 17 +++++ system/core/Output.php | 28 ++++++- system/language/english/profiler_lang.php | 1 + system/libraries/Profiler.php | 74 ++++++++++++++++--- user_guide/changelog.html | 1 + user_guide/general/profiling.html | 90 ++++++++++++++++++++--- user_guide/libraries/output.html | 3 + 7 files changed, 193 insertions(+), 21 deletions(-) create mode 100644 system/application/config/profiler.php diff --git a/system/application/config/profiler.php b/system/application/config/profiler.php new file mode 100644 index 00000000..f30432d9 --- /dev/null +++ b/system/application/config/profiler.php @@ -0,0 +1,17 @@ +enable_profiler = (is_bool($val)) ? $val : TRUE; } + // -------------------------------------------------------------------- + + /** + * Set Profiler Sections + * + * Allows override of default / config settings for Profiler section display + * + * @access public + * @param array + * @return void + */ + function set_profiler_sections($sections) + { + foreach ($sections as $section => $enable) + { + $this->_profiler_sections[$section] = ($enable !== FALSE) ? TRUE : FALSE; + } + } + // -------------------------------------------------------------------- /** @@ -258,7 +279,12 @@ function _display($output = '') if ($this->enable_profiler == TRUE) { $CI->load->library('profiler'); - + + if ( ! empty($this->_profiler_sections)) + { + $CI->profiler->set_sections($this->_profiler_sections); + } + // If the output data contains closing and tags // we will remove them and add them back after we insert the profile data if (preg_match("|.*?|is", $output)) diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php index bf218300..7876331f 100644 --- a/system/language/english/profiler_lang.php +++ b/system/language/english/profiler_lang.php @@ -16,6 +16,7 @@ $lang['profiler_no_get'] = 'No GET data exists'; $lang['profiler_no_uri'] = 'No URI data exists'; $lang['profiler_no_memory'] = 'Memory Usage Unavailable'; +$lang['profiler_no_profiles'] = 'No Profile data - all Profiler sections have been disabled.'; /* End of file profiler_lang.php */ /* Location: ./system/language/english/profiler_lang.php */ \ No newline at end of file diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index bf20f172..b2c008fc 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -34,14 +34,59 @@ class CI_Profiler { var $CI; - function CI_Profiler() + var $_available_sections = array( + 'benchmarks', + 'config', + 'controller_info', + 'get', + 'http_headers', + 'memory_usage', + 'post', + 'queries', + 'uri_string' + ); + + function CI_Profiler($config = array()) { $this->CI =& get_instance(); $this->CI->load->language('profiler'); + + // default all sections to display + foreach ($this->_available_sections as $section) + { + if ( ! isset($config[$section])) + { + $this->_compile_{$section} = TRUE; + } + } + + $this->set_sections($config); } // -------------------------------------------------------------------- + /** + * Set Sections + * + * Sets the private _compile_* properties to enable/disable Profiler sections + * + * @access public + * @param mixed + * @return void + */ + function set_sections($config) + { + foreach ($config as $method => $enable) + { + if (in_array($method, $this->_available_sections)) + { + $this->_compile_{$method} = ($enable !== FALSE) ? TRUE : FALSE; + } + } + } + + // -------------------------------------------------------------------- + /** * Auto Profiler * @@ -49,7 +94,7 @@ function CI_Profiler() * matches any two points that are named identically (ending in "_start" * and "_end" respectively). It then compiles the execution times for * all points and returns it as an array - * + * @PHP4 - all methods should be declared private * @access private * @return array */ @@ -438,16 +483,23 @@ function _compile_config() function run() { $output = "
      "; + $fields_displayed = 0; + + foreach ($this->_available_sections as $section) + { + if ($this->_compile_{$section} !== FALSE) + { + $func = "_compile_{$section}"; + $output .= $this->{$func}(); + $fields_displayed++; + } + } - $output .= $this->_compile_uri_string(); - $output .= $this->_compile_controller_info(); - $output .= $this->_compile_memory_usage(); - $output .= $this->_compile_benchmarks(); - $output .= $this->_compile_get(); - $output .= $this->_compile_post(); - $output .= $this->_compile_queries(); - $output .= $this->_compile_config(); - $output .= $this->_compile_http_headers(); + if ($fields_displayed == 0) + { + $output .= '

      '.$this->CI->lang->line('profiler_no_profiles').'

      '; + } + $output .= '
      '; return $output; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b196acf4..ac421286 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -72,6 +72,7 @@

      Version 2.0.0

    • Libraries
        +
      • Added ability to enable / disable individual sections of the Profiler
      • Added "is_object" into the list of unit tests capable of being run.
      • Table library will generate an empty cell with a blank string, or NULL value.
      • Added a parse_string() method to the Parser Class.
        • diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index ec71278b..8622edeb 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -69,20 +69,92 @@

        Initializing the Class

        Enabling the Profiler

        -

        To enable the profiler place the following function anywhere within your Controller functions:

        -$this->output->enable_profiler(TRUE); +

        To enable the profiler place the following function anywhere within your Controller functions:

        + $this->output->enable_profiler(TRUE); -

        When enabled a report will be generated and inserted at the bottom of your pages.

        +

        When enabled a report will be generated and inserted at the bottom of your pages.

        -

        To disable the profiler you will use:

        -$this->output->enable_profiler(FALSE); +

        To disable the profiler you will use:

        + $this->output->enable_profiler(FALSE); -

        Setting Benchmark Points

        - -

        In order for the Profiler to compile and display your benchmark data you must name your mark points using specific syntax.

        -

        Please read the information on setting Benchmark points in Benchmark Class page.

        +

        Setting Benchmark Points

        +

        In order for the Profiler to compile and display your benchmark data you must name your mark points using specific syntax.

        + +

        Please read the information on setting Benchmark points in Benchmark Class page.

        + + +

        Enabling and Disabling Profiler Sections

        + +

        Each section of Profiler data can be enabled or disabled by setting a corresponding config variable to TRUE or FALSE. This can be done one of two ways. First, you can set application wide defaults with the system/application/config/profiler.php config file.

        + + $config['config']          = FALSE;
        + $config['queries']         = FALSE;
         + +

        In your controllers, you can override the defaults and config file values by calling the set_profiler_sections() method of the Output class:

        + + $sections = array(
        +     'config'  => TRUE,
        +     'queries' => TRUE
        +     );
        +
        + $this->output->set_profiler_sections($sections);         + +

        Available sections and the array key used to access them are described in the table below.

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        KeyDescriptionDefault
        benchmarksElapsed time of Benchmark points and total execution timeTRUE
        configCodeIgniter Config variablesTRUE
        controller_infoThe Controller class and method requestedTRUE
        getAny GET data passed in the requestTRUE
        http_headersThe HTTP headers for the current requestTRUE
        memory_usageAmount of memory consumed by the current request, in bytesTRUE
        postAny POST data passed in the requestTRUE
        queriesListing of all database queries executed, including execution timeTRUE
        uri_stringThe URI of the current requestTRUE
      • diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index de22fbe2..70f0c1f7 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -130,6 +130,9 @@

      $this->output->enable_profiler();

      To disable the profiler you will use:

      $this->output->enable_profiler(FALSE); +

      $this->output->set_profiler_sections();

      + +

      Permits you to enable/disable specific sections of the Profiler when enabled. Please refer to the Profiler documentation for further information.

      $this->output->cache();

      The CodeIgniter output library also controls caching. For more information, please see the caching documentation.

      From 5034e3fe8442fcb558225f6c528497227474c9ca Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 13:33:43 -0600 Subject: [PATCH 1871/2544] added docs for Output class property --- user_guide/changelog.html | 1 + user_guide/libraries/output.html | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ac421286..8dcc9060 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -72,6 +72,7 @@

      Version 2.0.0

    • Libraries
        +
      • Added $parse_exec_vars property to Output library.
      • Added ability to enable / disable individual sections of the Profiler
      • Added "is_object" into the list of unit tests capable of being run.
      • Table library will generate an empty cell with a blank string, or NULL value.
        • diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 70f0c1f7..41104808 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -137,6 +137,12 @@

        $this->output->set_profiler_sections();

        $this->output->cache();

        The CodeIgniter output library also controls caching. For more information, please see the caching documentation.

        +

        Parsing Execution Variables

        + +

        CodeIgniter will parse the pseudo-variables {elapsed_time} and {memory_usage} in your output by default. To disable this, set the $parse_exec_vars class property to FALSE in your controller. + + $this->output->parse_exec_vars = FALSE; +

      • From 9898b892baed8d20f4138cb88c4f4ca3a082e444 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 14:04:17 -0600 Subject: [PATCH 1872/2544] added Security class docs, cleaned up Input class for changes to both --- user_guide/changelog.html | 1 + user_guide/general/security.html | 2 +- user_guide/helpers/cookie_helper.html | 44 +-------- user_guide/libraries/input.html | 81 +++++++++++------ user_guide/libraries/security.html | 123 ++++++++++++++++++++++++++ user_guide/libraries/sessions.html | 2 +- user_guide/nav/nav.js | 1 + user_guide/toc.html | 1 + 8 files changed, 182 insertions(+), 73 deletions(-) create mode 100644 user_guide/libraries/security.html diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8dcc9060..eb5cf93c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -72,6 +72,7 @@

      Version 2.0.0

    • Libraries
        +
      • Added Security library, which now contains the xss_clean function, filename_security function and other security related functions.
      • Added $parse_exec_vars property to Output library.
      • Added ability to enable / disable individual sections of the Profiler
      • Added "is_object" into the list of unit tests capable of being run.
        • diff --git a/user_guide/general/security.html b/user_guide/general/security.html index 593ffd58..bc969f73 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -112,7 +112,7 @@

        Best Practices

        CodeIgniter comes with a Cross Site Scripting filter. This filter looks for commonly used techniques to embed malicious Javascript into your data, or other types of code that attempt to hijack cookies -or do other malicious things. The XSS Filter is described here. +or do other malicious things. The XSS Filter is described here.

        diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index b73daf66..d7120d51 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -70,53 +70,13 @@

        Loading this Helper

        set_cookie()

        -

        Sets a cookie containing the values you specify. There are two ways to pass information to this function so that a cookie can be set: -Array Method, and Discrete Parameters:

        - -

        Array Method

        - -

        Using this method, an associative array is passed to the first parameter:

        - -$cookie = array(
        -                   'name'   => 'The Cookie Name',
        -                   'value'  => 'The Value',
        -                   'expire' => '86500',
        -                   'domain' => '.some-domain.com',
        -                   'path'   => '/',
        -                   'prefix' => 'myprefix_',
        -               );
        -
        -set_cookie($cookie); -         - -

        Notes:

        - -

        Only the name and value are required. To delete a cookie set it with the expiration blank.

        - -

        The expiration is set in seconds, which will be added to the current time. Do not include the time, but rather only the -number of seconds from now that you wish the cookie to be valid. If the expiration is set to -zero the cookie will only last as long as the browser is open.

        -

        For site-wide cookies regardless of how your site is requested, add your URL to the domain starting with a period, like this: .your-domain.com

        -

        The path is usually not needed since the function sets a root path.

        -

        The prefix is only needed if you need to avoid name collisions with other identically named cookies for your server.

        - -

        Discrete Parameters

        - -

        If you prefer, you can set the cookie by passing data using individual parameters:

        - -set_cookie($name, $value, $expire, $domain, $path, $prefix); +

        This helper function gives you view file friendly syntax to set browser cookies. Refer to the Input class for a description of use, as this function is an alias to $this->input->set_cookie().

        get_cookie()

        -

        Lets you fetch a cookie. The first parameter will contain the name of the cookie you are looking for (including any prefixes):

        - -get_cookie('some_cookie'); - -

        The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

        +

        This helper function gives you view file friendly syntax to get browser cookies. Refer to the Input class for a description of use, as this function is an alias to $this->input->cookie().

        -

        The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

        -

        get_cookie('some_cookie', TRUE);

        delete_cookie()

        Lets you delete a cookie. Unless you've set a custom path or other values, only the name of the cookie is needed:

        diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 59198a24..055f12bf 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -42,7 +42,7 @@
      • + + + + +

      CodeIgniter User Guide Version 2.0.0

      +
      + + + + + + + + + +
      + + +
      + + + +
      + + +

      Security Class

      + +

      The Security Class contains methods that help you create a secure application, processing input data for security.

      + +

      XSS Filtering

      + +

      CodeIgniter comes with a Cross Site Scripting Hack prevention filter which can either run automatically to filter +all POST and COOKIE data that is encountered, or you can run it on a per item basis. By default it does not +run globally since it requires a bit of processing overhead, and since you may not need it in all cases.

      + +

      The XSS filter looks for commonly used techniques to trigger Javascript or other types of code that attempt to hijack cookies +or do other malicious things. If anything disallowed is encountered it is rendered safe by converting the data to character entities.

      + +

      +Note: This function should only be used to deal with data upon submission. It's not something that should be used for general runtime processing since it requires a fair amount of processing overhead.

      + + +

      To filter data through the XSS filter use this function:

      + +

      $this->security->xss_clean()

      + +

      Here is an usage example:

      + +$data = $this->security->xss_clean($data); + +

      If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your +application/config/config.php file and setting this:

      + +$config['global_xss_filtering'] = TRUE; + +

      Note: If you use the form validation class, it gives you the option of XSS filtering as well.

      + +

      An optional second parameter, is_image, allows this function to be used to test images for potential XSS attacks, useful for file upload security. When this second parameter is set to TRUE, instead of returning an altered string, the function returns TRUE if the image is safe, and FALSE if it contained potentially malicious information that a browser may attempt to execute.

      + +if ($this->security->xss_clean($file, TRUE) === FALSE)
      +{
      +    // file failed the XSS test
      +}       + + +

      $this->security->sanitize_filename()

      + +

      When accepting filenames from user input, it is best to sanitize them to prevent directory traversal and other security related issues. To do so, use the sanitize_filename() method of the Security class. Here is an example:

      + +$filename = $this->security->sanitize_filename($this->input->post('filename')); + + + +
      + + + + + + + \ No newline at end of file diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 059f6fbc..31b4047e 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -298,7 +298,7 @@

      Session Preferences

  • Libraries From 536558bdd4dd04abade1f7d8424de2abd88d978c Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 14:09:54 -0600 Subject: [PATCH 1876/2544] changelog note for directory_trigger --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 2d34943c..822f394a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -70,6 +70,7 @@

    Version 2.0.0

  • Added new special Library type: Drivers.
  • Added routing overrides to the main index.php file, enabling the normal routing to be overridden on a per "index" file basis.
  • Added the ability to set config values (or override config values) directly from data set in the main index.php file. This allows a single application to be used with multiple front controllers, each having its own config values.
    • +
  • Added $config['directory_trigger'] to the config file so that a controller sub-directory can be specified when running _GET strings instead of URI segments.
  • In-development code is now hosted at BitBucket.
  • Libraries From ad1171a6797dc0054381327fb26a9e9e232a639e Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 14:18:38 -0600 Subject: [PATCH 1877/2544] added swap_pre, autoinit, and stricton database configuration explanations --- system/application/config/database.php | 4 ++++ user_guide/changelog.html | 3 +++ user_guide/database/configuration.html | 15 ++++++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/system/application/config/database.php b/system/application/config/database.php index 28dfff5c..fcdefda7 100644 --- a/system/application/config/database.php +++ b/system/application/config/database.php @@ -26,6 +26,8 @@ | ['cachedir'] The path to the folder where cache files should be stored | ['char_set'] The character set used in communicating with the database | ['dbcollat'] The character collation used in communicating with the database +| ['swap_pre'] A default table prefix that should be swapped with the dbprefix +| ['autoinit'] Whether or not to automatically initialize the database. | ['stricton'] TRUE/FALSE - forces "Strict Mode" connections | - good for ensuring strict SQL while developing | @@ -51,6 +53,8 @@ $db['default']['cachedir'] = ""; $db['default']['char_set'] = "utf8"; $db['default']['dbcollat'] = "utf8_general_ci"; +$db['default']['swap_pre'] = ""; +$db['default']['autoinit'] = TRUE; $db['default']['stricton'] = FALSE; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 822f394a..95b1e6cc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -89,6 +89,9 @@

    Version 2.0.0

  • Database
      +
    • Added swap_pre value to database configuration.
      • +
    • Added autoinit value to database configuration.
      • +
    • Added stricton value to database configuration.
    • Added database_exists() to the Database Utilities Class.
    • Semantic change to db->version() function to allow a list of exceptions for databases with functions to return version string instead of specially formed SQL queries. Currently this list only includes Oracle and SQLite.
    • Fixed a bug where driver specific table identifier protection could lead to malformed queries in the field_data() functions.
      • diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 4ef76ed1..1844aa05 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -78,7 +78,10 @@

      Database Configuration

      $db['default']['cache_on'] = FALSE;
      $db['default']['cachedir'] = "";
      $db['default']['char_set'] = "utf8";
      -$db['default']['dbcollat'] = "utf8_general_ci";       +$db['default']['dbcollat'] = "utf8_general_ci";
      +$db['default']['swap_pre'] = "";
      +$db['default']['autoinit'] = TRUE;
      +$db['default']['stricton'] = FALSE;

      The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store multiple sets of connection values. If, for example, you run multiple environments (development, production, test, etc.) @@ -96,7 +99,10 @@

      Database Configuration

      $db['test']['cache_on'] = FALSE;
      $db['test']['cachedir'] = "";
      $db['test']['char_set'] = "utf8";
      -$db['test']['dbcollat'] = "utf8_general_ci"; +$db['test']['dbcollat'] = "utf8_general_ci";
      +$db['test']['swap_pre'] = "";
      +$db['test']['autoinit'] = TRUE;
      +$db['test']['stricton'] = FALSE;

      Then, to globally tell the system to use that group you would set this variable located in the config file:

      @@ -129,7 +135,10 @@

      Explanation of Values:

    • cachedir - The absolute server path to your database query cache directory.
    • char_set - The character set used in communicating with the database.
    • dbcollat - The character collation used in communicating with the database.
      • -
    • port - The database port number. Currently only used with the Postgres driver. To use this value you have to add a line to the database config array.$db['default']['port'] = 5432;
      • +
    • swap_pre - A default table prefix that should be swapped with dbprefix. This is useful for distributed applications where you might run manually written queries, and need the prefix to still be customizable by the end user.
      • +
    • autoinit - Whether or not to automatically initialize the database.
      • +
    • stricton - TRUE/FALSE (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL while developing an application.
      • +
    • port - The database port number. Currently only used with the Postgres driver. To use this value you have to add a line to the database config array.$db['default']['port'] = 5432;

    Note: Depending on what database platform you are using (MySQL, Postgres, etc.) From 1a19592c5dca055b857177ed35a10294dded78ee Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 14:22:59 -0600 Subject: [PATCH 1878/2544] added docs for convert_accented_characters() in the Text Helper --- user_guide/changelog.html | 1 + user_guide/helpers/text_helper.html | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 95b1e6cc..bd209993 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -100,6 +100,7 @@

    Version 2.0.0

  • Helpers
      +
    • Added convert_accented_characters() function to text helper.
    • Added accept-charset to the list of inserted attributes of form_open() in the Form Helper.
    • Deprecated the dohash() function in favour of do_hash() for naming consistency.
    • Non-backwards compatible change made to get_dir_file_info() in the File Helper. No longer recurses diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index c80300c8..9e8f8f5e 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -115,6 +115,13 @@

      entities_to_ascii()

      This function does the opposite of the previous one; it turns character entities back into ASCII.

      +

      convert_accented_characters()

      + +

      Transliterates high ASCII characters to low ASCII equivalents, useful when non-English characters need to be used where only standard ASCII characters are safely used, for instance, in URLs.

      + +$string = convert_accented_characters($string); + +

      This function uses a companion config file system/application/config/foreign_chars.php to define the to and from array for transliteration.

      word_censor()

      From 7fa0f4aa89e570d01e53b02f3e0366e3313792f4 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 14:24:15 -0600 Subject: [PATCH 1879/2544] added docs for * filter for allowed_types of Upload class --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index bd209993..14f81bc4 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -79,6 +79,7 @@

      Version 2.0.0

    • Added CSRF (Cross-site Reference Forgery) protection to the Security library.
    • Added $parse_exec_vars property to Output library.
    • Added ability to enable / disable individual sections of the Profiler
      • +
    • Added a wildcard option $config['allowed_types'] = '*' to the File Uploading Class.
    • Added "is_object" into the list of unit tests capable of being run.
    • Table library will generate an empty cell with a blank string, or NULL value.
    • Added a parse_string() method to the Parser Class.
      • From 0d69ee3cb63a1e91ff5a00d906115297f4b5a0ae Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 14:25:06 -0600 Subject: [PATCH 1880/2544] updated Upload class docs to be accurate with the * filter for allowed_types --- user_guide/libraries/file_uploading.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 151b95cb..60290b18 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -255,7 +255,7 @@

      Preferences

      allowed_types None None -The mime types corresponding to the types of files you allow to be uploaded. Usually the file extension can be used as the mime type. Separate multiple types with a pipe. +The mime types corresponding to the types of files you allow to be uploaded. Usually the file extension can be used as the mime type. Separate multiple types with a pipe. If '*' is used, all file types will be allowed. From 9dad731fe608de8585900207bbc4a91c688b15de Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 14:27:30 -0600 Subject: [PATCH 1881/2544] added changelog item for XML-RPC server 'object' config item --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 14f81bc4..7497f561 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -80,6 +80,7 @@

      Version 2.0.0

    • Added $parse_exec_vars property to Output library.
    • Added ability to enable / disable individual sections of the Profiler
    • Added a wildcard option $config['allowed_types'] = '*' to the File Uploading Class.
      • +
    • Added an 'object' config variable to the XML-RPC Server library so that one can specify the object to look for requested methods, instead of assuming it is in the $CI superobject.
    • Added "is_object" into the list of unit tests capable of being run.
    • Table library will generate an empty cell with a blank string, or NULL value.
    • Added a parse_string() method to the Parser Class.
      • From ec03c8f034b44eb2dd4c0eee9b7b77446da3cd46 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 14:30:16 -0600 Subject: [PATCH 1882/2544] changelog note for subclass prefix automatically being applied by the loader. --- user_guide/changelog.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7497f561..295f8e09 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -83,6 +83,7 @@

      Version 2.0.0

    • Added an 'object' config variable to the XML-RPC Server library so that one can specify the object to look for requested methods, instead of assuming it is in the $CI superobject.
    • Added "is_object" into the list of unit tests capable of being run.
    • Table library will generate an empty cell with a blank string, or NULL value.
      • +
    • Added ability to set tag attributes for individual cells in the Table library
    • Added a parse_string() method to the Parser Class.
    • Added HTTP headers and Config information to the Profiler output.
    • Added Chrome and Flock to the list of detectable browsers by browser() in the User Agent Class.
      • @@ -115,6 +116,7 @@

      Version 2.0.0

    • Other Changes
        +
      • Updated loader to automatically apply the sub-class prefix as an option when loading classes. Class names can be prefixed with the standard "CI_" or the same prefix as the subclass prefix, or no prefix at all.
      • Increased randomness with is_really_writable() to avoid file collisions when hundreds or thousands of requests occur at once.
      • Switched some DIR_WRITE_MODE constant uses to FILE_WRITE_MODE where files and not directories are being operated on.
      • get_mime_by_extension() is now case insensitive.
        • From f991faed51a745f04b8440250502e385d1ade8e2 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 14:30:59 -0600 Subject: [PATCH 1883/2544] changelog note for bugfix to log entries --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 295f8e09..1028442e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -131,6 +131,7 @@

        Version 2.0.0

        Bug fixes for 2.0.0

          +
        • Fixed a bug that was writing log entries when multiple identical helpers and plugins were loaded.
        • Fixed assorted user guide typos or examples (#10693, #8951, #7825, #8660, #7883, #6771, #10656).
        • Fixed a language key in the profiler: "profiler_no_memory_usage" to "profiler_no_memory".
        • Fixed an error in the Zip library that didn't allow downloading on PHP 4 servers.
          • From f0abee3f8534d2c45c203dd270ed61dc31b5cefe Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 14:31:53 -0600 Subject: [PATCH 1884/2544] changelog note for bugfix in Profiler dealing with failed queries --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 1028442e..5b61993c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -131,6 +131,7 @@

          Version 2.0.0

          Bug fixes for 2.0.0

            +
          • Fixed a bug where a failed query would not have a saved query execution time causing errors in the Profiler
          • Fixed a bug that was writing log entries when multiple identical helpers and plugins were loaded.
          • Fixed assorted user guide typos or examples (#10693, #8951, #7825, #8660, #7883, #6771, #10656).
          • Fixed a language key in the profiler: "profiler_no_memory_usage" to "profiler_no_memory".
            • From 2ede2f6e8e9f2cde7402a88906d091011f7885ec Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 10 Mar 2010 15:00:18 -0600 Subject: [PATCH 1885/2544] added docs for application Packages, added third_party folder to the application folder --- system/application/third_party/index.html | 10 +++++ user_guide/changelog.html | 1 + user_guide/libraries/loader.html | 49 +++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 system/application/third_party/index.html diff --git a/system/application/third_party/index.html b/system/application/third_party/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/system/application/third_party/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

            Directory access is forbidden.

            + + + \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5b61993c..38ccc2fc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,6 +71,7 @@

            Version 2.0.0

          • Added routing overrides to the main index.php file, enabling the normal routing to be overridden on a per "index" file basis.
          • Added the ability to set config values (or override config values) directly from data set in the main index.php file. This allows a single application to be used with multiple front controllers, each having its own config values.
          • Added $config['directory_trigger'] to the config file so that a controller sub-directory can be specified when running _GET strings instead of URI segments.
            • +
          • Added ability to set "Package" paths - specific paths where the Loader and Config classes should try to look first for a requested file. This allows distribution of sub-applications with their own libraries, models, config files, etc. in a single "package" directory. See the Loader class documentation for more details.
          • In-development code is now hosted at BitBucket.
        • Libraries diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 83b3831e..cc521023 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -190,6 +190,55 @@

          $this->load->config('file_name')

          This function is an alias of the config file loading function: $this->config->load()

          +

          Application "Packages"

          + +

          An application package allows for the easy distribution of complete sets of resources in a single directory, complete with its own libraries, models, helpers, config, and language files. It is recommended that these packages be placed in the system/application/third_party folder. Below is a sample map of an package directory

          + + +

          Sample Package "Foo Bar" Directory Map

          + +

          The following is an example of a directory for an application package named "Foo Bar".

          + +/system/application/third_party/foo_bar
          +
          +config/
          +helpers/
          +language/
          +libraries/
          +models/
          +           + +

          Whatever the purpose of the "Foo Bar" application package, it has its own config files, helpers, language files, libraries, and models. To use these resources in your controllers, you first need to tell the Loader that you are going to be loading resources from a package, by adding the package path.

          + +

          $this->load->add_package_path()

          + +

          Adding a package path instructs the Loader class to prepend a given path for subsequent requests for resources. As an example, the "Foo Bar" application package above has a library named Foo_bar.php. In our controller, we'd do the following:

          + +$this->load->add_package_path(APPPATH.'third_party/foo_bar/');
          +$this->load->library('foo_bar');           + +

          $this->load->remove_package_path()

          + +

          When your controller is finished using resources from an application package, and particularly if you have other application packages you want to work with, you may wish to remove the package path so the Loader no longer looks in that folder for resources. To remove the last path added, simply call the method with no parameters.

          + +

          $this->load->remove_package_path()

          + +

          Or to remove a specific package path, specify the same path previously given to add_package_path() for a package.:

          + +$this->load->remove_package_path(APPPATH.'third_party/foo_bar/'); + +

          Package view files

          + +

          @todo - package view file interface is not complete. It can be experimentally used by first saving the Loader's original view path, setting the view path to the package's view path, and when finished, setting back to the original view path.

          + +// ... save the original view path, and set to our Foo Bar package view folder
          +$orig_view_path = $this->load->_ci_view_path;
          +$this->load->_ci_view_path = APPPATH.'third_party/foo_bar/views/';
          +
          +// ... code using the package's view files
          +
          +// ... then return the view path to the application's original view path
          +$this->load->_ci_view_path = $orig_view_path;           From cf579558fa8c1e20af748146e4fe196d7c772c34 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 11 Mar 2010 09:13:34 -0600 Subject: [PATCH 1886/2544] full on scaffolding removal --- system/database/DB_active_rec.php | 4 +- user_guide/general/common_functions.html | 2 +- user_guide/general/hooks.html | 2 - user_guide/general/reserved_names.html | 3 - user_guide/general/routing.html | 7 +- user_guide/general/scaffolding.html | 147 ----------------------- user_guide/libraries/loader.html | 5 - user_guide/nav/nav.js | 1 - user_guide/overview/features.html | 1 - user_guide/toc.html | 1 - 10 files changed, 4 insertions(+), 169 deletions(-) delete mode 100644 user_guide/general/scaffolding.html diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 88690a8f..3e9923e6 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1916,7 +1916,7 @@ function _object_to_array($object) foreach (get_object_vars($object) as $key => $val) { // There are some built in keys we need to ignore for this conversion - if ( ! is_object($val) && ! is_array($val) && $key != '_parent_name' && $key != '_ci_scaffolding' && $key != '_ci_scaff_table') + if ( ! is_object($val) && ! is_array($val) && $key != '_parent_name') { $array[$key] = $val; } @@ -1950,7 +1950,7 @@ function _object_to_array_batch($object) foreach ($fields as $val) { // There are some built in keys we need to ignore for this conversion - if ($val != '_parent_name' && $val != '_ci_scaffolding' && $val != '_ci_scaff_table') + if ($val != '_parent_name') { $i = 0; diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 132287c6..c04144a5 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -111,7 +111,7 @@

          set_status_header(code, 'text');

             ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  Scaffolding

          +Next Topic:  URI Routing

          CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

          diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 1cda08e6..44072380 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -143,8 +143,6 @@

          Hook Points

          use your own display methodology. Note that you will need to reference the CI superobject with $this->CI =& get_instance() and then the finalized data will be available by calling $this->CI->output->get_output()
        • cache_override
          Enables you to call your own function instead of the _display_cache() function in the output class. This permits you to use your own cache display mechanism.
          • -
        • scaffolding_override
          - Permits a scaffolding request to trigger your own script instead.
        • post_system
          Called after the final rendered page is sent to the browser, at the end of system execution after the finalized data is sent to the browser.
        diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 8abfbe6c..57373279 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -67,7 +67,6 @@

        Controller names

      • Controller
      • CI_Base
      • _ci_initialize
        • -
      • _ci_scaffolding
      • Default (PHP 5)
      • index
      @@ -85,14 +84,12 @@

      Controller names

    • language
    • library
    • model
      • -
    • scaffolding
    • script
    • view
    • vars
    • _ci_assign_to_models
    • _ci_autoloader
    • _ci_init_class
      • -
    • _ci_init_scaffolding
    • _ci_is_instance
    • _ci_load
    • _ci_load_class
      • diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 85e91af7..402e50a2 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -145,11 +145,6 @@

      Reserved Routes

      when people load your root URL. In the above example, the "welcome" class would be loaded. You are encouraged to always have a default route otherwise a 404 page will appear by default.

      -$route['scaffolding_trigger'] = 'scaffolding'; - -

      This route lets you set a secret word, which when present in the URL, triggers the scaffolding feature. -Please read the Scaffolding page for details.

      -

      Important:  The reserved routes must come before any wildcard or regular expression routes.

      @@ -158,7 +153,7 @@

      Reserved Routes

      From fc5c7e5e89d1ac8a84555b8d3971f14533abde03 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 11 Mar 2010 10:29:13 -0600 Subject: [PATCH 1888/2544] added @php4 tag to compat helper (thanks Phil) --- system/helpers/compatibility_helper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/helpers/compatibility_helper.php b/system/helpers/compatibility_helper.php index e7b21c66..4d7d466f 100644 --- a/system/helpers/compatibility_helper.php +++ b/system/helpers/compatibility_helper.php @@ -25,6 +25,7 @@ * well with CodeIgniter, so those functions have been refactored. * We cheat a little and use CI's _exception_handler() to output our own PHP errors * so that the behavior fully mimicks the PHP 5 counterparts. -- Derek Jones + * @PHP4 * * @package CodeIgniter * @subpackage Helpers From 1f25afec332193512b6fb3c364ec7387f776b1d0 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 11 Mar 2010 12:17:02 -0500 Subject: [PATCH 1889/2544] grammer fixup - we're all about grammer (yes, if you're reading this thinking "grammar" I'm trolling you). --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 38ccc2fc..69d7d4b8 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -64,7 +64,7 @@

      Version 2.0.0

      • General changes
          -
        • PHP 4 support is deprecated. Features new to 2.0.0 may not be support PHP 4, and all legacy features will no longer support PHP 4 as of 2.1.0.
          • +
        • PHP 4 support is deprecated. Features new to 2.0.0 may not support PHP 4, and all legacy features will no longer support PHP 4 as of 2.1.0.
        • Scaffolding, having been deprecated for a number of versions, has been removed.
        • Plugins have been removed, in favor of Helpers. The CAPTCHA plugin has been converted to a Helper and documented. The JavaScript calendar plugin was removed due to the ready availability of great JavaScript calendars, particularly with jQuery.
        • Added new special Library type: Drivers.
          • From 5c180887a44646fdcf4f81cc2d7b7110d13ccd43 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 11 Mar 2010 19:50:31 -0600 Subject: [PATCH 1890/2544] switching svn info on download page to hg --- user_guide/installation/downloads.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index f5f6b324..271be7f6 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -82,10 +82,14 @@

          Downloading CodeIgniter

          -

          Subversion Server

          -

          Subversion is a version control system.

          -

          Public subversion access is now available via http://svn.ellislab.com/CodeIgniter/trunk please note that while every effort is made to keep this codebase functional, we cannot guarantee the functionality of code taken from the repository.

          -

          Beginning with version 1.6.1, version snapshots (tags) are also available via the Subversion server via http://svn.ellislab.com/CodeIgniter/tags.

          +

          Mercurial Server

          +

          Mercurial is a distributed version control system.

          + +

          Public Hg access is available at BitBucket. + Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken + from the tip.

          + +

          Beginning with version 1.6.1, stable tags are also available via BitBucket, simply select the version from the Tags dropdown.

          From b79de3015a7a52150c4e967fdfedb07d87de8261 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Fri, 12 Mar 2010 16:28:11 -0600 Subject: [PATCH 1891/2544] Fix #2 -- extra on docs page --- user_guide/installation/downloads.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 271be7f6..0f0243e5 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -82,7 +82,7 @@

          Downloading CodeIgniter

          -

          Mercurial Server

          +

          Mercurial Server

          Mercurial is a distributed version control system.

          Public Hg access is available at BitBucket. From 4e8d66aeea7f03b75df5a387a54fce1889834ded Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 15 Mar 2010 12:23:27 -0400 Subject: [PATCH 1892/2544] code comment typo fix --- system/helpers/html_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index d5bdd080..4afa678a 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -97,7 +97,7 @@ function ol($list, $attributes = '') * @param string * @param mixed * @param mixed - * @param intiger + * @param integer * @return string */ if ( ! function_exists('_list')) From 66a3fc0a7dc6ae84da4a1e852e4458fda7714567 Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Thu, 18 Mar 2010 09:44:55 -0400 Subject: [PATCH 1893/2544] Added a $xss_clean class variable to the XMLRPC library, enabling control over the use of the Security library's xss_clean() method. --- system/libraries/Xmlrpc.php | 9 +++++---- system/libraries/Xmlrpcs.php | 10 ++++++++++ user_guide/changelog.html | 1 + user_guide/libraries/xmlrpc.html | 2 ++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index c46d52cd..2e0df5c9 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -63,6 +63,7 @@ class CI_Xmlrpc { var $result; var $response = array(); // Response from remote server + var $xss_clean = TRUE; //------------------------------------- // VALUES THAT MULTIPLE CLASSES NEED @@ -513,7 +514,7 @@ function decode($array=FALSE) } else { - $array[$key] = $CI->security->xss_clean($array[$key]); + $array[$key] = ($this->xss_clean) ? $CI->security->xss_clean($array[$key]) : $array[$key]; } } @@ -529,7 +530,7 @@ function decode($array=FALSE) } else { - $result = $CI->security->xss_clean($result); + $result = ($this->xss_clean) ? $CI->security->xss_clean($result) : $result; } } @@ -1129,7 +1130,7 @@ function output_parameters($array=FALSE) { // 'bits' is for the MetaWeblog API image bits // @todo - this needs to be made more general purpose - $array[$key] = ($key == 'bits') ? $array[$key] : $CI->security->xss_clean($array[$key]); + $array[$key] = ($key == 'bits' OR $this->xss_clean == FALSE) ? $array[$key] : $CI->security->xss_clean($array[$key]); } } @@ -1149,7 +1150,7 @@ function output_parameters($array=FALSE) } else { - $parameters[] = $CI->security->xss_clean($a_param); + $parameters[] = ($this->xss_clean) ? $CI->security->xss_clean($a_param) : $a_param; } } } diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php index fe1c99bf..c1fe649f 100644 --- a/system/libraries/Xmlrpcs.php +++ b/system/libraries/Xmlrpcs.php @@ -81,6 +81,11 @@ function initialize($config=array()) { $this->object = $config['object']; } + + if (isset($config['xss_clean'])) + { + $this->xss_clean = $config['xss_clean']; + } } //------------------------------------- @@ -247,6 +252,11 @@ function _execute($m) // Check to see if it is a system call $system_call = (strncmp($methName, 'system', 5) == 0) ? TRUE : FALSE; + if ($this->xss_clean == FALSE) + { + $m->xss_clean = FALSE; + } + //------------------------------------- // Valid Method //------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 69d7d4b8..5d2ca2f3 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -89,6 +89,7 @@

          Version 2.0.0

        • Added HTTP headers and Config information to the Profiler output.
        • Added Chrome and Flock to the list of detectable browsers by browser() in the User Agent Class.
        • The Unit Test Class now has an optional "notes" field available to it, and allows for discrete display of test result items using $this->unit->set_test_items().
          • +
        • Added a $xss_clean class variable to the XMLRPC library, enabling control over the use of the Security library's xss_clean() method.
      • Database diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 9f163ae5..6e929f1f 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -200,6 +200,8 @@

        Creating an XML-RPC Server

        The function names in the above example are arbitrary. You'll decide what they should be called on your server, or if you are using standardized APIs, like the Blogger or MetaWeblog API, you'll use their function names.

        + +

        There are two additional configuration keys you may make use of when initializing the server class: debug can be set to TRUE in order to enable debugging, and xss_clean may be set to FALSE to prevent sending data through the Security library's xss_clean function.

        Processing Server Requests

        From 76b369e191f4432ceba51ba7d7993c4ea54579ae Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Fri, 19 Mar 2010 11:15:28 -0400 Subject: [PATCH 1894/2544] Changed a few strstr to strpos for consistency w performance guidelines and to mirror EE2. --- system/core/Input.php | 2 +- system/helpers/download_helper.php | 2 +- system/libraries/Email.php | 2 +- system/libraries/Trackback.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/core/Input.php b/system/core/Input.php index 0760dc83..2eef8245 100644 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -288,7 +288,7 @@ function ip_address() return $this->ip_address; } - if (strstr($this->ip_address, ',')) + if (strpos($this->ip_address, ',') !== FALSE) { $x = explode(',', $this->ip_address); $this->ip_address = trim(end($x)); diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index 638ebaa8..eac024fc 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -71,7 +71,7 @@ function force_download($filename = '', $data = '') } // Generate the server headers - if (strstr($_SERVER['HTTP_USER_AGENT'], "MSIE")) + if (strpos($_SERVER['HTTP_USER_AGENT'], "MSIE") !== FALSE) { header('Content-Type: "'.$mime.'"'); header('Content-Disposition: attachment; filename="'.$filename.'"'); diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 8014bd21..09d1b8fb 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1865,7 +1865,7 @@ function _get_ip() elseif ($cip) $this->_IP = $cip; elseif ($fip) $this->_IP = $fip; - if (strstr($this->_IP, ',')) + if (strpos($this->_IP, ',') !== FALSE) { $x = explode(',', $this->_IP); $this->_IP = end($x); diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php index a604c0b2..a2791448 100644 --- a/system/libraries/Trackback.php +++ b/system/libraries/Trackback.php @@ -356,7 +356,7 @@ function get_id($url) { $tb_id = ""; - if (strstr($url, '?')) + if (strpos($url, '?') !== FALSE) { $tb_array = explode('/', $url); $tb_end = $tb_array[count($tb_array)-1]; From 5ed19b477072edb77aa4337be71551fae5d9736d Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Fri, 19 Mar 2010 12:13:14 -0500 Subject: [PATCH 1895/2544] Fixed a bug where files created with the Zip Library would result in file creation dates of 1980. Hat tip to JMous for a suggested fix on the forums. --- system/libraries/Zip.php | 60 ++++++++++++++++++++++++++++++++------- user_guide/changelog.html | 1 + 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index aae62d74..2c4bd255 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -37,10 +37,13 @@ class CI_Zip { var $entries = 0; var $file_num = 0; var $offset = 0; + var $now; function CI_Zip() { log_message('debug', "Zip Compression Class Initialized"); + + $this->now = time(); } // -------------------------------------------------------------------- @@ -63,10 +66,33 @@ function add_dir($directory) $dir .= '/'; } - $this->_add_dir($dir); + $dir_time = $this->_get_mod_time($dir); + + $this->_add_dir($dir, $dir_time['file_mtime'], $dir_time['file_mdate']); } } + // -------------------------------------------------------------------- + + /** + * Get file/directory modification time + * + * If this is a newly created file/dir, we will set the time to 'now' + * + * @param string path to file + * @return array filemtime/filemdate + */ + function _get_mod_time($dir) + { + // filemtime() will return false, but it does raise an error. + $date = (@filemtime($dir)) ? filemtime($dir) : getdate($this->now); + + $time['file_mtime'] = ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2; + $time['file_mdate'] = (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday']; + + return $time; + } + // -------------------------------------------------------------------- /** @@ -76,12 +102,14 @@ function add_dir($directory) * @param string the directory name * @return void */ - function _add_dir($dir) - { + function _add_dir($dir, $file_mtime, $file_mdate) + { $dir = str_replace("\\", "/", $dir); $this->zipdata .= - "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00" + .pack('v', $file_mtime) + .pack('v', $file_mdate) .pack('V', 0) // crc32 .pack('V', 0) // compressed filesize .pack('V', 0) // uncompressed filesize @@ -94,7 +122,9 @@ function _add_dir($dir) .pack('V', 0); // uncompressed filesize $this->directory .= - "\x50\x4b\x01\x02\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00" + "\x50\x4b\x01\x02\x00\x00\x0a\x00\x00\x00\x00\x00" + .pack('v', $file_mtime) + .pack('v', $file_mdate) .pack('V',0) // crc32 .pack('V',0) // compressed filesize .pack('V',0) // uncompressed filesize @@ -126,17 +156,21 @@ function _add_dir($dir) * @return void */ function add_data($filepath, $data = NULL) - { + { if (is_array($filepath)) { foreach ($filepath as $path => $data) { - $this->_add_data($path, $data); + $file_data = $this->_get_mod_time($path); + + $this->_add_data($path, $data, $file_data['file_mtime'], $file_data['file_mdate']); } } else { - $this->_add_data($filepath, $data); + $file_data = $this->_get_mod_time($filepath); + + $this->_add_data($filepath, $data, $file_data['file_mtime'], $file_data['file_mdate']); } } @@ -150,7 +184,7 @@ function add_data($filepath, $data = NULL) * @param string the data to be encoded * @return void */ - function _add_data($filepath, $data) + function _add_data($filepath, $data, $file_mtime, $file_mdate) { $filepath = str_replace("\\", "/", $filepath); @@ -162,7 +196,9 @@ function _add_data($filepath, $data) $compressed_size = strlen($gzdata); $this->zipdata .= - "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00\x00\x00\x00\x00" + "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00" + .pack('v', $file_mtime) + .pack('v', $file_mdate) .pack('V', $crc32) .pack('V', $compressed_size) .pack('V', $uncompressed_size) @@ -172,7 +208,9 @@ function _add_data($filepath, $data) .$gzdata; // "file data" segment $this->directory .= - "\x50\x4b\x01\x02\x00\x00\x14\x00\x00\x00\x08\x00\x00\x00\x00\x00" + "\x50\x4b\x01\x02\x00\x00\x14\x00\x00\x00\x08\x00" + .pack('v', $file_mtime) + .pack('v', $file_mdate) .pack('V', $crc32) .pack('V', $compressed_size) .pack('V', $uncompressed_size) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5d2ca2f3..9615fd2b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -148,6 +148,7 @@

        Bug fixes for 2.0.0

      • Fixed a bug were form_open_multipart() didn't accept string attribute arguments (#10930).
      • Fixed a bug (#10470) where get_mime_by_extension() was case sensitive.
      • Fixed a bug where some error messages for the SQLite and Oracle drivers would not display.
        • +
      • Fixed a bug where files created with the Zip Library would result in file creation dates of 1980.

      Version 1.7.2

      From d99e603f47e10adc015d4b804352db71f0563062 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 19 Mar 2010 19:57:33 -0500 Subject: [PATCH 1896/2544] reordered logic in _display_cache() to eliminate a call to is_really_writable() on each page request unless it is_really_needed() --- system/core/Output.php | 20 +++++++++----------- user_guide/changelog.html | 1 + 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/system/core/Output.php b/system/core/Output.php index 0dcf2e46..ac412940 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -377,12 +377,7 @@ function _write_cache($output) function _display_cache(&$CFG, &$URI) { $cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path'); - - if ( ! is_dir($cache_path) OR ! is_really_writable($cache_path)) - { - return FALSE; - } - + // Build the file path. The file name is an MD5 hash of the full URI $uri = $CFG->item('base_url'). $CFG->item('index_page'). @@ -410,7 +405,7 @@ function _display_cache(&$CFG, &$URI) flock($fp, LOCK_UN); fclose($fp); - + // Strip out the embedded timestamp if ( ! preg_match("/(\d+TS--->)/", $cache, $match)) { @@ -419,10 +414,13 @@ function _display_cache(&$CFG, &$URI) // Has the file expired? If so we'll delete it. if (time() >= trim(str_replace('TS--->', '', $match['1']))) - { - @unlink($filepath); - log_message('debug', "Cache file has expired. File deleted"); - return FALSE; + { + if (is_really_writable($cache_path)) + { + @unlink($filepath); + log_message('debug', "Cache file has expired. File deleted"); + return FALSE; + } } // Display the cache diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9615fd2b..45c69828 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -124,6 +124,7 @@

      Version 2.0.0

    • get_mime_by_extension() is now case insensitive.
    • Added "default" to the list Reserved Names.
    • Added 'application/x-msdownload' for .exe files and ''application/x-gzip-compressed' for .tgz files to config/mimes.php.
      • +
    • Eliminated a call to is_really_writable() on each request unless it is really needed (Output caching)
    • Documented append_output() in the Output Class.
    • Documented a second argument in the decode() function for the Encryption Class.
    • Documentd db->close().
      • From 75887a6c0c19f7f901c8c65553de2aece5ba6d83 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 12 Mar 2010 00:27:51 +0000 Subject: [PATCH 1897/2544] Fixed constant SELF undefined issue when a bad system folder is set. --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 0ad8fd82..f27520e7 100644 --- a/index.php +++ b/index.php @@ -113,7 +113,7 @@ // Is the sytsem path correct? if ( ! is_dir($system_path)) { - exit("Your system folder path does not appear to be set correctly. Please open the following file and correct this: ".SELF); + exit("Your system folder path does not appear to be set correctly. Please open the following file and correct this: ".pathinfo(__FILE__, PATHINFO_BASENAME)); } /* From eba35088bd4fef3475ea57ae1b7010aa32c592bb Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 22 Mar 2010 10:43:56 -0500 Subject: [PATCH 1898/2544] fixed spelling in code comment --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index f27520e7..47f1ae9e 100644 --- a/index.php +++ b/index.php @@ -110,7 +110,7 @@ // ensure there's a trailing slash $system_path = rtrim($system_path, '/').'/'; - // Is the sytsem path correct? + // Is the system path correct? if ( ! is_dir($system_path)) { exit("Your system folder path does not appear to be set correctly. Please open the following file and correct this: ".pathinfo(__FILE__, PATHINFO_BASENAME)); From 3140ad543e26a0aa4e6bc57a3a85ecdb3dfcf0d5 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 12 Mar 2010 00:22:42 +0000 Subject: [PATCH 1899/2544] Will check for sub-classes in core or libraries (which the original file is in) instead of always looking in libraries. Makes more sense to have them in the same folder wether in system or application. --- system/core/Common.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/core/Common.php b/system/core/Common.php index 47293a11..6e2f7250 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -142,13 +142,13 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_') } // Is the request a class extension? If so we load it too - if (file_exists(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT)) + if (file_exists(APPPATH.$directory.'/'.config_item('subclass_prefix').$class.EXT)) { $name = config_item('subclass_prefix').$class; if (class_exists($name) === FALSE) { - require(APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT); + require(APPPATH.$directory.'/'.config_item('subclass_prefix').$class.EXT); } } From 726c8eb63eac6f64408536dd39b7854dfa000251 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 12 Mar 2010 11:55:51 +0000 Subject: [PATCH 1900/2544] prep_url() will now not append http:// to string if a protocol is already used. That would really mess up itunes://, spotify://, telnet://, etc. --- system/helpers/url_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 90ea9207..86caa278 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -446,7 +446,7 @@ function prep_url($str = '') return ''; } - if (substr($str, 0, 7) != 'http://' && substr($str, 0, 8) != 'https://') + if (!preg_match('/^[a-z]{3,6}:\/\//', $str)) { $str = 'http://'.$str; } From d265871dfe205a905cd6c39e8ac4371f13848e58 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 22 Mar 2010 11:05:01 -0500 Subject: [PATCH 1901/2544] expanded philsturgeon's bugfix to parse_url() and updated docs and changelog --- system/helpers/url_helper.php | 4 ++-- user_guide/changelog.html | 1 + user_guide/helpers/url_helper.html | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 86caa278..7707d685 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -431,7 +431,7 @@ function auto_link($str, $type = 'both', $popup = FALSE) /** * Prep URL * - * Simply adds the http:// part if missing + * Simply adds the http:// part if no scheme is included * * @access public * @param string the URL @@ -446,7 +446,7 @@ function prep_url($str = '') return ''; } - if (!preg_match('/^[a-z]{3,6}:\/\//', $str)) + if ( ! parse_url($str, PHP_URL_SCHEME)) { $str = 'http://'.$str; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 45c69828..21e1bf14 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -114,6 +114,7 @@

      Version 2.0.0

    • Modified delete_files() in the File Helper to return FALSE on failure.
    • Added an optional second parameter to byte_format() in the Number Helper to allow for decimal precision.
    • Added alpha, and sha1 string types to random_string() in the String Helper.
      • +
    • Modified prep_url() so as to not prepend http:// if the supplied string already has a scheme.
  • Other Changes diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index dbc5969f..96da0c62 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -236,7 +236,7 @@

    url_title()

    prep_url()

    -

    This function will add http:// in the event it is missing from a URL. Pass the URL string to the function like this:

    +

    This function will add http:// in the event that a scheme is missing from a URL. Pass the URL string to the function like this:

    $url = "example.com";

    $url = prep_url($url);     From 28b293729d2c2917c434c6296eafecd19f397303 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 12 Mar 2010 00:43:28 +0000 Subject: [PATCH 1902/2544] Added FTP::download() and the accompanying lang line. This was first proposed in 2007, can we add it now pleeeeease? --- system/language/english/ftp_lang.php | 1 + system/libraries/Ftp.php | 42 ++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php index 42403b97..392b2b27 100644 --- a/system/language/english/ftp_lang.php +++ b/system/language/english/ftp_lang.php @@ -7,6 +7,7 @@ $lang['ftp_unable_to_changedir'] = "Unable to change directories."; $lang['ftp_unable_to_chmod'] = "Unable to set file permissions. Please check your path. Note: This feature is only available in PHP 5 or higher."; $lang['ftp_unable_to_upload'] = "Unable to upload the specified file. Please check your path."; +$lang['ftp_unable_to_download'] = "Unable to download the specified file. Please check your path."; $lang['ftp_no_source_file'] = "Unable to locate the source file. Please check your path."; $lang['ftp_unable_to_rename'] = "Unable to rename the file."; $lang['ftp_unable_to_delete'] = "Unable to delete the file."; diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 16ad9ad4..07f4b1ff 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -280,6 +280,48 @@ function upload($locpath, $rempath, $mode = 'auto', $permissions = NULL) // -------------------------------------------------------------------- + /** + * Download a file from a remote server to the local server + * + * @access public + * @param string + * @param string + * @param string + * @return bool + */ + function download($rempath, $locpath, $mode = 'auto') + { + if ( ! $this->_is_conn()) + { + return FALSE; + } + + // Set the mode if not specified + if ($mode == 'auto') + { + // Get the file extension so we can set the upload type + $ext = $this->_getext($rempath); + $mode = $this->_settype($ext); + } + + $mode = ($mode == 'ascii') ? FTP_ASCII : FTP_BINARY; + + $result = @ftp_get($this->conn_id, $locpath, $rempath, $mode); + + if ($result === FALSE) + { + if ($this->debug == TRUE) + { + $this->_error('ftp_unable_to_download'); + } + return FALSE; + } + + return TRUE; + } + + // -------------------------------------------------------------------- + /** * Rename (or move) a file * From 7ec3650749b2c4baf1600bf09fdf3e41f06d87d1 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 22 Mar 2010 11:11:30 -0500 Subject: [PATCH 1903/2544] added documentation for philsturgeon's submission of download() for the FTP library --- user_guide/changelog.html | 3 ++- user_guide/libraries/ftp.html | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 21e1bf14..8d9653aa 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -89,7 +89,8 @@

    Version 2.0.0

  • Added HTTP headers and Config information to the Profiler output.
  • Added Chrome and Flock to the list of detectable browsers by browser() in the User Agent Class.
  • The Unit Test Class now has an optional "notes" field available to it, and allows for discrete display of test result items using $this->unit->set_test_items().
    • -
  • Added a $xss_clean class variable to the XMLRPC library, enabling control over the use of the Security library's xss_clean() method.
    • +
  • Added a $xss_clean class variable to the XMLRPC library, enabling control over the use of the Security library's xss_clean() method.
    • +
  • Added a download() method to the FTP library
  • Database diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 10acdcda..b5194e8a 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -188,6 +188,19 @@

    $this->ftp->upload()

    Permissions are available if you are running PHP 5 and can be passed as an octal value in the fourth parameter.

    +

    $this->ftp->download()

    + +

    Downloads a file from your server. You must supply the remote path and the local path, and you can optionally set the mode. +Example:

    + +$this->ftp->download('/public_html/myfile.html', '/local/path/to/myfile.html', 'ascii'); + +

    Mode options are:  ascii, binary, and auto (the default). If +auto is used it will base the mode on the file extension of the source file.

    + +

    Returns FALSE if the download does not execute successfully (including if PHP does not have permission to write the local file)

    + +

    $this->ftp->rename()

    Permits you to rename a file. Supply the source file name/path and the new file name/path.

    From fa281354b37feead98ab71cc4e6d68f9748a7b6c Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 22 Mar 2010 14:41:27 -0500 Subject: [PATCH 1904/2544] Fix #10 , extending the CodeIgniter controller with MY_Controller will lead to a fatal PHP error. --- system/application/core/index.html | 10 ++++++++++ system/core/CodeIgniter.php | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 system/application/core/index.html diff --git a/system/application/core/index.html b/system/application/core/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/system/application/core/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + + \ No newline at end of file diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 488f9f3c..295917c9 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -224,6 +224,11 @@ // Load the base controller class require BASEPATH.'core/Controller'.EXT; + if (file_exists(APPPATH.'core/'.$CFG->config['subclass_prefix'].'Controller'.EXT)) + { + require APPPATH.'core/'.$CFG->config['subclass_prefix'].'Controller'.EXT; + } + // Load the local application controller // Note: The Router class automatically validates the controller path using the router->_validate_request(). // If this include fails it means that the default controller in the Routes.php file is not resolving to something valid. From ac9e0cdecc7ec15f173e5d538a18c37ab08d455b Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 22 Mar 2010 14:43:50 -0500 Subject: [PATCH 1905/2544] Updating docs for extending core libraries to reference the application/core directory --- user_guide/general/core_classes.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index f67c0053..6ffafca5 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -89,9 +89,9 @@

    System Class List

    Replacing Core Classes

    -

    To use one of your own system classes instead of a default one simply place your version inside your local application/libraries directory:

    +

    To use one of your own system classes instead of a default one simply place your version inside your local application/core directory:

    -application/libraries/some-class.php +application/core/some-class.php

    If this directory does not exist you can create it.

    @@ -118,7 +118,7 @@

    Extending Core Class

  • Your new class name and filename must be prefixed with MY_ (this item is configurable. See below.).
    • -

    For example, to extend the native Input class you'll create a file named application/libraries/MY_Input.php, and declare your class with:

    +

    For example, to extend the native Input class you'll create a file named application/core/MY_Input.php, and declare your class with:

    class MY_Input extends CI_Input {

    From 022be04a8262857e1bab9bf65e45817d398c31e6 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 22 Mar 2010 14:47:09 -0500 Subject: [PATCH 1906/2544] Updating changelog --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8d9653aa..7a6ef062 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -152,6 +152,7 @@

    Bug fixes for 2.0.0

  • Fixed a bug (#10470) where get_mime_by_extension() was case sensitive.
  • Fixed a bug where some error messages for the SQLite and Oracle drivers would not display.
  • Fixed a bug where files created with the Zip Library would result in file creation dates of 1980.
    • +
  • Fixed a bug where extending the Controller class would result in a fatal PHP error.

    • Version 1.7.2

    From f0b3994f51937c643200a0547f70b1fa7d94f88a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 25 Mar 2010 10:08:20 -0500 Subject: [PATCH 1907/2544] moved application folder outside of the system folder --- .../config/autoload.php | 4 +- .../config/config.php | 2 +- .../config/constants.php | 2 +- .../config/database.php | 2 +- .../config/doctypes.php | 0 .../config/foreign_chars.php | 2 +- .../config/hooks.php | 2 +- .../config/index.html | 0 .../config/mimes.php | 0 .../config/profiler.php | 2 +- .../config/routes.php | 2 +- .../config/smileys.php | 2 +- .../config/user_agents.php | 2 +- .../controllers/index.html | 0 .../controllers/welcome.php | 2 +- .../core/index.html | 0 .../errors/error_404.php | 0 .../errors/error_db.php | 0 .../errors/error_general.php | 0 .../errors/error_php.php | 0 .../errors/index.html | 0 .../helpers/index.html | 0 .../hooks/index.html | 0 .../application => application}/index.html | 0 .../language/english/index.html | 0 .../libraries/index.html | 0 .../models/index.html | 0 .../third_party/index.html | 0 .../views/index.html | 0 .../views/welcome_message.php | 4 +- user_guide/general/helpers.html | 2 +- user_guide/general/managing_apps.html | 38 +++++++++---------- user_guide/general/profiling.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/installation/upgrade_154.html | 6 +-- user_guide/installation/upgrade_160.html | 6 +-- user_guide/installation/upgrade_162.html | 6 +-- user_guide/libraries/javascript.html | 2 +- user_guide/libraries/jquery.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 4 +- 41 files changed, 50 insertions(+), 50 deletions(-) rename {system/application => application}/config/autoload.php (96%) rename {system/application => application}/config/config.php (99%) rename {system/application => application}/config/constants.php (96%) rename {system/application => application}/config/database.php (97%) rename {system/application => application}/config/doctypes.php (100%) rename {system/application => application}/config/foreign_chars.php (96%) rename {system/application => application}/config/hooks.php (89%) rename {system/application => application}/config/index.html (100%) rename {system/application => application}/config/mimes.php (100%) rename {system/application => application}/config/profiler.php (90%) rename {system/application => application}/config/routes.php (95%) rename {system/application => application}/config/smileys.php (98%) rename {system/application => application}/config/user_agents.php (98%) rename {system/application => application}/controllers/index.html (100%) rename {system/application => application}/controllers/welcome.php (76%) rename {system/application => application}/core/index.html (100%) rename {system/application => application}/errors/error_404.php (100%) rename {system/application => application}/errors/error_db.php (100%) rename {system/application => application}/errors/error_general.php (100%) rename {system/application => application}/errors/error_php.php (100%) rename {system/application => application}/errors/index.html (100%) rename {system/application => application}/helpers/index.html (100%) rename {system/application => application}/hooks/index.html (100%) rename {system/application => application}/index.html (100%) rename {system/application => application}/language/english/index.html (100%) rename {system/application => application}/libraries/index.html (100%) rename {system/application => application}/models/index.html (100%) rename {system/application => application}/third_party/index.html (100%) rename {system/application => application}/views/index.html (100%) rename {system/application => application}/views/welcome_message.php (91%) diff --git a/system/application/config/autoload.php b/application/config/autoload.php similarity index 96% rename from system/application/config/autoload.php rename to application/config/autoload.php index e7c6f0db..35ad6288 100644 --- a/system/application/config/autoload.php +++ b/application/config/autoload.php @@ -31,7 +31,7 @@ | Auto-load Libraries | ------------------------------------------------------------------- | These are the classes located in the system/libraries folder -| or in your system/application/libraries folder. +| or in your application/libraries folder. | | Prototype: | @@ -100,4 +100,4 @@ /* End of file autoload.php */ -/* Location: ./system/application/config/autoload.php */ \ No newline at end of file +/* Location: ./application/config/autoload.php */ \ No newline at end of file diff --git a/system/application/config/config.php b/application/config/config.php similarity index 99% rename from system/application/config/config.php rename to application/config/config.php index 1c961b45..bd1429a4 100644 --- a/system/application/config/config.php +++ b/application/config/config.php @@ -326,4 +326,4 @@ /* End of file config.php */ -/* Location: ./system/application/config/config.php */ \ No newline at end of file +/* Location: ./application/config/config.php */ \ No newline at end of file diff --git a/system/application/config/constants.php b/application/config/constants.php similarity index 96% rename from system/application/config/constants.php rename to application/config/constants.php index 86ebdbb2..1551cbca 100644 --- a/system/application/config/constants.php +++ b/application/config/constants.php @@ -38,4 +38,4 @@ /* End of file constants.php */ -/* Location: ./system/application/config/constants.php */ \ No newline at end of file +/* Location: ./application/config/constants.php */ \ No newline at end of file diff --git a/system/application/config/database.php b/application/config/database.php similarity index 97% rename from system/application/config/database.php rename to application/config/database.php index fcdefda7..a3226b18 100644 --- a/system/application/config/database.php +++ b/application/config/database.php @@ -59,4 +59,4 @@ /* End of file database.php */ -/* Location: ./system/application/config/database.php */ \ No newline at end of file +/* Location: ./application/config/database.php */ \ No newline at end of file diff --git a/system/application/config/doctypes.php b/application/config/doctypes.php similarity index 100% rename from system/application/config/doctypes.php rename to application/config/doctypes.php diff --git a/system/application/config/foreign_chars.php b/application/config/foreign_chars.php similarity index 96% rename from system/application/config/foreign_chars.php rename to application/config/foreign_chars.php index 8d70a2f6..59a7d234 100644 --- a/system/application/config/foreign_chars.php +++ b/application/config/foreign_chars.php @@ -61,4 +61,4 @@ /* End of file foreign_chars.php */ -/* Location: ./system/application/config/foreign_chars.php */ \ No newline at end of file +/* Location: ./application/config/foreign_chars.php */ \ No newline at end of file diff --git a/system/application/config/hooks.php b/application/config/hooks.php similarity index 89% rename from system/application/config/hooks.php rename to application/config/hooks.php index 5e98a9b4..a4ad2be6 100644 --- a/system/application/config/hooks.php +++ b/application/config/hooks.php @@ -13,4 +13,4 @@ /* End of file hooks.php */ -/* Location: ./system/application/config/hooks.php */ \ No newline at end of file +/* Location: ./application/config/hooks.php */ \ No newline at end of file diff --git a/system/application/config/index.html b/application/config/index.html similarity index 100% rename from system/application/config/index.html rename to application/config/index.html diff --git a/system/application/config/mimes.php b/application/config/mimes.php similarity index 100% rename from system/application/config/mimes.php rename to application/config/mimes.php diff --git a/system/application/config/profiler.php b/application/config/profiler.php similarity index 90% rename from system/application/config/profiler.php rename to application/config/profiler.php index f30432d9..f8a5b1a1 100644 --- a/system/application/config/profiler.php +++ b/application/config/profiler.php @@ -14,4 +14,4 @@ /* End of file profiler.php */ -/* Location: ./system/application/config/profiler.php */ \ No newline at end of file +/* Location: ./application/config/profiler.php */ \ No newline at end of file diff --git a/system/application/config/routes.php b/application/config/routes.php similarity index 95% rename from system/application/config/routes.php rename to application/config/routes.php index 4d9f340a..57af9850 100644 --- a/system/application/config/routes.php +++ b/application/config/routes.php @@ -36,4 +36,4 @@ /* End of file routes.php */ -/* Location: ./system/application/config/routes.php */ \ No newline at end of file +/* Location: ./application/config/routes.php */ \ No newline at end of file diff --git a/system/application/config/smileys.php b/application/config/smileys.php similarity index 98% rename from system/application/config/smileys.php rename to application/config/smileys.php index 7f3aba55..31a60c65 100644 --- a/system/application/config/smileys.php +++ b/application/config/smileys.php @@ -63,4 +63,4 @@ ); /* End of file smileys.php */ -/* Location: ./system/application/config/smileys.php */ \ No newline at end of file +/* Location: ./application/config/smileys.php */ \ No newline at end of file diff --git a/system/application/config/user_agents.php b/application/config/user_agents.php similarity index 98% rename from system/application/config/user_agents.php rename to application/config/user_agents.php index a1c0b14b..3be20094 100644 --- a/system/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -174,4 +174,4 @@ ); /* End of file user_agents.php */ -/* Location: ./system/application/config/user_agents.php */ \ No newline at end of file +/* Location: ./application/config/user_agents.php */ \ No newline at end of file diff --git a/system/application/controllers/index.html b/application/controllers/index.html similarity index 100% rename from system/application/controllers/index.html rename to application/controllers/index.html diff --git a/system/application/controllers/welcome.php b/application/controllers/welcome.php similarity index 76% rename from system/application/controllers/welcome.php rename to application/controllers/welcome.php index 20d48855..bd134e7e 100644 --- a/system/application/controllers/welcome.php +++ b/application/controllers/welcome.php @@ -14,4 +14,4 @@ function index() } /* End of file welcome.php */ -/* Location: ./system/application/controllers/welcome.php */ \ No newline at end of file +/* Location: ./application/controllers/welcome.php */ \ No newline at end of file diff --git a/system/application/core/index.html b/application/core/index.html similarity index 100% rename from system/application/core/index.html rename to application/core/index.html diff --git a/system/application/errors/error_404.php b/application/errors/error_404.php similarity index 100% rename from system/application/errors/error_404.php rename to application/errors/error_404.php diff --git a/system/application/errors/error_db.php b/application/errors/error_db.php similarity index 100% rename from system/application/errors/error_db.php rename to application/errors/error_db.php diff --git a/system/application/errors/error_general.php b/application/errors/error_general.php similarity index 100% rename from system/application/errors/error_general.php rename to application/errors/error_general.php diff --git a/system/application/errors/error_php.php b/application/errors/error_php.php similarity index 100% rename from system/application/errors/error_php.php rename to application/errors/error_php.php diff --git a/system/application/errors/index.html b/application/errors/index.html similarity index 100% rename from system/application/errors/index.html rename to application/errors/index.html diff --git a/system/application/helpers/index.html b/application/helpers/index.html similarity index 100% rename from system/application/helpers/index.html rename to application/helpers/index.html diff --git a/system/application/hooks/index.html b/application/hooks/index.html similarity index 100% rename from system/application/hooks/index.html rename to application/hooks/index.html diff --git a/system/application/index.html b/application/index.html similarity index 100% rename from system/application/index.html rename to application/index.html diff --git a/system/application/language/english/index.html b/application/language/english/index.html similarity index 100% rename from system/application/language/english/index.html rename to application/language/english/index.html diff --git a/system/application/libraries/index.html b/application/libraries/index.html similarity index 100% rename from system/application/libraries/index.html rename to application/libraries/index.html diff --git a/system/application/models/index.html b/application/models/index.html similarity index 100% rename from system/application/models/index.html rename to application/models/index.html diff --git a/system/application/third_party/index.html b/application/third_party/index.html similarity index 100% rename from system/application/third_party/index.html rename to application/third_party/index.html diff --git a/system/application/views/index.html b/application/views/index.html similarity index 100% rename from system/application/views/index.html rename to application/views/index.html diff --git a/system/application/views/welcome_message.php b/application/views/welcome_message.php similarity index 91% rename from system/application/views/welcome_message.php rename to application/views/welcome_message.php index 653b62c7..b66fb3f2 100644 --- a/system/application/views/welcome_message.php +++ b/application/views/welcome_message.php @@ -48,10 +48,10 @@

    The page you are looking at is being generated dynamically by CodeIgniter.

    If you would like to edit this page you'll find it located at:

    -system/application/views/welcome_message.php +application/views/welcome_message.php

    The corresponding controller for this page is found at:

    -system/application/controllers/welcome.php +application/controllers/welcome.php

    If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.

    diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index ef24e8c9..5ba1674c 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -69,7 +69,7 @@

    Helper Functions

    CodeIgniter does not load Helper Files by default, so the first step in using a Helper is to load it. Once loaded, it becomes globally available in your controller and views.

    -

    Helpers are typically stored in your system/helpers, or system/application/helpers directory. CodeIgniter will look first in your system/application/helpers +

    Helpers are typically stored in your system/helpers, or application/helpers directory. CodeIgniter will look first in your application/helpers directory. If the directory does not exist or the specified helper is not located there CI will instead look in your global system/helpers folder.

    diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index babed5f6..9f23de4b 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -58,7 +58,7 @@

    Managing your Applications

    By default it is assumed that you only intend to use CodeIgniter to manage one application, which you will build in your -system/application/ directory. It is possible, however, to have multiple sets of applications that share a single +application/ directory. It is possible, however, to have multiple sets of applications that share a single CodeIgniter installation, or even to rename or relocate your application folder.

    Renaming the Application Folder

    @@ -83,29 +83,29 @@

    Running Multiple Applications with one CodeIgniter Installation

    put all of the directories located inside your application folder into their own sub-folder.

    -

    For example, let's say you want to create two applications, "foo" and "bar". You will structure your -application folder like this:

    - -system/application/foo/
    -system/application/foo/config/
    -system/application/foo/controllers/
    -system/application/foo/errors/
    -system/application/foo/libraries/
    -system/application/foo/models/
    -system/application/foo/views/
    -system/application/bar/
    -system/application/bar/config/
    -system/application/bar/controllers/
    -system/application/bar/errors/
    -system/application/bar/libraries/
    -system/application/bar/models/
    -system/application/bar/views/     +

    For example, let's say you want to create two applications, "foo" and "bar". You could structure your +application folders like this:

    + +applications/foo/
    +applications/foo/config/
    +applications/foo/controllers/
    +applications/foo/errors/
    +applications/foo/libraries/
    +applications/foo/models/
    +applications/foo/views/
    +applications/bar/
    +applications/bar/config/
    +applications/bar/controllers/
    +applications/bar/errors/
    +applications/bar/libraries/
    +applications/bar/models/
    +applications/bar/views/

    To select a particular application for use requires that you open your main index.php file and set the $application_folder variable. For example, to select the "foo" application for use you would do this:

    -$application_folder = "application/foo"; +$application_folder = "applications/foo";

    Note:  Each of your applications will need its own index.php file which calls the desired application. The index.php file can be named anything you want.

    diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 8622edeb..f8650314 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -87,7 +87,7 @@

    Setting Benchmark Points

    Enabling and Disabling Profiler Sections

    -

    Each section of Profiler data can be enabled or disabled by setting a corresponding config variable to TRUE or FALSE. This can be done one of two ways. First, you can set application wide defaults with the system/application/config/profiler.php config file.

    +

    Each section of Profiler data can be enabled or disabled by setting a corresponding config variable to TRUE or FALSE. This can be done one of two ways. First, you can set application wide defaults with the application/config/profiler.php config file.

    $config['config']          = FALSE;
    $config['queries']         = FALSE;
     diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 9e8f8f5e..0e075b9d 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -121,7 +121,7 @@

    convert_accented_characters()

    $string = convert_accented_characters($string); -

    This function uses a companion config file system/application/config/foreign_chars.php to define the to and from array for transliteration.

    +

    This function uses a companion config file application/config/foreign_chars.php to define the to and from array for transliteration.

    word_censor()

    diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index 5e446866..b1bc8bb8 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -67,7 +67,7 @@

    Step 1: Update your CodeIgniter files

      -
    • system/application/config/mimes.php
      • +
    • application/config/mimes.php
    • system/codeigniter
    • system/database
    • system/helpers
      • @@ -78,7 +78,7 @@

      Step 1: Update your CodeIgniter files

      Note: If you have any custom developed files in these folders please make copies of them first.

      Step 2: Add charset to your config.php

      -

      Add the following to system/application/config/config.php

      +

      Add the following to application/config/config.php

      /*
      |--------------------------------------------------------------------------
      | Default Character Set
      @@ -91,7 +91,7 @@

      Step 2: Add charset to your config.php

      $config['charset'] = "UTF-8";

      Step 3: Autoloading language files

      -

      If you want to autoload any language files, add this line to system/application/config/autoload.php

      +

      If you want to autoload any language files, add this line to application/config/autoload.php

      $autoload['language'] = array();

      Step 4: Update your user guide

      diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index e817e245..5568f8ca 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -78,10 +78,10 @@

      Step 1: Update your CodeIgniter files

      Note: If you have any custom developed files in these folders please make copies of them first.

      Step 2: Add time_to_update to your config.php

      -

      Add the following to system/application/config/config.php with the other session configuration options

      +

      Add the following to application/config/config.php with the other session configuration options

      $config['sess_time_to_update'] = 300;

      Step 3: Add $autoload['model']

      -

      Add the following to system/application/config/autoload.php

      +

      Add the following to application/config/autoload.php

      /*
      | -------------------------------------------------------------------
      | Auto-load Model files
      @@ -94,7 +94,7 @@

      Step 3: Add $autoload['model']


      $autoload['model'] = array();

      Step 4: Add to your database.php

      -

      Make the following changes to your system/application/config/database.php file:

      +

      Make the following changes to your application/config/database.php file:

      Add the following variable above the database configuration options, with $active_group

      $active_record = TRUE;

      Remove the following from your database configuration options

      diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index fd34ab08..c9eb2bfe 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -78,12 +78,12 @@

      Step 1: Update your CodeIgniter files

      Step 2: Encryption Key

      -

      If you are using sessions, open up system/application/config/config.php and verify you've set an encryption key.

      +

      If you are using sessions, open up application/config/config.php and verify you've set an encryption key.

      Step 3: Constants File

      -

      Copy /system/application/config/constants.php to your installation, and modify if necessary.

      +

      Copy /application/config/constants.php to your installation, and modify if necessary.

      Step 4: Mimes File

      -

      Replace /system/application/config/mimes.php with the dowloaded version. If you've added custom mime types, you'll need to re-add them.

      +

      Replace /application/config/mimes.php with the dowloaded version. If you've added custom mime types, you'll need to re-add them.

      Step 5: Update your user guide

      Please also replace your local copy of the user guide with the new version.

      diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index 08982fd0..ac0af840 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -79,7 +79,7 @@

      Set these variables in your view

      $library_src, is where the actual library file will be loaded, as well as any subsequent plugin script calls; $script_head is where specific events, functions and other commands will be rendered.

      Set the path to the librarys with config items

      -

      There are some configuration items in javascript library. These can either be set in system/application/config.php, within its own confg/javascript.php file, or within any controller usings the set_item() function.

      +

      There are some configuration items in javascript library. These can either be set in application/config.php, within its own confg/javascript.php file, or within any controller usings the set_item() function.

      An image to be used as an "ajax loader", or progress indicator. Without one, the simple text message of "loading" will appear when Ajax calls need to be made.

      $config['javascript_location'] = 'http://localhost/codeigniter/themes/js/jquery/');
      $config['javascript_ajax_img'] = 'images/ajax-loader.gif';

      diff --git a/user_guide/libraries/jquery.html b/user_guide/libraries/jquery.html index 98c9a9cb..69b8389a 100644 --- a/user_guide/libraries/jquery.html +++ b/user_guide/libraries/jquery.html @@ -81,7 +81,7 @@

      Setup and Configuration

      <?php echo $jquery_script;?>
      <?php echo $script_head;?>

      -

      There are 2 configuration items in jQuery library. These can either be set in system/application/config.php, or within any controller. The first is the path from the root of your site to the jquery library ('js' is the default) and the second is an image to be used as an "ajax loader", or progress indicator. Without one, the simple text message of "loading" will appear when Ajax calls need to be made.

      +

      There are 2 configuration items in jQuery library. These can either be set in application/config.php, or within any controller. The first is the path from the root of your site to the jquery library ('js' is the default) and the second is an image to be used as an "ajax loader", or progress indicator. Without one, the simple text message of "loading" will appear when Ajax calls need to be made.

      $config['javascript_folder'] = 'js';
      $config['javascript_ajax_img'] = 'images/ajax-loader.gif';

      diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 9e50901a..ee78c765 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -64,7 +64,7 @@

      Language Class

      your own language files as needed in order to display error and other messages in other languages.

      Language files are typically stored in your system/language directory. Alternately you can create a folder called language inside -your application folder and store them there. CodeIgniter will look first in your system/application/language +your application folder and store them there. CodeIgniter will look first in your application/language directory. If the directory does not exist or the specified language is not located there CI will instead look in your global system/language folder.

      diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index ce693e0b..98520e77 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -187,14 +187,14 @@

      $this->load->config('file_name')

      Application "Packages"

      -

      An application package allows for the easy distribution of complete sets of resources in a single directory, complete with its own libraries, models, helpers, config, and language files. It is recommended that these packages be placed in the system/application/third_party folder. Below is a sample map of an package directory

      +

      An application package allows for the easy distribution of complete sets of resources in a single directory, complete with its own libraries, models, helpers, config, and language files. It is recommended that these packages be placed in the application/third_party folder. Below is a sample map of an package directory

      Sample Package "Foo Bar" Directory Map

      The following is an example of a directory for an application package named "Foo Bar".

      -/system/application/third_party/foo_bar
      +/application/third_party/foo_bar

      config/
      helpers/
      From 6e50b856d30037a88d878a68d1055fd37a182008 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 25 Mar 2010 10:21:04 -0500 Subject: [PATCH 1908/2544] added .htaccess to application and system folder to help prevent public access if installed in web root --- application/.htaccess | 1 + system/.htaccess | 1 + 2 files changed, 2 insertions(+) create mode 100644 application/.htaccess create mode 100644 system/.htaccess diff --git a/application/.htaccess b/application/.htaccess new file mode 100644 index 00000000..14249c50 --- /dev/null +++ b/application/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file diff --git a/system/.htaccess b/system/.htaccess new file mode 100644 index 00000000..14249c50 --- /dev/null +++ b/system/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file From 3181ae2a93b2c46112040036267d7c1767fe5109 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 25 Mar 2010 10:28:46 -0500 Subject: [PATCH 1909/2544] updated docs to encourage installation of application and system folders above web root --- user_guide/changelog.html | 1 + user_guide/installation/index.html | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7a6ef062..3f569abe 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -68,6 +68,7 @@

      Version 2.0.0

    • Scaffolding, having been deprecated for a number of versions, has been removed.
    • Plugins have been removed, in favor of Helpers. The CAPTCHA plugin has been converted to a Helper and documented. The JavaScript calendar plugin was removed due to the ready availability of great JavaScript calendars, particularly with jQuery.
    • Added new special Library type: Drivers.
      • +
    • Moved the application folder outside of the system folder.
    • Added routing overrides to the main index.php file, enabling the normal routing to be overridden on a per "index" file basis.
    • Added the ability to set config values (or override config values) directly from data set in the main index.php file. This allows a single application to be used with multiple front controllers, each having its own config values.
    • Added $config['directory_trigger'] to the config file so that a controller sub-directory can be specified when running _GET strings instead of URI segments.
      • diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 08f37ac9..a6446131 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -66,9 +66,14 @@

      Installation Instructions

    • If you intend to use a database, open the application/config/database.php file with a text editor and set your database settings.
      • -

      If you wish to increase security by hiding the location of your CodeIgniter files you can rename the system folder -to something more private. If you do rename it, you must open your main index.php file and set the $system_folder -variable at the top of the page with the new name you've chosen.

      +

      If you wish to increase security by hiding the location of your CodeIgniter files you can rename the system and application folders +to something more private. If you do rename them, you must open your main index.php file and set the $system_folder and $application_folder +variables at the top of the file with the new name you've chosen.

      + +

      For the best security, both the system and any application folders should be placed above web root so that they are not directly accessible via a browser. By default, .htaccess files are included in each folder to help prevent direct access, but it is best to remove them from public access entirely in case the web server configuration changes or doesn't abide by the .htaccess.

      + +

      After moving them, open your main index.php file and set the $system_folder and $application_folder variables, preferably with a full path, e.g. '/www/MyUser/system'.

      +

      That's it!

      From 6c1294b5c3c98e26eaa6cb5eaa83dd3921a30348 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 25 Mar 2010 10:32:22 -0500 Subject: [PATCH 1910/2544] code comment typo --- system/core/Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/core/Controller.php b/system/core/Controller.php index 2e44500a..92f7f17f 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -75,7 +75,7 @@ function Controller() } } -// END _Controller class +// END Controller class /* End of file Controller.php */ /* Location: ./system/core/Controller.php */ \ No newline at end of file From d25e66a1824a70c5a2ebfae69b759c3b8a2d02a6 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Sun, 28 Mar 2010 01:07:09 -0500 Subject: [PATCH 1911/2544] Change in the loader and driver docs to force ucfirst() on driver directory names to ensure compatibility on case sensitive file systems. --- system/core/Loader.php | 2 +- user_guide/general/creating_drivers.html | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/system/core/Loader.php b/system/core/Loader.php index 976823f8..292fdc95 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -506,7 +506,7 @@ function driver($library = '', $params = NULL, $object_name = NULL) // and typically identically named to the library if ( ! strpos($library, '/')) { - $library = $library.'/'.$library; + $library = ucfirst($library).'/'.$library; } return $this->library($library, $params, $object_name); diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index 83bec8c5..1f213db4 100644 --- a/user_guide/general/creating_drivers.html +++ b/user_guide/general/creating_drivers.html @@ -57,6 +57,27 @@

      Creating Drivers

      +

      Driver Directory and File Structure

      + +

      Sample driver directory and file structure layout:

      + +
        +
      • /application/libraries/Driver_name +
          +
        • Driver_name.php
          • +
        • drivers +
            +
          • Driver_name_subclass_1.php
            • +
          • Driver_name_subclass_2.php
            • +
          • Driver_name_subclass_3.php
            • +
          +
          • +
        +
        • +
      + +

      NOTE: In order to maintain compatibility on case-sensitive file systems, the Driver_name directory must be ucfirst()

      + From d6d70e327b74018ab1cd59185a0dc970cd0711be Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 29 Mar 2010 10:10:27 -0500 Subject: [PATCH 1912/2544] fixed casing of EllisLab --- user_guide/changelog.html | 2 +- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/forge.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/doc_style/index.html | 4 ++-- user_guide/doc_style/template.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/common_functions.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_drivers.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 4 ++-- user_guide/general/drivers.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/reserved_names.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/styleguide.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/captcha_helper.html | 2 +- user_guide/helpers/compatibility_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/email_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/language_helper.html | 2 +- user_guide/helpers/number_helper.html | 2 +- user_guide/helpers/path_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_153.html | 2 +- user_guide/installation/upgrade_154.html | 2 +- user_guide/installation/upgrade_160.html | 2 +- user_guide/installation/upgrade_161.html | 2 +- user_guide/installation/upgrade_162.html | 2 +- user_guide/installation/upgrade_163.html | 2 +- user_guide/installation/upgrade_170.html | 2 +- user_guide/installation/upgrade_171.html | 2 +- user_guide/installation/upgrade_172.html | 2 +- user_guide/installation/upgrade_200.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/cart.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/form_validation.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/javascript.html | 2 +- user_guide/libraries/jquery.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/security.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/typography.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/validation.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/cheatsheets.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/getting_started.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 130 files changed, 132 insertions(+), 132 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3f569abe..3006de75 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -1169,7 +1169,7 @@

      Version Beta 1.0

      User Guide Home   ·   Next Topic:  Credits

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 5703dcfe..6977302a 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -750,7 +750,7 @@

      $this->db->flush_cache()

      User Guide Home   ·   Next Topic:  Transactions

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 8064d344..d5ed5885 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -213,7 +213,7 @@

      $this->db->cache_delete_all()

      User Guide Home   ·   Next Topic:  Database manipulation with Database Forge

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 7c01a770..fe09d2b1 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -111,7 +111,7 @@

      $this->db->call_function();

      User Guide Home   ·   Next Topic:  Query Caching

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 1844aa05..7b1b7003 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -159,7 +159,7 @@

      Explanation of Values:

      User Guide Home   ·   Next Topic:  Connecting to your Database

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index bd910a41..3ce40562 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -181,7 +181,7 @@

      Manually closing the Connection

      User Guide Home   ·   Next Topic:  Queries

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 6b4b6390..41cfba0e 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -210,7 +210,7 @@

      Active Record Insert

      User Guide Home   ·   Next Topic:  Database Configuration

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index bbf2912e..30d39a42 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -156,7 +156,7 @@

      $this->db->field_data()

      User Guide Home   ·   Next Topic:  Custom Function Calls

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index 6ba3702c..28b32d96 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -227,7 +227,7 @@

      $this->dbforge->modify_column()

      Top of Page   ·   User Guide Home   ·   Next Topic:  Database Utilities Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index d60f1619..b7b8a538 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -144,7 +144,7 @@

      $this->db->update_string();

      User Guide Home   ·   Next Topic:  Active Record Pattern

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 868e00d2..45d15dba 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -92,7 +92,7 @@

      The Database Class

      User Guide Home   ·   Next Topic:  Quick Start: Usage Examples

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 0fb05c88..dbb3e5c7 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -146,7 +146,7 @@

      Query Bindings

      User Guide Home   ·   Next Topic:  Query Results

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 784ea324..9eaa1793 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -231,7 +231,7 @@

      $query->free_result()

      User Guide Home   ·   Next Topic:  Query Helper Functions

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 837e04d2..c85408fa 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -106,7 +106,7 @@

      $this->db->table_exists();

      User Guide Home   ·   Next Topic:   Field Metadata

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index 19edfb8e..c6ecac6f 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -193,7 +193,7 @@

      Running Transactions Manually

      User Guide Home   ·   Next Topic:  Table Metadata

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 3d08182a..1ce63d3a 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -307,7 +307,7 @@

      Description of Backup Preferences

      Top of Page   ·   User Guide Home   ·   Next Topic:   Email Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index e0dc9741..753b9d42 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -57,7 +57,7 @@

      Writing Documentation

      -

      To help facilitate a consistent, easy-to-read documentation style for CodeIgniter projects, Ellislab is making the markup and CSS from the CodeIgniter user guide freely available to the community for their use. For your convenience, a template file has been created that includes the primary blocks of markup used with brief samples.

      +

      To help facilitate a consistent, easy-to-read documentation style for CodeIgniter projects, EllisLab is making the markup and CSS from the CodeIgniter user guide freely available to the community for their use. For your convenience, a template file has been created that includes the primary blocks of markup used with brief samples.

      Files

      @@ -79,7 +79,7 @@

      Files

      Top of Page   ·   User Guide Home   ·  

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/doc_style/template.html b/user_guide/doc_style/template.html index 05bdafd0..26831ac0 100644 --- a/user_guide/doc_style/template.html +++ b/user_guide/doc_style/template.html @@ -121,7 +121,7 @@

      $this->foo->bar()

      User Guide Home   ·   Next Topic:  Next Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 4879076e..b9069a8b 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -140,7 +140,7 @@

      Alternative Control Structures

      User Guide Home   ·   Next Topic:  Security

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index 9e711a8c..92a8fd95 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -110,7 +110,7 @@

      get_instance()

      User Guide Home   ·   Next Topic:  Auto-loading Resources

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index d697c8a9..adcd2269 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -93,7 +93,7 @@

      Auto-loading Resources

      Top of Page   ·   User Guide Home   ·   Next Topic:  Common Functions

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 59edade3..5c1bcfd0 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -108,7 +108,7 @@

      Deleting Caches

      User Guide Home   ·   Next Topic:  Profiling Your Application

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index c04144a5..196e3777 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -112,7 +112,7 @@

      set_status_header(code, 'text');

      Top of Page   ·   User Guide Home   ·   Next Topic:  URI Routing

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index b0cbc058..9658df87 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -378,7 +378,7 @@

      That's it!

      Top of Page   ·   User Guide Home   ·   Next Topic:  Reserved Names

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 6ffafca5..a7503459 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -178,7 +178,7 @@

      Setting Your Own Prefix

      User Guide Home   ·   Next Topic:  Hooks - Extending the Core

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index 1f213db4..920cc16c 100644 --- a/user_guide/general/creating_drivers.html +++ b/user_guide/general/creating_drivers.html @@ -93,7 +93,7 @@

      Driver Directory and File Structure

      User Guide Home   ·   Next Topic:  Creating Core System Classes

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 721e60dd..0b4d642a 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -291,7 +291,7 @@

      Setting Your Own Prefix

      User Guide Home   ·   Next Topic:  Using CodeIgniter Drivers

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index 410f9598..b77528a7 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -58,7 +58,7 @@

      Credits

      CodeIgniter was originally developed by Rick Ellis (CEO of -Ellislab, Inc.). The framework was written for performance in the real +EllisLab, Inc.). The framework was written for performance in the real world, with many of the class libraries, helpers, and sub-systems borrowed from the code-base of ExpressionEngine.

      @@ -79,7 +79,7 @@

      Credits

      User Guide Home   ·   Next Topic:  Downloading CodeIgniter

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index 649b6d4d..9c86f021 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -97,7 +97,7 @@

      Creating Your Own Drivers

      User Guide Home   ·   Next Topic:  Creating Drivers

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 17e21003..7c585d1b 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -131,7 +131,7 @@

      log_message('level', 'message')

      User Guide Home   ·   Next Topic:  Page Caching

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 5ba1674c..98c0dca8 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -178,7 +178,7 @@

      Now What?

      User Guide Home   ·   Next Topic:  Using Libraries

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 44072380..0d87f3b2 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -158,7 +158,7 @@

      Hook Points

      User Guide Home   ·   Next Topic:  Auto-loading Resources

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 2634b18a..cd83da74 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -87,7 +87,7 @@

      Creating Your Own Libraries

      User Guide Home   ·   Next Topic:  Creating Libraries

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 9f23de4b..04af6e6a 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -126,7 +126,7 @@

      Running Multiple Applications with one CodeIgniter Installation

      User Guide Home   ·   Next Topic:  Alternative PHP Syntax

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 91972686..e04fdf99 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -244,7 +244,7 @@

      Connecting to your Database

      User Guide Home   ·   Next Topic:  Helpers

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index f8650314..47c1a5ab 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -169,7 +169,7 @@

      Enabling and Disabling Profiler Sections

      User Guide Home   ·   Next Topic:  Managing Applications

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index 2b651756..d90e9620 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -70,7 +70,7 @@

      Quick Reference Chart

      Top of Page   ·   User Guide Home

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index c74a3c0b..2757e430 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -75,7 +75,7 @@

      Server Requirements

      User Guide Home   ·   Next Topic:  License Agreement

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 57373279..0984845f 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -145,7 +145,7 @@

      Constants

      Top of Page   ·   User Guide Home   ·   Next Topic:  Views

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 402e50a2..a423eaa8 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -159,7 +159,7 @@

      Reserved Routes

      User Guide Home   ·   Next Topic:  Error Handling

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/security.html b/user_guide/general/security.html index bc969f73..1a0ed13f 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -146,7 +146,7 @@

      Best Practices

      User Guide Home   ·   Next Topic:  PHP Style Guide

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index b523d5a1..5be636a4 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -680,7 +680,7 @@

      Overlapping Tag Parameters

      User Guide Home   ·   Next Topic:  Writing Documentation

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 7dbd7fe5..abddea83 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -144,7 +144,7 @@

      Enabling Query Strings

      Top of Page   ·   User Guide Home   ·   Next Topic:  Controllers

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 9c124d91..10744694 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -267,7 +267,7 @@

      Returning views as data

      User Guide Home   ·   Next Topic:  Models

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index ede12072..c0bdd78e 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -112,7 +112,7 @@

      random_element()

      Top of Page   ·   User Guide Home   ·   Next Topic:  Compatibility Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index f358af19..c4aa65fa 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -188,7 +188,7 @@

      Adding a Database

      Top of Page   ·   User Guide Home

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/compatibility_helper.html b/user_guide/helpers/compatibility_helper.html index d43e7746..de8c49d0 100644 --- a/user_guide/helpers/compatibility_helper.html +++ b/user_guide/helpers/compatibility_helper.html @@ -111,7 +111,7 @@

      stripos()

      User Guide Home   ·   Next Topic:  Cookie Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index d7120d51..d0471d71 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -100,7 +100,7 @@

      delete_cookie()

      Top of Page   ·   User Guide Home   ·   Next Topic:  Date Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index a5c46f3d..2d908705 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -401,7 +401,7 @@

      Timezone Reference

      User Guide Home   ·   Next Topic:  Directory Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index d0799c7c..2324252d 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -136,7 +136,7 @@

      directory_map('source directory')

      User Guide Home   ·   Next Topic:  Download Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index b0e7da09..4c0e2017 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -105,7 +105,7 @@

      force_download('filename', 'data')

      Top of Page   ·   User Guide Home   ·   Next Topic:  Email Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index 01d3faa3..0084ada1 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -95,7 +95,7 @@

      send_email('recipient', 'subject', 'message Top of Page   ·   User Guide Home   ·   Next Topic:  File Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 4c5b4927..dd9df954 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -172,7 +172,7 @@

      octal_permissions($perms)

      Top of Page   ·   User Guide Home   ·   Next Topic:  Form Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index fa44f6b0..03a60685 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -477,7 +477,7 @@

      set_radio()

      User Guide Home   ·   Next Topic:  HTML Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index b79b92b0..a0ac8bdd 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -378,7 +378,7 @@

      doctype()

      Top of Page   ·   User Guide Home   ·   Next Topic:   Path Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 4ba6820a..9dcd1fc7 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -144,7 +144,7 @@

      humanize()

      User Guide Home   ·   Next Topic:  Number Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 4dede49c..ada6c60e 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -91,7 +91,7 @@

      lang('language line', 'element id')

      User Guide Home   ·   Next Topic:  Download Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index c2fc685b..9274e0cf 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -106,7 +106,7 @@

      byte_format()

      User Guide Home   ·   Next Topic:  Path Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index 15118674..c1d7b020 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -99,7 +99,7 @@

       

      User Guide Home   ·   Next Topic:  Security Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 351a5047..97be674a 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -119,7 +119,7 @@

      encode_php_tags()

      Top of Page   ·   User Guide Home   ·   Next Topic:  Smiley Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 2e050b93..661330aa 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -208,7 +208,7 @@

      parse_smileys()

      User Guide Home   ·   Next Topic:  String Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 71a8ef77..2b12c2a2 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -171,7 +171,7 @@

      strip_quotes()

      User Guide Home   ·   Next Topic:  Text Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 0e075b9d..d477f53a 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -192,7 +192,7 @@

      word_wrap()

      User Guide Home   ·   Next Topic:  Typography Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index ae4ade11..96a68e9f 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -105,7 +105,7 @@

      nl2br_except_pre()

      User Guide Home   ·   Next Topic:  URL Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 96da0c62..5b478024 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -281,7 +281,7 @@

      redirect()

      User Guide Home   ·   Next Topic:  XML Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index caf8239b..50179ce4 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -98,7 +98,7 @@

      xml_convert('string')

      Top of Page   ·   User Guide Home

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/index.html b/user_guide/index.html index f6264fdb..a1d56d48 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -90,7 +90,7 @@

      Who is CodeIgniter For?

      diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 0f0243e5..f4114b7d 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -102,7 +102,7 @@

      Mercurial Server

      User Guide Home   ·   Next Topic:  Installation Instructions

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index a6446131..3d58725e 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -95,7 +95,7 @@

      Installation Instructions

      Next Topic:  Upgrading from a Previous Version

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index e6ab9a98..0c05ed60 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -83,7 +83,7 @@

      Troubleshooting

      User Guide Home   ·   Next Topic:  CodeIgniter at a Glance

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index ab09a7bc..ec947274 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -85,7 +85,7 @@

      Upgrading From Beta 1.0 to Final 1.2

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index b85d92d5..bd43dd9e 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -196,7 +196,7 @@

      Step 6: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 43fc1680..db02b481 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -95,7 +95,7 @@

      Step 2: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index 52396dca..2caf9771 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -93,7 +93,7 @@

      Step 2: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index f3dec87f..e3d05814 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -105,7 +105,7 @@

      Step 3: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 2d502717..1d6b7ec0 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -138,7 +138,7 @@

      Step 3: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index d400f98b..12112803 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -141,7 +141,7 @@

      Step 4: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 07ee9c21..7e9bfa8c 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -171,7 +171,7 @@

      Step 5: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index c8f1ad3e..0b386a66 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -104,7 +104,7 @@

      Step 2: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index 042dd9ba..b32130dc 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -93,7 +93,7 @@

      Step 2: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index b1bc8bb8..33fbef4b 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -109,7 +109,7 @@

      Step 4: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index 5568f8ca..e0e987ed 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -118,7 +118,7 @@

      Step 5: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index fcfa0a06..81d592c5 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -91,7 +91,7 @@

      Step 2: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index c9eb2bfe..630fc3fe 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -99,7 +99,7 @@

      Step 5: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index 9f39e21b..222b7b4b 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -92,7 +92,7 @@

      Step 2: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index d3892cf8..9db3add8 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -114,7 +114,7 @@

      Step 4: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index 32dab56d..d9cbcc00 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -91,7 +91,7 @@

      Step 2: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index fb035667..8482cb25 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -98,7 +98,7 @@

      Step 3: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index 3f6bb129..f45875b3 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -104,7 +104,7 @@

      Step 3: Update your user guide

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index 52a6d84e..8604d514 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -137,7 +137,7 @@

      Step 5: Edit your config file

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 41ff226a..6df93b12 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -94,7 +94,7 @@

      Upgrading From a Previous Version

      User Guide Home   ·   Next Topic:  Troubleshooting

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index d82c3223..79f7fedb 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -191,7 +191,7 @@

      Displaying Memory Consumption

      User Guide Home   ·   Next Topic:  Calendar Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index f6a96022..74a8619b 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -242,7 +242,7 @@

      Creating a Calendar Template

      User Guide Home   ·   Next Topic:  Cart Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index 698f438b..4d458f57 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -339,7 +339,7 @@

      $this->cart->destroy();

      User Guide Home   ·   Next Topic:  Config Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 54462c79..bdabe8db 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -174,7 +174,7 @@

      $this->config->system_url();

      User Guide Home   ·   Next Topic:  Database Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 9fa68d79..e144826b 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -300,7 +300,7 @@

      Overriding Word Wrapping

      User Guide Home   ·   Next Topic:  Encryption Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index adcd7dc5..dac1db91 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -183,7 +183,7 @@

      $this->encrypt->sha1();

      User Guide Home   ·   Next Topic:  File Uploading Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 60290b18..d143f5b6 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -441,7 +441,7 @@

      Explanation

      User Guide Home   ·   Next Topic:  Form Validation Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index ec1357e5..2099135a 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -1214,7 +1214,7 @@

      set_radio()

      User Guide Home   ·   Next Topic:  FTP Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index b5194e8a..a46b155b 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -309,7 +309,7 @@

      $this->ftp->close();

      User Guide Home   ·   Next Topic:  HTML Table Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 2e92fdf7..3dce50bf 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -660,7 +660,7 @@

      Overlay Preferences

      User Guide Home   ·   Next Topic:  Input Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 055f12bf..4c12fd7b 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -247,7 +247,7 @@

      $this->input->user_agent()

      User Guide Home   ·   Next Topic:  Loader Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index ac0af840..7f0eed9f 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -97,7 +97,7 @@

      Set the path to the librarys with config items

      Top of Page   ·   User Guide Home   ·   Next Topic:  Language Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/jquery.html b/user_guide/libraries/jquery.html index 69b8389a..6dec7dda 100644 --- a/user_guide/libraries/jquery.html +++ b/user_guide/libraries/jquery.html @@ -229,7 +229,7 @@

      calendar()

      Top of Page   ·   User Guide Home   ·   Next Topic:  Language Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index ee78c765..c37f0092 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -130,7 +130,7 @@

      Auto-loading Languages

      User Guide Home   ·   Next Topic:  Output Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 98520e77..d9a3787c 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -248,7 +248,7 @@

      Package view files

      User Guide Home   ·   Next Topic:  Language Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 41104808..eeb27837 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -155,7 +155,7 @@

      Parsing Execution Variables

      User Guide Home   ·   Next Topic:  Pagination Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index d6b260be..21c7763f 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -211,7 +211,7 @@

      $config['num_tag_close'] = '</div>';

      User Guide Home   ·   Next Topic:  Session Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 19ad6dec..ece61c1f 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -205,7 +205,7 @@

      Variable Pairs

      User Guide Home   ·   Next Topic:  Typography

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index d5d72538..a50d9484 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -116,7 +116,7 @@

      $this->security->sanitize_filename()

      User Guide Home   ·   Next Topic:  Session Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 31b4047e..58f2148c 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -304,7 +304,7 @@

      Session Preferences

      User Guide Home   ·   Next Topic:  Trackback Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index c871d7cb..f1a46fca 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -308,7 +308,7 @@

      $this->table->function

      User Guide Home   ·   Next Topic:  Image Manipulation Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 30720601..a07b8d1f 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -239,7 +239,7 @@

      Notes:

      User Guide Home   ·   Next Topic:  Template Parser Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 9db565a1..ac53e880 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -153,7 +153,7 @@

      protect_braced_quotes

      User Guide Home   ·   Next Topic:  Unit Testing Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index ede938cd..0e7d1d69 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -219,7 +219,7 @@

      Creating a Template

      User Guide Home   ·   Next Topic:  URI Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index ae420d78..b2f5ac3d 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -245,7 +245,7 @@

      $this->uri->rsegment_array()

      User Guide Home   ·   Next Topic:  User Agent Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 6de6b6e6..944f1ed8 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -194,7 +194,7 @@

      $this->agent->accept_charset()

      User Guide Home   ·   Next Topic:  XML-RPC Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index dc7915c6..d62ca01b 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -733,7 +733,7 @@

      set_radio()

      User Guide Home   ·   Next Topic:  XML-RPC Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 6e929f1f..939e9456 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -512,7 +512,7 @@

      Data Types

      User Guide Home   ·   Next Topic:  Zip Encoding Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index d8b3ea36..44603f2b 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -271,7 +271,7 @@

      $this->zip->clear_data()

      User Guide Home   ·   Next Topic:  Array Helper

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/license.html b/user_guide/license.html index 354c08c4..c76035d1 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -100,7 +100,7 @@

      Limitations of Liability

      User Guide Home   ·   Next Topic:  Change Log

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 4881fd74..804c81d0 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -88,7 +88,7 @@

      Application Flow Chart

      User Guide Home   ·   Next Topic:  Model-View-Controller

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index be7e5e26..f0731372 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -165,7 +165,7 @@

      CodeIgniter has a Friendly Community of Users

      User Guide Home   ·   Next Topic:  CodeIgniter Cheatsheets

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index 1232bd67..cf200e08 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -76,7 +76,7 @@

      Helpers Reference

      User Guide Home   ·   Next Topic:  CodeIgniter Features

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 5fdb4f09..375403a6 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -112,7 +112,7 @@

      CodeIgniter Features

      User Guide Home   ·   Next Topic:  Application Flow Chart

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index 3bcfdcc0..88027eed 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -85,7 +85,7 @@

      Getting Started With CodeIgniter

      User Guide Home   ·   Next Topic:  CodeIgniter At a Glance

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index f6fa103e..e708753e 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -91,7 +91,7 @@

      Design and Architectural Goals

      User Guide Home   ·   Next Topic:  Getting Started

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index 5b930a48..3cb56f42 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -77,7 +77,7 @@

      CodeIgniter Overview

      diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 05e22d90..d0b1aa2e 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -93,7 +93,7 @@

      Model-View-Controller

      User Guide Home   ·   Next Topic:  Architectural Goals

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/toc.html b/user_guide/toc.html index 4f02d11b..6f222d15 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -200,7 +200,7 @@

      Additional Resources

      From 133e66626bb410571a8350376d3f81ed8bc9143f Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 29 Mar 2010 11:36:42 -0500 Subject: [PATCH 1913/2544] fixed a bug where a PHP error would result when passing objects as values to the Session class --- system/libraries/Session.php | 17 +++++++++++++---- user_guide/changelog.html | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/system/libraries/Session.php b/system/libraries/Session.php index bd942681..cf6dc96e 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -680,12 +680,18 @@ function _serialize($data) { foreach ($data as $key => $val) { - $data[$key] = str_replace('\\', '{{slash}}', $val); + if (is_string($val)) + { + $data[$key] = str_replace('\\', '{{slash}}', $val); + } } } else { - $data = str_replace('\\', '{{slash}}', $data); + if (is_string($data)) + { + $data = str_replace('\\', '{{slash}}', $data); + } } return serialize($data); @@ -711,13 +717,16 @@ function _unserialize($data) { foreach ($data as $key => $val) { - $data[$key] = str_replace('{{slash}}', '\\', $val); + if (is_string($val)) + { + $data[$key] = str_replace('{{slash}}', '\\', $val); + } } return $data; } - return str_replace('{{slash}}', '\\', $data); + return (is_string($data)) ? str_replace('{{slash}}', '\\', $data) : $data; } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3006de75..dff273d9 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -153,6 +153,7 @@

      Bug fixes for 2.0.0

    • Fixed a bug (#10470) where get_mime_by_extension() was case sensitive.
    • Fixed a bug where some error messages for the SQLite and Oracle drivers would not display.
    • Fixed a bug where files created with the Zip Library would result in file creation dates of 1980.
      • +
    • Fixed a bug in the Session library that would result in PHP error when attempting to store values with objects.
    • Fixed a bug where extending the Controller class would result in a fatal PHP error.
    From b7054751900fd6dfc6837d0e1fda57c416063cf6 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 30 Mar 2010 08:49:37 -0500 Subject: [PATCH 1914/2544] fixed syntax error in documentation example for XML-RPC send_response() method --- user_guide/libraries/xmlrpc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 939e9456..8d1dbdf5 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -476,7 +476,7 @@

    $this->xmlrpc->send_response()

    $response = array(
                     array(
                            'flerror' => array(FALSE, 'boolean'),
    -                        'message' => "Thanks for the ping!")
    +                        'message' => "Thanks for the ping!"
                         )
                     'struct');
    return $this->xmlrpc->send_response($response);     From 4bde110ec6769fe0fd0194be602fd3ed85c52bc7 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 30 Mar 2010 08:56:53 -0500 Subject: [PATCH 1915/2544] fixed a fatal PHP error in SQLite Forge _create_table() --- system/database/drivers/sqlite/sqlite_forge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php index b7d25e75..53b20a3c 100644 --- a/system/database/drivers/sqlite/sqlite_forge.php +++ b/system/database/drivers/sqlite/sqlite_forge.php @@ -77,7 +77,7 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) $sql = 'CREATE TABLE '; // IF NOT EXISTS added to SQLite in 3.3.0 - if ($if_not_exists === TRUE && version_compare($this->_version(), '3.3.0', '>=') === TRUE) + if ($if_not_exists === TRUE && version_compare($this->db->_version(), '3.3.0', '>=') === TRUE) { $sql .= 'IF NOT EXISTS '; } From a091147feb0331e758b74e7ea13f6ebcb645cd9b Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 30 Mar 2010 10:33:09 -0500 Subject: [PATCH 1916/2544] moved entity_decode() to the Security library to handle an issue with HTML in input when the global XSS filter is enabled --- system/helpers/typography_helper.php | 38 ++----------------- system/libraries/Security.php | 55 ++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 38 deletions(-) diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php index 712b5750..e45480e1 100644 --- a/system/helpers/typography_helper.php +++ b/system/helpers/typography_helper.php @@ -76,15 +76,6 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea * * This function is a replacement for html_entity_decode() * - * In some versions of PHP the native function does not work - * when UTF-8 is the specified character set, so this gives us - * a work-around. More info here: - * http://bugs.php.net/bug.php?id=25670 - * - * NOTE: html_entity_decode() has a bug in some PHP versions when UTF-8 is the - * character set, and the PHP developers said they were not back porting the - * fix to versions other than PHP 5.x. - * * @access public * @param string * @return string @@ -93,32 +84,9 @@ function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebrea { function entity_decode($str, $charset='UTF-8') { - if (stristr($str, '&') === FALSE) return $str; - - // The reason we are not using html_entity_decode() by itself is because - // while it is not technically correct to leave out the semicolon - // at the end of an entity most browsers will still interpret the entity - // correctly. html_entity_decode() does not convert entities without - // semicolons, so we are left with our own little solution here. Bummer. - - if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR version_compare(phpversion(), '5.0.0', '>='))) - { - $str = html_entity_decode($str, ENT_COMPAT, $charset); - $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str); - return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str); - } - - // Numeric Entities - $str = preg_replace('~&#x(0*[0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str); - $str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str); - - // Literal Entities - Slightly slow so we do another check - if (stristr($str, '&') === FALSE) - { - $str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES))); - } - - return $str; + $CI =& get_instance(); + $CI->load->library('security'); + return $CI->security->entity_decode($str, $charset); } } diff --git a/system/libraries/Security.php b/system/libraries/Security.php index 93da5920..60adf0a2 100644 --- a/system/libraries/Security.php +++ b/system/libraries/Security.php @@ -648,13 +648,62 @@ function _filter_attributes($str) */ function _decode_entity($match) { - $CI =& get_instance(); - $CI->load->helper('typography'); - return entity_decode($match[0], strtoupper($CI->config->item('charset'))); + return $this->entity_decode($match[0], strtoupper(config_item('charset'))); } // -------------------------------------------------------------------- + /** + * HTML Entities Decode + * + * This function is a replacement for html_entity_decode() + * + * In some versions of PHP the native function does not work + * when UTF-8 is the specified character set, so this gives us + * a work-around. More info here: + * http://bugs.php.net/bug.php?id=25670 + * + * NOTE: html_entity_decode() has a bug in some PHP versions when UTF-8 is the + * character set, and the PHP developers said they were not back porting the + * fix to versions other than PHP 5.x. + * + * @access public + * @param string + * @param string + * @return string + */ + function entity_decode($str, $charset='UTF-8') + { + if (stristr($str, '&') === FALSE) return $str; + + // The reason we are not using html_entity_decode() by itself is because + // while it is not technically correct to leave out the semicolon + // at the end of an entity most browsers will still interpret the entity + // correctly. html_entity_decode() does not convert entities without + // semicolons, so we are left with our own little solution here. Bummer. + + if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR is_php('5.0.0'))) + { + $str = html_entity_decode($str, ENT_COMPAT, $charset); + $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str); + return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str); + } + + // Numeric Entities + $str = preg_replace('~&#x(0*[0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str); + $str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str); + + // Literal Entities - Slightly slow so we do another check + if (stristr($str, '&') === FALSE) + { + $str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES))); + } + + return $str; + } + + // -------------------------------------------------------------------- + /** * Filename Security * From aaa19bce2b8fb549442a679cba1382510770ddff Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 31 Mar 2010 21:43:21 -0500 Subject: [PATCH 1917/2544] Fixing Validation error in output profiler --- system/libraries/Profiler.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index b2c008fc..3285bc53 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -434,8 +434,6 @@ function _compile_http_headers() $output .= "\n"; $output .= ""; - $output .= ""; - return $output; } @@ -467,8 +465,6 @@ function _compile_config() $output .= "\n"; $output .= ""; - $output .= ""; - return $output; } From 3fff87d3c7f7374fae3c4013d4ba1c7ba10f17be Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 7 Apr 2010 14:23:01 -0500 Subject: [PATCH 1918/2544] Fixing typo in XMLRpc error message: http://codeigniter.com/bug_tracker/bug/11556/ --- system/libraries/Xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index 2e0df5c9..ee04400f 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -112,7 +112,7 @@ function CI_Xmlrpc ($config = array()) $this->xmlrpcerr['unknown_method'] = '1'; $this->xmlrpcstr['unknown_method'] = 'This is not a known method for this XML-RPC Server'; $this->xmlrpcerr['invalid_return'] = '2'; - $this->xmlrpcstr['invalid_return'] = 'The XML data receieved was either invalid or not in the correct form for XML-RPC. Turn on debugging to examine the XML data further.'; + $this->xmlrpcstr['invalid_return'] = 'The XML data received was either invalid or not in the correct form for XML-RPC. Turn on debugging to examine the XML data further.'; $this->xmlrpcerr['incorrect_params'] = '3'; $this->xmlrpcstr['incorrect_params'] = 'Incorrect parameters were passed to method'; $this->xmlrpcerr['introspect_unknown'] = '4'; From 1101602e32c32dcac3fe23b8c43892c3d41a58df Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Thu, 8 Apr 2010 11:29:40 -0500 Subject: [PATCH 1919/2544] Fix #15 - Strict Standards Error in index.php --- index.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 47f1ae9e..fa34c651 100644 --- a/index.php +++ b/index.php @@ -134,7 +134,7 @@ define('FCPATH', str_replace(SELF, '', __FILE__)); // Name of the "system folder" - define('SYSDIR', end(explode('/', trim(BASEPATH, '/')))); + define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/')); // The path to the "application" folder diff --git a/user_guide/changelog.html b/user_guide/changelog.html index dff273d9..12a4dc92 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -155,6 +155,7 @@

    Bug fixes for 2.0.0

  • Fixed a bug where files created with the Zip Library would result in file creation dates of 1980.
  • Fixed a bug in the Session library that would result in PHP error when attempting to store values with objects.
  • Fixed a bug where extending the Controller class would result in a fatal PHP error.
    • +
  • Fixed a PHP Strict Standards Error in the index.php file.

    • Version 1.7.2

    From 0846d746cfe30f827dd20952a6b492ec4b61de95 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Thu, 8 Apr 2010 11:47:33 -0500 Subject: [PATCH 1920/2544] Update to realpath() check of SYSDIR in index.php --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index fa34c651..0eef7b89 100644 --- a/index.php +++ b/index.php @@ -102,7 +102,7 @@ * Resolve the system path for increased reliability * --------------------------------------------------------------- */ - if (function_exists('realpath') AND @realpath($system_path) !== FALSE) + if (realpath($system_path) !== FALSE) { $system_path = realpath($system_path).'/'; } From 73c19fc2e15bb542053bc347ee922ceb26114696 Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Fri, 9 Apr 2010 11:18:26 -0400 Subject: [PATCH 1921/2544] Modified get_file_info in the file helper, changing filectime() to filemtime() for dates. --- system/helpers/file_helper.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 274c4ad3..448bf275 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -305,7 +305,7 @@ function get_file_info($file, $returned_values = array('name', 'server_path', 's $fileinfo['size'] = filesize($file); break; case 'date': - $fileinfo['date'] = filectime($file); + $fileinfo['date'] = filemtime($file); break; case 'readable': $fileinfo['readable'] = is_readable($file); diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 12a4dc92..21c35d6a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -117,6 +117,7 @@

    Version 2.0.0

  • Added an optional second parameter to byte_format() in the Number Helper to allow for decimal precision.
  • Added alpha, and sha1 string types to random_string() in the String Helper.
  • Modified prep_url() so as to not prepend http:// if the supplied string already has a scheme.
    • +
  • Modified get_file_info in the file helper, changing filectime() to filemtime() for dates.
  • Other Changes From 676e1cda78b7bc4eede7cad509a8d9f015a51816 Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Fri, 9 Apr 2010 21:16:16 +0200 Subject: [PATCH 1922/2544] Adding output library exceptions for servers with zlib.output_compression enabled. --- system/core/Output.php | 15 ++++++++++++++- user_guide/changelog.html | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/system/core/Output.php b/system/core/Output.php index ac412940..e25e6219 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -34,10 +34,13 @@ class CI_Output { var $enable_profiler = FALSE; var $parse_exec_vars = TRUE; // whether or not to parse variables like {elapsed_time} and {memory_usage} + var $_zlib_oc = FALSE; var $_profiler_sections = array(); function CI_Output() { + $this->_zlib_oc = @ini_get('zlib.output_compression'); + log_message('debug', "Output Class Initialized"); } @@ -111,6 +114,16 @@ function append_output($output) */ function set_header($header, $replace = TRUE) { + // If zlib.output_compression is enabled it will compress the output, + // but it will not modify the content-length header to compensate for + // the reduction, causing the browser to hang waiting for more data. + // We'll just skip content-length in those cases. + + if ($this->_zlib_oc && strncasecmp($header, 'content-length', 14) == 0) + { + return; + } + $this->headers[] = array($header, $replace); } @@ -234,7 +247,7 @@ function _display($output = '') // -------------------------------------------------------------------- // Is compression requested? - if ($CFG->item('compress_output') === TRUE) + if ($CFG->item('compress_output') === TRUE && $this->_zlib_oc == FALSE) { if (extension_loaded('zlib')) { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 21c35d6a..14d173ab 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -128,6 +128,7 @@

    Version 2.0.0

  • get_mime_by_extension() is now case insensitive.
  • Added "default" to the list Reserved Names.
  • Added 'application/x-msdownload' for .exe files and ''application/x-gzip-compressed' for .tgz files to config/mimes.php.
    • +
  • Updated the output library to no longer compress output or send content-length headers if the server runs with zlib.output_compression enabled.
  • Eliminated a call to is_really_writable() on each request unless it is really needed (Output caching)
  • Documented append_output() in the Output Class.
  • Documented a second argument in the decode() function for the Encryption Class.
    • From ef88a906ed8b2050f4c6e6d8fbd73cc5b6adc7a3 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 14 Apr 2010 18:22:23 -0500 Subject: [PATCH 1923/2544] Removing deprecated Validation class. Form_validation going forward! Removed references to the validation classes documentation page in the changelog as well. --- system/libraries/Validation.php | 875 --------------------------- user_guide/changelog.html | 11 +- user_guide/libraries/validation.html | 740 ---------------------- 3 files changed, 6 insertions(+), 1620 deletions(-) delete mode 100644 system/libraries/Validation.php delete mode 100644 user_guide/libraries/validation.html diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php deleted file mode 100644 index a42b7760..00000000 --- a/system/libraries/Validation.php +++ /dev/null @@ -1,875 +0,0 @@ -'; - var $_error_suffix = '

    '; - - - - /** - * Constructor - * - */ - function CI_Validation() - { - $this->CI =& get_instance(); - - if (function_exists('mb_internal_encoding')) - { - mb_internal_encoding($this->CI->config->item('charset')); - } - - log_message('debug', "Validation Class Initialized"); - } - - // -------------------------------------------------------------------- - - /** - * Set Fields - * - * This function takes an array of field names as input - * and generates class variables with the same name, which will - * either be blank or contain the $_POST value corresponding to it - * - * @access public - * @param string - * @param string - * @return void - */ - function set_fields($data = '', $field = '') - { - if ($data == '') - { - if (count($this->_fields) == 0) - { - return FALSE; - } - } - else - { - if ( ! is_array($data)) - { - $data = array($data => $field); - } - - if (count($data) > 0) - { - $this->_fields = $data; - } - } - - foreach($this->_fields as $key => $val) - { - $this->$key = ( ! isset($_POST[$key])) ? '' : $this->prep_for_form($_POST[$key]); - - $error = $key.'_error'; - if ( ! isset($this->$error)) - { - $this->$error = ''; - } - } - } - - // -------------------------------------------------------------------- - - /** - * Set Rules - * - * This function takes an array of field names and validation - * rules as input ad simply stores is for use later. - * - * @access public - * @param mixed - * @param string - * @return void - */ - function set_rules($data, $rules = '') - { - if ( ! is_array($data)) - { - if ($rules == '') - return; - - $data = array($data => $rules); - } - - foreach ($data as $key => $val) - { - $this->_rules[$key] = $val; - } - } - - // -------------------------------------------------------------------- - - /** - * Set Error Message - * - * Lets users set their own error messages on the fly. Note: The key - * name has to match the function name that it corresponds to. - * - * @access public - * @param string - * @param string - * @return string - */ - function set_message($lang, $val = '') - { - if ( ! is_array($lang)) - { - $lang = array($lang => $val); - } - - $this->_error_messages = array_merge($this->_error_messages, $lang); - } - - // -------------------------------------------------------------------- - - /** - * Set The Error Delimiter - * - * Permits a prefix/suffix to be added to each error message - * - * @access public - * @param string - * @param string - * @return void - */ - function set_error_delimiters($prefix = '

    ', $suffix = '

    ') - { - $this->_error_prefix = $prefix; - $this->_error_suffix = $suffix; - } - - // -------------------------------------------------------------------- - - /** - * Run the Validator - * - * This function does all the work. - * - * @access public - * @return bool - */ - function run() - { - // Do we even have any data to process? Mm? - if (count($_POST) == 0 OR count($this->_rules) == 0) - { - return FALSE; - } - - // Load the language file containing error messages - $this->CI->lang->load('validation'); - - // Cycle through the rules and test for errors - foreach ($this->_rules as $field => $rules) - { - //Explode out the rules! - $ex = explode('|', $rules); - - // Is the field required? If not, if the field is blank we'll move on to the next test - if ( ! in_array('required', $ex, TRUE)) - { - if ( ! isset($_POST[$field]) OR $_POST[$field] == '') - { - continue; - } - } - - /* - * Are we dealing with an "isset" rule? - * - * Before going further, we'll see if one of the rules - * is to check whether the item is set (typically this - * applies only to checkboxes). If so, we'll - * test for it here since there's not reason to go - * further - */ - if ( ! isset($_POST[$field])) - { - if (in_array('isset', $ex, TRUE) OR in_array('required', $ex)) - { - if ( ! isset($this->_error_messages['isset'])) - { - if (FALSE === ($line = $this->CI->lang->line('isset'))) - { - $line = 'The field was not set'; - } - } - else - { - $line = $this->_error_messages['isset']; - } - - // Build the error message - $mfield = ( ! isset($this->_fields[$field])) ? $field : $this->_fields[$field]; - $message = sprintf($line, $mfield); - - // Set the error variable. Example: $this->username_error - $error = $field.'_error'; - $this->$error = $this->_error_prefix.$message.$this->_error_suffix; - $this->_error_array[] = $message; - } - - continue; - } - - /* - * Set the current field - * - * The various prepping functions need to know the - * current field name so they can do this: - * - * $_POST[$this->_current_field] == 'bla bla'; - */ - $this->_current_field = $field; - - // Cycle through the rules! - foreach ($ex As $rule) - { - // Is the rule a callback? - $callback = FALSE; - if (substr($rule, 0, 9) == 'callback_') - { - $rule = substr($rule, 9); - $callback = TRUE; - } - - // Strip the parameter (if exists) from the rule - // Rules can contain a parameter: max_length[5] - $param = FALSE; - if (preg_match("/(.*?)\[(.*?)\]/", $rule, $match)) - { - $rule = $match[1]; - $param = $match[2]; - } - - // Call the function that corresponds to the rule - if ($callback === TRUE) - { - if ( ! method_exists($this->CI, $rule)) - { - continue; - } - - $result = $this->CI->$rule($_POST[$field], $param); - - // If the field isn't required and we just processed a callback we'll move on... - if ( ! in_array('required', $ex, TRUE) AND $result !== FALSE) - { - continue 2; - } - - } - else - { - if ( ! method_exists($this, $rule)) - { - /* - * Run the native PHP function if called for - * - * If our own wrapper function doesn't exist we see - * if a native PHP function does. Users can use - * any native PHP function call that has one param. - */ - if (function_exists($rule)) - { - $_POST[$field] = $rule($_POST[$field]); - $this->$field = $_POST[$field]; - } - - continue; - } - - $result = $this->$rule($_POST[$field], $param); - } - - // Did the rule test negatively? If so, grab the error. - if ($result === FALSE) - { - if ( ! isset($this->_error_messages[$rule])) - { - if (FALSE === ($line = $this->CI->lang->line($rule))) - { - $line = 'Unable to access an error message corresponding to your field name.'; - } - } - else - { - $line = $this->_error_messages[$rule]; - } - - // Build the error message - $mfield = ( ! isset($this->_fields[$field])) ? $field : $this->_fields[$field]; - $mparam = ( ! isset($this->_fields[$param])) ? $param : $this->_fields[$param]; - $message = sprintf($line, $mfield, $mparam); - - // Set the error variable. Example: $this->username_error - $error = $field.'_error'; - $this->$error = $this->_error_prefix.$message.$this->_error_suffix; - - // Add the error to the error array - $this->_error_array[] = $message; - continue 2; - } - } - - } - - $total_errors = count($this->_error_array); - - /* - * Recompile the class variables - * - * If any prepping functions were called the $_POST data - * might now be different then the corresponding class - * variables so we'll set them anew. - */ - if ($total_errors > 0) - { - $this->_safe_form_data = TRUE; - } - - $this->set_fields(); - - // Did we end up with any errors? - if ($total_errors == 0) - { - return TRUE; - } - - // Generate the error string - foreach ($this->_error_array as $val) - { - $this->error_string .= $this->_error_prefix.$val.$this->_error_suffix."\n"; - } - - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Required - * - * @access public - * @param string - * @return bool - */ - function required($str) - { - if ( ! is_array($str)) - { - return (trim($str) == '') ? FALSE : TRUE; - } - else - { - return ( ! empty($str)); - } - } - - // -------------------------------------------------------------------- - - /** - * Match one field to another - * - * @access public - * @param string - * @param field - * @return bool - */ - function matches($str, $field) - { - if ( ! isset($_POST[$field])) - { - return FALSE; - } - - return ($str !== $_POST[$field]) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Minimum Length - * - * @access public - * @param string - * @param value - * @return bool - */ - function min_length($str, $val) - { - if (preg_match("/[^0-9]/", $val)) - { - return FALSE; - } - - if (function_exists('mb_strlen')) - { - return (mb_strlen($str) < $val) ? FALSE : TRUE; - } - - return (strlen($str) < $val) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Max Length - * - * @access public - * @param string - * @param value - * @return bool - */ - function max_length($str, $val) - { - if (preg_match("/[^0-9]/", $val)) - { - return FALSE; - } - - if (function_exists('mb_strlen')) - { - return (mb_strlen($str) > $val) ? FALSE : TRUE; - } - - return (strlen($str) > $val) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Exact Length - * - * @access public - * @param string - * @param value - * @return bool - */ - function exact_length($str, $val) - { - if (preg_match("/[^0-9]/", $val)) - { - return FALSE; - } - - if (function_exists('mb_strlen')) - { - return (mb_strlen($str) != $val) ? FALSE : TRUE; - } - - return (strlen($str) != $val) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Valid Email - * - * @access public - * @param string - * @return bool - */ - function valid_email($str) - { - return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $str)) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Valid Emails - * - * @access public - * @param string - * @return bool - */ - function valid_emails($str) - { - if (strpos($str, ',') === FALSE) - { - return $this->valid_email(trim($str)); - } - - foreach(explode(',', $str) as $email) - { - if (trim($email) != '' && $this->valid_email(trim($email)) === FALSE) - { - return FALSE; - } - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Validate IP Address - * - * @access public - * @param string - * @return string - */ - function valid_ip($ip) - { - return $this->CI->input->valid_ip($ip); - } - - // -------------------------------------------------------------------- - - /** - * Alpha - * - * @access public - * @param string - * @return bool - */ - function alpha($str) - { - return ( ! preg_match("/^([a-z])+$/i", $str)) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Alpha-numeric - * - * @access public - * @param string - * @return bool - */ - function alpha_numeric($str) - { - return ( ! preg_match("/^([a-z0-9])+$/i", $str)) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Alpha-numeric with underscores and dashes - * - * @access public - * @param string - * @return bool - */ - function alpha_dash($str) - { - return ( ! preg_match("/^([-a-z0-9_-])+$/i", $str)) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Numeric - * - * @access public - * @param string - * @return bool - */ - function numeric($str) - { - return (bool)preg_match( '/^[\-+]?[0-9]*\.?[0-9]+$/', $str); - - } - - // -------------------------------------------------------------------- - - /** - * Is Numeric - * - * @access public - * @param string - * @return bool - */ - function is_numeric($str) - { - return ( ! is_numeric($str)) ? FALSE : TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Integer - * - * @access public - * @param string - * @return bool - */ - function integer($str) - { - return (bool)preg_match( '/^[\-+]?[0-9]+$/', $str); - } - - // -------------------------------------------------------------------- - - /** - * Is a Natural number (0,1,2,3, etc.) - * - * @access public - * @param string - * @return bool - */ - function is_natural($str) - { - return (bool)preg_match( '/^[0-9]+$/', $str); - } - - // -------------------------------------------------------------------- - - /** - * Is a Natural number, but not a zero (1,2,3, etc.) - * - * @access public - * @param string - * @return bool - */ - function is_natural_no_zero($str) - { - if ( ! preg_match( '/^[0-9]+$/', $str)) - { - return FALSE; - } - - if ($str == 0) - { - return FALSE; - } - - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Valid Base64 - * - * Tests a string for characters outside of the Base64 alphabet - * as defined by RFC 2045 http://www.faqs.org/rfcs/rfc2045 - * - * @access public - * @param string - * @return bool - */ - function valid_base64($str) - { - return (bool) ! preg_match('/[^a-zA-Z0-9\/\+=]/', $str); - } - - // -------------------------------------------------------------------- - - /** - * Set Select - * - * Enables pull-down lists to be set to the value the user - * selected in the event of an error - * - * @access public - * @param string - * @param string - * @return string - */ - function set_select($field = '', $value = '') - { - if ($field == '' OR $value == '' OR ! isset($_POST[$field])) - { - return ''; - } - - if ($_POST[$field] == $value) - { - return ' selected="selected"'; - } - } - - // -------------------------------------------------------------------- - - /** - * Set Radio - * - * Enables radio buttons to be set to the value the user - * selected in the event of an error - * - * @access public - * @param string - * @param string - * @return string - */ - function set_radio($field = '', $value = '') - { - if ($field == '' OR $value == '' OR ! isset($_POST[$field])) - { - return ''; - } - - if ($_POST[$field] == $value) - { - return ' checked="checked"'; - } - } - - // -------------------------------------------------------------------- - - /** - * Set Checkbox - * - * Enables checkboxes to be set to the value the user - * selected in the event of an error - * - * @access public - * @param string - * @param string - * @return string - */ - function set_checkbox($field = '', $value = '') - { - if ($field == '' OR $value == '' OR ! isset($_POST[$field])) - { - return ''; - } - - if ($_POST[$field] == $value) - { - return ' checked="checked"'; - } - } - - // -------------------------------------------------------------------- - - /** - * Prep data for form - * - * This function allows HTML to be safely shown in a form. - * Special characters are converted. - * - * @access public - * @param string - * @return string - */ - function prep_for_form($data = '') - { - if (is_array($data)) - { - foreach ($data as $key => $val) - { - $data[$key] = $this->prep_for_form($val); - } - - return $data; - } - - if ($this->_safe_form_data == FALSE OR $data == '') - { - return $data; - } - - return str_replace(array("'", '"', '<', '>'), array("'", """, '<', '>'), stripslashes($data)); - } - - // -------------------------------------------------------------------- - - /** - * Prep URL - * - * @access public - * @param string - * @return string - */ - function prep_url($str = '') - { - if ($str == 'http://' OR $str == '') - { - $_POST[$this->_current_field] = ''; - return; - } - - if (substr($str, 0, 7) != 'http://' && substr($str, 0, 8) != 'https://') - { - $str = 'http://'.$str; - } - - $_POST[$this->_current_field] = $str; - } - - // -------------------------------------------------------------------- - - /** - * Strip Image Tags - * - * @access public - * @param string - * @return string - */ - function strip_image_tags($str) - { - $_POST[$this->_current_field] = $this->CI->input->strip_image_tags($str); - } - - // -------------------------------------------------------------------- - - /** - * XSS Clean - * - * @access public - * @param string - * @return string - */ - function xss_clean($str) - { - $_POST[$this->_current_field] = $this->CI->input->xss_clean($str); - } - - // -------------------------------------------------------------------- - - /** - * Convert PHP tags to entities - * - * @access public - * @param string - * @return string - */ - function encode_php_tags($str) - { - $_POST[$this->_current_field] = str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); - } - -} -// END Validation Class - -/* End of file Validation.php */ -/* Location: ./system/libraries/Validation.php */ \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 12a4dc92..cfb7396c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -74,6 +74,7 @@

    Version 2.0.0

  • Added $config['directory_trigger'] to the config file so that a controller sub-directory can be specified when running _GET strings instead of URI segments.
  • Added ability to set "Package" paths - specific paths where the Loader and Config classes should try to look first for a requested file. This allows distribution of sub-applications with their own libraries, models, config files, etc. in a single "package" directory. See the Loader class documentation for more details.
  • In-development code is now hosted at BitBucket.
    • +
  • Removed the deprecated Validation Class.
  • Libraries
      @@ -494,7 +495,7 @@

      Version 1.6.2

    • The MySQLi forge class is now in sync with MySQL forge.
    • Added the ability to set CRLF settings via config in the Email class.
    • Unit Testing results are now colour coded, and a change was made to the default template of results.
      • -
    • Added a valid_emails rule to the Validation class.
      • +
    • Added a valid_emails rule to the Validation class.
    • The Zip class now exits within download().
    • The Zip class has undergone a substantial re-write for speed and clarity (thanks stanleyxu for the hard work and code contribution in bug report #3425!)
    @@ -680,8 +681,8 @@

    Version 1.6.0

  • Removed 'last_visit' from the Session class.
  • Added a language entry for valid_ip validation error.
  • Modified prep_for_form() in the Validation class to accept arrays, adding support for POST array validation (via callbacks only)
    • -
  • Added an "integer" rule into the Validation library.
    • -
  • Added valid_base64() to the Validation library.
    • +
  • Added an "integer" rule into the Validation library.
    • +
  • Added valid_base64() to the Validation library.
  • Documented clear() in the Image Processing library.
  • Changed the behaviour of custom callbacks so that they no longer trigger the "required" rule.
  • Modified Upload class $_FILES error messages to be more precise.
    • @@ -767,8 +768,8 @@

    Bug fixes for Version 1.6.0

  • Fixed a bug in database driver where num_rows property wasn't getting updated.
  • Fixed a bug in the upload library when allowed_files wasn't defined.
  • Fixed a bug in word_wrap() of the Text Helper that incorrectly referenced an object.
    • -
  • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • -
  • Fixed a bug in Validation where individual error messages for checkboxes wasn't supported.
    • +
  • Fixed a bug in Validation where valid_ip() wasn't called properly.
    • +
  • Fixed a bug in Validation where individual error messages for checkboxes wasn't supported.
  • Fixed a bug in captcha calling an invalid PHP function.
  • Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.
  • Fixed a bug that was making validation callbacks required even when not set as such.
    • diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html deleted file mode 100644 index d62ca01b..00000000 --- a/user_guide/libraries/validation.html +++ /dev/null @@ -1,740 +0,0 @@ - - - - - -Form Validation : CodeIgniter User Guide - - - - - - - - - - - - - - - - - - - - -
    - - - - - -

    CodeIgniter User Guide Version 2.0.0

    -
    - - - - - - - - - -
    - - -
    - - - -
    - -

    - This library has been deprecated. Use of the form_validation library is encouraged. -

    - -

    Form Validation

    - -

    Before explaining CodeIgniter's approach to data validation, let's describe the ideal scenario:

    - -
      -
    1. A form is displayed.
      2. -
    2. You fill it in and submit it.
      3. -
    3. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data along with an error message describing the problem.
      4. -
    4. This process continues until you have submitted a valid form.
      5. -
    - -

    On the receiving end, the script must:

    - -
      -
    1. Check for required data.
      2. -
    2. Verify that the data is of the correct type, and meets the correct criteria. (For example, if a username is submitted -it must be validated to contain only permitted characters. It must be of a minimum length, -and not exceed a maximum length. The username can't be someone else's existing username, or perhaps even a reserved word. Etc.)
      3. -
    3. Sanitize the data for security.
      4. -
    4. Pre-format the data if needed (Does the data need to be trimmed? HTML encoded? Etc.)
      5. -
    5. Prep the data for insertion in the database.
      6. -
    - - -

    Although there is nothing complex about the above process, it usually requires a significant -amount of code, and to display error messages, various control structures are usually placed within the form HTML. -Form validation, while simple to create, is generally very messy and tedious to implement.

    - -CodeIgniter provides a comprehensive validation framework that truly minimizes the amount of code you'll write. -It also removes all control structures from your form HTML, permitting it to be clean and free of code. - -

    Overview

    - -

    In order to implement CodeIgniter's form validation you'll need three things:

    - -
      -
    1. A View file containing the form.
      2. -
    2. A View file containing a "success" message to be displayed upon successful submission.
      3. -
    3. A controller function to receive and process the submitted data.
      4. -
    - -

    Let's create those three things, using a member sign-up form as the example.

    - -

    The Form

    - -

    Using a text editor, create a form called myform.php. In it, place this code and save it to your applications/views/ -folder:

    - - - - - -

    The Success Page

    - - -

    Using a text editor, create a form called formsuccess.php. In it, place this code and save it to your applications/views/ -folder:

    - - - - - -

    The Controller

    - -

    Using a text editor, create a controller called form.php. In it, place this code and save it to your applications/controllers/ -folder:

    - - - - - -

    Try it!

    - -

    To try your form, visit your site using a URL similar to this one:

    - -example.com/index.php/form/ - -

    If you submit the form you should simply see the form reload. That's because you haven't set up any validation -rules yet, which we'll get to in a moment.

    - - -

    Explanation

    - -

    You'll notice several things about the above pages:

    - -

    The form (myform.php) is a standard web form with a couple exceptions:

    - -
      -
    1. It uses a form helper to create the form opening. -Technically, this isn't necessary. You could create the form using standard HTML. However, the benefit of using the helper -is that it generates the action URL for you, based on the URL in your config file. This makes your application more portable -and flexible in the event your URLs change.
      2. - -
    2. At the top of the form you'll notice the following variable: -<?php echo $this->validation->error_string; ?> - -

      This variable will display any error messages sent back by the validator. If there are no messages it returns nothing.

      -
      3. -
    - -

    The controller (form.php) has one function: index(). This function initializes the validation class and -loads the form helper and URL helper used by your view files. It also runs -the validation routine. Based on -whether the validation was successful it either presents the form or the success page.

    - -

    Since you haven't told the validation class to validate anything yet, it returns "false" (boolean false) by default. The run() -function only returns "true" if it has successfully applied your rules without any of them failing.

    - - -

    Setting Validation Rules

    - -

    CodeIgniter lets you set as many validation rules as you need for a given field, cascading them in order, and it even lets you prep and pre-process the field data -at the same time. Let's see it in action, we'll explain it afterwards.

    - -

    In your controller (form.php), add this code just below the validation initialization function:

    - -$rules['username'] = "required";
    -$rules['password'] = "required";
    -$rules['passconf'] = "required";
    -$rules['email'] = "required";
    -
    -$this->validation->set_rules($rules);     - -

    Your controller should now look like this:

    - - - -

    Now submit the form with the fields blank and you should see the error message. -If you submit the form with all the fields populated you'll see your success page.

    - -

    Note: The form fields are not yet being re-populated with the data when -there is an error. We'll get to that shortly, once we're through explaining the validation rules.

    - - -

    Changing the Error Delimiters

    - -

    By default, the system adds a paragraph tag (<p>) around each error message shown. You can easily change these delimiters with -this code, placed in your controller:

    - -$this->validation->set_error_delimiters('<div class="error">', '</div>'); - -

    In this example, we've switched to using div tags.

    - -

    Cascading Rules

    - -

    CodeIgniter lets you pipe multiple rules together. Let's try it. Change your rules array like this:

    - - -$rules['username'] = "required|min_length[5]|max_length[12]";
    -$rules['password'] = "required|matches[passconf]";
    -$rules['passconf'] = "required";
    -$rules['email'] = "required|valid_email";     - -

    The above code requires that:

    - -
      -
    1. The username field be no shorter than 5 characters and no longer than 12.
      2. -
    2. The password field must match the password confirmation field.
      3. -
    3. The email field must contain a valid email address.
      4. -
    - -

    Give it a try!

    - -

    Note: There are numerous rules available which you can read about in the validation reference.

    - - -

    Prepping Data

    - -

    In addition to the validation functions like the ones we used above, you can also prep your data in various ways. -For example, you can set up rules like this:

    - -$rules['username'] = "trim|required|min_length[5]|max_length[12]|xss_clean";
    -$rules['password'] = "trim|required|matches[passconf]|md5";
    -$rules['passconf'] = "trim|required";
    -$rules['email'] = "trim|required|valid_email";     - -

    In the above example, we are "trimming" the fields, converting the password to MD5, and running the username through -the "xss_clean" function, which removes malicious data.

    - -

    Any native PHP function that accepts one parameter can be used as a rule, like htmlspecialchars, -trim, MD5, etc.

    - -

    Note: You will generally want to use the prepping functions after -the validation rules so if there is an error, the original data will be shown in the form.

    - -

    Callbacks: Your own Validation Functions

    - -

    The validation system supports callbacks to your own validation functions. This permits you to extend the validation class -to meet your needs. For example, if you need to run a database query to see if the user is choosing a unique username, you can -create a callback function that does that. Let's create a simple example.

    - -

    In your controller, change the "username" rule to this:

    - -$rules['username'] = "callback_username_check"; - -

    Then add a new function called username_check to your controller. Here's how your controller should look:

    - - - - -

    Reload your form and submit it with the word "test" as the username. You can see that the form field data was passed to your -callback function for you to process.

    - -

    To invoke a callback just put the function name in a rule, with "callback_" as the rule prefix.

    - -

    The error message was set using the $this->validation->set_message function. -Just remember that the message key (the first parameter) must match your function name.

    - -

    Note: You can apply your own custom error messages to any rule, just by setting the -message similarly. For example, to change the message for the "required" rule you will do this:

    - -$this->validation->set_message('required', 'Your custom message here'); - -

    Re-populating the form

    - -

    Thus far we have only been dealing with errors. It's time to repopulate the form field with the submitted data. -This is done similarly to your rules. Add the following code to your controller, just below your rules:

    - -$fields['username'] = 'Username';
    -$fields['password'] = 'Password';
    -$fields['passconf'] = 'Password Confirmation';
    -$fields['email'] = 'Email Address';
    -
    -$this->validation->set_fields($fields);     - -

    The array keys are the actual names of the form fields, the value represents the full name that you want shown in the -error message.

    - -

    The index function of your controller should now look like this:

    - - - - - -

    Now open your myform.php view file and update the value in each field so that it has an attribute corresponding to its name:

    - - - - - -

    Now reload your page and submit the form so that it triggers an error. Your form fields should be populated -and the error messages will contain a more relevant field name.

    - - - -

    Showing Errors Individually

    - -

    If you prefer to show an error message next to each form field, rather than as a list, you can change your form so that it looks like this:

    - - - - -

    If there are no errors, nothing will be shown. If there is an error, the message will appear, wrapped in the delimiters you -have set (<p> tags by default).

    - -

    Note: To display errors this way you must remember to set your fields using the $this->validation->set_fields -function described earlier. The errors will be turned into variables that have "_error" after your field name. -For example, your "username" error will be available at:
    $this->validation->username_error.

    - - -

    Rule Reference

    - -

    The following is a list of all the native rules that are available to use:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    RuleParameterDescriptionExample
    requiredNoReturns FALSE if the form element is empty. 
    matchesYesReturns FALSE if the form element does not match the one in the parameter.matches[form_item]
    min_lengthYesReturns FALSE if the form element is shorter then the parameter value.min_length[6]
    max_lengthYesReturns FALSE if the form element is longer then the parameter value.max_length[12]
    exact_lengthYesReturns FALSE if the form element is not exactly the parameter value.exact_length[8]
    alphaNoReturns FALSE if the form element contains anything other than alphabetical characters. 
    alpha_numericNoReturns FALSE if the form element contains anything other than alpha-numeric characters. 
    alpha_dashNoReturns FALSE if the form element contains anything other than alpha-numeric characters, underscores or dashes. 
    numericNoReturns FALSE if the form element contains anything other than numeric characters. 
    integerNoReturns FALSE if the form element contains anything other than an integer. 
    valid_emailNoReturns FALSE if the form element does not contain a valid email address. 
    valid_emailsNoReturns FALSE if any value provided in a comma separated list is not a valid email. 
    valid_ipNoReturns FALSE if the supplied IP is not valid. 
    valid_base64NoReturns FALSE if the supplied string contains anything other than valid Base64 characters. 
    - -

    Note: These rules can also be called as discrete functions. For example:

    - -$this->validation->required($string); - -

    Note: You can also use any native PHP functions that permit one parameter.

    - - - -

    Prepping Reference

    - -

    The following is a list of all the prepping functions that are available to use:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    NameParameterDescription
    xss_cleanNoRuns the data through the XSS filtering function, described in the Input Class page.
    prep_for_formNoConverts special characters so that HTML data can be shown in a form field without breaking it.
    prep_urlNoAdds "http://" to URLs if missing.
    strip_image_tagsNoStrips the HTML from image tags leaving the raw URL.
    encode_php_tagsNoConverts PHP tags to entities.
    - -

    Note: You can also use any native PHP functions that permit one parameter, -like trim, htmlspecialchars, urldecode, etc.

    - - -

    Setting Custom Error Messages

    - -

    All of the native error messages are located in the following language file: language/english/validation_lang.php

    - -

    To set your own custom message you can either edit that file, or use the following function:

    - -$this->validation->set_message('rule', 'Error Message'); - -

    Where rule corresponds to the name of a particular rule, and Error Message is the text you would like displayed.

    - - -

    Dealing with Select Menus, Radio Buttons, and Checkboxes

    - -

    If you use select menus, radio buttons or checkboxes, you will want the state of -these items to be retained in the event of an error. The Validation class has three functions that help you do this:

    - -

    set_select()

    - -

    Permits you to display the menu item that was selected. The first parameter -must contain the name of the select menu, the second parameter must contain the value of -each item. Example:

    - - -<select name="myselect">
    -<option value="one" <?php echo $this->validation->set_select('myselect', 'one'); ?> >One</option>
    -<option value="two" <?php echo $this->validation->set_select('myselect', 'two'); ?> >Two</option>
    -<option value="three" <?php echo $this->validation->set_select('myselect', 'three'); ?> >Three</option>
    -</select> -     - - -

    set_checkbox()

    - -

    Permits you to display a checkbox in the state it was submitted. The first parameter -must contain the name of the checkbox, the second parameter must contain its value. Example:

    - -<input type="checkbox" name="mycheck" value="1" <?php echo $this->validation->set_checkbox('mycheck', '1'); ?> /> - - -

    set_radio()

    - -

    Permits you to display radio buttons in the state they were submitted. The first parameter -must contain the name of the radio button, the second parameter must contain its value. Example:

    - -<input type="radio" name="myradio" value="1" <?php echo $this->validation->set_radio('myradio', '1'); ?> /> - - - - - -
    - - - - - - - \ No newline at end of file From 757dda61aa0556aca8172dc2a8175596afe28ce2 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 14 Apr 2010 19:06:19 -0500 Subject: [PATCH 1924/2544] Fixing a bug where odbc/mssql/oci8 db drivers would encounter a PHP error due to a function being moved from the input to security class. Moving remove_invisible_characters() to Common.php so the entire class does not need to be instantiated in those database drivers. --- system/core/Common.php | 37 ++++++++++++++++ .../database/drivers/mssql/mssql_driver.php | 5 +-- system/database/drivers/oci8/oci8_driver.php | 5 +-- system/database/drivers/odbc/odbc_driver.php | 5 +-- system/libraries/Security.php | 42 +------------------ user_guide/changelog.html | 3 +- user_guide/general/common_functions.html | 6 +++ 7 files changed, 50 insertions(+), 53 deletions(-) diff --git a/system/core/Common.php b/system/core/Common.php index 6e2f7250..9dee591e 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -479,6 +479,43 @@ function _exception_handler($severity, $message, $filepath, $line) $_error->log_exception($severity, $message, $filepath, $line); } + // -------------------------------------------------------------------- + + /** + * Remove Invisible Characters + * + * This prevents sandwiching null characters + * between ascii characters, like Java\0script. + * + * @access public + * @param string + * @return string + */ + function remove_invisible_characters($str) + { + static $non_displayables; + + if ( ! isset($non_displayables)) + { + // every control character except newline (dec 10), carriage return (dec 13), and horizontal tab (dec 09), + $non_displayables = array( + '/%0[0-8bcef]/', // url encoded 00-08, 11, 12, 14, 15 + '/%1[0-9a-f]/', // url encoded 16-31 + '/[\x00-\x08]/', // 00-08 + '/\x0b/', '/\x0c/', // 11, 12 + '/[\x0e-\x1f]/' // 14-31 + ); + } + + do + { + $cleaned = $str; + $str = preg_replace($non_displayables, '', $str); + } + while ($cleaned != $str); + + return $str; + } /* End of file Common.php */ diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 0c74726a..40900e83 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -260,12 +260,9 @@ function escape_str($str, $like = FALSE) return $str; } - - // Access the CI object - $CI =& get_instance(); // Escape single quotes - $str = str_replace("'", "''", $CI->input->_remove_invisible_characters($str)); + $str = str_replace("'", "''", remove_invisible_characters($str)); // escape LIKE condition wildcards if ($like === TRUE) diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index cd0e0957..6f317d2e 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -403,10 +403,7 @@ function escape_str($str, $like = FALSE) return $str; } - // Access the CI object - $CI =& get_instance(); - - $str = $CI->input->_remove_invisible_characters($str); + $str = remove_invisible_characters($str); // escape LIKE condition wildcards if ($like === TRUE) diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index d5df8ef8..6e682313 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -271,12 +271,9 @@ function escape_str($str, $like = FALSE) return $str; } - - // Access the CI object - $CI =& get_instance(); // ODBC doesn't require escaping - $str = $CI->input->_remove_invisible_characters($str); + $str = remove_invisible_characters($str); // escape LIKE condition wildcards if ($like === TRUE) diff --git a/system/libraries/Security.php b/system/libraries/Security.php index 60adf0a2..cdae5016 100644 --- a/system/libraries/Security.php +++ b/system/libraries/Security.php @@ -198,7 +198,7 @@ function xss_clean($str, $is_image = FALSE) /* * Remove Invisible Characters */ - $str = $this->_remove_invisible_characters($str); + $str = remove_invisible_characters($str); /* * Protect GET variables in URLs @@ -258,7 +258,7 @@ function xss_clean($str, $is_image = FALSE) /* * Remove Invisible Characters Again! */ - $str = $this->_remove_invisible_characters($str); + $str = remove_invisible_characters($str); /* * Convert all tabs to spaces @@ -480,44 +480,6 @@ function xss_hash() // -------------------------------------------------------------------- - /** - * Remove Invisible Characters - * - * This prevents sandwiching null characters - * between ascii characters, like Java\0script. - * - * @access public - * @param string - * @return string - */ - function _remove_invisible_characters($str) - { - static $non_displayables; - - if ( ! isset($non_displayables)) - { - // every control character except newline (dec 10), carriage return (dec 13), and horizontal tab (dec 09), - $non_displayables = array( - '/%0[0-8bcef]/', // url encoded 00-08, 11, 12, 14, 15 - '/%1[0-9a-f]/', // url encoded 16-31 - '/[\x00-\x08]/', // 00-08 - '/\x0b/', '/\x0c/', // 11, 12 - '/[\x0e-\x1f]/' // 14-31 - ); - } - - do - { - $cleaned = $str; - $str = preg_replace($non_displayables, '', $str); - } - while ($cleaned != $str); - - return $str; - } - - // -------------------------------------------------------------------- - /** * Compact Exploded Words * diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 02cf6d06..5e0f5ae0 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -133,7 +133,8 @@

    Version 2.0.0

  • Eliminated a call to is_really_writable() on each request unless it is really needed (Output caching)
  • Documented append_output() in the Output Class.
  • Documented a second argument in the decode() function for the Encryption Class.
    • -
  • Documentd db->close().
    • +
  • Documented db->close().
    • +
  • Moved _remove_invisible_characters() function from the Security Library to common functions.
    • diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 196e3777..0e68d111 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -99,6 +99,12 @@

    set_status_header(code, 'text');

    See here for a full list of headers.

    + +

    remove_invisible_characters($str)

    +

    This function prevents inserting null characters between ascii characters, like Java\0script.

    + + + From f82e51cd8f46b112c3c400d43db9044854a8e805 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 14 Apr 2010 19:33:50 -0500 Subject: [PATCH 1925/2544] Update to File Upload library to return boolean on do_xss_clean(). --- system/libraries/Upload.php | 61 +++++++++++++++++++----- user_guide/changelog.html | 1 + user_guide/libraries/file_uploading.html | 6 +++ 3 files changed, 55 insertions(+), 13 deletions(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index ac9323c0..3131469d 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -276,9 +276,13 @@ function do_upload($field = 'userfile') * embedded within a file. Scripts can easily * be disguised as images or other file types. */ - if ($this->xss_clean == TRUE) + if ($this->xss_clean) { - $this->do_xss_clean(); + if ($this->do_xss_clean() === FALSE) + { + $this->set_error('upload_unable_to_write_file'); + return FALSE; + } } /* @@ -803,24 +807,55 @@ function do_xss_clean() { return FALSE; } + + if (function_exists('memory_get_usage') && memory_get_usage() && ini_get('memory_limit') != '') + { + $current = ini_get('memory_limit') * 1024 * 1024; + + // There was a bug/behavioural change in PHP 5.2, where numbers over one million get output + // into scientific notation. number_format() ensures this number is an integer + // http://bugs.php.net/bug.php?id=43053 + + $new_memory = number_format(ceil(filesize($this->new_name) + $current), 0, '.', ''); + + ini_set('memory_limit', $new_memory); // When an integer is used, the value is measured in bytes. - PHP.net + } - if (($data = @file_get_contents($file)) === FALSE) + // If the file being uploaded is an image, then we should have no problem with XSS attacks (in theory), but + // IE can be fooled into mime-type detecting a malformed image as an html file, thus executing an XSS attack on anyone + // using IE who looks at the image. It does this by inspecting the first 255 bytes of an image. To get around this + // CI will itself look at the first 255 bytes of an image to determine its relative safety. This can save a lot of + // processor power and time if it is actually a clean image, as it will be in nearly all instances _except_ an + // attempted XSS attack. + + if (function_exists('getimagesize') && @getimagesize($file) !== FALSE) { - return FALSE; + if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary + { + return FALSE; // Couldn't open the file, return FALSE + } + + $opening_bytes = fread($file, 256); + fclose($file); + + // These are known to throw IE into mime-type detection chaos + // ]/i', $opening_bytes)) + { + return TRUE; // its an image, no "triggers" detected in the first 256 bytes, we're good + } } - - if ( ! $fp = @fopen($file, FOPEN_READ_WRITE)) + + if (($data = @file_get_contents($file)) === FALSE) { return FALSE; } - $CI =& get_instance(); - $data = $CI->security->xss_clean($data); - - flock($fp, LOCK_EX); - fwrite($fp, $data); - flock($fp, LOCK_UN); - fclose($fp); + $CI =& get_instance(); + + return $CI->security->xss_clean($data, TRUE); } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5e0f5ae0..25b3b174 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -93,6 +93,7 @@

    Version 2.0.0

  • The Unit Test Class now has an optional "notes" field available to it, and allows for discrete display of test result items using $this->unit->set_test_items().
  • Added a $xss_clean class variable to the XMLRPC library, enabling control over the use of the Security library's xss_clean() method.
  • Added a download() method to the FTP library
    • +
  • Changed do_xss_clean() to return FALSE if the uploaded file fails XSS checks.
  • Database diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index d143f5b6..061d5562 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -318,6 +318,12 @@

    Preferences

    TRUE/FALSE (boolean) If set to TRUE, any spaces in the file name will be converted to underscores. This is recommended. + +xss_clean +FALSE +TRUE/FALSE (boolean) +If set to TRUE, the files will be tested for XSS vulnerabilities. + From ff3ecaede7e7154d1897307a390919b655b15096 Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Fri, 16 Apr 2010 16:13:23 -0400 Subject: [PATCH 1926/2544] Added class var xss_clean to the XML_RPC_Response class to prevent php error. Not noted in changelog, as I figure it's covered by the original note about adding xss clean at all. --- system/libraries/Xmlrpc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index ee04400f..e2b149b7 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -434,6 +434,7 @@ class XML_RPC_Response var $errno = 0; var $errstr = ''; var $headers = array(); + var $xss_clean = TRUE; function XML_RPC_Response($val, $code = 0, $fstr = '') { From 60e78c75f9cb332dcd5a387bf4262c1566f32b8e Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 20 Apr 2010 12:45:14 -0500 Subject: [PATCH 1927/2544] Modifying smiley_js() in the smiley helper to add optional third parameter to return only the javascript with no script tags. --- system/helpers/smiley_helper.php | 11 +++++++++-- user_guide/changelog.html | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 775cc1b9..b9eb0a23 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -40,7 +40,7 @@ */ if ( ! function_exists('smiley_js')) { - function smiley_js($alias = '', $field_id = '') + function smiley_js($alias = '', $field_id = '', $inline = TRUE) { static $do_setup = TRUE; @@ -108,7 +108,14 @@ function insert_smiley(smiley, field_id) { } } - return ''; + if ($inline) + { + return ''; + } + else + { + return $r; + } } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 25b3b174..53bf395d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -120,6 +120,7 @@

    Version 2.0.0

  • Added alpha, and sha1 string types to random_string() in the String Helper.
  • Modified prep_url() so as to not prepend http:// if the supplied string already has a scheme.
  • Modified get_file_info in the file helper, changing filectime() to filemtime() for dates.
    • +
  • Modified smiley_js() to add optional third parameter to return only the javascript with no script tags.
  • Other Changes From 47cd452c91a3dc7dab4a8285136bee2048fc7bba Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Thu, 22 Apr 2010 12:34:13 +0100 Subject: [PATCH 1928/2544] Fixed Upload bug that would break when files and images were both included on an allowed filetype list in the wrong order: http://codeigniter.com/bug_tracker/bug/11552/ --- system/libraries/Upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 3131469d..0e71aee6 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -578,7 +578,7 @@ function is_allowed_filetype() $mime = $this->mimes_types(strtolower($val)); // Images get some additional checks - if (in_array($val, $image_types)) + if ($this->file_ext == '.' . $val && in_array($val, $image_types)) { if (getimagesize($this->file_temp) === FALSE) { From 52c592bb08ad5fbc4ded7aedaa81e2f3fb329b8c Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 22 Apr 2010 16:36:40 -0500 Subject: [PATCH 1929/2544] tiny modification to whitespace from philsturgeon's bugfix to match CI style guidelines --- system/libraries/Upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 0e71aee6..b85663bc 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -578,7 +578,7 @@ function is_allowed_filetype() $mime = $this->mimes_types(strtolower($val)); // Images get some additional checks - if ($this->file_ext == '.' . $val && in_array($val, $image_types)) + if ($this->file_ext == '.'.$val && in_array($val, $image_types)) { if (getimagesize($this->file_temp) === FALSE) { From e4f6ee9b971d440d1f8cfee44e8860592475da0a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 22 Apr 2010 16:44:41 -0500 Subject: [PATCH 1930/2544] added changelog note for changesets 4ce5f465478a and 20a016307847 --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 53bf395d..21b60ace 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -162,6 +162,7 @@

    Bug fixes for 2.0.0

  • Fixed a bug in the Session library that would result in PHP error when attempting to store values with objects.
  • Fixed a bug where extending the Controller class would result in a fatal PHP error.
  • Fixed a PHP Strict Standards Error in the index.php file.
    • +
  • Fixed a bug where getimagesize() was being needlessly checked on non-image files in is_allowed_type().

    • Version 1.7.2

    From dcae4490998dc111d265da11507c0dad660eb1b4 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Thu, 22 Apr 2010 13:34:09 +0100 Subject: [PATCH 1931/2544] Some mime types are wrapped with " which breaks file type checking. This will remove any wrapping \ and " --- system/libraries/Upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index b85663bc..75104496 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -190,7 +190,7 @@ function do_upload($field = 'userfile') $this->file_name = $this->_prep_filename($_FILES[$field]['name']); $this->file_size = $_FILES[$field]['size']; $this->file_type = preg_replace("/^(.+?);.*$/", "\\1", $_FILES[$field]['type']); - $this->file_type = strtolower($this->file_type); + $this->file_type = trim(stripslashes($this->file_type), '"'); $this->file_ext = $this->get_extension($_FILES[$field]['name']); // Convert the file size to kilobytes From 616fb0281ba4bd2339accc47c0a94f7034c61a1a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 22 Apr 2010 16:52:18 -0500 Subject: [PATCH 1932/2544] reapplied strtolower() to ->file_type from philsturgeon's changeset 5fe3b04bdf44 to standardize input --- system/libraries/Upload.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 75104496..3227c374 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -190,7 +190,7 @@ function do_upload($field = 'userfile') $this->file_name = $this->_prep_filename($_FILES[$field]['name']); $this->file_size = $_FILES[$field]['size']; $this->file_type = preg_replace("/^(.+?);.*$/", "\\1", $_FILES[$field]['type']); - $this->file_type = trim(stripslashes($this->file_type), '"'); + $this->file_type = strtolower(trim(stripslashes($this->file_type), '"')); $this->file_ext = $this->get_extension($_FILES[$field]['name']); // Convert the file size to kilobytes diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 21b60ace..6eb03609 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -94,6 +94,7 @@

    Version 2.0.0

  • Added a $xss_clean class variable to the XMLRPC library, enabling control over the use of the Security library's xss_clean() method.
  • Added a download() method to the FTP library
  • Changed do_xss_clean() to return FALSE if the uploaded file fails XSS checks.
    • +
  • Added stripslashes() and trim()ing of double quotes from $_FILES type value to standardize input.
  • Database From 68c685ec6ed077e0ba4e5628963ef3183bb0a4fa Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 22 Apr 2010 17:18:46 -0500 Subject: [PATCH 1933/2544] clarifying a changelog item --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 6eb03609..ae63b1f5 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -94,7 +94,7 @@

    Version 2.0.0

  • Added a $xss_clean class variable to the XMLRPC library, enabling control over the use of the Security library's xss_clean() method.
  • Added a download() method to the FTP library
  • Changed do_xss_clean() to return FALSE if the uploaded file fails XSS checks.
    • -
  • Added stripslashes() and trim()ing of double quotes from $_FILES type value to standardize input.
    • +
  • Added stripslashes() and trim()ing of double quotes from $_FILES type value to standardize input in Upload library.
  • Database From 5640a7158559f4521911444b50798a6a9536f38b Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 23 Apr 2010 11:22:40 -0500 Subject: [PATCH 1934/2544] ensured the security lib was loaded in a few calls to xss_clean() in other libraries. Fixes #35 --- system/libraries/Form_validation.php | 7 ++++++- system/libraries/Upload.php | 7 ++++++- system/libraries/Xmlrpc.php | 10 ++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index bb70f0f7..73cb6b85 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1254,7 +1254,12 @@ function strip_image_tags($str) */ function xss_clean($str) { - return $this->CI->input->xss_clean($str); + if ( ! is_object($this->CI->security)) + { + $this->CI->load('security'); + } + + return $this->CI->security->xss_clean($str); } // -------------------------------------------------------------------- diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 3227c374..d7cf236f 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -854,7 +854,12 @@ function do_xss_clean() } $CI =& get_instance(); - + + if ( ! is_object($CI->security)) + { + $CI->load('security'); + } + return $CI->security->xss_clean($data, TRUE); } diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index e2b149b7..ee65398e 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -505,6 +505,11 @@ function decode($array=FALSE) { $CI =& get_instance(); + if ($this->xss_clean && ! is_object($CI->security)) + { + $CI->load('security'); + } + if ($array !== FALSE && is_array($array)) { while (list($key) = each($array)) @@ -1119,6 +1124,11 @@ function output_parameters($array=FALSE) { $CI =& get_instance(); + if ($this->xss_clean && ! is_object($CI->security)) + { + $CI->load('security'); + } + if ($array !== FALSE && is_array($array)) { while (list($key) = each($array)) From 78a1cf24831e067aae04531718a167e8ec144fda Mon Sep 17 00:00:00 2001 From: Roger Simms Date: Sun, 25 Apr 2010 12:50:53 +0100 Subject: [PATCH 1935/2544] Simple change to comment line 21: the=>that. --- system/core/Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/core/Controller.php b/system/core/Controller.php index 92f7f17f..c9d797ca 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -18,7 +18,7 @@ /** * CodeIgniter Application Controller Class * - * This class object is the super class the every library in + * This class object is the super class that every library in * CodeIgniter will be assigned to. * * @package CodeIgniter From 30841679f57da9de8053c8291a665043f8f92c03 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 26 Apr 2010 09:09:21 -0500 Subject: [PATCH 1936/2544] fixed errant syntax in changeset 53ace78c4b45, fixes #37 --- system/libraries/Form_validation.php | 6 +++--- system/libraries/Upload.php | 2 +- system/libraries/Xmlrpc.php | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 73cb6b85..64baaef2 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1254,11 +1254,11 @@ function strip_image_tags($str) */ function xss_clean($str) { - if ( ! is_object($this->CI->security)) + if ( ! isset($this->CI->security)) { - $this->CI->load('security'); + $this->CI->load->library('security'); } - + return $this->CI->security->xss_clean($str); } diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index d7cf236f..b3c625eb 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -855,7 +855,7 @@ function do_xss_clean() $CI =& get_instance(); - if ( ! is_object($CI->security)) + if ( ! isset($CI->security)) { $CI->load('security'); } diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index ee65398e..ff03a503 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -505,9 +505,9 @@ function decode($array=FALSE) { $CI =& get_instance(); - if ($this->xss_clean && ! is_object($CI->security)) + if ($this->xss_clean && ! isset($CI->security)) { - $CI->load('security'); + $CI->load->library('security'); } if ($array !== FALSE && is_array($array)) @@ -1124,9 +1124,9 @@ function output_parameters($array=FALSE) { $CI =& get_instance(); - if ($this->xss_clean && ! is_object($CI->security)) + if ($this->xss_clean && ! isset($CI->security)) { - $CI->load('security'); + $CI->load->library('security'); } if ($array !== FALSE && is_array($array)) From 247f02925e04a8a45f2e6e9acbf72ccd6848fd32 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 26 Apr 2010 09:10:21 -0500 Subject: [PATCH 1937/2544] fixed errant syntax in changeset 53ace78c4b45, fixes #37 --- system/libraries/Upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index b3c625eb..7a5eef0f 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -857,7 +857,7 @@ function do_xss_clean() if ( ! isset($CI->security)) { - $CI->load('security'); + $CI->load->library('security'); } return $CI->security->xss_clean($data, TRUE); From 42526cf74a61a350ff26904c52b4315229e077f2 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 28 Apr 2010 08:22:44 -0500 Subject: [PATCH 1938/2544] corrected references to Input class since the Security methods are now their own library. Fixes #31 --- user_guide/libraries/javascript.html | 2 +- user_guide/libraries/jquery.html | 2 +- user_guide/nav/nav.js | 2 +- user_guide/toc.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index 7f0eed9f..2b25fb2d 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -42,7 +42,7 @@ CodeIgniter Home  ›  User Guide Home  ›  -Input and Security Class +Input Class
    Search User Guide   
    diff --git a/user_guide/libraries/jquery.html b/user_guide/libraries/jquery.html index 6dec7dda..a7ab94f4 100644 --- a/user_guide/libraries/jquery.html +++ b/user_guide/libraries/jquery.html @@ -42,7 +42,7 @@ CodeIgniter Home  ›  User Guide Home  ›  -Input and Security Class +Input Class
    Search User Guide   
    diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index ce87f48b..909a0dd9 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -83,7 +83,7 @@ function create_menu(basepath) '
  • FTP Class
    • ' + '
  • HTML Table Class
    • ' + '
  • Image Manipulation Class
    • ' + - '
  • Input and Security Class
    • ' + + '
  • Input Class
    • ' + '
  • Loader Class
    • ' + '
  • Language Class
    • ' + '
  • Output Class
    • ' + diff --git a/user_guide/toc.html b/user_guide/toc.html index 6f222d15..f7fd5e0a 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -136,7 +136,7 @@

    Class Reference

  • FTP Class
  • HTML Table Class
  • Image Manipulation Class
    • -
  • Input and Security Class
    • +
  • Input Class
  • Loader Class
  • Language Class
  • Output Class
    • From e602683aa6362e2efeb03408cea749cfeaaeef4f Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Thu, 29 Apr 2010 13:41:39 -0500 Subject: [PATCH 1939/2544] Changing order of available sections in the output profiler. --- system/libraries/Profiler.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 3285bc53..49a6774c 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -36,14 +36,14 @@ class CI_Profiler { var $_available_sections = array( 'benchmarks', - 'config', - 'controller_info', 'get', - 'http_headers', 'memory_usage', 'post', + 'uri_string', + 'controller_info', 'queries', - 'uri_string' + 'http_headers', + 'config' ); function CI_Profiler($config = array()) @@ -459,6 +459,11 @@ function _compile_config() foreach($this->CI->config->config as $config=>$val) { + if (is_array($val)) + { + $val = print_r($val, TRUE); + } + $output .= "".$config."  ".$val."\n"; } From 26872de184e4aa2ae92bae645782089e9656115d Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Tue, 11 May 2010 11:41:59 +0100 Subject: [PATCH 1940/2544] Added an option to remove the preceding trail of empty folders when creating a Zip archive. --- system/libraries/Zip.php | 49 +++++++++++++++++++++++++---------- user_guide/changelog.html | 1 + user_guide/libraries/zip.html | 12 ++++++++- 3 files changed, 47 insertions(+), 15 deletions(-) diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index 2c4bd255..3ba3ddc8 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -270,27 +270,48 @@ function read_file($path, $preserve_filepath = FALSE) * @access public * @param string path to source * @return bool - */ - function read_dir($path) - { - if ($fp = @opendir($path)) + */ + function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL) + { + if (!$fp = @opendir($path)) + { + return FALSE; + } + + // Set the original directory root for child dir's to use as relative + if ($root_path === NULL) + { + $root_path = dirname($path).'/'; + } + + while (FALSE !== ($file = readdir($fp))) { - while (FALSE !== ($file = readdir($fp))) + if(substr($file, 0, 1) == '.') { - if (@is_dir($path.$file) && substr($file, 0, 1) != '.') - { - $this->read_dir($path.$file."/"); - } - elseif (substr($file, 0, 1) != ".") + continue; + } + + if (@is_dir($path.$file)) + { + $this->read_dir($path.$file."/", $preserve_filepath, $root_path); + } + + else + { + if (FALSE !== ($data = file_get_contents($path.$file))) { - if (FALSE !== ($data = file_get_contents($path.$file))) - { - $this->add_data(str_replace("\\", "/", $path).$file, $data); + $name = str_replace("\\", "/", $path); + + if ($preserve_filepath === FALSE) + { + $name = str_replace($root_path, '', $name); } + + $this->add_data($name.$file, $data); } } - return TRUE; } + return TRUE; } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ae63b1f5..08c98157 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -95,6 +95,7 @@

    Version 2.0.0

  • Added a download() method to the FTP library
  • Changed do_xss_clean() to return FALSE if the uploaded file fails XSS checks.
  • Added stripslashes() and trim()ing of double quotes from $_FILES type value to standardize input in Upload library.
    • +
  • Added a second parameter (boolean) to $this->zip->read_dir('/path/to/directory', FALSE) to remove the preceding trail of empty folders when creating a Zip archive. This example would contain a zip with "directory" and all of its contents.
  • Database diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 44603f2b..844023b9 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -177,7 +177,7 @@

    $this->zip->read_file()

    $this->zip->read_dir()

    -

    Permits you to compress a folder (and its contents) that already exists somewhere on your server. Supply a file path to the +

    Permits you to compress a folder (and its contents) that already exists somewhere on your server. Supply a file path to the directory and the zip class will recursively read it and recreate it as a Zip archive. All files contained within the supplied path will be encoded, as will any sub-folders contained within it. Example:

    @@ -189,6 +189,16 @@

    $this->zip->read_dir()

    $this->zip->download('my_backup.zip');     +

    By default the Zip archive will place all directories listed in the first parameter inside the zip. If you only want the end folder to be in the zip +you can pass FALSE (boolean) in the second parameter. Example:

    + + +$path = '/path/to/your/directory/';

    +$this->zip->read_dir($path, FALSE); +     + +

    This will create a ZIP with the folder "directory" inside, then all sub-folders stored correctly inside that.

    + From 2735b3eeb3403ba813aac56ed6f10be536839ff6 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 11 May 2010 08:58:21 -0500 Subject: [PATCH 1941/2544] fixed whitespace, massaged Zip read_dir() docs --- system/libraries/Zip.php | 4 ++-- user_guide/libraries/zip.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index 3ba3ddc8..92dfc814 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -273,7 +273,7 @@ function read_file($path, $preserve_filepath = FALSE) */ function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL) { - if (!$fp = @opendir($path)) + if ( ! $fp = @opendir($path)) { return FALSE; } @@ -295,7 +295,6 @@ function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL) { $this->read_dir($path.$file."/", $preserve_filepath, $root_path); } - else { if (FALSE !== ($data = file_get_contents($path.$file))) @@ -311,6 +310,7 @@ function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL) } } } + return TRUE; } diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 844023b9..d57dd48a 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -189,7 +189,7 @@

    $this->zip->read_dir()

    $this->zip->download('my_backup.zip');     -

    By default the Zip archive will place all directories listed in the first parameter inside the zip. If you only want the end folder to be in the zip +

    By default the Zip archive will place all directories listed in the first parameter inside the zip. If you want the tree preceding the target folder to be ignored you can pass FALSE (boolean) in the second parameter. Example:

    @@ -197,7 +197,7 @@

    $this->zip->read_dir()

    $this->zip->read_dir($path, FALSE);     -

    This will create a ZIP with the folder "directory" inside, then all sub-folders stored correctly inside that.

    +

    This will create a ZIP with the folder "directory" inside, then all sub-folders stored correctly inside that, but will not include the folders /path/to/your.

    From 511e3d72b875401b5cc61a28df45fb65acfd689a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 13 May 2010 09:03:30 -0500 Subject: [PATCH 1942/2544] added htmlspecialchars to config item output, fixes #41 --- system/libraries/Profiler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 49a6774c..0900a300 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -303,7 +303,7 @@ function _compile_post() $output .= "$_POST[".$key."]   "; if (is_array($val)) { - $output .= "
    " . htmlspecialchars(stripslashes(print_r($val, true))) . "
    "; + $output .= "
    " . htmlspecialchars(stripslashes(print_r($val, TRUE))) . "
    "; } else { @@ -464,7 +464,7 @@ function _compile_config() $val = print_r($val, TRUE); } - $output .= "".$config."  ".$val."\n"; + $output .= "".$config."  ".htmlspecialchars($val)."\n"; } $output .= "\n"; From 23e796f7561832a929c1a78c1fb60667563b0756 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 21 May 2010 12:45:25 -0500 Subject: [PATCH 1943/2544] fixed a bug in the Parser where the regex would not correctly match pair variables, fixes #42 --- system/libraries/Parser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php index 9387f1a9..41a438ba 100644 --- a/system/libraries/Parser.php +++ b/system/libraries/Parser.php @@ -197,7 +197,7 @@ function _parse_pair($variable, $data, $string) */ function _match_pair($string, $variable) { - if ( ! preg_match("|" . preg_quote($this->l_delim) . $variable . preg_quote($this->r_delim) . "(.+?) ". preg_quote($this->l_delim) . '/' . $variable . preg_quote($this->r_delim) . "|s", $string, $match)) + if ( ! preg_match("|" . preg_quote($this->l_delim) . $variable . preg_quote($this->r_delim) . "(.+?)". preg_quote($this->l_delim) . '/' . $variable . preg_quote($this->r_delim) . "|s", $string, $match)) { return FALSE; } From 2a6c1da49b38abb8767192a064b8c6b01d1e421e Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Mon, 24 May 2010 12:20:03 -0400 Subject: [PATCH 1944/2544] Added $prefix, $suffix and $first_url properties to Pagination library. --- system/libraries/Pagination.php | 36 +++++++++++++++++++++++++++------ user_guide/changelog.html | 1 + 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index d6321f41..ccd3e826 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -27,6 +27,9 @@ class CI_Pagination { var $base_url = ''; // The page we are linking to + var $prefix = ''; // A custom prefix added to the path. + var $suffix = ''; // A custom suffix added to the path. + var $total_rows = ''; // Total number of items (database results) var $per_page = 10; // Max number of items you want shown per page var $num_links = 2; // Number of "digit" links to show before/after the currently viewed page @@ -42,6 +45,7 @@ class CI_Pagination { var $first_tag_close = ' '; var $last_tag_open = ' '; var $last_tag_close = ''; + var $first_url = ''; // Alternative URL for the First Page. var $cur_tag_open = ' '; var $cur_tag_close = ''; var $next_tag_open = ' '; @@ -185,15 +189,25 @@ function create_links() // Render the "First" link if ($this->cur_page > ($this->num_links + 1)) { - $output .= $this->first_tag_open.''.$this->first_link.''.$this->first_tag_close; + $first_url = ($this->first_url == '') ? $this->base_url : $this->first_url; + $output .= $this->first_tag_open.''.$this->first_link.''.$this->first_tag_close; } // Render the "previous" link if ($this->cur_page != 1) { $i = $uri_page_number - $this->per_page; - if ($i == 0) $i = ''; - $output .= $this->prev_tag_open.''.$this->prev_link.''.$this->prev_tag_close; + + if ($i == 0 && $this->first_url != '') + { + $output .= $this->prev_tag_open.''.$this->prev_link.''.$this->prev_tag_close; + } + else + { + $i = ($i == 0) ? '' : $this->prefix.$i.$this->suffix; + $output .= $this->prev_tag_open.''.$this->prev_link.''.$this->prev_tag_close; + } + } // Write the digit links @@ -210,7 +224,17 @@ function create_links() else { $n = ($i == 0) ? '' : $i; - $output .= $this->num_tag_open.''.$loop.''.$this->num_tag_close; + + if ($n == '' && $this->first_url != '') + { + $output .= $this->num_tag_open.''.$loop.''.$this->num_tag_close; + } + else + { + $n = ($n == '') ? '' : $this->prefix.$n.$this->suffix; + + $output .= $this->num_tag_open.''.$loop.''.$this->num_tag_close; + } } } } @@ -218,14 +242,14 @@ function create_links() // Render the "next" link if ($this->cur_page < $num_pages) { - $output .= $this->next_tag_open.''.$this->next_link.''.$this->next_tag_close; + $output .= $this->next_tag_open.''.$this->next_link.''.$this->next_tag_close; } // Render the "Last" link if (($this->cur_page + $this->num_links) < $num_pages) { $i = (($num_pages * $this->per_page) - $this->per_page); - $output .= $this->last_tag_open.''.$this->last_link.''.$this->last_tag_close; + $output .= $this->last_tag_open.''.$this->last_link.''.$this->last_tag_close; } // Kill double slashes. Note: Sometimes we can end up with a double slash diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 08c98157..1aa06d38 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -78,6 +78,7 @@

    Version 2.0.0

  • Libraries
      +
    • Added $prefix, $suffix and $first_url properties to Pagination library.
    • Added Security library, which now contains the xss_clean function, filename_security function and other security related functions.
    • Added CSRF (Cross-site Reference Forgery) protection to the Security library.
    • Added $parse_exec_vars property to Output library.
      • From c78a259b4af7430f237636b5f93d6eb59443a1e2 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 9 Jun 2010 11:45:32 -0500 Subject: [PATCH 1945/2544] Fixed an undefined variable PHP error in the do_xss_clean() method of the Upload library. --- system/libraries/Upload.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 7a5eef0f..8bdb4be1 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -812,13 +812,13 @@ function do_xss_clean() { $current = ini_get('memory_limit') * 1024 * 1024; - // There was a bug/behavioural change in PHP 5.2, where numbers over one million get output - // into scientific notation. number_format() ensures this number is an integer - // http://bugs.php.net/bug.php?id=43053 - - $new_memory = number_format(ceil(filesize($this->new_name) + $current), 0, '.', ''); - - ini_set('memory_limit', $new_memory); // When an integer is used, the value is measured in bytes. - PHP.net + // There was a bug/behavioural change in PHP 5.2, where numbers over one million get output + // into scientific notation. number_format() ensures this number is an integer + // http://bugs.php.net/bug.php?id=43053 + + $new_memory = number_format(ceil(filesize($file) + $current), 0, '.', ''); + + ini_set('memory_limit', $new_memory); // When an integer is used, the value is measured in bytes. - PHP.net } // If the file being uploaded is an image, then we should have no problem with XSS attacks (in theory), but From 7c708ca4da0e0848c15ed78f9a14aa637a5ba14c Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 5 Jul 2010 07:25:11 -0400 Subject: [PATCH 1946/2544] Fixed an example typo --- user_guide/database/active_record.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 6977302a..bc7cd3d1 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -228,7 +228,7 @@

      $this->db->where();

      $this->db->where('name', $name);
      $this->db->where('title', $title);
      $this->db->where('status', $status); -

      // WHERE name 'Joe' AND title = 'boss' AND status = 'active'       +

      // WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
    • Custom key/value method: From 13fbacda9f846c997f4745d341a7b75098d79bcf Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 5 Jul 2010 07:31:17 -0400 Subject: [PATCH 1947/2544] guide clarification --- user_guide/general/reserved_names.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 0984845f..7ab518d2 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -62,7 +62,7 @@

      Controller names

      Since your controller classes will extend the main application controller you must be careful not to name your functions identically to the ones used by that class, otherwise your local functions will override them. The following -is a list of reserved names. Do not name your controller functions any of these:

      +is a list of reserved names. Do not name your controller any of these:

      • Controller
      • CI_Base
        • From 34312bb46c1d60e9e944139ded10e1fecb847ed9 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 5 Jul 2010 07:36:31 -0400 Subject: [PATCH 1948/2544] added a file to be replaced when updating from 1.71 to 1.72 --- user_guide/installation/upgrade_172.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index 8482cb25..0f95a815 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -72,6 +72,7 @@

        Step 1: Update your CodeIgniter files

      • system/helpers
      • system/language
      • system/libraries
        • +
      • index.php

      Note: If you have any custom developed files in these folders please make copies of them first.

      @@ -83,7 +84,10 @@

      Step 2: Remove header() from 404 error template

      404 status headers are now properly handled in the show_404() method itself.

      -

      Step 3: Update your user guide

      +

      Step 3: Confirm your system_path

      +

      In your updated index.php file, confirm that the $system_path variable is set to your application's system folder.

      + +

      Step 4: Update your user guide

      Please replace your local copy of the user guide with the new version, including the image files.

      From 2f304d6119e022abd5bd29e6a9980b7c81a27586 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 5 Jul 2010 07:40:26 -0400 Subject: [PATCH 1949/2544] altering a few examples to be more CI driven then EE driven in styleguide --- user_guide/general/styleguide.html | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 5be636a4..1200a2c1 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -88,7 +88,7 @@

      Table of Contents

    • Line Breaks
    • Code Indenting
    • Bracket and Parenthetic Spacing
      • -
    • Localized Text in Control Panel
      • +
    • Localized Text
    • Private Methods and Variables
    • PHP Errors
    • Short Open Tags
      • @@ -96,7 +96,6 @@

      Table of Contents

    • Strings
    • SQL Queries
    • Default Function Arguments
      • -
    • Overlapping Tag Parameters
  • @@ -535,15 +534,15 @@

    Bracket and Parenthetic Spacing

    -

    Localized Text in Control Panel

    +

    Localized Text

    -

    Any text that is output in the control panel should use language variables in your module's lang file to allow localization.

    +

    Any text that is output in the control panel should use language variables in your lang file to allow localization.

    INCORRECT: return "Invalid Selection"; CORRECT: -return $LANG->line('invalid_selection'); +return $this->lang->line('invalid_selection');
    @@ -657,12 +656,6 @@

    Default Function Arguments

    - -

    Overlapping Tag Parameters

    -
    -

    Avoid multiple tag parameters that have effect on the same thing. For instance, instead of include= and exclude=, perhaps allow include= to handle the parameter alone, with the addition of "not", e.g. include="not bar". This will prevent problems of parameters overlapping or having to worry about which parameter has priority over another.

    -
    - From f597dd19ef20e4bff70ad10bf794aab3915d693d Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 5 Jul 2010 07:43:46 -0400 Subject: [PATCH 1950/2544] fixed a missing
    • in guide --- user_guide/database/queries.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index dbb3e5c7..7a6734c4 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -113,7 +113,7 @@

    Escaping Queries

    conditions so that LIKE wildcards ('%', '_') in the string are also properly escaped. $search = '20% raise';
    -$sql = "SELECT id FROM table WHERE column LIKE '%".$this->db->escape_like_str($search)."%'";     +$sql = "SELECT id FROM table WHERE column LIKE '%".$this->db->escape_like_str($search)."%'"; From 8d027fad2fe50fa05b6bb967883a9ddfa673c746 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 5 Jul 2010 07:47:38 -0400 Subject: [PATCH 1951/2544] fixed missing

    in guide --- user_guide/installation/upgrade_170.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/typography.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 9db3add8..7f3cec61 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -80,7 +80,7 @@

    Step 1: Update your CodeIgniter files

    Step 2: Update your Session Table

    If you are using the Session class in your application, AND if you are storing session data to a database, you must add a new column named user_data to your session table. -Here is an example of what this column might look like for MySQL: +Here is an example of what this column might look like for MySQL:

    user_data text NOT NULL diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index d9a3787c..1d5a47f4 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -76,7 +76,7 @@

    $this->load->library('class_name', $config, 'ob $this->load->library('email'); -

    Once loaded, the library will be ready for use, using $this->email->some_function(). +

    Once loaded, the library will be ready for use, using $this->email->some_function().

    Library files can be stored in subdirectories within the main "libraries" folder, or within your personal application/libraries folder. To load a file located in a subdirectory, simply include the path, relative to the "libraries" folder. diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index ac53e880..2675fa75 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -91,7 +91,7 @@

    auto_typography()

    Parameters

    -

    There is one optional parameters that determines whether the parser should reduce more then two consecutive line breaks down to two. Use boolean TRUE or FALSE. +

    There is one optional parameters that determines whether the parser should reduce more then two consecutive line breaks down to two. Use boolean TRUE or FALSE.

    By default the parser does not reduce line breaks. In other words, if no parameters are submitted, it is the same as doing this:

    @@ -133,7 +133,7 @@

    nl2br_except_pre()

    protect_braced_quotes

    When using the Typography library in conjunction with the Template Parser library it can often be desirable to protect single - and double quotes within curly braces. To enable this, set the protect_braced_quotes class property to TRUE. + and double quotes within curly braces. To enable this, set the protect_braced_quotes class property to TRUE.

    Usage example:

    From bb6a687bc5aeafa20da8ef7422476e8307739694 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 5 Jul 2010 07:49:14 -0400 Subject: [PATCH 1952/2544] minor capitalization --- user_guide/libraries/benchmark.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 79f7fedb..d0ba3294 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -83,7 +83,7 @@

    Table of Contents

    Using the Benchmark Class

    -

    The Benchmark class can be used within your controllers, views, or your Models. The process for usage is this:

    +

    The Benchmark class can be used within your controllers, views, or your models. The process for usage is this:

    1. Mark a start point
      2. From c778e79cca825ea3a9d8399c7fb7a7aa4e3a3147 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 5 Jul 2010 07:52:36 -0400 Subject: [PATCH 1953/2544] userguide links --- user_guide/doc_style/index.html | 1 + user_guide/libraries/benchmark.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 753b9d42..22637d38 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -78,6 +78,7 @@

      Files

         ·   Top of Page   ·   User Guide Home   ·   +Next Topic:  Benchmarking Class

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index d0ba3294..05f7cc0e 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -185,7 +185,7 @@

      Displaying Memory Consumption

      From e01fd0fc3b694d12dc6b968727bd7f21f8c1a0fb Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 5 Jul 2010 11:06:07 -0400 Subject: [PATCH 1958/2544] suppress page list --- system/libraries/Pagination.php | 37 ++++++++++++++++------------ user_guide/changelog.html | 2 +- user_guide/libraries/pagination.html | 9 +++++++ 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 68c35a57..3a0632d0 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -56,6 +56,7 @@ class CI_Pagination { var $num_tag_close = ''; var $page_query_string = FALSE; var $query_string_segment = 'per_page'; + var $display_pages = TRUE; var $anchor_class = ''; /** @@ -216,30 +217,34 @@ function create_links() } - // Write the digit links - for ($loop = $start -1; $loop <= $end; $loop++) + // Render the pages + if ($this->display_pages !== FALSE) { - $i = ($loop * $this->per_page) - $this->per_page; - - if ($i >= 0) + // Write the digit links + for ($loop = $start -1; $loop <= $end; $loop++) { - if ($this->cur_page == $loop) - { - $output .= $this->cur_tag_open.$loop.$this->cur_tag_close; // Current page - } - else + $i = ($loop * $this->per_page) - $this->per_page; + + if ($i >= 0) { - $n = ($i == 0) ? '' : $i; - - if ($n == '' && $this->first_url != '') + if ($this->cur_page == $loop) { - $output .= $this->num_tag_open.'anchor_class.'href="'.$this->first_url.'">'.$loop.''.$this->num_tag_close; + $output .= $this->cur_tag_open.$loop.$this->cur_tag_close; // Current page } else { - $n = ($n == '') ? '' : $this->prefix.$n.$this->suffix; + $n = ($i == 0) ? '' : $i; + + if ($n == '' && $this->first_url != '') + { + $output .= $this->num_tag_open.'anchor_class.'href="'.$this->first_url.'">'.$loop.''.$this->num_tag_close; + } + else + { + $n = ($n == '') ? '' : $this->prefix.$n.$this->suffix; - $output .= $this->num_tag_open.'anchor_class.'href="'.$this->base_url.$n.'">'.$loop.''.$this->num_tag_close; + $output .= $this->num_tag_open.'anchor_class.'href="'.$this->base_url.$n.'">'.$loop.''.$this->num_tag_close; + } } } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 4f86c1e9..94eff05b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -79,7 +79,7 @@

      Version 2.0.0

    2. Libraries
      • Added $prefix, $suffix and $first_url properties to Pagination library.
        • -
      • Added the ability to suppress first, previous, next and last links by setting their values to FALSE in the Pagination library.
        • +
      • Added the ability to suppress first, previous, next, last, and page links by setting their values to FALSE in the Pagination library.
      • Added Security library, which now contains the xss_clean function, filename_security function and other security related functions.
      • Added CSRF (Cross-site Reference Forgery) protection to the Security library.
      • Added $parse_exec_vars property to Output library.
        • diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 33c87107..521b708b 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -197,6 +197,15 @@

        $config['num_tag_open'] = '<div>';

        $config['num_tag_close'] = '</div>';

        The closing tag for the "digit" link.

        +

        Hiding the Pages

        + +

        If you wanted to not list the specific pages (for example, you only want "next" and "previous" links), you can suppress their rendering by adding:

        + + +$config['display_pages'] = FALSE; + + +

        Adding a class to every anchor

        If you want to add a class attribute to every link rendered by the pagination class, you can set the config "anchor_class" equal to the classname you want.

        From f1a02f9784a8e4b4ee65705f6524d8c1bff20a80 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 8 Jul 2010 09:36:34 -0500 Subject: [PATCH 1959/2544] fixed a file location in an EOF comment --- application/config/doctypes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/doctypes.php b/application/config/doctypes.php index 9d510abc..f7e1d19a 100644 --- a/application/config/doctypes.php +++ b/application/config/doctypes.php @@ -12,4 +12,4 @@ ); /* End of file doctypes.php */ -/* Location: application/config/doctypes.php */ \ No newline at end of file +/* Location: ./application/config/doctypes.php */ \ No newline at end of file From 90295819cd17a7b18fadb69b5d146bace3f90182 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 12 Jul 2010 10:05:26 -0500 Subject: [PATCH 1960/2544] Removed tag v1.7.2 From e9d723fb2c13585fa8a502fde7dd83dc334874ff Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 12 Jul 2010 10:10:59 -0500 Subject: [PATCH 1961/2544] 201007 file upload bug fix --- system/libraries/Upload.php | 194 +++++++++++++---------- user_guide/libraries/file_uploading.html | 21 ++- 2 files changed, 118 insertions(+), 97 deletions(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 8bdb4be1..c94e4d44 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -26,31 +26,34 @@ */ class CI_Upload { - var $max_size = 0; - var $max_width = 0; - var $max_height = 0; - var $max_filename = 0; - var $allowed_types = ""; - var $file_temp = ""; - var $file_name = ""; - var $orig_name = ""; - var $file_type = ""; - var $file_size = ""; - var $file_ext = ""; - var $upload_path = ""; - var $overwrite = FALSE; - var $encrypt_name = FALSE; - var $is_image = FALSE; - var $image_width = ''; - var $image_height = ''; - var $image_type = ''; - var $image_size_str = ''; - var $error_msg = array(); - var $mimes = array(); - var $remove_spaces = TRUE; - var $xss_clean = FALSE; - var $temp_prefix = "temp_file_"; - + var $max_size = 0; + var $max_width = 0; + var $max_height = 0; + var $max_filename = 0; + var $allowed_types = ""; + var $file_temp = ""; + var $file_name = ""; + var $orig_name = ""; + var $file_type = ""; + var $file_size = ""; + var $file_ext = ""; + var $upload_path = ""; + var $overwrite = FALSE; + var $encrypt_name = FALSE; + var $is_image = FALSE; + var $image_width = ''; + var $image_height = ''; + var $image_type = ''; + var $image_size_str = ''; + var $error_msg = array(); + var $mimes = array(); + var $remove_spaces = TRUE; + var $xss_clean = FALSE; + var $temp_prefix = "temp_file_"; + var $client_name = ''; + + var $_file_name_override = ''; //@PHP4 (should be private) + /** * Constructor * @@ -75,6 +78,7 @@ function CI_Upload($props = array()) * @param array * @return void */ + function initialize($config = array()) { $defaults = array( @@ -101,7 +105,8 @@ function initialize($config = array()) 'mimes' => array(), 'remove_spaces' => TRUE, 'xss_clean' => FALSE, - 'temp_prefix' => "temp_file_" + 'temp_prefix' => "temp_file_", + 'client_name' => '' ); @@ -124,6 +129,10 @@ function initialize($config = array()) $this->$key = $val; } } + + // if a file_name was provided in the config, use it instead of the user input + // supplied file name for all uploads until initialized again + $this->_file_name_override = $this->file_name; } // -------------------------------------------------------------------- @@ -185,20 +194,16 @@ function do_upload($field = 'userfile') return FALSE; } + // Set the uploaded data as class variables $this->file_temp = $_FILES[$field]['tmp_name']; - $this->file_name = $this->_prep_filename($_FILES[$field]['name']); - $this->file_size = $_FILES[$field]['size']; + $this->file_size = $_FILES[$field]['size']; $this->file_type = preg_replace("/^(.+?);.*$/", "\\1", $_FILES[$field]['type']); $this->file_type = strtolower(trim(stripslashes($this->file_type), '"')); - $this->file_ext = $this->get_extension($_FILES[$field]['name']); + $this->file_name = $this->_prep_filename($_FILES[$field]['name']); + $this->file_ext = $this->get_extension($this->file_name); + $this->client_name = $this->file_name; - // Convert the file size to kilobytes - if ($this->file_size > 0) - { - $this->file_size = round($this->file_size/1024, 2); - } - // Is the file type allowed to be uploaded? if ( ! $this->is_allowed_filetype()) { @@ -206,6 +211,25 @@ function do_upload($field = 'userfile') return FALSE; } + // if we're overriding, let's now make sure the new name and type is allowed + if ($this->_file_name_override != '') + { + $this->file_name = $this->_prep_filename($this->_file_name_override); + $this->file_ext = $this->get_extension($this->file_name); + + if ( ! $this->is_allowed_filetype(TRUE)) + { + $this->set_error('upload_invalid_filetype'); + return FALSE; + } + } + + // Convert the file size to kilobytes + if ($this->file_size > 0) + { + $this->file_size = round($this->file_size/1024, 2); + } + // Is the file size within the allowed maximum? if ( ! $this->is_allowed_filesize()) { @@ -254,6 +278,21 @@ function do_upload($field = 'userfile') } } + /* + * Run the file through the XSS hacking filter + * This helps prevent malicious code from being + * embedded within a file. Scripts can easily + * be disguised as images or other file types. + */ + if ($this->xss_clean) + { + if ($this->do_xss_clean() === FALSE) + { + $this->set_error('upload_unable_to_write_file'); + return FALSE; + } + } + /* * Move the file to the final destination * To deal with different server configurations @@ -269,21 +308,6 @@ function do_upload($field = 'userfile') return FALSE; } } - - /* - * Run the file through the XSS hacking filter - * This helps prevent malicious code from being - * embedded within a file. Scripts can easily - * be disguised as images or other file types. - */ - if ($this->xss_clean) - { - if ($this->do_xss_clean() === FALSE) - { - $this->set_error('upload_unable_to_write_file'); - return FALSE; - } - } /* * Set the finalized image dimensions @@ -316,6 +340,7 @@ function data() 'full_path' => $this->upload_path.$this->file_name, 'raw_name' => str_replace($this->file_ext, '', $this->file_name), 'orig_name' => $this->orig_name, + 'client_name' => $this->client_name, 'file_ext' => $this->file_ext, 'file_size' => $this->file_size, 'is_image' => $this->is_image(), @@ -558,7 +583,7 @@ function is_image() * @access public * @return bool */ - function is_allowed_filetype() + function is_allowed_filetype($ignore_mime = FALSE) { if ($this->allowed_types == '*') { @@ -570,36 +595,42 @@ function is_allowed_filetype() $this->set_error('upload_no_file_types'); return FALSE; } + + $ext = strtolower(ltrim($this->file_ext, '.')); + + if ( ! in_array($ext, $this->allowed_types)) + { + return FALSE; + } + // Images get some additional checks $image_types = array('gif', 'jpg', 'jpeg', 'png', 'jpe'); - - foreach ($this->allowed_types as $val) + + if (in_array($ext, $image_types)) { - $mime = $this->mimes_types(strtolower($val)); - - // Images get some additional checks - if ($this->file_ext == '.'.$val && in_array($val, $image_types)) + if (getimagesize($this->file_temp) === FALSE) { - if (getimagesize($this->file_temp) === FALSE) - { - return FALSE; - } - } - - if (is_array($mime)) - { - if (in_array($this->file_type, $mime, TRUE)) - { - return TRUE; - } - } - else + return FALSE; + } + } + + if ($ignore_mime === TRUE) + { + return TRUE; + } + + $mime = $this->mimes_types($ext); + + if (is_array($mime)) + { + if (in_array($this->file_type, $mime, TRUE)) { - if ($mime == $this->file_type) - { - return TRUE; - } - } + return TRUE; + } + } + elseif ($mime == $this->file_type) + { + return TRUE; } return FALSE; @@ -801,7 +832,7 @@ function limit_filename_length($filename, $length) */ function do_xss_clean() { - $file = $this->upload_path.$this->file_name; + $file = $this->file_temp; if (filesize($file) == 0) { @@ -968,7 +999,7 @@ function _prep_filename($filename) foreach ($parts as $part) { - if ($this->mimes_types(strtolower($part)) === FALSE) + if ( ! in_array(strtolower($part), $this->allowed_types) OR $this->mimes_types(strtolower($part)) === FALSE) { $filename .= '.'.$part.'_'; } @@ -978,13 +1009,6 @@ function _prep_filename($filename) } } - // file name override, since the exact name is provided, no need to - // run it through a $this->mimes check. - if ($this->file_name != '') - { - $filename = $this->file_name; - } - $filename .= '.'.$ext; return $filename; diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 061d5562..28cf8de3 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.0

        CodeIgniter User Guide Version 1.7.2
        @@ -74,7 +74,7 @@

        The Process

      • Once uploaded, the user will be shown a success message.
      -

      To demonstrate this process here is a brief tutorial. Afterward you'll find reference information.

      +

      To demonstrate this process here is brief tutorial. Afterward you'll find reference information.

      Creating the Upload Form

      @@ -255,7 +255,7 @@

      Preferences

      allowed_types None None -The mime types corresponding to the types of files you allow to be uploaded. Usually the file extension can be used as the mime type. Separate multiple types with a pipe. If '*' is used, all file types will be allowed. +The mime types corresponding to the types of files you allow to be uploaded. Usually the file extension can be used as the mime type. Separate multiple types with a pipe. @@ -264,8 +264,7 @@

      Preferences

      None Desired file name -

      If set CodeIgniter will rename the uploaded file to this name.

      -

      Note:The filename should not include a file extension.

      +

      If set CodeIgniter will rename the uploaded file to this name. The extension provided in the file name must also be an allowed file type.

      @@ -318,12 +317,6 @@

      Preferences

      TRUE/FALSE (boolean) If set to TRUE, any spaces in the file name will be converted to underscores. This is recommended. - -xss_clean -FALSE -TRUE/FALSE (boolean) -If set to TRUE, the files will be tested for XSS vulnerabilities. - @@ -377,6 +370,7 @@

      $this->upload->data()

          [full_path]    => /path/to/your/upload/jpg.jpg
          [raw_name]     => mypic
          [orig_name]    => mypic.jpg
      +    [client_name]  => mypic.jpg
          [file_ext]     => .jpg
          [file_size]    => 22.2
          [is_image]     => 1
      @@ -411,6 +405,9 @@

      Explanation

      orig_name The original file name. This is only useful if you use the encrypted name option. +client_name +The file name as supplied by the client user agent, prior to any file name preparation or incrementing. + file_ext The file extension with period @@ -447,7 +444,7 @@

      Explanation

      User Guide Home   ·   Next Topic:  Form Validation Class

      -

      CodeIgniter  ·  Copyright © 2006-2010  ·  EllisLab, Inc.

      +

      CodeIgniter  ·  Copyright © 2006-2010  ·  Ellislab, Inc.

      From 9a42f58bdafb4f1558ad25f81c66c03ca4d6e9d9 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 13 Jul 2010 09:41:11 -0400 Subject: [PATCH 1962/2544] example fix --- user_guide/libraries/sessions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 58f2148c..78049d22 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -216,7 +216,7 @@

      Saving Session Data to a Database

      Make sure you've specified the table name in your config file as well:

      -$config['sess_table_name'] = 'ci_sessions"; +$config['sess_table_name'] = 'ci_sessions';

      Note: The Session class has built-in garbage collection which clears out expired sessions so you do not need to write your own routine to do it.

      From 32cada7d98174673deadb0ad52d56f4b627d6c34 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 16 Jul 2010 08:53:04 -0400 Subject: [PATCH 1963/2544] example fix --- user_guide/libraries/sessions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 78049d22..9a2ca939 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -202,7 +202,7 @@

      Saving Session Data to a Database

      ip_address varchar(16) DEFAULT '0' NOT NULL, user_agent varchar(50) NOT NULL, last_activity int(10) unsigned DEFAULT 0 NOT NULL, -user_data text NOT NULL, +user_data text DEFAULT '' NOT NULL, PRIMARY KEY (session_id) ); From ce3129d277d2235f0584a937114d0e636349ee9c Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Fri, 16 Jul 2010 10:01:48 -0500 Subject: [PATCH 1964/2544] Removing validation_lang.php file that was missed when removing the Validation library. --- system/language/english/validation_lang.php | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 system/language/english/validation_lang.php diff --git a/system/language/english/validation_lang.php b/system/language/english/validation_lang.php deleted file mode 100644 index 345341fe..00000000 --- a/system/language/english/validation_lang.php +++ /dev/null @@ -1,21 +0,0 @@ - Date: Thu, 22 Jul 2010 11:04:58 -0500 Subject: [PATCH 1965/2544] Fixed a bug in the Upload class where a PHP error could occur when wildcards were used as the allowed_types. --- system/libraries/Upload.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index c94e4d44..c18c178d 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -988,7 +988,7 @@ function mimes_types($mime) */ function _prep_filename($filename) { - if (strpos($filename, '.') === FALSE) + if (strpos($filename, '.') === FALSE OR $this->allowed_types == '*') { return $filename; } @@ -1020,4 +1020,4 @@ function _prep_filename($filename) // END Upload Class /* End of file Upload.php */ -/* Location: ./system/libraries/Upload.php */ \ No newline at end of file +/* Location: ./system/libraries/Upload.php */ From 958543a38c2c97b0ec4c10fc9faf4f0753143880 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 22 Jul 2010 14:10:26 -0400 Subject: [PATCH 1966/2544] Adding CSRF into config Adding CSRF token into form open() --- application/config/config.php | 11 +++++++++++ system/helpers/form_helper.php | 6 ++++++ system/libraries/Security.php | 16 +++++++++++----- user_guide/changelog.html | 1 + 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/application/config/config.php b/application/config/config.php index bd1429a4..6e52bcc1 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -265,6 +265,17 @@ */ $config['global_xss_filtering'] = FALSE; +/* +|-------------------------------------------------------------------------- +| Cross Site Forgery Request +|-------------------------------------------------------------------------- +| Enables a CSFR cookie token to be set. When set to TRUE, token will be +| checked on a submitted form. If you are accepting user data, it is strongly +| recommended CSRF protection be enabled. +*/ +$config['csrf_protection'] = FALSE; + + /* |-------------------------------------------------------------------------- | Output Compression diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 5feb3ce6..632f9450 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -62,6 +62,12 @@ function form_open($action = '', $attributes = '', $hidden = array()) $form .= form_hidden($hidden); } + // CSRF + if ($CI->config->item('csrf_protection') === TRUE) + { + $form .= form_hidden($CI->security->csrf_token_name, $CI->security->csrf_hash); + } + return $form; } } diff --git a/system/libraries/Security.php b/system/libraries/Security.php index cdae5016..c8d43504 100644 --- a/system/libraries/Security.php +++ b/system/libraries/Security.php @@ -54,7 +54,7 @@ function CI_Security() { // Set the CSRF hash $this->_csrf_set_hash(); - + log_message('debug', "Security Class Initialized"); } @@ -67,21 +67,24 @@ function CI_Security() * @return null */ function csrf_verify() - { + { // If no POST data exists we will set the CSRF cookie if (count($_POST) == 0) { return $this->csrf_set_cookie(); } + // Append application specific cookie prefix to token name + $csrf_token_name = (config_item('cookie_prefix')) ? config_item('cookie_prefix').$this->csrf_token_name : $this->csrf_token_name; + // Do the tokens exist in both the _POST and _COOKIE arrays? - if ( ! isset($_POST[$this->csrf_token_name]) OR ! isset($_COOKIE[$this->csrf_token_name])) + if ( ! isset($_POST[$this->csrf_token_name]) OR ! isset($_COOKIE[$csrf_token_name])) { $this->csrf_show_error(); } // Do the tokens match? - if ($_POST[$this->csrf_token_name] != $_COOKIE[$this->csrf_token_name]) + if ($_POST[$this->csrf_token_name] != $_COOKIE[$csrf_token_name]) { $this->csrf_show_error(); } @@ -134,7 +137,10 @@ function _csrf_set_hash() $this->csrf_hash = md5(uniqid(rand(), TRUE)); } } - + + // Create the cookie before we finish up + $this->csrf_set_cookie(); + return $this->csrf_hash; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 94eff05b..fb39d606 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -126,6 +126,7 @@

      Version 2.0.0

    3. Modified get_file_info in the file helper, changing filectime() to filemtime() for dates.
    4. Modified smiley_js() to add optional third parameter to return only the javascript with no script tags.
    5. The img() function of the HTML helper will now generate an empty string as an alt attribute if one is not provided.
      6. +
    6. If CSRF is enabled in the application config file, form_open() will automatically insert it as a hidden field.
    7. Other Changes From 4433f424d7a0dd7e5863ddd5393c13be377ed6ce Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Fri, 23 Jul 2010 08:47:34 -0400 Subject: [PATCH 1967/2544] adding sanitize_filename() into the security helper --- system/helpers/security_helper.php | 18 ++++++++++++++++++ user_guide/changelog.html | 1 + user_guide/helpers/security_helper.html | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php index 654cfd10..63f0e9cd 100644 --- a/system/helpers/security_helper.php +++ b/system/helpers/security_helper.php @@ -44,6 +44,24 @@ function xss_clean($str, $is_image = FALSE) } } +// ------------------------------------------------------------------------ + +/** + * Sanitize Filename + * + * @access public + * @param string + * @return string + */ +if ( ! function_exists('sanitize_filename')) +{ + function sanitize_filename($filename) + { + $CI =& get_instance(); + return $CI->security->sanitize_filename($filename); + } +} + // -------------------------------------------------------------------- /** diff --git a/user_guide/changelog.html b/user_guide/changelog.html index fb39d606..714e9e86 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -127,6 +127,7 @@

      Version 2.0.0

    8. Modified smiley_js() to add optional third parameter to return only the javascript with no script tags.
    9. The img() function of the HTML helper will now generate an empty string as an alt attribute if one is not provided.
    10. If CSRF is enabled in the application config file, form_open() will automatically insert it as a hidden field.
      11. +
    11. Added sanitize_filename() into the Security helper.
    12. Other Changes diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 97be674a..f74a7766 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -75,6 +75,12 @@

      xss_clean()

      Input class. More info can be found there.

      +

      sanitize_filename()

      + +

      Provides protection against directory traversal. This function is an alias to the one in the +Security class. More info can be found there.

      + +

      do_hash()

      Permits you to create SHA1 or MD5 one way hashes suitable for encrypting passwords. Will create SHA1 by default. Examples:

      From b3f10a23e4eb51f9236af0647eee4607776fee23 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sun, 25 Jul 2010 19:11:26 -0500 Subject: [PATCH 1968/2544] separated the CSRF cookie name from the token, forced new token on successful POST --- system/libraries/Security.php | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/system/libraries/Security.php b/system/libraries/Security.php index c8d43504..29ac2612 100644 --- a/system/libraries/Security.php +++ b/system/libraries/Security.php @@ -29,7 +29,8 @@ class CI_Security { var $csrf_hash = ''; var $csrf_expire = 7200; // Two hours (in seconds) var $csrf_token_name = 'ci_csrf_token'; - + var $csfr_cookie_name = 'ci_csrf_token'; + /* never allowed, string replacement */ var $never_allowed_str = array( 'document.cookie' => '[removed]', @@ -52,6 +53,9 @@ class CI_Security { function CI_Security() { + // Append application specific cookie prefix to token name + $this->csfr_cookie_name = (config_item('cookie_prefix')) ? config_item('cookie_prefix').$this->csrf_token_name : $this->csrf_token_name; + // Set the CSRF hash $this->_csrf_set_hash(); @@ -74,23 +78,25 @@ function csrf_verify() return $this->csrf_set_cookie(); } - // Append application specific cookie prefix to token name - $csrf_token_name = (config_item('cookie_prefix')) ? config_item('cookie_prefix').$this->csrf_token_name : $this->csrf_token_name; - // Do the tokens exist in both the _POST and _COOKIE arrays? - if ( ! isset($_POST[$this->csrf_token_name]) OR ! isset($_COOKIE[$csrf_token_name])) + if ( ! isset($_POST[$this->csrf_token_name]) OR ! isset($_COOKIE[$this->csfr_cookie_name])) { $this->csrf_show_error(); } // Do the tokens match? - if ($_POST[$this->csrf_token_name] != $_COOKIE[$csrf_token_name]) + if ($_POST[$this->csrf_token_name] != $_COOKIE[$this->csfr_cookie_name]) { $this->csrf_show_error(); } // We kill this since we're done and we don't want to polute the _POST array unset($_POST[$this->csrf_token_name]); + + // Nothing should last forever + unset($_COOKIE[$this->csfr_cookie_name]); + $this->_csrf_set_hash(); + $this->csrf_set_cookie(); log_message('debug', "CSRF token verified "); } @@ -105,11 +111,9 @@ function csrf_verify() */ function csrf_set_cookie() { - $prefix = ( ! is_string(config_item('cookie_prefix'))) ? '' : config_item('cookie_prefix'); - $expire = time() + $this->csrf_expire; - setcookie($prefix.$this->csrf_token_name, $this->csrf_hash, $expire, config_item('cookie_path'), config_item('cookie_domain'), 0); + setcookie($this->csfr_cookie_name, $this->csrf_hash, $expire, config_item('cookie_path'), config_item('cookie_domain'), 0); log_message('debug', "CRSF cookie Set"); } @@ -128,9 +132,9 @@ function _csrf_set_hash() { // If the cookie exists we will use it's value. We don't necessarily want to regenerate it with // each page load since a page could contain embedded sub-pages causing this feature to fail - if (isset($_COOKIE[$this->csrf_token_name]) AND $_COOKIE[$this->csrf_token_name] != '') + if (isset($_COOKIE[$this->csfr_cookie_name]) AND $_COOKIE[$this->csfr_cookie_name] != '') { - $this->csrf_hash = $_COOKIE[$this->csrf_token_name]; + $this->csrf_hash = $_COOKIE[$this->csfr_cookie_name]; } else { @@ -138,9 +142,6 @@ function _csrf_set_hash() } } - // Create the cookie before we finish up - $this->csrf_set_cookie(); - return $this->csrf_hash; } From 6dba102f71958f1a39f63fd0cc4885327354f752 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Sun, 25 Jul 2010 23:24:26 -0400 Subject: [PATCH 1969/2544] guide typo --- user_guide/libraries/file_uploading.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 28cf8de3..31041341 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -420,7 +420,7 @@

      Explanation

      image_width Image width. -image_heigth +image_height Image height image_type From 2ddc9496e9403a59a87b644d1c2b9a106b773e46 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 5 Aug 2010 10:08:33 -0400 Subject: [PATCH 1970/2544] Added an optional second parameter to show_404() to disable logging. --- system/core/Common.php | 4 ++-- system/core/Exceptions.php | 9 +++++++-- user_guide/changelog.html | 1 + user_guide/general/errors.html | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/system/core/Common.php b/system/core/Common.php index 9dee591e..2b8ad26b 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -317,10 +317,10 @@ function show_error($message, $status_code = 500, $heading = 'An Error Was Encou * @access public * @return void */ - function show_404($page = '') + function show_404($page = '', $log_error = TRUE) { $_error =& load_class('Exceptions', 'core'); - $_error->show_404($page); + $_error->show_404($page, $log_error); exit; } diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 503015df..419ea2b6 100644 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -88,12 +88,17 @@ function log_exception($severity, $message, $filepath, $line) * @param string * @return string */ - function show_404($page = '') + function show_404($page = '', $log_error = TRUE) { $heading = "404 Page Not Found"; $message = "The page you requested was not found."; - log_message('error', '404 Page Not Found --> '.$page); + // By default we log this, but allow a dev to skip it + if ($log_error) + { + log_message('error', '404 Page Not Found --> '.$page); + } + echo $this->show_error($heading, $message, 'error_404', 404); exit; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 714e9e86..ce017c9f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -132,6 +132,7 @@

      Version 2.0.0

    13. Other Changes
        +
      • Added an optional second parameter to show_404() to disable logging.
      • Updated loader to automatically apply the sub-class prefix as an option when loading classes. Class names can be prefixed with the standard "CI_" or the same prefix as the subclass prefix, or no prefix at all.
      • Increased randomness with is_really_writable() to avoid file collisions when hundreds or thousands of requests occur at once.
      • Switched some DIR_WRITE_MODE constant uses to FILE_WRITE_MODE where files and not directories are being operated on.
        • diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index 7c585d1b..5bd5011a 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -76,13 +76,15 @@

        show_error('message' [, int $status_code= 500 ] )

        application/errors/error_general.php

        The optional parameter $status_code determines what HTTP status code should be sent with the error.

        -

        show_404('page')

        +

        show_404('page' [, 'log_error'])

        This function will display the 404 error message supplied to it using the following error template:

        application/errors/error_404.php

        The function expects the string passed to it to be the file path to the page that isn't found. Note that CodeIgniter automatically shows 404 messages if controllers are not found.

        +

        CodeIgniter automatically logs any show_404() calls. Setting the optional second parameter to FALSE will skip logging.

        +

        log_message('level', 'message')

        From cbe3247819be75c34231ea200874044735bd853b Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Thu, 5 Aug 2010 14:09:20 -0500 Subject: [PATCH 1971/2544] Adding an ellipsize function to the text helper, and associated documentation to the user guide. --- system/helpers/text_helper.php | 42 +++++++++++++++++++++++++++++ user_guide/changelog.html | 1 + user_guide/helpers/text_helper.html | 12 +++++++++ 3 files changed, 55 insertions(+) diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 47726021..b7ade7a8 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -495,6 +495,48 @@ function word_wrap($str, $charlim = '76') } } +// ------------------------------------------------------------------------ + +if ( ! function_exists('ellipsize')) +{ + /** + * Ellipsize String + * + * This function will strip tags from a string, split it at its max_length and ellipsize + * + * @param string string to ellipsize + * @param integer max length of string + * @param mixed int (1|0) or float, .5, .2, etc for position to split + * @param string ellipsis ; Default '...' + * @return string ellipsized string + */ + function ellipsize($str, $max_length, $position = 1, $ellipsis = '…') + { + // Strip tags + $str = trim(strip_tags($str)); + + // Is the string long enough to ellipsize? + if (strlen($str) <= $max_length) + { + return $str; + } + + $beg = substr($str, 0, floor($max_length * $position)); + + $position = ($position > 1) ? 1 : $position; + + if ($position === 1) + { + $end = substr($str, 0, -($max_length - strlen($beg))); + } + else + { + $end = substr($str, -($max_length - strlen($beg))); + } + + return $beg.$ellipsis.$end; + } +} /* End of file text_helper.php */ /* Location: ./system/helpers/text_helper.php */ \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ce017c9f..f32ee58b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -128,6 +128,7 @@

        Version 2.0.0

      • The img() function of the HTML helper will now generate an empty string as an alt attribute if one is not provided.
      • If CSRF is enabled in the application config file, form_open() will automatically insert it as a hidden field.
      • Added sanitize_filename() into the Security helper.
        • +
      • Added ellipsize() to the Text Helper
    14. Other Changes diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index d477f53a..438eaec4 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -177,7 +177,19 @@

      word_wrap()

      us demonstrate this
      function       +

      ellipsize()

      +

      This function will strip tags from a string, split it at a defined maximum length, and insert an ellipsis.

      +

      The first parameter is the string to ellipsize, the second is the number of characters in the final string. The third parameter is where in the string the ellipsis should appear from 0 - 1, left to right. For example. a value of 1 will place the ellipsis at the right of the string, .5 in the middle, and 0 at the left.

      +

      An optional forth parameter is the kind of ellipsis. By default, &hellip; will be inserted.

      + +$str = 'this_string_is_entirely_too_long_and_might_break_my_design.jpg';
      +
      +echo ellipsize($str, 32, .5);       + +Produces: + +this_string_is_e…ak_my_design.jpg From 0f6b7c1ce0f0122ba162dc579a34a73438d4955a Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Thu, 5 Aug 2010 14:11:14 -0500 Subject: [PATCH 1972/2544] moving code comment in text helper --- system/helpers/text_helper.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index b7ade7a8..b85e2aae 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -497,19 +497,19 @@ function word_wrap($str, $charlim = '76') // ------------------------------------------------------------------------ +/** + * Ellipsize String + * + * This function will strip tags from a string, split it at its max_length and ellipsize + * + * @param string string to ellipsize + * @param integer max length of string + * @param mixed int (1|0) or float, .5, .2, etc for position to split + * @param string ellipsis ; Default '...' + * @return string ellipsized string + */ if ( ! function_exists('ellipsize')) { - /** - * Ellipsize String - * - * This function will strip tags from a string, split it at its max_length and ellipsize - * - * @param string string to ellipsize - * @param integer max length of string - * @param mixed int (1|0) or float, .5, .2, etc for position to split - * @param string ellipsis ; Default '...' - * @return string ellipsized string - */ function ellipsize($str, $max_length, $position = 1, $ellipsis = '…') { // Strip tags From 88f8d9f4c9d590cc14e71cd77f34e5e2abe57e21 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Fri, 6 Aug 2010 13:01:38 -0500 Subject: [PATCH 1973/2544] Removing the following deprecated database methods: orwhere, orlike, groupby, orhaving, orderby, getwhere. --- system/database/DB_active_rec.php | 74 +------------------------- user_guide/changelog.html | 1 + user_guide/database/active_record.html | 10 ++-- 3 files changed, 7 insertions(+), 78 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 3e9923e6..953cc954 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -398,18 +398,6 @@ function or_where($key, $value = NULL, $escape = TRUE) // -------------------------------------------------------------------- - /** - * orwhere() is an alias of or_where() - * this function is here for backwards compatibility, as - * orwhere() has been deprecated - */ - function orwhere($key, $value = NULL, $escape = TRUE) - { - return $this->or_where($key, $value, $escape); - } - - // -------------------------------------------------------------------- - /** * Where * @@ -671,18 +659,6 @@ function or_not_like($field, $match = '', $side = 'both') // -------------------------------------------------------------------- - /** - * orlike() is an alias of or_like() - * this function is here for backwards compatibility, as - * orlike() has been deprecated - */ - function orlike($field, $match = '', $side = 'both') - { - return $this->or_like($field, $match, $side); - } - - // -------------------------------------------------------------------- - /** * Like * @@ -775,18 +751,6 @@ function group_by($by) // -------------------------------------------------------------------- - /** - * groupby() is an alias of group_by() - * this function is here for backwards compatibility, as - * groupby() has been deprecated - */ - function groupby($by) - { - return $this->group_by($by); - } - - // -------------------------------------------------------------------- - /** * Sets the HAVING value * @@ -801,19 +765,7 @@ function having($key, $value = '', $escape = TRUE) { return $this->_having($key, $value, 'AND ', $escape); } - - // -------------------------------------------------------------------- - - /** - * orhaving() is an alias of or_having() - * this function is here for backwards compatibility, as - * orhaving() has been deprecated - */ - - function orhaving($key, $value = '', $escape = TRUE) - { - return $this->or_having($key, $value, $escape); - } + // -------------------------------------------------------------------- /** @@ -938,18 +890,6 @@ function order_by($orderby, $direction = '') // -------------------------------------------------------------------- - /** - * orderby() is an alias of order_by() - * this function is here for backwards compatibility, as - * orderby() has been deprecated - */ - function orderby($orderby, $direction = '') - { - return $this->order_by($orderby, $direction); - } - - // -------------------------------------------------------------------- - /** * Sets the LIMIT value * @@ -1125,18 +1065,6 @@ function get_where($table = '', $where = null, $limit = null, $offset = null) // -------------------------------------------------------------------- - /** - * getwhere() is an alias of get_where() - * this function is here for backwards compatibility, as - * getwhere() has been deprecated - */ - function getwhere($table = '', $where = null, $limit = null, $offset = null) - { - return $this->get_where($table, $where, $limit, $offset); - } - - // -------------------------------------------------------------------- - /** * Insert_Batch * diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f32ee58b..7e86ba4e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -109,6 +109,7 @@

      Version 2.0.0

    15. Semantic change to db->version() function to allow a list of exceptions for databases with functions to return version string instead of specially formed SQL queries. Currently this list only includes Oracle and SQLite.
    16. Fixed a bug where driver specific table identifier protection could lead to malformed queries in the field_data() functions.
    17. Fixed a bug where an undefined class variable was referenced in database drivers.
      18. +
    18. Removed the following deprecated functions: orwhere, orlike, groupby, orhaving, orderby, getwhere.
    19. Helpers diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 2c12d628..482115cc 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -116,7 +116,7 @@

      $this->db->get_where();

      $query = $this->db->get_where('mytable', array('id' => $id), $limit, $offset);

      Please read the about the where function below for more information.

      -

      Note: get_where() was formerly known as getwhere(), which has been deprecated

      +

      Note: get_where() was formerly known as getwhere(), which has been removed

      $this->db->select();

      Permits you to write the SELECT portion of your query:

      @@ -274,7 +274,7 @@

      $this->db->or_where();



      // Produces: WHERE name != 'Joe' OR id > 50 -

      Note: or_where() was formerly known as orwhere(), which has been deprecated.

      +

      Note: or_where() was formerly known as orwhere(), which has been removed.

      $this->db->where_in();

      @@ -356,7 +356,7 @@

      $this->db->or_like();

      -

      Note: or_like() was formerly known as orlike(), which has been deprecated.

      +

      Note: or_like() was formerly known as orlike(), which has been removed.

      $this->db->not_like();

      This function is identical to like(), except that it generates NOT LIKE statements:

      $this->db->not_like('title', 'match');
      @@ -381,7 +381,7 @@

      $this->db->group_by();



      // Produces: GROUP BY title, date       -

      Note: group_by() was formerly known as groupby(), which has been deprecated.

      +

      Note: group_by() was formerly known as groupby(), which has been removed.

      $this->db->distinct();

      @@ -439,7 +439,7 @@

      $this->db->order_by();


      // Produces: ORDER BY title DESC, name ASC

      -

      Note: order_by() was formerly known as orderby(), which has been deprecated.

      +

      Note: order_by() was formerly known as orderby(), which has been removed.

      Note: random ordering is not currently supported in Oracle or MSSQL drivers. These will default to 'ASC'.

      $this->db->limit();

      Lets you limit the number of rows you would like returned by the query:

      From c5b044b739234c1e1635d4a4647b3440c44f4fa3 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Fri, 6 Aug 2010 13:06:32 -0500 Subject: [PATCH 1974/2544] Removed deprecated _drop_database() and _create_database() functions from db utility drivers. --- .../database/drivers/mssql/mssql_utility.php | 35 --------------- .../database/drivers/mysql/mysql_utility.php | 35 --------------- .../drivers/mysqli/mysqli_utility.php | 36 --------------- system/database/drivers/oci8/oci8_utility.php | 35 --------------- system/database/drivers/odbc/odbc_utility.php | 45 ------------------- .../drivers/postgre/postgre_utility.php | 36 --------------- .../drivers/sqlite/sqlite_utility.php | 45 ------------------- user_guide/changelog.html | 1 + 8 files changed, 1 insertion(+), 267 deletions(-) diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php index da887b81..751be146 100644 --- a/system/database/drivers/mssql/mssql_utility.php +++ b/system/database/drivers/mssql/mssql_utility.php @@ -82,42 +82,7 @@ function _backup($params = array()) return $this->db->display_error('db_unsuported_feature'); } - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access private - * @param string the database name - * @return bool - */ - function _create_database($name) - { - return "CREATE DATABASE ".$name; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - return "DROP DATABASE ".$name; - } - } - /* End of file mssql_utility.php */ /* Location: ./system/database/drivers/mssql/mssql_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php index 3277b0ff..c4a970cf 100644 --- a/system/database/drivers/mysql/mysql_utility.php +++ b/system/database/drivers/mysql/mysql_utility.php @@ -204,41 +204,6 @@ function _backup($params = array()) return $output; } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access private - * @param string the database name - * @return bool - */ - function _create_database($name) - { - return "CREATE DATABASE ".$name; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - return "DROP DATABASE ".$name; - } - } /* End of file mysql_utility.php */ diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php index 44fd0f7a..3ba14d25 100644 --- a/system/database/drivers/mysqli/mysqli_utility.php +++ b/system/database/drivers/mysqli/mysqli_utility.php @@ -81,42 +81,6 @@ function _backup($params = array()) // Currently unsupported return $this->db->display_error('db_unsuported_feature'); } - - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access private - * @param string the database name - * @return bool - */ - function _create_database($name) - { - return "CREATE DATABASE ".$name; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - return "DROP DATABASE ".$name; - } - } /* End of file mysqli_utility.php */ diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php index 74670eaa..cc179353 100644 --- a/system/database/drivers/oci8/oci8_utility.php +++ b/system/database/drivers/oci8/oci8_utility.php @@ -81,41 +81,6 @@ function _backup($params = array()) // Currently unsupported return $this->db->display_error('db_unsuported_feature'); } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access public - * @param string the database name - * @return bool - */ - function _create_database($name) - { - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - return FALSE; - } - } /* End of file oci8_utility.php */ diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php index 4e6848e8..5b874d88 100644 --- a/system/database/drivers/odbc/odbc_utility.php +++ b/system/database/drivers/odbc/odbc_utility.php @@ -96,52 +96,7 @@ function _backup($params = array()) // Currently unsupported return $this->db->display_error('db_unsuported_feature'); } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - /** - * Create database - * - * @access private - * @param string the database name - * @return bool - */ - function _create_database() - { - // ODBC has no "create database" command since it's - // designed to connect to an existing database - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - // ODBC has no "drop database" command since it's - // designed to connect to an existing database - if ($this->db->db_debug) - { - return $this->db->display_error('db_unsuported_feature'); - } - return FALSE; - } } /* End of file odbc_utility.php */ diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php index dda22ddb..84b089af 100644 --- a/system/database/drivers/postgre/postgre_utility.php +++ b/system/database/drivers/postgre/postgre_utility.php @@ -81,42 +81,6 @@ function _backup($params = array()) // Currently unsupported return $this->db->display_error('db_unsuported_feature'); } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access private - * @param string the database name - * @return bool - */ - function _create_database($name) - { - return "CREATE DATABASE ".$name; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - return "DROP DATABASE ".$name; - } - - } diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php index fe63362e..956d2130 100644 --- a/system/database/drivers/sqlite/sqlite_utility.php +++ b/system/database/drivers/sqlite/sqlite_utility.php @@ -90,51 +90,6 @@ function _backup($params = array()) // Currently unsupported return $this->db->display_error('db_unsuported_feature'); } - - /** - * - * The functions below have been deprecated as of 1.6, and are only here for backwards - * compatibility. They now reside in dbforge(). The use of dbutils for database manipulation - * is STRONGLY discouraged in favour if using dbforge. - * - */ - - /** - * Create database - * - * @access public - * @param string the database name - * @return bool - */ - function _create_database() - { - // In SQLite, a database is created when you connect to the database. - // We'll return TRUE so that an error isn't generated - return TRUE; - } - - // -------------------------------------------------------------------- - - /** - * Drop database - * - * @access private - * @param string the database name - * @return bool - */ - function _drop_database($name) - { - if ( ! @file_exists($this->db->database) OR ! @unlink($this->db->database)) - { - if ($this->db->db_debug) - { - return $this->db->display_error('db_unable_to_drop'); - } - return FALSE; - } - return TRUE; - } - } /* End of file sqlite_utility.php */ diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7e86ba4e..171392f4 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -110,6 +110,7 @@

      Version 2.0.0

    20. Fixed a bug where driver specific table identifier protection could lead to malformed queries in the field_data() functions.
    21. Fixed a bug where an undefined class variable was referenced in database drivers.
    22. Removed the following deprecated functions: orwhere, orlike, groupby, orhaving, orderby, getwhere.
      23. +
    23. Removed deprecated _drop_database() and _create_database() functions from the db utility drivers.
    24. Helpers From 4062d48ca89736c952e9be17bb395d36140f4668 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 10 Aug 2010 20:30:34 -0500 Subject: [PATCH 1975/2544] removed redundant upload lang file, after lang name changs, it was blocking the CI lang file from loading. Fixes #473 --- system/libraries/Upload.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index c18c178d..0aa6d4c2 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -937,9 +937,12 @@ function set_error($msg) */ function display_errors($open = '

      ', $close = '

      ') { + $CI =& get_instance(); + $CI->lang->load('upload'); $str = ''; foreach ($this->error_msg as $val) { + $str .= '
      '.print_r($CI->lang->line($msg), TRUE).'
      '; $str .= $open.$val.$close; } From 23b7776accc6ebfa377c9b54bd04baaaf0c00132 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 10 Aug 2010 20:38:43 -0500 Subject: [PATCH 1976/2544] undoing mistaken changes in rev 8c54b3b0402f --- system/libraries/Upload.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 0aa6d4c2..c18c178d 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -937,12 +937,9 @@ function set_error($msg) */ function display_errors($open = '

      ', $close = '

      ') { - $CI =& get_instance(); - $CI->lang->load('upload'); $str = ''; foreach ($this->error_msg as $val) { - $str .= '
      '.print_r($CI->lang->line($msg), TRUE).'
      '; $str .= $open.$val.$close; } From b76fedd3b07549b926b18148793c8f50373942bb Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 12 Aug 2010 16:14:10 -0400 Subject: [PATCH 1977/2544] single quotes instead of double quotes by default to prevent PHP from trying to parse a $ in a password as a variable. --- application/config/database.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/application/config/database.php b/application/config/database.php index a3226b18..24d611ac 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -5,7 +5,7 @@ | ------------------------------------------------------------------- | This file will contain the settings needed to access your database. | -| For complete instructions please consult the "Database Connection" +| For complete instructions please consult the 'Database Connection' | page of the User Guide. | | ------------------------------------------------------------------- @@ -28,32 +28,32 @@ | ['dbcollat'] The character collation used in communicating with the database | ['swap_pre'] A default table prefix that should be swapped with the dbprefix | ['autoinit'] Whether or not to automatically initialize the database. -| ['stricton'] TRUE/FALSE - forces "Strict Mode" connections +| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections | - good for ensuring strict SQL while developing | | The $active_group variable lets you choose which connection group to -| make active. By default there is only one group (the "default" group). +| make active. By default there is only one group (the 'default' group). | | The $active_record variables lets you determine whether or not to load | the active record class */ -$active_group = "default"; +$active_group = 'default'; $active_record = TRUE; -$db['default']['hostname'] = "localhost"; -$db['default']['username'] = ""; -$db['default']['password'] = ""; -$db['default']['database'] = ""; -$db['default']['dbdriver'] = "mysql"; -$db['default']['dbprefix'] = ""; +$db['default']['hostname'] = 'localhost'; +$db['default']['username'] = ''; +$db['default']['password'] = ''; +$db['default']['database'] = ''; +$db['default']['dbdriver'] = 'mysql'; +$db['default']['dbprefix'] = ''; $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; -$db['default']['cachedir'] = ""; -$db['default']['char_set'] = "utf8"; -$db['default']['dbcollat'] = "utf8_general_ci"; -$db['default']['swap_pre'] = ""; +$db['default']['cachedir'] = ''; +$db['default']['char_set'] = 'utf8'; +$db['default']['dbcollat'] = 'utf8_general_ci'; +$db['default']['swap_pre'] = ''; $db['default']['autoinit'] = TRUE; $db['default']['stricton'] = FALSE; From d8153f502f2e553e6169b6245c36d26b7a2d027a Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Mon, 16 Aug 2010 08:57:45 -0400 Subject: [PATCH 1978/2544] guide typo --- user_guide/libraries/cart.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index 4d458f57..0dcf04ac 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -68,7 +68,7 @@

      Initializing the Shopping Cart Class

      Important: The Cart class utilizes CodeIgniter's Session Class to save the cart information to a database, so before using the Cart class you must set up a database table -as indicated in the Session Documentation , and set the session preferences in your appliction/config/config.php file to utilize a database.

      +as indicated in the Session Documentation , and set the session preferences in your application/config/config.php file to utilize a database.

      To initialize the Shopping Cart Class in your controller constructor, use the $this->load->library function:

      From 5eb964f7bcda04c13cc484cfdef7138e887a75f3 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Thu, 19 Aug 2010 09:31:52 -0400 Subject: [PATCH 1979/2544] Adding CAPTCHA helper to toc --- user_guide/nav/nav.js | 28 +++++++++++++--------------- user_guide/toc.html | 2 +- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index 909a0dd9..bad23d20 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -7,9 +7,9 @@ function create_menu(basepath) '' + '' + + '' + '

      Basic Info

      ' + '' + - + '' + + '

      Installation

      ' + '' + - + '

      Introduction

      ' + '' + + '' + - '' + '

      General Topics

      ' + @@ -65,10 +64,9 @@ function create_menu(basepath) '
    25. PHP Style Guide
      26. ' + '
    26. Writing Documentation
      27. ' + '' + - + '' + - '

      Class Reference

      ' + '' + '

      Additional Resources

      ' + '' + - + '' + + ''); } \ No newline at end of file diff --git a/user_guide/toc.html b/user_guide/toc.html index f7fd5e0a..db9e9a82 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -121,7 +121,6 @@

      General Topics

      -

      Class Reference

      • Benchmarking Class
        • @@ -160,6 +159,7 @@

        Class Reference

        Helper Reference

        • Array Helper
          • +
        • CAPTCHA Helper
        • Compatibility Helper
        • Cookie Helper
        • Date Helper
          • From 595bfd1484ecc8212d6c3c028210b4d1ae78baba Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 20 Aug 2010 10:28:22 -0500 Subject: [PATCH 1980/2544] Added ability in the Image Library to handle PNG transparency for resize operations when using the GD lib. --- system/libraries/Image_lib.php | 7 +++++++ user_guide/changelog.html | 1 + 2 files changed, 8 insertions(+) diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 21e0a709..806d942b 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -513,6 +513,13 @@ function image_process_gd($action = 'resize') } $dst_img = $create($this->width, $this->height); + + if ($this->image_type == 3) // png we can actually preserve transparency + { + imagealphablending($dst_img, FALSE); + imagesavealpha($dst_img, TRUE); + } + $copy($dst_img, $src_img, 0, 0, $this->x_axis, $this->y_axis, $this->width, $this->height, $this->orig_width, $this->orig_height); // Show the image diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 171392f4..48d4309a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -98,6 +98,7 @@

          Version 2.0.0

        • Changed do_xss_clean() to return FALSE if the uploaded file fails XSS checks.
        • Added stripslashes() and trim()ing of double quotes from $_FILES type value to standardize input in Upload library.
        • Added a second parameter (boolean) to $this->zip->read_dir('/path/to/directory', FALSE) to remove the preceding trail of empty folders when creating a Zip archive. This example would contain a zip with "directory" and all of its contents.
          • +
        • Added ability in the Image Library to handle PNG transparency for resize operations when using the GD lib.

      • Database From 60f8c395f24ba6db80d510892bcc53ce5bf9f4eb Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Wed, 25 Aug 2010 18:03:28 +0200 Subject: [PATCH 1981/2544] Modified the database driver's display_error() method to show the filename and line number of the failed query. --- system/database/DB_driver.php | 18 ++++++++++++++++++ user_guide/changelog.html | 1 + 2 files changed, 19 insertions(+) diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index dfef4275..8e6f8880 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1169,6 +1169,24 @@ function display_error($error = '', $swap = '', $native = FALSE) $message = ( ! is_array($error)) ? array(str_replace('%s', $swap, $LANG->line($error))) : $error; } + // Find the most likely culprit of the error by going through + // the backtrace until the source file is no longer in the + // database folder. + + $trace = debug_backtrace(); + + foreach($trace as $call) + { + if (isset($call['file']) && strpos($call['file'], BASEPATH.'database') === FALSE) + { + // Found it - use a relative path for safety + $message[] = 'Filename: '.str_replace(array(BASEPATH, APPPATH), '', $call['file']); + $message[] = 'Line Number: '.$call['line']; + + break; + } + } + $error =& load_class('Exceptions', 'core'); echo $error->show_error($heading, $message, 'error_db'); exit; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 48d4309a..38f84112 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -110,6 +110,7 @@

        Version 2.0.0

      • Semantic change to db->version() function to allow a list of exceptions for databases with functions to return version string instead of specially formed SQL queries. Currently this list only includes Oracle and SQLite.
      • Fixed a bug where driver specific table identifier protection could lead to malformed queries in the field_data() functions.
      • Fixed a bug where an undefined class variable was referenced in database drivers.
        • +
      • Modified the database errors to show the filename and line number of the problematic query.
      • Removed the following deprecated functions: orwhere, orlike, groupby, orhaving, orderby, getwhere.
      • Removed deprecated _drop_database() and _create_database() functions from the db utility drivers.
      From 5485db50775d4e2f76a593ef8b3425f6a1b90666 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 30 Aug 2010 21:31:08 -0500 Subject: [PATCH 1982/2544] Added fatal error to Session class when no encryption key is set in the config file, for additional assurance that session manipulation can be prevented --- application/config/config.php | 4 ++-- system/libraries/Session.php | 5 +++++ user_guide/libraries/sessions.html | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/application/config/config.php b/application/config/config.php index 6e52bcc1..c5eae8f5 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -213,8 +213,8 @@ | Encryption Key |-------------------------------------------------------------------------- | -| 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. +| If you use the Encryption class or the Session class you +| MUST set an encryption key. See the user guide for info. | */ $config['encryption_key'] = ""; diff --git a/system/libraries/Session.php b/system/libraries/Session.php index cf6dc96e..f413c0d1 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -65,6 +65,11 @@ function CI_Session($params = array()) $this->$key = (isset($params[$key])) ? $params[$key] : $this->CI->config->item($key); } + if ($this->encryption_key == '') + { + show_error('In order to use the Session class you are required to set an encryption key in your config file.'); + } + // Load the string helper so we can use the strip_slashes() function $this->CI->load->helper('string'); diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 9a2ca939..7dc386fd 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -68,6 +68,9 @@

      Session Class

      Note: The Session class does not utilize native PHP sessions. It generates its own session data, offering more flexibility for developers.

      +

      Note: Even if you are not using encrypted sessions, you must set +an encryption key in your config file which is used to aid in preventing session data manipulation.

      +

      Initializing a Session

      Sessions will typically run globally with each page load, so the session class must either be From 52ace4322b6ff02b8d0212197355ac9ee25e63f2 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 30 Aug 2010 21:33:38 -0500 Subject: [PATCH 1983/2544] added link for encryption key in Session class to the explanation in the Encryption lib --- user_guide/libraries/sessions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 7dc386fd..a8e3b349 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -69,7 +69,7 @@

      Session Class

      generates its own session data, offering more flexibility for developers.

      Note: Even if you are not using encrypted sessions, you must set -an encryption key in your config file which is used to aid in preventing session data manipulation.

      +an encryption key in your config file which is used to aid in preventing session data manipulation.

      Initializing a Session

      From ac01acc5d786226f6372c2dc2bab81c7d8f3bd06 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 30 Aug 2010 21:45:06 -0500 Subject: [PATCH 1984/2544] changelog note for Session class change in rev f2660eeaab8d --- user_guide/changelog.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 38f84112..18e4df7a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -98,7 +98,8 @@

      Version 2.0.0

    27. Changed do_xss_clean() to return FALSE if the uploaded file fails XSS checks.
    28. Added stripslashes() and trim()ing of double quotes from $_FILES type value to standardize input in Upload library.
    29. Added a second parameter (boolean) to $this->zip->read_dir('/path/to/directory', FALSE) to remove the preceding trail of empty folders when creating a Zip archive. This example would contain a zip with "directory" and all of its contents.
      30. -
    30. Added ability in the Image Library to handle PNG transparency for resize operations when using the GD lib.

      +
    31. Added ability in the Image Library to handle PNG transparency for resize operations when using the GD lib.
      32. +
    32. Modified the Session class to prevent use if no encryption key is set in the config file.
    33. Database From 7284f06585a689702ea86684893c999065621460 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 31 Aug 2010 00:30:21 -0500 Subject: [PATCH 1985/2544] changed key comparison to be loosely typed, so an error would be triggered when an empty string is attempted to be used as an encryption key --- system/libraries/Encrypt.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index c893fbf9..44fdce03 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -72,7 +72,7 @@ function get_key($key = '') $CI =& get_instance(); $key = $CI->config->item('encryption_key'); - if ($key === FALSE) + if ($key == FALSE) { show_error('In order to use the encryption class requires that you set an encryption key in your config file.'); } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 18e4df7a..d9c17ab7 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -177,6 +177,7 @@

      Bug fixes for 2.0.0

    34. Fixed a bug where extending the Controller class would result in a fatal PHP error.
    35. Fixed a PHP Strict Standards Error in the index.php file.
    36. Fixed a bug where getimagesize() was being needlessly checked on non-image files in is_allowed_type().
      37. +
    37. Fixed a bug in the Encryption library where an empty key was not triggering an error.

      38. Version 1.7.2

      From 95b183addfb1683583d401e04f2684ceb86f8b96 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 31 Aug 2010 09:42:39 -0500 Subject: [PATCH 1986/2544] fixed spelling error in Security class property for the CSRF cookie --- system/libraries/Security.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/system/libraries/Security.php b/system/libraries/Security.php index 29ac2612..9a1590b5 100644 --- a/system/libraries/Security.php +++ b/system/libraries/Security.php @@ -29,7 +29,7 @@ class CI_Security { var $csrf_hash = ''; var $csrf_expire = 7200; // Two hours (in seconds) var $csrf_token_name = 'ci_csrf_token'; - var $csfr_cookie_name = 'ci_csrf_token'; + var $csrf_cookie_name = 'ci_csrf_token'; /* never allowed, string replacement */ var $never_allowed_str = array( @@ -54,7 +54,7 @@ class CI_Security { function CI_Security() { // Append application specific cookie prefix to token name - $this->csfr_cookie_name = (config_item('cookie_prefix')) ? config_item('cookie_prefix').$this->csrf_token_name : $this->csrf_token_name; + $this->csrf_cookie_name = (config_item('cookie_prefix')) ? config_item('cookie_prefix').$this->csrf_token_name : $this->csrf_token_name; // Set the CSRF hash $this->_csrf_set_hash(); @@ -79,13 +79,13 @@ function csrf_verify() } // Do the tokens exist in both the _POST and _COOKIE arrays? - if ( ! isset($_POST[$this->csrf_token_name]) OR ! isset($_COOKIE[$this->csfr_cookie_name])) + if ( ! isset($_POST[$this->csrf_token_name]) OR ! isset($_COOKIE[$this->csrf_cookie_name])) { $this->csrf_show_error(); } // Do the tokens match? - if ($_POST[$this->csrf_token_name] != $_COOKIE[$this->csfr_cookie_name]) + if ($_POST[$this->csrf_token_name] != $_COOKIE[$this->csrf_cookie_name]) { $this->csrf_show_error(); } @@ -94,7 +94,7 @@ function csrf_verify() unset($_POST[$this->csrf_token_name]); // Nothing should last forever - unset($_COOKIE[$this->csfr_cookie_name]); + unset($_COOKIE[$this->csrf_cookie_name]); $this->_csrf_set_hash(); $this->csrf_set_cookie(); @@ -113,7 +113,7 @@ function csrf_set_cookie() { $expire = time() + $this->csrf_expire; - setcookie($this->csfr_cookie_name, $this->csrf_hash, $expire, config_item('cookie_path'), config_item('cookie_domain'), 0); + setcookie($this->csrf_cookie_name, $this->csrf_hash, $expire, config_item('cookie_path'), config_item('cookie_domain'), 0); log_message('debug', "CRSF cookie Set"); } @@ -132,9 +132,9 @@ function _csrf_set_hash() { // If the cookie exists we will use it's value. We don't necessarily want to regenerate it with // each page load since a page could contain embedded sub-pages causing this feature to fail - if (isset($_COOKIE[$this->csfr_cookie_name]) AND $_COOKIE[$this->csfr_cookie_name] != '') + if (isset($_COOKIE[$this->csrf_cookie_name]) AND $_COOKIE[$this->csrf_cookie_name] != '') { - $this->csrf_hash = $_COOKIE[$this->csfr_cookie_name]; + $this->csrf_hash = $_COOKIE[$this->csrf_cookie_name]; } else { From 09c7793b23ae77c54e25d12b63d8ca9c9232efeb Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 31 Aug 2010 13:17:10 -0500 Subject: [PATCH 1987/2544] Significant changes to the Encryption library - Removed double-encoding with XOR scheme when Mcrypt is available. Additional obfuscation was not significantly aiding security, and came at a very high performance cost. - Changed the default encryption mode from ECB to CBC for much improved security - Added an encode_from_legacy() method to allow re-encoding of permanent data that was originally encoded with the older methods. --- system/libraries/Encrypt.php | 75 ++++++++++++++++++++++-- user_guide/changelog.html | 4 ++ user_guide/installation/upgrade_200.html | 15 ++++- user_guide/libraries/encryption.html | 44 ++++++++++++-- 4 files changed, 126 insertions(+), 12 deletions(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 44fdce03..8beff75d 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -116,12 +116,16 @@ function set_key($key = '') function encode($string, $key = '') { $key = $this->get_key($key); - $enc = $this->_xor_encode($string, $key); - + if ($this->_mcrypt_exists === TRUE) { - $enc = $this->mcrypt_encode($enc, $key); + $enc = $this->mcrypt_encode($string, $key); + } + else + { + $enc = $this->_xor_encode($string, $key); } + return base64_encode($enc); } @@ -155,12 +159,71 @@ function decode($string, $key = '') return FALSE; } } - - return $this->_xor_decode($dec, $key); + else + { + $dec = $this->_xor_decode($dec, $key); + } + + return $dec; } // -------------------------------------------------------------------- + + /** + * Encode from Legacy + * + * Takes an encoded string from the original Encryption class algorithms and + * returns a newly encoded string using the improved method added in 2.0.0 + * This allows for backwards compatibility and a method to transition to the + * new encryption algorithms. + * + * For more details, see http://codeigniter.com/user_guide/installation/upgrade_200.html#encryption + * + * @access public + * @param string + * @param int (mcrypt mode constant) + * @param string + * @return string + */ + function encode_from_legacy($string, $legacy_mode = MCRYPT_MODE_ECB, $key = '') + { + if ($this->_mcrypt_exists === FALSE) + { + log_message('error', 'Encoding from legacy is available only when Mcrypt is in use.'); + return FALSE; + } + + // decode it first + // set mode temporarily to what it was when string was encoded with the legacy + // algorithm - typically MCRYPT_MODE_ECB + $current_mode = $this->_get_mode(); + $this->set_mode($legacy_mode); + + $key = $this->get_key($key); + + if (preg_match('/[^a-zA-Z0-9\/\+=]/', $string)) + { + return FALSE; + } + + $dec = base64_decode($string); + + if (($dec = $this->mcrypt_decode($dec, $key)) === FALSE) + { + return FALSE; + } + + $dec = $this->_xor_decode($dec, $key); + // set the mcrypt mode back to what it should be, typically MCRYPT_MODE_CBC + $this->set_mode(MCRYPT_MODE_CBC); + + // and re-encode + return base64_encode($this->mcrypt_encode($dec, $key)); + } + + // -------------------------------------------------------------------- + /** * XOR Encode * @@ -412,7 +475,7 @@ function _get_mode() { if ($this->_mcrypt_mode == '') { - $this->_mcrypt_mode = MCRYPT_MODE_ECB; + $this->_mcrypt_mode = MCRYPT_MODE_CBC; } return $this->_mcrypt_mode; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d9c17ab7..c42bde01 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -100,6 +100,10 @@

      Version 2.0.0

    38. Added a second parameter (boolean) to $this->zip->read_dir('/path/to/directory', FALSE) to remove the preceding trail of empty folders when creating a Zip archive. This example would contain a zip with "directory" and all of its contents.
    39. Added ability in the Image Library to handle PNG transparency for resize operations when using the GD lib.
    40. Modified the Session class to prevent use if no encryption key is set in the config file.
      41. +
    41. Improved performance of the Encryption library on servers where Mcrypt is available.
      42. +
    42. Changed the default encryption mode in the Encryption library to CBC.
      43. +
    43. Added an encode_from_legacy() method to provide a way to transition encrypted data from CodeIgniter 1.x to CodeIgniter 2.x. + Please see the upgrade instructions for details.
    44. Database diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index f45875b3..155df90d 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -89,7 +89,20 @@

      Step 3: Convert your Plugins to Helpers

      -

      Step 3: Update your user guide

      +

      Step 4: Update stored encrypted data

      + +

      Note: If your application does not use the Encryption library, does not store Encrypted data permanently, or is on an environment that does not support Mcrypt, you may skip this step.

      + +

      The Encryption library has had a number of improvements, some for encryption strength and some for performance, that has an unavoidable consequence of + making it no longer possible to decode encrypted data produced by the original version of this library. To help with the transition, a new method has + been added, encode_from_legacy() that will decode the data with the original algorithm and return a re-encoded string using the improved methods. + This will enable you to easily replace stale encrypted data with fresh in your applications, either on the fly or en masse.

      + +

      Please read how to use this method in the Encryption library documentation.

      + +

      + +

      Step 5: Update your user guide

      Please replace your local copy of the user guide with the new version, including the image files.

      diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index dac1db91..fbffd63c 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -58,12 +58,11 @@

      Encryption Class

      -

      The Encryption Class provides two-way data encryption. It uses a scheme that pre-compiles -the message using a randomly hashed bitwise XOR encoding scheme, which is then encrypted using +

      The Encryption Class provides two-way data encryption. It uses a scheme that either compiles +the message using a randomly hashed bitwise XOR encoding scheme, or is encrypted using the Mcrypt library. If Mcrypt is not available on your server the encoded message will still provide a reasonable degree of security for encrypted sessions or other such "light" purposes. -If Mcrypt is available, you'll effectively end up with a double-encrypted message string, which should -provide a very high degree of security.

      +If Mcrypt is available, you'll be provided with a high degree of security appropriate for storage.

      Setting your Key

      @@ -153,7 +152,7 @@

      $this->encrypt->set_cipher();

      $this->encrypt->set_mode();

      -

      Permits you to set an Mcrypt mode. By default it uses MCRYPT_MODE_ECB. Example:

      +

      Permits you to set an Mcrypt mode. By default it uses MCRYPT_MODE_CBC. Example:

      $this->encrypt->set_mode(MCRYPT_MODE_CFB);

      Please visit php.net for a list of available modes.

      @@ -169,7 +168,42 @@

      $this->encrypt->sha1();

      If your server does not support SHA1 you can use the provided function.

      +

      $this->encrypt->encode_from_legacy($orig_data, $legacy_mode = MCRYPT_MODE_ECB, $key = '');

      +

      Enables you to re-encode data that was originally encrypted with CodeIgniter 1.x to be compatible with the Encryption library in CodeIgniter 2.x. It is only + necessary to use this method if you have encrypted data stored permanently such as in a file or database and are on a server that supports Mcrypt. "Light" use encryption + such as encrypted session data or transitory encrypted flashdata require no intervention on your part. However, existing encrypted Sessions will be + destroyed since data encrypted prior to 2.x will not be decoded.

      +

      Why only a method to re-encode the data instead of maintaining legacy methods for both encoding and decoding? The algorithms in + the Encryption library have improved in CodeIgniter 2.x both for performance and security, and we do not wish to encourage continued use of the older methods. + You can of course extend the Encryption library if you wish and replace the new methods with the old and retain seamless compatibility with CodeIgniter 1.x + encrypted data, but this a decision that a developer should make cautiously and deliberately, if at all.

      + +$new_data = $this->encrypt->encode_from_legacy($old_encrypted_string); + + + + + + + + + + + + + + + + + + + + + + +
      ParameterDefaultDescription
      $orig_datan/aThe original encrypted data from CodeIgniter 1.x's Encryption library
      $legacy_modeMCRYPT_MODE_ECBThe Mcrypt mode that was used to generate the original encrypted data. CodeIgniter 1.x's default was MCRYPT_MODE_ECB, and it will + assume that to be the case unless overridden by this parameter.
      $keyn/aThe encryption key. This it typically specified in your config file as outlined above.
      From d1606358ba51261150bc2f99bb9cb2b9117718e7 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 1 Sep 2010 11:16:07 -0500 Subject: [PATCH 1988/2544] fixes issue #109 where cc and bcc recipients were not reset when using the clear() method in the Email lib --- system/libraries/Email.php | 2 ++ user_guide/changelog.html | 1 + 2 files changed, 3 insertions(+) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 09d1b8fb..af48757b 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -146,6 +146,8 @@ function clear($clear_attachments = FALSE) $this->_header_str = ""; $this->_replyto_flag = FALSE; $this->_recipients = array(); + $this->_cc_array = array(); + $this->_bcc_array = array(); $this->_headers = array(); $this->_debug_msg = array(); diff --git a/user_guide/changelog.html b/user_guide/changelog.html index c42bde01..25633b63 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -182,6 +182,7 @@

      Bug fixes for 2.0.0

    45. Fixed a PHP Strict Standards Error in the index.php file.
    46. Fixed a bug where getimagesize() was being needlessly checked on non-image files in is_allowed_type().
    47. Fixed a bug in the Encryption library where an empty key was not triggering an error.
      48. +
    48. Fixed a bug in the Email library where CC and BCC recipients were not reset when using the clear() method (#109).

      49. Version 1.7.2

      From 95e05a0d51c034523fab629357e5fc9c065ecd58 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 2 Sep 2010 10:20:54 -0500 Subject: [PATCH 1989/2544] added a teeny bit stronger wording to encourage use of database for sessions where validation is necessary or undesirable actions could occur by a user manipulating their cookies --- user_guide/libraries/sessions.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index a8e3b349..3bd170d6 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -190,12 +190,14 @@

      Flashdata

      Saving Session Data to a Database

      While the session data array stored in the user's cookie contains a Session ID, unless you store session data in a database there is no way to validate it. For some applications that require little or no -security, session ID validation may not be needed, but if your application requires security, validation is mandatory.

      +security, session ID validation may not be needed, but if your application requires security, validation is mandatory. Otherwise, an old session +could be restored by a user modifying their cookies.

      When session data is available in a database, every time a valid session is found in the user's cookie, a database query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never be updated, they can only be generated when a new session is created.

      +

      In order to store sessions, you must first create a database table for this purpose. Here is the basic prototype (for MySQL) required by the session class:

      From eaa71ba1c19538af5416dceec288aa37cad2b7e6 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 2 Sep 2010 10:32:07 -0500 Subject: [PATCH 1990/2544] Added a new config item to the Session class (sess_expire_on_close) to allow sessions to auto-expire when the browser window is closed. --- system/libraries/Session.php | 7 +++++-- user_guide/changelog.html | 1 + user_guide/libraries/sessions.html | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/system/libraries/Session.php b/system/libraries/Session.php index f413c0d1..fc3ee054 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -30,6 +30,7 @@ class CI_Session { var $sess_use_database = FALSE; var $sess_table_name = ''; var $sess_expiration = 7200; + var $sess_expire_on_close = FALSE; var $sess_match_ip = FALSE; var $sess_match_useragent = TRUE; var $sess_cookie_name = 'ci_session'; @@ -655,12 +656,14 @@ function _set_cookie($cookie_data = NULL) // if encryption is not used, we provide an md5 hash to prevent userside tampering $cookie_data = $cookie_data.md5($cookie_data.$this->encryption_key); } - + + $expire = ($this->sess_expire_on_close === TRUE) ? 0 : $this->sess_expiration + time(); + // Set the cookie setcookie( $this->sess_cookie_name, $cookie_data, - $this->sess_expiration + time(), + $expire, $this->cookie_path, $this->cookie_domain, 0 diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 25633b63..5740f739 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -100,6 +100,7 @@

      Version 2.0.0

    49. Added a second parameter (boolean) to $this->zip->read_dir('/path/to/directory', FALSE) to remove the preceding trail of empty folders when creating a Zip archive. This example would contain a zip with "directory" and all of its contents.
    50. Added ability in the Image Library to handle PNG transparency for resize operations when using the GD lib.
    51. Modified the Session class to prevent use if no encryption key is set in the config file.
      52. +
    52. Added a new config item to the Session class sess_expire_on_close to allow sessions to auto-expire when the browser window is closed.
    53. Improved performance of the Encryption library on servers where Mcrypt is available.
    54. Changed the default encryption mode in the Encryption library to CBC.
    55. Added an encode_from_legacy() method to provide a way to transition encrypted data from CodeIgniter 1.x to CodeIgniter 2.x. diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 3bd170d6..2d295d72 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -257,6 +257,12 @@

      Session Preferences

      None The number of seconds you would like the session to last. The default value is 2 hours (7200 seconds). If you would like a non-expiring session set the value to zero: 0 + + sess_expire_on_close + FALSE + TRUE/FALSE (boolean) + Whether to cause the session to expire automatically when the browser window is closed. + sess_encrypt_cookie FALSE From 092103e4d6a4a2bcd14274055f774e4eb01ecaa3 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Thu, 2 Sep 2010 11:11:58 -0500 Subject: [PATCH 1991/2544] fixed a spot where the encryption mode was still a hard coded constant instead of the fetched variable --- system/libraries/Encrypt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 8beff75d..b27847a5 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -216,7 +216,7 @@ function encode_from_legacy($string, $legacy_mode = MCRYPT_MODE_ECB, $key = '') $dec = $this->_xor_decode($dec, $key); // set the mcrypt mode back to what it should be, typically MCRYPT_MODE_CBC - $this->set_mode(MCRYPT_MODE_CBC); + $this->set_mode($current_mode); // and re-encode return base64_encode($this->mcrypt_encode($dec, $key)); From a33b93cdc442ea756ba7329404a9fe89d8ec660f Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 3 Sep 2010 09:16:10 -0500 Subject: [PATCH 1992/2544] user guide typo fixes #128 --- user_guide/libraries/config.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index bdabe8db..6367e2e8 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -144,7 +144,7 @@

      Fetching Config Items

      Setting a Config Item

      -

      If you would like to dynamically set a config item or change an existing one, you can so using:

      +

      If you would like to dynamically set a config item or change an existing one, you can do so using:

      $this->config->set_item('item_name', 'item_value'); From 34cf0a8bd4a185c85b84900324386e89eeca2b97 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 7 Sep 2010 08:35:47 -0400 Subject: [PATCH 1993/2544] typo fix --- user_guide/libraries/config.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 6367e2e8..bfb67945 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -66,7 +66,7 @@

      Config Class

      Anatomy of a Config File

      -

      By default, CodeIgniter has a one primary config file, located at application/config/config.php. If you open the file using +

      By default, CodeIgniter has one primary config file, located at application/config/config.php. If you open the file using your text editor you'll see that config items are stored in an array called $config.

      You can add your own config items to From 59aa935e9214401822ade8f476546fbed5e222c8 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 14 Sep 2010 00:37:16 -0500 Subject: [PATCH 1994/2544] Fixed a bug #129 where Model documentation referenced parent::Model instead of parent::CI_Model. --- user_guide/general/models.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/user_guide/general/models.html b/user_guide/general/models.html index e04fdf99..e405dd1b 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -77,7 +77,7 @@

      What is a Model?

      retrieve your blog data. Here is an example of what such a model class might look like:

      -class Blogmodel extends Model {
      +class Blogmodel extends CI_Model {

          var $title   = '';
          var $content = '';
      @@ -86,7 +86,7 @@

      What is a Model?

          function Blogmodel()
          {
              // Call the Model constructor
      -        parent::Model();
      +        parent::CI_Model();
          }
          
          function get_last_ten_entries()
      @@ -126,11 +126,11 @@

      Anatomy of a Model

      -class Model_name extends Model {
      +class Model_name extends CI_Model {

          function Model_name()
          {
      -        parent::Model();
      +        parent::CI_Model();
          }
      }       @@ -140,11 +140,11 @@

      Anatomy of a Model

      The file name will be a lower case version of your class name. For example, if your class is this:

      -class User_model extends Model {
      +class User_model extends CI_Model {

          function User_model()
          {
      -        parent::Model();
      +        parent::CI_Model();
          }
      }       From d2167a01ec5bd134a4138b50d76487caa72245c6 Mon Sep 17 00:00:00 2001 From: Robin Sowell Date: Tue, 14 Sep 2010 15:05:42 -0400 Subject: [PATCH 1995/2544] Fixed a bug in the URL Helper where prep_url() could cause a PHP error on PHP versions < 5.1.2. --- system/helpers/url_helper.php | 4 +++- user_guide/changelog.html | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 7707d685..dad76114 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -446,7 +446,9 @@ function prep_url($str = '') return ''; } - if ( ! parse_url($str, PHP_URL_SCHEME)) + $url = parse_url($str); + + if ( ! $url OR ! isset($url['scheme'])) { $str = 'http://'.$str; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5740f739..9bb4a4e8 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -184,6 +184,7 @@

      Bug fixes for 2.0.0

    56. Fixed a bug where getimagesize() was being needlessly checked on non-image files in is_allowed_type().
    57. Fixed a bug in the Encryption library where an empty key was not triggering an error.
    58. Fixed a bug in the Email library where CC and BCC recipients were not reset when using the clear() method (#109).
      59. +
    59. Fixed a bug in the URL Helper where prep_url() could cause a PHP error on PHP versions < 5.1.2.

      60. Version 1.7.2

      From a7f5a94d9ecc371a1ee9fb3b5ffe4bfdd90b5e2d Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 14 Sep 2010 17:20:53 -0500 Subject: [PATCH 1996/2544] Added a log message in core/output if the cache directory config value was not found. --- system/core/Output.php | 1 + user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+) diff --git a/system/core/Output.php b/system/core/Output.php index e25e6219..7d3e2e18 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -346,6 +346,7 @@ function _write_cache($output) if ( ! is_dir($cache_path) OR ! is_really_writable($cache_path)) { + log_message('error', "Unable to write cache file: ".$cache_path); return; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9bb4a4e8..fb533b08 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -185,6 +185,7 @@

      Bug fixes for 2.0.0

    60. Fixed a bug in the Encryption library where an empty key was not triggering an error.
    61. Fixed a bug in the Email library where CC and BCC recipients were not reset when using the clear() method (#109).
    62. Fixed a bug in the URL Helper where prep_url() could cause a PHP error on PHP versions < 5.1.2.
      63. +
    63. Added a log message in core/output if the cache directory config value was not found.

      64. Version 1.7.2

      From c2950704d0cf8b7ae4d71900259b1c8ef3584c68 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 14 Sep 2010 17:52:26 -0500 Subject: [PATCH 1997/2544] Updates to output profiler html validation. http://bitbucket.org/ellislab/codeigniter/issue/111/profiler-output-does-not-validate --- system/libraries/Profiler.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 0900a300..6bc3c879 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -128,7 +128,7 @@ function _compile_benchmarks() foreach ($profile as $key => $val) { $key = ucwords(str_replace(array('_', '-'), ' ', $key)); - $output .= "".$key."  ".$val."\n"; + $output .= "".$key."  ".$val."\n"; } $output .= "\n"; @@ -165,8 +165,8 @@ function _compile_queries() $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_queries').'  '; $output .= "\n"; - $output .= "\n\n\n"; - $output .="\n"; + $output .= "\n\n
      ".$this->CI->lang->line('profiler_no_db')."
      \n"; + $output .="\n"; $output .= "
      ".$this->CI->lang->line('profiler_no_db')."
      \n"; $output .= ""; @@ -187,11 +187,11 @@ function _compile_queries() $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_database').':  '.$db->database.'   '.$this->CI->lang->line('profiler_queries').': '.count($this->CI->db->queries).'   '; $output .= "\n"; - $output .= "\n\n\n"; + $output .= "\n\n
      \n"; if (count($db->queries) == 0) { - $output .= "\n"; + $output .= "\n"; } else { @@ -206,7 +206,7 @@ function _compile_queries() $val = str_replace($bold, ''.$bold.'', $val); } - $output .= "\n"; + $output .= "\n"; } } From 3424bf77ce638a2fd8e64ea76e874d3b9ead7414 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 14 Sep 2010 17:53:10 -0500 Subject: [PATCH 1998/2544] Fixed http://bitbucket.org/ellislab/codeigniter/issue/38/slight-bug-with-profilerphp Slight tweak to SQL query display in output profiler. --- system/libraries/Profiler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 6bc3c879..db179976 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -177,7 +177,7 @@ function _compile_queries() $this->CI->load->helper('text'); // Key words we want bolded - $highlight = array('SELECT', 'DISTINCT', 'FROM', 'WHERE', 'AND', 'LEFT JOIN', 'ORDER BY', 'GROUP BY', 'LIMIT', 'INSERT', 'INTO', 'VALUES', 'UPDATE', 'OR', 'HAVING', 'OFFSET', 'NOT IN', 'IN', 'LIKE', 'NOT LIKE', 'COUNT', 'MAX', 'MIN', 'ON', 'AS', 'AVG', 'SUM', '(', ')'); + $highlight = array('SELECT', 'DISTINCT', 'FROM', 'WHERE', 'AND', 'LEFT JOIN', 'ORDER BY', 'GROUP BY', 'LIMIT', 'INSERT', 'INTO', 'VALUES', 'UPDATE', 'OR ', 'HAVING', 'OFFSET', 'NOT IN', 'IN', 'LIKE', 'NOT LIKE', 'COUNT', 'MAX', 'MIN', 'ON', 'AS', 'AVG', 'SUM', '(', ')'); $output = "\n\n"; From fd2ba8836d74ded06cfe14f728387698c0532148 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 14 Sep 2010 18:45:42 -0500 Subject: [PATCH 1999/2544] Fix #96 html validation failure on csrf hidden input on form_open() in the form helper. Added
      ".$this->CI->lang->line('profiler_no_queries')."
      ".$this->CI->lang->line('profiler_no_queries')."
      ".$time."  ".$val."
      ".$time."  ".$val."
      ', - 'heading_row_start' => '', + 'table_open' => '
      ', + 'heading_row_start' => '', 'heading_previous_cell' => '', - 'heading_title_cell' => '', - 'heading_next_cell' => '', - 'heading_row_end' => '', - 'week_row_start' => '', - 'week_day_cell' => '', - 'week_row_end' => '', - 'cal_row_start' => '', - 'cal_cell_start' => '', + 'heading_next_cell' => '', + 'heading_row_end' => '', + 'week_row_start' => '', + 'week_day_cell' => '', + 'week_row_end' => '', + 'cal_row_start' => '', + 'cal_cell_start' => '', 'cal_row_end' => '', 'table_close' => '
      <<{heading}>>
      {week_day}
      ', + 'heading_title_cell' => '{heading}>>
      {week_day}
      ', 'cal_cell_start_today' => '', 'cal_cell_content' => '{day}', 'cal_cell_content_today' => '{day}', @@ -428,9 +428,9 @@ function default_template() 'cal_cell_end_today' => '
      ' - ); + ); } - + // -------------------------------------------------------------------- /** @@ -442,17 +442,17 @@ function default_template() * @access public * @return void */ - function parse_template() - { + function parse_template() + { $this->temp = $this->default_template(); - - if ($this->template == '') - { - return; - } - + + if ($this->template == '') + { + return; + } + $today = array('cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today'); - + foreach (array('table_open', 'table_close', 'heading_row_start', 'heading_previous_cell', 'heading_title_cell', 'heading_next_cell', 'heading_row_end', 'week_row_start', 'week_day_cell', 'week_row_end', 'cal_row_start', 'cal_cell_start', 'cal_cell_content', 'cal_cell_no_content', 'cal_cell_blank', 'cal_cell_end', 'cal_row_end', 'cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today') as $val) { if (preg_match("/\{".$val."\}(.*?)\{\/".$val."\}/si", $this->template, $match)) @@ -466,8 +466,8 @@ function parse_template() $this->temp[$val] = $this->temp[str_replace('_today', '', $val)]; } } - } - } + } + } } diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index 643d2eca..f3969ef2 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -29,7 +29,7 @@ class CI_Cart { // These are the regular expression rules that we use to validate the product ID and product name var $product_id_rules = '\.a-z0-9_-'; // alpha-numeric, dashes, underscores, or periods var $product_name_rules = '\.\:\-_ a-z0-9'; // alpha-numeric, dashes, underscores, colons or periods - + // Private variables. Do not change! var $CI; var $_cart_contents = array(); @@ -39,12 +39,12 @@ class CI_Cart { * Shopping Class Constructor * * The constructor loads the Session class, used to store the shopping cart contents. - */ + */ function CI_Cart($params = array()) - { + { // Set the super object to a local variable for use later $this->CI =& get_instance(); - + // Are any config settings being passed manually? If so, set them $config = array(); if (count($params) > 0) @@ -54,10 +54,10 @@ function CI_Cart($params = array()) $config[$key] = $val; } } - + // Load the Sessions class $this->CI->load->library('session', $config); - + // Grab the shopping cart array from the session table, if it exists if ($this->CI->session->userdata('cart_contents') !== FALSE) { @@ -66,15 +66,15 @@ function CI_Cart($params = array()) else { // No cart exists so we'll set some base values - $this->_cart_contents['cart_total'] = 0; - $this->_cart_contents['total_items'] = 0; + $this->_cart_contents['cart_total'] = 0; + $this->_cart_contents['total_items'] = 0; } - + log_message('debug', "Cart Class Initialized"); } // -------------------------------------------------------------------- - + /** * Insert items into the cart and save it to the session table * @@ -90,15 +90,15 @@ function insert($items = array()) log_message('error', 'The insert method must be passed an array containing data.'); return FALSE; } - - // You can either insert a single product using a one-dimensional array, + + // You can either insert a single product using a one-dimensional array, // or multiple products using a multi-dimensional one. The way we // determine the array type is by looking for a required array key named "id" // at the top level. If it's not found, we will assume it's a multi-dimensional array. - - $save_cart = FALSE; + + $save_cart = FALSE; if (isset($items['id'])) - { + { if ($this->_insert($items) == TRUE) { $save_cart = TRUE; @@ -114,7 +114,7 @@ function insert($items = array()) { $save_cart = TRUE; } - } + } } } @@ -129,7 +129,7 @@ function insert($items = array()) } // -------------------------------------------------------------------- - + /** * Insert * @@ -145,9 +145,9 @@ function _insert($items = array()) log_message('error', 'The insert method must be passed an array containing data.'); return FALSE; } - + // -------------------------------------------------------------------- - + // Does the $items array contain an id, quantity, price, and name? These are required if ( ! isset($items['id']) OR ! isset($items['qty']) OR ! isset($items['price']) OR ! isset($items['name'])) { @@ -156,7 +156,7 @@ function _insert($items = array()) } // -------------------------------------------------------------------- - + // Prep the quantity. It can only be a number. Duh... $items['qty'] = trim(preg_replace('/([^0-9])/i', '', $items['qty'])); // Trim any leading zeros @@ -167,9 +167,9 @@ function _insert($items = array()) { return FALSE; } - + // -------------------------------------------------------------------- - + // Validate the product ID. It can only be alpha-numeric, dashes, underscores or periods // Not totally sure we should impose this rule, but it seems prudent to standardize IDs. // Note: These can be user-specified by setting the $this->product_id_rules variable. @@ -180,7 +180,7 @@ function _insert($items = array()) } // -------------------------------------------------------------------- - + // Validate the product name. It can only be alpha-numeric, dashes, underscores, colons or periods. // Note: These can be user-specified by setting the $this->product_name_rules variable. if ( ! preg_match("/^[".$this->product_name_rules."]+$/i", $items['name'])) @@ -195,7 +195,7 @@ function _insert($items = array()) $items['price'] = trim(preg_replace('/([^0-9\.])/i', '', $items['price'])); // Trim any leading zeros $items['price'] = trim(preg_replace('/(^[0]+)/i', '', $items['price'])); - + // Is the price a valid number? if ( ! is_numeric($items['price'])) { @@ -204,13 +204,13 @@ function _insert($items = array()) } // -------------------------------------------------------------------- - + // We now need to create a unique identifier for the item being inserted into the cart. - // Every time something is added to the cart it is stored in the master cart array. - // Each row in the cart array, however, must have a unique index that identifies not only - // a particular product, but makes it possible to store identical products with different options. - // For example, what if someone buys two identical t-shirts (same product ID), but in - // different sizes? The product ID (and other attributes, like the name) will be identical for + // Every time something is added to the cart it is stored in the master cart array. + // Each row in the cart array, however, must have a unique index that identifies not only + // a particular product, but makes it possible to store identical products with different options. + // For example, what if someone buys two identical t-shirts (same product ID), but in + // different sizes? The product ID (and other attributes, like the name) will be identical for // both sizes because it's the same shirt. The only difference will be the size. // Internally, we need to treat identical submissions, but with different options, as a unique product. // Our solution is to convert the options array to a string and MD5 it along with the product ID. @@ -225,19 +225,19 @@ function _insert($items = array()) // Technically, we don't need to MD5 the ID in this case, but it makes // sense to standardize the format of array indexes for both conditions $rowid = md5($items['id']); - } + } // -------------------------------------------------------------------- // Now that we have our unique "row ID", we'll add our cart items to the master array - + // let's unset this first, just to make sure our index contains only the data from this submission - unset($this->_cart_contents[$rowid]); - + unset($this->_cart_contents[$rowid]); + // Create a new index with our new row ID $this->_cart_contents[$rowid]['rowid'] = $rowid; - - // And add the new items to the cart array + + // And add the new items to the cart array foreach ($items as $key => $val) { $this->_cart_contents[$rowid][$key] = $val; @@ -248,11 +248,11 @@ function _insert($items = array()) } // -------------------------------------------------------------------- - + /** * Update the cart * - * This function permits the quantity of a given item to be changed. + * This function permits the quantity of a given item to be changed. * Typically it is called from the "view cart" page if a user makes * changes to the quantity before checkout. That array must contain the * product ID and quantity for each item. @@ -269,8 +269,8 @@ function update($items = array()) { return FALSE; } - - // You can either update a single product using a one-dimensional array, + + // You can either update a single product using a one-dimensional array, // or multiple products using a multi-dimensional one. The way we // determine the array type is by looking for a required array key named "id". // If it's not found we assume it's a multi-dimensional array @@ -292,7 +292,7 @@ function update($items = array()) { $save_cart = TRUE; } - } + } } } @@ -307,11 +307,11 @@ function update($items = array()) } // -------------------------------------------------------------------- - + /** * Update the cart * - * This function permits the quantity of a given item to be changed. + * This function permits the quantity of a given item to be changed. * Typically it is called from the "view cart" page if a user makes * changes to the quantity before checkout. That array must contain the * product ID and quantity for each item. @@ -319,7 +319,7 @@ function update($items = array()) * @access private * @param array * @return bool - */ + */ function _update($items = array()) { // Without these array indexes there is nothing we can do @@ -327,7 +327,7 @@ function _update($items = array()) { return FALSE; } - + // Prep the quantity $items['qty'] = preg_replace('/([^0-9])/i', '', $items['qty']); @@ -336,7 +336,7 @@ function _update($items = array()) { return FALSE; } - + // Is the new quantity different than what is already saved in the cart? // If it's the same there's nothing to do if ($this->_cart_contents[$items['rowid']]['qty'] == $items['qty']) @@ -348,18 +348,18 @@ function _update($items = array()) // If the quantity is greater than zero we are updating if ($items['qty'] == 0) { - unset($this->_cart_contents[$items['rowid']]); + unset($this->_cart_contents[$items['rowid']]); } else { $this->_cart_contents[$items['rowid']]['qty'] = $items['qty']; } - + return TRUE; } // -------------------------------------------------------------------- - + /** * Save the cart array to the session DB * @@ -383,20 +383,20 @@ function _save_cart() } $total += ($val['price'] * $val['qty']); - + // Set the subtotal $this->_cart_contents[$key]['subtotal'] = ($this->_cart_contents[$key]['price'] * $this->_cart_contents[$key]['qty']); } // Set the cart total and total items. - $this->_cart_contents['total_items'] = count($this->_cart_contents); + $this->_cart_contents['total_items'] = count($this->_cart_contents); $this->_cart_contents['cart_total'] = $total; - + // Is our cart empty? If so we delete it from the session if (count($this->_cart_contents) <= 2) { $this->CI->session->unset_userdata('cart_contents'); - + // Nothing more to do... coffee time! return FALSE; } @@ -406,11 +406,11 @@ function _save_cart() $this->CI->session->set_userdata(array('cart_contents' => $this->_cart_contents)); // Woot! - return TRUE; + return TRUE; } // -------------------------------------------------------------------- - + /** * Cart Total * @@ -423,7 +423,7 @@ function total() } // -------------------------------------------------------------------- - + /** * Total Items * @@ -438,7 +438,7 @@ function total_items() } // -------------------------------------------------------------------- - + /** * Cart Contents * @@ -450,16 +450,16 @@ function total_items() function contents() { $cart = $this->_cart_contents; - + // Remove these so they don't create a problem when showing the cart table unset($cart['total_items']); unset($cart['cart_total']); - + return $cart; } // -------------------------------------------------------------------- - + /** * Has options * @@ -475,12 +475,12 @@ function has_options($rowid = '') { return FALSE; } - + return TRUE; } // -------------------------------------------------------------------- - + /** * Product options * @@ -500,7 +500,7 @@ function product_options($rowid = '') } // -------------------------------------------------------------------- - + /** * Format Number * @@ -515,15 +515,15 @@ function format_number($n = '') { return ''; } - + // Remove anything that isn't a number or decimal point. $n = trim(preg_replace('/([^0-9\.])/i', '', $n)); - + return number_format($n, 2, '.', ','); } - + // -------------------------------------------------------------------- - + /** * Destroy the cart * @@ -535,9 +535,9 @@ function format_number($n = '') function destroy() { unset($this->_cart_contents); - - $this->_cart_contents['cart_total'] = 0; - $this->_cart_contents['total_items'] = 0; + + $this->_cart_contents['cart_total'] = 0; + $this->_cart_contents['total_items'] = 0; $this->CI->session->unset_userdata('cart_contents'); } diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php index 07ef2e72..1261b4c7 100644 --- a/system/libraries/Driver.php +++ b/system/libraries/Driver.php @@ -25,25 +25,25 @@ * @subpackage Libraries * @category Libraries * @author EllisLab Dev Team - * @link + * @link */ class CI_Driver_Library { protected $valid_drivers = array(); protected static $lib_name; - + // The first time a child is used it won't exist, so we instantiate it // subsequents calls will go straight to the proper child. function __get($child) { if (! isset($this->lib_name)) { - $this->lib_name = get_class($this); + $this->lib_name = get_class($this); } // The class will be prefixed with the parent lib $child_class = $this->lib_name.'_'.$child; - + if (in_array(strtolower($child_class), array_map('strtolower', $this->valid_drivers))) { // check and see if the driver is in a separate file @@ -64,11 +64,11 @@ function __get($child) { include_once $filepath; break; - } + } } } } - + // it's a valid driver, but the file simply can't be found if ( ! class_exists($child_class)) { @@ -82,14 +82,14 @@ function __get($child) $this->$child = $obj; return $this->$child; } - + // The requested driver isn't valid! log_message('error', "Invalid driver requested: ".$child_class); show_error("Invalid driver requested: ".$child_class); } - + // -------------------------------------------------------------------- - + } // END CI_Driver_Library CLASS @@ -104,11 +104,11 @@ function __get($child) * @subpackage Libraries * @category Libraries * @author EllisLab Dev Team - * @link + * @link */ class CI_Driver { protected $parent; - + private $methods = array(); private $properties = array(); @@ -126,16 +126,16 @@ class CI_Driver { function decorate($parent) { $this->parent = $parent; - + // Lock down attributes to what is defined in the class // and speed up references in magic methods - + $class_name = get_class($parent); - + if ( ! isset(self::$reflections[$class_name])) { $r = new ReflectionObject($parent); - + foreach ($r->getMethods() as $method) { if ($method->isPublic()) @@ -151,7 +151,7 @@ function decorate($parent) $this->properties[] = $prop->getName(); } } - + self::$reflections[$class_name] = array($this->methods, $this->properties); } else @@ -159,9 +159,9 @@ function decorate($parent) list($this->methods, $this->properties) = self::$reflections[$class_name]; } } - + // -------------------------------------------------------------------- - + /** * __call magic method * @@ -185,7 +185,7 @@ public function __call($method, $args = array()) } // -------------------------------------------------------------------- - + /** * __get magic method * @@ -204,7 +204,7 @@ function __get($var) } // -------------------------------------------------------------------- - + /** * __set magic method * @@ -222,9 +222,9 @@ function __set($var, $val) $this->parent->$var = $val; } } - + // -------------------------------------------------------------------- - + } // END CI_Driver CLASS diff --git a/system/libraries/Email.php b/system/libraries/Email.php index af48757b..6c0309b0 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -129,7 +129,7 @@ function initialize($config = array()) $this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE; $this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE; } - + // -------------------------------------------------------------------- /** @@ -161,7 +161,7 @@ function clear($clear_attachments = FALSE) $this->_attach_disp = array(); } } - + // -------------------------------------------------------------------- /** @@ -202,7 +202,7 @@ function from($from, $name = '') $this->_set_header('From', $name.' <'.$from.'>'); $this->_set_header('Return-Path', '<'.$from.'>'); } - + // -------------------------------------------------------------------- /** @@ -238,7 +238,7 @@ function reply_to($replyto, $name = '') $this->_set_header('Reply-To', $name.' <'.$replyto.'>'); $this->_replyto_flag = TRUE; } - + // -------------------------------------------------------------------- /** @@ -273,7 +273,7 @@ function to($to) break; } } - + // -------------------------------------------------------------------- /** @@ -300,7 +300,7 @@ function cc($cc) $this->_cc_array = $cc; } } - + // -------------------------------------------------------------------- /** @@ -336,7 +336,7 @@ function bcc($bcc, $limit = '') $this->_set_header('Bcc', implode(", ", $bcc)); } } - + // -------------------------------------------------------------------- /** @@ -351,7 +351,7 @@ function subject($subject) $subject = $this->_prep_q_encoding($subject); $this->_set_header('Subject', $subject); } - + // -------------------------------------------------------------------- /** @@ -365,7 +365,7 @@ function message($body) { $this->_body = stripslashes(rtrim(str_replace("\r", "", $body))); } - + // -------------------------------------------------------------------- /** @@ -396,7 +396,7 @@ function _set_header($header, $value) { $this->_headers[$header] = $value; } - + // -------------------------------------------------------------------- /** @@ -422,7 +422,7 @@ function _str_to_array($email) } return $email; } - + // -------------------------------------------------------------------- /** @@ -436,7 +436,7 @@ function set_alt_message($str = '') { $this->alt_message = ($str == '') ? '' : $str; } - + // -------------------------------------------------------------------- /** @@ -450,7 +450,7 @@ function set_mailtype($type = 'text') { $this->mailtype = ($type == 'html') ? 'html' : 'text'; } - + // -------------------------------------------------------------------- /** @@ -464,7 +464,7 @@ function set_wordwrap($wordwrap = TRUE) { $this->wordwrap = ($wordwrap === FALSE) ? FALSE : TRUE; } - + // -------------------------------------------------------------------- /** @@ -478,7 +478,7 @@ function set_protocol($protocol = 'mail') { $this->protocol = ( ! in_array($protocol, $this->_protocols, TRUE)) ? 'mail' : strtolower($protocol); } - + // -------------------------------------------------------------------- /** @@ -504,7 +504,7 @@ function set_priority($n = 3) $this->priority = $n; } - + // -------------------------------------------------------------------- /** @@ -524,7 +524,7 @@ function set_newline($newline = "\n") $this->newline = $newline; } - + // -------------------------------------------------------------------- /** @@ -544,7 +544,7 @@ function set_crlf($crlf = "\n") $this->crlf = $crlf; } - + // -------------------------------------------------------------------- /** @@ -558,7 +558,7 @@ function _set_boundaries() $this->_alt_boundary = "B_ALT_".uniqid(''); // multipart/alternative $this->_atc_boundary = "B_ATC_".uniqid(''); // attachment boundary } - + // -------------------------------------------------------------------- /** @@ -575,7 +575,7 @@ function _get_message_id() return "<".uniqid('').strstr($from, '@').">"; } - + // -------------------------------------------------------------------- /** @@ -595,7 +595,7 @@ function _get_protocol($return = TRUE) return $this->protocol; } } - + // -------------------------------------------------------------------- /** @@ -650,7 +650,7 @@ function _get_content_type() return 'plain'; } } - + // -------------------------------------------------------------------- /** @@ -668,7 +668,7 @@ function _set_date() return sprintf("%s %s%04d", date("D, j M Y H:i:s"), $operator, $timezone); } - + // -------------------------------------------------------------------- /** @@ -681,7 +681,7 @@ function _get_mime_message() { return "This is a multi-part message in MIME format.".$this->newline."Your email application may not support this format."; } - + // -------------------------------------------------------------------- /** @@ -710,7 +710,7 @@ function validate_email($email) return TRUE; } - + // -------------------------------------------------------------------- /** @@ -724,7 +724,7 @@ function valid_email($address) { return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $address)) ? FALSE : TRUE; } - + // -------------------------------------------------------------------- /** @@ -740,11 +740,11 @@ function clean_email($email) { if (preg_match('/\<(.*)\>/', $email, $match)) { - return $match['1']; + return $match['1']; } - else + else { - return $email; + return $email; } } @@ -754,17 +754,17 @@ function clean_email($email) { if (preg_match( '/\<(.*)\>/', $addy, $match)) { - $clean_email[] = $match['1']; + $clean_email[] = $match['1']; } - else + else { - $clean_email[] = $addy; + $clean_email[] = $addy; } } return $clean_email; } - + // -------------------------------------------------------------------- /** @@ -804,7 +804,7 @@ function _get_alt_message() for ($x = 1; $x <= $i; $x ++) { - $n .= "\n"; + $n .= "\n"; } $body = str_replace($n, "\n\n", $body); @@ -812,7 +812,7 @@ function _get_alt_message() return $this->word_wrap($body, '76'); } - + // -------------------------------------------------------------------- /** @@ -908,7 +908,7 @@ function word_wrap($str, $charlim = '') return $output; } - + // -------------------------------------------------------------------- /** @@ -926,7 +926,7 @@ function _build_headers() $this->_set_header('Message-ID', $this->_get_message_id()); $this->_set_header('Mime-Version', '1.0'); } - + // -------------------------------------------------------------------- /** @@ -961,7 +961,7 @@ function _write_headers() $this->_header_str = rtrim($this->_header_str); } } - + // -------------------------------------------------------------------- /** @@ -1150,7 +1150,7 @@ function _build_message() return; } - + // -------------------------------------------------------------------- /** @@ -1245,7 +1245,7 @@ function _prep_quoted_printable($str, $charlim = '') } // -------------------------------------------------------------------- - + /** * Prep Q Encoding * @@ -1317,7 +1317,7 @@ function _prep_q_encoding($str, $from = FALSE) } // -------------------------------------------------------------------- - + /** * Send Email * @@ -1358,7 +1358,7 @@ function send() return TRUE; } } - + // -------------------------------------------------------------------- /** @@ -1416,7 +1416,7 @@ function batch_bcc_send() $this->_spool_email(); } } - + // -------------------------------------------------------------------- /** @@ -1429,7 +1429,7 @@ function _unwrap_specials() { $this->_finalbody = preg_replace_callback("/\{unwrap\}(.*?)\{\/unwrap\}/si", array($this, '_remove_nl_callback'), $this->_finalbody); } - + // -------------------------------------------------------------------- /** @@ -1447,7 +1447,7 @@ function _remove_nl_callback($matches) return $matches[1]; } - + // -------------------------------------------------------------------- /** @@ -1492,7 +1492,7 @@ function _spool_email() $this->_set_error_message('email_sent', $this->_get_protocol()); return TRUE; } - + // -------------------------------------------------------------------- /** @@ -1528,7 +1528,7 @@ function _send_with_mail() } } } - + // -------------------------------------------------------------------- /** @@ -1550,12 +1550,12 @@ function _send_with_sendmail() fputs($fp, $this->_header_str); fputs($fp, $this->_finalbody); - $status = pclose($fp); - + $status = pclose($fp); + if (version_compare(PHP_VERSION, '4.2.3') == -1) { $status = $status >> 8 & 0xFF; - } + } if ($status != 0) { @@ -1566,7 +1566,7 @@ function _send_with_sendmail() return TRUE; } - + // -------------------------------------------------------------------- /** @@ -1635,7 +1635,7 @@ function _send_with_smtp() $this->_send_command('quit'); return TRUE; } - + // -------------------------------------------------------------------- /** @@ -1662,7 +1662,7 @@ function _smtp_connect() $this->_set_error_message($this->_get_smtp_data()); return $this->_send_command('hello'); } - + // -------------------------------------------------------------------- /** @@ -1729,7 +1729,7 @@ function _send_command($cmd, $data = '') return TRUE; } - + // -------------------------------------------------------------------- /** @@ -1783,7 +1783,7 @@ function _smtp_authenticate() return TRUE; } - + // -------------------------------------------------------------------- /** @@ -1804,7 +1804,7 @@ function _send_data($data) return TRUE; } } - + // -------------------------------------------------------------------- /** @@ -1829,7 +1829,7 @@ function _get_smtp_data() return $data; } - + // -------------------------------------------------------------------- /** @@ -1842,7 +1842,7 @@ function _get_hostname() { return (isset($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : 'localhost.localdomain'; } - + // -------------------------------------------------------------------- /** @@ -1862,7 +1862,7 @@ function _get_ip() $rip = (isset($_SERVER['REMOTE_ADDR']) AND $_SERVER['REMOTE_ADDR'] != "") ? $_SERVER['REMOTE_ADDR'] : FALSE; $fip = (isset($_SERVER['HTTP_X_FORWARDED_FOR']) AND $_SERVER['HTTP_X_FORWARDED_FOR'] != "") ? $_SERVER['HTTP_X_FORWARDED_FOR'] : FALSE; - if ($cip && $rip) $this->_IP = $cip; + if ($cip && $rip) $this->_IP = $cip; elseif ($rip) $this->_IP = $rip; elseif ($cip) $this->_IP = $cip; elseif ($fip) $this->_IP = $fip; @@ -1884,7 +1884,7 @@ function _get_ip() return $this->_IP; } - + // -------------------------------------------------------------------- /** @@ -1908,7 +1908,7 @@ function print_debugger() $msg .= "
      ".$this->_header_str."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'
      '; return $msg; } - + // -------------------------------------------------------------------- /** @@ -1932,7 +1932,7 @@ function _set_error_message($msg, $val = '') $this->_debug_msg[] = str_replace('%s', $val, $line)."
      "; } } - + // -------------------------------------------------------------------- /** diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index b27847a5..b95dd999 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -144,7 +144,7 @@ function encode($string, $key = '') function decode($string, $key = '') { $key = $this->get_key($key); - + if (preg_match('/[^a-zA-Z0-9\/\+=]/', $string)) { return FALSE; @@ -163,12 +163,12 @@ function decode($string, $key = '') { $dec = $this->_xor_decode($dec, $key); } - + return $dec; } // -------------------------------------------------------------------- - + /** * Encode from Legacy * @@ -176,7 +176,7 @@ function decode($string, $key = '') * returns a newly encoded string using the improved method added in 2.0.0 * This allows for backwards compatibility and a method to transition to the * new encryption algorithms. - * + * * For more details, see http://codeigniter.com/user_guide/installation/upgrade_200.html#encryption * * @access public @@ -192,22 +192,22 @@ function encode_from_legacy($string, $legacy_mode = MCRYPT_MODE_ECB, $key = '') log_message('error', 'Encoding from legacy is available only when Mcrypt is in use.'); return FALSE; } - + // decode it first // set mode temporarily to what it was when string was encoded with the legacy - // algorithm - typically MCRYPT_MODE_ECB + // algorithm - typically MCRYPT_MODE_ECB $current_mode = $this->_get_mode(); $this->set_mode($legacy_mode); - + $key = $this->get_key($key); - + if (preg_match('/[^a-zA-Z0-9\/\+=]/', $string)) { return FALSE; } $dec = base64_decode($string); - + if (($dec = $this->mcrypt_decode($dec, $key)) === FALSE) { return FALSE; @@ -223,7 +223,7 @@ function encode_from_legacy($string, $legacy_mode = MCRYPT_MODE_ECB, $key = '') } // -------------------------------------------------------------------- - + /** * XOR Encode * @@ -247,7 +247,7 @@ function _xor_encode($string, $key) $enc = ''; for ($i = 0; $i < strlen($string); $i++) - { + { $enc .= substr($rand, ($i % strlen($rand)), 1).(substr($rand, ($i % strlen($rand)), 1) ^ substr($string, $i, 1)); } @@ -410,7 +410,7 @@ function _remove_cipher_noise($data, $key) { $temp = $temp + 256; } - + $str .= chr($temp); } @@ -418,7 +418,7 @@ function _remove_cipher_noise($data, $key) } // -------------------------------------------------------------------- - + /** * Set the Mcrypt Cipher * @@ -477,7 +477,7 @@ function _get_mode() { $this->_mcrypt_mode = MCRYPT_MODE_CBC; } - + return $this->_mcrypt_mode; } @@ -503,7 +503,7 @@ function set_hash($type = 'sha1') * @access public * @param string * @return string - */ + */ function hash($str) { return ($this->_hash_type == 'sha1') ? $this->sha1($str) : md5($str); diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 64baaef2..566655b1 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -25,29 +25,29 @@ * @link http://codeigniter.com/user_guide/libraries/form_validation.html */ class CI_Form_validation { - + var $CI; - var $_field_data = array(); + var $_field_data = array(); var $_config_rules = array(); var $_error_array = array(); - var $_error_messages = array(); + var $_error_messages = array(); var $_error_prefix = '

      '; var $_error_suffix = '

      '; var $error_string = ''; - var $_safe_form_data = FALSE; + var $_safe_form_data = FALSE; /** * Constructor * - */ + */ function CI_Form_validation($rules = array()) - { + { $this->CI =& get_instance(); - + // Validation rules can be stored in a config file. $this->_config_rules = $rules; - + // Automatically load the form helper $this->CI->load->helper('form'); @@ -56,12 +56,12 @@ function CI_Form_validation($rules = array()) { mb_internal_encoding($this->CI->config->item('charset')); } - + log_message('debug', "Form Validation Class Initialized"); } - + // -------------------------------------------------------------------- - + /** * Set Rules * @@ -80,7 +80,7 @@ function set_rules($field, $label = '', $rules = '') { return; } - + // If an array was passed via the first parameter instead of indidual string // values we cycle through it and recursively call this function. if (is_array($field)) @@ -101,7 +101,7 @@ function set_rules($field, $label = '', $rules = '') } return; } - + // No fields? Nothing to do... if ( ! is_string($field) OR ! is_string($rules) OR $field == '') { @@ -113,9 +113,9 @@ function set_rules($field, $label = '', $rules = '') // Is the field name an array? We test for the existence of a bracket "[" in // the field name to determine this. If it is an array, we break it apart - // into its components so that we can fetch the corresponding POST data later + // into its components so that we can fetch the corresponding POST data later if (strpos($field, '[') !== FALSE AND preg_match_all('/\[(.*?)\]/', $field, $matches)) - { + { // Note: Due to a bug in current() that affects some versions // of PHP we can not pass function call directly into it $x = explode('[', $field); @@ -128,19 +128,19 @@ function set_rules($field, $label = '', $rules = '') $indexes[] = $matches['1'][$i]; } } - + $is_array = TRUE; } else { - $indexes = array(); - $is_array = FALSE; + $indexes = array(); + $is_array = FALSE; } - - // Build our master array + + // Build our master array $this->_field_data[$field] = array( - 'field' => $field, - 'label' => $label, + 'field' => $field, + 'label' => $label, 'rules' => $rules, 'is_array' => $is_array, 'keys' => $indexes, @@ -150,7 +150,7 @@ function set_rules($field, $label = '', $rules = '') } // -------------------------------------------------------------------- - + /** * Set Error Message * @@ -168,12 +168,12 @@ function set_message($lang, $val = '') { $lang = array($lang => $val); } - + $this->_error_messages = array_merge($this->_error_messages, $lang); } - + // -------------------------------------------------------------------- - + /** * Set The Error Delimiter * @@ -183,7 +183,7 @@ function set_message($lang, $val = '') * @param string * @param string * @return void - */ + */ function set_error_delimiters($prefix = '

      ', $suffix = '

      ') { $this->_error_prefix = $prefix; @@ -191,7 +191,7 @@ function set_error_delimiters($prefix = '

      ', $suffix = '

      ') } // -------------------------------------------------------------------- - + /** * Get Error Message * @@ -200,14 +200,14 @@ function set_error_delimiters($prefix = '

      ', $suffix = '

      ') * @access public * @param string the field name * @return void - */ + */ function error($field = '', $prefix = '', $suffix = '') - { + { if ( ! isset($this->_field_data[$field]['error']) OR $this->_field_data[$field]['error'] == '') { return ''; } - + if ($prefix == '') { $prefix = $this->_error_prefix; @@ -222,7 +222,7 @@ function error($field = '', $prefix = '', $suffix = '') } // -------------------------------------------------------------------- - + /** * Error String * @@ -232,7 +232,7 @@ function error($field = '', $prefix = '', $suffix = '') * @param string * @param string * @return str - */ + */ function error_string($prefix = '', $suffix = '') { // No errrors, validation passes! @@ -240,7 +240,7 @@ function error_string($prefix = '', $suffix = '') { return ''; } - + if ($prefix == '') { $prefix = $this->_error_prefix; @@ -250,7 +250,7 @@ function error_string($prefix = '', $suffix = '') { $suffix = $this->_error_suffix; } - + // Generate the error string $str = ''; foreach ($this->_error_array as $val) @@ -260,12 +260,12 @@ function error_string($prefix = '', $suffix = '') $str .= $prefix.$val.$suffix."\n"; } } - + return $str; } // -------------------------------------------------------------------- - + /** * Run the Validator * @@ -273,7 +273,7 @@ function error_string($prefix = '', $suffix = '') * * @access public * @return bool - */ + */ function run($group = '') { // Do we even have any data to process? Mm? @@ -281,7 +281,7 @@ function run($group = '') { return FALSE; } - + // Does the _field_data array containing the validation rules exist? // If not, we look to see if they were assigned via a config file if (count($this->_field_data) == 0) @@ -291,10 +291,10 @@ function run($group = '') { return FALSE; } - + // Is there a validation rule for the particular URI being accessed? $uri = ($group == '') ? trim($this->CI->uri->ruri_string(), '/') : $group; - + if ($uri != '' AND isset($this->_config_rules[$uri])) { $this->set_rules($this->_config_rules[$uri]); @@ -303,7 +303,7 @@ function run($group = '') { $this->set_rules($this->_config_rules); } - + // We're we able to set the rules correctly? if (count($this->_field_data) == 0) { @@ -311,17 +311,17 @@ function run($group = '') return FALSE; } } - + // Load the language file containing error messages $this->CI->lang->load('form_validation'); - - // Cycle through the rules for each field, match the + + // Cycle through the rules for each field, match the // corresponding $_POST item and test for errors foreach ($this->_field_data as $field => $row) - { + { // Fetch the data from the corresponding $_POST array and cache it in the _field_data array. // Depending on whether the field name is an array or a string will determine where we get it from. - + if ($row['is_array'] == TRUE) { $this->_field_data[$field]['postdata'] = $this->_reduce_array($_POST, $row['keys']); @@ -333,8 +333,8 @@ function run($group = '') $this->_field_data[$field]['postdata'] = $_POST[$field]; } } - - $this->_execute($row, explode('|', $row['rules']), $this->_field_data[$field]['postdata']); + + $this->_execute($row, explode('|', $row['rules']), $this->_field_data[$field]['postdata']); } // Did we end up with any errors? @@ -347,7 +347,7 @@ function run($group = '') // Now we need to re-set the POST data with the new, processed data $this->_reset_post_array(); - + // No errors, validation passes! if ($total_errors == 0) { @@ -359,7 +359,7 @@ function run($group = '') } // -------------------------------------------------------------------- - + /** * Traverse a multidimensional $_POST array index until the data is found * @@ -368,7 +368,7 @@ function run($group = '') * @param array * @param integer * @return mixed - */ + */ function _reduce_array($array, $keys, $i = 0) { if (is_array($array)) @@ -389,18 +389,18 @@ function _reduce_array($array, $keys, $i = 0) return $array; } } - + return $array; } // -------------------------------------------------------------------- - + /** * Re-populate the _POST array with our finalized and processed data * * @access private * @return null - */ + */ function _reset_post_array() { foreach ($this->_field_data as $field => $row) @@ -418,7 +418,7 @@ function _reset_post_array() { // start with a reference $post_ref =& $_POST; - + // before we assign values, make a reference to the right POST key if (count($row['keys']) == 1) { @@ -452,7 +452,7 @@ function _reset_post_array() } // -------------------------------------------------------------------- - + /** * Executes the Validation routines * @@ -462,21 +462,21 @@ function _reset_post_array() * @param mixed * @param integer * @return mixed - */ + */ function _execute($row, $rules, $postdata = NULL, $cycles = 0) { // If the $_POST data is an array we will run a recursive call if (is_array($postdata)) - { + { foreach ($postdata as $key => $val) { $this->_execute($row, $rules, $val, $cycles); $cycles++; } - + return; } - + // -------------------------------------------------------------------- // If the field is blank, but NOT required, no further tests are necessary @@ -496,7 +496,7 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) } // -------------------------------------------------------------------- - + // Isset Test. Typically this rule will only apply to checkboxes. if (is_null($postdata) AND $callback == FALSE) { @@ -504,31 +504,31 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) { // Set the message type $type = (in_array('required', $rules)) ? 'required' : 'isset'; - + if ( ! isset($this->_error_messages[$type])) { if (FALSE === ($line = $this->CI->lang->line($type))) { $line = 'The field was not set'; - } + } } else { $line = $this->_error_messages[$type]; } - + // Build the error message $message = sprintf($line, $this->_translate_fieldname($row['label'])); // Save the error message $this->_field_data[$row['field']]['error'] = $message; - + if ( ! isset($this->_error_array[$row['field']])) { $this->_error_array[$row['field']] = $message; } } - + return; } @@ -538,7 +538,7 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) foreach ($rules As $rule) { $_in_array = FALSE; - + // We set the $postdata variable with the current data in our master array so that // each cycle of the loop is dealing with the processed data from the last cycle if ($row['is_array'] == TRUE AND is_array($this->_field_data[$row['field']]['postdata'])) @@ -549,7 +549,7 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) { continue; } - + $postdata = $this->_field_data[$row['field']]['postdata'][$cycles]; $_in_array = TRUE; } @@ -559,15 +559,15 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) } // -------------------------------------------------------------------- - - // Is the rule a callback? + + // Is the rule a callback? $callback = FALSE; if (substr($rule, 0, 9) == 'callback_') { $rule = substr($rule, 9); $callback = TRUE; } - + // Strip the parameter (if exists) from the rule // Rules can contain a parameter: max_length[5] $param = FALSE; @@ -576,15 +576,15 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) $rule = $match[1]; $param = $match[2]; } - + // Call the function that corresponds to the rule if ($callback === TRUE) { if ( ! method_exists($this->CI, $rule)) - { + { continue; } - + // Run the function and grab the result $result = $this->CI->$rule($postdata, $param); @@ -597,7 +597,7 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) { $this->_field_data[$row['field']]['postdata'] = (is_bool($result)) ? $postdata : $result; } - + // If the field isn't required and we just processed a callback we'll move on... if ( ! in_array('required', $rules, TRUE) AND $result !== FALSE) { @@ -605,15 +605,15 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) } } else - { + { if ( ! method_exists($this, $rule)) { - // If our own wrapper function doesn't exist we see if a native PHP function does. + // If our own wrapper function doesn't exist we see if a native PHP function does. // Users can use any native PHP function call that has one param. if (function_exists($rule)) { $result = $rule($postdata); - + if ($_in_array == TRUE) { $this->_field_data[$row['field']]['postdata'][$cycles] = (is_bool($result)) ? $postdata : $result; @@ -623,7 +623,7 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) $this->_field_data[$row['field']]['postdata'] = (is_bool($result)) ? $postdata : $result; } } - + continue; } @@ -638,54 +638,54 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) $this->_field_data[$row['field']]['postdata'] = (is_bool($result)) ? $postdata : $result; } } - + // Did the rule test negatively? If so, grab the error. if ($result === FALSE) - { + { if ( ! isset($this->_error_messages[$rule])) { if (FALSE === ($line = $this->CI->lang->line($rule))) { $line = 'Unable to access an error message corresponding to your field name.'; - } + } } else { $line = $this->_error_messages[$rule]; } - + // Is the parameter we are inserting into the error message the name // of another field? If so we need to grab its "field label" if (isset($this->_field_data[$param]) AND isset($this->_field_data[$param]['label'])) { $param = $this->_translate_fieldname($this->_field_data[$param]['label']); } - + // Build the error message $message = sprintf($line, $this->_translate_fieldname($row['label']), $param); // Save the error message $this->_field_data[$row['field']]['error'] = $message; - + if ( ! isset($this->_error_array[$row['field']])) { $this->_error_array[$row['field']] = $message; } - + return; } } } // -------------------------------------------------------------------- - + /** * Translate a field name * * @access private * @param string the field name * @return string - */ + */ function _translate_fieldname($fieldname) { // Do we need to translate the field name? @@ -693,8 +693,8 @@ function _translate_fieldname($fieldname) if (substr($fieldname, 0, 5) == 'lang:') { // Grab the variable - $line = substr($fieldname, 5); - + $line = substr($fieldname, 5); + // Were we able to translate the field name? If not we use $line if (FALSE === ($fieldname = $this->CI->lang->line($line))) { @@ -706,7 +706,7 @@ function _translate_fieldname($fieldname) } // -------------------------------------------------------------------- - + /** * Get the value from a form * @@ -717,19 +717,19 @@ function _translate_fieldname($fieldname) * @param string the field name * @param string * @return void - */ + */ function set_value($field = '', $default = '') { if ( ! isset($this->_field_data[$field])) { return $default; } - + return $this->_field_data[$field]['postdata']; } - + // -------------------------------------------------------------------- - + /** * Set Select * @@ -740,9 +740,9 @@ function set_value($field = '', $default = '') * @param string * @param string * @return string - */ + */ function set_select($field = '', $value = '', $default = FALSE) - { + { if ( ! isset($this->_field_data[$field]) OR ! isset($this->_field_data[$field]['postdata'])) { if ($default === TRUE AND count($this->_field_data) === 0) @@ -751,9 +751,9 @@ function set_select($field = '', $value = '', $default = FALSE) } return ''; } - + $field = $this->_field_data[$field]['postdata']; - + if (is_array($field)) { if ( ! in_array($value, $field)) @@ -768,12 +768,12 @@ function set_select($field = '', $value = '', $default = FALSE) return ''; } } - + return ' selected="selected"'; } - + // -------------------------------------------------------------------- - + /** * Set Radio * @@ -784,7 +784,7 @@ function set_select($field = '', $value = '', $default = FALSE) * @param string * @param string * @return string - */ + */ function set_radio($field = '', $value = '', $default = FALSE) { if ( ! isset($this->_field_data[$field]) OR ! isset($this->_field_data[$field]['postdata'])) @@ -795,9 +795,9 @@ function set_radio($field = '', $value = '', $default = FALSE) } return ''; } - + $field = $this->_field_data[$field]['postdata']; - + if (is_array($field)) { if ( ! in_array($value, $field)) @@ -812,12 +812,12 @@ function set_radio($field = '', $value = '', $default = FALSE) return ''; } } - + return ' checked="checked"'; } - + // -------------------------------------------------------------------- - + /** * Set Checkbox * @@ -828,7 +828,7 @@ function set_radio($field = '', $value = '', $default = FALSE) * @param string * @param string * @return string - */ + */ function set_checkbox($field = '', $value = '', $default = FALSE) { if ( ! isset($this->_field_data[$field]) OR ! isset($this->_field_data[$field]['postdata'])) @@ -839,9 +839,9 @@ function set_checkbox($field = '', $value = '', $default = FALSE) } return ''; } - + $field = $this->_field_data[$field]['postdata']; - + if (is_array($field)) { if ( ! in_array($value, $field)) @@ -856,12 +856,12 @@ function set_checkbox($field = '', $value = '', $default = FALSE) return ''; } } - + return ' checked="checked"'; } - + // -------------------------------------------------------------------- - + /** * Required * @@ -880,9 +880,9 @@ function required($str) return ( ! empty($str)); } } - + // -------------------------------------------------------------------- - + /** * Match one field to another * @@ -895,16 +895,16 @@ function matches($str, $field) { if ( ! isset($_POST[$field])) { - return FALSE; + return FALSE; } - + $field = $_POST[$field]; return ($str !== $field) ? FALSE : TRUE; } - + // -------------------------------------------------------------------- - + /** * Minimum Length * @@ -912,7 +912,7 @@ function matches($str, $field) * @param string * @param value * @return bool - */ + */ function min_length($str, $val) { if (preg_match("/[^0-9]/", $val)) @@ -922,14 +922,14 @@ function min_length($str, $val) if (function_exists('mb_strlen')) { - return (mb_strlen($str) < $val) ? FALSE : TRUE; + return (mb_strlen($str) < $val) ? FALSE : TRUE; } - + return (strlen($str) < $val) ? FALSE : TRUE; } - + // -------------------------------------------------------------------- - + /** * Max Length * @@ -937,7 +937,7 @@ function min_length($str, $val) * @param string * @param value * @return bool - */ + */ function max_length($str, $val) { if (preg_match("/[^0-9]/", $val)) @@ -947,14 +947,14 @@ function max_length($str, $val) if (function_exists('mb_strlen')) { - return (mb_strlen($str) > $val) ? FALSE : TRUE; + return (mb_strlen($str) > $val) ? FALSE : TRUE; } - + return (strlen($str) > $val) ? FALSE : TRUE; } - + // -------------------------------------------------------------------- - + /** * Exact Length * @@ -962,7 +962,7 @@ function max_length($str, $val) * @param string * @param value * @return bool - */ + */ function exact_length($str, $val) { if (preg_match("/[^0-9]/", $val)) @@ -972,42 +972,42 @@ function exact_length($str, $val) if (function_exists('mb_strlen')) { - return (mb_strlen($str) != $val) ? FALSE : TRUE; + return (mb_strlen($str) != $val) ? FALSE : TRUE; } - + return (strlen($str) != $val) ? FALSE : TRUE; } - + // -------------------------------------------------------------------- - + /** * Valid Email * * @access public * @param string * @return bool - */ + */ function valid_email($str) { return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $str)) ? FALSE : TRUE; } // -------------------------------------------------------------------- - + /** * Valid Emails * * @access public * @param string * @return bool - */ + */ function valid_emails($str) { if (strpos($str, ',') === FALSE) { return $this->valid_email(trim($str)); } - + foreach(explode(',', $str) as $email) { if (trim($email) != '' && $this->valid_email(trim($email)) === FALSE) @@ -1015,12 +1015,12 @@ function valid_emails($str) return FALSE; } } - + return TRUE; } // -------------------------------------------------------------------- - + /** * Validate IP Address * @@ -1034,56 +1034,56 @@ function valid_ip($ip) } // -------------------------------------------------------------------- - + /** * Alpha * * @access public * @param string * @return bool - */ + */ function alpha($str) { return ( ! preg_match("/^([a-z])+$/i", $str)) ? FALSE : TRUE; } - + // -------------------------------------------------------------------- - + /** * Alpha-numeric * * @access public * @param string * @return bool - */ + */ function alpha_numeric($str) { return ( ! preg_match("/^([a-z0-9])+$/i", $str)) ? FALSE : TRUE; } - + // -------------------------------------------------------------------- - + /** * Alpha-numeric with underscores and dashes * * @access public * @param string * @return bool - */ + */ function alpha_dash($str) { return ( ! preg_match("/^([-a-z0-9_-])+$/i", $str)) ? FALSE : TRUE; } - + // -------------------------------------------------------------------- - + /** * Numeric * * @access public * @param string * @return bool - */ + */ function numeric($str) { return (bool)preg_match( '/^[\-+]?[0-9]*\.?[0-9]+$/', $str); @@ -1092,72 +1092,72 @@ function numeric($str) // -------------------------------------------------------------------- - /** - * Is Numeric - * - * @access public - * @param string - * @return bool - */ - function is_numeric($str) - { - return ( ! is_numeric($str)) ? FALSE : TRUE; - } + /** + * Is Numeric + * + * @access public + * @param string + * @return bool + */ + function is_numeric($str) + { + return ( ! is_numeric($str)) ? FALSE : TRUE; + } // -------------------------------------------------------------------- - + /** * Integer * * @access public * @param string * @return bool - */ + */ function integer($str) { return (bool)preg_match( '/^[\-+]?[0-9]+$/', $str); } - + // -------------------------------------------------------------------- - /** - * Is a Natural number (0,1,2,3, etc.) - * - * @access public - * @param string - * @return bool - */ - function is_natural($str) - { - return (bool)preg_match( '/^[0-9]+$/', $str); - } + /** + * Is a Natural number (0,1,2,3, etc.) + * + * @access public + * @param string + * @return bool + */ + function is_natural($str) + { + return (bool)preg_match( '/^[0-9]+$/', $str); + } // -------------------------------------------------------------------- - /** - * Is a Natural number, but not a zero (1,2,3, etc.) - * - * @access public - * @param string - * @return bool - */ + /** + * Is a Natural number, but not a zero (1,2,3, etc.) + * + * @access public + * @param string + * @return bool + */ function is_natural_no_zero($str) - { - if ( ! preg_match( '/^[0-9]+$/', $str)) - { - return FALSE; - } - - if ($str == 0) - { - return FALSE; - } - - return TRUE; - } - + { + if ( ! preg_match( '/^[0-9]+$/', $str)) + { + return FALSE; + } + + if ($str == 0) + { + return FALSE; + } + + return TRUE; + } + // -------------------------------------------------------------------- - + /** * Valid Base64 * @@ -1172,9 +1172,9 @@ function valid_base64($str) { return (bool) ! preg_match('/[^a-zA-Z0-9\/\+=]/', $str); } - + // -------------------------------------------------------------------- - + /** * Prep data for form * @@ -1193,10 +1193,10 @@ function prep_for_form($data = '') { $data[$key] = $this->prep_for_form($val); } - + return $data; } - + if ($this->_safe_form_data == FALSE OR $data === '') { return $data; @@ -1204,54 +1204,54 @@ function prep_for_form($data = '') return str_replace(array("'", '"', '<', '>'), array("'", """, '<', '>'), stripslashes($data)); } - + // -------------------------------------------------------------------- - + /** * Prep URL * * @access public * @param string * @return string - */ + */ function prep_url($str = '') { if ($str == 'http://' OR $str == '') { return ''; } - + if (substr($str, 0, 7) != 'http://' && substr($str, 0, 8) != 'https://') { $str = 'http://'.$str; } - + return $str; } - + // -------------------------------------------------------------------- - + /** * Strip Image Tags * * @access public * @param string * @return string - */ + */ function strip_image_tags($str) { return $this->CI->input->strip_image_tags($str); } - + // -------------------------------------------------------------------- - + /** * XSS Clean * * @access public * @param string * @return string - */ + */ function xss_clean($str) { if ( ! isset($this->CI->security)) @@ -1261,16 +1261,16 @@ function xss_clean($str) return $this->CI->security->xss_clean($str); } - + // -------------------------------------------------------------------- - + /** * Convert PHP tags to entities * * @access public * @param string * @return string - */ + */ function encode_php_tags($str) { return str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 07f4b1ff..fa2d3770 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -295,7 +295,7 @@ function download($rempath, $locpath, $mode = 'auto') { return FALSE; } - + // Set the mode if not specified if ($mode == 'auto') { @@ -303,9 +303,9 @@ function download($rempath, $locpath, $mode = 'auto') $ext = $this->_getext($rempath); $mode = $this->_settype($ext); } - + $mode = ($mode == 'ascii') ? FTP_ASCII : FTP_BINARY; - + $result = @ftp_get($this->conn_id, $locpath, $rempath, $mode); if ($result === FALSE) @@ -314,11 +314,11 @@ function download($rempath, $locpath, $mode = 'auto') { $this->_error('ftp_unable_to_download'); } - return FALSE; + return FALSE; } - + return TRUE; - } + } // -------------------------------------------------------------------- @@ -454,7 +454,7 @@ function delete_dir($filepath) * Set file permissions * * @access public - * @param string the file path + * @param string the file path * @param string the permissions * @return bool */ diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 806d942b..99225600 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -26,7 +26,7 @@ */ class CI_Image_lib { - var $image_library = 'gd2'; // Can be: imagemagick, netpbm, gd, gd2 + var $image_library = 'gd2'; // Can be: imagemagick, netpbm, gd, gd2 var $library_path = ''; var $dynamic_output = FALSE; // Whether to send to browser or write to disk var $source_image = ''; @@ -36,7 +36,7 @@ class CI_Image_lib { var $quality = '90'; var $create_thumb = FALSE; var $thumb_marker = '_thumb'; - var $maintain_ratio = TRUE; // Whether to maintain aspect ratio when resizing or use hard values + var $maintain_ratio = TRUE; // Whether to maintain aspect ratio when resizing or use hard values var $master_dim = 'auto'; // auto, height, or width. Determines what to use as the master dimension var $rotation_angle = ''; var $x_axis = ''; @@ -54,11 +54,11 @@ class CI_Image_lib { var $wm_hor_alignment = 'C'; // Horizontal alignment: L R C var $wm_padding = 0; // Padding around text var $wm_hor_offset = 0; // Lets you push text to the right - var $wm_vrt_offset = 0; // Lets you push text down + var $wm_vrt_offset = 0; // Lets you push text down var $wm_font_color = '#ffffff'; // Text color var $wm_shadow_color = ''; // Dropshadow color var $wm_shadow_distance = 2; // Dropshadow distance - var $wm_opacity = 50; // Image opacity: 1 - 100 Only works with image + var $wm_opacity = 50; // Image opacity: 1 - 100 Only works with image // Private Vars var $source_folder = ''; @@ -147,7 +147,7 @@ function initialize($props = array()) if ($this->source_image == '') { $this->set_error('imglib_source_image_required'); - return FALSE; + return FALSE; } /* @@ -190,7 +190,7 @@ function initialize($props = array()) // Set the Image Properties if ( ! $this->get_image_properties($this->source_folder.$this->source_image)) { - return FALSE; + return FALSE; } /* @@ -400,7 +400,7 @@ function rotate() if ($this->rotation_angle == '' OR ! in_array($this->rotation_angle, $degs)) { $this->set_error('imglib_rotation_angle_required'); - return FALSE; + return FALSE; } // Reassign the width and height @@ -455,8 +455,8 @@ function image_process_gd($action = 'resize') { if ($this->orig_width == $this->width AND $this->orig_height == $this->height) { - if ($this->source_image != $this->new_image) - { + if ($this->source_image != $this->new_image) + { if (@copy($this->full_src_path, $this->full_dst_path)) { @chmod($this->full_dst_path, FILE_WRITE_MODE); @@ -494,14 +494,14 @@ function image_process_gd($action = 'resize') return FALSE; } - // Create The Image + // Create The Image // // old conditional which users report cause problems with shared GD libs who report themselves as "2.0 or greater" // it appears that this is no longer the issue that it was in 2004, so we've removed it, retaining it in the comment // below should that ever prove inaccurate. // // if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor') AND $v2_override == FALSE) - if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor')) + if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor')) { $create = 'imagecreatetruecolor'; $copy = 'imagecopyresampled'; @@ -519,7 +519,7 @@ function image_process_gd($action = 'resize') imagealphablending($dst_img, FALSE); imagesavealpha($dst_img, TRUE); } - + $copy($dst_img, $src_img, 0, 0, $this->x_axis, $this->y_axis, $this->width, $this->height, $this->orig_width, $this->orig_height); // Show the image @@ -584,9 +584,9 @@ function image_process_imagemagick($action = 'resize') { switch ($this->rotation_angle) { - case 'hor' : $angle = '-flop'; + case 'hor' : $angle = '-flop'; break; - case 'vrt' : $angle = '-flip'; + case 'vrt' : $angle = '-flip'; break; default : $angle = '-rotate '.$this->rotation_angle; break; @@ -664,7 +664,7 @@ function image_process_netpbm($action = 'resize') break; case 180 : $angle = 'r180'; break; - case 270 : $angle = 'r90'; + case 270 : $angle = 'r90'; break; case 'vrt' : $angle = 'tb'; break; @@ -889,7 +889,7 @@ function overlay_watermark() $this->get_image_properties(); // Fetch watermark image properties - $props = $this->get_image_properties($this->wm_overlay_path, TRUE); + $props = $this->get_image_properties($this->wm_overlay_path, TRUE); $wm_img_type = $props['image_type']; $wm_width = $props['width']; $wm_height = $props['height']; @@ -944,7 +944,7 @@ function overlay_watermark() if ($wm_img_type == 3 AND function_exists('imagealphablending')) { @imagealphablending($src_img, TRUE); - } + } // Set RGB values for text and shadow $rgba = imagecolorat($wm_img, $this->wm_x_transp, $this->wm_y_transp); @@ -1266,7 +1266,7 @@ function image_display_gd($resource) switch ($this->image_type) { - case 1 : imagegif($resource); + case 1 : imagegif($resource); break; case 2 : imagejpeg($resource, '', $this->quality); break; @@ -1384,8 +1384,8 @@ function get_image_properties($path = '', $return = FALSE) * new variable needs to be known * * $props = array( - * 'width' => $width, - * 'height' => $height, + * 'width' => $width, + * 'height' => $height, * 'new_width' => 40, * 'new_height' => '' * ); @@ -1446,7 +1446,7 @@ function explode_name($source_image) { $ext = strrchr($source_image, '.'); $name = ($ext === FALSE) ? $source_image : substr($source_image, 0, -strlen($ext)); - + return array('ext' => $ext, 'name' => $name); } diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php index efaaab4b..b4f33e30 100644 --- a/system/libraries/Javascript.php +++ b/system/libraries/Javascript.php @@ -29,9 +29,9 @@ class CI_Javascript { var $_javascript_location = 'js'; function CI_Javascript($params = array()) - { + { $defaults = array('js_library_driver' => 'jquery', 'autoload' => TRUE); - + foreach ($defaults as $key => $val) { if (isset($params[$key]) && $params[$key] !== "") @@ -39,7 +39,7 @@ function CI_Javascript($params = array()) $defaults[$key] = $params[$key]; } } - + extract($defaults); $this->CI =& get_instance(); @@ -48,13 +48,13 @@ function CI_Javascript($params = array()) $this->CI->load->library('javascript/'.$js_library_driver, array('autoload' => $autoload)); // make js to refer to current library $this->js =& $this->CI->$js_library_driver; - + log_message('debug', "Javascript Class Initialized and loaded. Driver used: $js_library_driver"); } - // -------------------------------------------------------------------- - // Event Code // -------------------------------------------------------------------- + // Event Code + // -------------------------------------------------------------------- /** * Blur @@ -70,9 +70,9 @@ function blur($element = 'this', $js = '') { return $this->js->_blur($element, $js); } - + // -------------------------------------------------------------------- - + /** * Change * @@ -87,9 +87,9 @@ function change($element = 'this', $js = '') { return $this->js->_change($element, $js); } - + // -------------------------------------------------------------------- - + /** * Click * @@ -107,7 +107,7 @@ function click($element = 'this', $js = '', $ret_false = TRUE) } // -------------------------------------------------------------------- - + /** * Double Click * @@ -124,7 +124,7 @@ function dblclick($element = 'this', $js = '') } // -------------------------------------------------------------------- - + /** * Error * @@ -141,7 +141,7 @@ function error($element = 'this', $js = '') } // -------------------------------------------------------------------- - + /** * Focus * @@ -158,7 +158,7 @@ function focus($element = 'this', $js = '') } // -------------------------------------------------------------------- - + /** * Hover * @@ -168,7 +168,7 @@ function focus($element = 'this', $js = '') * @param string - element * @param string - Javascript code for mouse over * @param string - Javascript code for mouse out - * @return string + * @return string */ function hover($element = 'this', $over, $out) { @@ -176,7 +176,7 @@ function hover($element = 'this', $over, $out) } // -------------------------------------------------------------------- - + /** * Keydown * @@ -193,7 +193,7 @@ function keydown($element = 'this', $js = '') } // -------------------------------------------------------------------- - + /** * Keyup * @@ -207,10 +207,10 @@ function keydown($element = 'this', $js = '') function keyup($element = 'this', $js = '') { return $this->js->_keyup($element, $js); - } + } // -------------------------------------------------------------------- - + /** * Load * @@ -224,10 +224,10 @@ function keyup($element = 'this', $js = '') function load($element = 'this', $js = '') { return $this->js->_load($element, $js); - } - + } + // -------------------------------------------------------------------- - + /** * Mousedown * @@ -244,7 +244,7 @@ function mousedown($element = 'this', $js = '') } // -------------------------------------------------------------------- - + /** * Mouse Out * @@ -261,7 +261,7 @@ function mouseout($element = 'this', $js = '') } // -------------------------------------------------------------------- - + /** * Mouse Over * @@ -360,7 +360,7 @@ function scroll($element = 'this', $js = '') { return $this->js->_scroll($element, $js); } - + // -------------------------------------------------------------------- /** @@ -378,9 +378,9 @@ function unload($element = 'this', $js = '') return $this->js->_unload($element, $js); } - // -------------------------------------------------------------------- - // Effects // -------------------------------------------------------------------- + // Effects + // -------------------------------------------------------------------- /** @@ -391,14 +391,14 @@ function unload($element = 'this', $js = '') * @access public * @param string - element * @param string - Class to add - * @return string + * @return string */ function addClass($element = 'this', $class = '') { return $this->js->_addClass($element, $class); } - // -------------------------------------------------------------------- + // -------------------------------------------------------------------- /** * Animate @@ -409,7 +409,7 @@ function addClass($element = 'this', $class = '') * @param string - element * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds * @param string - Javascript callback function - * @return string + * @return string */ function animate($element = 'this', $params = array(), $speed = '', $extra = '') { @@ -417,7 +417,7 @@ function animate($element = 'this', $params = array(), $speed = '', $extra = '') } // -------------------------------------------------------------------- - + /** * Fade In * @@ -427,15 +427,15 @@ function animate($element = 'this', $params = array(), $speed = '', $extra = '') * @param string - element * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds * @param string - Javascript callback function - * @return string + * @return string */ function fadeIn($element = 'this', $speed = '', $callback = '') { return $this->js->_fadeIn($element, $speed, $callback); } - + // -------------------------------------------------------------------- - + /** * Fade Out * @@ -445,14 +445,14 @@ function fadeIn($element = 'this', $speed = '', $callback = '') * @param string - element * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds * @param string - Javascript callback function - * @return string + * @return string */ function fadeOut($element = 'this', $speed = '', $callback = '') { return $this->js->_fadeOut($element, $speed, $callback); } // -------------------------------------------------------------------- - + /** * Slide Up * @@ -462,14 +462,14 @@ function fadeOut($element = 'this', $speed = '', $callback = '') * @param string - element * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds * @param string - Javascript callback function - * @return string + * @return string */ function slideUp($element = 'this', $speed = '', $callback = '') { return $this->js->_slideUp($element, $speed, $callback); } - + // -------------------------------------------------------------------- /** @@ -480,15 +480,15 @@ function slideUp($element = 'this', $speed = '', $callback = '') * @access public * @param string - element * @param string - Class to add - * @return string + * @return string */ function removeClass($element = 'this', $class = '') { return $this->js->_removeClass($element, $class); } - // -------------------------------------------------------------------- - + // -------------------------------------------------------------------- + /** * Slide Down * @@ -498,7 +498,7 @@ function removeClass($element = 'this', $class = '') * @param string - element * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds * @param string - Javascript callback function - * @return string + * @return string */ function slideDown($element = 'this', $speed = '', $callback = '') { @@ -506,7 +506,7 @@ function slideDown($element = 'this', $speed = '', $callback = '') } // -------------------------------------------------------------------- - + /** * Slide Toggle * @@ -516,14 +516,14 @@ function slideDown($element = 'this', $speed = '', $callback = '') * @param string - element * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds * @param string - Javascript callback function - * @return string + * @return string */ function slideToggle($element = 'this', $speed = '', $callback = '') { return $this->js->_slideToggle($element, $speed, $callback); } - + // -------------------------------------------------------------------- /** @@ -535,15 +535,15 @@ function slideToggle($element = 'this', $speed = '', $callback = '') * @param string - element * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds * @param string - Javascript callback function - * @return string + * @return string */ function hide($element = 'this', $speed = '', $callback = '') { return $this->js->_hide($element, $speed, $callback); } - + // -------------------------------------------------------------------- - + /** * Toggle * @@ -551,16 +551,16 @@ function hide($element = 'this', $speed = '', $callback = '') * * @access public * @param string - element - * @return string + * @return string */ function toggle($element = 'this') { return $this->js->_toggle($element); } - + // -------------------------------------------------------------------- - + /** * Toggle Class * @@ -568,15 +568,15 @@ function toggle($element = 'this') * * @access public * @param string - element - * @return string + * @return string */ function toggleClass($element = 'this', $class='') { return $this->js->_toggleClass($element, $class); } - + // -------------------------------------------------------------------- - + /** * Show * @@ -586,7 +586,7 @@ function toggleClass($element = 'this', $class='') * @param string - element * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds * @param string - Javascript callback function - * @return string + * @return string */ function show($element = 'this', $speed = '', $callback = '') { @@ -604,12 +604,12 @@ function show($element = 'this', $speed = '', $callback = '') * @access public * @param string The element to attach the event to * @return string - */ + */ function compile($view_var = 'script_foot', $script_tags = TRUE) { $this->js->_compile($view_var, $script_tags); } - + /** * Clear Compile * @@ -624,7 +624,7 @@ function clear_compile() } // -------------------------------------------------------------------- - + /** * External * @@ -645,16 +645,16 @@ function external($external_file = '', $relative = FALSE) if ($this->CI->config->item('javascript_location') != '') { $this->_javascript_location = $this->CI->config->item('javascript_location'); - } + } } - + if ($relative === TRUE OR strncmp($external_file, 'http://', 7) == 0 OR strncmp($external_file, 'https://', 8) == 0) { - $str = $this->_open_script($external_file); + $str = $this->_open_script($external_file); } elseif (strpos($this->_javascript_location, 'http://') !== FALSE) { - $str = $this->_open_script($this->_javascript_location.$external_file); + $str = $this->_open_script($this->_javascript_location.$external_file); } else { @@ -664,13 +664,13 @@ function external($external_file = '', $relative = FALSE) $str .= $this->_close_script(); return $str; } - + // -------------------------------------------------------------------- - + /** * Inline * - * Outputs a + * Outputs an closing * * @access private - * @param string + * @param string * @return string */ function _close_script($extra = "\n") { return "$extra"; } - - + + // -------------------------------------------------------------------- // -------------------------------------------------------------------- // AJAX-Y STUFF - still a testbed @@ -736,15 +736,15 @@ function _close_script($extra = "\n") * @param string - element * @param string - One of 'slow', 'normal', 'fast', or time in milliseconds * @param string - Javascript callback function - * @return string + * @return string */ function update($element = 'this', $speed = '', $callback = '') { return $this->js->_updater($element, $speed, $callback); } - + // -------------------------------------------------------------------- - + /** * Generate JSON * @@ -780,7 +780,7 @@ function generate_json($result = NULL, $match_array_type = FALSE) $json = array(); $_is_assoc = TRUE; - + if ( ! is_array($json_result) AND empty($json_result)) { show_error("Generate JSON Failed - Illegal key, value pair."); @@ -805,11 +805,11 @@ function generate_json($result = NULL, $match_array_type = FALSE) $json = implode(',', $json); return $_is_assoc ? "{".$json."}" : "[".$json."]"; - + } - + // -------------------------------------------------------------------- - + /** * Is associative array * @@ -828,12 +828,12 @@ function _is_associative_array($arr) return TRUE; } } - + return FALSE; } - + // -------------------------------------------------------------------- - + /** * Prep Args * @@ -862,7 +862,7 @@ function _prep_args($result, $is_key = FALSE) return $result; } } - + // -------------------------------------------------------------------- } // END Javascript Class diff --git a/system/libraries/Log.php b/system/libraries/Log.php index 4e6b3bc3..99ed126f 100644 --- a/system/libraries/Log.php +++ b/system/libraries/Log.php @@ -40,27 +40,27 @@ class CI_Log { function CI_Log() { $config =& get_config(); - + $this->log_path = ($config['log_path'] != '') ? $config['log_path'] : BASEPATH.'logs/'; - + if ( ! is_dir($this->log_path) OR ! is_really_writable($this->log_path)) { $this->_enabled = FALSE; } - + if (is_numeric($config['log_threshold'])) { $this->_threshold = $config['log_threshold']; } - + if ($config['log_date_format'] != '') { $this->_date_fmt = $config['log_date_format']; } } - + // -------------------------------------------------------------------- - + /** * Write Log File * @@ -71,42 +71,42 @@ function CI_Log() * @param string the error message * @param bool whether the error is a native PHP error * @return bool - */ + */ function write_log($level = 'error', $msg, $php_error = FALSE) - { + { if ($this->_enabled === FALSE) { return FALSE; } - + $level = strtoupper($level); - + if ( ! isset($this->_levels[$level]) OR ($this->_levels[$level] > $this->_threshold)) { return FALSE; } - + $filepath = $this->log_path.'log-'.date('Y-m-d').EXT; $message = ''; - + if ( ! file_exists($filepath)) { $message .= "<"."?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?".">\n\n"; } - + if ( ! $fp = @fopen($filepath, FOPEN_WRITE_CREATE)) { return FALSE; } $message .= $level.' '.(($level == 'INFO') ? ' -' : '-').' '.date($this->_date_fmt). ' --> '.$msg."\n"; - - flock($fp, LOCK_EX); + + flock($fp, LOCK_EX); fwrite($fp, $message); flock($fp, LOCK_UN); fclose($fp); - - @chmod($filepath, FILE_WRITE_MODE); + + @chmod($filepath, FILE_WRITE_MODE); return TRUE; } diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 3a0632d0..b3175f99 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -30,11 +30,11 @@ class CI_Pagination { var $prefix = ''; // A custom prefix added to the path. var $suffix = ''; // A custom suffix added to the path. - var $total_rows = ''; // Total number of items (database results) - var $per_page = 10; // Max number of items you want shown per page + var $total_rows = ''; // Total number of items (database results) + var $per_page = 10; // Max number of items you want shown per page var $num_links = 2; // Number of "digit" links to show before/after the currently viewed page - var $cur_page = 0; // The current page being viewed - var $first_link = '‹ First'; + var $cur_page = 0; // The current page being viewed + var $first_link = '‹ First'; var $next_link = '>'; var $prev_link = '<'; var $last_link = 'Last ›'; @@ -190,7 +190,7 @@ function create_links() $this->base_url = rtrim($this->base_url, '/') .'/'; } - // And here we go... + // And here we go... $output = ''; // Render the "First" link @@ -204,17 +204,17 @@ function create_links() if ($this->prev_link !== FALSE AND $this->cur_page != 1) { $i = $uri_page_number - $this->per_page; - + if ($i == 0 && $this->first_url != '') { - $output .= $this->prev_tag_open.'      anchor_class.'href="'.$this->first_url.'">'.$this->prev_link.''.$this->prev_tag_close; + $output .= $this->prev_tag_open.'anchor_class.'href="'.$this->first_url.'">'.$this->prev_link.''.$this->prev_tag_close; } else { $i = ($i == 0) ? '' : $this->prefix.$i.$this->suffix; $output .= $this->prev_tag_open.'anchor_class.'href="'.$this->base_url.$i.'">'.$this->prev_link.''.$this->prev_tag_close; } - + } // Render the pages @@ -234,7 +234,7 @@ function create_links() else { $n = ($i == 0) ? '' : $i; - + if ($n == '' && $this->first_url != '') { $output .= $this->num_tag_open.'anchor_class.'href="'.$this->first_url.'">'.$loop.''.$this->num_tag_close; @@ -242,7 +242,7 @@ function create_links() else { $n = ($n == '') ? '' : $this->prefix.$n.$this->suffix; - + $output .= $this->num_tag_open.'anchor_class.'href="'.$this->base_url.$n.'">'.$loop.''.$this->num_tag_close; } } diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php index 41a438ba..b969ce4d 100644 --- a/system/libraries/Parser.php +++ b/system/libraries/Parser.php @@ -94,7 +94,7 @@ function _parse($template, $data, $return = FALSE) { if (is_array($val)) { - $template = $this->_parse_pair($key, $val, $template); + $template = $this->_parse_pair($key, $val, $template); } else { @@ -110,9 +110,9 @@ function _parse($template, $data, $return = FALSE) return $template; } - + // -------------------------------------------------------------------- - + /** * Set the left/right variable delimiters * @@ -126,9 +126,9 @@ function set_delimiters($l = '{', $r = '}') $this->l_delim = $l; $this->r_delim = $r; } - + // -------------------------------------------------------------------- - + /** * Parse a single key/value * @@ -142,9 +142,9 @@ function _parse_single($key, $val, $string) { return str_replace($this->l_delim.$key.$this->r_delim, $val, $string); } - + // -------------------------------------------------------------------- - + /** * Parse a tag pair * @@ -157,7 +157,7 @@ function _parse_single($key, $val, $string) * @return string */ function _parse_pair($variable, $data, $string) - { + { if (FALSE === ($match = $this->_match_pair($string, $variable))) { return $string; @@ -178,15 +178,15 @@ function _parse_pair($variable, $data, $string) $temp = $this->_parse_pair($key, $val, $temp); } } - + $str .= $temp; } - + return str_replace($match['0'], $str, $string); } - + // -------------------------------------------------------------------- - + /** * Matches a variable pair * @@ -201,7 +201,7 @@ function _match_pair($string, $variable) { return FALSE; } - + return $match; } diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index db179976..796db2d6 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -33,7 +33,7 @@ class CI_Profiler { var $CI; - + var $_available_sections = array( 'benchmarks', 'get', @@ -46,11 +46,11 @@ class CI_Profiler { 'config' ); - function CI_Profiler($config = array()) - { - $this->CI =& get_instance(); - $this->CI->load->language('profiler'); - + function CI_Profiler($config = array()) + { + $this->CI =& get_instance(); + $this->CI->load->language('profiler'); + // default all sections to display foreach ($this->_available_sections as $section) { @@ -59,10 +59,10 @@ function CI_Profiler($config = array()) $this->_compile_{$section} = TRUE; } } - + $this->set_sections($config); - } - + } + // -------------------------------------------------------------------- /** @@ -80,13 +80,13 @@ function set_sections($config) { if (in_array($method, $this->_available_sections)) { - $this->_compile_{$method} = ($enable !== FALSE) ? TRUE : FALSE; + $this->_compile_{$method} = ($enable !== FALSE) ? TRUE : FALSE; } } } // -------------------------------------------------------------------- - + /** * Auto Profiler * @@ -98,45 +98,45 @@ function set_sections($config) * @access private * @return array */ - function _compile_benchmarks() - { - $profile = array(); - foreach ($this->CI->benchmark->marker as $key => $val) - { - // We match the "end" marker so that the list ends - // up in the order that it was defined - if (preg_match("/(.+?)_end/i", $key, $match)) - { - if (isset($this->CI->benchmark->marker[$match[1].'_end']) AND isset($this->CI->benchmark->marker[$match[1].'_start'])) - { - $profile[$match[1]] = $this->CI->benchmark->elapsed_time($match[1].'_start', $key); - } - } - } + function _compile_benchmarks() + { + $profile = array(); + foreach ($this->CI->benchmark->marker as $key => $val) + { + // We match the "end" marker so that the list ends + // up in the order that it was defined + if (preg_match("/(.+?)_end/i", $key, $match)) + { + if (isset($this->CI->benchmark->marker[$match[1].'_end']) AND isset($this->CI->benchmark->marker[$match[1].'_start'])) + { + $profile[$match[1]] = $this->CI->benchmark->elapsed_time($match[1].'_start', $key); + } + } + } // Build a table containing the profile data. // Note: At some point we should turn this into a template that can // be modified. We also might want to make this data available to be logged - + $output = "\n\n"; $output .= '
      '; $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_benchmarks').'  '; - $output .= "\n"; + $output .= "\n"; $output .= "\n\n\n"; - + foreach ($profile as $key => $val) { $key = ucwords(str_replace(array('_', '-'), ' ', $key)); $output .= "\n"; } - + $output .= "
      ".$key."  ".$val."
      \n"; $output .= "
      "; - - return $output; - } - + + return $output; + } + // -------------------------------------------------------------------- /** @@ -144,7 +144,7 @@ function _compile_benchmarks() * * @access private * @return string - */ + */ function _compile_queries() { $dbs = array(); @@ -157,22 +157,22 @@ function _compile_queries() $dbs[] = $CI_object; } } - + if (count($dbs) == 0) { $output = "\n\n"; $output .= '
      '; $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_queries').'  '; - $output .= "\n"; + $output .= "\n"; $output .= "\n\n\n"; $output .="\n"; $output .= "
      ".$this->CI->lang->line('profiler_no_db')."
      \n"; $output .= "
      "; - + return $output; } - + // Load the text helper so we can highlight the SQL $this->CI->load->helper('text'); @@ -180,45 +180,45 @@ function _compile_queries() $highlight = array('SELECT', 'DISTINCT', 'FROM', 'WHERE', 'AND', 'LEFT JOIN', 'ORDER BY', 'GROUP BY', 'LIMIT', 'INSERT', 'INTO', 'VALUES', 'UPDATE', 'OR ', 'HAVING', 'OFFSET', 'NOT IN', 'IN', 'LIKE', 'NOT LIKE', 'COUNT', 'MAX', 'MIN', 'ON', 'AS', 'AVG', 'SUM', '(', ')'); $output = "\n\n"; - + foreach ($dbs as $db) { $output .= '
      '; $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_database').':  '.$db->database.'   '.$this->CI->lang->line('profiler_queries').': '.count($this->CI->db->queries).'   '; - $output .= "\n"; + $output .= "\n"; $output .= "\n\n\n"; - + if (count($db->queries) == 0) { $output .= "\n"; } else - { + { foreach ($db->queries as $key => $val) - { + { $time = number_format($db->query_times[$key], 4); $val = highlight_code($val, ENT_QUOTES); - + foreach ($highlight as $bold) { - $val = str_replace($bold, ''.$bold.'', $val); + $val = str_replace($bold, ''.$bold.'', $val); } - + $output .= "\n"; } } - + $output .= "
      ".$this->CI->lang->line('profiler_no_queries')."
      ".$time."  ".$val."
      \n"; $output .= "
      "; - + } - + return $output; } - + // -------------------------------------------------------------------- /** @@ -226,15 +226,15 @@ function _compile_queries() * * @access private * @return string - */ + */ function _compile_get() - { + { $output = "\n\n"; $output .= '
      '; $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_get_data').'  '; $output .= "\n"; - + if (count($_GET) == 0) { $output .= "
      ".$this->CI->lang->line('profiler_no_get')."
      "; @@ -242,14 +242,14 @@ function _compile_get() else { $output .= "\n\n\n"; - + foreach ($_GET as $key => $val) { if ( ! is_numeric($key)) { $key = "'".$key."'"; } - + $output .= "\n"; } - + $output .= "
      $_GET[".$key."]   "; if (is_array($val)) { @@ -261,30 +261,30 @@ function _compile_get() } $output .= "
      \n"; } $output .= "
      "; - return $output; + return $output; } - + // -------------------------------------------------------------------- - + /** * Compile $_POST Data * * @access private * @return string - */ + */ function _compile_post() - { + { $output = "\n\n"; $output .= '
      '; $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_post_data').'  '; $output .= "\n"; - + if (count($_POST) == 0) { $output .= "
      ".$this->CI->lang->line('profiler_no_post')."
      "; @@ -292,14 +292,14 @@ function _compile_post() else { $output .= "\n\n\n"; - + foreach ($_POST as $key => $val) { if ( ! is_numeric($key)) { $key = "'".$key."'"; } - + $output .= "\n"; } - + $output .= "
      $_POST[".$key."]   "; if (is_array($val)) { @@ -311,70 +311,70 @@ function _compile_post() } $output .= "
      \n"; } $output .= "
      "; - return $output; + return $output; } - + // -------------------------------------------------------------------- - + /** * Show query string * * @access private * @return string - */ + */ function _compile_uri_string() - { + { $output = "\n\n"; $output .= '
      '; $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_uri_string').'  '; $output .= "\n"; - + if ($this->CI->uri->uri_string == '') { $output .= "
      ".$this->CI->lang->line('profiler_no_uri')."
      "; } else { - $output .= "
      ".$this->CI->uri->uri_string."
      "; + $output .= "
      ".$this->CI->uri->uri_string."
      "; } - + $output .= "
      "; - return $output; + return $output; } // -------------------------------------------------------------------- - + /** * Show the controller and function that were called * * @access private * @return string - */ + */ function _compile_controller_info() - { + { $output = "\n\n"; $output .= '
      '; $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_controller_info').'  '; $output .= "\n"; - - $output .= "
      ".$this->CI->router->fetch_class()."/".$this->CI->router->fetch_method()."
      "; - + $output .= "
      ".$this->CI->router->fetch_class()."/".$this->CI->router->fetch_method()."
      "; + + $output .= "
      "; - return $output; + return $output; } // -------------------------------------------------------------------- - + /** * Compile memory usage * @@ -390,23 +390,23 @@ function _compile_memory_usage() $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_memory_usage').'  '; $output .= "\n"; - + if (function_exists('memory_get_usage') && ($usage = memory_get_usage()) != '') { $output .= "
      ".number_format($usage).' bytes
      '; } else { - $output .= "
      ".$this->CI->lang->line('profiler_no_memory_usage')."
      "; + $output .= "
      ".$this->CI->lang->line('profiler_no_memory_usage')."
      "; } - + $output .= ""; return $output; } // -------------------------------------------------------------------- - + /** * Compile header information * @@ -463,7 +463,7 @@ function _compile_config() { $val = print_r($val, TRUE); } - + $output .= "".$config."  ".htmlspecialchars($val)."\n"; } @@ -474,18 +474,18 @@ function _compile_config() } // -------------------------------------------------------------------- - + /** * Run the Profiler * * @access private * @return string - */ + */ function run() { $output = "
      "; $fields_displayed = 0; - + foreach ($this->_available_sections as $section) { if ($this->_compile_{$section} !== FALSE) @@ -500,7 +500,7 @@ function run() { $output .= '

      '.$this->CI->lang->line('profiler_no_profiles').'

      '; } - + $output .= '
      '; return $output; diff --git a/system/libraries/Security.php b/system/libraries/Security.php index 9a1590b5..2db8ee9b 100644 --- a/system/libraries/Security.php +++ b/system/libraries/Security.php @@ -25,12 +25,12 @@ * @link http://codeigniter.com/user_guide/libraries/sessions.html */ class CI_Security { - var $xss_hash = ''; - var $csrf_hash = ''; + var $xss_hash = ''; + var $csrf_hash = ''; var $csrf_expire = 7200; // Two hours (in seconds) var $csrf_token_name = 'ci_csrf_token'; var $csrf_cookie_name = 'ci_csrf_token'; - + /* never allowed, string replacement */ var $never_allowed_str = array( 'document.cookie' => '[removed]', @@ -63,7 +63,7 @@ function CI_Security() } // -------------------------------------------------------------------- - + /** * Verify Cross Site Request Forgery Protection * @@ -92,7 +92,7 @@ function csrf_verify() // We kill this since we're done and we don't want to polute the _POST array unset($_POST[$this->csrf_token_name]); - + // Nothing should last forever unset($_COOKIE[$this->csrf_cookie_name]); $this->_csrf_set_hash(); @@ -100,9 +100,9 @@ function csrf_verify() log_message('debug', "CSRF token verified "); } - + // -------------------------------------------------------------------- - + /** * Set Cross Site Request Forgery Protection Cookie * @@ -114,12 +114,12 @@ function csrf_set_cookie() $expire = time() + $this->csrf_expire; setcookie($this->csrf_cookie_name, $this->csrf_hash, $expire, config_item('cookie_path'), config_item('cookie_domain'), 0); - - log_message('debug', "CRSF cookie Set"); + + log_message('debug', "CRSF cookie Set"); } - + // -------------------------------------------------------------------- - + /** * Set Cross Site Request Forgery Protection Cookie * @@ -146,7 +146,7 @@ function _csrf_set_hash() } // -------------------------------------------------------------------- - + /** * Show CSRF Error * @@ -159,7 +159,7 @@ function csrf_show_error() } // -------------------------------------------------------------------- - + /** * XSS Clean * @@ -198,7 +198,7 @@ function xss_clean($str, $is_image = FALSE) { $str[$key] = $this->xss_clean($str[$key]); } - + return $str; } @@ -210,9 +210,9 @@ function xss_clean($str, $is_image = FALSE) /* * Protect GET variables in URLs */ - + // 901119URL5918AMP18930PROTECT8198 - + $str = preg_replace('|\&([a-z\_0-9\-]+)\=([a-z\_0-9\-]+)|i', $this->xss_hash()."\\1=\\2", $str); /* @@ -225,7 +225,7 @@ function xss_clean($str, $is_image = FALSE) $str = preg_replace('#(&\#?[0-9a-z]{2,})([\x00-\x20])*;?#i', "\\1;\\2", $str); /* - * Validate UTF16 two byte encoding (x00) + * Validate UTF16 two byte encoding (x00) * * Just as above, adds a semicolon if missing. * @@ -248,9 +248,9 @@ function xss_clean($str, $is_image = FALSE) * */ $str = rawurldecode($str); - + /* - * Convert character entities to ASCII + * Convert character entities to ASCII * * This permits our tests below to work reliably. * We only convert entities that are within tags since @@ -259,14 +259,14 @@ function xss_clean($str, $is_image = FALSE) */ $str = preg_replace_callback("/[a-z]+=([\'\"]).*?\\1/si", array($this, '_convert_attribute'), $str); - + $str = preg_replace_callback("/<\w+.*?(?=>|<|$)/si", array($this, '_decode_entity'), $str); /* * Remove Invisible Characters Again! */ $str = remove_invisible_characters($str); - + /* * Convert all tabs to spaces * @@ -276,29 +276,29 @@ function xss_clean($str, $is_image = FALSE) * so we use str_replace. * */ - + if (strpos($str, "\t") !== FALSE) { $str = str_replace("\t", ' ', $str); } - + /* * Capture converted string for later comparison */ $converted_string = $str; - + /* * Not Allowed Under Any Conditions */ - + foreach ($this->never_allowed_str as $key => $val) { - $str = str_replace($key, $val, $str); + $str = str_replace($key, $val, $str); } - + foreach ($this->never_allowed_regex as $key => $val) { - $str = preg_replace("#".$key."#i", $val, $str); + $str = preg_replace("#".$key."#i", $val, $str); } /* @@ -321,7 +321,7 @@ function xss_clean($str, $is_image = FALSE) { $str = str_replace(array(''), array('<?', '?>'), $str); } - + /* * Compact any exploded words * @@ -333,7 +333,7 @@ function xss_clean($str, $is_image = FALSE) foreach ($words as $word) { $temp = ''; - + for ($i = 0, $wordlen = strlen($word); $i < $wordlen; $i++) { $temp .= substr($word, $i, 1)."\s*"; @@ -343,7 +343,7 @@ function xss_clean($str, $is_image = FALSE) // That way valid stuff like "dealer to" does not become "dealerto" $str = preg_replace_callback('#('.substr($temp, 0, -3).')(\W)#is', array($this, '_compact_exploded_words'), $str); } - + /* * Remove disallowed Javascript in links or img tags * We used to do some version comparisons and use of stripos for PHP5, but it is dog slow compared @@ -352,17 +352,17 @@ function xss_clean($str, $is_image = FALSE) do { $original = $str; - + if (preg_match("/]*?)(>|$)#si", array($this, '_js_link_removal'), $str); } - + if (preg_match("/]*?)(\s?/?>|$)#si", array($this, '_js_img_removal'), $str); } - + if (preg_match("/script/i", $str) OR preg_match("/xss/i", $str)) { $str = preg_replace("#<(/*)(script|xss)(.*?)\>#si", '[removed]', $str); @@ -385,14 +385,14 @@ function xss_clean($str, $is_image = FALSE) if ($is_image === TRUE) { /* - * Adobe Photoshop puts XML metadata into JFIF images, including namespacing, + * Adobe Photoshop puts XML metadata into JFIF images, including namespacing, * so we have to allow this for images. -Paul */ unset($event_handlers[array_search('xmlns', $event_handlers)]); } $str = preg_replace("#<([^><]+?)(".implode('|', $event_handlers).")(\s*=\s*[^><]*)([><]*)#i", "<\\1\\4", $str); - + /* * Sanitize naughty HTML elements * @@ -420,7 +420,7 @@ function xss_clean($str, $is_image = FALSE) * */ $str = preg_replace('#(alert|cmd|passthru|eval|exec|expression|system|fopen|fsockopen|file|file_get_contents|readfile|unlink)(\s*)\((.*?)\)#si', "\\1\\2(\\3)", $str); - + /* * Final clean up * @@ -430,9 +430,9 @@ function xss_clean($str, $is_image = FALSE) */ foreach ($this->never_allowed_str as $key => $val) { - $str = str_replace($key, $val, $str); + $str = str_replace($key, $val, $str); } - + foreach ($this->never_allowed_regex as $key => $val) { $str = preg_replace("#".$key."#i", $val, $str); @@ -457,13 +457,13 @@ function xss_clean($str, $is_image = FALSE) return FALSE; } } - + log_message('debug', "XSS Filtering completed"); return $str; } // -------------------------------------------------------------------- - + /** * Random Hash for protecting URLs * @@ -471,22 +471,22 @@ function xss_clean($str, $is_image = FALSE) * @return string */ function xss_hash() - { + { if ($this->xss_hash == '') { if (phpversion() >= 4.2) mt_srand(); else mt_srand(hexdec(substr(md5(microtime()), -8)) & 0x7fffffff); - + $this->xss_hash = md5(time() + mt_rand(0, 1999999999)); } - + return $this->xss_hash; } // -------------------------------------------------------------------- - + /** * Compact Exploded Words * @@ -501,9 +501,9 @@ function _compact_exploded_words($matches) { return preg_replace('/\s+/s', '', $matches[1]).$matches[2]; } - + // -------------------------------------------------------------------- - + /** * Sanitize Naughty HTML * @@ -517,15 +517,15 @@ function _sanitize_naughty_html($matches) { // encode opening brace $str = '<'.$matches[1].$matches[2].$matches[3]; - + // encode captured opening or closing brace to prevent recursive vectors $str .= str_replace(array('>', '<'), array('>', '<'), $matches[4]); - + return $str; } - + // -------------------------------------------------------------------- - + /** * JS Link Removal * @@ -543,7 +543,7 @@ function _js_link_removal($match) $attributes = $this->_filter_attributes(str_replace(array('<', '>'), '', $match[1])); return str_replace($match[1], preg_replace("#href=.*?(alert\(|alert&\#40;|javascript\:|charset\=|window\.|document\.|\.cookie|', '<', '\\'), array('>', '<', '\\\\'), $match[0]); } - + // -------------------------------------------------------------------- /** @@ -644,35 +644,35 @@ function _decode_entity($match) function entity_decode($str, $charset='UTF-8') { if (stristr($str, '&') === FALSE) return $str; - + // The reason we are not using html_entity_decode() by itself is because // while it is not technically correct to leave out the semicolon // at the end of an entity most browsers will still interpret the entity // correctly. html_entity_decode() does not convert entities without // semicolons, so we are left with our own little solution here. Bummer. - + if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8' OR is_php('5.0.0'))) { $str = html_entity_decode($str, ENT_COMPAT, $charset); $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str); return preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str); } - + // Numeric Entities $str = preg_replace('~&#x(0*[0-9a-f]{2,5});{0,1}~ei', 'chr(hexdec("\\1"))', $str); $str = preg_replace('~&#([0-9]{2,4});{0,1}~e', 'chr(\\1)', $str); - + // Literal Entities - Slightly slow so we do another check if (stristr($str, '&') === FALSE) { $str = strtr($str, array_flip(get_html_translation_table(HTML_ENTITIES))); } - + return $str; } - + // -------------------------------------------------------------------- - + /** * Filename Security * @@ -705,16 +705,16 @@ function sanitize_filename($str) "%20", "%22", "%3c", // < - "%253c", // < - "%3e", // > - "%0e", // > - "%28", // ( - "%29", // ) - "%2528", // ( - "%26", // & - "%24", // $ - "%3f", // ? - "%3b", // ; + "%253c", // < + "%3e", // > + "%0e", // > + "%28", // ( + "%29", // ) + "%2528", // ( + "%26", // & + "%24", // $ + "%3f", // ? + "%3b", // ; "%3d" // = ); diff --git a/system/libraries/Session.php b/system/libraries/Session.php index fc3ee054..342c301e 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -39,7 +39,7 @@ class CI_Session { var $cookie_domain = ''; var $sess_time_to_update = 300; var $encryption_key = ''; - var $flashdata_key = 'flash'; + var $flashdata_key = 'flash'; var $time_reference = 'time'; var $gc_probability = 5; var $userdata = array(); @@ -96,7 +96,7 @@ function CI_Session($params = array()) { $this->sess_expiration = (60*60*24*365*2); } - + // Set the cookie name $this->sess_cookie_name = $this->cookie_prefix.$this->sess_cookie_name; @@ -112,10 +112,10 @@ function CI_Session($params = array()) } // Delete 'old' flashdata (from last request) - $this->_flashdata_sweep(); + $this->_flashdata_sweep(); // Mark all new flashdata as old (data will be deleted before next request) - $this->_flashdata_mark(); + $this->_flashdata_mark(); // Delete expired sessions if necessary $this->_sess_gc(); @@ -313,9 +313,9 @@ function sess_create() $sessid .= $this->CI->input->ip_address(); $this->userdata = array( - 'session_id' => md5(uniqid($sessid, TRUE)), - 'ip_address' => $this->CI->input->ip_address(), - 'user_agent' => substr($this->CI->input->user_agent(), 0, 50), + 'session_id' => md5(uniqid($sessid, TRUE)), + 'ip_address' => $this->CI->input->ip_address(), + 'user_agent' => substr($this->CI->input->user_agent(), 0, 50), 'last_activity' => $this->now ); @@ -656,9 +656,9 @@ function _set_cookie($cookie_data = NULL) // if encryption is not used, we provide an md5 hash to prevent userside tampering $cookie_data = $cookie_data.md5($cookie_data.$this->encryption_key); } - + $expire = ($this->sess_expire_on_close === TRUE) ? 0 : $this->sess_expiration + time(); - + // Set the cookie setcookie( $this->sess_cookie_name, @@ -690,7 +690,7 @@ function _serialize($data) { if (is_string($val)) { - $data[$key] = str_replace('\\', '{{slash}}', $val); + $data[$key] = str_replace('\\', '{{slash}}', $val); } } } @@ -698,7 +698,7 @@ function _serialize($data) { if (is_string($data)) { - $data = str_replace('\\', '{{slash}}', $data); + $data = str_replace('\\', '{{slash}}', $data); } } @@ -727,7 +727,7 @@ function _unserialize($data) { if (is_string($val)) { - $data[$key] = str_replace('{{slash}}', '\\', $val); + $data[$key] = str_replace('{{slash}}', '\\', $val); } } diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php index f9611a8a..ff7e7203 100644 --- a/system/libraries/Sha1.php +++ b/system/libraries/Sha1.php @@ -55,7 +55,7 @@ function CI_SHA() * @access public * @param string * @return string - */ + */ function generate($str) { $n = ((strlen($str) + 8) >> 6) + 1; @@ -117,7 +117,7 @@ function generate($str) return $this->_hex($a).$this->_hex($b).$this->_hex($c).$this->_hex($d).$this->_hex($e); } - + // -------------------------------------------------------------------- /** @@ -126,7 +126,7 @@ function generate($str) * @access private * @param string * @return string - */ + */ function _hex($str) { $str = dechex($str); @@ -138,7 +138,7 @@ function _hex($str) return $str; } - + // -------------------------------------------------------------------- /** @@ -146,7 +146,7 @@ function _hex($str) * * @access private * @return string - */ + */ function _ft($t, $b, $c, $d) { if ($t < 20) @@ -166,7 +166,7 @@ function _ft($t, $b, $c, $d) * * @access private * @return string - */ + */ function _kt($t) { if ($t < 20) @@ -186,7 +186,7 @@ function _kt($t) return -899497514; } } - + // -------------------------------------------------------------------- /** @@ -194,7 +194,7 @@ function _kt($t) * * @access private * @return string - */ + */ function _safe_add($x, $y) { $lsw = ($x & 0xFFFF) + ($y & 0xFFFF); @@ -202,7 +202,7 @@ function _safe_add($x, $y) return ($msw << 16) | ($lsw & 0xFFFF); } - + // -------------------------------------------------------------------- /** @@ -210,7 +210,7 @@ function _safe_add($x, $y) * * @access private * @return integer - */ + */ function _rol($num, $cnt) { return ($num << $cnt) | $this->_zero_fill($num, 32 - $cnt); @@ -223,7 +223,7 @@ function _rol($num, $cnt) * * @access private * @return string - */ + */ function _zero_fill($a, $b) { $bin = decbin($a); diff --git a/system/libraries/Table.php b/system/libraries/Table.php index 1f920ea9..2fc1b634 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -30,13 +30,13 @@ class CI_Table { var $rows = array(); var $heading = array(); - var $auto_heading = TRUE; - var $caption = NULL; - var $template = NULL; + var $auto_heading = TRUE; + var $caption = NULL; + var $template = NULL; var $newline = "\n"; var $empty_cells = ""; var $function = FALSE; - + function CI_Table() { log_message('debug', "Table Class Initialized"); @@ -57,7 +57,7 @@ function set_template($template) { return FALSE; } - + $this->template = $template; } @@ -97,21 +97,21 @@ function make_columns($array = array(), $col_limit = 0) { return FALSE; } - - // Turn off the auto-heading feature since it's doubtful we + + // Turn off the auto-heading feature since it's doubtful we // will want headings from a one-dimensional array $this->auto_heading = FALSE; - + if ($col_limit == 0) { return $array; } - + $new = array(); while(count($array) > 0) - { - $temp = array_splice($array, 0, $col_limit); - + { + $temp = array_splice($array, 0, $col_limit); + if (count($temp) < $col_limit) { for ($i = count($temp); $i < $col_limit; $i++) @@ -119,10 +119,10 @@ function make_columns($array = array(), $col_limit = 0) $temp[] = ' '; } } - + $new[] = $temp; } - + return $new; } @@ -141,7 +141,7 @@ function set_empty($value) { $this->empty_cells = $value; } - + // -------------------------------------------------------------------- /** @@ -160,7 +160,7 @@ function add_row() } // -------------------------------------------------------------------- - + /** * Prep Args * @@ -188,9 +188,9 @@ function _prep_args($args) } else { - $args[$key] = array('data' => $val); + $args[$key] = array('data' => $val); } - } + } } } else @@ -203,12 +203,12 @@ function _prep_args($args) } } } - + return $args; } // -------------------------------------------------------------------- - + /** * Add a table caption * @@ -219,7 +219,7 @@ function _prep_args($args) function set_caption($caption) { $this->caption = $caption; - } + } // -------------------------------------------------------------------- @@ -246,23 +246,23 @@ function generate($table_data = NULL) $this->_set_from_array($table_data, $set_heading); } } - + // Is there anything to display? No? Smite them! if (count($this->heading) == 0 AND count($this->rows) == 0) { return 'Undefined table data'; } - + // Compile and validate the template date $this->_compile_template(); - + // set a custom cell manipulation function to a locally scoped variable so its callable $function = $this->function; - + // Build the table! - + $out = $this->template['table_open']; - $out .= $this->newline; + $out .= $this->newline; // Add any caption here if ($this->caption) @@ -283,16 +283,16 @@ function generate($table_data = NULL) foreach($this->heading as $heading) { $temp = $this->template['heading_cell_start']; - + foreach ($heading as $key => $val) { if ($key != 'data') { $temp = str_replace('template['heading_cell_end']; } @@ -302,13 +302,13 @@ function generate($table_data = NULL) $out .= $this->template['thead_close']; $out .= $this->newline; } - + // Build the table rows if (count($this->rows) > 0) { $out .= $this->template['tbody_open']; $out .= $this->newline; - + $i = 1; foreach($this->rows as $row) { @@ -316,25 +316,25 @@ function generate($table_data = NULL) { break; } - + // We use modulus to alternate the row colors $name = (fmod($i++, 2)) ? '' : 'alt_'; - + $out .= $this->template['row_'.$name.'start']; - $out .= $this->newline; - + $out .= $this->newline; + foreach($row as $cell) { $temp = $this->template['cell_'.$name.'start']; - + foreach ($cell as $key => $val) { if ($key != 'data') { $temp = str_replace('template['cell_'.$name.'end']; } - + $out .= $this->template['row_'.$name.'end']; - $out .= $this->newline; + $out .= $this->newline; } - + $out .= $this->template['tbody_close']; $out .= $this->newline; } $out .= $this->template['table_close']; - + return $out; } - + // -------------------------------------------------------------------- /** @@ -382,9 +382,9 @@ function clear() { $this->rows = array(); $this->heading = array(); - $this->auto_heading = TRUE; + $this->auto_heading = TRUE; } - + // -------------------------------------------------------------------- /** @@ -400,7 +400,7 @@ function _set_from_object($query) { return FALSE; } - + // First generate the headings from the table column names if (count($this->heading) == 0) { @@ -408,12 +408,12 @@ function _set_from_object($query) { return FALSE; } - + $this->heading = $this->_prep_args($query->list_fields()); } - + // Next blast through the result array and build out the rows - + if ($query->num_rows() > 0) { foreach ($query->result_array() as $row) @@ -438,10 +438,10 @@ function _set_from_array($data, $set_heading = TRUE) { return FALSE; } - + $i = 0; foreach ($data as $row) - { + { // If a heading hasn't already been set we'll use the first row of the array as the heading if ($i == 0 AND count($data) > 1 AND count($this->heading) == 0 AND $set_heading == TRUE) { @@ -451,7 +451,7 @@ function _set_from_array($data, $set_heading = TRUE) { $this->rows[] = $this->_prep_args($row); } - + $i++; } } @@ -464,14 +464,14 @@ function _set_from_array($data, $set_heading = TRUE) * @access private * @return void */ - function _compile_template() - { - if ($this->template == NULL) - { - $this->template = $this->_default_template(); - return; - } - + function _compile_template() + { + if ($this->template == NULL) + { + $this->template = $this->_default_template(); + return; + } + $this->temp = $this->_default_template(); foreach (array('table_open', 'thead_open', 'thead_close', 'heading_row_start', 'heading_row_end', 'heading_cell_start', 'heading_cell_end', 'tbody_open', 'tbody_close', 'row_start', 'row_end', 'cell_start', 'cell_end', 'row_alt_start', 'row_alt_end', 'cell_alt_start', 'cell_alt_end', 'table_close') as $val) { @@ -479,9 +479,9 @@ function _compile_template() { $this->template[$val] = $this->temp[$val]; } - } - } - + } + } + // -------------------------------------------------------------------- /** @@ -493,33 +493,33 @@ function _compile_template() function _default_template() { return array ( - 'table_open' => '', - + 'table_open' => '
      ', + 'thead_open' => '', 'thead_close' => '', - - 'heading_row_start' => '', - 'heading_row_end' => '', + + 'heading_row_start' => '', + 'heading_row_end' => '', 'heading_cell_start' => '', 'tbody_open' => '', 'tbody_close' => '', - - 'row_start' => '', - 'row_end' => '', + + 'row_start' => '', + 'row_end' => '', 'cell_start' => '', - 'row_alt_start' => '', - 'row_alt_end' => '', + 'row_alt_start' => '', + 'row_alt_end' => '', 'cell_alt_start' => '', - 'table_close' => '
      ', 'heading_cell_end' => '
      ', 'cell_end' => '
      ', 'cell_alt_end' => '
      ' - ); + 'table_close' => '' + ); } - + } diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php index a2791448..a8be8a87 100644 --- a/system/libraries/Trackback.php +++ b/system/libraries/Trackback.php @@ -27,7 +27,7 @@ * @link http://codeigniter.com/user_guide/libraries/trackback.html */ class CI_Trackback { - + var $time_format = 'local'; var $charset = 'UTF-8'; var $data = array('url' => '', 'title' => '', 'excerpt' => '', 'blog_name' => '', 'charset' => ''); @@ -44,24 +44,24 @@ function CI_Trackback() { log_message('debug', "Trackback Class Initialized"); } - + // -------------------------------------------------------------------- - + /** * Send Trackback * * @access public * @param array * @return bool - */ + */ function send($tb_data) - { + { if ( ! is_array($tb_data)) { $this->set_error('The send() method must be passed an array'); return FALSE; } - + // Pre-process the Trackback Data foreach (array('url', 'title', 'excerpt', 'blog_name', 'ping_url') as $item) { @@ -70,14 +70,14 @@ function send($tb_data) $this->set_error('Required item missing: '.$item); return FALSE; } - + switch ($item) { case 'ping_url' : $$item = $this->extract_urls($tb_data[$item]); break; case 'excerpt' : $$item = $this->limit_characters($this->convert_xml(strip_tags(stripslashes($tb_data[$item])))); break; - case 'url' : $$item = str_replace('-', '-', $this->convert_xml(strip_tags(stripslashes($tb_data[$item])))); + case 'url' : $$item = str_replace('-', '-', $this->convert_xml(strip_tags(stripslashes($tb_data[$item])))); break; default : $$item = $this->convert_xml(strip_tags(stripslashes($tb_data[$item]))); break; @@ -103,9 +103,9 @@ function send($tb_data) // Build the Trackback data string $charset = ( ! isset($tb_data['charset'])) ? $this->charset : $tb_data['charset']; - + $data = "url=".rawurlencode($url)."&title=".rawurlencode($title)."&blog_name=".rawurlencode($blog_name)."&excerpt=".rawurlencode($excerpt)."&charset=".rawurlencode($charset); - + // Send Trackback(s) $return = TRUE; if (count($ping_url) > 0) @@ -116,14 +116,14 @@ function send($tb_data) { $return = FALSE; } - } + } } return $return; } - + // -------------------------------------------------------------------- - + /** * Receive Trackback Data * @@ -134,9 +134,9 @@ function send($tb_data) * * @access public * @return bool - */ + */ function receive() - { + { foreach (array('url', 'title', 'blog_name', 'excerpt') as $val) { if ( ! isset($_POST[$val]) OR $_POST[$val] == '') @@ -144,29 +144,29 @@ function receive() $this->set_error('The following required POST variable is missing: '.$val); return FALSE; } - + $this->data['charset'] = ( ! isset($_POST['charset'])) ? 'auto' : strtoupper(trim($_POST['charset'])); - + if ($val != 'url' && function_exists('mb_convert_encoding')) { $_POST[$val] = mb_convert_encoding($_POST[$val], $this->charset, $this->data['charset']); } - + $_POST[$val] = ($val != 'url') ? $this->convert_xml(strip_tags($_POST[$val])) : strip_tags($_POST[$val]); - + if ($val == 'excerpt') { $_POST['excerpt'] = $this->limit_characters($_POST['excerpt']); } - + $this->data[$val] = $_POST[$val]; } return TRUE; - } - + } + // -------------------------------------------------------------------- - + /** * Send Trackback Error Message * @@ -177,15 +177,15 @@ function receive() * @access public * @param string * @return void - */ + */ function send_error($message = 'Incomplete Information') { echo "\n\n1\n".$message."\n"; exit; } - + // -------------------------------------------------------------------- - + /** * Send Trackback Success Message * @@ -194,29 +194,29 @@ function send_error($message = 'Incomplete Information') * * @access public * @return void - */ + */ function send_success() { echo "\n\n0\n"; exit; } - + // -------------------------------------------------------------------- - + /** * Fetch a particular item * * @access public * @param string * @return string - */ + */ function data($item) { return ( ! isset($this->data[$item])) ? '' : $this->data[$item]; } // -------------------------------------------------------------------- - + /** * Process Trackback * @@ -227,11 +227,11 @@ function data($item) * @param string * @param string * @return bool - */ + */ function process($url, $data) { $target = parse_url($url); - + // Open the socket if ( ! $fp = @fsockopen($target['host'], 80)) { @@ -241,7 +241,7 @@ function process($url, $data) // Build the path $ppath = ( ! isset($target['path'])) ? $url : $target['path']; - + $path = (isset($target['query']) && $target['query'] != "") ? $ppath.'?'.$target['query'] : $ppath; // Add the Trackback ID to the data string @@ -260,32 +260,32 @@ function process($url, $data) // Was it successful? $this->response = ""; - + while( ! feof($fp)) { $this->response .= fgets($fp, 128); } @fclose($fp); - - + + if (stristr($this->response, '0') === FALSE) { $message = 'An unknown error was encountered'; - + if (preg_match("/(.*?)<\/message>/is", $this->response, $match)) { $message = trim($match['1']); } - + $this->set_error($message); return FALSE; } return TRUE; } - + // -------------------------------------------------------------------- - + /** * Extract Trackback URLs * @@ -296,34 +296,34 @@ function process($url, $data) * @access public * @param string * @return string - */ + */ function extract_urls($urls) - { + { // Remove the pesky white space and replace with a comma. $urls = preg_replace("/\s*(\S+)\s*/", "\\1,", $urls); - + // If they use commas get rid of the doubles. $urls = str_replace(",,", ",", $urls); - + // Remove any comma that might be at the end if (substr($urls, -1) == ",") { $urls = substr($urls, 0, -1); } - + // Break into an array via commas $urls = preg_split('/[,]/', $urls); - + // Removes duplicates $urls = array_unique($urls); - + array_walk($urls, array($this, 'validate_url')); - + return $urls; } - + // -------------------------------------------------------------------- - + /** * Validate URL * @@ -332,7 +332,7 @@ function extract_urls($urls) * @access public * @param string * @return string - */ + */ function validate_url($url) { $url = trim($url); @@ -342,46 +342,46 @@ function validate_url($url) $url = "http://".$url; } } - + // -------------------------------------------------------------------- - + /** * Find the Trackback URL's ID * * @access public * @param string * @return string - */ + */ function get_id($url) - { + { $tb_id = ""; - + if (strpos($url, '?') !== FALSE) { $tb_array = explode('/', $url); $tb_end = $tb_array[count($tb_array)-1]; - + if ( ! is_numeric($tb_end)) { $tb_end = $tb_array[count($tb_array)-2]; } - + $tb_array = explode('=', $tb_end); $tb_id = $tb_array[count($tb_array)-1]; } else { $url = rtrim($url, '/'); - + $tb_array = explode('/', $url); $tb_id = $tb_array[count($tb_array)-1]; - + if ( ! is_numeric($tb_id)) { $tb_id = $tb_array[count($tb_array)-2]; } - } - + } + if ( ! preg_match ("/^([0-9]+)$/", $tb_id)) { return FALSE; @@ -389,11 +389,11 @@ function get_id($url) else { return $tb_id; - } + } } - + // -------------------------------------------------------------------- - + /** * Convert Reserved XML characters to Entities * @@ -404,22 +404,22 @@ function get_id($url) function convert_xml($str) { $temp = '__TEMP_AMPERSANDS__'; - + $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); - + $str = str_replace(array("&","<",">","\"", "'", "-"), - array("&", "<", ">", """, "'", "-"), - $str); - + array("&", "<", ">", """, "'", "-"), + $str); + $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); $str = preg_replace("/$temp(\w+);/","&\\1;", $str); - + return $str; - } - + } + // -------------------------------------------------------------------- - + /** * Character limiter * @@ -437,27 +437,27 @@ function limit_characters($str, $n = 500, $end_char = '…') { return $str; } - + $str = preg_replace("/\s+/", ' ', str_replace(array("\r\n", "\r", "\n"), ' ', $str)); - + if (strlen($str) <= $n) { return $str; } - + $out = ""; foreach (explode(' ', trim($str)) as $val) { - $out .= $val.' '; + $out .= $val.' '; if (strlen($out) >= $n) { return trim($out).$end_char; - } + } } } - + // -------------------------------------------------------------------- - + /** * High ASCII to Entities * @@ -470,58 +470,58 @@ function limit_characters($str, $n = 500, $end_char = '…') */ function convert_ascii($str) { - $count = 1; - $out = ''; - $temp = array(); - - for ($i = 0, $s = strlen($str); $i < $s; $i++) - { - $ordinal = ord($str[$i]); - - if ($ordinal < 128) - { - $out .= $str[$i]; - } - else - { - if (count($temp) == 0) - { - $count = ($ordinal < 224) ? 2 : 3; - } - - $temp[] = $ordinal; - - if (count($temp) == $count) - { - $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64); - - $out .= '&#'.$number.';'; - $count = 1; - $temp = array(); - } - } - } - - return $out; + $count = 1; + $out = ''; + $temp = array(); + + for ($i = 0, $s = strlen($str); $i < $s; $i++) + { + $ordinal = ord($str[$i]); + + if ($ordinal < 128) + { + $out .= $str[$i]; + } + else + { + if (count($temp) == 0) + { + $count = ($ordinal < 224) ? 2 : 3; + } + + $temp[] = $ordinal; + + if (count($temp) == $count) + { + $number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64); + + $out .= '&#'.$number.';'; + $count = 1; + $temp = array(); + } + } + } + + return $out; } - + // -------------------------------------------------------------------- - + /** * Set error message * * @access public * @param string * @return void - */ + */ function set_error($msg) { log_message('error', $msg); $this->error_msg[] = $msg; } - + // -------------------------------------------------------------------- - + /** * Show error messages * @@ -529,15 +529,15 @@ function set_error($msg) * @param string * @param string * @return string - */ + */ function display_errors($open = '

      ', $close = '

      ') - { + { $str = ''; foreach ($this->error_msg as $val) { $str .= $open.$val.$close; } - + return $str; } diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php index f058769e..d8b295e7 100644 --- a/system/libraries/Typography.php +++ b/system/libraries/Typography.php @@ -28,22 +28,22 @@ class CI_Typography { // Block level elements that should not be wrapped inside

      tags var $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul'; - + // Elements that should not have

      and
      tags within them. var $skip_elements = 'p|pre|ol|ul|dl|object|table|h\d'; - + // Tags we want the parser to completely ignore when splitting the string. var $inline_elements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var'; - + // array of block level elements that require inner content to be within another block level element var $inner_block_required = array('blockquote'); - + // the last block element parsed var $last_block_element = ''; - + // whether or not to protect quotes within { curly braces } var $protect_braced_quotes = FALSE; - + /** * Nothing to do here... * @@ -56,11 +56,11 @@ function CI_Typography() * Auto Typography * * This function converts text, making it typographically correct: - * - Converts double spaces into paragraphs. - * - Converts single line breaks into
      tags - * - Converts single and double quotes into correctly facing curly quote entities. - * - Converts three dots into ellipsis. - * - Converts double dashes into em-dashes. + * - Converts double spaces into paragraphs. + * - Converts single line breaks into
      tags + * - Converts single and double quotes into correctly facing curly quote entities. + * - Converts three dots into ellipsis. + * - Converts double dashes into em-dashes. * - Converts two spaces into entities * * @access public @@ -78,15 +78,15 @@ function auto_typography($str, $reduce_linebreaks = FALSE) // Standardize Newlines to make matching easier if (strpos($str, "\r") !== FALSE) { - $str = str_replace(array("\r\n", "\r"), "\n", $str); + $str = str_replace(array("\r\n", "\r"), "\n", $str); } - + // Reduce line breaks. If there are more than two consecutive linebreaks // we'll compress them down to a maximum of two since there's no benefit to more. if ($reduce_linebreaks === TRUE) { $str = preg_replace("/\n\n+/", "\n\n", $str); - } + } // HTML comment tags don't conform to patterns of normal tags, so pull them out separately, only if needed $html_comments = array(); @@ -101,50 +101,50 @@ function auto_typography($str, $reduce_linebreaks = FALSE) } } } - + // match and yank 

       tags if they exist.  It's cheaper to do this separately since most content will
 		// not contain 
       tags, and it keeps the PCRE patterns below simpler and faster
 		if (strpos($str, '.*?
      #si", array($this, '_protect_characters'), $str);
 		}
-		
+
 		// Convert quotes within tags to temporary markers.
 		$str = preg_replace_callback("#<.+?>#si", array($this, '_protect_characters'), $str);
 
 		// Do the same with braces if necessary
 		if ($this->protect_braced_quotes === TRUE)
 		{
-			$str = preg_replace_callback("#\{.+?\}#si", array($this, '_protect_characters'), $str);		
+			$str = preg_replace_callback("#\{.+?\}#si", array($this, '_protect_characters'), $str);
 		}
-				
-		// Convert "ignore" tags to temporary marker.  The parser splits out the string at every tag 
-		// it encounters.  Certain inline tags, like image tags, links, span tags, etc. will be 
+
+		// Convert "ignore" tags to temporary marker.  The parser splits out the string at every tag
+		// it encounters.  Certain inline tags, like image tags, links, span tags, etc. will be
 		// adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG}
 		$str = preg_replace("#<(/*)(".$this->inline_elements.")([ >])#i", "{@TAG}\\1\\2\\3", $str);
 
 		// Split the string at every tag.  This expression creates an array with this prototype:
-		// 
-		// 	[array]
-		// 	{
-		// 		[0] = 
-		// 		[1] = Content...
-		// 		[2] = 
-		// 		Etc...
-		// 	}	
+		//
+		//	[array]
+		//	{
+		//		[0] = 
+		//		[1] = Content...
+		//		[2] = 
+		//		Etc...
+		//	}
 		$chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
-		
-		// Build our finalized string.  We cycle through the array, skipping tags, and processing the contained text	
+
+		// Build our finalized string.  We cycle through the array, skipping tags, and processing the contained text
 		$str = '';
 		$process = TRUE;
 		$paragraph = FALSE;
 		$current_chunk = 0;
 		$total_chunks = count($chunks);
-		
+
 		foreach ($chunks as $chunk)
-		{ 
+		{
 			$current_chunk++;
-			
+
 			// Are we dealing with a tag? If so, we'll skip the processing for this cycle.
 			// Well also set the "process" flag which allows us to skip 
       tags and a few other things.
 			if (preg_match("#<(/*)(".$this->block_elements.").*?>#", $chunk, $match))
@@ -153,7 +153,7 @@ function auto_typography($str, $reduce_linebreaks = FALSE)
 				{
 					$process =  ($match[1] == '/') ? TRUE : FALSE;
 				}
-				
+
 				if ($match[1] == '')
 				{
 					$this->last_block_element = $match[2];
@@ -162,32 +162,32 @@ function auto_typography($str, $reduce_linebreaks = FALSE)
 				$str .= $chunk;
 				continue;
 			}
-			
+
 			if ($process == FALSE)
 			{
 				$str .= $chunk;
 				continue;
 			}
-			
+
 			//  Force a newline to make sure end tags get processed by _format_newlines()
 			if ($current_chunk == $total_chunks)
 			{
-				$chunk .= "\n";  
+				$chunk .= "\n";
 			}
-			
+
 			//  Convert Newlines into 
       and 
       tags
 			$str .= $this->_format_newlines($chunk);
 		}
-		
+
 		// No opening block level tag?  Add it if needed.
 		if ( ! preg_match("/^\s*<(?:".$this->block_elements.")/i", $str))
 		{
 			$str = preg_replace("/^(.*?)<(".$this->block_elements.")/i", '
      $1
      <$2', $str);
 		}
-		
+
 		// Convert quotes, elipsis, em-dashes, non-breaking spaces, and ampersands
 		$str = $this->format_characters($str);
-		
+
 		// restore HTML comments
 		for ($i = 0, $total = count($html_comments); $i < $total; $i++)
 		{
@@ -196,18 +196,18 @@ function auto_typography($str, $reduce_linebreaks = FALSE)
 			// if '
      {@HC1}' then replace 
      {@HC1}
       with the comment, else replace only {@HC1} with the comment
 			$str = preg_replace('#(?(?=
      \{@HC'.$i.'\})
      \{@HC'.$i.'\}(\s*
      )|\{@HC'.$i.'\})#s', $html_comments[$i], $str);
 		}
-				
+
 		// Final clean up
 		$table = array(
-		
+
 						// If the user submitted their own paragraph tags within the text
 						// we will retain them instead of using our tags.
 						'/(*?]>)
      /'	=> '$1', // )+#'			=> '
      ',
 						'/(
      \W*
      )+/'	=> '
      ',
-						
+
 						// Clean up stray paragraph tags that appear before block level elements
 						'#
      <('.$this->block_elements.')#'	=> '<$1',
 
@@ -223,15 +223,15 @@ function auto_typography($str, $reduce_linebreaks = FALSE)
 
 						// An unintended consequence of the _format_newlines function is that
 						// some of the newlines get truncated, resulting in 
       tags
-						// starting immediately after  tags on the same line. 
+						// starting immediately after  tags on the same line.
 						// This forces a newline after such occurrences, which looks much nicer.
 						"/>
      \n/"			=> ">\n
      ",
-						
+
 						// Similarly, there might be cases where a closing  will follow
 						// a closing 
       tag, so we'll correct it by adding a newline in between
 						"#
       "
      \n
      #'] = '
       
      ';
 		}
-		
+
 		return preg_replace(array_keys($table), $table, $str);
 
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Format Characters
 	 *
@@ -264,10 +264,10 @@ function auto_typography($str, $reduce_linebreaks = FALSE)
 	function format_characters($str)
 	{
 		static $table;
-		
+
 		if ( ! isset($table))
 		{
-			$table = array(					
+			$table = array(
 							// nested smart quotes, opening and closing
 							// note that rules for grammar (English) allow only for two levels deep
 							// and that single quotes are _supposed_ to always be on the outside
@@ -313,7 +313,7 @@ function format_characters($str)
 
 		return preg_replace(array_keys($table), $table, $str);
 	}
-	
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -324,25 +324,25 @@ function format_characters($str)
 	 * @access	public
 	 * @param	string
 	 * @return	string
-	 */	
+	 */
 	function _format_newlines($str)
 	{
 		if ($str == '')
 		{
 			return $str;
 		}
-		
+
 		if (strpos($str, "\n") === FALSE  && ! in_array($this->last_block_element, $this->inner_block_required))
 		{
 			return $str;
 		}
-		
+
 		// Convert two consecutive newlines to paragraphs
 		$str = str_replace("\n\n", "
      \n\n
      ", $str);
-		
+
 		// Convert single spaces to 
       tags
 		$str = preg_replace("/([^\n])(\n)([^\n])/", "\\1
      \\2\\3", $str);
-		
+
 		// Wrap the whole enchilada in enclosing paragraphs
 		if ($str != "\n")
 		{
@@ -355,19 +355,19 @@ function _format_newlines($str)
 		// Remove empty paragraphs if they are on the first line, as this
 		// is a potential unintended consequence of the previous code
 		$str = preg_replace("/
      <\/p>(.*)/", "\\1", $str, 1);
-		
+
 		return $str;
 	}
-	
+
 	// ------------------------------------------------------------------------
-	
+
 	/**
 	 * Protect Characters
 	 *
 	 * Protects special characters from being formatted later
 	 * We don't want quotes converted within tags so we'll temporarily convert them to {@DQ} and {@SQ}
- 	 * and we don't want double dashes converted to emdash entities, so they are marked with {@DD}
- 	 * likewise double spaces are converted to {@NBS} to prevent entity conversion
+	 * and we don't want double dashes converted to emdash entities, so they are marked with {@DD}
+	 * likewise double spaces are converted to {@NBS} to prevent entity conversion
 	 *
 	 * @access	public
 	 * @param	array
@@ -379,19 +379,19 @@ function _protect_characters($match)
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Convert newlines to HTML line breaks except within PRE tags
 	 *
 	 * @access	public
 	 * @param	string
 	 * @return	string
-	 */		
+	 */
 	function nl2br_except_pre($str)
 	{
 		$ex = explode("pre>",$str);
 		$ct = count($ex);
-	
+
 		$newstr = "";
 		for ($i = 0; $i < $ct; $i++)
 		{
@@ -403,14 +403,14 @@ function nl2br_except_pre($str)
 			{
 				$newstr .= $ex[$i];
 			}
-		
+
 			if ($ct - 1 != $i)
 				$newstr .= "pre>";
 		}
-	
+
 		return $newstr;
 	}
-	
+
 }
 // END Typography Class
 
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
index c4714363..9a90cb47 100644
--- a/system/libraries/Unit_test.php
+++ b/system/libraries/Unit_test.php
@@ -29,9 +29,9 @@
 class CI_Unit_test {
 
 	var $active					= TRUE;
-	var $results 				= array();
+	var $results				= array();
 	var $strict					= FALSE;
-	var $_template 				= NULL;
+	var $_template				= NULL;
 	var $_template_rows			= NULL;
 	var $_test_items_visible	= array();
 
@@ -82,32 +82,32 @@ function set_test_items($items = array())
 	 * @param	mixed
 	 * @param	string
 	 * @return	string
-	 */	
+	 */
 	function run($test, $expected = TRUE, $test_name = 'undefined', $notes = '')
 	{
 		if ($this->active == FALSE)
 		{
 			return FALSE;
 		}
-	
+
 		if (in_array($expected, array('is_object', 'is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null'), TRUE))
 		{
 			$expected = str_replace('is_float', 'is_double', $expected);
-			$result = ($expected($test)) ? TRUE : FALSE;	
+			$result = ($expected($test)) ? TRUE : FALSE;
 			$extype = str_replace(array('true', 'false'), 'bool', str_replace('is_', '', $expected));
 		}
 		else
 		{
 			if ($this->strict == TRUE)
-				$result = ($test === $expected) ? TRUE : FALSE;	
+				$result = ($test === $expected) ? TRUE : FALSE;
 			else
-				$result = ($test == $expected) ? TRUE : FALSE;	
-			
+				$result = ($test == $expected) ? TRUE : FALSE;
+
 			$extype = gettype($expected);
 		}
-				
+
 		$back = $this->_backtrace();
-	
+
 		$report[] = array (
 							'test_name'			=> $test_name,
 							'test_datatype'		=> gettype($test),
@@ -124,7 +124,7 @@ function run($test, $expected = TRUE, $test_name = 'undefined', $notes = '')
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Generate a report
 	 *
@@ -175,9 +175,9 @@ function report($result = array())
 
 		return $r;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Use strict comparison
 	 *
@@ -191,9 +191,9 @@ function use_strict($state = TRUE)
 	{
 		$this->strict = ($state == FALSE) ? FALSE : TRUE;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Make Unit testing active
 	 *
@@ -207,9 +207,9 @@ function active($state = TRUE)
 	{
 		$this->active = ($state == FALSE) ? FALSE : TRUE;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Result Array
 	 *
@@ -219,15 +219,15 @@ function active($state = TRUE)
 	 * @return	array
 	 */
 	function result($results = array())
-	{	
+	{
 		$CI =& get_instance();
 		$CI->load->language('unit_test');
-		
+
 		if (count($results) == 0)
 		{
 			$results = $this->results;
 		}
-		
+
 		$retval = array();
 		foreach ($results as $result)
 		{
@@ -246,8 +246,8 @@ function result($results = array())
 						if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$v))))
 						{
 							$v = $line;
-						}				
-						$temp[$CI->lang->line('ut_'.$k)] = $v;					
+						}
+						$temp[$CI->lang->line('ut_'.$k)] = $v;
 					}
 				}
 				else
@@ -255,19 +255,19 @@ function result($results = array())
 					if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$val))))
 					{
 						$val = $line;
-					}				
+					}
 					$temp[$CI->lang->line('ut_'.$key)] = $val;
 				}
 			}
-			
+
 			$retval[] = $temp;
 		}
-	
+
 		return $retval;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set the template
 	 *
@@ -276,14 +276,14 @@ function result($results = array())
 	 * @access	public
 	 * @param	string
 	 * @return	void
-	 */	
+	 */
 	function set_template($template)
 	{
 		$this->_template = $template;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Generate a backtrace
 	 *
@@ -297,17 +297,17 @@ function _backtrace()
 		if (function_exists('debug_backtrace'))
 		{
 			$back = debug_backtrace();
-			
+
 			$file = ( ! isset($back['1']['file'])) ? '' : $back['1']['file'];
 			$line = ( ! isset($back['1']['line'])) ? '' : $back['1']['line'];
-						
+
 			return array('file' => $file, 'line' => $line);
 		}
 		return array('file' => 'Unknown', 'line' => 'Unknown');
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Get Default Template
 	 *
@@ -315,17 +315,17 @@ function _backtrace()
 	 * @return	string
 	 */
 	function _default_template()
-	{	
+	{
 		$this->_template = "\n".'';
 		$this->_template .= '{rows}';
 		$this->_template .= "\n".'
      ';
-		
+
 		$this->_template_rows = "\n\t".'';
 		$this->_template_rows .= "\n\t\t".'{item}';
 		$this->_template_rows .= "\n\t\t".'{result}';
-		$this->_template_rows .= "\n\t".'';	
+		$this->_template_rows .= "\n\t".'';
 	}
-	
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -336,29 +336,29 @@ function _default_template()
 	 * @access	private
 	 * @return	void
 	 */
- 	function _parse_template()
- 	{
- 		if ( ! is_null($this->_template_rows))
- 		{
- 			return;
- 		}
- 		
- 		if (is_null($this->_template))
- 		{
- 			$this->_default_template();
- 			return;
- 		}
- 		
+	function _parse_template()
+	{
+		if ( ! is_null($this->_template_rows))
+		{
+			return;
+		}
+
+		if (is_null($this->_template))
+		{
+			$this->_default_template();
+			return;
+		}
+
 		if ( ! preg_match("/\{rows\}(.*?)\{\/rows\}/si", $this->_template, $match))
 		{
- 			$this->_default_template();
- 			return;
+			$this->_default_template();
+			return;
 		}
 
 		$this->_template_rows = $match['1'];
-		$this->_template = str_replace($match['0'], '{rows}', $this->_template); 	
- 	}
- 	
+		$this->_template = str_replace($match['0'], '{rows}', $this->_template);
+	}
+
 }
 // END Unit_test Class
 
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index c18c178d..c83d0aea 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -25,7 +25,7 @@
  * @link		http://codeigniter.com/user_guide/libraries/file_uploading.html
  */
 class CI_Upload {
-	
+
 	var $max_size				= 0;
 	var $max_width				= 0;
 	var $max_height				= 0;
@@ -51,9 +51,9 @@ class CI_Upload {
 	var $xss_clean				= FALSE;
 	var $temp_prefix			= "temp_file_";
 	var $client_name			= '';
-	
+
 	var $_file_name_override	= ''; //@PHP4 (should be private)
-	
+
 	/**
 	 * Constructor
 	 *
@@ -65,19 +65,19 @@ function CI_Upload($props = array())
 		{
 			$this->initialize($props);
 		}
-		
+
 		log_message('debug', "Upload Class Initialized");
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Initialize preferences
 	 *
 	 * @access	public
 	 * @param	array
 	 * @return	void
-	 */	
+	 */
 
 	function initialize($config = array())
 	{
@@ -107,9 +107,9 @@ function initialize($config = array())
 							'xss_clean'			=> FALSE,
 							'temp_prefix'		=> "temp_file_",
 							'client_name'		=> ''
-						);	
-	
-	
+						);
+
+
 		foreach ($defaults as $key => $val)
 		{
 			if (isset($config[$key]))
@@ -122,27 +122,27 @@ function initialize($config = array())
 				else
 				{
 					$this->$key = $config[$key];
-				}			
+				}
 			}
 			else
 			{
 				$this->$key = $val;
 			}
 		}
-		
+
 		// if a file_name was provided in the config, use it instead of the user input
 		// supplied file name for all uploads until initialized again
 		$this->_file_name_override = $this->file_name;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Perform the file upload
 	 *
 	 * @access	public
 	 * @return	bool
-	 */	
+	 */
 	function do_upload($field = 'userfile')
 	{
 		// Is $_FILES[$field] set? If not, no reason to continue.
@@ -151,7 +151,7 @@ function do_upload($field = 'userfile')
 			$this->set_error('upload_no_file_selected');
 			return FALSE;
 		}
-		
+
 		// Is the upload path valid?
 		if ( ! $this->validate_upload_path())
 		{
@@ -173,10 +173,10 @@ function do_upload($field = 'userfile')
 					$this->set_error('upload_file_exceeds_form_limit');
 					break;
 				case 3: // UPLOAD_ERR_PARTIAL
-				   $this->set_error('upload_file_partial');
+					$this->set_error('upload_file_partial');
 					break;
 				case 4: // UPLOAD_ERR_NO_FILE
-				   $this->set_error('upload_no_file_selected');
+					$this->set_error('upload_no_file_selected');
 					break;
 				case 6: // UPLOAD_ERR_NO_TMP_DIR
 					$this->set_error('upload_no_temp_directory');
@@ -196,14 +196,14 @@ function do_upload($field = 'userfile')
 
 
 		// Set the uploaded data as class variables
-		$this->file_temp = $_FILES[$field]['tmp_name'];		
-		$this->file_size = $_FILES[$field]['size'];	
+		$this->file_temp = $_FILES[$field]['tmp_name'];
+		$this->file_size = $_FILES[$field]['size'];
 		$this->file_type = preg_replace("/^(.+?);.*$/", "\\1", $_FILES[$field]['type']);
 		$this->file_type = strtolower(trim(stripslashes($this->file_type), '"'));
 		$this->file_name = $this->_prep_filename($_FILES[$field]['name']);
 		$this->file_ext	 = $this->get_extension($this->file_name);
 		$this->client_name = $this->file_name;
-		
+
 		// Is the file type allowed to be uploaded?
 		if ( ! $this->is_allowed_filetype())
 		{
@@ -220,10 +220,10 @@ function do_upload($field = 'userfile')
 			if ( ! $this->is_allowed_filetype(TRUE))
 			{
 				$this->set_error('upload_invalid_filetype');
-				return FALSE;				
+				return FALSE;
 			}
 		}
-		
+
 		// Convert the file size to kilobytes
 		if ($this->file_size > 0)
 		{
@@ -247,7 +247,7 @@ function do_upload($field = 'userfile')
 
 		// Sanitize the file name for security
 		$this->file_name = $this->clean_file_name($this->file_name);
-		
+
 		// Truncate the file name if it's too long
 		if ($this->max_filename > 0)
 		{
@@ -271,7 +271,7 @@ function do_upload($field = 'userfile')
 		if ($this->overwrite == FALSE)
 		{
 			$this->file_name = $this->set_filename($this->upload_path, $this->file_name);
-			
+
 			if ($this->file_name === FALSE)
 			{
 				return FALSE;
@@ -304,8 +304,8 @@ function do_upload($field = 'userfile')
 		{
 			if ( ! @move_uploaded_file($this->file_temp, $this->upload_path.$this->file_name))
 			{
-				 $this->set_error('upload_destination_error');
-				 return FALSE;
+				$this->set_error('upload_destination_error');
+				return FALSE;
 			}
 		}
 
@@ -319,18 +319,18 @@ function do_upload($field = 'userfile')
 
 		return TRUE;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Finalized Data Array
-	 *	
+	 *
 	 * Returns an associative array containing all of the information
 	 * related to the upload, allowing the developer easy access in one array.
 	 *
 	 * @access	public
 	 * @return	array
-	 */	
+	 */
 	function data()
 	{
 		return array (
@@ -350,24 +350,24 @@ function data()
 						'image_size_str'	=> $this->image_size_str,
 					);
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set Upload Path
 	 *
 	 * @access	public
 	 * @param	string
 	 * @return	void
-	 */	
+	 */
 	function set_upload_path($path)
 	{
 		// Make sure it has a trailing slash
 		$this->upload_path = rtrim($path, '/').'/';
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set the file name
 	 *
@@ -379,25 +379,25 @@ function set_upload_path($path)
 	 * @param	string
 	 * @param	string
 	 * @return	string
-	 */	
+	 */
 	function set_filename($path, $filename)
 	{
 		if ($this->encrypt_name == TRUE)
-		{		
+		{
 			mt_srand();
-			$filename = md5(uniqid(mt_rand())).$this->file_ext;	
+			$filename = md5(uniqid(mt_rand())).$this->file_ext;
 		}
-	
+
 		if ( ! file_exists($path.$filename))
 		{
 			return $filename;
 		}
-	
+
 		$filename = str_replace($this->file_ext, '', $filename);
-		
+
 		$new_filename = '';
 		for ($i = 1; $i < 100; $i++)
-		{			
+		{
 			if ( ! file_exists($path.$filename.$i.$this->file_ext))
 			{
 				$new_filename = $filename.$i.$this->file_ext;
@@ -415,72 +415,72 @@ function set_filename($path, $filename)
 			return $new_filename;
 		}
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set Maximum File Size
 	 *
 	 * @access	public
 	 * @param	integer
 	 * @return	void
-	 */	
+	 */
 	function set_max_filesize($n)
 	{
 		$this->max_size = ((int) $n < 0) ? 0: (int) $n;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set Maximum File Name Length
 	 *
 	 * @access	public
 	 * @param	integer
 	 * @return	void
-	 */	
+	 */
 	function set_max_filename($n)
 	{
 		$this->max_filename = ((int) $n < 0) ? 0: (int) $n;
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set Maximum Image Width
 	 *
 	 * @access	public
 	 * @param	integer
 	 * @return	void
-	 */	
+	 */
 	function set_max_width($n)
 	{
 		$this->max_width = ((int) $n < 0) ? 0: (int) $n;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set Maximum Image Height
 	 *
 	 * @access	public
 	 * @param	integer
 	 * @return	void
-	 */	
+	 */
 	function set_max_height($n)
 	{
 		$this->max_height = ((int) $n < 0) ? 0: (int) $n;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set Allowed File Types
 	 *
 	 * @access	public
 	 * @param	string
 	 * @return	void
-	 */	
+	 */
 	function set_allowed_types($types)
 	{
 		if ( ! is_array($types) && $types == '*')
@@ -490,9 +490,9 @@ function set_allowed_types($types)
 		}
 		$this->allowed_types = explode('|', $types);
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set Image Properties
 	 *
@@ -501,7 +501,7 @@ function set_allowed_types($types)
 	 * @access	public
 	 * @param	string
 	 * @return	void
-	 */	
+	 */
 	function set_image_properties($path = '')
 	{
 		if ( ! $this->is_image())
@@ -512,7 +512,7 @@ function set_image_properties($path = '')
 		if (function_exists('getimagesize'))
 		{
 			if (FALSE !== ($D = @getimagesize($path)))
-			{	
+			{
 				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
 
 				$this->image_width		= $D['0'];
@@ -522,9 +522,9 @@ function set_image_properties($path = '')
 			}
 		}
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set XSS Clean
 	 *
@@ -539,15 +539,15 @@ function set_xss_clean($flag = FALSE)
 	{
 		$this->xss_clean = ($flag == TRUE) ? TRUE : FALSE;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Validate the image
 	 *
 	 * @access	public
 	 * @return	bool
-	 */	
+	 */
 	function is_image()
 	{
 		// IE will sometimes return odd mime-types during upload, so here we just standardize all
@@ -555,12 +555,12 @@ function is_image()
 
 		$png_mimes  = array('image/x-png');
 		$jpeg_mimes = array('image/jpg', 'image/jpe', 'image/jpeg', 'image/pjpeg');
-		
+
 		if (in_array($this->file_type, $png_mimes))
 		{
 			$this->file_type = 'image/png';
 		}
-		
+
 		if (in_array($this->file_type, $jpeg_mimes))
 		{
 			$this->file_type = 'image/jpeg';
@@ -570,80 +570,80 @@ function is_image()
 							'image/gif',
 							'image/jpeg',
 							'image/png',
-						   );
+						);
 
 		return (in_array($this->file_type, $img_mimes, TRUE)) ? TRUE : FALSE;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Verify that the filetype is allowed
 	 *
 	 * @access	public
 	 * @return	bool
-	 */	
+	 */
 	function is_allowed_filetype($ignore_mime = FALSE)
 	{
 		if ($this->allowed_types == '*')
 		{
 			return TRUE;
 		}
-		
+
 		if (count($this->allowed_types) == 0 OR ! is_array($this->allowed_types))
 		{
 			$this->set_error('upload_no_file_types');
 			return FALSE;
 		}
-		
+
 		$ext = strtolower(ltrim($this->file_ext, '.'));
-		
+
 		if ( ! in_array($ext, $this->allowed_types))
 		{
 			return FALSE;
 		}
 
-		// Images get some additional checks		
+		// Images get some additional checks
 		$image_types = array('gif', 'jpg', 'jpeg', 'png', 'jpe');
-		
+
 		if (in_array($ext, $image_types))
 		{
 			if (getimagesize($this->file_temp) === FALSE)
 			{
 				return FALSE;
-			}			
+			}
 		}
-		
+
 		if ($ignore_mime === TRUE)
 		{
 			return TRUE;
 		}
-		
+
 		$mime = $this->mimes_types($ext);
-				
+
 		if (is_array($mime))
 		{
 			if (in_array($this->file_type, $mime, TRUE))
 			{
 				return TRUE;
-			}			
+			}
 		}
 		elseif ($mime == $this->file_type)
 		{
 				return TRUE;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Verify that the file is within the allowed size
 	 *
 	 * @access	public
 	 * @return	bool
-	 */	
+	 */
 	function is_allowed_filesize()
 	{
 		if ($this->max_size != 0  AND  $this->file_size > $this->max_size)
@@ -655,15 +655,15 @@ function is_allowed_filesize()
 			return TRUE;
 		}
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Verify that the image is within the allowed width/height
 	 *
 	 * @access	public
 	 * @return	bool
-	 */	
+	 */
 	function is_allowed_dimensions()
 	{
 		if ( ! $this->is_image())
@@ -690,9 +690,9 @@ function is_allowed_dimensions()
 
 		return TRUE;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Validate Upload Path
 	 *
@@ -701,7 +701,7 @@ function is_allowed_dimensions()
 	 *
 	 * @access	public
 	 * @return	bool
-	 */	
+	 */
 	function validate_upload_path()
 	{
 		if ($this->upload_path == '')
@@ -709,7 +709,7 @@ function validate_upload_path()
 			$this->set_error('upload_no_filepath');
 			return FALSE;
 		}
-		
+
 		if (function_exists('realpath') AND @realpath($this->upload_path) !== FALSE)
 		{
 			$this->upload_path = str_replace("\\", "/", realpath($this->upload_path));
@@ -730,31 +730,31 @@ function validate_upload_path()
 		$this->upload_path = preg_replace("/(.+?)\/*$/", "\\1/",  $this->upload_path);
 		return TRUE;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Extract the file extension
 	 *
 	 * @access	public
 	 * @param	string
 	 * @return	string
-	 */	
+	 */
 	function get_extension($filename)
 	{
 		$x = explode('.', $filename);
 		return '.'.end($x);
-	}	
-	
+	}
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Clean the file name for security
 	 *
 	 * @access	public
 	 * @param	string
 	 * @return	string
-	 */		
+	 */
 	function clean_file_name($filename)
 	{
 		$bad = array(
@@ -773,40 +773,40 @@ function clean_file_name($filename)
 						"%20",
 						"%22",
 						"%3c",		// <
-						"%253c", 	// <
-						"%3e", 		// >
-						"%0e", 		// >
-						"%28", 		// (
-						"%29", 		// )
-						"%2528", 	// (
-						"%26", 		// &
-						"%24", 		// $
-						"%3f", 		// ?
-						"%3b", 		// ;
+						"%253c",	// <
+						"%3e",		// >
+						"%0e",		// >
+						"%28",		// (
+						"%29",		// )
+						"%2528",	// (
+						"%26",		// &
+						"%24",		// $
+						"%3f",		// ?
+						"%3b",		// ;
 						"%3d"		// =
 					);
-					
+
 		$filename = str_replace($bad, '', $filename);
 
 		return stripslashes($filename);
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Limit the File Name Length
 	 *
 	 * @access	public
 	 * @param	string
 	 * @return	string
-	 */		
+	 */
 	function limit_filename_length($filename, $length)
 	{
 		if (strlen($filename) < $length)
 		{
 			return $filename;
 		}
-	
+
 		$ext = '';
 		if (strpos($filename, '.') !== FALSE)
 		{
@@ -814,12 +814,12 @@ function limit_filename_length($filename, $length)
 			$ext		= '.'.array_pop($parts);
 			$filename	= implode('.', $parts);
 		}
-	
+
 		return substr($filename, 0, ($length - strlen($ext))).$ext;
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Runs the file through the XSS clean function
 	 *
@@ -829,26 +829,26 @@ function limit_filename_length($filename, $length)
 	 *
 	 * @access	public
 	 * @return	void
-	 */	
+	 */
 	function do_xss_clean()
-	{		
+	{
 		$file = $this->file_temp;
-		
+
 		if (filesize($file) == 0)
 		{
 			return FALSE;
 		}
-		
+
 		if (function_exists('memory_get_usage') && memory_get_usage() && ini_get('memory_limit') != '')
 		{
 			$current = ini_get('memory_limit') * 1024 * 1024;
-			
+
 			// There was a bug/behavioural change in PHP 5.2, where numbers over one million get output
 			// into scientific notation.  number_format() ensures this number is an integer
 			// http://bugs.php.net/bug.php?id=43053
-			
+
 			$new_memory = number_format(ceil(filesize($file) + $current), 0, '.', '');
-			
+
 			ini_set('memory_limit', $new_memory); // When an integer is used, the value is measured in bytes. - PHP.net
 		}
 
@@ -856,18 +856,18 @@ function do_xss_clean()
 		// IE can be fooled into mime-type detecting a malformed image as an html file, thus executing an XSS attack on anyone
 		// using IE who looks at the image.  It does this by inspecting the first 255 bytes of an image.  To get around this
 		// CI will itself look at the first 255 bytes of an image to determine its relative safety.  This can save a lot of
-		// processor power and time if it is actually a clean image, as it will be in nearly all instances _except_ an 
+		// processor power and time if it is actually a clean image, as it will be in nearly all instances _except_ an
 		// attempted XSS attack.
 
 		if (function_exists('getimagesize') && @getimagesize($file) !== FALSE)
 		{
-	        if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
-	        {
+			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
+			{
 				return FALSE; // Couldn't open the file, return FALSE
-	        }
+			}
 
-	        $opening_bytes = fread($file, 256);
-	        fclose($file);
+			$opening_bytes = fread($file, 256);
+			fclose($file);
 
 			// These are known to throw IE into mime-type detection chaos
 			// security))
 		{
 			$CI->load->library('security');
 		}
-		
+
 		return $CI->security->xss_clean($data, TRUE);
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set an error message
 	 *
 	 * @access	public
 	 * @param	string
 	 * @return	void
-	 */	
+	 */
 	function set_error($msg)
 	{
-		$CI =& get_instance();	
+		$CI =& get_instance();
 		$CI->lang->load('upload');
-		
+
 		if (is_array($msg))
 		{
 			foreach ($msg as $val)
 			{
-				$msg = ($CI->lang->line($val) == FALSE) ? $val : $CI->lang->line($val);				
+				$msg = ($CI->lang->line($val) == FALSE) ? $val : $CI->lang->line($val);
 				$this->error_msg[] = $msg;
 				log_message('error', $msg);
-			}		
+			}
 		}
 		else
 		{
@@ -924,9 +924,9 @@ function set_error($msg)
 			log_message('error', $msg);
 		}
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Display the error message
 	 *
@@ -934,7 +934,7 @@ function set_error($msg)
 	 * @param	string
 	 * @param	string
 	 * @return	string
-	 */	
+	 */
 	function display_errors($open = '
      ', $close = '
      ')
 	{
 		$str = '';
@@ -942,12 +942,12 @@ function display_errors($open = '
      ', $close = '
      ')
 		{
 			$str .= $open.$val.$close;
 		}
-	
+
 		return $str;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * List of Mime Types
 	 *
@@ -957,11 +957,11 @@ function display_errors($open = '
      ', $close = '
      ')
 	 * @access	public
 	 * @param	string
 	 * @return	string
-	 */	
+	 */
 	function mimes_types($mime)
 	{
 		global $mimes;
-	
+
 		if (count($this->mimes) == 0)
 		{
 			if (@require_once(APPPATH.'config/mimes'.EXT))
@@ -970,12 +970,12 @@ function mimes_types($mime)
 				unset($mimes);
 			}
 		}
-	
+
 		return ( ! isset($this->mimes[$mime])) ? FALSE : $this->mimes[$mime];
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Prep Filename
 	 *
@@ -1010,7 +1010,7 @@ function _prep_filename($filename)
 		}
 
 		$filename .= '.'.$ext;
-		
+
 		return $filename;
 	}
 
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index a7c7a760..00cbf696 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -29,25 +29,25 @@
 class CI_User_agent {
 
 	var $agent		= NULL;
-	
+
 	var $is_browser	= FALSE;
 	var $is_robot	= FALSE;
 	var $is_mobile	= FALSE;
 
 	var $languages	= array();
 	var $charsets	= array();
-	
+
 	var $platforms	= array();
 	var $browsers	= array();
 	var $mobiles	= array();
 	var $robots		= array();
-	
+
 	var $platform	= '';
 	var $browser	= '';
 	var $version	= '';
 	var $mobile		= '';
 	var $robot		= '';
-	
+
 	/**
 	 * Constructor
 	 *
@@ -55,14 +55,14 @@ class CI_User_agent {
 	 *
 	 * @access	public
 	 * @return	void
-	 */		
+	 */
 	function CI_User_agent()
 	{
 		if (isset($_SERVER['HTTP_USER_AGENT']))
 		{
 			$this->agent = trim($_SERVER['HTTP_USER_AGENT']);
 		}
-		
+
 		if ( ! is_null($this->agent))
 		{
 			if ($this->_load_agent_file())
@@ -70,27 +70,27 @@ function CI_User_agent()
 				$this->_compile_data();
 			}
 		}
-		
+
 		log_message('debug', "User Agent Class Initialized");
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Compile the User Agent Data
 	 *
 	 * @access	private
 	 * @return	bool
-	 */		
+	 */
 	function _load_agent_file()
 	{
 		if ( ! @include(APPPATH.'config/user_agents'.EXT))
 		{
 			return FALSE;
 		}
-		
+
 		$return = FALSE;
-		
+
 		if (isset($platforms))
 		{
 			$this->platforms = $platforms;
@@ -111,7 +111,7 @@ function _load_agent_file()
 			unset($mobiles);
 			$return = TRUE;
 		}
-		
+
 		if (isset($robots))
 		{
 			$this->robots = $robots;
@@ -121,36 +121,36 @@ function _load_agent_file()
 
 		return $return;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Compile the User Agent Data
 	 *
 	 * @access	private
 	 * @return	bool
-	 */		
+	 */
 	function _compile_data()
 	{
 		$this->_set_platform();
-	
+
 		foreach (array('_set_browser', '_set_robot', '_set_mobile') as $function)
 		{
 			if ($this->$function() === TRUE)
 			{
 				break;
 			}
-		}	
+		}
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set the Platform
 	 *
 	 * @access	private
 	 * @return	mixed
-	 */		
+	 */
 	function _set_platform()
 	{
 		if (is_array($this->platforms) AND count($this->platforms) > 0)
@@ -168,19 +168,19 @@ function _set_platform()
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set the Browser
 	 *
 	 * @access	private
 	 * @return	bool
-	 */		
+	 */
 	function _set_browser()
 	{
 		if (is_array($this->browsers) AND count($this->browsers) > 0)
 		{
 			foreach ($this->browsers as $key => $val)
-			{		
+			{
 				if (preg_match("|".preg_quote($key).".*?([0-9\.]+)|i", $this->agent, $match))
 				{
 					$this->is_browser = TRUE;
@@ -193,19 +193,19 @@ function _set_browser()
 		}
 		return FALSE;
 	}
-			
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set the Robot
 	 *
 	 * @access	private
 	 * @return	bool
-	 */		
+	 */
 	function _set_robot()
 	{
 		if (is_array($this->robots) AND count($this->robots) > 0)
-		{		
+		{
 			foreach ($this->robots as $key => $val)
 			{
 				if (preg_match("|".preg_quote($key)."|i", $this->agent))
@@ -220,17 +220,17 @@ function _set_robot()
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set the Mobile Device
 	 *
 	 * @access	private
 	 * @return	bool
-	 */		
+	 */
 	function _set_mobile()
 	{
 		if (is_array($this->mobiles) AND count($this->mobiles) > 0)
-		{		
+		{
 			foreach ($this->mobiles as $key => $val)
 			{
 				if (FALSE !== (strpos(strtolower($this->agent), $key)))
@@ -240,261 +240,261 @@ function _set_mobile()
 					return TRUE;
 				}
 			}
-		}	
+		}
 		return FALSE;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set the accepted languages
 	 *
 	 * @access	private
 	 * @return	void
-	 */			
+	 */
 	function _set_languages()
 	{
 		if ((count($this->languages) == 0) AND isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) AND $_SERVER['HTTP_ACCEPT_LANGUAGE'] != '')
 		{
 			$languages = preg_replace('/(;q=[0-9\.]+)/i', '', strtolower(trim($_SERVER['HTTP_ACCEPT_LANGUAGE'])));
-			
+
 			$this->languages = explode(',', $languages);
 		}
-		
+
 		if (count($this->languages) == 0)
 		{
 			$this->languages = array('Undefined');
-		}	
+		}
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Set the accepted character sets
 	 *
 	 * @access	private
 	 * @return	void
-	 */			
+	 */
 	function _set_charsets()
-	{	
+	{
 		if ((count($this->charsets) == 0) AND isset($_SERVER['HTTP_ACCEPT_CHARSET']) AND $_SERVER['HTTP_ACCEPT_CHARSET'] != '')
 		{
 			$charsets = preg_replace('/(;q=.+)/i', '', strtolower(trim($_SERVER['HTTP_ACCEPT_CHARSET'])));
-			
+
 			$this->charsets = explode(',', $charsets);
 		}
-		
+
 		if (count($this->charsets) == 0)
 		{
 			$this->charsets = array('Undefined');
-		}	
+		}
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Is Browser
 	 *
 	 * @access	public
 	 * @return	bool
-	 */		
+	 */
 	function is_browser()
 	{
 		return $this->is_browser;
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Is Robot
 	 *
 	 * @access	public
 	 * @return	bool
-	 */		
+	 */
 	function is_robot()
 	{
 		return $this->is_robot;
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Is Mobile
 	 *
 	 * @access	public
 	 * @return	bool
-	 */		
+	 */
 	function is_mobile()
 	{
 		return $this->is_mobile;
-	}	
+	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Is this a referral from another site?
 	 *
 	 * @access	public
 	 * @return	bool
-	 */			
+	 */
 	function is_referral()
 	{
 		return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') ? FALSE : TRUE;
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Agent String
 	 *
 	 * @access	public
 	 * @return	string
-	 */			
+	 */
 	function agent_string()
 	{
 		return $this->agent;
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Get Platform
 	 *
 	 * @access	public
 	 * @return	string
-	 */			
+	 */
 	function platform()
 	{
 		return $this->platform;
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Get Browser Name
 	 *
 	 * @access	public
 	 * @return	string
-	 */			
+	 */
 	function browser()
 	{
 		return $this->browser;
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Get the Browser Version
 	 *
 	 * @access	public
 	 * @return	string
-	 */			
+	 */
 	function version()
 	{
 		return $this->version;
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Get The Robot Name
 	 *
 	 * @access	public
 	 * @return	string
-	 */				
+	 */
 	function robot()
 	{
 		return $this->robot;
 	}
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Get the Mobile Device
 	 *
 	 * @access	public
 	 * @return	string
-	 */			
+	 */
 	function mobile()
 	{
 		return $this->mobile;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Get the referrer
 	 *
 	 * @access	public
 	 * @return	bool
-	 */			
+	 */
 	function referrer()
 	{
 		return ( ! isset($_SERVER['HTTP_REFERER']) OR $_SERVER['HTTP_REFERER'] == '') ? '' : trim($_SERVER['HTTP_REFERER']);
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Get the accepted languages
 	 *
 	 * @access	public
 	 * @return	array
-	 */			
+	 */
 	function languages()
 	{
 		if (count($this->languages) == 0)
 		{
 			$this->_set_languages();
 		}
-	
+
 		return $this->languages;
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Get the accepted Character Sets
 	 *
 	 * @access	public
 	 * @return	array
-	 */			
+	 */
 	function charsets()
 	{
 		if (count($this->charsets) == 0)
 		{
 			$this->_set_charsets();
 		}
-	
+
 		return $this->charsets;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Test for a particular language
 	 *
 	 * @access	public
 	 * @return	bool
-	 */			
+	 */
 	function accept_lang($lang = 'en')
 	{
 		return (in_array(strtolower($lang), $this->languages(), TRUE)) ? TRUE : FALSE;
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Test for a particular character set
 	 *
 	 * @access	public
 	 * @return	bool
-	 */			
+	 */
 	function accept_charset($charset = 'utf-8')
 	{
 		return (in_array(strtolower($charset), $this->charsets(), TRUE)) ? TRUE : FALSE;
 	}
-	
-	
+
+
 }
 
 
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index ff03a503..54ee7077 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -14,7 +14,7 @@
  */
 
 if ( ! function_exists('xml_parser_create'))
-{	
+{
 	show_error('Your PHP installation does not support XML');
 }
 
@@ -32,34 +32,34 @@
  */
 class CI_Xmlrpc {
 
-	var $debug			= FALSE; 	// Debugging on or off	
+	var $debug			= FALSE;	// Debugging on or off
 	var $xmlrpcI4		= 'i4';
 	var $xmlrpcInt		= 'int';
 	var $xmlrpcBoolean	= 'boolean';
-	var $xmlrpcDouble	= 'double';	
+	var $xmlrpcDouble	= 'double';
 	var $xmlrpcString	= 'string';
 	var $xmlrpcDateTime	= 'dateTime.iso8601';
 	var $xmlrpcBase64	= 'base64';
 	var $xmlrpcArray	= 'array';
 	var $xmlrpcStruct	= 'struct';
-	
+
 	var $xmlrpcTypes	= array();
 	var $valid_parents	= array();
 	var $xmlrpcerr		= array();	// Response numbers
 	var $xmlrpcstr		= array();  // Response strings
-	
+
 	var $xmlrpc_defencoding = 'UTF-8';
 	var $xmlrpcName			= 'XML-RPC for CodeIgniter';
 	var $xmlrpcVersion		= '1.1';
 	var $xmlrpcerruser		= 800; // Start of user errors
 	var $xmlrpcerrxml		= 100; // Start of XML Parse errors
 	var $xmlrpc_backslash	= ''; // formulate backslashes for escaping regexp
-	
+
 	var $client;
 	var $method;
 	var $data;
 	var $message			= '';
-	var $error				= '';  		// Error string for request
+	var $error				= '';		// Error string for request
 	var $result;
 	var $response			= array();  // Response from remote server
 
@@ -71,22 +71,22 @@ class CI_Xmlrpc {
 
 	function CI_Xmlrpc ($config = array())
 	{
-		$this->xmlrpcName 		= $this->xmlrpcName;
+		$this->xmlrpcName		= $this->xmlrpcName;
 		$this->xmlrpc_backslash = chr(92).chr(92);
-		
+
 		// Types for info sent back and forth
 		$this->xmlrpcTypes = array(
-			$this->xmlrpcI4	   => '1',
-			$this->xmlrpcInt	  => '1',
-			$this->xmlrpcBoolean  => '1',
-			$this->xmlrpcString   => '1',
-			$this->xmlrpcDouble   => '1',
-			$this->xmlrpcDateTime => '1',
-			$this->xmlrpcBase64   => '1',
-			$this->xmlrpcArray	=> '2',
-			$this->xmlrpcStruct   => '3'
+			$this->xmlrpcI4	 		=> '1',
+			$this->xmlrpcInt		=> '1',
+			$this->xmlrpcBoolean	=> '1',
+			$this->xmlrpcString		=> '1',
+			$this->xmlrpcDouble		=> '1',
+			$this->xmlrpcDateTime	=> '1',
+			$this->xmlrpcBase64		=> '1',
+			$this->xmlrpcArray		=> '2',
+			$this->xmlrpcStruct		=> '3'
 			);
-			
+
 		// Array of Valid Parents for Various XML-RPC elements
 		$this->valid_parents = array('BOOLEAN'			=> array('VALUE'),
 									 'I4'				=> array('VALUE'),
@@ -106,8 +106,8 @@ function CI_Xmlrpc ($config = array())
 									 'FAULT'			=> array('METHODRESPONSE'),
 									 'VALUE'			=> array('MEMBER', 'DATA', 'PARAM', 'FAULT')
 									 );
-			
-			
+
+
 		// XML-RPC Responses
 		$this->xmlrpcerr['unknown_method'] = '1';
 		$this->xmlrpcstr['unknown_method'] = 'This is not a known method for this XML-RPC Server';
@@ -121,13 +121,13 @@ function CI_Xmlrpc ($config = array())
 		$this->xmlrpcstr['http_error'] = "Did not receive a '200 OK' response from remote server.";
 		$this->xmlrpcerr['no_data'] = '6';
 		$this->xmlrpcstr['no_data'] ='No data received from server.';
-		
+
 		$this->initialize($config);
-		
+
 		log_message('debug', "XML-RPC Class Initialized");
 	}
-	
-	
+
+
 	//-------------------------------------
 	//  Initialize Prefs
 	//-------------------------------------
@@ -140,13 +140,13 @@ function initialize($config = array())
 			{
 				if (isset($this->$key))
 				{
-					$this->$key = $val;			
+					$this->$key = $val;
 				}
 			}
 		}
 	}
 	// END
-	
+
 	//-------------------------------------
 	//  Take URL and parse it
 	//-------------------------------------
@@ -157,20 +157,20 @@ function server($url, $port=80)
 		{
 			$url = "http://".$url;
 		}
-		
+
 		$parts = parse_url($url);
-		
+
 		$path = ( ! isset($parts['path'])) ? '/' : $parts['path'];
-		
+
 		if (isset($parts['query']) && $parts['query'] != '')
 		{
 			$path .= '?'.$parts['query'];
-		}	
-		
+		}
+
 		$this->client = new XML_RPC_Client($path, $parts['host'], $port);
 	}
 	// END
-	
+
 	//-------------------------------------
 	//  Set Timeout
 	//-------------------------------------
@@ -183,7 +183,7 @@ function timeout($seconds=5)
 		}
 	}
 	// END
-	
+
 	//-------------------------------------
 	//  Set Methods
 	//-------------------------------------
@@ -193,7 +193,7 @@ function method($function)
 		$this->method = $function;
 	}
 	// END
-	
+
 	//-------------------------------------
 	//  Take Array of Data and Create Objects
 	//-------------------------------------
@@ -204,17 +204,17 @@ function request($incoming)
 		{
 			// Send Error
 		}
-		
+
 		$this->data = array();
-		
+
 		foreach($incoming as $key => $value)
 		{
 			$this->data[$key] = $this->values_parsing($value);
 		}
 	}
 	// END
-	
-	
+
+
 	//-------------------------------------
 	//  Set Debug
 	//-------------------------------------
@@ -223,7 +223,7 @@ function set_debug($flag = TRUE)
 	{
 		$this->debug = ($flag == TRUE) ? TRUE : FALSE;
 	}
-	
+
 	//-------------------------------------
 	//  Values Parsing
 	//-------------------------------------
@@ -249,7 +249,7 @@ function values_parsing($value, $return = FALSE)
 				{
 					$value['0'][$k] = $this->values_parsing($value['0'][$k], TRUE);
 				}
-				
+
 				$temp = new XML_RPC_Values($value['0'], $value['1']);
 			}
 			else
@@ -275,7 +275,7 @@ function send_request()
 	{
 		$this->message = new XML_RPC_Message($this->method,$this->data);
 		$this->message->debug = $this->debug;
-	
+
 		if ( ! $this->result = $this->client->send($this->message))
 		{
 			$this->error = $this->result->errstr;
@@ -286,13 +286,13 @@ function send_request()
 			$this->error = $this->result->errstr;
 			return FALSE;
 		}
-		
+
 		$this->response = $this->result->decode();
-		
+
 		return TRUE;
 	}
 	// END
-	
+
 	//-------------------------------------
 	//  Returns Error
 	//-------------------------------------
@@ -302,7 +302,7 @@ function display_error()
 		return $this->error;
 	}
 	// END
-	
+
 	//-------------------------------------
 	//  Returns Remote Server Response
 	//-------------------------------------
@@ -312,37 +312,37 @@ function display_response()
 		return $this->response;
 	}
 	// END
-	
+
 	//-------------------------------------
 	//  Sends an Error Message for Server Request
 	//-------------------------------------
-	
+
 	function send_error_message($number, $message)
 	{
 		return new XML_RPC_Response('0',$number, $message);
 	}
 	// END
-	
-	
+
+
 	//-------------------------------------
 	//  Send Response for Server Request
 	//-------------------------------------
-	
+
 	function send_response($response)
 	{
 		// $response should be array of values, which will be parsed
 		// based on their data and type into a valid group of XML-RPC values
-		
+
 		$response = $this->values_parsing($response);
-	
+
 		return new XML_RPC_Response($response);
 	}
 	// END
-	
+
 } // END XML_RPC Class
 
-	
-	
+
+
 /**
  * XML-RPC Client class
  *
@@ -363,12 +363,12 @@ class XML_RPC_Client extends CI_Xmlrpc
 	function XML_RPC_Client($path, $server, $port=80)
 	{
 		parent::CI_Xmlrpc();
-		
+
 		$this->port = $port;
 		$this->server = $server;
 		$this->path = $path;
 	}
-	
+
 	function send($msg)
 	{
 		if (is_array($msg))
@@ -382,22 +382,22 @@ function send($msg)
 	}
 
 	function sendPayload($msg)
-	{	
+	{
 		$fp = @fsockopen($this->server, $this->port,$this->errno, $this->errstr, $this->timeout);
-		
+
 		if ( ! is_resource($fp))
 		{
 			error_log($this->xmlrpcstr['http_error']);
 			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'],$this->xmlrpcstr['http_error']);
 			return $r;
 		}
-		
+
 		if(empty($msg->payload))
 		{
 			// $msg = XML_RPC_Messages
 			$msg->createPayload();
 		}
-		
+
 		$r = "\r\n";
 		$op  = "POST {$this->path} HTTP/1.0$r";
 		$op .= "Host: {$this->server}$r";
@@ -405,7 +405,7 @@ function sendPayload($msg)
 		$op .= "User-Agent: {$this->xmlrpcName}$r";
 		$op .= "Content-Length: ".strlen($msg->payload). "$r$r";
 		$op .= $msg->payload;
-		
+
 
 		if ( ! fputs($fp, $op, strlen($op)))
 		{
@@ -437,7 +437,7 @@ class XML_RPC_Response
 	var $xss_clean = TRUE;
 
 	function XML_RPC_Response($val, $code = 0, $fstr = '')
-	{	
+	{
 		if ($code != 0)
 		{
 			// error
@@ -470,7 +470,7 @@ function value()
 	{
 		return $this->val;
 	}
-	
+
 	function prepare_response()
 	{
 		$result = "\n";
@@ -500,7 +500,7 @@ function prepare_response()
 		$result .= "\n";
 		return $result;
 	}
-	
+
 	function decode($array=FALSE)
 	{
 		$CI =& get_instance();
@@ -523,13 +523,13 @@ function decode($array=FALSE)
 					$array[$key] = ($this->xss_clean) ? $CI->security->xss_clean($array[$key]) : $array[$key];
 				}
 			}
-			
+
 			$result = $array;
 		}
 		else
 		{
 			$result = $this->xmlrpc_decoder($this->val);
-			
+
 			if (is_array($result))
 			{
 				$result = $this->decode($result);
@@ -539,12 +539,12 @@ function decode($array=FALSE)
 				$result = ($this->xss_clean) ? $CI->security->xss_clean($result) : $result;
 			}
 		}
-		
+
 		return $result;
 	}
 
-	
-	
+
+
 	//-------------------------------------
 	//  XML-RPC Object to PHP Types
 	//-------------------------------------
@@ -562,7 +562,7 @@ function xmlrpc_decoder($xmlrpc_val)
 			reset($xmlrpc_val->me);
 			list($a,$b) = each($xmlrpc_val->me);
 			$size = count($b);
-			
+
 			$arr = array();
 
 			for($i = 0; $i < $size; $i++)
@@ -583,8 +583,8 @@ function xmlrpc_decoder($xmlrpc_val)
 			return $arr;
 		}
 	}
-	
-	
+
+
 	//-------------------------------------
 	//  ISO-8601 time to server or UTC time
 	//-------------------------------------
@@ -602,7 +602,7 @@ function iso8601_decode($time, $utc=0)
 		}
 		return $t;
 	}
-	
+
 } // End Response Class
 
 
@@ -619,12 +619,12 @@ class XML_RPC_Message extends CI_Xmlrpc
 	var $payload;
 	var $method_name;
 	var $params			= array();
-	var $xh 			= array();
+	var $xh				= array();
 
 	function XML_RPC_Message($method, $pars=0)
 	{
 		parent::CI_Xmlrpc();
-		
+
 		$this->method_name = $method;
 		if (is_array($pars) && count($pars) > 0)
 		{
@@ -635,51 +635,51 @@ function XML_RPC_Message($method, $pars=0)
 			}
 		}
 	}
-	
+
 	//-------------------------------------
 	//  Create Payload to Send
 	//-------------------------------------
-	
+
 	function createPayload()
 	{
 		$this->payload = "\r\n\r\n";
 		$this->payload .= '' . $this->method_name . "\r\n";
 		$this->payload .= "\r\n";
-		
+
 		for($i=0; $iparams); $i++)
 		{
 			// $p = XML_RPC_Values
 			$p = $this->params[$i];
 			$this->payload .= "\r\n".$p->serialize_class()."\r\n";
 		}
-		
+
 		$this->payload .= "\r\n\r\n";
 	}
-	
+
 	//-------------------------------------
 	//  Parse External XML-RPC Server's Response
 	//-------------------------------------
-	
+
 	function parseResponse($fp)
 	{
 		$data = '';
-		
+
 		while($datum = fread($fp, 4096))
 		{
 			$data .= $datum;
 		}
-		
+
 		//-------------------------------------
 		//  DISPLAY HTTP CONTENT for DEBUGGING
 		//-------------------------------------
-		
+
 		if ($this->debug === TRUE)
 		{
 			echo "
      ";
 			echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
 			echo "
      ";
 		}
-		
+
 		//-------------------------------------
 		//  Check for data
 		//-------------------------------------
@@ -690,32 +690,32 @@ function parseResponse($fp)
 			$r = new XML_RPC_Response(0, $this->xmlrpcerr['no_data'], $this->xmlrpcstr['no_data']);
 			return $r;
 		}
-		
-		
+
+
 		//-------------------------------------
 		//  Check for HTTP 200 Response
 		//-------------------------------------
-		
+
 		if (strncmp($data, 'HTTP', 4) == 0 && ! preg_match('/^HTTP\/[0-9\.]+ 200 /', $data))
 		{
 			$errstr= substr($data, 0, strpos($data, "\n")-1);
 			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error']. ' (' . $errstr . ')');
 			return $r;
 		}
-		
+
 		//-------------------------------------
 		//  Create and Set Up XML Parser
 		//-------------------------------------
-	
+
 		$parser = xml_parser_create($this->xmlrpc_defencoding);
 
-		$this->xh[$parser]				 = array();
-		$this->xh[$parser]['isf']		 = 0;
-		$this->xh[$parser]['ac']		 = '';
-		$this->xh[$parser]['headers'] 	 = array();
-		$this->xh[$parser]['stack']		 = array();
-		$this->xh[$parser]['valuestack'] = array();
-		$this->xh[$parser]['isf_reason'] = 0;
+		$this->xh[$parser]					= array();
+		$this->xh[$parser]['isf']			= 0;
+		$this->xh[$parser]['ac']			= '';
+		$this->xh[$parser]['headers']		= array();
+		$this->xh[$parser]['stack']			= array();
+		$this->xh[$parser]['valuestack']	= array();
+		$this->xh[$parser]['isf_reason']	= 0;
 
 		xml_set_object($parser, $this);
 		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
@@ -727,7 +727,7 @@ function parseResponse($fp)
 		//-------------------------------------
 		//  GET HEADERS
 		//-------------------------------------
-		
+
 		$lines = explode("\r\n", $data);
 		while (($line = array_shift($lines)))
 		{
@@ -738,11 +738,11 @@ function parseResponse($fp)
 			$this->xh[$parser]['headers'][] = $line;
 		}
 		$data = implode("\r\n", $lines);
-		
-		
+
+
 		//-------------------------------------
 		//  PARSE XML DATA
-		//-------------------------------------  	
+		//-------------------------------------
 
 		if ( ! xml_parse($parser, $data, count($data)))
 		{
@@ -755,11 +755,11 @@ function parseResponse($fp)
 			return $r;
 		}
 		xml_parser_free($parser);
-		
+
 		// ---------------------------------------
 		//  Got Ourselves Some Badness, It Seems
 		// ---------------------------------------
-		
+
 		if ($this->xh[$parser]['isf'] > 1)
 		{
 			if ($this->debug === TRUE)
@@ -768,7 +768,7 @@ function parseResponse($fp)
 				echo $this->xh[$parser]['isf_reason'];
 				echo "---Invalid Return---\n\n";
 			}
-				
+
 			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
 			return $r;
 		}
@@ -777,15 +777,15 @@ function parseResponse($fp)
 			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
 			return $r;
 		}
-		
+
 		//-------------------------------------
 		//  DISPLAY XML CONTENT for DEBUGGING
-		//-------------------------------------  	
-		
+		//-------------------------------------
+
 		if ($this->debug === TRUE)
 		{
 			echo "
      ";
-			
+
 			if (count($this->xh[$parser]['headers'] > 0))
 			{
 				echo "---HEADERS---\n";
@@ -795,20 +795,20 @@ function parseResponse($fp)
 				}
 				echo "---END HEADERS---\n\n";
 			}
-			
+
 			echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
-			
+
 			echo "---PARSED---\n" ;
 			var_dump($this->xh[$parser]['value']);
 			echo "\n---END PARSED---
      ";
 		}
-		
+
 		//-------------------------------------
 		//  SEND RESPONSE
 		//-------------------------------------
-		
+
 		$v = $this->xh[$parser]['value'];
-			
+
 		if ($this->xh[$parser]['isf'])
 		{
 			$errno_v = $v->me['struct']['faultCode'];
@@ -831,11 +831,11 @@ function parseResponse($fp)
 		$r->headers = $this->xh[$parser]['headers'];
 		return $r;
 	}
-	
+
 	// ------------------------------------
 	//  Begin Return Message Parsing section
 	// ------------------------------------
-	
+
 	// quick explanation of components:
 	//   ac - used to accumulate values
 	//   isf - used to indicate a fault
@@ -854,9 +854,9 @@ function open_tag($the_parser, $name, $attrs)
 	{
 		// If invalid nesting, then return
 		if ($this->xh[$the_parser]['isf'] > 1) return;
-		
+
 		// Evaluate and check for correct nesting of XML elements
-		
+
 		if (count($this->xh[$the_parser]['stack']) == 0)
 		{
 			if ($name != 'METHODRESPONSE' && $name != 'METHODCALL')
@@ -876,16 +876,16 @@ function open_tag($the_parser, $name, $attrs)
 				return;
 			}
 		}
-		
+
 		switch($name)
 		{
 			case 'STRUCT':
 			case 'ARRAY':
 				// Creates array for child elements
-				
+
 				$cur_val = array('value' => array(),
 								 'type'	 => $name);
-								
+
 				array_unshift($this->xh[$the_parser]['valuestack'], $cur_val);
 			break;
 			case 'METHODNAME':
@@ -917,13 +917,13 @@ function open_tag($the_parser, $name, $attrs)
 					$this->xh[$the_parser]['isf_reason'] = "'Twas a $name element following a ".$this->xh[$the_parser]['vt']." element inside a single value";
 					return;
 				}
-				
+
 				$this->xh[$the_parser]['ac'] = '';
 			break;
 			case 'MEMBER':
 				// Set name of  to nothing to prevent errors later if no  is found
 				$this->xh[$the_parser]['valuestack'][0]['name'] = '';
-				
+
 				// Set NULL value to check to see if value passed for this param/member
 				$this->xh[$the_parser]['value'] = null;
 			break;
@@ -939,7 +939,7 @@ function open_tag($the_parser, $name, $attrs)
 				$this->xh[$the_parser]['isf_reason'] = "Invalid XML-RPC element found: $name";
 			break;
 		}
-		
+
 		// Add current element name to stack, to allow validation of nesting
 		array_unshift($this->xh[$the_parser]['stack'], $name);
 
@@ -955,14 +955,14 @@ function open_tag($the_parser, $name, $attrs)
 	function closing_tag($the_parser, $name)
 	{
 		if ($this->xh[$the_parser]['isf'] > 1) return;
-		
+
 		// Remove current element from stack and set variable
 		// NOTE: If the XML validates, then we do not have to worry about
 		// the opening and closing of elements.  Nesting is checked on the opening
 		// tag so we be safe there as well.
-		
+
 		$curr_elem = array_shift($this->xh[$the_parser]['stack']);
-	
+
 		switch($name)
 		{
 			case 'STRUCT':
@@ -982,7 +982,7 @@ function closing_tag($the_parser, $name)
 			case 'DATETIME.ISO8601':
 			case 'BASE64':
 				$this->xh[$the_parser]['vt'] = strtolower($name);
-				
+
 				if ($name == 'STRING')
 				{
 					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
@@ -1044,10 +1044,10 @@ function closing_tag($the_parser, $name)
 					$this->xh[$the_parser]['value']	= $this->xh[$the_parser]['ac'];
 					$this->xh[$the_parser]['vt']	= $this->xmlrpcString;
 				}
-				
+
 				// build the XML-RPC value out of the data received, and substitute it
 				$temp = new XML_RPC_Values($this->xh[$the_parser]['value'], $this->xh[$the_parser]['vt']);
-				
+
 				if (count($this->xh[$the_parser]['valuestack']) && $this->xh[$the_parser]['valuestack'][0]['type'] == 'ARRAY')
 				{
 					// Array
@@ -1061,7 +1061,7 @@ function closing_tag($the_parser, $name)
 			break;
 			case 'MEMBER':
 				$this->xh[$the_parser]['ac']='';
-				
+
 				// If value add to array in the stack for the last element built
 				if ($this->xh[$the_parser]['value'])
 				{
@@ -1099,7 +1099,7 @@ function closing_tag($the_parser, $name)
 	function character_data($the_parser, $data)
 	{
 		if ($this->xh[$the_parser]['isf'] > 1) return; // XML Fault found already
-		
+
 		// If a value has not been found
 		if ($this->xh[$the_parser]['lv'] != 3)
 		{
@@ -1107,28 +1107,28 @@ function character_data($the_parser, $data)
 			{
 				$this->xh[$the_parser]['lv'] = 2; // Found a value
 			}
-				
+
 			if( ! @isset($this->xh[$the_parser]['ac']))
 			{
 				$this->xh[$the_parser]['ac'] = '';
 			}
-				
+
 			$this->xh[$the_parser]['ac'] .= $data;
 		}
 	}
-	
-	
+
+
 	function addParam($par) { $this->params[]=$par; }
-	
+
 	function output_parameters($array=FALSE)
 	{
-		$CI =& get_instance();	
+		$CI =& get_instance();
 
 		if ($this->xss_clean && ! isset($CI->security))
 		{
 			$CI->load->library('security');
 		}
-		
+
 		if ($array !== FALSE && is_array($array))
 		{
 			while (list($key) = each($array))
@@ -1144,17 +1144,17 @@ function output_parameters($array=FALSE)
 					$array[$key] = ($key == 'bits' OR $this->xss_clean == FALSE) ? $array[$key] : $CI->security->xss_clean($array[$key]);
 				}
 			}
-			
+
 			$parameters = $array;
 		}
 		else
 		{
 			$parameters = array();
-		
+
 			for ($i = 0; $i < count($this->params); $i++)
 			{
 				$a_param = $this->decode_message($this->params[$i]);
-				
+
 				if (is_array($a_param))
 				{
 					$parameters[] = $this->output_parameters($a_param);
@@ -1163,13 +1163,13 @@ function output_parameters($array=FALSE)
 				{
 					$parameters[] = ($this->xss_clean) ? $CI->security->xss_clean($a_param) : $a_param;
 				}
-			}	
+			}
 		}
-		
+
 		return $parameters;
 	}
-	
-	
+
+
 	function decode_message($param)
 	{
 		$kind = $param->kindOf();
@@ -1182,31 +1182,31 @@ function decode_message($param)
 		{
 			reset($param->me);
 			list($a,$b) = each($param->me);
-			
+
 			$arr = array();
 
 			for($i = 0; $i < count($b); $i++)
 			{
 				$arr[] = $this->decode_message($param->me['array'][$i]);
 			}
-			
+
 			return $arr;
 		}
 		elseif($kind == 'struct')
 		{
 			reset($param->me['struct']);
-			
+
 			$arr = array();
 
 			while(list($key,$value) = each($param->me['struct']))
 			{
 				$arr[$key] = $this->decode_message($value);
 			}
-			
+
 			return $arr;
 		}
 	}
-	
+
 } // End XML_RPC_Messages class
 
 
@@ -1220,17 +1220,17 @@ function decode_message($param)
  */
 class XML_RPC_Values extends CI_Xmlrpc
 {
-	var $me 	= array();
+	var $me		= array();
 	var $mytype	= 0;
 
 	function XML_RPC_Values($val=-1, $type='')
-	{	
+	{
 		parent::CI_Xmlrpc();
-		
+
 		if ($val != -1 OR $type != '')
 		{
 			$type = $type == '' ? 'string' : $type;
-			
+
 			if ($this->xmlrpcTypes[$type] == 1)
 			{
 				$this->addScalar($val,$type);
@@ -1249,13 +1249,13 @@ function XML_RPC_Values($val=-1, $type='')
 	function addScalar($val, $type='string')
 	{
 		$typeof = $this->xmlrpcTypes[$type];
-		
+
 		if ($this->mytype==1)
 		{
 			echo 'XML_RPC_Values: scalar can have only one value
      ';
 			return 0;
 		}
-		
+
 		if ($typeof != 1)
 		{
 			echo 'XML_RPC_Values: not a scalar type (${typeof})
      ';
@@ -1392,12 +1392,12 @@ function serializeval($o)
 	{
 		$ar = $o->me;
 		reset($ar);
-		
+
 		list($typ, $val) = each($ar);
 		$rs = "\n".$this->serializedata($typ, $val)."\n";
 		return $rs;
 	}
-	
+
 	function scalarval()
 	{
 		reset($this->me);
@@ -1409,11 +1409,11 @@ function scalarval()
 	//-------------------------------------
 	// Encode time in ISO-8601 form.
 	//-------------------------------------
-	
+
 	// Useful for sending time in XML-RPC
 
 	function iso8601_encode($time, $utc=0)
-	{	
+	{
 		if ($utc == 1)
 		{
 			$t = strftime("%Y%m%dT%H:%M:%S", $time);
@@ -1427,7 +1427,7 @@ function iso8601_encode($time, $utc=0)
 		}
 		return $t;
 	}
-	
+
 }
 // END XML_RPC_Values Class
 
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
index c1fe649f..56fd655d 100644
--- a/system/libraries/Xmlrpcs.php
+++ b/system/libraries/Xmlrpcs.php
@@ -14,7 +14,7 @@
  */
 
 if ( ! function_exists('xml_parser_create'))
-{	
+{
 	show_error('Your PHP installation does not support XML');
 }
 
@@ -36,11 +36,11 @@
  */
 class CI_Xmlrpcs extends CI_Xmlrpc
 {
-	var $methods		= array(); 	//array of methods mapped to function names and signatures
+	var $methods		= array();	//array of methods mapped to function names and signatures
 	var $debug_msg		= '';		// Debug Message
-	var $system_methods = array(); // XML RPC Server methods
+	var $system_methods = array();	// XML RPC Server methods
 	var $controller_obj;
-	
+
 	var $object			= FALSE;
 
 
@@ -49,49 +49,49 @@ class CI_Xmlrpcs extends CI_Xmlrpc
 	//-------------------------------------
 
 	function CI_Xmlrpcs($config=array())
-	{	
+	{
 		parent::CI_Xmlrpc();
 		$this->set_system_methods();
-	
+
 		if (isset($config['functions']) && is_array($config['functions']))
 		{
 			$this->methods = array_merge($this->methods, $config['functions']);
 		}
-		
+
 		log_message('debug', "XML-RPC Server Class Initialized");
 	}
-	
+
 	//-------------------------------------
 	//  Initialize Prefs and Serve
 	//-------------------------------------
-	
+
 	function initialize($config=array())
-	{	
+	{
 		if (isset($config['functions']) && is_array($config['functions']))
 		{
 			$this->methods = array_merge($this->methods, $config['functions']);
 		}
-		
+
 		if (isset($config['debug']))
 		{
 			$this->debug = $config['debug'];
 		}
-		
+
 		if (isset($config['object']) && is_object($config['object']))
 		{
 			$this->object = $config['object'];
 		}
-		
+
 		if (isset($config['xss_clean']))
 		{
 			$this->xss_clean = $config['xss_clean'];
 		}
 	}
-	
+
 	//-------------------------------------
 	//  Setting of System Methods
 	//-------------------------------------
-	
+
 	function set_system_methods ()
 	{
 		$this->methods = array(
@@ -118,14 +118,14 @@ function set_system_methods ()
 	//-------------------------------------
 	//  Main Server Function
 	//-------------------------------------
-	
+
 	function serve()
 	{
 		$r = $this->parseRequest();
 		$payload  = 'xmlrpc_defencoding.'"?'.'>'."\n";
 		$payload .= $this->debug_msg;
 		$payload .= $r->prepare_response();
-		
+
 		header("Content-Type: text/xml");
 		header("Content-Length: ".strlen($payload));
 		exit($payload);
@@ -134,7 +134,7 @@ function serve()
 	//-------------------------------------
 	//  Add Method to Class
 	//-------------------------------------
-	
+
 	function add_to_map($methodname,$function,$sig,$doc)
 	{
 		$this->methods[$methodname] = array(
@@ -148,11 +148,11 @@ function add_to_map($methodname,$function,$sig,$doc)
 	//-------------------------------------
 	//  Parse Server Request
 	//-------------------------------------
-	
+
 	function parseRequest($data='')
 	{
 		global $HTTP_RAW_POST_DATA;
-		
+
 		//-------------------------------------
 		//  Get Data
 		//-------------------------------------
@@ -165,10 +165,10 @@ function parseRequest($data='')
 		//-------------------------------------
 		//  Set up XML Parser
 		//-------------------------------------
-		
+
 		$parser = xml_parser_create($this->xmlrpc_defencoding);
 		$parser_object = new XML_RPC_Message("filler");
-		
+
 		$parser_object->xh[$parser]					= array();
 		$parser_object->xh[$parser]['isf']			= 0;
 		$parser_object->xh[$parser]['isf_reason']	= '';
@@ -182,12 +182,12 @@ function parseRequest($data='')
 		xml_set_element_handler($parser, 'open_tag', 'closing_tag');
 		xml_set_character_data_handler($parser, 'character_data');
 		//xml_set_default_handler($parser, 'default_handler');
-		
-		
+
+
 		//-------------------------------------
 		//  PARSE + PROCESS XML DATA
-		//-------------------------------------  	
-		
+		//-------------------------------------
+
 		if ( ! xml_parse($parser, $data, 1))
 		{
 			// return XML error as a faultCode
@@ -205,53 +205,53 @@ function parseRequest($data='')
 		else
 		{
 			xml_parser_free($parser);
-			
+
 			$m = new XML_RPC_Message($parser_object->xh[$parser]['method']);
 			$plist='';
-			
+
 			for($i=0; $i < count($parser_object->xh[$parser]['params']); $i++)
 			{
 				if ($this->debug === TRUE)
 				{
 					$plist .= "$i - " .  print_r(get_object_vars($parser_object->xh[$parser]['params'][$i]), TRUE). ";\n";
 				}
-				
+
 				$m->addParam($parser_object->xh[$parser]['params'][$i]);
 			}
-			
+
 			if ($this->debug === TRUE)
 			{
 				echo "
      ";
 				echo "---PLIST---\n" . $plist . "\n---PLIST END---\n\n";
 				echo "
      ";
 			}
-			
+
 			$r = $this->_execute($m);
 		}
-		
+
 		//-------------------------------------
 		//  SET DEBUGGING MESSAGE
-		//-------------------------------------  	
-		
+		//-------------------------------------
+
 		if ($this->debug === TRUE)
 		{
 			$this->debug_msg = "\n";
 		}
-		
+
 		return $r;
 	}
 
 	//-------------------------------------
 	//  Executes the Method
 	//-------------------------------------
-	
+
 	function _execute($m)
 	{
 		$methName = $m->method_name;
-		
+
 		// Check to see if it is a system call
 		$system_call = (strncmp($methName, 'system', 5) == 0) ? TRUE : FALSE;
-		
+
 		if ($this->xss_clean == FALSE)
 		{
 			$m->xss_clean = FALSE;
@@ -260,19 +260,19 @@ function _execute($m)
 		//-------------------------------------
 		//  Valid Method
 		//-------------------------------------
-		
+
 		if ( ! isset($this->methods[$methName]['function']))
 		{
 			return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']);
 		}
-		
+
 		//-------------------------------------
 		//  Check for Method (and Object)
 		//-------------------------------------
-			
+
 		$method_parts = explode(".", $this->methods[$methName]['function']);
 		$objectCall = (isset($method_parts['1']) && $method_parts['1'] != "") ? TRUE : FALSE;
-		
+
 		if ($system_call === TRUE)
 		{
 			if ( ! is_callable(array($this,$method_parts['1'])))
@@ -291,30 +291,30 @@ function _execute($m)
 				return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']);
 			}
 		}
-		
+
 		//-------------------------------------
 		//  Checking Methods Signature
 		//-------------------------------------
-		
+
 		if (isset($this->methods[$methName]['signature']))
 		{
 			$sig = $this->methods[$methName]['signature'];
 			for($i=0; $iparams)+1)
 				{
 					for($n=0; $n < count($m->params); $n++)
 					{
 						$p = $m->params[$n];
 						$pt = ($p->kindOf() == 'scalar') ? $p->scalarval() : $p->kindOf();
-						
+
 						if ($pt != $current_sig[$n+1])
 						{
 							$pno = $n+1;
 							$wanted = $current_sig[$n+1];
-							
+
 							return new XML_RPC_Response(0,
 								$this->xmlrpcerr['incorrect_params'],
 								$this->xmlrpcstr['incorrect_params'] .
@@ -354,22 +354,22 @@ function _execute($m)
 			return call_user_func($this->methods[$methName]['function'], $m);
 		}
 	}
-	
-	
+
+
 	//-------------------------------------
 	//  Server Function:  List Methods
 	//-------------------------------------
-	
+
 	function listMethods($m)
 	{
 		$v = new XML_RPC_Values();
 		$output = array();
-		
+
 		foreach($this->methods as $key => $value)
 		{
 			$output[] = new XML_RPC_Values($key, 'string');
 		}
-		
+
 		foreach($this->system_methods as $key => $value)
 		{
 			$output[]= new XML_RPC_Values($key, 'string');
@@ -378,23 +378,23 @@ function listMethods($m)
 		$v->addArray($output);
 		return new XML_RPC_Response($v);
 	}
-	
+
 	//-------------------------------------
 	//  Server Function:  Return Signature for Method
 	//-------------------------------------
-		
+
 	function methodSignature($m)
 	{
 		$parameters = $m->output_parameters();
 		$method_name = $parameters[0];
-		
+
 		if (isset($this->methods[$method_name]))
 		{
 			if ($this->methods[$method_name]['signature'])
 			{
 				$sigs = array();
 				$signature = $this->methods[$method_name]['signature'];
-				
+
 				for($i=0; $i < count($signature); $i++)
 				{
 					$cursig = array();
@@ -418,20 +418,20 @@ function methodSignature($m)
 		}
 		return $r;
 	}
-	
+
 	//-------------------------------------
 	//  Server Function:  Doc String for Method
 	//-------------------------------------
-	
+
 	function methodHelp($m)
 	{
 		$parameters = $m->output_parameters();
 		$method_name = $parameters[0];
-	
+
 		if (isset($this->methods[$method_name]))
 		{
 			$docstring = isset($this->methods[$method_name]['docstring']) ? $this->methods[$method_name]['docstring'] : '';
-			
+
 			return new XML_RPC_Response(new XML_RPC_Values($docstring, 'string'));
 		}
 		else
@@ -448,7 +448,7 @@ function multicall($m)
 	{
 		// Disabled
 		return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']);
-		
+
 		$parameters = $m->output_parameters();
 		$calls = $parameters[0];
 
@@ -457,15 +457,15 @@ function multicall($m)
 		foreach ($calls as $value)
 		{
 			//$attempt = $this->_execute(new XML_RPC_Message($value[0], $value[1]));
-			
+
 			$m = new XML_RPC_Message($value[0]);
 			$plist='';
-			
+
 			for($i=0; $i < count($value[1]); $i++)
 			{
 				$m->addParam(new XML_RPC_Values($value[1][$i], 'string'));
 			}
-			
+
 			$attempt = $this->_execute($m);
 
 			if ($attempt->faultCode() != 0)
@@ -478,8 +478,8 @@ function multicall($m)
 
 		return new XML_RPC_Response(new XML_RPC_Values($result, 'array'));
 	}
-	
-	
+
+
 	//-------------------------------------
 	//  Multi-call Function:  Error Handling
 	//-------------------------------------
@@ -488,28 +488,28 @@ function multicall_error($err)
 	{
 		$str  = is_string($err) ? $this->xmlrpcstr["multicall_${err}"] : $err->faultString();
 		$code = is_string($err) ? $this->xmlrpcerr["multicall_${err}"] : $err->faultCode();
-		
+
 		$struct['faultCode'] = new XML_RPC_Values($code, 'int');
 		$struct['faultString'] = new XML_RPC_Values($str, 'string');
-	
+
 		return new XML_RPC_Values($struct, 'struct');
 	}
-	
-	
+
+
 	//-------------------------------------
 	//  Multi-call Function:  Processes method
 	//-------------------------------------
-	
+
 	function do_multicall($call)
 	{
 		if ($call->kindOf() != 'struct')
 			return $this->multicall_error('notstruct');
 		elseif ( ! $methName = $call->me['struct']['methodName'])
 			return $this->multicall_error('nomethod');
-		
+
 		list($scalar_type,$scalar_value)=each($methName->me);
 		$scalar_type = $scalar_type == $this->xmlrpcI4 ? $this->xmlrpcInt : $scalar_type;
-			
+
 		if ($methName->kindOf() != 'scalar' OR $scalar_type != 'string')
 			return $this->multicall_error('notstring');
 		elseif ($scalar_value == 'system.multicall')
@@ -518,7 +518,7 @@ function do_multicall($call)
 			return $this->multicall_error('noparams');
 		elseif ($params->kindOf() != 'array')
 			return $this->multicall_error('notarray');
-			
+
 		list($a,$b)=each($params->me);
 		$numParams = count($b);
 
@@ -536,8 +536,8 @@ function do_multicall($call)
 		}
 
 		return new XML_RPC_Values(array($result->value()), 'array');
-	}	
-	
+	}
+
 }
 // END XML_RPC_Server class
 
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 92dfc814..da3e5eb6 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -32,17 +32,17 @@
  */
 class CI_Zip  {
 
-	var $zipdata 	= '';
-	var $directory 	= '';
-	var $entries 	= 0;
-	var $file_num 	= 0;
+	var $zipdata	= '';
+	var $directory	= '';
+	var $entries	= 0;
+	var $file_num	= 0;
 	var $offset		= 0;
 	var $now;
 
 	function CI_Zip()
 	{
 		log_message('debug', "Zip Compression Class Initialized");
-		
+
 		$this->now = time();
 	}
 
@@ -72,24 +72,24 @@ function add_dir($directory)
 		}
 	}
 
-	// --------------------------------------------------------------------	
+	// --------------------------------------------------------------------
 
 	/**
 	 *	Get file/directory modification time
-	 *	
+	 *
 	 *	If this is a newly created file/dir, we will set the time to 'now'
 	 *
 	 *	@param string	path to file
-	 *	@return array 	filemtime/filemdate
+	 *	@return array	filemtime/filemdate
 	 */
 	function _get_mod_time($dir)
 	{
 		// filemtime() will return false, but it does raise an error.
-		$date = (@filemtime($dir)) ? filemtime($dir) : getdate($this->now); 
+		$date = (@filemtime($dir)) ? filemtime($dir) : getdate($this->now);
 
 		$time['file_mtime'] = ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2;
 		$time['file_mdate'] = (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday'];
-		
+
 		return $time;
 	}
 
@@ -103,7 +103,7 @@ function _get_mod_time($dir)
 	 * @return	void
 	 */
 	function _add_dir($dir, $file_mtime, $file_mdate)
-	{		
+	{
 		$dir = str_replace("\\", "/", $dir);
 
 		$this->zipdata .=
@@ -140,7 +140,7 @@ function _add_dir($dir, $file_mtime, $file_mdate)
 		$this->offset = strlen($this->zipdata);
 		$this->entries++;
 	}
-	
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -154,14 +154,14 @@ function _add_dir($dir, $file_mtime, $file_mdate)
 	 * @param	mixed
 	 * @param	string
 	 * @return	void
-	 */	
+	 */
 	function add_data($filepath, $data = NULL)
-	{	
+	{
 		if (is_array($filepath))
 		{
 			foreach ($filepath as $path => $data)
 			{
-				$file_data = $this->_get_mod_time($path);	
+				$file_data = $this->_get_mod_time($path);
 
 				$this->_add_data($path, $data, $file_data['file_mtime'], $file_data['file_mdate']);
 			}
@@ -169,7 +169,7 @@ function add_data($filepath, $data = NULL)
 		else
 		{
 			$file_data = $this->_get_mod_time($filepath);
-			
+
 			$this->_add_data($filepath, $data, $file_data['file_mtime'], $file_data['file_mdate']);
 		}
 	}
@@ -183,7 +183,7 @@ function add_data($filepath, $data = NULL)
 	 * @param	string	the file name/path
 	 * @param	string	the data to be encoded
 	 * @return	void
-	 */	
+	 */
 	function _add_data($filepath, $data, $file_mtime, $file_mdate)
 	{
 		$filepath = str_replace("\\", "/", $filepath);
@@ -227,7 +227,7 @@ function _add_data($filepath, $data, $file_mtime, $file_mdate)
 		$this->entries++;
 		$this->file_num++;
 	}
-	
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -235,7 +235,7 @@ function _add_data($filepath, $data, $file_mtime, $file_mdate)
 	 *
 	 * @access	public
 	 * @return	bool
-	 */	
+	 */
 	function read_file($path, $preserve_filepath = FALSE)
 	{
 		if ( ! file_exists($path))
@@ -246,7 +246,7 @@ function read_file($path, $preserve_filepath = FALSE)
 		if (FALSE !== ($data = file_get_contents($path)))
 		{
 			$name = str_replace("\\", "/", $path);
-			
+
 			if ($preserve_filepath === FALSE)
 			{
 				$name = preg_replace("|.*/(.+)|", "\\1", $name);
@@ -259,7 +259,7 @@ function read_file($path, $preserve_filepath = FALSE)
 	}
 
 	// ------------------------------------------------------------------------
-	
+
 	/**
 	 * Read a directory and add it to the zip.
 	 *
@@ -321,7 +321,7 @@ function read_dir($path, $preserve_filepath = TRUE, $root_path = NULL)
 	 *
 	 * @access	public
 	 * @return	binary string
-	 */	
+	 */
 	function get_zip()
 	{
 		// Is there any data to return?
@@ -340,7 +340,7 @@ function get_zip()
 
 		return $zip_data;
 	}
-	
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -351,7 +351,7 @@ function get_zip()
 	 * @access	public
 	 * @param	string	the file name
 	 * @return	bool
-	 */	
+	 */
 	function archive($filepath)
 	{
 		if ( ! ($fp = @fopen($filepath, FOPEN_WRITE_CREATE_DESTRUCTIVE)))
@@ -359,12 +359,12 @@ function archive($filepath)
 			return FALSE;
 		}
 
-		flock($fp, LOCK_EX);	
+		flock($fp, LOCK_EX);
 		fwrite($fp, $this->get_zip());
 		flock($fp, LOCK_UN);
 		fclose($fp);
 
-		return TRUE;	
+		return TRUE;
 	}
 
 	// --------------------------------------------------------------------
@@ -404,7 +404,7 @@ function download($filename = 'backup.zip')
 	 *
 	 * @access	public
 	 * @return	void
-	 */		
+	 */
 	function clear_data()
 	{
 		$this->zipdata		= '';
@@ -413,7 +413,7 @@ function clear_data()
 		$this->file_num		= 0;
 		$this->offset		= 0;
 	}
-	
+
 }
 
 /* End of file Zip.php */
diff --git a/system/libraries/javascript/Jquery.php b/system/libraries/javascript/Jquery.php
index f6b8dce6..db80c142 100644
--- a/system/libraries/javascript/Jquery.php
+++ b/system/libraries/javascript/Jquery.php
@@ -173,7 +173,7 @@ function _focus($element = 'this', $js = '')
 	 * @param	string	- element
 	 * @param	string	- Javascript code for mouse over
 	 * @param	string	- Javascript code for mouse out
- 	 * @return	string
+	 * @return	string
 	 */
 	function _hover($element = 'this', $over, $out)
 	{
@@ -390,7 +390,7 @@ function _unload($element = 'this', $js = '')
 	 *
 	 * @access	private
 	 * @param	string	- element
- 	 * @return	string
+	 * @return	string
 	 */
 	function _addClass($element = 'this', $class='')
 	{
@@ -410,7 +410,7 @@ function _addClass($element = 'this', $class='')
 	 * @param	string	- element
 	 * @param	string	- One of 'slow', 'normal', 'fast', or time in milliseconds
 	 * @param	string	- Javascript callback function
- 	 * @return	string
+	 * @return	string
 	 */
 	function _animate($element = 'this', $params = array(), $speed = '', $extra = '')
 	{
@@ -452,7 +452,7 @@ function _animate($element = 'this', $params = array(), $speed = '', $extra = ''
 	 * @param	string	- element
 	 * @param	string	- One of 'slow', 'normal', 'fast', or time in milliseconds
 	 * @param	string	- Javascript callback function
- 	 * @return	string
+	 * @return	string
 	 */
 	function _fadeIn($element = 'this', $speed = '', $callback = '')
 	{
@@ -480,7 +480,7 @@ function _fadeIn($element = 'this', $speed = '', $callback = '')
 	 * @param	string	- element
 	 * @param	string	- One of 'slow', 'normal', 'fast', or time in milliseconds
 	 * @param	string	- Javascript callback function
- 	 * @return	string
+	 * @return	string
 	 */
 	function _fadeOut($element = 'this', $speed = '', $callback = '')
 	{
@@ -508,7 +508,7 @@ function _fadeOut($element = 'this', $speed = '', $callback = '')
 	 * @param	string	- element
 	 * @param	string	- One of 'slow', 'normal', 'fast', or time in milliseconds
 	 * @param	string	- Javascript callback function
- 	 * @return	string
+	 * @return	string
 	 */
 	function _hide($element = 'this', $speed = '', $callback = '')
 	{
@@ -534,7 +534,7 @@ function _hide($element = 'this', $speed = '', $callback = '')
 	 *
 	 * @access	private
 	 * @param	string	- element
- 	 * @return	string
+	 * @return	string
 	 */
 	function _removeClass($element = 'this', $class='')
 	{
@@ -554,7 +554,7 @@ function _removeClass($element = 'this', $class='')
 	 * @param	string	- element
 	 * @param	string	- One of 'slow', 'normal', 'fast', or time in milliseconds
 	 * @param	string	- Javascript callback function
- 	 * @return	string
+	 * @return	string
 	 */
 	function _slideUp($element = 'this', $speed = '', $callback = '')
 	{
@@ -582,7 +582,7 @@ function _slideUp($element = 'this', $speed = '', $callback = '')
 	 * @param	string	- element
 	 * @param	string	- One of 'slow', 'normal', 'fast', or time in milliseconds
 	 * @param	string	- Javascript callback function
- 	 * @return	string
+	 * @return	string
 	 */
 	function _slideDown($element = 'this', $speed = '', $callback = '')
 	{
@@ -610,7 +610,7 @@ function _slideDown($element = 'this', $speed = '', $callback = '')
 	 * @param	string	- element
 	 * @param	string	- One of 'slow', 'normal', 'fast', or time in milliseconds
 	 * @param	string	- Javascript callback function
- 	 * @return	string
+	 * @return	string
 	 */
 	function _slideToggle($element = 'this', $speed = '', $callback = '')
 	{
@@ -636,7 +636,7 @@ function _slideToggle($element = 'this', $speed = '', $callback = '')
 	 *
 	 * @access	private
 	 * @param	string	- element
- 	 * @return	string
+	 * @return	string
 	 */
 	function _toggle($element = 'this')
 	{
@@ -654,7 +654,7 @@ function _toggle($element = 'this')
 	 *
 	 * @access	private
 	 * @param	string	- element
- 	 * @return	string
+	 * @return	string
 	 */
 	function _toggleClass($element = 'this', $class='')
 	{
@@ -674,7 +674,7 @@ function _toggleClass($element = 'this', $class='')
 	 * @param	string	- element
 	 * @param	string	- One of 'slow', 'normal', 'fast', or time in milliseconds
 	 * @param	string	- Javascript callback function
- 	 * @return	string
+	 * @return	string
 	 */
 	function _show($element = 'this', $speed = '', $callback = '')
 	{
@@ -884,7 +884,7 @@ function sortable($element, $options = array())
 	}
 
 	// --------------------------------------------------------------------
-		 
+
 	/**
 	 * Table Sorter Plugin
 	 *
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 58fd7800..8a275dda 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -95,7 +95,7 @@ 
      Version 2.0.0
      
 			
    64. The Unit Test Class now has an optional "notes" field available to it, and allows for discrete display of test result items using $this->unit->set_test_items().
      65. 
 			
    65. Added a $xss_clean class variable to the XMLRPC library, enabling control over the use of the Security library's xss_clean() method.
      66. 
 			
    66. Added a download() method to the FTP library
      67. 
-			
    67. Changed do_xss_clean() to return FALSE if the uploaded file fails XSS checks.
      68.  
+			
    68. Changed do_xss_clean() to return FALSE if the uploaded file fails XSS checks.
      69. 
 			
    69. Added stripslashes() and trim()ing of double quotes from $_FILES type value to standardize input in Upload library.
      70. 
 			
    70. Added a second parameter (boolean) to $this->zip->read_dir('/path/to/directory', FALSE) to remove the preceding trail of empty folders when creating a Zip archive. This example would contain a zip with "directory" and all of its contents.
      71. 
 			
    71. Added ability in the Image Library to handle PNG transparency for resize operations when using the GD lib.
      72. 
@@ -129,7 +129,7 @@ 
      Version 2.0.0
      
 			
    72. Non-backwards compatible change made to get_dir_file_info() in the File Helper.  No longer recurses
 				by default so as to encourage responsible use (this function can cause server performance issues when used without caution).
      73. 
 			
    73. Modified the second parameter of directory_map() in the Directory Helper to accept an integer to specify recursion depth.
      74. 
-			
    74. Modified delete_files() in the File Helper to return FALSE on failure.
      75.  
+			
    75. Modified delete_files() in the File Helper to return FALSE on failure.
      76. 
 			
    76. Added an optional second parameter to byte_format() in the Number Helper to allow for decimal precision.
      77. 
 			
    77. Added alpha, and sha1 string types to random_string() in the String Helper.
      78. 
 			
    78. Modified prep_url() so as to not prepend http:// if the supplied string already has a scheme.
      79. 
@@ -227,7 +227,7 @@ 
      Version 1.7.2
      
 			
    79. Modified show_error() to allow sending of HTTP server response codes.
      80. 
 			
    80. Modified show_404() to send 404 status code, removing non-CGI compatible header() statement from error_404.php template.
      81. 
 			
    81. Added set_status_header() to the Common functions to allow use when the Output class is unavailable.
      82. 
-			
    82. Added is_php() to Common functions to facilitate PHP version comparisons.
       
+			
    83. Added is_php() to Common functions to facilitate PHP version comparisons.
      
 			
    84. Added 2 CodeIgniter "cheatsheets" (thanks to DesignFellow.com for this contribution).
      85. 
 		
 	
@@ -252,7 +252,7 @@ 
      Bug fixes for 1.7.2
      
 	
    85. Fixed a bug in form_textarea() where form data was not prepped correctly.
      86. 
 	
    86. Fixed a bug in form_prep() causing it to not preserve entities in the user's original input when called back into a form element
      87. 
 	
    87. Fixed a bug in _protect_identifiers() where the swap prefix ($swap_pre) was not being observed.
      88. 
-	
    88. Fixed a bug where the 400 status header sent with the 'disallowed URI characters' was not compatible with CGI environments.
      89.  
+	
    89. Fixed a bug where the 400 status header sent with the 'disallowed URI characters' was not compatible with CGI environments.
      90. 
 	
    90. Fixed a bug in the typography class where heading tags could have paragraph tags inserted when using auto_typography().
      91. 
 
 
@@ -363,7 +363,7 @@ 
      Version 1.7
      
 	
 	
    91. Database
 		
        
-			
      • Improved Active Record class to allow full path column and table names:  hostname.database.table.column.  Also improved the alias handling.
        • 			
+			
      • Improved Active Record class to allow full path column and table names:  hostname.database.table.column.  Also improved the alias handling.
        • 
 			
      • Improved how table and column names are escaped and prefixed.  It now honors full path names when adding prefixes and escaping.
        • 
 			
      • Added Active Record caching feature to "update" and "delete" functions.
        • 
 			
      • Added removal of non-printing control characters in escape_str() of DB drivers that do not have native PHP escaping mechanisms (mssql, oci8, odbc), to avoid potential SQL errors, and possible sources of SQL injection.
        • 
@@ -553,7 +553,7 @@ 
        Version 1.6.2
        
 		
          
 			
        • Added ability for xss_clean() to accept arrays.
          • 
 			
        • Removed closing PHP tags from all PHP files to avoid accidental output and potential 'cannot modify headers' errors.
          • 
-			
        • Removed "scripts" from the auto-load search path. Scripts were deprecated 
+			
        • Removed "scripts" from the auto-load search path. Scripts were deprecated
 				in Version 1.4.1 (September 21, 2006). If you still need to use them for legacy reasons, they must now be manually loaded in each Controller.
          • 
 			
        • Added a Reserved Names page to the userguide, and migrated reserved controller names into it.
          • 
 			
        • Added a Common Functions page to the userguide for globally available functions.
          • 
@@ -599,7 +599,7 @@ 
          Version 1.6.1
          
 
          Release Date: February 12, 2008
          
 Hg Tag: 1.6.1
          
 
            
-	
          • Active Record 
+	
          • Active Record
 		
              
 			
            • Added Active Record Caching.
              • 
 			
            • Made Active Record fully database-prefix aware.
              • 
@@ -674,7 +674,7 @@ 
              Version 1.6.0
              
 			
            • Changed the behaviour of variables submitted to the where() clause with no values to auto set "IS NULL"
              • 
 		
            
 	
            • 
-	
+
 	
          • Other Database Related
 		
              
 			
            • MySQL driver now requires MySQL 4.1+
              • 
@@ -690,19 +690,19 @@ 
              Version 1.6.0
              
 				in harmony with the global nature of the behavior (#1834).
 		
            
 	
            • 
-	
+
 	
          • Core changes
 		
              
 			
            • Added ability to load multiple views, whose content will be appended to the output in the order loaded.
              • 
 			
            • Added the ability to auto-load Models.
              • 
 			
            • Reorganized the URI and Routes classes for better clarity.
              • 
-			
            • Added Compat.php to allow function overrides for older versions of PHP or PHP environments missing certain extensions / libraries
              •    
+			
            • Added Compat.php to allow function overrides for older versions of PHP or PHP environments missing certain extensions / libraries
              • 
 			
            • Added memory usage, GET, URI string data, and individual query execution time to Profiler output.
              • 
 			
            • Deprecated Scaffolding.
              • 
 			
            • Added is_really_writable() to Common.php to provide a cross-platform reliable method of testing file/folder writability.
              • 
 		
            
 	
            • 
-	
+
 	
          • Libraries
 		
              
 			
            • Changed the load protocol of Models to allow for extension.
              • 
@@ -722,7 +722,7 @@ 
              Version 1.6.0
              
 			
            • Enabled the 'system' methods for the XML-RPC Server library, except for 'system.multicall' which is still disabled.
              • 
 		
            
 	
            • 
-	
+
 	
          • Helpers & Plugins
 		
              
 			
            • Added link_tag() to the HTML helper.
              • 
@@ -738,8 +738,8 @@ 
              Version 1.6.0
              
 			
            • Javascript Calendar plugin now uses the months and days from the calendar language file, instead of hard-coded values, internationalizing it.
              • 
 		
            
 	
            • 
+
 	
-	  
 	
          • Documentation Changes
 		
              
 			
            • Added Writing Documentation section for the community to use in writing their own documentation.
              • 
@@ -756,7 +756,7 @@ 
              Version 1.6.0
              
 
            
 
 
            Bug fixes for Version 1.6.0
            
-	
+
 
              
 	
            • Fixed a bug (#1813) preventing using $CI->db in the same application with returned database objects.
              • 
 	
            • Fixed a bug (#1842) where the $this->uri->rsegments array would not include the 'index' method if routed to the controller without an implicit method.
              • 
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index 482115cc..065db491 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -220,20 +220,20 @@ 
              $this->db->where();
              
 
 	$this->db->where('name', $name);
 	

              // Produces: WHERE name = 'Joe'	              
-	
+
 	
              Notice that the equal sign is added for you.
              
-	
+
 	
              If you use multiple function calls they will be chained together with AND between them:
              
-	
+
 	$this->db->where('name', $name);
              
 	$this->db->where('title', $title);
              
 	$this->db->where('status', $status);
 	

              // WHERE name = 'Joe' AND title = 'boss' AND status = 'active'	              	
-	
+
 	
            • Custom key/value method:
-	
+
 	
              You can include an operator in the first parameter in order to control the comparison:
              
-	
+
 	$this->db->where('name !=', $name);
              
 	$this->db->where('id <', $id);
 	

              // Produces: WHERE name != 'Joe' AND id < 45	              	
              • 
@@ -242,7 +242,7 @@ 
              $this->db->where();
              
 
 	
 	$array = array('name' => $name, 'title' => $title, 'status' => $status);

              
-	
+
 	$this->db->where($array);
 	

              // Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'	              
 
@@ -250,10 +250,10 @@ 
              $this->db->where();
              
 
 	
 	$array = array('name !=' => $name, 'id <' => $id, 'date >' => $date);

              
-	
+
 	$this->db->where($array);              	
 		
            • Custom string:
-		
+
 		
              You can write your own clauses manually:
              
 
 		
@@ -263,7 +263,7 @@ 
              $this->db->where();
              
 
 
 
              $this->db->where() accepts an optional third parameter. If you set it to FALSE, CodeIgniter will not try to protect your field or table names with backticks.
              
-
               		$this->db->where('MATCH (field) AGAINST ("value")', NULL, FALSE);
              
+
              		$this->db->where('MATCH (field) AGAINST ("value")', NULL, FALSE);
              
 
              
 
              $this->db->or_where();
              
 
              This function is identical to the one above, except that multiple instances are joined by OR:
              
@@ -290,7 +290,7 @@ 
              $this->db->or_where_in();
              
 	$names = array('Frank', 'Todd', 'James');
              
 	$this->db->or_where_in('username', $names);
              
 	// Produces: OR username IN ('Frank', 'Todd', 'James')
              
-	
+
 
              $this->db->where_not_in();
              
 
              Generates a WHERE field NOT IN ('item', 'item') SQL query joined with AND if appropriate
              
 
              
@@ -316,14 +316,14 @@ 
              $this->db->like();
              
 
 	$this->db->like('title', 'match');
 	

              // Produces: WHERE title LIKE '%match%'	              
-		
+
 	
              If you use multiple function calls they will be chained together with AND between them:
              
-	
+
 	$this->db->like('title', 'match');
              
 	$this->db->like('body', 'match');
 	

              
 	// WHERE title LIKE '%match%' AND  body LIKE '%match%              
-	If you want to control where the wildcard (%) is placed, you can use an optional third argument. Your options are 'before', 'after' and 'both' (which is the default). 
+	If you want to control where the wildcard (%) is placed, you can use an optional third argument. Your options are 'before', 'after' and 'both' (which is the default).
 	$this->db->like('title', 'match', 'before');
 	
              
 		// Produces: WHERE title LIKE '%match'	
              
@@ -333,17 +333,17 @@ 
              $this->db->like();
              
 
              
 	$this->db->like('title', 'match', 'both'); 
              
 // Produces: WHERE title LIKE '%match%'               	
              • 
-	
+
 	
            • Associative array method:
 
 	
 	$array = array('title' => $match, 'page1' => $match, 'page2' => $match);

              
-	
+
 	$this->db->like($array);
 	

              // WHERE title LIKE '%match%' AND  page1 LIKE '%match%' AND  page2 LIKE '%match%'
              •
    - - + +

    $this->db->or_like();

    This function is identical to the one above, except that multiple instances are joined by OR:

    @@ -355,7 +355,7 @@

    $this->db->or_like();

    - +

    Note: or_like() was formerly known as orlike(), which has been removed.

    $this->db->not_like();

    This function is identical to like(), except that it generates NOT LIKE statements:

    @@ -370,17 +370,17 @@

    $this->db->or_not_like();

    // WHERE title LIKE '%match% OR body NOT LIKE '%match%'

    $this->db->group_by();

    Permits you to write the GROUP BY portion of your query:

    - + $this->db->group_by("title");

    // Produces: GROUP BY title

    You can also pass an array of multiple values as well:

    - + $this->db->group_by(array("title", "date"));

    // Produces: GROUP BY title, date     - +

    Note: group_by() was formerly known as groupby(), which has been removed.

    $this->db->distinct();
    @@ -392,7 +392,7 @@

    $this->db->distinct();
    // Produces: SELECT DISTINCT * FROM table

    $this->db->having();

    Permits you to write the HAVING portion of your query. There are 2 possible syntaxes, 1 argument or 2:

    - + $this->db->having('user_id = 45');
    // Produces: HAVING user_id = 45
    @@ -401,7 +401,7 @@

    $this->db->having();

    // Produces: HAVING user_id = 45

     - +

    You can also pass an array of multiple values as well:

    @@ -419,14 +419,14 @@

    $this->db->or_having();

    $this->db->order_by();

    Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by. The second parameter lets you set the direction of the result. Options are asc or desc, or random.

    - + $this->db->order_by("title", "desc");

    // Produces: ORDER BY title DESC

    You can also pass your own string in the first parameter:

    - + $this->db->order_by('title desc, name asc');

    // Produces: ORDER BY title DESC, name ASC @@ -479,10 +479,10 @@

    $this->db->count_all();

    // Produces an integer, like 25     - +  

    Inserting Data

    - +

    $this->db->insert();

    Generates an insert string based on the data you supply, and runs the query. You can either pass an array or an object to the function. Here is an example using an array:

    @@ -520,9 +520,9 @@

    $this->db->insert();

    The first parameter will contain the table name, the second is an associative array of values.

    Note: All values are escaped automatically producing safer queries.

    - - - + + +

    $this->db->set();

    This function enables you to set values for inserts or updates.

    @@ -576,10 +576,10 @@

    $this->db->set();

    - +  

    Updating Data

    - +

    $this->db->update();

    Generates an update string and runs the query based on the data you supply. You can pass an array or an object to the function. Here is an example using @@ -625,7 +625,7 @@

    $this->db->update();

    Note: All values are escaped automatically producing safer queries.

    - +

    You'll notice the use of the $this->db->where() function, enabling you to set the WHERE clause. You can optionally pass this information directly into the update function as a string:

    @@ -634,15 +634,15 @@

    $this->db->update();

    Or as an array:

    $this->db->update('mytable', $data, array('id' => $id)); - +

    You may also use the $this->db->set() function described above when performing updates.

    - +  

    Deleting Data

    - +

    $this->db->delete();

    Generates a delete SQL string and runs the query.

    diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index fe09d2b1..46dfe89d 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -97,7 +97,7 @@

    $this->db->call_function();

    - + diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 30d39a42..e5cc4777 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -142,7 +142,7 @@

    $this->db->field_data()

  • primary_key - 1 if the column is a primary key
  • type - the type of the column
    • - + diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 45d15dba..381592c2 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -78,7 +78,7 @@

    The Database Class

  • Database manipulation with Database Forge
  • Database Utilities Class
    • - + diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 7a6734c4..c8a30494 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -132,7 +132,7 @@

    Query Bindings

    The question marks in the query are automatically replaced with the values in the array in the second parameter of the query function.

    The secondary benefit of using binds is that the values are automatically escaped, producing safer queries. You don't have to remember to manually escape data; the engine does it automatically for you.

    - + diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 9eaa1793..410dac84 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -65,11 +65,11 @@

    Generating Query Results

    There are several ways to generate query results:

    result()

    - +

    This function returns the query result as an array of objects, or an empty array on failure. - + Typically you'll use this in a foreach loop, like this:

    - + $query = $this->db->query("YOUR QUERY");

    @@ -79,11 +79,11 @@

    result()

       echo $row->name;
       echo $row->body;
    }     - +

    The above function is an alias of result_object().

    If you run queries that might not produce a result, you are encouraged to test the result first:

    - + $query = $this->db->query("YOUR QUERY");

    @@ -97,9 +97,9 @@

    result()

       }
    }     - +

    result_array()

    - +

    This function returns the query result as a pure array, or an empty array when no result is produced. Typically you'll use this in a foreach loop, like this:

    $query = $this->db->query("YOUR QUERY");
    @@ -113,7 +113,7 @@

    result_array()

    row()

    - +

    This function returns a single result row. If your query has more than one row, it returns only the first row. The result is returned as an object. Here's a usage example:

    @@ -128,9 +128,9 @@

    row()

       echo $row->body;
    }     - +

    If you want a specific row returned you can submit the row number as a digit in the first parameter:

    - + $row = $query->row(5); @@ -151,13 +151,13 @@

    row_array()

    }     - +

    If you want a specific row returned you can submit the row number as a digit in the first parameter:

    - + $row = $query->row_array(5); - -

    In addition, you can walk forward/backwards/first/last through your results using these variations:

    + +

    In addition, you can walk forward/backwards/first/last through your results using these variations:

    $row = $query->first_row()
    @@ -217,7 +217,7 @@

    $query->free_result()

    - + diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index c85408fa..8b86ed58 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -92,7 +92,7 @@

    $this->db->table_exists();

    - + diff --git a/user_guide/doc_style/template.html b/user_guide/doc_style/template.html index 26831ac0..d5ef5caa 100644 --- a/user_guide/doc_style/template.html +++ b/user_guide/doc_style/template.html @@ -54,7 +54,7 @@

    Foo Class

    Brief description of Foo Class. If it extends a native CodeIgniter class, please link to the class in the CodeIgniter documents here.

    Important:  This is an important note with EMPHASIS.

    - +

    Features:

      diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index b9069a8b..3193c058 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -58,14 +58,14 @@

      Alternate PHP Syntax for View Files

      If you do not utilize CodeIgniter's template engine, you'll be using pure PHP -in your View files. To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use +in your View files. To minimize the PHP code in these files, and to make it easier to identify the code blocks it is recommended that you use PHPs alternative syntax for control structures and short tag echo statements. If you are not familiar with this syntax, it allows you to eliminate the braces from your code, and eliminate "echo" statements.

      Automatic Short Tag Support

      Note: If you find that the syntax described in this page does not work on your server it might -be that "short tags" are disabled in your PHP ini file. CodeIgniter will optionally rewrite short tags on-the-fly, +be that "short tags" are disabled in your PHP ini file. CodeIgniter will optionally rewrite short tags on-the-fly, allowing you to use that syntax even if your server doesn't support it. This feature can be enabled in your config/config.php file.

      diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 0b4d642a..3f0e32cb 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -200,7 +200,7 @@

      Utilizing CodeIgniter Resources within Your Library

      This is very important. Assigning by reference allows you to use the original CodeIgniter object rather than creating a copy of it.

      Also, please note: If you are running PHP 4 it's usually best to avoid calling get_instance() -from within your class constructors. PHP 4 has trouble referencing the CI super object within application constructors +from within your class constructors. PHP 4 has trouble referencing the CI super object within application constructors since objects do not exist until the class is fully instantiated.

      diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index b77528a7..5423d583 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -58,8 +58,8 @@

      Credits

      CodeIgniter was originally developed by Rick Ellis (CEO of -EllisLab, Inc.). The framework was written for performance in the real -world, with many of the class libraries, helpers, and sub-systems borrowed from the code-base of +EllisLab, Inc.). The framework was written for performance in the real +world, with many of the class libraries, helpers, and sub-systems borrowed from the code-base of ExpressionEngine.

      It is currently developed and maintained by the ExpressionEngine Development Team.

      diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index 9c86f021..3163c11a 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -75,7 +75,7 @@

      Using CodeIgniter Drivers

      $this->some_parent->some_method();

      The child classes, the drivers themselves, can then be called directly through the parent class, without initializing them:

      - + $this->some_parent->child_one->some_method();
      $this->some_parent->child_two->another_method();       diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index 04af6e6a..a1a96cf8 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -70,7 +70,7 @@

      Renaming the Application Folder

      Relocating your Application Folder

      -

      It is possible to move your application folder to a different location on your server than your system folder. +

      It is possible to move your application folder to a different location on your server than your system folder. To do so open your main index.php and set a full server path in the $application_folder variable.

      @@ -79,7 +79,7 @@

      Relocating your Application Folder

      Running Multiple Applications with one CodeIgniter Installation

      -

      If you would like to share a common CodeIgniter installation to manage several different applications simply +

      If you would like to share a common CodeIgniter installation to manage several different applications simply put all of the directories located inside your application folder into their own sub-folder.

      @@ -107,7 +107,7 @@

      Running Multiple Applications with one CodeIgniter Installation

      $application_folder = "applications/foo"; -

      Note:  Each of your applications will need its own index.php file which +

      Note:  Each of your applications will need its own index.php file which calls the desired application. The index.php file can be named anything you want.

      diff --git a/user_guide/general/models.html b/user_guide/general/models.html index e405dd1b..35ab08d2 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -212,7 +212,7 @@

      Connecting to your Database

    • You can tell the model loading function to auto-connect by passing TRUE (boolean) via the third parameter, and connectivity settings, as defined in your database config file will be used: - $this->load->model('Model_name', '', TRUE); + $this->load->model('Model_name', '', TRUE);
      • diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 47c1a5ab..7cb3f158 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -129,7 +129,7 @@

      Enabling and Disabling Profiler Sections

      Any GET data passed in the request TRUE - + http_headers The HTTP headers for the current request TRUE @@ -149,7 +149,7 @@

      Enabling and Disabling Profiler Sections

      Listing of all database queries executed, including execution time TRUE - + uri_string The URI of the current request TRUE diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 1200a2c1..7b7d837d 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -107,12 +107,12 @@

      File Format

      a UTF-8 encoded file, and the BOM can have a negative side effect in PHP of sending output, preventing the application from being able to set its own headers. Unix line endings should be used (LF).

      - +

      Here is how to apply these settings in some of the more common text editors. Instructions for your text editor may vary; check your text editor's documentation.

      - +
      TextMate
      - +
      1. Open the Application Preferences
      2. Click Advanced, and then the "Saving" tab
        3. @@ -121,9 +121,9 @@
        TextMate
      3. Optional: Check "Use for existing files as well" if you wish to modify the line endings of files you open to your new preference.
      - +
      BBEdit
      - +
      1. Open the Application Preferences
      2. Select "Text Encodings" on the left.
        3. @@ -137,7 +137,7 @@
        BBEdit

        PHP Closing Tag

        -

        The PHP closing tag on a PHP document ?> is optional to the PHP parser. However, if used, any whitespace following the closing tag, whether introduced +

        The PHP closing tag on a PHP document ?> is optional to the PHP parser. However, if used, any whitespace following the closing tag, whether introduced by the developer, user, or an FTP application, can cause unwanted output, PHP errors, or if the latter are suppressed, blank pages. For this reason, all PHP files should OMIT the closing PHP tag, and instead use a comment block to mark the end of file and it's location relative to the application root. This allows you to still identify a file as being complete and not truncated.

        @@ -158,7 +158,7 @@

        PHP Closing Tag

        - +

        Class and Method Naming

        Class names should always have their first letter uppercase, and the constructor method should match identically. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.

        @@ -193,8 +193,8 @@

        Class and Method Naming

        function get_file_properties() // descriptive, underscore separator, and all lowercase letters
        - - + +

        Variable Names

        The guidelines for variable naming is very similar to that used for class methods. Namely, variables should contain only lowercase letters, use underscore separators, and be reasonably named to indicate their purpose and contents. Very short, non-word variables should only be used as iterators in for() loops.

        @@ -213,8 +213,8 @@

        Variable Names

        $last_city
        - - + +

        Commenting

        In general, code should be commented prolifically. It not only helps describe the flow and intent of the code for less experienced programmers, but can prove invaluable when returning to your own code months down the line. There is not a required format for comments, but the following are recommended.

        @@ -257,8 +257,8 @@

        Commenting

        $parts = $this->foo($parts);
        - - + +

        Constants

        Constants follow the same guidelines as do variables, except constants should always be fully uppercase. Always use CodeIgniter constants when appropriate, i.e. SLASH, LD, RD, PATH_CACHE, etc.

        @@ -275,8 +275,8 @@

        Constants

        $str = str_replace(LD.'foo'.RD, 'bar', $str);
        - - + +

        TRUE, FALSE, and NULL

        TRUE, FALSE, and NULL keywords should always be fully uppercase.

        @@ -290,9 +290,9 @@

        TRUE, FALSE, and NULL

        $bar = FALSE; function foo($bar = NULL)
        - - + +

        Logical Operators

        Use of || is discouraged as its clarity on some output devices is low (looking like the number 11 for instance). @@ -310,9 +310,9 @@

        Logical Operators

        if ( ! is_array($foo))
        - - - + + +

        Comparing Return Values and Typecasting

        Some PHP functions return FALSE on failure, but may also have a valid return value of "" or 0, which would evaluate to FALSE in loose comparisons. Be explicit by comparing the variable type when using these return values in conditionals to ensure the return value is indeed what you expect, and not a value that has an equivalent loose-type evaluation.

        @@ -350,27 +350,27 @@

        Comparing Return Value $str = (string) $str; // cast $str as a string

        - - + +

        Debugging Code

        No debugging code can be left in place for submitted add-ons unless it is commented out, i.e. no var_dump(), print_r(), die(), and exit() calls that were used while creating the add-on, unless they are commented out.

        // print_r($foo);
        - - + +

        Whitespace in Files

        No whitespace can precede the opening PHP tag or follow the closing PHP tag. Output is buffered, so whitespace in your files can cause output to begin before CodeIgniter outputs its content, leading to errors and an inability for CodeIgniter to send proper headers. In the examples below, select the text with your mouse to reveal the incorrect whitespace.

        INCORRECT:

        - + <?php // ...there is whitespace and a linebreak above the opening PHP tag // as well as whitespace after the closing PHP tag -?> +?>

        CORRECT:

        <?php @@ -378,15 +378,15 @@

        Whitespace in Files

        ?>
        - - + +

        Compatibility

        Unless specifically mentioned in your add-on's documentation, all code must be compatible with PHP version 4.3+. Additionally, do not use PHP functions that require non-default libraries to be installed unless your code contains an alternative method when the function is not available, or you implicitly document that your add-on requires said PHP libraries.

        - - + +

        Class and File Names using Common Words

        When your class or filename is a common word, or might quite likely be identically named in another PHP script, provide a unique prefix to help prevent collision. Always realize that your end users may be running other add-ons or third party PHP scripts. Choose a prefix that is unique to your identity as a developer or company.

        @@ -402,8 +402,8 @@

        Class and File Names u class Pre_import mod.pre_import.php

        - - + +

        Database Table Names

        Any tables that your add-on might use must use the 'exp_' prefix, followed by a prefix uniquely identifying you as the developer or company, and then a short descriptive table name. You do not need to be concerned about the database prefix being used on the user's installation, as CodeIgniter's database class will automatically convert 'exp_' to what is actually being used.

        @@ -419,30 +419,30 @@

        Database Table Names

        NOTE: Be mindful that MySQL has a limit of 64 characters for table names. This should not be an issue as table names that would exceed this would likely have unreasonable names. For instance, the following table name exceeds this limitation by one character. Silly, no? exp_pre_email_addresses_of_registered_users_in_seattle_washington

        - - + +

        One File per Class

        Use separate files for each class your add-on uses, unless the classes are closely related. An example of CodeIgniter files that contains multiple classes is the Database class file, which contains both the DB class and the DB_Cache class, and the Magpie plugin, which contains both the Magpie and Snoopy classes.

        - - + +

        Whitespace

        Use tabs for whitespace in your code, not spaces. This may seem like a small thing, but using tabs instead of whitespace allows the developer looking at your code to have indentation at levels that they prefer and customize in whatever application they use. And as a side benefit, it results in (slightly) more compact files, storing one tab character versus, say, four space characters.

        - - + +

        Line Breaks

        Files must be saved with Unix line breaks. This is more of an issue for developers who work in Windows, but in any case ensure that your text editor is setup to save files with Unix line breaks.

        - - + +

        Code Indenting

        Use Allman style indenting. With the exception of Class declarations, braces are always placed on a line by themselves, and indented at the same level as the control statement that "owns" them.

        @@ -498,12 +498,12 @@

        Code Indenting

        } }
        - +

        Bracket and Parenthetic Spacing

        In general, parenthesis and brackets should not use any additional spaces. The exception is that a space should always follow PHP control structures that accept arguments with parenthesis (declare, do-while, elseif, for, foreach, if, switch, while), to help distinguish them from functions and increase readability.

        - + INCORRECT: $arr[ $foo ] = 'foo'; @@ -514,13 +514,13 @@

        Bracket and Parenthetic Spacing

        INCORRECT: function foo ( $bar ) { - + } CORRECT: function foo($bar) // no spaces around parenthesis in function declarations { - + } @@ -531,9 +531,9 @@

        Bracket and Parenthetic Spacing

        foreach ($query->result() as $row) // single space following PHP control structures, but not in interior parenthesis
        - - - + + +

        Localized Text

        Any text that is output in the control panel should use language variables in your lang file to allow localization.

        @@ -544,9 +544,9 @@

        Localized Text

        CORRECT: return $this->lang->line('invalid_selection');
        - - + +

        Private Methods and Variables

        Methods and variables that are only accessed internally by your class, such as utility and helper functions that your public methods use for code abstraction, should be prefixed with an underscore.

        @@ -554,9 +554,9 @@

        Private Methods and Variablesconvert_text() // public method _convert_text() // private method

        - - + +

        PHP Errors

        Code must run error free and not rely on warnings and notices to be hidden to meet this requirement. For instance, never access a variable that you did not set yourself (such as $_POST array keys) without first checking to see that it isset().

        @@ -574,9 +574,9 @@

        PHP Errors

        NOTE: Setting the display_errors setting with ini_set() at runtime is not identical to having it enabled in the PHP environment. Namely, it will not have any effect if the script has fatal errors

        - - + +

        Short Open Tags

        Always use full PHP opening tags, in case a server does not have short_open_tag enabled.

        @@ -589,9 +589,9 @@

        Short Open Tags

        CORRECT: <?php echo $foo; ?>
        - - + +

        One Statement Per Line

        Never combine statements on one line.

        @@ -605,9 +605,9 @@

        One Statement Per Line

        $bat = str_replace($foo, $bar, $bag);
        - - + +

        Strings

        Always use single quoted strings unless you need variables parsed, and in cases where you do need variables parsed, use braces to prevent greedy token parsing. You may also use double-quoted strings if the string contains single quotes, so you do not have to use escape characters.

        @@ -622,9 +622,9 @@

        Strings

        "My string {$foo}" "SELECT foo FROM bar WHERE baz = 'bag'"
        - - + +

        SQL Queries

        MySQL keywords are always capitalized: SELECT, INSERT, UPDATE, WHERE, AS, JOIN, ON, IN, etc.

        @@ -645,16 +645,16 @@

        SQL Queries

        ORDER BY foobaz LIMIT 5, 100");
        - - + +

        Default Function Arguments

        Whenever appropriate, provide function argument defaults, which helps prevent PHP errors with mistaken calls and provides common fallback values which can save a few lines of code. Example:

        function foo($bar = '', $baz = FALSE)
        - + diff --git a/user_guide/general/views.html b/user_guide/general/views.html index b5dea05a..8f317109 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -169,7 +169,7 @@

        Adding Dynamic Data to the View

        { $data['title'] = "My Real Title"; $data['heading'] = "My Real Heading"; - + $this->load->view('blogview', $data); } } @@ -211,7 +211,7 @@

        Creating Loops

        $data['title'] = "My Real Title"; $data['heading'] = "My Real Heading"; - + $this->load->view('blogview', $data); } } @@ -229,8 +229,8 @@

        Creating Loops

        </head> <body> <h1><?php echo $heading;?></h1> - -<h3>My Todo List</h3> + +<h3>My Todo List</h3> <ul> <?php foreach($todo_list as $item):?> @@ -239,7 +239,7 @@

        Creating Loops

        <?php endforeach;?> </ul> - + </body> </html> diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index c4aa65fa..bd748226 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -87,9 +87,9 @@

        captcha_create($data)

        The "word" is the word that appears in the captcha image, which if not supplied to the function, will be a random string.

        - +

        Using the CAPTCHA helper

        - +

        Once loaded you can generate a captcha like this:

        $vals = array(
        @@ -120,14 +120,14 @@

        Using the CAPTCHA helper

    Adding a Database

    - +

    In order for the captcha function to prevent someone from submitting, you will need to add the information returned from create_captcha() function to your database. Then, when the data from the form is submitted by the user you will need to verify that the data exists in the database and has not expired.

    - +

    Here is a table prototype:

    - + CREATE TABLE captcha (
     captcha_id bigint(13) unsigned NOT NULL auto_increment,
     captcha_time int(10) unsigned NOT NULL,
    @@ -138,7 +138,7 @@

    Adding a Database

    )

    Here is an example of usage with a database. On the page where the CAPTCHA will be shown you'll have something like this:

    - + $this->load->helper('captcha');
    $vals = array(
        'img_path' => './captcha/',
    @@ -161,10 +161,10 @@

    Adding a Database

    echo '<input type="text" name="captcha" value="" />';

    Then, on the page that accepts the submission you'll have something like this:

    - + // First, delete old captchas
    $expiration = time()-7200; // Two hour limit
    -$this->db->query("DELETE FROM captcha WHERE captcha_time < ".$expiration);
    +$this->db->query("DELETE FROM captcha WHERE captcha_time < ".$expiration);

    // Then see if a captcha exists:
    $sql = "SELECT COUNT(*) AS count FROM captcha WHERE word = ? AND ip_address = ? AND date > ?";
    @@ -176,7 +176,7 @@

    Adding a Database

    {
        echo "You must submit the word that appears in the image";
    }     - + diff --git a/user_guide/helpers/compatibility_helper.html b/user_guide/helpers/compatibility_helper.html index de8c49d0..9afec654 100644 --- a/user_guide/helpers/compatibility_helper.html +++ b/user_guide/helpers/compatibility_helper.html @@ -68,7 +68,7 @@

    Compatibility Helper

    You may use those functions without loading this helper. The functions are split between that file and this Helper so that only functions required by the framework are included by default. This way, whether or not you load the additional functions in this Helper remains your choice.

    - +

    Loading this Helper

    This helper is loaded using the following code:

    diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 2d908705..f8775b14 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -116,7 +116,7 @@

    standard_date()

    Description Example - + DATE_ATOM Atom 2005-08-15T16:13:03+0000 @@ -149,7 +149,7 @@

    standard_date()

    DATE_RFC1123 RFC 1123 - Sun, 14 Aug 2005 16:13:03 UTC + Sun, 14 Aug 2005 16:13:03 UTC DATE_RFC2822 diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index 2324252d..6e4faef0 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -83,7 +83,7 @@

    directory_map('source directory')

    $map = directory_map('./mydirectory/', 1); -

    By default, hidden files will not be included in the returned array. To override this behavior, +

    By default, hidden files will not be included in the returned array. To override this behavior, you may set a third parameter to true (boolean):

    $map = directory_map('./mydirectory/', FALSE, TRUE); diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 03a60685..0aaa8f60 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -258,11 +258,11 @@

    form_fieldset()



    // Produces
    -<fieldset> +<fieldset>
    -<legend>Address Information</legend> +<legend>Address Information</legend>
    -<p>form content here</p> +<p>form content here</p>
    </fieldset>

    Similar to other functions, you can submit an associative array in the second parameter if you prefer to set additional attributes.

    diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 50a1c48a..845ecf10 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -118,7 +118,7 @@

    link_tag()

    echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
    - // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" /> + // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" />

    echo link_tag('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
    @@ -134,7 +134,7 @@

    link_tag()


    echo link_tag($link);
    // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />

    - +

    nbs()

    Generates non-breaking spaces (&nbsp;) based on the number you submit. Example:

    echo nbs(3); diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 661330aa..d95562d9 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -91,7 +91,7 @@

    The Controller

    In your application/controllers/ folder, create a file called smileys.php and place the code below in it.

    -

    Important: Change the URL in the get_clickable_smileys() function below so that it points to +

    Important: Change the URL in the get_clickable_smileys() function below so that it points to your smiley folder.

    You'll notice that in addition to the smiley helper we are using the Table Class.

    @@ -105,21 +105,21 @@

    The Controller

    { parent::Controller(); } - + function index() { $this->load->helper('smiley'); $this->load->library('table'); - + $image_array = get_clickable_smileys('http://example.com/images/smileys/', 'comments'); - + $col_array = $this->table->make_columns($image_array, 8); - + $data['smiley_table'] = $this->table->generate($col_array); - + $this->load->view('smiley_view', $data); } - + } ?> diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 2b12c2a2..d3f97fb5 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -145,7 +145,7 @@

    reduce_multiples()

    $string=",Fred, Bill,, Joe, Jimmy,";
    $string=reduce_multiples($string, ", ", TRUE); //results in "Fred, Bill, Joe, Jimmy" -

    +

    quotes_to_entities()

    Converts single and double quotes in a string to the corresponding HTML entities. Example:

    diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 438eaec4..6a68180b 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -120,7 +120,7 @@

    convert_accented_characters()

    Transliterates high ASCII characters to low ASCII equivalents, useful when non-English characters need to be used where only standard ASCII characters are safely used, for instance, in URLs.

    $string = convert_accented_characters($string); - +

    This function uses a companion config file application/config/foreign_chars.php to define the to and from array for transliteration.

    word_censor()

    diff --git a/user_guide/images/ci_logo.jpg b/user_guide/images/ci_logo.jpg index 3ae0eee079898922487dd362660b6f8b05942be5..9ab5a8e24fe8effec1f2250b0aec5bddebbc57f5 100644 GIT binary patch literal 9035 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 delta 5467 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 diff --git a/user_guide/images/ci_logo_flame.jpg b/user_guide/images/ci_logo_flame.jpg index 17e9c586bb55d8073c4629b707b2a590334f34fc..5bf38adbb01ac723ec47817cbcd1ff2b1c46fdfd 100644 GIT binary patch literal 13862 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 ecj=O~!hWEweR0{MijNw)}+bj0<__0 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%0DHqf`U)5 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 literal 94476 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 diff --git a/user_guide/images/codeigniter_1.7.1_helper_reference.png b/user_guide/images/codeigniter_1.7.1_helper_reference.png index 15a7c1576e0bc49affc6a137070b94d19d03e548..6a7d9f8c9efded77b01f32fc114bb5e984989808 100644 GIT binary patch literal 109471 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%0DeB+>(vAG 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 literal 111747 zcmb6AV|XQ9v;_*swr$&X$Lu7XbkwnJ+qSV|b!^)m?4*-)Y}?k|@A=O8e%(KJJx_LO zSJkSu7v`8_jx{UlyRr;20s#UT7#OmgtfU$k7=#w+cnA&#^r^4q;0F2!X0}fPt z;Y=ez-{Bo)wOzo#T&Mo~125Pz%>$hza+T6@Rd+CV^)PZa0~0rOFg7ETwsJP}aB#M9 zA^WDz1=BcR00u?|CMPNW!!!3h&%+l>>T7JPYw1djr3V*I_NoUC0fNHt8x&ztvrIH} z34CM%g(ehYF!GP@;Lxf}bbn)@;Gi%hBxI@c?)Q_cy81*fF~C)C&>wD|&IRkbojtmE zIRyn@W-R(R?}&HYRZ~^J|8HrxjtuYs$NJy$*>}?gl};71d#U!n*Pq>LWewp0m@O3J z$-9sL|Fhh+T8xWwY)lemrL4L^jU)m)z1*54H+_ICJ~pYMO}bi%LJK0 zMGnazh8FM(2rt${RS3~s^xU)~E0>H01uov+IQ1(TD)5x|_Jf;Bg1GD(_$WKYj9HoXma<+^2H{39$V({qZxg zo=R>(9z)-p)2N|AwmodHPL8sRX};CR!&tX%)ITaP3A{x*M5nl;NLe1Dd&>MhIHW-y zqjhWi&0?Ix4S@2?f=fTQoUDM8V51KPk|FK4Y9buqtXURApy$&ghFm*&_S6*@KDWP~ zZ9#yz2L^T2l;=xv{X>;XW#d?h=AH&qr}#!xd2+*?iU@gEvxbI_VmDgqhLwDhqp>`e zpav&~irk=##8i6}I@WU=Tv{n7oGdy+_zEbIOm%9SRS*d`6%@3ffDvS5`b@ITY~$=A31W^mk*y#&4r4Yv%H)J%X5YnZZ~VcSbJ$rlJ8gUe~NCrwkW zHL&}u3obUcL_eA3G;m;pUR#)Wz6U5Qb9cGXFu~!Tz?Mu6-$lj#@$qCeSB1+1^vR(m zUV`r9k#qKNP9CmF5LNzaFoBPaKg>oUu6Wu%x!zyeZgJAT{^c0MFIQT0#oTs1I1r*I z>du4%WUr!{Yj&{!thdI|_PvC6=(b+Jp3HMyEL7ffLYNq5cG}{rT&+jR7hBzzeBda{ z4GOX)uH^6-v1QfEVQhkfEB@-quJ~7j|MZ7(oCWuxaeaA5fEvEMT!ae9y-Wq1PC6Lf z;{k3V-dR_0hP3g5o;8s>os-pMh1oWpEmcD+4BkeoeEZ%hv}Bp#Zw5cLagN2tsTxl6*(-ogMfGoqbgF8Aw`F^J_`504rmCC>m&8L)D*@2R(=6zS z*fIKe!Y`9-Hfx#rxN4(l(32gu<@>Gttgd_`5IolNoSnh+#p0s35SiD}=+~dd*b22d zzkaZ`rF(?6r2mX{FZQB?qo>~cNbG-Q}h;#9>P*k}2z!dI5L*x1NWv<%K=XNHyu%v$Wf`87^a;}53qg%XCYb?Iv2ZI_02HT12aI>9)l|2hef#1>0c%!1575(F@_qm%}g`0rH-tM@NJ5nA~ zlgl)L^@Tf4&oxBrtM~2Eba7)zD2-A!8XCIzYJ%vlW5@O5gA^Lne-#9rg1yUAW|s6P zxqo$0{Qj|^`Gd>5&$Vd0BNZz>oI98%uAHJICEUUUM{&7gpFPPbw@#+agaUn;WMt^CYZy9q_b zlA_M+%@9~ls}Tg8Emurve0*8uBhp70hX29f7d=hG2@XE9%vDXP97pU$l%SG3j9-I4 z*8i!MnH5N0p)KbzHoP{!Rdx;>u2Dzf)acH;4a1eSS$*qSj7E7jTH}F1A^vmGWS*3h zB>pDi=V|ip={!HLU2lbXKurxLBVF{*dO}6TVpV~4hY%~2pDHxgWbFB~rmcQ)F)1T$ zB-8>hAj*aH6$$q~H1x82kkMha%GDT8O8eVRH=2XP(`lXW(&y7_hD2Dt3mlR!BU^q< z#EB& ztSn=%hGDd%H^klJjlNk+%-rQ}wzoTC`SG6FZHwPw0sLF*;UJPJoO8FbGPT;Clq&3F zx!S^5{&;S5G)BtleW@oO6K$!lH6D(u@3^F}){13ep8V^V(pEb2go1JzA7e~J2J_JV znS!AyRr%9Zd24rW{o%9~ry-b5NDxX0th%cH%txNU&6Hi6)6@IQu-nPt%e!xK?-$?^ z5>`zgbdj}ZIAth;({Kt8CYEq)#boT5%ahHBjrZJ-#qO z%8H`pd|Ao)+8AsM&JINP`#W4@BpDlDX6&HE4>8XeoM#wl^p#d-ySE1u|F2Kk{{1EW zVm8ry_a5(?)sLrQ9z47zM{+4Iuk|KVct%q1NTURiXq~EqQ5lk*6tBCA%4*3{I3{Rl z=&&zu7RLJOM#T(6?2l~g2C@PkxN45sQDKF4nxvZj8%>9`P<5 z+JpQ}M$zWWkP)xiLu|5nkLFrz_&rXsMpjlNxoxDoK0i9D3`9rQoe}dKx|5=dD4L}y z8O?z-G#trUggj^@1oGc)nH-d}B{PhMv;?fNU_?a^eP8KgKz6_SS503@v1IIe2Wo8i zdT=}`SI8TSRaKHYdifViQBlz>J`$FNsooFOB04o%IYqtp#Kvx+NB=M3UVw6)5nj33 z)g}la^;`c!4i3#(wrHK5R&P*Reu{|>af-T|Jnz<)=N~@yi!mt3dmhfoz(d{_$)-`EV_|;#arUqK z^`Z?bEUdwDU$&M|F#Won4?rZG?S8R(a}7&+{kKBZl#1$lGz9f_xA0qaj$j7l+hfE1 zSsgx`H&?^OTGPix+l%>wwZ5o(tVfyhfupZb-Q}`)!azur-4-C#?@jCdxOfU=<~YJW z7;Ck}QdwC{dBTLGE!j6QxR_YjBfAYIC#y}g>ObquKZ>L*1A*x*)YWDRo62%KA6|FM zk28WGk5un9fg!S1AC$HgpmMg^bKZGi%(4@yX zS*x8cM(=BME+(xOj}H%c@O1=^?SB|g_wEJ)c{#BwJY?$>f)=J-Gc5dnI>s+a0y95k z->bTU%*~NCt5QDM>-TbrGw$cV8_DVsm3DLlt|_QPBH;_9uB(^x<)w%7eg{F-obBlL z#q<~=t}zq{eqSmpoBMWP^jL7!_5JaC2KswdM5(K_Iioo_99J)%!$TdnLgA5!xT9NQ zaOU>Pa-N;$X`*eckN=gxhn<`}hefEX>qKvwO4KZ>IerQ~sbq)F?-=gq@*g9^BtKmY z9q$cgJ$qurlZ;$J00S{2Ef*0KG_W;r5Czs<+PI1$HIgksPg)Ya26K6P90B7q#ZP0R zM1UY5YqnC44|v*;LWH2wmM)%Wcit2NxflKx3)K9+M*;zrUIsEQmiUs5E>*9~Z(2>} z=lWggA|9I)k8N9{Cs`Tl>G>*(Z;wQuyNJpM`?DQxHkX;45!u-U0{Q{MIq6J=UI`@c z&np)DI5@ksa3I2jwp583LaTDP2aSjZhKx4f%4`5?C(7r^xM{`mZ#Vy9X=$o%4HRBn z1vddhO!Rd^6kxd@HFIAW$L^}U`HlfgM+4WUMneK8OAi|JX(sd{Wg81m~ zD*pVOm?8V47>}(|U?Mr5pYJihHP**id}(KO?D@WFEh%sO6NwiTvc1E?OD@qWXfPa< zvVvI+Jp`;aYY5Y$5lHk~kwWIiKOfGVb{_fuEiPQ&XR_<@+TwAFd}iL^<7+W6EVmg! zn)e?#7O>+*TF-~y7Ev5N90$!zB7$a?{bF^_W`XWMi(I{R{u@tZG&LBOyWRjPO!qAW z0aU)o{Aub<*NMXtG7#oU3cKYGO?!tgmR=fJ=VxxzU=drpw78aYc))cOd0@R;@(6Nt z4Z(APGi6J}9t8l-2zfaQA)(x|JVDA1y#+{rv8Nn|!~W5@bv`qM7Hn)hsG#0rnI?x1 zZ|?-62@8evdY>zOU#AFKt!^jEH(uL1~a%k;h{AE=1NiGGJw^m?`WgNU%+^Z{MyROCX9 zw(=X>tFrP3xDf%eIEXIi2}VGAS}rp5`rIkaU}J4l!a+$&f{aeeN(ot~-;^iC{hExz zK8b!0rW)lSXgE-{|$=v*@^suYb0v$DMH%hB|{(40h| zBso5_Z3gO8jS%6CCe`Rpj86@t+~bQ7DVR|o^w%d*I;~zrGGK$~z-=%@cTggY(zu{s zc0mQ*DR>jz?$O@26y-cRMU`@d$e1`OG^x|7-?KhmM$pY-Up`j{5l@?Yt6i5AUP~+s zVxSu<=vis$xzk{Mo(@w=sA>s0!&?+Gj3I)Jjh8!p`6J>V_o*W95Ilo+$+UmL-G;c73EE*cTMn*a8ks&?MQo|78n)-%yjfhg#+nJsH>dk?H z0rFBbd^|W+Bf-#c4|hY`7jdOU!JWSu(v@;x0uk}JjUYY?3*!#vJXe)Ke#O@N(~G*j z?!TB&G&Uce3Eact2V+d6zd*0ZkCEDDZ)F?-J_E`f*2o1uDiL9$(jjJ%R4l&A=8%7s zwXwndON>ANe*Dw*a@!J#zPp>V;qq-WM}880V{*x0rKMts#uRj~w_0TI207rnzSrnG zZEdKrQRl;LaWE3S*4WmyHcULc@$^y!_N-~sd_HjyX@!f8E~>4K_ep0Ge_D63bQ1s# z$t+kBv#v9UVP?CZ4tJ=Ruj}Wq{POht^mVV+9VQwh?XGg>t2;Mr(TxmaZi^}3#yUMjL&6_C2e3J;`d?}8@RcaW8r>v__AhS ztlMVqO3W3xU8aQpbUSJ5eaYWA|Cc2@VsSgFeU@|w;vE74E;811_pENOevRMfnaxc@ zqn!u^Y*gq0D+HK7#>$rHVLoHJlg>=E(uvLeU0Y4!34~T|eg4ldFr6c2dPF||YTZ=y zU^y@`@VJa1ST~(uy;T4^?ChY(SleHOMkQpN&pTBY#5%Luw#uY3SaLV}@(YeFnbOjJ zEG(j*pT&3>l5O?fq1e4X9i2R!%@H6~8+2zTS2O(wLV}=mC%}p-<0mXA`W8#BUUog4 z<6wMyLoP@k_07O{;KJq5k%bzX7!40!&PyB|81PJPb_7(}k)_Z&EO4z7R`r2Yka+XGW8-C4=! zw#t{w12a!s7N=cT$@Mn4K|w+Pk*L3a=TFx9MB79@`K)M_(Uv;7ZE%?>s3?L#yzn$A zGMzceG%IAwe{y>w#p|{>fsUE3ptmeM@9ZD@eqn^x^AnmFY4Y0^rYA~!K;|0=1=dSkUBgBM7&VJXqKNfd#=P6go6@$c!lU}{Q zQqh-3XzdiJZfRLqSepOsVi8Th-OQ+KydR;oY1l;onVERI0v=`E6_HIc2^d(|QW|pb znlaGgXo+CO8Mvx7Iz}y8VrY&FOX}Kc!JwGc#R7=2Se?~HDH1>uM^~g)1s@kfDassI z-_93n&gr(ei09`wp`uh;+xo~WjK)!*RtZuw29D2S$f6h0GrD>-v9T?YVea+y|5LJV zu6l-Ef3iCqRu9H4tW z73;rRze_?-vk83td@Vss4kSL!43C*y--6^(5D$0!!(pzHWs8Go6@gl;R>}7As+OA* zqgh2wCy*U{?+R5gR3N^5cE;ZlAc|68_jLIj5tbBi80%A;M@FWAp(N-=!6%R%yEiuR zXPTOa0ik?D*-H*yq_;Qo{e67$&tSpgU!!d?Q*D~FXQ$}s7{ar0^M*t~qL`8fws>LT zaI=HT>Ojb)dkGTef7-`8WqWl$L`52v{rR?13LCMFM>?h8IwLeSzAH@7T#v8pOlyN^ z@nz#&BemRMxUQp>Q(bzK0*10>?7}A6-FUo@tmNp0IJ)E*lq=;pXN(h6Yzft5>+JI6`(Y{sG`ur?}kV>)Mb1T?647ybTZ>8A%#2 zQ^_Lu?)BGMKQVlpJ|k9;Ciz?X90G*0O2H&dv!2(F`*2qR`^Z1)w8%@}zTpcUv?yQ@ z0MEj`Z5`!)3on)3_|jI(VIKNE;(w6{q(&!WZ~-_b0I#$9YNO$qhSvTBJnmjIDFn4k zDRq0nZ&V5xn!u0lYeD3>DJhknkTun6tHx216DMt zkOAx=$});w?h8x*lC!d3)yFkdK&)y^Pu`$C_I!Qhu0l}e8l7Hi~x%?A(W&p6mWR(Hfkz6ype zs(8ixY{o4b9EmKdsFqa!pDmW>nD4K8AdTR^5>^#UQU8B?F|{10-arOg=&(Kvv*ez^ zMd_@#%4?bLw#lHwjoN^%zAhw$uMkTp?8^$1Xl?a&0ysW1N7#$+CFz4#;?iM}^54y$ z81#OHIRkp7+B6pCv(sh$x+VaJ1l+ys&MxrR7$KrQYRf7Hhs__ zfoYuU9kjebH=CMjTd5%Qj3&QBZqx)6WA^t__GQ{7&O4+0_w1vE1=Ra`1N<9(a~8OWgsAS z1Ge|tx$+qK4R)@?{itat#_^yi3Akk2XW23k!{8WxrGh zSe2SO%c57abtHyZl+~q2>G0+XhoZ523d+-U8l5@eP>{uo=jfzw9i*fsp))PfWFSz0 z?6e%UF*7*doqDU`(&WSPS5Wcc!MUkR!zwfw-rwJooXCyAxB^21;o1}H9Zy6|?BUJ9 zs(+R;GrW6{!%@&E0={lyMtA`#xxtXw)+%iWINIC`ffi@PaRmdRxbC(U-$Te!e&vQK z*NrWW{j}o!x=LcLr^VeBD*`aCbj@yTLQ$vkgBE!Akif8dGB(s5f%LLy=&r4~{ZZLa8>WPdm^ zK7QKKSZomgmw#~Vf~&~qzPfe8b|Ufk_%obHNv`lnBQ>j2Z+mEcq@(n@7b9@WJ2_6& zmYj(U0t{E#wh83-axe5Z2B{1a@>B92st+?38aA)m7 z_W^StgLv4qy~ztFt7@u2q;!>d&D^%L0O6Mo6VB^~qp*8d-g6IZQc%!0hwVppkKIIK zOK4{Ih`h8(eOmq-DhP-t6(V34qo&haPjUO*zpe%&De2L8V(s)fPusi=lk)XPNzL=I z0D26LO}rbN;YkDQp<@b^ zjJO+AWwX&(E7$W`TAyh0agOI{xAe(ig}~cZAg2g1H6=leGYi7Ecj{D~28PsW{YjT9UtPz4>cI2g6Rm-;iU7}M1gelwSm zPex)F{Z!9=rlbS|omkFT9zml;;~0wg;h%u@skN-4Nc^IHf`W5Wrf;sdkFbt-NaT3s zJguC7U(sCPKkc(|kqjwmeHMD!WUI|iXaTZ5Hq?y$K`J~sInj~p-ViuA6w}WlT6iP` zyhP>E8;5eT`5=e3m=ODLFB z^e%yLi;&6T#BkBse6(>;b?k4)TH8}7s-l=D<@{H!8;aEw{?qL#glN?zFoM)8wiojC zW-sU?mz9OQR?5Xzi{FVMX(|^9WVHx12r-C!>7GzI)8Qz>a`d$PDM>IK(a0|{yRG2f zd8l>F1{1AzqJ|4^JEYsF6-i0xH={ew+m8w-XsVQkgNOCtF!J&uRG^TOSc$+-lSU|F)uK#nmwmRv-LKKy&0CADL)DK&%a*PzK z%~OJZc6vbdyL_@ETORGKtaaBlIQu>ytYX-$@P7p+$IL?&m9>R_87Q%NTqqGk1B6%I zaX8E>(*Tt=5n->77qf-!{mx6j%)5JE$S z+vm6L24jBF_j=5TAvrxgOp<(V;uak#Q&XtDu`LyQdye z87e%!Vv<@^7|};N`H=+3_*NG1@Q7yP^*P^tpqk)`8<|`-62b4!)*^~mGB8$UaoADtqV}b|Aey_}?$i7F zcH=+w3x|fnU=k7zeM42+?L2#9d!6xVSpA*F^TAG|+?@|XR-Sanb`_={;8z8yO*n%(ydG{sTv?dI#V#iYfTgws7wvBd#T0N-9KP7wCJEbYy=?_JL6 zt#uOWw%P8yya2B+4^cZ>bpv|0dg3Ck0wQrWnM;pa{EoLeVgIvkf4-nGK(18&+1ngv zEhVD9FM??%pEZ$NaNOG$H%UnK(Z1Xd4>e%DoCUpmfytL@{SIqH=iPHLl$gWEg1xZglVIPkXwV%L- zP)U7nC;l_u>cY;>>`Ha>*-{0Wq9V$bb|X%UznmbPp=I3k&2u~Zhlz!UG_G~ZKqqV< z9fLCsR?)UttQPhB^2Ywy+aQZkt=AFk(&6QLwHXE?Yx=)F1r}SRTy3{V@S_B!H)Wih z$kB}&3gD^(s2C(~8-c27Kc>EUB#dpF?N^!s)#`Y^C+5gBrB8#8%L7ZwI%nc|YD7+k3soozxnY^9B%Ttt- zk^n(iyafk1?05tzy$?z!6+<+KtZSl$7cAH`?px>MYxjTS6X(&*a9x9GhNmzv77%$f&8|6>7rdFiFc?GUA)9 z7lW&-iOfYr;sC;3?5^Xoqp|pMZMDK3AO8fsE*=hid%YO(Ejan__s~W3-pFZH0AzxU zusPE+l&HW_ATWW@fe597&-GY_sl`nZ@D679Z8ScR7gPh^cTbFhf{`hZP$0OQ5Ky!HRq+Krac(wY2{$}Lz;S7T+4*Gf_E^8J%)L@C}l9(pEl39E@P9Fd2?S z^Dej8pyqYC?knmDTnIKpZ|Ajb9j#EaHaZ`49U}{5^Tdq^Unzj_Idp0wR5CoSI}101 z#pEC79b3-S{=uPfi%yi?CKkS|k}|mvM=s5rlBf5Ji_pzNidF+CLTIngygruY3e=x9 zk=#~vW|-D(A*1GxIyz!KylB%*PEC~UQYOy)+LwsFMZ_1_r2$33FHbHpS)z74KxQwP zlu-qIiubW1a!N|X79Ax?EvAS)OgtW6xMG=v5zwk47JR(^!>BOvXKHk8ECTWkrNMB= zc5sjakLTRnniL98^CE1-Ouf86QCN^Il#IE2`;6a)*;Q8B4cjGxW$`~yg zHugl@maWBOu1pkMg7I6{TKiW@4%ExnQOhn&c`s4|Bwe@Q86Hv4tcTxG&<5hx?n9hn?v0-Kw?dONSYVO!h0 z(CIM9a%0M5kq`^=@7IeSRBLPPLjnAa=OCw%cKq%2}CkjP!g0w zbbJ{yn=ihtzE9kweQoL6vuKJHeD23|o4p`yKBGXb>Sk=bum_g?EeAb_^ogXv?X9(1 z?@?d`T1x0)iW9`-2Pr9KMf{TwYihyC{I?QZ&o{%O5`>0J1jkf$e#S>e=I4tN)P$>O z)(xp?Oz>_w9Mn8%Zr88PSuRXviKLv|krXS`*=Keu=1%@GS~zB((&Ece5z!m#rF_e5 zGX!so@5oD7s)qh9A*iPzsi%fqo~$z86{ib7{r8O^E)La`$87LvfIPxHmkK-Wc!IS3VwQMx#R{dTi=HV91;Le%nRb- z^+0w)MOB^2W3KkHEvQEl{AtPZva)EER#8G-&(w#knNpMKOWS6*gXfq~eLiUkg8`65 zWNM6y$=RtAW0!eRNQjhNR7A`I%Cx0q(G*5IJIg`Eu)8NKeXOX$d`Z1MuO=hWR050~UaICi>?&l3Td*o4#1^eIVH@a6MSa#th2lN=z! zU07Jyws{<|t^rY@y#4+8sZ91f%qY2%GV0{Kw3wkCz)ZcGNX}#6ePCmt?ponkSviC^6E$L^q#h0LKx)3;Uvk+z898mzwQpNd%MV@XmLt= zNwKolvUHNA$K4tB;urUMO=;w=EKTCo?V}?g@(}Ev#HfzL!7Djr5;ZQQ1Hr!j7TLr) z+q-nGENErj<2y3Lq$ELhJ+gc4LJd+5S}oRclkXI|UMv#BVxUBX_=nW)70Q%3y*omH zqAm9NEi#C12(8CULZP?eKDk)Y@VT|&z`~H@)hfXYK{w;^>2F?EI~ZWn8=~PuZ>a1p ze4PArb)^?nlp507HpANc8NxfLJq^~SHJri_WZl=}JcwvF=*LZ>GD z`Wo$UN;`1!V1I==2G4CwIB;0E>K~iQsA4u(RH@C<%>8-Ra5V2GNX21u-e+d=+{Hh4 z7i?P>K$@kytNSdBjQpYfJJMz@_TR#hV6bUd*&^WM`DFQ;3 z%MT2iNXlye4b~eCvEd;JwcKkrTUMr=eU9p=K2w^SoAY{i0W(sa@1}Xd(J(L+bx!d? zrW?kju+Dbu-Rjqs=W_`N1g)L6EfI*WjTsZp^1XwL={q3nK{n1bJqyduzcu@v^$sC@ z?N^~OOicdt#PRixJHCM4)HB$7N@nJ~2vUHOr6n5(8jF7a&R%IEE%ZsKW%4_5vnLS1 z3fYVq2!Wk%S%Z;AB9zk8<2*-Uq?AUY=Hkk1ZwIAL0Q_I^QO-q&r^d=T-A?=J*YYfz z3Br-^r$90E_00{n08KPHWq3$q@au0!DI)^O0b=q|a(=cb{fh6ZD#QY=SQ_maqHj46 z^~O?htHh)VXx|GZBqb%vx{FfD`p`i6G*r2bnBr*Pi$|lHZhVT!iX_6mxffvkfNKX< zwrU2EZCBlmgxAb1UfvF4s}@24z2T~=NK~L}XD%Ms1M(Pny==+!NeM-;BIx==1lW{CnqgU1bT!(>dL|~d5SM{*YZe*&`|K0H{ z0Jrquh&{(oH3nw=>zSgUY(^(cx>&mScChEi>V=*2mM(b4x#R&pPim!+Nb z24yaamlM9!{23KP2$ODaIa~#pX;OHpsi~jea#X9_`10IAv~d^+RQ&#(?DJ5p`cWXB zL|EF<5p9XfMp;!3y>NiMJ#oG2)m2AQm5TcTX>LwcQi@BaD1C2CxnSuG4jGZUABc*} zA%jY5$c1mUR7N~<6axo$FT-rfm*EkgIBU3I%}t?WN<_r(jZ{7_p23ob4ps5{Hw_(G zYBMMO!ooicOw72Ia|I_=c#D~m`A#K9i4YS$7oM!{ZeIb9%g7a4yr@ot3fM5lA>y)~ zXsC3ucP#Wb30CEh`lKYnFqA;1N!%VBXmoV+CFmh$T!2dlaJ^2-Bfc?K-jUTVEs3Bao;$ow3F&EW;^Pf!e=-c zj>L$Cf{dF*NplGLsdnco41Jw7?qnCmn!&~C92c9Tb~KZF+j`1iC%>N+u^RD05)yYc zX0oR*RpBC#3@)x!UNUSQO;J^$|-Burm?ecuc}^w*QNkU{eCq`gB5 z8Qk%lIxC}sC^i99x*$x9U?g38TuR=Sx3e=L1?DCEF++cND9D14!~c9>!Cay&N3Lb^ z2^~$46jKf&lZuGH#7!;23^26K1PztAdhkk)*l zRV@+|f3zhg&B1$f4PI^ik!Hp7*DMQv5)k*0dSQHjfjgF!Q`+et@XJ+HrV^x`$28lB zi~O{BvxJXaCT2-z4hUj4@SPbTeNxp_4G$!E+SF%YsH$4N9kGA|OshyD*}i?+G&(m5 z6(L9>5h*Adu03s$8+VqNHqtu89km>zTLwrI!^tN1uey;MSJpkiDTh@}I4CoH)eL3$ z8=zS(OUO`K&LIdmyEHz(Hv!q;!bc0GdJ1G{kNq<~l9T2TbdZA4^9pQ;cDr>zvSohl zS7_0$1lM4xZXccAFQ`8ZGn5q0z15kG(Hym|ZU8~F*-G+dShTRw=J&qb6wW0WO%@*}8_o6n9QmujJ= z2G0T20c!@8=ED-YZI1;)KXk4*!r$KT`a~kWi3?#n<_cB#(@}n02Jw+4T~H!>8-116C!-@QzOW}7pz*K#>1hpsZb(P+zPs)9*J;fI zEnI z3g2O%e6E+gy$xQyc$6v=4Z6X}VBT;b0n+EGG2n^>g01l)#=%j5*mBMYL-Aa&KEm(q z$?{vT|@na@#tMdQW2EI z4frNX@;Oh!@`d}XF>wYkA!{@m8cR(}SJm+a0Q`Jh&MhJQ{mm~s9GGlGwTJjs^eQ)( z3?@$>@=dCm)G{+vfM?!KZa|OA3152p=BrhBbnKRN0w{4whgo%f4dr_NOlJjt?zBZo zX~~_zu;Q74&5JIpty0PhUDsjrw!-;S|7-(lF)J(hO_9ya7Jn>F?A>NTI7EcMbD=;`x+^IzG)mX2MyvcV+`)dLFMM@^+7ifDoU>9oi>vv__x7?R$ksY zGTK&rFljF|ECK@$Ev~}-=7M((Utr%nTEY4H@n*2%>86?ui(t(}TZ&#^U;mg(IvR*u zv}k>Ehb%cNZlw(`4o?2#N7~MTnFPprs~LzZDKQrgC>?KWR2yXuxfL&?u5bWw(6W6ljli5R6*Hw>c8;84%0)~B(1LebqGCuvUAzOH&++RY5xDM)Fh*&Wg- zX=g!0#}T@-qDhOcj(!Z3`Q9_IQQ0M&j{yzM9~v4~q+!({P_1Qc&HnbLs-YcKp{8ol zfJQ{{mru0%pN2w$jnD1e8fklky71iumOnl^ahCQ8NG+c0@=%HOhU{{8pyXmo)nr~( z)zO!glA@N98qr%TM}-i;P$3a_?i{&`!jx;*W69>RnmlPXX||q&d3vXPT335A5WMVA zmF}PTn~}k0^GNyZ8Fo8*#>#ma)D;D16Yq0po_8eZ*52jF%+F8zeBQ(?#O{H9>GeaC z1%ObvSN`%7xsDL3OL1sj{mGY2knC^MPY;k#pm3!R`SmXU8Sn>N%K6KCJ|otDn?z#h zo7YiGT6e=Pa=OqL(U>yTY~7X{-z%Tj!%M~-VVv#OD|21U*>x4DU$L#$ zx*=$b>xDE)M90ta)+GkAXi11Ul7ZgMIfFqm1lIm)r;4f-?lP&V+KYL}Pe}uSi%quH z@H>+M((QETiY~qyJT`As^?rW&o44{lYzj(n%@1IO4B+wFjtMKD^Z9Q~o((tbEqj@i zcgt;JmGie^KA~h9XM+WSsfN-)EOdPr@3HY{@jHAPJ4Xm2Tz1;sADfdQy|DDS%*)H; z_qpsj656u0X85hm6gh2vu+;a7tiJ{4<9>BCno~Pu%R~9* zlCr=6>2f$z(%YM~*7w5f|Jsya@BRVPdU(0*li-(+Yv3L9`RTvAXQB-;*hOw`JS1qSFsKH`zQDi92%|@) zN$Kf>wHs@d)z!wH%YQD~wxpfaIJQS<-#lN(fJPiyjsm}YpDqRYU9aJ|Tez8eY}s{P zJPf%A@bK`c1OyQ3#)hUrZ%>pdzPPfqvfXVU6%I1-geqT)nlq(hr$s)~9g>t8yS_zaH6(0x zYV1vl!37>|10cJ(?s1dn)gz4L zMO8g9L~m>_7sSoH`4lwd@o%J_ndmF=nzL%Y?{EhrW}r=M8l{}6&LTqKSni-sI$DMQa^| zn(|Yx=fbgZrDMoHq++C)uycabs4BX z>u3c8!Vi8jnOtr5AR(i;fCAFl1-+ro;1E0|@8FPNOY7go0R=IY>K3mlXQ0G8O%M?T zr%?jP>ggf*AR@pgz^Ye)o*O%c((j7HtKK+TLw2Yd6b*lPw&ARu~ z#Z-?eNx<`p!*~`)(EhloP@~$$wsWT=|1Y7Z{Vy~e^ci5jSNvJ87o~@&H|tA>7Z)#& z%kPe`uncD7mxrHoYx6_zBZ%$yf6R{WVZvcxzLfqVeSOu76}U{d{Nw8e*>6(pVay;V_s)M3Q=XM4(Nqg?|fs?mm1@MWMMjdvYo&BWHK2>c7T{ zq!4B06^&l+=}Rn1oaW&LD81?FSMqksqJj+pNU!Q@g>7he-s#xFHZIj zb$bU;0luNcUR^id!oJTt0=t;I^=r}b_w%BXHJbBl^Gcfk_|{o? zBckIAG^;#sBNB|7Rz2_M-fkv1uDb6~hK7cQhb3Lkm)Surf~FsF_wN^;dSOvnclHY6 zQ8FM=QqNe(I|R_NGOyMAtfq&8E07oeqQF9KaXUPhmHVQ=O3uljHoQP3pOCTr;K`?| zCatN-Q$&Y>jy)kozn3NGCD3rw0GbXAETUMt-bLb*E9qCse`>^|ZTuJfj7w`K~zgU*96Ni7S;@R}W7aLEnPL`y+QC*kLeE@($dizynllDy zNoEYm*{CDFtlhEcDnh|R?>%_lys%*X@a>(zyN3aZL8_`raKU2!pCqx;oFsJ-MIjOF zSyR4OZ>TpRw4XVRe-T7pEiqAr9C=ZNpYis_5{heTh>PcB9Yvjo?EWtoz!A>Ms&bfi z_$H&TThY^#FA9DlQ&Cz!;KJ_n^Jyt65{{OhJPbV|L{#L9LZAm>f) z*4vr~8JX7W<>04Qi!(7urlsKG3TO=U{PQ0HGT=vWvpq@;F(Yi< z#dF$r<-;c-g6KcGQ}w-uE2XAwKPk)k?=Ahwk?UDDu%2JSLhr?6e2smPc`^u*@i8|E zQ<7Xd$Z!R`bnw@CcEsKHw=tH@I_vhlMRbN7S$M~U+sS4b&ZYtAACLY4@LUxO)_Tgc z)GZqKPY)@Xxw0m9kZu|+P!Zu|lNciTs5P1qRC2N+QJ=m3%G_<+?j3B|EY>x;AocZFhfHX%?tO*>1FACyXgL-M|Y08Wxp<16t+4B_2Uf1puPO>-LhR5Ias! z8D$kz3d_qgs;iOQFPEj)d$Fv-PVCpp)4SC1|_AhJB<*#xVmCu5kY17s*FItwmx66+Z%Jg z-ae|TYMd+)HrAgl`*1s~i^^!z!4!gL{*9PF89Z^^cI}XUUlMf?8MC4X5MOiVw29q` z)LPpiY_3J_+MaVb&q&lCO}ga_RfBxI0c9A#r_?ebsUwce96bfrm}Of~)J&AU={IIu zus`agtJDk}Wpi_&5R*YMM@u+{CIp?7cq-ZJmIw4KMOv6d|N31F7y(%ARu^^@DInG% zJ8$pc$S|+4ff#J;XuyTY8e{X8h>Gq;G zsKKq$jQpm)IS(!1tMnzrHulJVdg0(2w)?f;==K-%Ta}fY0CG}^LCJ#oGoXza#xN!4=MKp; zLR`%ML8Fi@|J54fS{5Fz_l-I=Z~jdAL}M^`kdk5-yK~=eU1~;@Cw)a{9q>1vZ#AS| zKCsxoJXBf!(ly51m64b2H)Y2pAdxba$Ev!Y0tzl6D@9&cmp=!wGuAg9A3FOhS>k$7 zXlQ&^LXcl?^Tl^~RMb6z-`=o+DkC4>usWSj7*O(X9|)q!Zz)!E!UfIa%V=5_+IgPK3D=KoUmB^P=Rb>wk(_FqyUjX8YpDSjOd|pp@-tXS~`=*8SP~a2< zO$fO&a+;d__AQxXiL@NNyb=IX$!VcT$xoAzltkraK&qpI4~!qx?Jv$A9v)>?RW$7E z!3mfnpflvjEI!=lfR7#bOg{uz4q=g*$-q#jy^;Bim9d8|v?~<_5L1~cxR|1lZ5HR|)+almZ)Igb`^9v&5k8HC%OBucF^h%l5 zkASkAE#NM-a+Hn7L)QgxV|R z(=)*<{)NDJ(BfhDKy9$?uMrOlA6Un-YEZa1R&@(s|t> z7`3X&DJYOy)&};+Fm>9Tk%hX50heGjkN!vsbDNtW2|xzOXlO9Y%8oTQH&|4A|(A`X}UEcJ-d>Uep!zu4=q44Uj zd}c)uKWAF;uLS8BrAw64F}?$5@VPmUZ9A)8 zlT{dN-JYCY6HX7LhJ!Gllo>7Tmbv(R)8_@{^@U>?9fM*6;)v@p8;pj7F@-#Q5o-M) zVfkI47U%_AK_;RSre~K^>dER?g(E&;$UF?{t&WA_k*M&bn<|Ef1JYoQOnyCv;H)H# zmhr$>CT(8j&e;9{ZwU!$&<03SLV~KEY!7(N=NSj4gQoQIjJ~f1g2%HvgW>3AA>%6@&@_iZ zDTPcNE1EQ3k%mKwD7iLGHdJB*4;>i8R1%!3@ww-eP$_C@30+>so1{VPdKbELc}z%4 z@>{`^cb6SxJZx&R#IN!=TSiQWL9*n?k3!vFc zkS6iT+7kJ+0fy$b`xJrr+K))#Y+tQc1hK+gQ){uQULz5YMDQwIPXo1i2ng}OKsO-+ zG*K+cfPg@ia`oJm=@o2_dM3&UpFf>%q-nlnbVsLK`3#m!WAF3dBB9lhkWp1t41&vU zj&h#7Of4+XNpRRRo<1byMSE$Vfi+LV#f6l93*QVK5)$Iru~BID0Fc;W#$?KZTYFa= zT&C25T>YpNokm9%pSrVjblv88zJ9Z_v%bsq-~CFzaB&39oDG?>1M@&do|P%STpV<^ zqA$u)bsiZN7eCd?h|wn)K+5C7r1`uG&X%$9J0`@xaoG9WQOD~A2c`Nk1O@%ZGOk3* zb2+D97Bg1u6cJV9(!xgY%FCFIjM{ftI&=7bgDOfMH}x~4on@e`X4Y9(Kv{BNOgADn zN3>#o_ueh7XWQ7gK-It3wzxo$jO-7vUpI#?jDcPG>tVa?5ePNslM;eITTkoWE3s2b((aYRllb_+PIaH6mGWx7|Pum;6 zE$ytOXf0>_wxIpoE&gG$ZRwEKO3ltLt&M!I>3LxPQ(NFmXN-oFltN-LQe9;Udd5Cc zvFQ%~1#i z-pxRxyg!WrfB$vI>ah9dKVH?ap%Z^^t_F022Bq!I2{F~KP@m2In14_%|V@r!Ie~8I|bcIZje)A>}XUO*CXXQvDH8h-)&q-jLZy-$S3g<~lgQkdYie-ACSXZE^{XqGN8n z#*yu$X0FAD0EDrTPQw>Q%>TGtWzUgc8PR$&06$l0Y)Tc804cz!kwBi&5`-86`jfdA z8adOd-4u{Ayy{`_JRfOEbx^Ws$z=&D5R0Ueg+lC;Nl1V!!C1h9resOQ#I|m<9No&2 z_Hr)ZNM}4oL%Wt025d6Xd18#mKq2vqg(|7uPz-On`5!g;xM%koQqL|FKB(;?2gGmY zkSuz)5)>LqP?t&dTs8*aROJa3*7y}7-~^Oc|1o}DocAZAi}~UhmB-7|l{Z3%S6<0f zTGIyy|BEmv$K6H5!S4<%Cys zA@7Y3(ebD-c-e=mzE>MK#7LvhkB$9{(c2D=H0&Q|v2RAKvI% zWAf@a!B_SlI853>WD;V7WO(muDWF#&B2J;~jq~Nk=$K8{hs*Uq#f4|;7~%JGI5?me z3aJ`6;*u+QAZ__;eqVv*)y7Gx{fpNyytWrinH3MuDaxo}O_-J_7E5diO2bG zDAu3N5r*&o{+*njKA_Ga6+T{Bt-jLAZ9`pN%)eVJFEFc{eEfN{i_wUgb2lYXT%dH! zr!xoogCpJE|M^Onf)coe6UQ+RWaAXsJSSKKfv>Gce-P)&FJ!ZCrV8apK~kk(09%Y0uyk^iPbk zfrGrBQqKgxlGn4%zTqLW$jJOFOsok=Kgd0@Lx-%s?IXM`RfH={b zMFR5z`&JfR$EgHkZOsTgfU&NwuBe1&&yiQB(~^&nyPASUIA(jB?8enLuf9HHa?ezj%NcWMXb1`xmh*=(H%??afcE5gUg8Qq%?d53FC_p9<+VKt>eG{p3yY2R z=*bLsc>5MWtQpBhfNWZ#^q>Vc4tIR@B&A%AReJ2Qg2ffCse|&%-S(IZ$E#jEKKd)< zQ|)S%w)~D??9I69H#x@EiNGThb7EO%Io7;K-3^p(+~9K(lbbB!T&4+R%50 zs-ljT^s+EK-|6+GEti0p)pmk*etw;HM|gq9LrffW#oyAj*>>5D++TivipQb>*(A!A zY@RWf7H28UgM))t7ymYgsv+HpHhsg=TJbL5E`5RCGA*01WiOGsz_@@<&n4{Sr@3=k z8C>ebSe4f1AR9|k?f#u=PEZuO(1;?5$-fwV;B7NmHp@)#Vo7_`s*S?^cf4I&eneFu zU35Gv)=$~rYTf7jQo9@9H4cUX5{YGf#ho)#_qk~A{akN-hri`uP{&FoCKnP&BvW9+ z5H{_lXYBiKgvLw}MYCL?oG&SD&X8!q&DL`bgxAYXz6$y`fTgsk~w4AejcG?kw{#wMneU|#^+{^DCNG=3k7!B ze$u6Gz1@74l~wKbZh8ZrMdu5Jt-OwoNISxx^dc(514=?tmJ)ct5^pC76uHb zvY~d%<4U{Y?^k1!zs~(d^&3~F1B0^=F>yLn2~6M za=tH^(uk-(cSqU10tTzA1dh*+i?4cpyo5=oq7^FNjlR4Kd7lGm5`Y{`mms6nbc}-G z55twaw|q7iGH$i+;xCs?bF9X&(PilnU_d`e$?O?htZD-W|3Aq#ZLUMVvUr^W_D1C3 zP*8T4>o8W=1hjpIoEK|8!x(Gyq)a6mMMC9k-e@f z1b_|kzyaH-slu{jI8@;)G!TegT}#X9qDiaXY90q5)wWtc%wvcJB9>^;aR~Y|P zup|t9MN-HRNvjQJK)c4KvO4zHZdskz!)IB%D&u$fYJmP6TrkY?`PT5Gzd9TGd{sl# z!-GM<_58;~iXEN;zwnzQGeC}-Jmzd9C2Pj@RQNfqtW@eXW%NTz0xwfmZsNzq>X%Bx zmhhlKZ4^=l^Rs3<2}xvk>jW2Qc@)OP*p+#ZgTpn5OkXP%v@Huoo!vxUPzC@#@bzK=Z@-wgf{0Sc$ zmDkagnEm~>^=P_-&+CqjdPI@!*9{jSsUJ*1Cd7AI)d9+~y5j(b;Oy*L79%Deonyq} zN6QLWnZQbK$S)gq=uA93g6(&nt-i~8H64TD_`*>3G^EC+W_F7Qy>&YNa`(07I?oXl z-8Egd?@V5e=Exfx8(0?ty&+$0KqoHhDeB5#_5QUr0H zEYI9@a11r~js1ey?tHl}(rUg$)zC0>?cnf!X{+xHx=L}N#^>4d^ps#Zz9sU*pG43A z^%~x3|Iog)xGgy#;GKv`Fp5gHsM!2=0X5fr@%%(vzOT?-mr<)r=_H(kf#FZxO2|r` z32sg24UKTk-~?-zl$jZJJ=5)~&A(aD=0GTEHKmOn!OYunsk+8ez5SFF5eltAjfA*2 zB!70wN&`ztMQL_>yT{?QPA@dlq{sl4{D8$Y?jL1#OJX1cm2*}ktj}nBIMcrG=oSQU zXvzONrPbbL0W>z1NvB_-Wplh?<~;~AG}h^Q_cUbDsc19h ziOc{Gqx)S~R%yocL?hLtWp%cki;9NYqzReRYFKhILnIaY7B_$X1h5D($W6$~C~nui zl9K+ss4j9^wF)1Q0mdI+SpAUt8 zZ(nE0UNx_sd%gPqyU7myh}8PH!+?X>^4(Us;};5jAU1WgOdBne$$8sUgJXzKTgGGQ zy5T60{{av~RI>P8?*iIizX}4h;{N_Vo4p=RG_rz=>n|YwHTYXG1v@)9psIKx`P37Z(>&qfvsycRj$J1%bxIW7h$8 zl9p%Fh1t3(gJ;t%do_b!RW)&?(TWia0PQWVcY`N8o-l@^36+$7qe{Y}CT3*~s)=}I zG&gfA=GY!;U&A9HMvjh6o7-HXcnO#K(uhj_RAU6*lXcIn-=i~I;=12(%FD;j*R*7G zbf{BV4Zj(GB|_iXVKS(Xd)(BQy-X3L*_Yq$^`{64=}@Wo%bQ&q3Hd=RFC|rs!JeM% zHJBG?1h}nijJcQee2BF+S_5|ce{_uqY;@Y5|EK5)qgS+V0q6Y)8Q0nPpTbydgHcGGY7#{-_W!{IX-IXT)v ztZ&yllu0qcAsp5SQ4CCpSjB~Kedk3f>t`5{u@TThAP(R%EOm2SS& zNOJ{RCXRq#q?KZ&OARm4kI8)GVxo~TT>`%olM|yyE_RH5kjutj14lV50MU02A%?|7 zlhd%I9PeAY+OCH{6T`Y*Pzv+Km%K;;0Awx7_vd+soDoZo`nT1Jr=HxmfZagp))&Gh zV~%vUf5|OZZk<@RTax-+_2)kOz2wzx5BxXW`!~A|A5mkLG!FCJ+?9ILZt75EoU>c8 zAlrhb^5oGpng96ugk8+@sV#ANbtdeQ2>?{56=X=L0u0!{HfSze-vt12@^A{*K(gvD z8V1RDj{Y+gH0+LZ`!t`HX0K@9=0@29gU{VUY@7KIHg7fxfNj>TNgtn{8;>W^%V%>0 z?~pTY`M#n1Jf9u?w`cbCiS6zg>o`sQ-IpIN`ST~_E=nB%5mimgFhsYIhMxl(9+iTD zs9H?e&G!qivjznR$7OazUsl^+cE6&Kcx?-3vEcT+UXb#+*9T{1*#glLwDOtU!7W=a zU_d%0usJi3Y*KGbGgSbx`!2hhjLKLPFk#LshPQ!UMvby*Inm{8Sl1`w|P* z*n7_P;R;dW2~;TOo1u9DRzJ;mT|3JE^yChZ{$C5gL`%;Xyj_bn9-HcHxg~bx}it4e1prk~pv?oku?Fq;jw|2GL?7Nyp ztLeVs=(zn2Fpy3i>)SJJ^=lVEdE>S0YbMB{15T>knaF|a*~Dy=&>OR-8^$ba8;t}- zZ(#}W7Y~ng;omqOh5q-?nRL|*@HpUlHXm_%KOnudd-CZzXYK6#C@?X>t6Pbu!lxzCQ^XaP-5rcKSN4g<()vk~kbptY@0Qll{c5-A@rn&4mRC`c`Q4!{d7;tN z!2R9pKnabn=EiCNL{8JvCOrWBFb}tCit=f$^VAOWHNWOcxBcEVn zpIHl)BTK4i+hp21{GI$Dsh~Q~GZcbVB@7~rC^`fnDHTeLjDTuLqYj`DG9=4rPV)klCNm{ZNyQb^y=gFsgV>i(9>Ea$4Ir$b0E$2JZ-{R3ZivIC zJixSWTx0`c6f_Kifc;!-F5Reg=XoCZ$S5+4aVX$#0!oZQn!)(2oUig;Oeh_YRf;2l zk3yrK|2h>8pO}EMbvvu6iTS1&92#7>be6nQP>E!`XAH7yu>K~DsnJ}$k>(t|KW-fa_jJqK>LI~oqbGlpz>>W4fD8@}b>FFB&0m7{ zM@nUBgX)-?20Fay`UzH{LfV?8K&pwsVJS|F2crKrOmqqVuu;d#2l9eKO7Q=*oRj9% z+DiZ+CP-3HKmmrT^nN8RpUx3Xo8y*6-opS+XN{?QksfS{dtT8pqelTXTgD}y{tG?y z5f`++AYtr*0Ur*p=P_gkXmvPemqvCEM2Gj)~E8cmf5W}=q> z|HmNG!#|e1uBzxtV1H-T8SM*zEGjCkKfa-+8Yz9j?D$d!Lc_s{k#h!dE=)*rmY}EN zNgG>pILX4}MM+Th+D{z6sC?1v?H@ z@t8EM!9~JRGI3-9cpjjO0gyfd^g5NG5y?6AEt%mU`2~hA!YiS=6*L?)5y!1~U%!e2 zY&$g_RZw|D$^75NzCkOsG_GG9PT}xD(voPzgi~{76Ljk>xtJrd*S+GgjyI;17y1{# zKOdiv{-2-%ron$Gl{NoP8=l>XeNu-lHLupFvmTe29~gT2_-&~Bc8l{4o9zd969+#2Pzvj>-Co79DD;o}|Ozbq!=P`SO@b^uW3^% z;Om3XF|2n1d#I|KzMPyKC#QwN(Wd9+POm>C71dz=-_zx~p90?Rkn7${*@J^pb?)=7 z9xv_7?Y{^c%%`^7&uXZ6e#6S8u$Wp}rojWsJ6^WYze{>zIy!v%8`%=l(&)sPW56)& zesqC4d)CBc(CHU;rR~d-9P-g;@9aGMgSa^%4lQ=WUK&f1Mq!*B5T#W*;om(za{9dS z!oa|2x8JE&Y7+ka@)tOCZ$4g0*(|1+{#4k2EY->2@SEVhQsPB>0ITTQqZ4=*c3xf?b94Uda3?BiYBET4^qpg5 z4`7!cos>T^`hm^?;pBvFyOA+c)v^&J#hjy+d@eFSZ9s9iLn$omAJWc`fJ#b5PaO>4 z#VUXj^fE^Aw8EzC5d`bhmOZJ@MH&d|eI@OT1sv+}|2}zyO%Yr#hE3Uj0s<$Xfc64g zwg9@6-ELU^Yrl9IONA+r7gBU&%Dy1d`*5+=dP>MRN|Zaanp~l5vw#-`1E@X9bxtIP zBsf{95z(*vCvV~cks@JrA*f!0xCWCXB~s(@77yoJpt(`A3TV-HD6Ydg)~hgk#CNIO%d z@%--Ql(J>K`rQUJXmm~j1eEgw-~fOM4RSoeP6e%OiYd#$akAzp{Bl2_I}zrhN&+A` z*Yjyw>MzOrQCPrK!G2u_oZ0}^FaBJI5ktyySp9kla0Io!O5pS-R!rT-^j{7%@Q|bk zPEX5uRiqp&c$&U^nKX2UZ@|@)KLKIliAMp$6&f~iux5p%1Dg>_J>Vm(g@Vo3tOyH> zC@OA({uu||B&DEa!LvuJL&iRzcPOm zRifC-zKm+b!mP6ITY zO$S(rhlc$?1_vBGym^Kp)JuT(U)LC_M=%1>e275E(A@q@@lc4i#JH>NK0kCwh_wh; z=gMQc8NmlEZZGY+0`W+2NDj6DVsLQEZ&;iEPWJ9`KVp{lB(Wp`nH(a^_rZgoDaIqw zOQ=qm=uXdK4*V|5!)SZZ5=h7Ive^_B+|`47&OetFezOIj!cyWXGek)E+9l8AZW9`< zwmQ|FUOWQ*A#eh4G>p{QUOS&JOP`E-+{wrkhG+Tz@7elY?6`=H5PxIIylT0}b(33{aDV^T)|-ekWo=!KQu=dyUr%t3j!;fodq@{o9)xDGecBn}siq}^ zu{*2V_&SO_T0cqUCpQ06NpxtcvLnlDVE_l2wN5^&?)f0N<1hUD0?y&(mt72oD0w&9 z`t~<&+-bBvv)kVw20Pbi#Z2ob0nPC(X%8wi)A3zyY_D@|7*z*;GfG?swNiSOV@I3i zDOQPmM))Kgf;G8l399nGkjW~1Cv9@Bpu>-~2V`}PzgJx&Id25>St5YY27$uk&h5%* zSR%AAGFRxs#OHZw3!o1R8#*~SbX|Cz@}y%CaS0k*9gPQrFky8Y-QJR1@YAdNSbQGW zYo2lqKanCg15n|4SX@4AhAv7wI~)t7qH&17Fejg{rompN7#r+!MiwUkD_i zKA#u&#J>iIVbb!u_#h-F+~iA6#O8Vh2#~a9HZHiV`xtCn{H#qn-LKB!9-m-LkK-gM z91EL2ktqGEqN*AJGBO^Q#B{%lr)|9z*pd)6eK>Dx{N0F#ODHF)fxY;HvAmofDAhWT z`;PxUg?S6#vA8O4d0z-%B7;RG`C&RZe1|`O<?>H+}Jm^&lwSR4F|$nua%K9T$KF=Nl;SgrV}!O6Q23v}Te z6cKfePfGkWeWaDYA6+;FO^K%YtX)LGWS+EpNJV%k6jK8q zno-c8sB&Y0-ie~05>L)pIMoC`>nLWLn+XTeJTaJ6eEQS+qCu=MfXoj`cue}IIOf<1 zeFVbbk!YBR&38&mOB<13YAU!wvG^kVSFdfS?V7MK@4;%g%}5G3G>kuRin(1gE3uHH z@aX8N=LFuqM-U1hMck5Ng9pxYYx4pg%)ogB9P^@wYFl!>z>RsPA*M&AFD*)IB3Ih9 zbpAyX7henidRZIh+I$f1>j?|QE{Q8i^Mr@XTChzBlX4M&VcV#{7=!zjLiwQ8ObGR! z)$|O!Kl^ULBH1==9$fIuEhg(RW^bgqI z4xpUFr!``L!LCPY`6TdmNBjlDnHzk4U_~s#4-A4=iU<(naxqNdkGOODUFM1jd{7;4 z;GR6rZ{99}gcY4pCz-sn@>q-|hIddAAd2qm_^={w6Y$8d%n%7aAKIwR8KF#A!9!u9 z$j5UhK1{w~C-=YlO2$>_fuDk^{HR878+vggy$p_aa~+PPoN=Md4qr*B9V@XLKk#kA zH%iM?vQ~P&vhsT`+~6jhBRoa2?qx#kKeKu=87@MQ{hg_2t?16jP%i^*_m|fa&ZxHY zk|w-b5FJ>?aV|=5Sv&{y3I&U>@pB@-=*{ydy}s?eXWNbc@k5*~@XMGHj;VR=djDsA zB<73@eT|gh;Kz3E0Na#DvVjA93tLKXs|VKX?y=KKy{0 z2kG0X-^WVE9EGtCsjOURv|E*GP}=+_L+kU2gFEvciLR7s!s6|N^ZZ=6$Fis1%csG> z5Ec^z#I)7ij91hs1Ii!d=wEP_(y1_Di5%8Z zMV4R+U$f*X6-OgGN9WOdcAtmN<<@1ex~dc%W3SkhO+gleFuMr~nX(6BgU@c~7B@rC zDYFAF7Lv5s9bN>f#-xArfk%D%bC7+a(B$o?e@A?M#CD#KZeh12Hh0q=bH`AoG?I`Q zNMT+B#$iA7+1i$Eu!{@gtduTrYCjHeeh<%A0P_v>3jwp!rwaRZw&ZmF#4f=^m-L&N z0;kyHkf= z#P|@c%n%ezmH!b$EF`2va-Q*g2{1fI%p}IMBhV~%HY5PnvEz3H0)KBvXA^(d5tJyi zq~gB11XBxCVX^CZ|91#GXqZ+LNTEWbebF5QP2VfUw}$|daT9c=!dHX{Ko~G;^_xIz735$ex@bzDn)ZqC)hsvN7V}q?yt%OKCAZG~Aq36EaS8_YR z8~Y(W-^S?VvPI+-J7M3X);F&8$t{b87BDE}xL?v%e(wkYaP)IZ?*A-y!fx;Sz%dKh zf`CiNX4mE;HA@e|Nk8I5KCV%hVXCw*xJlgJRJeh@{W6AyU$NtV-PpzXEW z)BRue@2hs91+69L*RHMnH#d3;3Uv1P!FQ2|X@22qhWCLP;+ED9T7``EB9^2S1m!Xn z@%GW(Zl+qM=3bUr(sogQh+^fk4i$wBwQ#OW;cHX9%YU)yMa+>{EBfPyYf2*N>61c_ z>*-_ZkDW(CGdvtfpQ65vqp~O2<12|4Y20SRzQ+fbnx*`*mlawyrHzeQLy@>9Y|Yo( z;*X9Ddt?B|ELHKB!}miE;_aP1T^`8KlarxR1)_UF?#Hc3`_%`T*_kUHM_`&2!LxBj z92_xqJ_9gV2z*Nh0>P{)KGC6}F>SX5V^dSb%_TAE4d!#Ji~A5(A;Y^n`IL-|k>Ky4 zWX3NwUBVkLW~%TEHwezp=I=O6nv9sGiia{U5lKFoK47=x%FiUNh>~7p?6;7`+Hm6CUB_M=albbe3=TX zW%=hT9f^PH5nzz<gwv{j`gz1??RsuqQ^HcY7(Kq_H~o1pEAb7 zK>!hGowtuXY1|Gl(htNG?9_nhO4-F4^;Fk}ev;92HA{!9@f2N>7JSoxf%~s9dwMur z(O2}-&ZfSd3wjJaN)i@H24@t$qM&2rMsHY^wpVA& z#wk~#Fk)jL1O&FIG}tLKrd#G683%$$6RzTp4e=6IQ8s zYgtK)S~W&!MmvY1MHaQ)C>fA5R$ft2)L4|1w@p^03jgIx6Osbq*OzW$I1GOf<;d*n zrbJ-3|1b>Y$q6hTzb#vJu`KHOv?jvMPuWXQ?zHX7>itBT^Tn64 z_yP$QpD!5Po`m&VS13D-IwE0K$Cbsp4`Zr0>%VCMG|qObHW+o&J@;K2CC*U0cjr!g zvfGNgR581#H4n}^J4gES#R4!zu2?j<9er;8m_Ll($2|ls%np99=@u(2PbSW61}SUJ zO#NofbI|o|uG)~l+1|9(ZHvh~oEjkiRb2TuAOtdWu1=Q;=`45nMS(DG%rr~TIiQ2I zHJ3zI=n55?ibF60V6{NYb76G@y__>$qyCVuWehcdD~|2*PsQ^~q?xw7x!2npp0Fid zGV`x2evgD}Oj_6C*N*#K71}X<3e57V@;!f867#L@E|2jwO!7eJd`adVG#a@@?^{ zcwtF+Esxr>)$UHQ__$$;{CFloXIG(mJQ=h2=PPe;=>CFoIs=5HJ)I`9;)%FZfSjDP zD{)XtN%Pw3!WUCC4>#NqYXqMmT0|Uq?tlGaDcNk!M#2{&N>?8b`E>>$$#-&uqQjuX zg{1}1=3>ak59v5KI_z(*wyV=^iKR~4WWo&S0^E%OF_I2F6Zt~0yzT$cRNIoq3!EPS zX3yP;9`^B^l8!5>p!4gvoL+1!o=`+#D9R4*_Dne??Q)9=&#UV>H62r0f2APsfZ#q; zqod)AEJ3fVi?bGG72WA-g)KBZjKRhG%+V=+B{NBAaZf-4RKDkRbtxxt^4( z5BCawx+#%}?57W;7z~4$g1sX5=VQN(dQwv2Z(&^EHoxn4>6M<}tk}iaSpwc6wWE%T zB*J3$2HYAN8dRkvwZ9+jJ&I^<7e#Oqam$nrl5-J9w2G<8f=6669gV4U&U7yBFQA3>(S(_90Kk7JCN-MQ!nbVV|9$vP z(npLXQdnEwQ5nx>$zGH^_4dicw{K!16Y>?c?tCIyLPDa!{DL3AN5>`@$yix)6B1N$ zSiDk!lr4@KGmhVzOc4af;OfjKH`@P&Re5&7$*c;E!ujqJ0LGm<|nDEgrYK3g#;y075TN~qG}u@LxqMypy3lrN_)b7 z_=7_QLB(@B!jWCAz>;!0J{buf}m3XcgH4BP_RE5+Ix5<<7BG0R};4UJ39qI zCyh`rFc<^`Uo|w4|LYlNrbcF#fJ-jt+0x~)a8ubl?%?_d3h;Q#L}=!RR;ck04$PpS zp)v5$CkDf{3PEM`Oms#U?O(XKxC#K_iFK2NM9`k&D&SuO;z-&?O`RucFrC{3(ivMt z<2TytsVR0HdGWvOFzf=_lp0rPVQfjWs7y8zpbZF#B9JnkAu0P}{b!tUrPZ1lyVy*I z3IppK^uS0A89zsePvGmkKshR~i7sd^&MI$->MJkiM@P2RMo>rrnvEoMz(0SWx3-S5 z&3cYkodFy5^WMqp-D`|_G@pz%w=sU8jE>RblDK8o!pLy?XdjIfGj>sY0=T2g%Es>C za^#ZESIWbNJn?Bkys9sE``x7^1x0yb zd-&4uk#N!s$r!*ULOCPc_dH3|+0_{y6P*u)vfLikpK#WasySqYs52Z?OJ5#LUaQ#} zbopPE!O2TuN@7#fC6E9667cbZ4*(I<6les6guvswPGIB4u$L>j6^TTGLrY;}gkG()1w_wOUX0=_%j3ibTw4fhEq zayXqiba%1@j2@$EO2QLc244OR7BlgwTB8Bbx9KAPG_wGPxOjIjR-|ujDNxwkGk$>* zJv%gEC^8i=toDDrhibRDVgeyLfIfWF`v~&kaz*LuSEAR4PRT3V|7!t=C9uBmW})b2 zd~b7^S8nlP)?W;01Q`Ks&5xEf_Qnov-l{3)qC454`L)QBMH<{_J&L~N9{|GxTrXEQ zU}gbqqJv=-Qt|FLT!vNJeK$%y`=?`=$Cm$kZMk;*Gk_Ma)_#RySRvi-ngUZ%z;!nf zgRk`n%&^)((Owh9UFWF0x{`vIDe0%h^qevfkj#J(`8Q(Bvft=9ud4~UO0c_+xxqftqUJynmi3eAVh0I*}=w(7ChXt-2=-= z=vA7GU{@y|&j-Pr6w;7wy%8H8aD8%^Vtf;$CI$}nbl#2?9umwX4JWZ3@p3I_Zan~- zk=X9ySnwBAFbpOJ&bY>sywTMxxuuJ)ERk5-xcHHQdp}A-Xn?$ACte_FE>4De-{Ob@;@StaT&Y>4 zO0Sw8RT=e@>HX#>7Xh+nWMm6%yv+I~Buge`wqmF{L$S0TN6UsMtd1Ep5HV7yUS7LK zEMvyOrOT`u9A(8bwcq?|Z}D7e$YH!r$Dx#4*j1H%+^bDgu%Rz_QB>80oCpdVvhB0w zpiKUzVzU6;dQ`jpA#infbJ~ASmxOTFbWb$H7pO;WaZ)f-R$lehC4!g8^&3J2Xlao= zal(;b@4ne0#*EEz&i z5c5aV1rF9Cx)~YQs0dGE%cQh8yL-FOMj%)q5LaBI4!o-$2*n=9o9?dN5E; z_P+t)Li{&<@Wu&U1b+V2XV;Zfx(HyG=5U)uGw^w)hCw+ERp0eU7}$|0RG9~XVusE+ zPjyIshSKO zV36=77FT}Cn5iasJdlwW!*+l8xIMd}6O#rGuLb&D8NHz5%UJhpnjRdodAw;?69|y> zD2o6bVElx}aprv^*B4IT2RrRr7i`_tI!sLB$Zw_nHlat%c!clt_@3fcXu~P zcZZa8HwZ{~qcqYD(k;?TcSuQhcQ;7)x1RBh_m{&V965)**IsMRdtMi&hel(-^5ZQg z1tg!-#_7JKlp?k;-0j}MYj2j22XbZFXX2=DF*0Rp6bT9hqPv93#3Es%R^}Tu6d}@K zn3x!0ak*&koP{x+w#eTLMVD6*j5pk54vA#SOKCs{DdzEY#^>AgPI}oOAfrm`Zvs>W zyS5Uc3K*dQR8uf0k9k6Z4Ef_@VgPyew<(wRwk$|z%~<~Jq{RyIOM|BOFpnR-L~>^W z{3E_a$xux@Jr8oIJ>63Biy#zQgD?PMhJmu8A2GPf!+Vw2#a|GjkU=yJQk;^4vR@O4 z+wMe83^4MsD#K%M%I7D_Rmge@0Wcd?qI{ae??eu~6`An--~cFC@&pBZ9uH`}?9`n# z;Yj2t$giwS9N{K(0<5qZiZXIK@cyv3Q~>$}_R>@-a`Fmt`AK@ln%doyFX1+hj-R$- z)DI?^LjNVYfCnqS_YJR5}mK1D_JU`rC~uNMmeoF^wF4vHNY!U zwJ+m00rQg!KM5>U60KpdBIE90Lg5Y`_U8Vvq_ez@_PZqTcq@{hzt}8Lp=TT`Z7cX@ zGhHoP`R|A^Fzy?&`M{W=hK2^vvj#91r~W<(PgtQ7PbC{lNTd~AfC0WL2nK~vPszC)*T$T}Biijt^J%HF=A zqbwVQlZEDllas5ena)*Zu`i;oR_i078lL-{xybWh77^ezHn$Aim6>3qm_cpmGc`@0 zx{=Y4B$`NU(mD@9r#{}XF~1J$Ml~jZ8gcc=}?yyI~BWpa(X6H%U=s z1fP=`RweLDk(j|Lh(~VFrg*mKM2Ho4WW|96xU=mUl2d%o!#$o#0#Dd5Ecv?7cTglL zQld<(az^!|QUA%ZBP}aAE)*?z>*OY_5pmSy-SmVP*g}gPo=okJH^8L>m$Ize!+j)= z5#Pl1p$a)>*j-|^FTiC>DwY`H>rpBrc!m&gSYvD1>D1=Aw3;-@olshh988$@giN9Q zU8(U#x#7N%qruc5#F^e-*;%4ETN^$8$>Cz^xkPMV@#Yi5G)+5b?chKuBoMS*GFsaA z;>qUBwJ%t9jC$7!rD|lT?Cwn?8IC+~Rx+6>jb$qi6>(* zN2??PG{bk6I52?f1j2WknzIfv`A8l_#MnU^v@~>d;S&?+kdV(DnWNV4^%QBb)XJbk zd+IaU>F$VaQ@*7iSRj|kfPxHTC>xVjfVib4_tpNY!Uug4d4#f=xis^7Jp_1ou`-R8 zVR|VGP6E!z?;|I_!956rMXPABAM1!O>;XLxm%SCbZ~ThV`re@IkvB*tFcwtN6f!WQ zdV^|L>+2%O$pxfm2)PkMw`8eKlzF10-%n3XNyMwvME#^$V(k{8hlZhTMJOJzFTOB- zck)twJRo-_N)5pfDjoWs=RIZ05Wwu&+~f!+wRRW;exsJ-&{wLftJ^w04mKz`7&9{b z*djD>z&7g%!6wLX%wo?1Lbp4=&c~qP;SE0|X0Onpp`jIVE?PRDOG!2MrJ}T2ze&#@ zP}a86_M|Pxei8Ha74*nNfrf}A-`L!J$d0#wfC!%!_tp2EuV+X>e6M$EX6OQ;GBk2O>g~DUpB?#m=Wd@5Ywpr` zOD^pN+134EDg5!X!t753MzVJDHdv(0{Qkv3erUZ>zac`Zf$p|K2i1_xTWbpcy6(Iiw#tp?Jn}B7$bY~w8v#R^Y@9eXUqrX#~qFssbYS3M0 zbxT22jhb&`fPXXnE^Su&s%YRM@`$uqqbHnpCzn4_ zqBn>2FRXw?@29N+HW4jKId%dRzvtU0KD)8=k);Lcr?^-;SUre5PbPTON-}i#Z=cog7Wq>|i$QjL6l-V{HCD=>RIV%oi*|g(sD76_ zgRi~#0@3#jFKjci2oh=j3!X5RcyG|!&i8j1V{Ejgo}`61ZfjLpapCVarLZ98ABxWWG|5$r=h)tW-a4urXEX%hR*7orO|}<0YftxvZlnUX zKW%~6W#qd*77V}lHR%K#0{}Kgr#13ILIM~9^doe0YUfJdeD?6i0(!IGOJeU-it%nn z>+c`#&GA?*TB+q~1?_Yywc2LZ-Vbo?=(ejI671J)zO zAD;Mvw+;i6`;mH;{U&GRob2C@_G}^jA)P7BYTU@vh7;s140ZFAnQ|L$wfuzqIF@44 zm8|@P{dAk3KZiw=_Lrm(H9efc&XEvi$%8d=c3Uaf)(8tHJa#--mX^C9 z>23a=ke-pzwChWN91MvP%Peq`PL(=3YPhhJDw9#svq!{FkcXkD6z12W28xPO%h}k? zZSP}=DLc?&ic7>51r(K%bmo~O(nSUKDZ2r0JW3iPqvH$Xrz5+4eW1c z%RefAZnk@_cMnfz{%FG2vNw`9bZ0TAjWxeZ&8};xi%(As8L~E;s{6dyZV6`_6V~gC zhE9SfssEX1@{)sIQ{m{R?Z=;*BTa|2S!#5I;=K(d`h31ZP|*LCg~2@4&h9=22G-D0 zwHD`LKZ8c9*2P>V(&20;uR5L4cyo^(PxX?Rk~_CQ+>QC^-t5er1{NlvjI=HRLnOnA zXiXe!drrt7>K=0{uRGy1C0#o;AqIbS`SlJWV`EW3Gp^CCgoX>B@O3f<^a84DZXcg( zh5zb1S{mOpXg9~6&cyRIDP1$6178l)=y4DepRTFd*(0dnP&beFhsTtb!NE5@TBhUi z-nGr&-|M0yJYmRkMtc^M2-jEI@)tGz#PR2*x3z(TS;3UGc3(9e4GC2fc(_|K)4w}I zZ4YyT;3%hVs2OFn9$`RRTH?W5TMLr-Gqs>A?MH&a>P%vPOUPXzpCOz_(X%yray^*6j~%KSpj= zL|iAET3PbZKLv20i%_T{XQz%x4k*JH5YV~0LB#Z>rO>7aNIrdLyqv_GK)R+*h zePQ4@{HNR8y3W?f=g3=`Ot5betMnri_xl-MRXtTH+qX5aT2*BTL^ALiji=5M0T*Qf zIbEEGYi9W#0s*KH7R8YE{~;==`81#m>GwQ2KWlEy>vU6(g)iX4hcSsUqQ{=5E~}C! zA@dl!YT$l4JJP;wrA*4-U1mOTd3m|*r^Q1XjM1#7yx#rN?64OToxvGK(|aH(^zaOx{W? zU>%WEH^(B336srz<^mV6v|9w&AAyP{0jCf2c6B>!ieBF-+Dn3rKNU(UZIRj`j{cP` zXU65l^+q3_5wM9cgJKmt5)$Y}hV!oZMNOK^T$~u^mdeIK&sDC<>F7W!mnJD?Hc%wV zAI>s`O2Wmt{F8#!t4t+XKcQf!f2X2?*5I%zMWc$L0N5N`?BZc+R|8ux-6)%O6-@JzvZ-Rq^44(3|(AY zbPX?Ox|WV5`m@!b83V>91~h_lcoJwjf_cP?%d7mVmQ*N$0o9+$UQdsC8jJ=+L0JW@ z{c=GH#RVNDslBqOTQ!1~)PvnHf-&^vMd)-Mg_Sjo?gy@Mmniw*2Az z@1_%&j(#Tw4qK+C6hM7-wS~lnfsg-1;|MVflq)65$SEnKb-6xWPDtLV8X6Ao49z=j zNx`;y6mvOm&8CmgQd0KdbGuNFKkxF}@nn8xAV8-MT2_7fi!9UXUd9@=vsUTwvgDGm zLeiwezS^qOax;8wpV%4^AyG-q%t-vUAyy|M01jRgM|Jo251igd?w})*s2@MvCg?!H zLy4QKDvFtiMIb~TlLO`J{CLm6`1fyQlnOKfsF`7+V=A`hXA6?H5tSZL(+MWoxPD4Z z{;oKdp$LmYB%x-@`L$d8noKDEc~r&Rq|_yDHP03ZfeV z8+#86A74)124SdO4WHK=auz2gL^cd76JJ)t5BU`$;QsL`VWpLhDN1ag<{oS&)X98(&#f+1|({vXJ|lVy0+t*9Lh7 zE|a7T3LPWs_oKgzu*f8es&eQM9T4d(w4AXy7LQ85o!~o#_cqWHR$wgNbMrcFdBM&b za3NGGcUKu6Mga2b9EZgqd56v;NPkQ75m%j9NlU}Tpu~Wk10&PVrq`AXyR}~lfW-p_ zpg4Y(5A*x7X5M;037~P?+uMVuKf}mp2{RsxF#Ic0w>U{Jr1qAubG>G=R!?^`0(B-5j_L53ZtJg|pTRjc?=%#X&neq@Y#%`~n5Wa$PJhAt5p1 zU7r7ZjF!QIdPJk$f97v+T<)u%SFt$#9@F+b^?B9ehRH}2=RM;WToz7?h$g4#^#&4j zXoN5TTuU0Js5WLsz>JoG3i^{0^x9z#cBA2_T(}hlyT9^-SRJB?N%XQDKEQKXeP1F{ zrB9*X5v}Y50g%V4cf-<@sZgj=%z!t)4axBkiZoIhUnODi=_5!i1@iAymy*NMnb%C*>b zbes!ikGp=u4|lzuR%J(xBVXfzWX>b6rn^qP@e&PBqdJ+bXGP?Z>0THE57wG{6zC zB36dWA5Xq~lQey3_@IT@1Ai@Nz zO*=G^WKe;a6{LOa;v#a{4~tEOsNud92#*2=8g zmJS6sjev}_!*(Ys4tjr5p?|)J&GUDstR9_olEV+ec;DSF8q4FcVYDD%HX033-RV8Yg&XTtVxW zlCn2JK5!|_5P=k5k;NiQS8-Q5g+q#O(ZZWMv| z7GbWy=Nf^^7S>M%^a0~H?i@`k-N=w~G*ia@SuK3*ZU$DlU(f5&9xD&RQ{e>z*|wSv zI-oE<&)@H~I37P%Ij=Ufu5XWRXP@y17)$!jb6|?+$*Qq|862P%bO8rZyTqBpoBQ)$ zF-LQ8L-kT#y3%JkL3qZ@`aM)gXN8V$5XeM=LBXxJ01Ihk9NzIU4wj`}lN+={!D!*P zB^1?Z-lLC5w$NhVut6}qqn4E4#UcoqhVkh5_=inJ0UsEwN~aeqD)^a&Y7U3UYoa11 zwyqI3WKm?iBvxQn=)Bcs$DzKi8jg%NtMfH6Ohy>D9On0;RB3g}sM+qV%@tqW-Mi`1 zQ8CJdnzQ5C_q^{hNHJo)hWK%;p;=feM>S?OJZ^r2OkhL9+&T2Q`|0KF~CDlkq6-<2`wB?{-UK%cz5~p!((!XBi?X_(YG&Q zV30o5uK{_IfimydXAK5_v+vY>>9r}S{B+%J>&SWja%`E5!*h(x>%3k1Y(DQd3XSjG z$^LP*)<+|)?o7vLtPI7lFMElvFV!C?ElO;K>rJQWitMuZ#c%acbSG2MlF!pdB+0Ew1dE) zx*r_+CPg)A@+%!(deXk&`D&f2ncPzeakaNeF`iBT)XReTWCk{KS+&0$62l)Vw z##K+aKpiK+xRpTBhy5#O0g%TQ5NZ=@+K=-zvF1|M)a~v;Ti^3jMkVXKgy1X=`dn%( zTL{KNUVNRmi-tgROHEI;=R|bGd~KBXYNjx-XJSp<-kl{l3~lpJJEu=_;&N{*R6|oE zAz%+)@BIq$q@N%bAe z{Q?ap?}zO9i|gwiRwHjgvw+W-6Nw$?L^(eH_~$C$zSngZGBA!6*VRR!5Y4;1+^EyD zvTQs*2+=BiADlP#m$9q3^aCVcNYOj#?6hdk{~?dG;ipss%bb< zre4ax$lSlYoS8rs{@bk27R-KT@CKr~WMIcT-`ddvIS#Xa1LV8lvK-Cw&W(PX`N^fV zeo(cDCgln$l?@ua8@#q6V%V$NPhgC-rOwYnZ$H9S`-5*}vVFX^-2E6?) zP3;)jXEJVQcgwWo^i!+rQ6JFP1X+;+NpUTA4x_cTduu-i7G`nEgbgQwA3vDsI5;DJ zHxn?wSrEjDTz!IUgQ72Ik}g)m*uaVS_}-&is#uv}dCrlNqZkgv^{9E@gt+TxHMF(z zC1q?3Srk$dy{h50&h`EyrK6zur25sRV`#_po7Jl(8vm()alMT9*^v4Za+#R^fpu`z zT@%tu@rP2gLjiY$^^soC>>6M!e|G@+dvTQj}2Joh7{xd*rf)l9g(WuYbOe;2p zq)WGBz^-|AZJ^|uy7a#+KyuRuBv$70&VP4lO*akRA)z6gZS<{+hr;w``$3bxnN&Tt z+#1xk?!-Z+S>EL z@yf&C>UG3nBn}hX+b&FrVrQ&#Z&krZI~j@}x}5E4m z{BTsRsn}+P7=`N}GGtc-?B$}uugJY&sOFagAHZ}i?~rh!_ijokG7(S2k3rIRb}LO^ zSFXH4UJ1-SGSCn1M~Vs$2crr7sakFI-Yo`Sm(xFUypN87A!9B{bv*A#YcCgQHQJUz zAqh7n49L68tV+W$zy!CpywuIg;n8(6Zknowj+~SmH2CfIH_%Rbp6vbUF8tx| zmL=d3WNI!`V}9(hw7i6XhALZ<==`|AAQMM6JcKn+R>4R|$^6$)cK@&9?EHKJK-6g} z(d2jM6Z3n7eE-f!%;$AE`3W8oX>%q4OU?q)Dl?St4SsCT%8WDpAZe<)+^b!Gy_(F3 z(#>)LrNrYe)8ET~w-Suj^bAa5lqq>yK3nLO_)4(XC_ZgM&*<^fGX38XO*A|FrzkQ3kxV`N;t5G*li*D2=AMVhTQBxBNhDFtN#4T@kx#hI8T6*K7{y`}0u!CzfF778nh_ZYAJ}Wh9FuSF?O>N|yivQaZE`Gyrc;l)w{)G^s2&Ihhnb zD5zqD`0@5wN!JEOG7Nd^W`2#@|IK49;0g+tC z|7tR^XO7yf)P#;MYhe)M4>yk>#}f0$b{LKK@EUEFWbnFz?$yZNSb>%xLFqV$dB4Ux zPm=J^i5gX(yE7$wd+v^owS@|gpFclGs6<#UH;^c1d2yq}C?%(+Zj)_{M{E|pm42$w ztMh9)k^}(&?^l)ai!LlQQ1_91j1^va>GCf+U+w)~ZJ=AM`JqFGHjQJm-?{B^>GMdl zzX(=|vf00p<0k*d(Uq%%7mMs+v%Y;}4n})qTEzuvqHdA=XhKok?9$lGlF{wU0aD-v zoK`K}KQ=E-_dhoH=X!PjJUu>fD0Fdq({1WWo-{l(HVR2jEtFjOnfIfvkvQNJ0m0x% zI!`9*(#OKRcI|aqkfQK!&uRIoC-EG#P$B!0`ydW4|QfX8?JLFi9*LkO)?0JOG#@u2e=U=!zw2 zML<9>yN@sh6Dt6xF`8c63)1wZ?XzO)u2kwJ2Ez^Z`j^)il$?youKT|(|6QA&@L|>0 zyZ@JS2@s*+%ToUNdAQ~9;tl4-nj--#A^rm0Wy~^3-82Qd#n&VtKHHcI#t%X)we@Yh!m2+&h?k?Fz&)a|^6|s|FSLi}UKM`t6F#yRR}7oNuz#C^=Ty7KO8TugS37P3Ky9>O z=P*GkVAp{9?+TGXz>WRg{`fuy7FOTOop4Wib?3+m|JC9zdzPCUADLL<{)aY2kbrIX zxrN#|*xZ&Hkoss`UHbN=V}axpbfP(|odOkxT|r0?C>}teVp7gSnKe$xN7S+7lJ;)J zpDZI|@%ktmva2kqR9^m2+`&OaI1vki&*K_+>cv6y#Qg?CYRuAV+i5{w;XwYgK8}5* zJ*aiH`M1HNy7}L#e9EHYWJXsFA6K_vVd&ntn&^71g%3Cc}LB!Qn}xzOKKq}re-9Zbl~5a zVr;(W=4pQIkcP9N3U|ITYy{x%A4M7+*_?}*$IO_hpw<69H#6T2Dj))&S zY7xW_w(q+Ot?Tu+Ffmm>a~l#c!=VDdlBb9pTarV14=6P2*z-_hB7iMwj=v9w(}9WK z%S+S#?GtY87k&-1m|st+1egKfaMMw z7yGy6FprV{sdP@j5kHUpN>4mRFxZC}OP0>oSlz%r-jPL2T3g&4X(p#>v-|yVf<+}9 zY zBo|x#@z4OfP7jS_^CJd0OMv_``|(_J+vCWG5w@IgNjInSTrz5M_AfI5?bdxk68R<@ zHQgXLDdKxaHRX8KjI}n!G_A^jMCN zQZB>``=(f#Dh44z|7EbO{OK}M($HXGpx2kXH2-L=a>;MWrA7g%`=s9AGI$mH4xKo+ zjy^(%!%qKpWP3z88s|N3i0|;{4VFdCFQ~}U&hf!eVM8PJJHlwFTKp4^^cFeI@bAF* zH3aJE&2Dn9nhB0Elov?CcE?qOWc>}9K8;(U=b}d`mzs`#M>$#cjNjT)gBIU-*v~Ch z$+Z9z_wmEnXO#cgGTvK4qP7Ol<8{RLnMqeW?x+Oj{AsDrlsik1@=)d>A%Uf&GShAM z!2vCTO^PNI zCN}n``jE<8SUD>7Ss!V;Kc?W2RY$L67J1kk0sGGyGgl!ysCw-1MNP z+wY+d(X7CnzMNj7+L2mB1a-c_0fu+Qi3Qx+qmC<_C7JK||kfZ*TX$xg@mWFj4hKZ~eX#?N`sY94I+mdE1eE z&&v%WQn96JbRMlx!QEYhm*#x_C)ifO2vOY;&bb;9@^_L@C6}i zF&g^oUKlM{a;xNQA03sHqp#0-Lps~9F&#UvXh}(Pz@C^~dobN=bT%Xm=IVBtY~%D4 z#A0P=lP2fpfRLU1osm%vA8~Bd(y__h$U{h&)V~>Z6;7`UF*gA`M!1-J}y=8a-vpNREbq;ZXfQ>))&_mR1lMi8iNBFYAX^XW7=?Q zYzos3h~9hpD!ZYQAgz0avXt}I+C1TQ=(T6D;raLX2Mem&Xe>wz>WP0SFHQjs5HQSl zG5s)YWg}UsvHeG0T9?1$wF7{>ih`1lelh|rJ*&`H9$%)E;@zsR>O^0}PY%{zACYE< zx*`AL!Rh{k0r7gEyJYtTWTBso4=#s@iRy{)h^R%5>qh@YuH4;yN`M^j!qi-+(Ue;j zm1KKU_Pns9BsOJue(UtOFWZw@tXQqab>GOL&6E*L>t+e2jn*es?;Fh7*#7+7Y}LaZ z!DnMT1%m$pRqYOxjKzfUY9BxT-RjH5!o`&UhN|AMH&Nex5;Dt_o6Ga;wJBdZiXsen zIay}8+OIIJKRz#O&d;~B9353vS-STH!KnV}H_N|UlRsdYK~F@V^37Ic8-E($LJ((Y zsor(>40sr!<5Fq96XF_Q;lEpP4d~1VG~u)?5NVB(x9I!3`=15|6SHTAfz15uU}H|- zk(!Ds*hal{`_c=a>z4EHFk|!4-^&X9&Tq3oL4`%sM@HI27S%UWmFrxK)Yp`hh@g=c<>xCQK#MfvM5&X0%jF`p+ZgWWC+cvYfv? z6A`by$w>OJPOAr0Ff6Lsx)3A#FArNm$V+Ssn|F?22_0VJ zhoy)6`t8}NM^3reUU?!lLNL3ks#^%bd0@!&CNPV;j*|td_~_Ak9AcYhDhx*Vk_t7^ zG}Cu8doF*Lru}zJYEn;yb^ld}S`Qui z-e}oxz;kShcyMS{rY+qcN6@FOu22ll`hxQF%+M2Z7Uf~lak_fV!^!U_IVdQQC23te zmFW3;pqH9d_z`o@!Na3Ln%8&dl}5nNKs>S9c5va8ID9;3?CUyGli#wP$Wvv<8@V>w z3vbG&+-&O^a%6hdt^Sx{?NG}M;D$oi}itB3t20`YP;fdg&%dauC|VG_)2&RCsRWWK!C<(zC+Wx%v9$tx7t6;Z|EE z=xiz$hsvFK>#)~#=5JjmkgPxh+4YXNu&$AQj@Pig&emM(9h`REFD*0l<$S29u5 z)NT^tuq>!2){{UuKdPvZ2D`|URydYA*4~^K1OU>+4+S6p|2bu|QwwFL!rDwFTsQ@NpVI}rpFnaEk?j#Pd1h~AakNNz;SjFgwfS2Qa%;WmNt^Gp& zt05Os0^aSQ_Ju5)GE{YHZmwsHMX<@`dG?k4h2TPxn0d1AVTxgF=0&G@g}}ftp_J^K zx@f!+Hhw~}Gx4YTLM%j$rgmj)#9i+d5zzny0N>C+ zA1Su|)c98?hrDkj2Z$FBVH%fbZw!jn3e?<39F5Dx z{1xoJriO)p&^}>~Edwcyu9q*(hKwJIQOI6^ju_n&@-ZDA{i_HAF*mJg54GZtP{PUy zOmawecVFm8a?q*+`b>^)O6W@9(UDQ?ks|-PQ?)F0SxX5im1kGwI9H1P?OaIP?ezS$ z?W$=^_U^PaR`g~9Nf?A;SiFfoew!|b9(OnT)VX?^c!6n!_-VK$1{)90y>{}+*=lfP zuhc<0gWFJAQj!XA49&(?nu&$n2KQCnNek)THjGFgx6M!1JtrC~<`0u2t9VpgSNy95 zNvL3aw5s$JUb|o5-9&CZ`)p3#Irc|31({?wJfUMaG9b)+>(w2P@*H`|Q@9{VeEI#>8}`_m+nWST`9 zdeFGYWBS~lmWG7;l4o11mB~IIl{}`=kna-I&X1&lQ`5cZaX>m5__Z4azC(MR36G7+ z^Ch)vw|$J`Bi&e4vk#BkQYGduOxQux)##yVYdhUKvt2P6+=h4*e5_2#w zub%o64DW$vu|O66S`P{~oAkyzo9XMoc78+0QkulY_UZLj|8dgsL)pUS%l#$axpg&` zkH`7)kbctI#yMMO*V(GzVgps0ykp1M)NT|wpN|;xWgg}#?ye3w0yUeBg989A-+8^g zcv{=qnyq&T`w96Yo_D_SDL1Tp%+j8m*TPHv8Z;ClG}9P`OCsi0UT>^WDM?Q4@b}0c@okt!aU%uC9<8;y zm3)TE@2z*biC|!hzgCE}FQzm?8EPNQ#Z6P>i-n2>FPh!HO#HOrYJ?B~(f@EXlH$C) z_^>dUmVFEP#Bcn+@z`x=im%5BphYC4CwIvYYxz&$bAOj~ed)6jH!<1$>pqh8z^xn} zqFmi)GC?(AQmgCiyGlPnh4jm|cA==%NODoZox%;^)<>b zJ%Kcw9gk!_Lsabag&JpW`#m0uAyWUeD;ndwyKJZCRrRNx{T2s*TmLt1H%`&vMDdoY zV$J54G5hSX^6vd#ZnrGwqVB@k)hUK=;(f7(&BSbsV)y^1l{>Bc_Wkc#W;%{FT@*Ux zmMiU9;LuJ#J<^e>c|FT%>$?#7U=KbPk`B2pJ#F?$$~iID*WaA1can8ny}HW`YW}$3 z6G~3WDyk|;6{~Y|8+>rkt0P`Wikm-{jtK*ZMM!CK9J=9$4YKnscLi|Qm(PA1*nZ8C zq%NgBaQ0nkT6I9(CzB}Cz(mK7AjCn$t`l5ZXfZ`%ASm;?K&O<@>F`1z;;r~J-eH(7 z^-eEe*iccIUKNR3Aph6}_C_L3?}u}%;lX55t20%r=Lw}0G*%uw*oFVL8HGhI-93A_ zR2T0sR;tjcO?B+Z31-$WzFQp!#L04hbJ=}i#=zXACH?z-qVp|hBnvuOSEEur5w&68 zq|%RCAH%ll{8U8)KJb+25LZvNkha?iIMSSj{k`-`BPOTg|PI-hB&=_pW{6tQ%`d8gp z_=6v(xwuk>s@wZk(NEH@ihS1G|aajMzq%MgdKe6`wDD zD@elj$dH(rDRiPs-PgD$)?=27_ z$@nV?FTOk#Xq5q{ThG*FH_M&kpQ%Z4OBArLKJBPL$oYW{Xv1jMf4Lu{_Vo1dc~qd6_bFIP3)j1A3f-lN0zH=>kHbRr z^zPnQxU<5hrigamD;q~H*Ubpi>&`qj@osT&RpGK2^tg_ThBgGisr6VAazyLy9C@9+~7!%Oj_2l zSmKvr^+6CI{y=m$F-eWjkD9DlLCMNTfW>}PLrWteD@#h#9fg9TTPloBP1jJ--=7Na z`ZzA6%eHZ1W<~;JWM5ohRke-f4~IBeoAStjG(%I9n|yL!6icP|n@3`Jk_kP&F^XUv504GqQVWBWdJx&*8Y!zsk zv{;IN{`yXr>-7z*SoTtZbZUAU0>=N*0vxGCV2zw6ZSGPPe$;sAc-@gDu^+^otha}M z=#RA+dc^rp3jib$Aib=cy&!9X^&2k^ySfHY}`qBu3Ei#$uatKjGVBh_bCn@$io?7p*eZNB?!7liUBfabU+imj-y zJ-b8lkt=Y|uArb0jFU?Z^r`AUhZe_rh1i2G#xNK}r?M#DlE{G*G01zeTsL+kaq zb9=a~oqLGPBwC;b({vT<>(p#WEa3I!=RbvL2wLUTEb20CPNTRq^Kc}5u00pxh4EXS zH|-wsorC_7jNIu-)7@EZBRY0fm1-kl`SaOK=_p(bZ0v}|m9NzDfIdA*RaP1oxgcrn z#B8}sv*I@l9ZM=KV_`uZ85!yKGHM5ounV1U?;P7iB9$_Ez-=-LYMEZgr@ROAj^qw; z!9_*Tq`uekw`Z%;K>G|jr8o7h8FAUtga7P1cS7SLlF4Bc*U0=0TQWLE2;MKXg&o&`_MbG&3_Z2m5Q z(X;)0%hOPB{QXH3?jPE3r%ko%$9HyGa7eh!{bsfQ4x=+>=6P$JUe!RceId6qx4fz?^@|vZ zz5OY2lL+H&OT9+;es`}Yq~t3s!DP58ljM&LUkk#4&!6o5pH zWHv?wQ4I{P{)*`hkDFSU8Eh(d%==XB#bf{1^7=;teTqPd|NHEce%!e#eMx6$202Xo z)6tz>`+?)HMWm6|GcrGI|ML4> zSgT_1dpX@k7pp5${!TsK>lg{zbF68a(crC;w^W~ux(l!r^unyToJ*N)nK6iXWDUz2 zk7WX|l)1TZU+6&Ox5$E$mhTV7<0Z}cksU8CAZLCMlJoKeoS~v?-N&~zT#kbI7^cLc zYJ*Ff*XeOC1VJwVUrmb~2;`o6JoqSct^IJMGh=Dt?0r&H?Q+=;b}`0KY=R3sJA z7rdpVC7s_sEH96D#U&-*u=;QS^c*{G$6_FM^@oP-(x^S)%_OF^qPWTu?c(4R6&GWY z<%)@mLjb1+tj!??(hCEt)2HhL4!Hoh zV_sPP!27HZA&A%j5&^*5U?$7#K9mZd9qpNe;`)?5t)3gF;`(c)KXuL0nbY8jsXJ~t7_nsWy&vUUExSg z&Afy6z!zBlqoSfjC6^i0Pc9K6N77$m1U*lsDz$R2geag9L*tWtaTFA3q4FflQ-~>k0N4XN-8RXE-qA&A60uKsMs^2t=|)Z7m!Ix`2Jl0EH4wskO$e>k;|tt`KlAV zbVThU5nU!3?`IC(64BR_kXR1}zCgS<@ey0k%47^JZ*HKWt@O@rv+gfD?xPbE{~^IT z-#cq{EcHA`u4?sw1kZbB-CseM+toX@vbkn&uTTqi9F<` zLJ#aOPy0Y2zyJa9^+z%zkQ_xu#_ZL~l2N^94gp|9h@PHaohBy=aMmRiPHauzV8LYq z8YPlI|IP7}^|Uy21%Qbw1D{8Gdo~JQb78{WUUbS2>cnuP$SbEXkzWSau2d}o?vm^QHBWw?KgAsYWU7l?N|X zR%-(Y^7oiyDS!S9Otu=6y#um#%Tb(#Q=S~}9hLt^FTka?q^AcwA^V%6!ZIc%pj@Nm zt1tKxj=Zrbn_JM)K)25=J0WVxzse={PNn$=iG*0EU`J>{zyR1 zUgJGX8!bbnB7B29uhIltKHCrA2y!Yay;G*rWg46=JAKb*XUk2OVVM9VfJTu|0nSjl zw{spqTE5usiAO_YS#+%^Q~B{~OpwfEA~RjUQUH96GV<~atsbZ5eg9@Pw6tp77Ae8= z#@gN{luY-}_P`rimTROcxy3$w)5%oAf6}>;4qXF}Mfz93$pT9t$I)L7WKs@nI95y_ zY7hVzx<{D5Je)ZM`&`CC4hUu-Ja}+UGf65%)x3k+K{mCFPBSBA!Xjfb}j}6W=c+hZ!^(G zKd8CO=PL8Ay%2h34MOnH_@SP@e%Uc%xNav8M`4=3T$G(|-b+Q$NYT!lw2t@?O(nvS z19k?3`i&Xlz2RGbh9*pVhYVZ6ehGAaNu4%Iqxeckei#bIz4;{hP@1X~)4Ts4t8FeY?EM(rhY1LrYK6=>iFm zFZhAU17!UAEbBJ^di!Y!7jrb|3EMTVk%Q0RL%kzWSXe(ULGDLDVy$l&7S#dAM03j@ zbxzy(_^fyE4Flk002Xh<7$O(C_t9a;;_V+AY{*nn$M!v^ooefRW|o(~EZM=gfrKVD z2}y5vh{78Y(2ohqfVx9;qiS3@95lD`bqg$nPt4RnC4Bf#xu9mtjvMX<7gm z>i)x8Gk%YRZ^?>=YGhGJ!~aZ#Pfucinaclpr0{1Mame%#@ZOGu(S&ch3MbGafnc5j zg*rf4pjYjrthoFHBd|bOg$OvM;Q4ucbTVOS;3>4X9|tM{=-RF^A4Ue10uE^r;1Vt8 zo(p1%khjcqAe-m0?ia5jZxlLuc-e50>_S0@6x|>EzTDzZ{qR40=E1a?kfwKN_<%g% z1axgXIo&U^2>O~!Wb*HsAamB*9WsZb*%#Hc1a|TW9hkML@#CvT&%Ll&dZ($ZY|tq;q$*R2Hkal$|Om*(o{*nlUjme!m-X!cM|= z^bzgr>&FI#bQ}$6RXcQ&Sds>&q{fivn36?n2yV*M=kqsUJei7)LbiuaZAQ)21oD%Z zq2s1z{XZH=mwf`q#6JigqtntJlOqrp{VZ3W{>bY{`^p);P$fwP>(cQQo~RQyVB+xx zyVbd=aONm7D!zZ&1P(MV@!MDv<@SlZUsLWp;E+i@71RI+z#3OE?sRI0`l%SGd{0Q!Sd-mQ}k)WKApy)iqeEZNPG zc*zms>D-G~7gc7E%0&@?zZP^VkPjiiu;FDjZV%0pdXB;nlY6r24ad)}qBU+*iX}!W z9ql;1v6=e#)s8SMDy2M)`@E++G?V)0#MeiUVWmq?KczWrXW@#B;jau%fVYc7LNr>= z(bo5sLtN(L$Bzrgvlv8x4hxM}zVP49V$HUJ*RF0xrarj#CnP7E126cm<>hc%F8~sz z5#`1Dne`6u5yOr_oIQMFL&I|7=}Tm!pP?!%D{~QE%PRB-Inro2Z*)O9J3j!O;h(yimxl>- z5pQ`8Fj!dfs|5%0TquHTn%6EVZ!3#L08so>Cd^&yUBma8#HJw?fHk>!ym>am%a?L< z)d6el6QIV<*=%i@S_^no^L-ZKs^J0zr$Wr&k^@F%74@XVM0pbvte~Kv9fzfGt$aG( zF-1*Hr1#~b_sVJ~{mo7~wIf+=|K{>>}Filk>z&{&yu@XeaN6_FtKK^@>%@|bR#VY@O8u{Rn%6os_1$RN^x~qT@??(r^?2VWk6QCnY5?XftR$AP zcS8eeQ>~i}JE$ux(y=5i9E`JA%ivqIcMmrf4eoa#fW|JY`k8edikj82ON_@%T!A*0 zea|+1QPbByh($~X{>$6y;}r4T6$QoqVdrZYNT;};0lQaK4yb$@nfNiN;_VJ^ z6tC)NhfB}z@L?3lc7&qlj08qbSZHo&xMXa!;!Htc69ZK=seL=N*jh4gb1Zgi9)}EUg9Y=Y88twKO@|K<(?M zx-K>#03$ln$esbCBu$0;R_7fSHZgT{rj1*13Pk1CVV^(uLaaglW|D!G8mmO{+M3Yq(aR3>$ch`ey7jpv8hqBlV-Y@m?l*&!W$*J3gR)dEP2>!m85%P2b2XrYn$=-(hv^93=u1FA-HY zVVFR@ouYW+-TlMm9eGlfded3PTi2HoGPXq(l3C@A=<-+VptU|`@~ z5ijFTO^1)+07Z|&BBYNj;Et@lN4t76)vNLRj@}+{*0FG0_WWXh=j{)aJ6zW^diml& zJ~R|GR%BRQ;nOHNn`rvzle9lt@NCvz@R~?PA@ebddOB@M#&-{@o+W*9ow}I+zR+?} zxe^)o<)&QiNii$e`mKVBK8!*pn-n)xtH^XR$M5=ZCbLi> z9*Z1b+4Zd`U6Gux@V1JP*RI7|=BUOSesGTk9nc|U;AT!hA)~8HD4dO-HcF@c!U${B zlq$f`-c6TgFjO*H*%!UL;O+Bt*K|%3DbFVz0*~gfTC6nrl!YmsCm)MKuvX;!(pjkO zUp(VqyrT{g#qnqS+KLKiZ(jiYdYjj`>3nzD>rdXJxO9Je z!NK&hRs=OXm`kIe14Uu7sa`Wnc|S5Ba&r9?nqqqypRP*o)4>l%9^d8)Ceq-z*s4C@ zk1Bj$-IhcU8gHNl9bFWXx`&VZMZ2^dl!{ug~WrV}ot^mwe7%v!Ncr?nN+e_<|S zJ={%(FsPl7>UW@2?Z6?;Dx;mcsIor`@=U1nE_+RuCo+&{=hn>M{=DLuc2b@nnQ>dq zYPo9u^QWd`7<*`4g}_zKpsi!D)L$$q!pnug`8m{9qx`ME*7iE-ORmc9-9>IJ#s0_5 zZPP!lggYAB9Bc*;E-JfOQ9-Nmb%i`+-O&+sO1p|lp;A-|zCT4+mGgU|_j&ird5|4E zmTL4WWD)wob23PPrG*%#J|O?6wkxEy9IbVnU7<-(?B|ONY5Up8zOR7vSxQ?oDLbln z@9pA&h`mT|Rvd-ZK)i|bYYk=xg&xvMJVS~chTzjINvG0K?qjD6&QSzKr(m1ms7fcf zzeB{}nZ~oAVn-*B6bI^#!MtIvknd4+oONE zZ(1M}vcct#NJ)s~jH6)N=~j3tW>J{kb{P}y-$v`{+UKzXh}wyFIx)BJh;x*=1a(HF z7aCku+`u%)Xj9D19-22PmFY}%55(NS_P*)!3BiB=&npA%y6JT%%;z-DHj2)7Pws9a zPv^ZD5);sH${^NJT2?|`q`(YXa_g7$n5q~Hd+qjO_l-6W@_RRg@PyvxTh9Fa3jk{D zE!MPLPEJ5c7*SC-m5f+3+3p(#0259`m{>Kmw+nAgZoUas`%w77@8n5G>6P67`5I8; zzoz#k`U@g{_d!2XdNCx`>qGEZC}!=iP^E8R{0Js+vnBW51FFPFe~_pN3wuBa1vhiS zt}AeJ!CU_sV5=yg0$@imB%batLTRtEh+=`W93(vChcAF0wWV=1hf6BjQ`-_9|78G6kJ zwJL&+yt(0jgu~H@x_1`n6PFmG0nWAY^KWIfc;axhmIQHvYm18}l=C~U#HaIZ0jSQ9 z-3SW*r$Om_t*NOgNk28VlwG`4zuR_N+UpHKgnN34iaO5`fb=^rIxI~raOCfema{{QcPUm7}MZK6mghI#~dLc+)^%xS?m zM7~_EBGK!S_Iu^4LmEoc3R{{M;s++lB-($P01Cz+%f_v`XdfI5e63&a`yBthPu~0H zIE1)e-82ZpBg1=}tuI~C4OO5u0|eesTdWBM4E)*Lv~1Hf$(thn0inTd{OP2|O6e#) zT(1KBa$l2wg-{V-6gRY_=%2NRsFg2hzIzX`lO|Ozf|j`W4*r|@HzvC;!Q=h1P3fy8 z&Yp&nqTC-hz9OjU8=SZCk(KP<1+XJW9H*{`tU<89;Pk@NQOFRnYu9(cScdt`3JS#;h|cLy9m$? z^1Vq*DBu1L6A+@xzppfi1G3zqYr)$x-8yqRwOBPEn1CZHb8L9{vaocI^mP7Tg{prK z#~TT?5QCB8wV5g;JxXHVd<${t5s&8uinv&5UC$_>Q{9f_Q-w%LqEmwXR{PMBl zZeHgk54fWu_rGx(Q#*OP@P3Ac1`W_$fgo3^0nABCnJsu!uu@+re@uQumY%9whl?R} z;d;C|?p~dT*mx5MQ3V~Z)@CpEd3ygS`n5W%8p$8Z(eadguxRbjc@J4Gx-ouKdyVg& zRGQfs3}AUdBWG>U7=`uhkQxhws=J=iyt56(7pM#<-_gw>Vpiv>ddJeumy4kJ>$hhKryg~SAMzpN1AA4loZ1Hj-FNFEY{TpQHA_8k} zEJB|Mrsx|AaJ)sEH4A#!m$(pNY-Rcy%hK~_f`9FLVv#OS)u|-!sYlR5(AZP-JsOQhcWwJ%hN5UtGM{D7QHPCh+ z)ZIz6wYv`egq}(vA?E)*!~&O|nPl{njdg)l)mvfVvE#9|iJ@}&LankFbt>B+V4y6m zEcrK^E9|~29GZicrDUtL1T@5`FR}EJB#w{>MMSALLAnPA)Fp6=)n?i7vf{uw^3McTB0vzWZbKh)!XlmRrW<@DPw%aj#P|%_UQPles|T-z?IC} z{0{hQ|FVA@UmzDDBj`Iw%!y1xoZroq1uRPKQ-wI*sM7H&%^Ju>pEJ>c{)CDAhs4(F zGDqP+gfb%Lzz8wFhZa>)x+j(-d&&fto>!VB04q$jo`4cMUF4O-$n*LGfM`!xQTVFr zxx@Qm*G?gl*??CkwGP7vPAP17QP1@I-Tmt^#r~31nz!;MJLVsl;@55||4kew2-ZQk zscZE^9TGD7-quU61`3&QelOdqXBfd(#IA$7X_hwFFOuL5DtMl6+{cr`1~3zb;=_@L zeooB|_{ah3v%mlMU+7ddCF)O&?>vIs$n}Pzr)yLi8#m4OkL$+tR9vamQ`X;KU4&Xg zgWrs$(u3*HNFogaQaozEHR6VymQZ%jCP(Kba(BK|pDY~|d7Dv`*VSI$Ta=z&)4Tld zrOvkWapa>`;~DSj8~L&EaJpHl+LWbDNlmCE`rTe`s5DGv9=g{>QZ(}4GJ>vYkjens zEOG1)l`n?|`+QBjn~81Kv$g((l0(m5>i)8*Z-}nF7>Eny)h(6bj?6gtQH6?5C|XJE zw`w5vPwuh!E_4JStbs?;+S(cb3|_WETe0)xV&6yB$9Y+O#-cvck!3u{(<*lz(xWh6=#^c(5;2Sr)G~P>Nwio_RuYHzhZ2h z4_42W%S&qq>z++#=eA?Q;nGrAX6U6FD;Af1f0cLkbcaM>?zZ53ePH5z#b4ud2JyBi zGUIP@IXIVcKVBS|uh3UiJqyA_-on{F-&%b}vHvS0hq`|@L#|&&bFyr(jEta>XV!i6p2oU?LY2{{ELN6X z;NzXI{Lp)vE#i5bqC}_)zg)0&c?oS78rlVh5QXLA71G2>%KS<8{>>3>@Uoly9 zDmQ@;5&B$4{(%^+vf<@?CMYsN{y}&GD z_UaY)noi0Zrjds`qOEi+o%dHQX>UATO%13KVvigB(a?0*Lz?tdI6*dH_*DsTd+(&_ z)QJrtzrA+V9?*ybhpivd%~fIDBhZSpAYWd&B)(n#DuGV{wJ-WoNgB+_648DDQxPWE zB;!s0ST7wd%~&mDM;WBWRJW<_w=Whf9TF9<-1Uqy@-ch8JE=i~rEJ7W_@us}3D`wo zpaHl0wUWJ5QpHJ$>PX-X6%|E+a22j~K=>@m zhxNA~3x3|vGAKub*kVy>OHdd^MehH+0CXz&iE9j_6dHnPz?W&10gr^#prt0M@x~aE zF6BLm>g;X7S@d7PKJBU7p_x5(UFs<&RSI^9hKf*89*RKi7JlPn(bNeo~`)O$bq8(+@ajTE( zhyNWCdT~f+=aZ;+dz64tuB@CKo{q6tYE+ZD>>ILF{L_|wD1VRJ6QD2czlo~7G=1T- zg>TVsqzc`*V4$GqX{Vs@dlL8ZT2WLV{W!L$GG)Wt_WGj0J1=l?fP;~gIv*Vr^1$;^ zQo_<#IPB+7FiR00X}-{L96Y(L_TN^<=g|8yZB0$t)fa;CTgF-udQ^vX2OK>uRZfYu zlIk2=?8dSsGV{79f&C_3)C(H{ot#>fH5t^Yu(DNDvrZT?PQDK5pqbNCt1%tAZvJyNL19CLcQ~>4&p(QZH(>rFHom&7pY^3^^ z;`-*~oWpi&JBPgb9oT0C49PbYd++sZ^-Dfi%2a61@Q4x#7}@p2g*LHRDdQItG&^~) zA=&(^?*3#2p_E#Kq^pc>G)g6A|IenGbytkOvqyHZY}6dXrfF9o4gn=#pW|1Y z3GYx}LC^+gjvueJp@U%#!Q4y68>9O#*(2{ii32$qbXH4;;jc~C`ejGuCZNN^8yn;dZJUijj}!-WCFp}U*v>0;A|h{wC_ ztOVUW(Mqj}C)=>9{hQ{;HxLhZ0(RYzf!LN+-)*wBRUC{w+RsPA85tQZHyN3UGtj~_ zxR4?uM$XG$(HylFF68<7`Jg~j{PD>QdrRAIP}%eFAT=1OcB+2)b~X4o(ya`p`NH(7 zh-b>8RT7TT>m|%;snK49iYni8l|3AltPen~Tb>)&gVfy(PiKy2w2ptr*Bm{x89u*Q zZMR{uau}&DzX>;X#$rih-+vZZr}EJac+d8s`#D}>=t^C*_eX_3h}-z`0rklD2=5da zonjl`-<&L}fsiXfY)5jF@gsv}Rm#)ay{<5;`Sq~rhzJE`@T}ch0tzCyR)97bVC1T? z+tdoi?pe%kf@vKEEv`Ei!)F(}#km)K#<}z~T-hTxHb2xJ0wci4`dcV1X%bADBMu?9 z>_8xR1mNGSG6$T5}8r&3pbZ- z9b}8NF87Ob&1Mf&S`G)IJU=NE@g}Ar>`$-v6=v@-m^l2j3*|$1{bGA%OO!@8YDX}E;A$lOT z$FDr940cS5rC9HS|9DemTRjn=Vx|@VL5FT9PrfP;*!c)O=%k&E7;nim`Is;UKD^gKqfZy)9r{! z(Dz&Yf3DQj)Qrq*ru&sAeGGI3nzkB+KWcvl8@9UF`stI4X?+#)Z%g2_eQz>FlK%4Y z7K{cRMGTX(1(m!k@Gjc1r-OWp>h%Fk$*ETealP@%1R+zE2x2L2Li(d2ba6I1- zx14-Q-JAF3{#AGHyq9);vXXiHd&yVG1s-fFG>p3OnPzo5Hh25ejCL;=UWRO|I)=er;mhy5qPG8%ysoThHfe#vC*p2T$MKox zXugV$l{%86^C|d5q%moRgCt*rdwWJ*x6u~~E3sQvPPWc#6rSI~V6yR~1(kS_B8>B5 zK*HGScbgomfneI>S!=w}r*^OegIuB*A-|oVvEN^~=rq>8=&#A->A3i0mdo{}xOfzF zBCQxKI&9m+O6!0k@^CgPTYnw={SFfiGP{gB=ucbtBd+X=quK8|UA%lX_v1e_W3f1JOm8DY^_BE`1H=6zd>KtWc=# z8W}jS=$bEm=@-4)_*!4j|IZ-@JXODa58Wy|Pvk2JotQGOnl4VBy#D>%^%NFvmY{dW z%{K}w`F&3J9Yv^50K+8Iy3%5X0cMY2q^Y6jorK5o9tWQs%=4HCuf0#(j`(Z29|0)s zLyajMxGm5!+;K&i?f#t^`d9LAA0(>e(1hPU zljCZjmiy7n!F0(m?5wQw-Tf*-l{q~R;I=!St-9p63_5Lm?7*N0ioRhi!&)WYSR#ubdIevR|1I9wB09iCLG75&iun2G_K5OCVogfInflZQ!ZN=1bM&xM1q$(q*w|Z(%_b;-tp4&0 zkA;Ob@WrAW5cw#%sV@YQS*WHQY#79uau_K5aX%YV$Qy8FbV@u53hmc^vIPR z*Uz)-_YdPROrdz=1_ux9!N2#d#tnD{K2#DqxPH=QkHG%3ws^e?`J%TWv?Qihzj&6; z5A}SXpY9xATCMqnLDDVbbJx_;pTm-cPV%`;cstUMpizU;N?c zxmhav6Jdka`0{SK=UGD&=w`E=9{ue6M_1UV>EuUgJ{D-^XBv`U8^K7$-Z+a`JEeTQ z7UEXV+1hSeSE!iJd&?-5k?&8b3h*nk)>ML$HfAC1DBVb{~VDJa(hzlrofH;yoby(v&qTPJ#9`%_~1jASUcEvtvb-t z6)_B|lL8;(ucc2#m6c!e@+426XJnF7@m$WtFfKulCfIKa5VotqWlbzaE6 z)zZ=me_y^kA#|IRlHGsyIioj&@5o8WLZ*AxXfR3r{pGUlB$)f5=@N-D#=2{Z_&wfi z&X(eU!gS!j9x{G?@`%e793yL5SBWQ2Y|chD3h;x9#`jm8+`(mLDG%WJim`6{F)A2! z#OFG{^I~&9x7u+DL6;35+_3qT zQI(^WbvvEWqEme(9}>4!TMvatzNp+g|CJXvY6(5bY;;~b`%KC42n`1OS;83*J5$m( z>4!w23gKVf9$0NEh(jhM*MpwTx46-R{bUpmQuyS{Q$U)e%Fowz)co*XX=2F^Vwo!w3m>Sd6KAqr=EnM=H3=^l+$W348MaHZ zcp9C?g@b#g5fPEUx0DiP_76NpOIQvK@dA3>Ql}Ngkxqq0-`%vL15(rDf`H8VjN%(o z+#Le0RWn)epnR2yh~qviyIAEkqgNV60!E+h{Ua4WKN#V5d=44Js~oQ+y4?TF_r{1^ z-Sr})V(B@m0z+Z%+pp$yRwAS0cjH7(yAPeYo!=4z&=Ih~q;fnam(I}h*v_+&3j4-@ z=6mq*dN}Q8H`RC@=_MuY9J+-`OS!3KTYWdGZ*aSu3W=|_9EZ1@$O@XXpCW$%~{x11S5> z(tfV#>bEFK21IH|aR~7wp`?nL85%G-e7`;&rZ{_nNlBSgZP`<1#b-f^x?uhGihldL z>)_D*LQhO=yHx8%0$d!x4r687(B%DI_Qic?dmkmRsY*aN1WKhCd~7_}DXB-t0AB0k(YS8&~=yed!{t zZGsJj+?P_q_Sl$gSGaBZI50DUOB)SSW-APQx&01E&ZJ7g)#n;U-iL0%At6(Te?7g3 zm>3ypZ>7aK+MiG-MXyLf97*)@Af)XYY>RLRAU*>g1&duPii_)+S6Vu{^y_O>ReSm^ zoGrps{@{ZHYgj0-DEoom6?0>9)hmA5q)`K~wybpte;dhz70R)7_uTBA1sc7!$gA%I zT#lzN`_8BH05gw8A$Qhn0G{LjY&2;6dPy0aMt6GCMJm#g`t(U?SnO+y#e8=2YlL){L{WzTf=UuC7}zsCd)Ila zI9$WSR0Ui&k_KO0NEOfKzhzE$d8Hr}cjldB^-Me=Y1-J`?%#UHa_H!uH*Le^?c=nw zVe;GXf(s0b!2Sk=&!svaj4J=?!1`&LW~ZC8NEPLeTi4}8!Zw5_i_MnHuEHl|=A>f7 z#;+HgcznC7VlL>JGajI)^Nq5n?V(SbL;w|w4hMrUf9jE?fx5LP;bYSom8fu1r|5-1 z4|Q+L{^sL!S%aXH^KI{K&E`x)@)mIGFSl%7d|zmp>Aj> z#@z4)k3~o0-MjHcE}Er!C!T;5Q{5|7M9bf7>g4YZHY zhj5yil`vNIfihb;6bWit+HcQ~7*04Kj`SyHPC%4*SFBBG`X74qH_i&7=5 zhj)Canmlo*@gk*=!o-x#_nFHbrK@`5+Pahc_mHQ`?64RAkJd zl$#u1EZaB`xj@Vm5eZ{Ao9;~8SZDA*p(ZEuS1RW^XG}P(SUsiUmJso0?fbimTOwgo zLM0}#(yG!T1y|mDtj$QqH&I5zO#hu3jAv4?(n>JIzsMi}$CzWQf$OiO?7%AdsI+*2 z%ms%6&>D9>qFUvqV#Ud2uwl~Lm_mPSYENu#M z)L&}j9lEKne!@;sf-=&@^FspjoFPi4A_j(;870UeTv8}lCiUn2qTUzN@Kcc&_eMdA z3xAZsgEw*=OkQXH(z4DjK}pxr0tX9wNA(4|fzR#fZ@16I?UmW@wqh`9H@&g<;Bh^W z)LSmA*8LBaNH{^eSlyKK0Gw5}x#*e0AhtAUv1)|vF`z*RbR~F9v?L07tjgP~iA`&Y zl~k1v9y()hEQI{~NOx1r05i>Wgipt5->^=Tai{9^zhhErn%)o1=W4;h!8JnvskS`m zIec>hGA4Ku;eT1$Fo5!}jV?sVZUAKWJnu$maoR(LM?V~q}=~a6KAQ$g(RT) z$N`coJ~~LjMkg*F1UkPH!=m?i{FY;z?~NZpio;Ell$E1<6ekDM@#A0+44bg3774Qy z9gM=K!9Xl5qUB;3Bkz5_8@r|c(-V+8Ek`d%0 z{Qo7zI(Emack1=Fb&3tI=X%D>Sn+UWE_*$_ zYXhje^{2Gu#02wI7-kTZ_C%!$%j-H&I>r%QV4^nd4Tpv!u3yVZ$3xL`4GcvQKv(}& z2HWiTiz@w|jrROmAW2BqofLv%1+fCg&QPsV^Qk;2*t=WFo}QZR!J*+{Iwq#X#YO9$ z9_gj(7Zp@^vfl9G8jCA*@FkCoile6I+73{as%qZ}WX>xV&tHp%UUb}+8!D<*}4 zodGIyQBnn7201m+W?qlfV z0%TO=%VTihTM@(TU z709Mn88b7HxFszZf@jVtCm3^ribhuNziclLeZ8P+l@n0YaSMWRBI2<#G1YxNMT=dy z6KSK)OB4ao#=DTba6nOBURa)kCTe&%OVl4aRxc#JlLFET1B;Zc7q47Z@Lx&tw@_V> zdva(ZkpfbYD`?UWdIR6xmE$K;T2*d!`Mva-^jGx5gD~?b^8pr_+DAvqC98?e-4i)Q zSwdvo=EnYS}i=yE6>Hs2tue z*WqHdr`3TF4)!7GXlrXLX*shtt$7RV*ZvZ6J-`g`IdGcD5gYB1Lsb&-1yxA<(eZ zLqk`iZxt8<6MRyYz7F8ve2omuczpH67*}KaPp<(!5C);i<=L$X=*FhMeO;(Z{Q$m{ zSk-b*=)GTKhI(pSguFei07pbY0d{4}9&=8>={x-PNBnp1cCSxF65y`(amaASd9IAk z33Zt>^fQPAZfvw3e{kCWaU&J?#f*I~cN*sVaxnxm*5<@Nn(8+Mj_|a?KM_FNJ0dc& z<;qP3IEp#WfwXzmX9{xvJ53{>XD@oSwt=q)FSc{9K|B6TTKS;X9^XAP777M_yDJVE zPp%&hWLmgA9hWhJMc`m*k+|cs^C&rTtE)LHo4uitrGm5{`201W+-Kp4;Rt$~C=2;9 zvg%OgnLKYq5~^uJWOuhajNWZu+S!VpAP!Y)m0SId>2Zmhaj{$Q;!b#bs_-=5QR&~= zj{U<{@A1fg&6T>~$7p#7Wb*9&5nG8hRCM(0Z>6ykIq7e8f2!@vQ-&k80Y8b`V0jihLh8JP9*8mLScZkTavZP65 zfa)3*%|2AT;|0j4iQU=AxN9tXyutGH&1O>PZKO#!*?AVdKRNzUd8dQ8zKIz%fSI>j~)2rnIl#S`&?~^GeP0a;^ z-XJn(2+q*-KehlDr4waEeg1V@R!$l|8~duDSUHpkD;bDdKDF&6d?yh=PHuK`qp&?k;H8Vq)V8()(qi?)^-0by7mI>MoYm~;h3b#T+@af^!9uUzwX%Y6JE>UKNeH7NIUbk20<@_Z zaxb_gq2dpX*F3bt<0YEChZ1=d3^VFnR|D&bE}NwHaA5`_&+wp$_)XH6Y>_6HO=dm(s?pdSi}p< z$}&n0$j3TP@S&lh-+)!Labtgf^xT97is5}`c9BY|ww{)}t17SAVBGZ>GZRrN|Cco% z_iCqJozPHNmvui65YFj~pa@WPe~&ID6*QJ377c*7VChZFO5Pe?O3n?D>u>SBp5_L5 zej527SQHcr;8=;npt?~QFOmOWeayFS*7EU0Qcg}tD?l&OsWPwZd=UnA79}?~Htip( zrk8Wt0WefODxB5V!B8agD%6M`Y=?N7AN#-PJ9~{xG1j!6P;M}pT|BR$1P7ACC?|ux zPpNpn_ty5Q;O^w$m&&dpxy-=d!n%k)hwY)iY?lw}97tGb?_1MB`=+mNTNI*-B!4*j z{)J&1d+g5dFrkEmj=!o$%NXQ^h>}S^Uw>fnHaq4^$D$p@OOq}j3*(Y+8%g&B?;0A9{=x?n+(G&+R*jhOxGx7l?; z(P{Pb9HUFF$%pHwU{dRjQy=ZBt7ihr$Z4mWkgtR4$agZT|9Js&_M--_T8}pjo%(hE zEo_!+z7hLbkjZ=HuAT)%n1l=TxX;H&&g6&U3nyHvokH|p`WM-aKXa^ttyT@u83OT; ziU&Ux`Q)yq^_s!Dtwo;+XByhGBx0csoE__&H_SZnRZ2UQKEEoWKhhmiqq4U2v<;2K zr*fP8p{4FE_$h|IAb?7rR%{oll^`aQw)5vj5(Uv!ckI9o{%wip?MV|-ENWpxO_fv>=tm`ulp)U&qe($YNf5_e7qh0&cv|-GK(eXCsqh1GCC%@qtB5quM-w*E zo7`U&&k6(V4R4>z5nJ<|ki>ANZ7j}8TZ+=%T|l8_M5N-U4@hKWWQ4FZb9{54WVZmv zwV6(UzcqHNK-$RrN$AfXn_-TLqMvPF4reN9_K&^F^vZXVP}2UAq>4tVN`F$f@dvOdd8;3?7v=RZ5?%lfOzV?N+_6|_{6?&@Mj`fF zSd`z#zuQ8{G8=0xmzaTFkPBHJHTXC?fHMG#Kl5ar7~inY82nzPYqBc(Dz`R*MS0&F z8q#^JcmQ%6Oi$3%{({QVT-W{@#z;nujnq{_I2y38K+^#pb>K0nZCI66HZ3jgkgK~C z=9G8ODEK#QFSlG;r31K-Vm3JTv^MBpyUtYJMv(nZ;yC6VpP3@|#ZtY579(&>5BYe& zFK)p}2p$|;z%e~M1Tiye?lc??0JcOj9e4t$kR&bhpM zC27BJ8JyzNbOAY9sLpTi$sh>yE}4Vf&!4W_*-(OgX(n@rdk%K{|Dg>$-_q`e(TU#O z(HyTfrl7kZfCzDyDNs;!Wvvt#bkuWu^4k#@*%^DRd7WQW`BxS`OW96g5zT~1rVxNL z%ubHTWHXnJJ5CtKQ4@U&sjSl{@qe}T&a;lf!oq^tUa7Mkeu|MtGWtGfk2em~4ZzPx z%vV%o@m7bQ+kI8z`llqfIt37hbHJHcrtp`4FG(UMmxf-B`d+CjJO;V!+jv4y#Q=(Y zie^kL#!8|{1sx;F#i#+Pf*3>m9D{ViJz06PHvbAG4H}MKo8;t&JMtB>;&DnSBlD2B zU)(1hW0XL>!XHJ2VPyl%uHIw{5CTAT2n8T_vw;|y&$HTE+N$rI=+r7M%c^#&%}JXv zVXJ*E6W*3!YHGaI4pi1~5@*N+rS7M#C-J;9QSfY;?v;Zl?k;kjiMX!3wNLGIsD#`J z$uEA2s7iS_B>1IuJ_9NY2b$hCqi(;V0K7VRQEUjdr9M9N_${LAuOM_Gy52Z60SE9! zxIY-bJ-@jeVCYKAbja<$QPYq75^Z@zU|hg+knTAC4uphp%gyCjtUuJ4Gi?{EN|w)E z&WluC-4^Fic5XoLPg-j07^KBWRPd37iJHi8se2lj{u_!Ug@w)$8YT|yK(=pdp zE7~~qdF^{}J7Q#ErlJ>5J+fLGN-G!8n0^cSC^YTl~Wl6jGFvDxm}((iNSA)oK!n613)%_N$;5UC*(0=_Y4paRMuk2wk-&AxU`DUW;(*#02f0KrmhN_8@ID80}Qqp3h7Z2z&I8+$D zxa6+29YudYBkH;^QRte z?KAo7EVk3`5a1JhPDKeWQ8?kfv33Z?(n#icPJSHSInU^TDcBp(T=m)wV=a&l!lfkd z8r}iFdrufjY#u^0z zF0-VFJ-XNU?4v)0JR|)@D#{bgZM*Us^V?CnAzxLvSz;Zd=ix7p&6~o6|BhyQQahQ> zzpH1r$cZc;M=laNx+{+<_uJn@Tst6u4P3^+WUr*EV!J9{V(ga(0T|VS`N*DnzzdI0 zPY)lq6fqw_$=%>wB?yB}`VCLLWNw#b;^y#q7iTTXKt8o`N$WFKKqP||AeBE2B z%4;bi*JR4mI@oQaNLE~L;c(Xc#Adu;#pn6p?sa1;=J!W*;5*8+b}pVe5uKMsM`GPR zq{epN2>zO4S}Yt`g27r>fO;q?c^xBl?kg@;Sy3WaiBNthuJcm*FwmIAPUVfP^m(~H zr>u+^drM1f8!z!_lsUoCyHc&P>8InSG!P+>uH!H3_a6qtPMIMUa+0yir8GP|Fm)~2 zIm6F)PE=zAn#V1pUBYc=l$uV{Al%M%|3xWlcpMt(>)ZrxlrWf#_{#5eXU8FinA z6|T?L(^^m4B4)*(HB0mI^P}3@49aY6G;DcAABMhy83KN^K| z7#bS-Pj-pgW@xdw6y&uLl2DNx^f_ZQoh`vy^&TZ%9v?qms>{vGdjsl~KDGHZm}iXv z;bMlNfnd`_({AY!uifVsP)37|874Ls%Fl>(0Tpf{?21t~Xpr1Dw2){pUHD44GK)J= zOy2_=7kg}lqpkbo_IK3#@*+^l!$9sG%3n+r(fe;4<7mwp`!}|Y`%DgEEErMM$>H9V zT{UlK`p0eI@;)gAm4t`1c&2~vZ>FLmq;F**0+dJm6Djy8!(ae63ZDRC|BfwbhyGR? zy%gpF%>SfpRagjWof(@G24hGZr1#k(j!=Vx!ccyHS5U>BOPTv7GWMOmC@C#>beLvP zDAOq;aa*Cr=0f?GJO<74ITC2#8x~B3fL%XR+<3B{X+dj7S53);OGmvK**=osvGIh8 zQ!pVfffD_6bui3DXe{f>r-!;{HzheZumr!w@l+HXLpt9`0A(iD?QaaJM21W&hU0M; z7Pb%Fbije+2(k*HkR>Xpm^6KQhf`YlpZWTY*di&vY0|a^)4MgK^Q8~_U@{4-Sy1*L zHU|XN!66~vGJ_ip+VD=iXuf`ZSny2=6F5C zSn^GKlGaZvtXC4h+#tGwAB~ma66?2|v9aU6H-~yXJut(9UKwNBAM94o>1t{;+g_IS zK@)0ZTN`v7xe!F9E~<+%;QfDhF@MUuZ_XqnRrFEpE9eJeh(^Uc*5iMdFmQ4PR_J&3 zeVm1I;D%&>uV%zRVu*+*rDPUPO8R9A$rAiBXITu~SAYHxgZ#HbJQ*b==Qjdl->|1P zX|2cawLWL=dMg=`sPWR5zWB6C1$msg*VksQx~iUD_tj?m_!${TARzQlsvsgdENMWF zBNdC$W82y%8F_(eWn`V8Vduw(f@5!r29b1^%N-@4jtf`B;T%SA61IC@Mzw%q22^>N z*4tyrB7DSaj1%&Z-p#$K&F3A1A$n%|q=GGJNUl)W+VA1}EKmnOB9!Jv9NiD94bcD+ z9yBRi+wy2@Y00{~qq9}en{M^gh}hXJ*9W1ih$L=C0sNK8rUHEl)*z3y+ccHoj;Bea+g& z8n$cJhMHO!doX?@$Y7pBhdCw5y{>Kc`6+Bh^!9l4`}gaCg$0B#>5JIgtgNan_f{vR z6Gq%i?5FQLumi?Ube}knVW%d+R;_!F87l zT+xa&!Nsds=mF z(|%wq4@@F{{JKpa4wj|fdkD+-AF+gikhsVT{QAg>(J_f`2!Vimk`Ot(l7gzxKi`t5@1Ic$6~l|sK!+|lHTu)(z5M}5gCod z*s)G8S28=lzJ>WSX<=|Sz}lzH7Bd-uftv8|v z89H#{Pr1No-*!pVhU@UOYpRlN+Qh;{XBeG0%iiwNxP^0L`!`Krj$W++?YvHjm*6M{z1Tu$fZ z=)TED!UK3**o2L*6_WeA#!qC+8+|C0boX%M~%@(Ph z?o316YTTI3kiR##Z&~5JAL1qQdHHlD4nvql=zjlb|LEg}PJkUi(RhDpggUSRRwppq z{irGl02nGo&)X(muj`DIzzo~(kiJ3bY~Ke63IV66vNI~^!UZfW4<=br<#FtLTvc~m z4kn;}!9xZdISNSE(o!VPX=}6&&rOZ} zwG+RQT`5+fZEbB0k9uEFS58p11tj>#=!mIimA>Z*aiAJ7zxD*iUQa%x;4qqqk5S^V z3i=nN*noHU^MLB_>r2FCHin5t5Vo2tQ8AIrvR@5T9ezHoJY*18;D!3-HrWg! z4e2wjpIBTD08>B-Yb=Qy!XG5mI9a-(V4h)F|KI5=mBarYk2|PM%kA>!on7vX1!zeE zn>MV_&)Nf6K5n56z@Wrx)2y|yi=)&)oTrf{95)48Jqmc5S$JQVTjU`w9PFV2Ct z^$STehigmLpIj1FS_ba6m^XZHF$l1wcEjI;Cn(hCkI4Q(U^ap)A$Rt$^sX4tZ{^M| zwPWEcWWNHpt}efBka)-z@kc>0fKZdm7~)}KSP!1l6L)M%_kF&eo|`^D1W5j!L*&0r zM~uo+ALv%~x{7ibyN}tYfP{~mAO3M{JM*h;xIdI16bR~eZ3(=;)GKOl$7Zr)qJWSA zaHs;-M=nF&SNCmnUGD?9+42QJN%POTtNhEJN7lAYJ5+~9coPS$lG0)1q@*zylSrWb z`q_P49t$bnsQJg3}uurRA;A^_tO34CsV} zz5d^xKQUDN85>K@vk*BuzZSmO7U9Z7>FO4_fBt8RiGwqIf63+SoHky}1_F3k?Dh3* zvs_rt5v!M(kJzs~2>}!nv^2&!>Y2V&D?n}U?q2o-cw)H*2f$g;&{YByb3VXG#2j>j zNnCNI)t`;HXs-;JUrrKRIXF09iWXdgZdMzffrfBg7|&}}6oCx^qPVni~b zr)on4T%@qUbP$)>oSrH%ykzQ^>F9~y=JLX&vg+*T>+eUne5SBDzReNS)2q_yyvP*c zAt9zUHKRriTw#$i6!mt*Ab1RDV4a;^^A$feJ>O`3g-^a@IxK%ZeW6Bw z`tA62^Hfki`R}QpyfGpPaM5ZTUzq)S&e*8lrHX}@QKB)HN9%ye$nP+T6Go; z4?RS;tf;0Gx++;mUIp+D?qThWzQ{`ARlgthj&;) zUl}*J&&Uy9tpH}}Ms5oVWzztKWl*nJ#&6Ksb!zCI{`cpHWg_Dl`Lo zO~pWU5kbaY_Mt*Gboiue(n6?0p+L0+aB;yo50-ZOZt2SYmSGGo0+c7`m!z4b@yTUrsek+kVXXD6;P1l5%BZc%x~wj&lj?K+x;8)Bn^M@m zs-8~(UcU7A>E7=0YPmlwCLCx@zJG&x#GE0I z34D9|MPFY}nu>*xFbfPeYMlCsO3N(w0b{+;q!3646La+ZM@-4NxWL*L-`p|+@*MHX zxsAQOuioC!Fz`PO$M2yqP*Q{YiL!?AD?9pl-r*#;obviS-2D96oKjUKzif-+w&wJ9 zjQ^5(jQ^IEsqGGakPowjrji20xlVl9FgDwn9G91nks(wqOWys7?aa*p84PD-Wi?>M z1AAwCTbqQz1_9Iw#+_PBTQ={ZlnHoSBd_(WDQKGk6%IdgW@t)|Z-lP0{qMAe(tO=H z9W*q|0Iy35b&AmfD>zc^?t^6@-vT6ipd0*JBb9$tozIe`@n|c(}p^ zWpZI@DMr~0fL0PLEZ}@(u_W+))gk4P?oymgGrg>%Z}*A!~AT|nxf9IjI%~NviF7%E;zbOhObkgXs^+^n*#34~7 zNn8{&rb>E;*s#}@oBuA2+9P5xg2sO9g1&lY(z0|Tv6rs7n+znCg(vnUvKwPvJo$Hv zsQ%-wjJ!j6i%Q(LVIK#S3ChaLu>_GF1j$b?>1Tlm68)4-IQYprx-=ICx<-h9s<5 zD{Az-HhA}Pi7Da28jDU-ALUq%qY;QnFdQM<339}bQ} za71F!R0(aRV2LtW7#VqAv~cCrl-T&cW~%$_5;SxZ&o&B=&lqHknT-@2Qm7ch!4XP( z%xJLtsoYRyS6kzM{09CE(G6^zG^`rUj&KxA(Bkr%Q(PmP7#kZWBqa$7>O+A`Kzuwp zD5xCo&J@VV$v<-H!!p>+fYx&wl%GJzd!jx8B9EjFzAKz4aXX}li-Rei;BJW+AbgjS zltl1sBLbMAJx+@&fM=;b%R)`_9-;80qQ)e^5Dje#d3Mr-L{zud^|e5jqeWBrQ?$@@AF}(SoBh zG1~z{DFd!haTDnBiSCZp=3DIEzP$MM^z;E`n%LK`bP!1Reo+1ckS z_^hJhX6--Cjm5A+Xn-NxcUlE^TDQzwTg7l)% z&quo&tn70NYFcAKbd^1pN5=nFpMe@P9xX@8V1f&%adG{2I5oAj5K)lw8-FA%zw>xc zFi#vhB?N)sA|g6^6s@ldf{NaJX0`R|B2qewJsrKfZ}UaL0$$+TH%jW-g?I}2vY8cP z3L!N4yhHZl_K?v*sP>du(@aJj&1m?7i6gD*$KeN;!%4`gd&lLIbZTgyA%Ws!J9Ie%?%pmc>1d(CQJ z+jwfWiOv;@UfePr>P=)SbnN4pspmX+d^kQ-`&2xhcYU=arq}SSCTok6tiuSQ7#7|` zjoC9?RC$LdDq5bf)8X2q5`a|HANDu~pAr#K>iA#X?)7>FrI*@&Nb7kl=(>*8Snc5$ zb2Tsk9ohe8+9L)Xl(KZR$q`=)s61{K;)gX{lFuFe%KSJ`Tu+w!RT6*Yl^K6rkuAQ9 zez_hHb!Q-{@ftG)5KaY}By(0v(`9!CB!zJQ$*GvdsnpsQV)W=eJXRtzwYN0p){NlE zWH|2O@oQmZ4(s;U7s<6oVmyk!-sipI+zi;jNC=K?>F=B?PQRX{Q-*^}_>9o__P)+% zQGp)F-*M7F`>%{oKHa=-BHu(q`w{0zc}Cb#$%K37oV|<8v`(6+k;Z(ve$Wd%&ZwW5 z0>MWLfOwNe2(W+O!+1|$n0tKl18ZP4;fbxVD;P6$TksRjd4FUwzCic1>1OuQt0*-) z*gISKC3*32x$=OonU}!#Rl6=@(H-1`v{^2>e^hTC@= zM*Gq5eOHizio)pD&37x;KN*i2NbX_i^Z%hV40M$38&(c1iDT2Ni`v@0VQ$jdwo+_4 z6-Wp+!DwB*oEq4aOF5qi9UkCL9clGz7rkjBOJM>Qn8YIWyV20JMHwQds~TTqMI@>B z0qChyy#Z!=-3RuDXxrKf!MSl}_OOKcB>5QA=CEU_0VI3bmT+0TTc_!K=a}9A+0X!7 zjD|}O;1{sR>LgXGlSh)WX3rqNZtYBvFT;UPE#mS_jB%tIvO}i%dzK41kI=bbcH+aD_SH&4oY2e^9dx)2)TK)m53_@4Yn25PB{RH10$bglhU0WiHut)R#V0f(~qt;7U9W1W>b{w>LU%8nE8=-mk8hsVrOUIvI&!<$B?u1ZMgwZ@~PQP9ePRHH= z68^J2?(U5%cH0vbdt!2Q+1x~fpPsJY>4!s0E6zqU0fp*`q$F$w9mU??G8yQi-@02+ z0cBgt))s}!td@p>{^!rUkeW?J&?h@cUC#J>X;!s#a&xRvFv zE#+MZI0-)2XABHTO4yAXPQNvD)8uqLM$oLtzQUvivA#tmCF$c;f>;4KVw6oF;vNGR z{o9k!v1i;s(%tSX{Nz+DCfYvmQtd|1t?m92Se4x^VFB5NPD>TF8ZE92sJv%5|J8sC z3qp#9v}E%o#7OccZlt*zd33y0t=nL^L+8dN8|_^hCF-g zU@Fk&98-AHK{2g2<<&Bp-$(D%4}l zd_Kf7hMtHeQ7nh>Qx+3s#`Au9eu#59eV@aiF}eZsHazT5$jJ(mxV1hkDk^ban?0aA zz~d1mE8QQhVf|91u=IbOV8G1ejXh-5@d5YgH_8Y zL6Z4@V~QxJqJ`E2I$&aVKMnVoZs5q1r)e}Da@KB~@32Bu)8T;&UFqaQUGB#pYn49C zZ3n5$DE|b4D4HOU6B$KiUh2`zo=FQ*n==IKCr-qu)a#B<>D#|@t7vjOE_FetS6oGf z^8P-Ub-MoIzLf3ibR|(uFG~*GBI~c&0Om6hRQo17g_&dR{=+BwM=3U-xqWlY_ou2Z zK1^7RtoC<{O~%aNBHNKXjhJlafMB7rB5-!Ns33C(Mua?wQ^{mXi5RirI9`0@ay;G< zz12%=x6-$OMFzg#R_Crf%EX z^O^6_qCMh{`eV8%r>k-fLg-BkTr_M_*ljo1S+gjz1pIyebwXG>A0}J;XopvygMO?I zhB3yo*CMtFp(4dc>s54f48%g&HF4G!J69u7z+ZHSc|qxHZ3bF z&DJd@ZdU3gg3&`{y(^JQxs5z;Fjz@X9kq8Kjbs&z<(rr6+`f+a`0k}{N42qVU5>K+ z;~jG;8m}cA@LF5_`{E5> z6q{}QXI+S1w+ap5peYB06R~A9YMm)(R8;W_+561d6%>{K{_E%O0>frpZdcfoMK{5` zc!?yHfQWzqZ+^d9%sOsDzA5h7`=g3-&Bo02aeY_ohwnw%9x?01XxJl}fg}U%VW`VI zA?dG~LLf?)QjC%pL}>pb2HGSJ9lB2+;?6gp?*D!h4IL_Tc@B?(gAYdcVZ5EH4KT(cA=XaFL!a$ z^)exVk$5kZr+9HyHg-Os6zg=nZU7XAKJeFDm0K?{V|!cS0{p%H=(kk{Gu$Zu_y*Qi zeFGc%|{!~HFXmceGn==;mv z{5jmTn_V8qoKIoJrxO+9%{_S-D0NQ65Ry$#Fi{cvip#7ZShjl)s!-YV5>3d8mxzTasGb&EThFnPD-1CQo)lqb1*PANKQ`{)pOVE z{BJ3-mU>JcXuF0ezXDO)AL}nhWxqG=Ump=K-@sjoJV3^au?ZocuG1eLuy&<$fXND| z%iA@7fB!_>K74JZ(aL*TsoiWJ?2Ied|yn6i)(>`H*$s#-dxzju5?=;dsB z``eDw_l!oZwh~RRl95Ye0SXJ}1G*j)zo6SI^5E8auHs=7rd*<&KVg0*#jb4m!8SD`D2Nk}!*b{?v23UQ_}Ufk%8n!XLn;pJo65P!?$g|w z=7>W}Ixuk?lsks!3I!PCr?O2`v;5^ZJ_Tgr%JXVv|o;``4bOg_dA! zW;`7*cSL+|UvP#`8<{VytwysGj|ILX7~1VPqZ=cV@`5a7iwb~D7sC?!rPCbHZCYgO zP1g4Ix|_T)o&r~H{qlZ)zLurn0l9m}*+GAfA1pJ=dc4|R>F#N9@PSSJ6wx}xn?`Ms zVZ0mUbju!XYyP5trVnOn)j_ZZv&wZs>TtGF!gBa0eMVbYAA{n# zXB(^aVj8@RB8Y?m?a%dV&vVc1t$$)v|4@l}66#z}EX&5;c=IC`3`$O^j-)>=x*t+e zV_>7ls8$wK<)Ts6aQz-J?Zz?|&$|lLWYXz1XT?zC$gW0xjv1(;$#i{7TR-&g6ir^R zqcur@El{TBV!qaIbNuwVhoT1qpP+vku6Ey34OR2E^>Ex<2@Fi-PzSq?zTm6ND`K{f ziM`SaLZnSxV2QlI3U`UPdoEvUx48%35b`)4?<>&K4V9#76DySIFJy{stES2;%Zt{g zyt&+4i{X7w=!uF+)hZ(7i_6`Hk+=YI-`GtGciwm05`k=p;X6b-G$m@Jr`~PgNm4BN z_{H%fkE^!`#NmU%hUsPqiUgxZ3PhwpJbL}4VQtIPl~k=#$8@<-?QT0!?u{kW_v&f~ z^$JIfgX<%%p5ES<)EF_rjvvRIA3qy^{?~EMZkM8rL4Y15TUqe)vuvLHz}h!_@nK2| zZ(XKp#A*<{aQ2|rmp5T)zWS5$Q#2m)UTu0NPdq>)(f9FY_pF|@e5y?b^I_Rg7>ct- zK33b+q=*_vq>Ib&sK}mT){Wj!JWBD}@XC~mJerQUo^4O#A2~&~&z_R};Z?;5?WpB8|B@W0} z0FIiI6g!oj9v?&oT9A=6wRR5$glnLGN-am!ug?lNx_}%;pVI)FGZ(mGDuE>?6%nEF z+u?(0Wbl7aB>OpEL!&LAEumNwh?wK80F-P>>!rHj{yu)GLVb{pWm=(ic50Ov78cWE z&U~@ab89hK{^_mjzg}~8=FN5m>8vM4%?j1u?HAO0?*`tiG@F!3%0f0yNdqmp)WOzj z>6Q((&ALBslQZXOf}z7rL~-6#H6uMZQlkKandYT0TCVy#>c5RrL3lQsVq#BjT%a=x~M7ZB%riF@q@}! z{xosuoP?cmHui#Q;X-q{zZ*_s;hvfTpe9PqWLuwO}OHBHi#53f;qjTrY|DLL;^!91NnUxkf z0U>}!zCoAFgwg~&puzP6XpPC3X(KGHJ`lyGqJ2dWD-;6{QE6-z{z_DEu2xZob>)*e z*8D1vryW1E^iSrW)Khls3f-0Mr^n3L1(aY#B|(jq-KHJ~6?3 z$ka~+1Q2lmj8(Ey-sCCe>S2@vT`)$(;t9M05f%tExjB`7=&ZDQC-FY@|J*uC1|>NkN;* zrZKq+)tRnyK^ZX>qA7uUGlszx)7mLNL1OOT|AOB)I6dsCJ^Doq$PFZCa=IiPEpUY) z#lJkCzQDP2ym>ae-Xfq+25>fjg4LucrU|PLaw5jy7m!(IXi`9^;i{PPV?hLg90|%i z7~8#(7$3|=v;H&Nws@iDOO=X#qIo{LA|=U}kP~v@U*fP9Lo?2=mnzJ6xTN|qYb8qw zLh7e4VENp~b35q-%0(~Mif6CV@q_~X{Y4yev9?Vt)m7MR%1YE>1JWVz<9Ca*lkK`teDB- z&`^+pc+U1nuisClwY1!KV~4}78R#!RGr2@*J^x~(UIMDQiNKC}BHoSx8F%FLwdi-L z+kH`_|MwdS7GPkAclKmIx6m*$bdh`$;S5&n253>QC4BGqQ4;(ES_6*MPk!Um!gVBXcc6BhKUb_} zBs_Hyl-kT@q$E>>XD(YW>t^`*^02AWka4$bjnLjTIK6b?-UZXlF&nF>@Z?`~KQc}S zsQblOihuO=ZcccYe!!{i_EKC;0Wsb)UV$BNCA@FtXJ#_7-#Mfl8v3g6Fr^9ytDSI^ z@|&5>l}&Zfv%3XvE;j1vb+XjLs9xD;>c%JG-|q$h{%`m|f%qb*w3^b|rWXLq1W~kU zDJ!%j5Wx8RqCH6d?PdvuRjgyG;61(S%Qn~JE7RZ_wRcBObMp4@vS*(NX!I#UztdL^ zmtngw&GERzjFD-MqR%HIZUanzw~n&3(l~cyZU`4eJRfkWI=HjBa>h2-<9)nYpM6Y6 z?+HSOzYSXd$S)5#F4L&9T>D-ZW5eZj!Fmd%N0XaD5z82!W+~@;?^faWeR2))!m!4+;Mr|(clIU+g?QEVs#a}7jckxl=Sh#WB> zzf^2~wVRNOnIq5L8}BTj*Q|Sg{@WI78$BP7_WAaw6owcj99A-xH`Cpt>V^5>2Dul2 ze+b?|hMpRhoV}Jgb!t|6P$7b2DI-hwmMc`Sr>*!o-_Z#o(O@yWSsiHE%aAK_dnwYa zAX}C~I$z)7z@ZoDmlpaFFSq5`9C0KjCXZ}t0KvB{nqMGB70(G)^0tymMQ(m+W`2Tq zsm&|jn&KO_(AeXxfr)2?r=-ilhG%mN55zgAO48iCA^odDOP-+r zUW<1?$&&3a{FrCvU|+z^;8k zFAjq}AQA-c^LuO4(X`=nBkJeQoC#w4 z!>3DpjRsfp40aolg5P%yW!G=>`xbNM+ws}R40o4pm;<6}|JB+5Tp#JEVUeac`_QES#sDJ9RWb_t#{j#v_x{2P;yal!qgdk`5c_ z$fNsD3}%{l2)I3=U}!-vQ3BNe7HdtIbBua<^9tHWA3l!TiGY2p*$^&4aE$Q!@zW zxB|XNKw>IUd=gl<*7PNrArDr$k&j>3_g?H2{~0Zo{{qX;eKYp>!IY`;*@%p`@F4_W z?!;};`m8}sZ|OHw(Z!9+*Mt^S;=E>g*&IFyxGYs$Ey;SWu7vvPcqQs-NE`UR0hLfl zbQ4Zae}DUmS5tO!G}k}?2m-hMlIV284MYIF3?B1!o-jIIZa`DA!aPQq%cI9Us52Oz zDB)o?#7fq66qo3f70_jpj5N-Nl2I93Fbug>mMTimoq02!=~P0@E@~7fAtAYRIKmf`i4+hO{;pz zMp;F*)@YBTM|93)Vl%i{nU+znT`Cg0gkHNbsH#d5plPKoG)Tb@GhNU11>jiIkq2s( zS?e3csEzt0n<9|ttOixuPOD@;zfG=xHcz(RC0TznQ%`Hxs z!}t6-qK=LjO-)?onzaFO^6%1dSk&7*L7L|`fSkj?AX8JGl_~FzClCF^z-03Jjn8_u z6|81_E1-ax@(p1RE zct5I4ueqCVkNw39pJ%dD*C?BgUvdmBM4fsF;{i!F<^eb2IH>7YieQOTE_n z17l^R$tBJdNg-(fLZlfJ2{-fi=N7=}Qt3nxtxf;R;2`V@zT-`BOu1) z*3?9GhoWK-6Gw)91M2N>&u>wx?KixMyzMEtv%)c{WpmNQJa13?OI5ytFehpuQmQUt zLoT-s3XpCKmQ&CJB%0IPSpcwN`u3bKiBl0?V_$sSLbfy4wH&LASwzFZJBV~~@#U=s zr^hy@o7;YGlaiUmR0)H`4bhLP+^~k%FW-v#`B3wNR!l(~+Tb&;z1K2e-UF$V`HcDX zw{_ZFyie*KzA*o-%HuQ%C{DMRkAPLNe(nj>Tx@{9`m}*62W|g!_o;7HAi%W5#$$JZ zTBFV!aU`P%0E!2jQ=+?7!XXwn1$apSnHo+i@|M|oz}(TXvexaN5Qya!>rSEq(|$(n z0l~_-TH6!&F7hrw_1oV2Fj=eS=Ej>bw@L!@V zPR?~vSZx!Za zG_V8lbr!_(_e6XsTd1`n4!_1QpWuzY#F;#pFCknLp7sdilCccnlx>Sd!`A-p% zk+|$nMD0(GZ~nDkqR6JcE1L;XuzO+h#qrg!n5c1irsBTY@5=GJeT!7AKeR?&1^Rk; z4U#+6p}um)itj;I0TobLkQ7j8Ouak^YkVB}66SW1usq=f=3QPI=x z55LSo z&|y2=U#K*@9`%fS^_`t{-#Q)7LvBuZ2KtFRBu=k+QHXe>I&;ltN_Rx(!ok~NI(nBd zr<);ZAcU^NeYdwO#3LMq#`xiJo)U} zuTgcqH$I5R5(#-eh#lXkNc+4Rg#i5!09Nl$S39jE`DQ!}W_JZ<{POXva-W4>bUX3y zK3#88)1_c1joA6TC+YoVG{$7)k0L;5E^owC=`$oVd(hF#E3Z^ zVIpWf5qiQ-um)H{O?Ey&WpXDvwLszdb~w9^X{D2D^4cfS9+Bh)l%BBPfT=0PJ1^X@s13FF*t}E z9vMkVO`WP*p*5c8;{}NJQo#xH^V~tOZ>Ngn-2 zrcRtVDCsRs0D)W=gFiNUfFI-G0S9(qf-E5qAj+NHSpxyIK> z3P{h9x0+5$PI@CBM_2oU>gk!mS)9<0R{-U!Jz52K{mz70_WHTmi=>L!2N23boN#QI zH?`3c7^5WEKnJJxOS}8T6%!L*CJ_D_bRD<1O)gejh|jkZW0h1@M~D4UC6A^&=E6%gb?sK2IO_af3aEYk9u7Cs@?9Kj7cqLz>2HUY>kdd-4U~N^3&t; zCl)rg1H&UUK8N*A#kn7hC<+m$u(2qoOvVpr_U+p4k={r(^ZBYb&kxACM*S$D&v#x6 z^X31w0QobP17l+whsjoT<`Yq7IUe82%js(>_r}ZAP_umxDZRh(9xlzwB`jAYB-^fd zP5%DsHI2kpq4m44OF=e_9hS$H$a@>T+?I|iIUUK2iz>S0H`c2Ex9z@91dBd#n*qX; z+zs!P>0zA%m!t655;#`V1{xjwC>i;`_jtN2G#R~h%?Nx0^HAe??Wy}Pe93Aa7u0Jg zUZF}3!2q4~+xNHw36yk_0vV8%9(7PgL9LhQJf=O0v-mz4M<9Krp{3sq7kB~Uv0iFo zzkosO{I!*~YW2VGahd&@Ik4%hb$-fty@kYm{9Hxs;c?%{ixMTy_odoJz0sbFlvD`nYJVaN zmt`-1$`Y5gSO6Cn2P|Xf!|80`=yA9?##K~2#Kc7xy16C*se>Vd#=>^vQ@KLSTWjBi zJv87}n%#aD7k{+ZXU{O7Y32fBs3MV2SFm}ijVBzzb4$2Pbp-T}K;|Gy0L=tweIOx4 z*f$dfg@hzzWQ2+rbXp^A$uc+oHZU3(*l4|66xH>Jttc zN*qRGL-2rM4%KH(3yX=_WMXj}6RelhABe?4vC@;Ri>BPD&0%M0Y${YJ4b;R3wpUjHF^>37lKk@1Ft!Yf%kr(y1j zU&e@D^h$i0|CD~}P@zq7r$E*1jFc_wJ}jzefyJ>*#%nPaDVvyuUV#u*<2av!$=0(mT({3 z=BANCi84@R(?qmhr4~(CiI~r}B7z}4_-Gwpx;}Zo)L2!{i3khp{Pa0PQBnEOdN;`; zc_-=d6EQt?G!G3STWhmM!l*I7(O06;M~ zDQJV^8}GQo@+Gs1VL{CRBUm;&S+8Zr%)*3$i78W-VsX6CkhqTa4(4$UCO?tALer6r zE^@zE5>`Pp!TZksvWJ*hsHl28Ureb^6L}*~!PrC(C@SA4H#jNC_EQc%r`6-=(% z4`S1g@ja3`?T+R`EXiS~-LTqLDY?Q+Fo(5>WvHkhxe>#|-CK#?~fG=$zywiTD?ji5k4?| zrRC;g`JLPsgC`#6rT-@~k7&oA5N5jAi z0J85th%G+P)(MX%#qhF+f~F}nPlY>dJ-|}y7a31RnunEC{G?(eAR30c@2AC)xSTu? zH}>7p0R4=NRH6IFFWmG}q0eD7XB*c{WqGa4Ib3>-#cW3|oCH^gD_Os7xXImER~MHB zI%8$x!cWyD$2E)t(CTde|D?#=MJrkhHX;kR4zFyO?fW(i!B?-$M)I`Rs^Q`8P<*$ zWkGEg1RHvf>FpQ&;4oe+9LLbI?CaT~c0qOF1x4^uX_E10isf%l73I%&7o(vG#F3bZ?V!$37{Igpi(CVYi?AB`(mIQl{|vk znIl*0z$|XrC4dO^l=!`&a{$rXn+#~G!d&CM-zTg#Gf{DI_-z@bmvs1pk)y)p<5% z=xM%&jN3P2)wf{VUosMPDONgla6h*vw7Wxx>Fn~;1lgvHbfumybGbY}<7v*!?^lKu zqQPgqcp91~3O6qGXF0Tan1``LS7`cs9@TC^C#Q2qDz|H*zxkB47OAt*4t`$gWonhx z`Y(pByt>}=mJT#*cwVpOrDYZGiMcaPhEstZLLmFDTWNqpTjk~QeCh4ijE3@!hWLaJaS5E>szqvl$c z?XwVdw0}Dt*Pmv}pF+Z26lr&s&v?_^$Oo`fiYQCviw)`{j+I5@UwPId1?>?$ppQ5(02SH946fBK^)qvzoWQ z=+zWF8iPF84*r&odi|2sVUGeEel%B$fEvBMf8MREnyjR$Dy=TbIypx3@Ab9vck=LL z;nEZF6Vp*kT8N$$MomY~+$$2Snp?In(iF+p+&)rhQChm;{qbtTm1bv&uE1WyA6mDg zqM|{h29+n|w#Tu5zE-ZTfRlaxSY?^Rl_C%xr8l(xcV+xo|Mz=J(O|)%(Gy5mWgx1A zP4*Ao*rMM$Bnmn@y#w(gkTAImEsvE(V%tB#LAAf_lKdVl8>rVi-MVi&cyxSU-E*$i zD3@LHj%zuDvwWj9RmzU(ZM*Cd?ajCmXOQtRY$ z_2wjCn@LPqj5Csm884T4CoCdtVj2aNAlGGE?_|FA#?n8~&ZC1p6Z3l>zCucRE zkMr?zyBrxMwAOz8kT0b_Q~Dv3+a&;7Mytkk#d7wSx|qB&jhE|jzSX}|3N~resl#jM zqd68djn@cgBY#RmLBU9W0!hSuGKVgyJ+-3uYHg%&-VaQNar)D^bBM)aq^j zQgP_JqB8f_=i4v1(bF>K+c|pC{Z>1~e)w{+**X&z!p}K$CFP7eSLsSUqSWN;B7fF% zc3)&~$yUbsk)etDVsio}jE$ckWTs`J%r?3T>mXJmMc^7}x7NOFAvpH>;n@#P{msgK za~sr=xCbI4QjxDB=4)7LY8p3kSX6PK^RR*?F?V!)U$o|AsR`bMf=isQF~!r;iD(>J zjw61-n(pRSLU>F>cmFNoWdn+@@#m869YN)=*UfwKb$f2W7kK@K->nz84Rw@4S|s6! ziHj|^wOew9&+OmU;_7g?kC^Sg|AoDBWnky;*Sdr07+Jm+3?kgY@w{6A3LYFX8UFmy z?spOzdiBytxo%A+d^G-KtIRviI-B0Q@P8AfI`~OaaIa5yO6(P@Pze7?H2!PiytF;W zr)PI=ioMgQHHItr*O3#qFCTI74k0#zgofgyReiLhmWO}U6J64K*p*)DsWocyOJ0c> zqV+_%q8hg~6w$xhO(}!m^}Y4HHdxRua@~e~ecIdG#@QvyHS6x1`TKIg67lt2JaSe? zvVRK0QoG?`f*44(H$tqD*G?EKU&sLgC`Ssk(?FaFE}1R2)<(PK2ivbsm&tVQv~AiQb@iit_q&vc3w9K8l8ce`ccB%od)JD%H|X*|Mo*NJr)w2R3U}}>E^lnStHE7 zS_eC#`9j+*e*2v_yMqHHQ$|1nVu3rNsP)BaSNrC8Wi;sgABGZjOn$y_L`1~k-^MU; z>WhuHIpBOH0Ir_!=;*EMIjT+PCbYZR2*cr78G4O6=-P#Wdna7=vWnK*(-w-EuLg6c zKA@qTG~f6Uw1Ij@vsxs7t))Q{SNpbHG4XK%bt_GuwCpf(GXA7b9sEuE@)*MV9x6OD zQycFmtI5*uED)7MlsHJ?R-nrSuJnLgi|#)jhsK!Mfgo^zkNw}r#{>at^8=Ej2Nl0_ zgvK_<(R{TF!-hxqqmhP%S~me`?$(6V^5e1>^!Jo(2k)WD0IDVo*_jy;sOR7G18;m`FlJpp4&2aUv^ z4M#iRfZbkqZS{XB7O*FHN$u@s_rpZ;ZJZ zLb9~>+7^`AK`j;q4aCvawzp^Q72gz$JA5&wp!6HK2BbR#K{Q^=Z|fo%MWvWi9?=d` zm^;sIZ00GZ&(CeB9vjhW^9?>6u4NxuMqxO7jcPR=xClU-|GvSls5mz)UPMCCpwjp}6Ye8}DLC0_lB8HQk>LYLKeOJK zB@V=#@Ei!NGs2@bzxDTdY)JII;l-#j8CE@|;D`r>65~ogj;vgwZ&2@6Wex?N;~n^5Y|SJ|ZB^1YIV8 z{r~{w(VgK`1zKfrt;m&8p-VXIciMI49{FDXXTu&uH#bd?2@6t?l4h^8pcvL_f=no( zyf~*O(5aOz!pzd8ZV)F`)X?ay*56cn`;|3=~JZ8|o8PLFmznN5FwM7h|` z$uZj4z=oKkN1+AadR1o{=fFYYi= zjo35p>=(VTu&^)s1^A>)R1o`P2|JD1|J!8eS1fX9MA+iCx^FxKQLO5dpIVi+cXlQU zywt!0lgsh$V>~)~o%I4nwB|^184g6&av-Z`=27iBacnxXabLh1jfcao$Z3pGR9u4j z{JFtmsSxJ*@v6vYF2-8DDaOD^qRL`N4a_Pv-ORs6)};WugMn}?xcc;oO3EWx5H7{b zbHsyFqQ+=y?&+YnNQ2)FkwxGk3ha%8Ang zlG2TIgLF!lbV*AKNOyOMbhmWZx1aguozXvzW8C+3?O5kp#|kv?`SqVFeofAfQNI+j zWJf0^Mt-iLrx!DBG3em2ar1$a(uAA9YK|dPz3|`mc+)`s;-Mo|%O_?FFrNY@%Du4+ z*PtL~f>=1X>(1!T=UoAyKWA+vVgYnaWF%q?0Y~EE`aOI%r383AsUE-pV7f%r13-Hj z{of9PU-c0l{AV`nxc<%a9W1nC-y|hD2^uu(v$h$wpz6h@9@(^LENmyRxc{Tk^A?9( zJ-plm|DA|hQ`wm&Bgb!~BE$V-iU5BA4FzD+H1zb-6_$KJ5aY62t;_y(`j_47QV0+k zfT$E9j%w2{KZr(pFw;m4T6vk3GkGkQ7f7>2U5F47E9PZ#MMdrpdeQmauVDZgwLm^e zM(O)Cnn^yTQVur&EDf)}-NJ#-j6o^^q=gN=9?oJ21Y*8I!)@Mr{%N-)2dahe^U#Y@ z`aSwWrJ!%0K9j#wIja;L#Jpdf>y?s!^W6@W!))gT4yA}}5MJiU1mhh)+5^#4J zJf@EeGN_v_Hz)qvpwt^2Zo$X`U|O-?70L-YU12)%4FT*H-5t0Xi68cVIr7%uZYh8Q zVW0<1ojd&t*q|i& zNpV|QtyfWp-;qdxmY8CXCh?%BY7N$Zt&ZH=gPr5ZY@)JYPzerU{fYh2Y85;yTxJlN zybimd>a)NrTI*L;S8+YVf3KJl!lZ0#{-44YZ){I zuoE1tmcWDLA{dOB{7NSjv}6DBr540FvM0rI#{mLQz7l^D)SnJIG}W8*YRklSqygbL z9GnLGBJ#PF?U7&2ysQ3-#~B*v{&p4kFRMMSsa}?x&SJ5(jqTJzqCeIq)!N{IgNvIq z!%hh0;Ra046$uex*T|OXJf>*bf*ul%Q`=V$YD~L|B^qT?i8NWPK=F#YyhJ*hPnv}) zC@d^3Z6;KBx7mG~%F_9dP&giOyCgm>ZL&+^MW@rDUaVL=R;8N$-Lc>c{4H#riXAC1 z+`k9nm1c=@e!yF6StZjTmKj`|@Aal7x6K?ztjt6{fEv)U(y934Ffg5aw*wf(!Y{9> zyw;@}6J(;;??B7G*sXl<6gKp}IqBW(g_l=WF4n!$0*!mUIU?}Q9`^)mULI5ckJN?u1`Z+P8m074=pBfM}I>xLw9!g(6TfkqyT^09Oi?s(ZIH z(DU3FsSbnm6Fi^=Egtupr7nGhg3^BWxNTzaYBH6T>Utop$t4wH`P)Dx_yY~h9fkze zb)ZA;jk0N0Lc&5gZ(f=hD;OyMV8J$n02b{K7MiD=e;r5h?n4L+EObF$3??nPFF!1puMJ~#uf9A{ASjfVGyVDHCjx%AJX9#d<^47~DC|&n zQbXW@P(zHowQqIeeIdBoXQRE^vIc_Q&Cw5v&E|PZM25V;*ODR{F}7Sl$1EtMDyu9l z@PF~PTdD({Yxs56v)X@)8l?)S&v(<1w8uZxt(Bb)NL- zk4kWQAB#~0e+x|V2(5l=s^*ra-T=%+%IPen2V&o+gGxJ*+%}u=_(}8QiQ|Z}hbFjX$(=b<9qdfK0w84gysPQZ4g8^ez`TvGwj4Xw1mHHC_H6inLRvjtf5$AGLg+1yF zxUL6Nsd;%Dx&7Tp2e&tDCPX1;ZEsa@2z-^t;g8&yjd_U)JdL@CrLd@?o3}FSwvQvZ zt@`3k3svl>Sgc313%zz68iwiv8$NJT1%Pmwh{gDh&E({d`kbmtf%K@w&Mq#y@4Yd2 z)fpJZcBco)seY+Y&7k_qKqksqr{}vfdi5!-hO7?bsQvN~?a;jgArSPx?W_Y|g&-1xGDL;?3@13@Gj4REyZ*Xb_ zW{1zAG$p({pS|G<2Up@G>)x<@NT=Q+{6&Xfw96@5h&!%Yj^P7+-X?e(d^?e*jwYWT zH|>W;hbShEezHKWR+7`VAO}T2Li5^r(xL;N101TMFoXKAU#ghh-KJzH628hwqQTEZ zEGZO%i_P9JT50wrH z3(wbL2&j>hb)T8amkCD3C*s!9lmO6=v3@U27VWpwUOxWMyrygD|;W)cn1v{lTddB(pN zYuH!xY+p<@O>P7da*Opc$+8igZ~Q!E#$l*2m5qZGa(6v&y0RZWw44?D3^G3vsByi~ z=uMrbPTMlkXz=dbR%O>(?02)eD{uFbFt+b&Or)bzugAE?UR-&x=~TCh_l-8nIz?6O zl$ae3o5*n21s=_zD+B$PA2%TsDH&>nPLzC(No7PhQ-8=S^QU-)fxH17h;o8pk}+qd zlYoI76u0AQ;x>F7r`3+g^`RRd+DSx&QZ_p*U`!&vd1j!~x69^Ayjaas0e9^n1%b}5 z&m5l??5Oy;5zb`RSI3EC|8W78BXZMP%~z^#Ax#NuYi;#WQ1x<>dl1SrN1<`2bcb9{b;nTYLR6A4)X{isk(^u6b)k3n) zfj3D4I^Nw~-Mvpb^`5l(3HdQZTwxzZwd2#0WM9IDQOI~g20O!FM7dlnZ_Nv*C!bXvGpbA``hP^#9o_ZN2hR ztO#^-ku4_+!8nd%j&fans5mB?W-m%TUFGA8KA-}rdPZX#zS;fy`RJ4AdwN%xhX9ZQE@!}j)oeY?y zq9GP>o060f{sD7ma5OwW&fnW(>|X6V!)630usG5<@DWrlt;Npn zPPV8DiJ0!@hZNTz3A((fXC0r*U}uw zIqB8;7r)kXr}6%4*IdmKL9Nbxk+T-^BbtRm-E6oyRhx)4 z-%%$aF%2<|nrv3G$=NIx_%b=47KG*1Q$tt%a-4p_L1eXyhI^8 z;K~~P$m%6*Ft6nQVxZSxI}Ts1Tp(Y+r{r&owI;gOw-B*?{h$e;(=dA~nd1i?z4EG^ z6La!s95307zLyhP?siK(F6d&zZPqU7T;^~#5`N2UW37+&kp%a*t;KEETf{gx+TDC9 z)f43(NHH%`*Hhf1bX!A~HC4-DK7Qzq!-`))@GkfNc%EzFzt)mOzF1xTqxvn?LDU_W zzoERke3|c?2N$YgC0X>0c5@jzm+fMe>1Zlx4y}U2;nRTqHj8Ns?Rj$J*!LR&U4aa; z^TX`2WjGxstsT4_5C)YmUyRX90NC)<=>kdH=QcliyM^>Q7ksPqWV!cd%+p^uC`JL= z?-}ZOczmSWp~>aYm&xx5RlH<&rp-XHC-^-A3gUZbdGK3;px=AmWb-Z6et9?A@hOS| zp>$qBoEE9aK;g+?b>85`x(uVmpEeeZw$t(tXCOz%JUEchu%B|kxrWH$F-Gt@y>_C<9Yacbt zz4Yh$G%vXWI902Hew!xmqq_4I%Zq1a$&?#qU1; z(9y$HFQ+;QB(Al&xTu*+4H(sU`n{X!~VgJk1 zRvg7~aFFYO4LoSys|DL_nf5)OLl0DMf_Ws*@kgvJ;-IEDbmD;f1o2q5{~Vk4i)bWE zJ_vkjy6Rt-Sxl-*X&yE(K@e%`@Vdc%84c#^_01xH+rs5lHlQ@hNPjWG6#C`ZyS|v) zjgDg4UD+~MW)xS@Lj|Frr~vSCGQUk1ozISb{yQ>C2pNm)9sEy=I%^Y%)R%>n6uP75 z4*EGU!9=KO8X6ovx(Ii1U{;h;`Dh`)!L!A{$Vv;!wzFcGa{`WOU2RzYYkoVF z>-5f+v*ZqKfd#X=pwO!WfjqwPzYSfHnKN5hAU$i6V4@&`XW0BD$xS3l5cTMCwa(mb zy$$xQ3j!#OAX2>9&u6rKYH74P7Lg=;xx=q9Su|Dg!IEzLKHlB_uO{XCg#P_ce-;+- zacrC{U7f77glp1I*4ZvPWTD}s#}O)PYvYN%Hb(+E7|`B;EhH^Xb@jJfOZs;OV>Jq3 z+BTam2u)5-Rxfdf;th`_*ZxV%z@E-wD)TiQlJWD-e)cEb7H3pIV@n^W1JqF^3k$UW zX5?f(F>Ls3RASZf8}SrixK7Sx>HAH)f)bRbRaWX>UR`>f=O=*RF%ZhatE<^)X=zCW zJwr-|7{FcTzhW(wl4z6O@EXT6f8dk_rGWi|gYflB?~i%M)ylN`WESbDx2b4pc_*?& zx*x9aJ$+X^R}xcBvg`nX6gS1(%yNIjxmCV&DSq_hgoc)ul9ripl^&1f@W*wh`ltTv zA7B|uWX@ka^12;Q(|NdYcBYafyxZ~Qtu&f!vQ2e4E8V2wwT)T&oDW6phJ6f3IT#<9 ze*IkT8;g+$cBTh})21ELq4gnfD!PEsG~5bbx}Vq?B^6y_ z)TJ{S!5zleuM%eF=2)bJk^;QGe$N;%UwPJ_yOOqZEhabH&CH6Zhez-)TiH5?7l~6{ zZg&U)mqTT*(N!jf2-YV3`KZnU>t1{HYE9 zWv_R!ka@=Cu}1Rqhrw38z!jhZ(~F9RA#T%i+Wqkx%X#4dgEI5uh1`snLlUq^t4f%l z-2oTXNtWvm)y#3ON##7-CKci9jo|rv0!+--!mO5DwvBf5H5vwrAoF!!X*D&9>W)i6 zRS}V|71sEKyk`6WDXjGBgfy+5@Sn@~;c6dBB`Rv<;bPG3`Mj41a5o8gPsp&aGo3*- zAd0t0@EK{>0X*4eSqYH(PjvUjv*Sj00TY?5sKhcc%QwrKyj}dV_CG`P3&(fT!0A!}5rb2w8*yef2ao!o~g*UadVT5r0o?Vhs|9$*Y{b4KwP2q@}BU`^VOf)?Y>9_t=V5LKCY#Q zJf&>wtol)Fc_o^YtY8XC#HYGdU&h7wj%E9y$>@j0sb1fFM2XL&A+T`GO>4qe zUgoy!nN{76w}* zgGLdN{2`g5T&u622Eqo`o4FipH2+yAGZMxJP(LA}M_(J0XK`C6M#OngybI77*d6`o z)Itk_#VNSjM05*-R_9cloKWhtK^p@$^_u$n@12Y>#xomt!pXHY3N1(sTCXK=I(Bx` z-XxNWWJ>3mnDNM|sHw_I8R$7`MK3NmLS#dx%iUaLR``PC&-?;s56!lc;u63!2!=zm zmAcpH^?Uc20AgIpIEr>I7b}3lwffq5Sm~l+|g?vo7`U`5wwPohTAXs zM6Ur(^b4C3NWfqHaoHA;4r&U>_a8od^tkzW=kXCdEN=oWX83gV8Izp`5iv^n`ZB#m zGGm69unsF)Ln&=sFVHYBm%AE*H%AIhYa)z^iU&fT5YX`G17Cx^V~N;pFZ5TMAB-os zX>{Kw(!fY`?X}Qpt94(UJwszAIJX21bCo0*WyLkc@!4?mo5L$=2gqhrp~xp9u*0db zrd>_rb75kn3;PiX^b3?~QN5-H62FY#qL8qsv--7a>gm7F3&3E~;&;k>-(RA*r>>`;Iz;QLih=?Y2&SVD@u#zV;@x)QFORD?9b^UO zF*z{pShV8>cFqUa1>vIw`@p42Y7vp7*^&ut>_TR985tRjjWb!`GDizf+8#ttidV~Q zf4WuE)(-34?Avvnsq#U`3uuWyk8olVrWFU?_3#R;*41w`@?dtu^zPlXbtCvUC;mlr zlb0*)Emp)ozrB?y>;BCZ{3IsjyomI-Glhs5X~Y3p0)rjdf`lJ{n8AL_ZG-CYaC?2s zM3FbTD|L_T8xI2m_I;a+pC-HO#Y~AlxFJ{7i4ou5+$GI1=Sed)-ag(;%KZzXSb-9T zGoPXHboeMTIDbbOoQDxcqg#Iap#q8$)Y~ycb^eY0IG+|1LnD`dJ@W4zB41FR*;Atp zi(V{Vt6jCjS?X#tEFWDvVz$cNyMlFVXK~4;!PSyi3-XO#VV!RN@$=M1_ zscLnYVc=jf2noMUThRy#CgxEDw6!Z=pDdv^eWDT)3jVj+I#v3G3LH*?dZ3OLSFK%`D8->$RDAZ09L> zdEqLm5<$Rfw!@D&42^IA5VcA(FnTk%_T}tW0wti~<8yOm!Sv#YGu0iD@ z2-4m4q;oD88i-8ATB@&Z6m$q9{^8}~Wl?4*BcY0kv~vYSCCkG{j@mOW#^lTv(KBK* zEXf{_o2jNFLsrw550$Eiym|B->a_t#a!iHs`yWcn563OKd&-apm+Jlawg+OXCw{HY z8g`hQel!+G`l2w_DXZtPTgzv;&kQDyrraWU!BiuwGCU%)>AdG z`Cp%KOt~-Na=GcutSeAdDnxd*Z}2xL&5|gD zig(^45jklGsV#yVnU!Y7rW9(5jp93~yqZdgM(tpgii#Xu?IqzqwVE0l@8dlXcq6&G5}JH;5yc8KeVwhe3_UKoJimg_@dn zpuFRj^8zhvi6NC}IUHvmX0oa6)Ydt~lzttkgz9D#Qb)E~X|AyM15-6Qe?!qzyitYc$ik7KI}qvjxYY>j(fwKR)VW*Xi3d<>{AUt!7OFK2Nn zF9OY6A_3sxk{-W@0Sg+k_sR1eHJ0mvyr_Ff;06TMd+IZS^ZLXzExM(VzJGgmW3e-Y zWse*mAio7_wR5}M>c%R;TGVI2leLjgCke-!Wps%LsEYB?GdcX*Z(_CzStnRzi}P|3 z+IM{Rw|%0#TMJ&bzS3FKYIk%Lfu|*?(qL@FKGG1%|FwU?v}M~@@ZtE4(f(Cs3Y@i= zw1yJL((3m$HMDx#(NTKMIO|`-8$q!#htnTp1%)VqwmXXHi&`*5CJ0ivAeuvlW7StO zna+BM2okUIMr=4-`PT1(x4FA5Ew9cY0)K6Cw~#wLI@~?Dh^|gMmG5FHn#CD8Q=q{u z$YYvIIQh{9KOal_r&0UF_N4O8(e5b8YCt+%EEZrpe6}5+{4G6Ek}X-X2rih-zMEJ# zL_FX^zp;HPY4QcKL)0G!XAi)>rfoz{&{86%t@4WMLKOEk1TuWHZdZk{$Z&_tcCe*x zqPpD%ecru@U`>6wIieNK63+IZZ-TaYDgGL!0A=tIVv((FHV5o?C`Xv(8NUjwst?^6h>Cg`dLI26sf`)Xribn zt^_keF(V@wC4T*W5I@4i!uc98irr=nxIzL}b2ebT{3>(SGq{D`JUpa8&&}P(<>CrO z725xB{{Ta^UDQyCP`?xdh*nynICv%0QBrl5X`C*sli=+%sBU>RVENbE zj%Vl6?TtV8?z3~k4*1`QrPfd1LA$d??RzPjq zeDPUJx#;zI|Gt`u5o5YgZHu;n=rs30^W3ZvMm#(OwMy?e<9;=x8~6DugrdxVNz?59 z+Uo(TH{SST(4E*TLiM!a$)De`xeNAPo30ua?kqAfB%zv4+H9L;>R0_S0>H|e^t$@U z<*=eNqBzRP$n<%nXxR68i9Soj?K^9G>vXLpzRi5axX@(#L|wn4Q_Jeu;{o>Cs}+{f zTj0B<1B1d9Z9aK2JG`W(kCXLhfH@OFc7QM$_#9Y(EWww5vn# zY0+`Oj>F}x5dD1XkLA5*H*@OPOJX?vH|Y|tJPAp6Z@jX7jX$;4?<|t=39SzS%Z}L) zuWp7*{q1$u_2XL|cTtuqEwgY8ylfmS49HaKG&w-a%PXe~x(Nc}yrUyBsgRrTcG!4G zXt+k63kZ0e1+7_Xi>_zpYhAfGS4FzC(6-={(e&I?*y~X$|gOvDn|84(24#{)vbKu3G70DWp%_3Ek<;hqku% zq48l#3ikLtiysgz8Klz z1A|C5g61s01mu#**+N^#N*(n=2`mR@#*ra_EM(O`fE8g~u@YJG%pSaMDPOB#658tt z#Us^Tic)6>lvxEeYU+H6Xl!`*rEkD^U+})I%tGm*wN99ZV(Yfy10@rWeNK=+V&pG_ zzqNkbc$fBG2iK2BwlCRv#2E^x>s9w*6WPmPeI6OsEU{YriTVoZ@7r$2(HpiJEK}UV zi2b_U;qQFIx#8&Z`ck*b7F?R?h-`)7@VD&kli$nLuONCMhtK_YqooEVc&JA_rv>Nk{ti@4Q0s))MgK^nr_ciMCgzZAQox}oia-I*K*rfQu<2JpZSuR`Xm&@Z0 zBR3K1(D~l7}5P-l^EzVYo5Q{=h|1J|wK9=3e4Y1Li zU&jQ1OUWXd5bXBGoQVnU*fKHzuf z2zv+p`TnJi{na`u3b|HW`}LpF+0R#^Y!R1lLlI8pqBSzXkg+n7U_$EHe#6An*wr2^ z!+H626EMLqHHJ`#7lc)64Xi$XM) z3o`#<8+mGvcjRN>k@tFQFKfH{XAAC8$+nAZ?6=bwZ7=^S<|;m>-P-${gNK`j$3fBG zAC9)Tc0JE`S z&(J2d&hH&!&T7jV&k3lom=5&Tah1YH`O4>4A@Ev8R(uHl?q*YK`os$eVye{+?HNLT zys_VTDB1ZDNNx6fIWpT;gh3N>nkJiz)uR8H1@bPgxt(DvX12DfjJKdyOUsJOIz~`X z@Rwl)HMfIv381maNh#5MX|w^NlO9x1a4AD|*We^PIXQV9Cnty=0_F34Z;_P0PHh&Y zWSH~ii9E3EM@-ulEar7o8nxg_V0a!}$TBcY>{oaptCxM4Q?v{0-7GSloOo_?BL;_@ zECK(hwk-X>?hcdSAW>w{pmJ2>b1_;Bv0?*6w8?6uOQ$`PHi zKkc^U>Is-9%RU%QFctpy2~F!>p}-*P{1%ZPxX>$`rhe3r%tFAY^7WI)u3*!&>Rp?%(e_PuGU!~V_E;=+u=o#wuOL`+61KDV$`=6U%=qE^oLS-t7 z8=8~BgSFZ5Y5lUP)aKRY)(#2qNwnVlW>uFD*4nv1#0{_v8m-)jzyyw+0A*;1TUmjM zo-fS{oIPhjt>78OHhs))U!*1g;bsj*=rCI#cle8vhgdo+ zK|xSJLIf{eT-odzV9UW&$@G4O2IV;qOuc8VpiMXqlZ0ewi!Ci4v~8Y0{VOiFdIi~Y zP`=@rgN%tG5Fi>_Q-e{N;=VU&gi_bl9UM*om=wSj)SI)qO(1+vhR6Jz1=gWd`7;&D zQyW3HwtJF|HX-tJIq|+jr#y`^P;2(zqS>>Ab3|7T*204Kp`(YuSJI7g^e4P99Ie*; zN;Me=H_7{giYPX0D~RfQgWbsXomkKGyOKYxZhW+%{XlZDnfodKkMqY?Zi2wQWx5np?e!MSXohQ+n3>f3O6n6& zL)bJbtzy9ockSC`MQEDiA7ct1SGRK|jkAY;zC!%gC41T%RK2gxR|^TGLCMy;!Ud~? zsX{L6wCXy?L9!SNYS7K(D{`kuqC$_I8xZD*$F@0i*h{kH5#fHiyzTtEMqBH35~pQd zg^K7B$yw)ez65m5OT+d*Z||ltO8(~gpBI2VQ~Cbh`)bAI4Z`?2cHOkG9n`4)-e5`3s16o@)zM&_aSSN&8Rs_LP zy9YcxI!S&_O$7K;fJqnOYJV~hperDupT1o7S%ZoetL0y)hK7LQ@N)hu#7Tr2w(4)s zbrMk*=&2QlJZ{dh6(-isjZdFmq7v=clPilVVblF@YS$}^~`fp_0p-o0~OzcGP zw@2?U5!r;t%XimZI8Le9+FzNh4?jjmMbmZGL_qe!Pyccg3MzR2=l4H)5;S^A8T1nQ zq#xM?c5&$Z=&F^ z9M!bu9rxU03sx>wKYVZ>sBs^cVR{#h`GNE4_Mhe5&lhf`%E>uKa+lr94;_ZTL&#Qr z05Ag)HS+V~&#Jjf-CO||(fyRP^&*QZewkR`5Ky1Dy}cXf8;(QvmSbi{qr12D5RDKa zd~vPW_B`h@r&y_4|AS=;LC?aUGj=3Op)zpXhMGng2gpBOJ0ACvrt)rOj#Sk`nUrj6t+O zjM+d!T#W)uGISvdm-_Ol;rYF`VCbS@n?_M{yqR&CQpew-?n8*IxQW2@*o|ne-;6`E zM8d$XF6FGlP{z{?=H@#$sNTIg?Wy+KDlVzn>T_tq#vuvmUq;RxmvQxFR?nXf6qoiA zc$Ijy;?|3?z;@3>ZJk#Dp!XEq6mXuL;;t2N!zMoOT^t3$PUU^k)pQYaxNJZR{<9HB zBcIN^C)C%WR8-jz!;;y=70~V5@%s1<0J@@=?8;?4i;BnwPo1YLy)^g6bi3{^;u14b z##bggyUe)rXRQf&E;o-*QUjwDY#B96CX9PRYO}<0dwwW?LO?^a*h<1K`%nQlnpVBl zpO!OVb#AiOHaTtWc74njANNB!A3#t|!A zxiCM_ELI!r-z=_g&VMxOG2^WBSriq`;K+9DGzbHD6r*)Wr6*4&km;VQBpiGV7Fw$F zdRO(SY1``ZiF=!``J~^<>eSBHJ?g-5M<>XgIs!t$o$^dfRnqql zPZuwD6@ZIHDpQz%yUx}N1oT*5(cuHtOUOO5JO*J*SQEg=r)5h6aQ}_XMD$LxVG%>P_L)qBi4uYYWyG zFZb8|u#0&ov8tuORR?%Nus(qO`~Wka zy-+eXAWsZj4MIY~f!z0X_%o;l#KyphP^fxetN|*6BBSHz*|{SOKKcJ}&=;Yh`F(fR zKXzAQ`YWA4*qMMHjefi9D{-V@@Z-fxq9fp6OAYp`RZIAZK3U-fQE*;&Kk<8Su!p0O z=2-;8e75P+U`m;4kVdvp`7RS|5j)hdx9Qvx5fRhp77lZzk`~=3g9-+!;9E)s3QMSj z1-FJya_@DV<<&?98z>U|uX5HQ8(bmlb=r?)K?m*OLKU{Z|EpY%fhQDGRMZuS-t9i# zpuk9lp^<+3RQKgfq)?~z-zNXz-YqB_g&=LdKg8>@o_Se((UD^Oa`U zQ@0J&^!7=~&eoZ8f$tsI=Z*<(y8N1HBXfD}fu;XyCc2vAq1R*Smpy#Dk4H&EL(EjX zlm1VkZNCdy*H35*xkm_~^+MXjup3n=n8x&?&Y1U8dGr~LJSF8@qNY}({+*B7^t$k` zyb}YUGnLLC9c{m}V?9)LjKjkK&3+@SNV>0z?v^X_Rpnd8@^#=w0tT5MPY9JL8Qc(9 zne2CgB!msh4rK}@Xsw2a$Dz!Ef~lHQ{R!I*<2pNY6YW#XPTYwF1ia=VDqth{S8>6a zjGl&uAh9(?!lg`ZqKA1m(RxljgzTgNnM0k7+ zRxARXz)nXRw2zojAa|GnaA?!DnnF3=N4f(dys2Gz;(KE`iY8wK1q1{D7QmFl>*Jza zM9yPmbQ)^`A3+2{G{`Q4@E1h^tq3)0ql~h6pqP!iq@e^EENtl9&lHH#W>;F=Y!z84 z9bwKCkMpPNMH1%djsDE)P9;xQm{?*u4$B3lAO5`10B5f*k14v=p=IBdW`>xOCj-H4 zHOw+GV8&7Sfw8r8rH;7Wn4*&#U5rg^rCB}y$CzHww6RQRR9k_*ub&@>@y0HGj^)9@ zla*E{qVzASw(GT_A)GXP6OK<9>LxC_xKzJZzv?>f&Fn@4F9cDncJ%UYf%MbD!MwMU zMG`z!`LpKFL@2Z-=%!KS8rFE)cOCCBV8hTmaIkPs=mQR{KmYoP8Sy!-RC8!HQy_H?MmJ5M#Ya_ zuS;o+3DIwCM%SH6P20wi2Lfr%QK~;CP5$j)=|0Z`wjvWq)|I>kuC<9-GubaU7T9O1 zz`$jA`L1vY-&|vZZ@I9!83t(Fvlhw+YmL?LUU|$$%XX{-aRG_bg|Zl=xRU-7nBZVW z%~4AUDtZU>tj+KJ?mqKA)VVENaNF=u%ft+@2mlr$juGqg_m75Np}O@JoVT?czHcu~ zg05DIasO7QkCMkxsqi||#WF$8;-U{*^&Dj0IE}^0-B16Hf)|@(zn&0h2cO+$PO@1a zO@l3aduY>C`0Cn)M94pWzG89n_*k(}29@83H*~GNHOWY=3n-#fRt;?r1Is`q$^>ay zbqx)Lw^zS|MGtmzl?6{iKd2ZJWk{#ygiV_hkh<4Ft#3=`7`$nbQwOZG~d( z$mP=kJ6=$r( zyK#&i6F6~IC|$Ua^rxAZc)@Y&G6mFAx$8CB$aHqxZ6#JV*e-r=_qp44)%7~>o;EYL ztaVvLLxF?6&B#bm24~>$Pc+k2wvKIWsQ-BvZ%Oqik?>&9QFv%~QGn|NJm6C$Myh`s z9b^CB_Xs>k&buQY+|QOmRZ6Hp5*wU=lhlO5Kn8BM{v#jADE((dC^PCryWrWX(HXmk zzXvtik|30=R~5!pGRXm6pl@W#1G{z3dt(BRx2KVDO^a+uPiHhQkcm&@8puSniZntM zTrx~rNHy3QQI|;1~70r5xJzdXRw z_XyrF79)XHS>I}*N~%K!TiZ!Chfn=_fd@$khZ_y}#}pQt%sc7ejVF{=A> zTY_YGA}EG$Ud6(TPLLfCMrdm0Zx+7x;2Lo&8jWJN1-D zB&A^O|Ji}(OXK#^-IbwXz$vN1nGVC+Tkhi>6!Q}F{jd+)`@9mLPUiOsmzj_~p`-b3uU^DB&_opY8LG zdY(VR8$fxZk^BknA607q9XaHoC9;s)G@_2k^>1EV|F%+ zWx-FpTplTT1w}>al0IlN?W&WVE3{kdj7|6NZmLtQo(*OY1$o~ZA|GRkF-Tl{v$yXm zonH+QONWM(==u1_8x=yCN5M7LW+Ccre4eCuTnsuqN~bCX#MPMb*vcc$pr9Ovl@&&$ z^;Ikz`FVLo7a}t$iyqk5*_^R_)$Yk zN6O3oYbQM?NM}CXU|GP8yx%`p<$sgGy%d*MLij&I)1;f_He6RprKtp`Vx4%#Ad6TZ^k5JoZ*Ffp%cM zR8UxA@L?}+3!l7)>8S2|+lp_8!L5kBo?DqpKJ>|ICu%@|n9ZV%@8}=*v%km)+@*^o zkSrsq+vS8MA)NKx`D3q@3|y_miYtnpuiv`w(9W|8bCOEp)OB^`jRVClz94ooDRgfB zV$@>mj9?fIcD@lA@uS*eiG#$HPu01-ab64PJS4?4e$o4&OGO<;Scm&g@V~)1M}~O@ z$)CnFpGTD9kgcP}9^z9a1;5n&7Cg)vlipZjY8kWS{dO%@llkvwgreu7&L>MGLY~QC zZrBy|>fpnuG3`Ro+7*@3wtvn6BZruDhTZCn=g6Q4G?Cp2PH@DfOL`D{4b?J_+v}6J z)@6h%?AGkP&n1@qPz8YXEE!Cs-p-u$&Hgt;+vGk9UaN0#jJZq1jjf!lR6SIY2+_qO z$JHZT=Zn><9|n}Jm5%%gPZ-12kOWrUG~W@bLL_5wT{c2dMRc8&buN=fs@5Yje3pNa4H3 zXlA2^m>>4vKQ;+?UQ_(1UVMcor=p;XxUA!Zf`an88O8@z@}0S9Y|p2M4Of1h+I!;P z*N5Mjd%tG;5L_HsxjQ~&l;rq+(`dmV^;RKK*>k-_M7l!$Z_CzGk6bzl9oLhW_99$c z>uAdUur~h|3Io$nsoxj_T#QpKin1%Le1qSz^FCDIffo-P{>4YNSxR*afeI54H*T>H zB2Bu@#)tq9zTJL@V%1RdP-5S=7-7B<_!S|j^|6=j^Tu_CX{BL1q-7!;Fu=&J5l6;p`;6KkFS8G=r2y< zmoRiKn{Q@>JT_o}q=?5>(9n=fr=00bNgE2L20$5zQmNh_S_=jh=pZ*8oK}rqPan{8 zQ(-OV5D6;EHWKxjb=c!h#+ZNK9;$#k6m>Pe*?IB1%Z`6ky7s?G-7Q_LX{z|y9> zY>CIhVM5ZYG#m))LhQb5_C+FLLPFxRp435S=Sc^{K_)ntCA*YavU_FxIqwzBA$}t< zC+pGU-B|WLP{!>h+c&|r#hni)`14Bsu0>OSn3!Y#!@l> zsbRYRO`}kTrQ=gWOg=gq{oFegVqUHJjtmFagIbd+!-C2>p2YYs|JTu31vL4#VVp*! zL%O?>96e$nor)3?f;1D520^+Tqy(g#h!WD>jWkM0BQ1;^{XPG0Cp*}|yMrh0_r9;| zclk$c(2C7q-^Juah%}OX&BqtV!0>Wzcn!f(G*+D|T({X31_Nk3B$4v*zE{10dd}!U z)&-LOTaf$ZZp1Qop75ey^H75NG1ewzS?H5epLV*g!^~TrK@c*$l#)d%{NsKFUT!gL zxt(;~S&iTJwVk){>L+^Hwy!|i){y?6_8&Y-3LQQ3Ozr*7A`^{9yg+n^@o6qpU*EaMa-k}#an+ARI z=Z{TlaY`a;V|cuZ{={$H^kv=&c`l%7!ipzNf|(zpc5X>XCU!gYM?FL+m)3vf7U1f^bUsC%^jg)ElQQ6OV{e?%i5F{EO9Y6#qxGcw1wx=!JYzT*)1m2c5X^U#n>TE$#9Q`%3i%H#j z?r)2J4k=QVM@vlFf>&9Uj#A++7slD z=BXz#zTBBD;6vzeRc{Yti@_I3goN;U(_?k*1T1e*cwq4{>66e%T5|tD^nI#n3A`2+yF0;q(dqGG0&bck|DmZ%+(%R(KisAw!H zo9Z#Lp9vs^q7%!s55oKcB4D>NTiD$H*7L`Y>MRKt%JqI-%RfysAVVN>WrZ2m z*|S#h*X_Ur2M|uDzmWEq=lV;%l@9;qk~39g%EZnKmcU_$4(J{Nmq4*ayZM)=v_L7V z3xiRkqu&9)6RvRt7y|-jWY_it+rYrU#(oyX&CNUN+YV|EKL((JL|zbL{#$HPjXHVT0tdQ!@sY?Ajw)koY0rb9==H(<*_!wh#HayC zSzSTD5V7v-_t>3FPuFZ)|L(nHwRGd_97WK*>T%P4J}M*q)&2T9AH-v(s*CJ|pW=jx zJ@~0t68auJxlpV(A_iN=VE=u{b1du%Dn&iL)ez=q(paU!1!0sAuqGEq*t7ipwgiok zthQBn|5^4sY+5>N_Pz&W8s97FE!pci|Dg7q%rHqW`q|NvwOFhOtO)@~Myrf>0R)xu zA$@e>_KB-BeVA&*+tv+Qw!XMR)S}eTFnr=)?os^uOAK0m! zsQY<;o{%!ADf8dO-w@OFG}mD*SGdAh@17Xr)P61v9bu# z&2Y_`6Mn*#%Ooc4%X`Kw6(aIWE=L01lWEc(xBbNf@_;Aw;Q)fa@5!-OPy2`$pH_X-Csm+q=`4Z=%o5%iULfG)E zT%0&HxRO4akNA>lPbpyXUa5dto+tRzxTQq-Em8fz^N_sls?A+0cZG_2xc zb+*c);aMPgmX^*7A8Ifxr!0$anwJg~Ks_p&U~-tUUFy)uO9Z*vemaD2Aw zsg}}lhj|TP;fn4Wtii#malz<4u>MNNv*(%Gwy=z--pL+d*B=-e;N;?p1-W_q63I>_ zzd?Yh$H9DbOboAtGb$L&Eq3?lKvz(y>`W0+4KfQI9Lqm{`VM4bmTwNIJGBWs=7tgj4ptwqFtylajOt2ES+@XE>kI^+oA zB?bZD8g!TAsO3TK(&dNilL)qq;i|d2M~Y|nOOslnw>X5w#V8Te`dchVVylgv5DQ^i zOfZoy1Zu^)=!3`BII>lmf*;KU+j>r)+m4I##8zfL2t@hG#S@-^a?n|V?p@?57nf*G zf89Y98XCEkI!y5?{_6~>z-{i;WKtW1Cyc^uk-Kp;90bG$dE)G>^00sAH1zoK-W>CK zQd}mIE$cFE`H21Q*KW=JTw6|HH;%iSyluis0f<#`_0BrD)aTCXUpS7K}_K2a%a7l{NuNkl9V!l>~2q*lgp{K_@-KF zkTM4V{>$(l+v*99db-ul)dqGdKgF@R5YbF+$}ZqWJvuS}G5^}N;S@~<;!^avDO>S^ z*!m#mnd}Y9=I-hzF$kXMAC+=`(VAEOvgz%{3X3D36Sc^i{I7B|Z6!z6EGY(_X0Ool z)_*KP%T`2pEs1d-`E?lNI;%pTB=c=}?2pqRHZCI|Sppk}awB2=oIkGn8RD|U7{SnI z^yk9(<@R<`uFl<3_s02QZ+PJef93@v!w*qOQ$3iT+T+|N58FQ$zua{z7@g-@q8o~_ z$P80vTi@YYbH*$074^o4nF)4py05z5SSwzMq&+ptI2p{B=VIhM7Y8l`|D(tEr*bw8Vr})iVNK#9KK@gB-FBM-^rU2?{SDza^*ywoH+7O(! zH=D!HsBZ}380BJaZUVsK7N)%gaaS1m0mpbiWLs@Fc0Ar~eQyhw{x4a*k1z+12#@pe zxY|P9V5XMs@js?vyWtF1-3!5+o0CA^AwHxy3gFmu!E5UiWo5Q8IcTm6^q{zH3HIUz z$>1Ols3LNblJq!rXd@MwI;zN@0DGo_U~0kdJ+QkWCf`3?UHMVIs|iafE0L91S5MP; zlpl1C9fD?TOtY~WZ#(fM)?O?NiJTB|nYY2X!L*0}09zYsT_;9LORMFlD!owmufxXC zW_nwepHeiEXw$lWPE9RtE1E0sMme1y+x6cCTq7lnJF4Ysl+O9j5u1B>2-27Q1#)J~ z#`_>lt6-zow}On0W|&Qs5z(+s@A9f>Fz0dhIi3TG`ZUeFwXeFO9k{E+AmUTZ;=|T;$w(RdfT}Wi&}#G}WN<*sdSjsAn`u4z#O9i@VvU275;>!3jvwr!{UeoR3im9`IUO#K|H8+aYn#7`T?>W zm;*8Qr2%I@5b$)XZmp)#KYjXV?dhG}w8Tu|WSML&2VUbRz#5J!G;B|yCmUX*vOxGB zGI|`Q4mYJc>6NB^ygwrlC#P4IGQalbWc!b2S_q=l+i)RC>M%TYea>hsM?#&dh)~wYJ#z(uw?OZy4 zk9C9^a$3HrGJK}5ZmCAHN=gd$wp%RRLtZ-I)NkI-YsIXSCMI^2o}U2ejVcDkqmr@7agpO zlbV@5azwNiEb~S zUgrf~(fk!cy`P-i0{{m9!%;-x5BlcrzN7-o=tRw?^&D&+1ZHS{aE5tcxc5?4f0O6( z+kgAMe@Fdu(Sq2#at1#Cq`SO}jGvyF7Ja>|T>RPgXwFWv!Q7-zbZo@3vx~UFt%yM1 z<7BD%#MkZbTgF!lzl;Z6o1FPA?l?}UTC|nlVQPNh@3$xTR9;R*@}>OS-&i3dQVM&U z)vn%_`%Y5|$~>#>%3!T**}NOJeo%d_m1GH>AfN)a-NZRGl3$n-m-3!iTB1#TmQ%f(2z9=6;{&Ax>XODMa8wpx341WD|8Wga z2Rv_?Z#SUm=xcx8!6T(Vl&-}fibuRn4_LhpSvzsN5PE#TloQ=ir}5Ak`kZXbioq&u zZRI-F`NdBuGy~h5lDV5zd_qv3kV$A@KoHjOWQq$9eyB#=yko06r@Uhb`r<&-5PZsU+|BY=Xogix3+Mf*( z3E(hGK8+It;!N@@;FiavNR8>>~wH$Htf^Iz>(yQg?MJ9U&)x#}YWNN;K2~iy(QC z?DF!GoxO*gk}_m!hh0K~@=p0h-QkDjv}fNxy+y7IS^J#@S&&Nx8?{~oPN8^fB zyQB5hCkPU1`ktXj7LRYkX&SI~TO#nO3_t5yPb}a|KKJ2nMVsnq5qm!otF$Mp^(T2osI1|F4xq7LP!4 z#E?brbD6e{B}L2^wWnj-0UmMwJ{ZgIn)9q96UfM!V*l78Ob`8m%_=R;OmVM_O`d0| z`!+Jt2!lPOTPbOH^NYA6pzyjjnyJAdfvQ0pA~c1X?5w;Pk$)5sa4GwDHD=9z=_5ME z0O=jmlV&se=%W=97oXZ^nZ(h_arSK8OQ~DgEtb_Pc{MIeHgA&ed8y+UR#{eh8w?_| z0c@hK-`i}5KLKyS8Jl| z>_Gs|jGE{e7zx%>$FbnPo^yrTj@aBn&3XSxr--q#k*C z&P_qP_R3n)gF8Prc`Zv~)$ahZ}26wNT&Dp0M)zo|H71nS}&fk7dRWllFdzdXX9n z^GaqYt8$88ygs2nJoYgQAQ7?6u(S_f+*n)|^(s$Us&s@#H5#&Kx5Pw}5i1=X$`P}A z_dS}P$#5P29*TW|UwnBrIY2{Z`f{(ZpXdzT;8Q#9j2J%=CWTJ6Y1vd9oqI={zG@1g#lqQVc zXEq?4WP}TRp1wsVaZEEx~qe8!s*|?gl|{-(JEJZs5k_c zP_zt6d*n{tq5dv?@x&r1FifZ{-A4vu(G)To zFEfvo^ozl-LX!h>wTUHCz^VSk)O-RDgruX&wd_XMCK*#Jg*6JNED8Y_^Le z4EN=~9o6efo9x!NZaxc*x4-_tw?@x*Ths&EO|JzEIb~yT9uli`>ma>xpv1UBp|}o_j{D zY;4>Dt)t!K{VW+gJ_j>%AU-J)bc;xVZfbZ({m~Y9nQv(c;mXfM?}$#tHLhCYvu#6> zN%)JJ);Y7Vup}h29qT#0v5OtAcDkT6;=hl%Sn`j2oi9-I-_;`Jo_4Y9pK*QCchpOz z+2DIZ+3bA?f<{wQvSE&nv`-S~dk#MM?5gVqA@Gj@l^MID^-3D7dn=ozcX6Y1iFC1$ z_h!APi2T<*Q7mHO;?)O;Tu=oBe>e4h{QCIm-;rERcp}_Ppt0{1k+*rWIZQ1d@F0?S zYpT_s3Z`ESiXkD{Lv^2*&kQx}UHR9!WCw}|*QsZN*s;SepFW>qP8}TI@mQQ{rQ?i^ z##?8!8eN1)zT2gMs~1*v!g99N00#_pJeMs45PP=>N zUR|8ncN?0Ks+2%aZhMNlQ;ta@pb@CCY*ub0Cp|Pc-xzRXoq$b2Rq$>qZmLy|;9;B_ z+vwrXs|#gyZn$PMO@Ib^Dln(vnNjvnenUd{n2X_Ys3(>mAc;- zzs-T|i6#g$8xTHP`0!v+MfK~+xr1_oP~HK8W^7@lz=cHExAUgW$AQ!LEFEGD5Lot5#w=Tu(nUg*ZB0iFO;~^m9qIHTY<3ze{=6! zQS*o(ysDk{44)H7jrnl0p*kB2%DPWI)kaZ}`$6w}Y%beDtzwdazn*kJgEieepWSN7 zcw(MSsL=RSH_5Um4iiGQ!yqawF1CgO@b{aJuNn_hX0U01vAuAAvQ#VHi@M_ zhJeG}(V;6YI=MB{vfj8+RZ2SGOLqtsYF$%K;5*i6o-y7Mq$@PZu%Pg508Z|@Xv0RE z&Nu$go;r6*Xc}oxt^49(gp};;A;NmP_=Hhn#sUGia~ea#Lsbhdak*C{(POPKkN5;? zR$|d1tO7O6K06AI4oYb-$8gTEU~1@Y)e(4;A`Qkd880d_`}#z{9(?2A7qT00iLG{p zlLiGG6+9%zxshx+VWu;xcv7NI{)k*9V-Y^^+TF48lR`8R;Y_BSAPnXxM=>+)U%i5} zl87gIu}Orr!dk*kt||BP>3YX<8O7DQrU2z)1Ku0*K~w>;UY9_CiMqrasN#LatrqON zkyX9ScG8Cf9v*dmiz+P8t8{dy)RjGZz{BHWdKk==S21DGxuLFmJe@jLyJUKqQCs}E zj*W9vZD&RrOL1jt?2Yg(65?vDsKm}EgUKG8mUbRTD;Hy>{KRdwi$me31q2SSRWKLg z}fQ?VXD+*hw^CE5dmP zhPLk@dk#;E^hI6upwe3#cNR`wTW9^T87UvrM%WT{Y&VW@rMx^iLva#pW`=~l(_3%v xQG=M7v_G-Ju~=3MLEMsk?L3q~otp(2gf@#y1#<{TQ$_`Dek1{Ma8Fi3DR1D|6` zeo`t!%Ax&0K}MkFrZo(QCo(V+510^u84jS@nHU*?vOo-%AeM2u9q1xK4h9_tb!J9E z1|~s9W?C8%85|Kz`(?KXhRUQa4?J5;qC0< zhc|Ob3S#I2hCpKr0}s#wCP8LF27891lM;YtFduF^-Oiv^RsE=Qsc|KHnDL?g{ABW^ z4{bR-G4Jqp%>o|fvO^oa54R*rAKH3&NenZ`qlR6FRs;d#Pr~hRPtxJdjLE?+I*h&o ek2>bDnm8TWFY>5i3O55#j0xl>FgV?QbO!)3>TQbv literal 441 zcmex=C5UDGKfoZ!!JxyS&deytz$D1XEXer(2tzE; z+02YUS0VrtJ0}+-st{080O$i&PJ}831}4UZLCnIzEMnK#!>4md3Swyae~W#!?^^YX6AMO8Puw(Hyc;7hZ!H>CxI!wx+U+LW&w|K*+%b%MCq+vG0Yry*91L~ jaC@6HoiRDsMTgN>U<0d((*co-+zdc26UaU=_Downloading CodeIgniter

    Mercurial Server

    Mercurial is a distributed version control system.

    - +

    Public Hg access is available at BitBucket. Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken from the tip.

    - +

    Beginning with version 1.6.1, stable tags are also available via BitBucket, simply select the version from the Tags dropdown.

    diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 3d58725e..973d2106 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -73,7 +73,7 @@

    Installation Instructions

    For the best security, both the system and any application folders should be placed above web root so that they are not directly accessible via a browser. By default, .htaccess files are included in each folder to help prevent direct access, but it is best to remove them from public access entirely in case the web server configuration changes or doesn't abide by the .htaccess.

    After moving them, open your main index.php file and set the $system_folder and $application_folder variables, preferably with a full path, e.g. '/www/MyUser/system'.

    - +

    That's it!

    diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index e0e987ed..b6a946d7 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -79,7 +79,7 @@

    Step 1: Update your CodeIgniter files

    Step 2: Add time_to_update to your config.php

    Add the following to application/config/config.php with the other session configuration options

    -

    $config['sess_time_to_update'] = 300;

    +

    $config['sess_time_to_update'] = 300;

    Step 3: Add $autoload['model']

    Add the following to application/config/autoload.php

    /*
    diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 7f3cec61..91238ecb 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -79,7 +79,7 @@

    Step 1: Update your CodeIgniter files

    Step 2: Update your Session Table

    -

    If you are using the Session class in your application, AND if you are storing session data to a database, you must add a new column named user_data to your session table. +

    If you are using the Session class in your application, AND if you are storing session data to a database, you must add a new column named user_data to your session table. Here is an example of what this column might look like for MySQL:

    user_data text NOT NULL @@ -93,7 +93,7 @@

    Step 2: Update your Session Table

    Step 3: Update your Validation Syntax

    -

    This is an optional, but recommended step, for people currently using the Validation class. CI 1.7 introduces a new Form Validation class, which +

    This is an optional, but recommended step, for people currently using the Validation class. CI 1.7 introduces a new Form Validation class, which deprecates the old Validation library. We have left the old one in place so that existing applications that use it will not break, but you are encouraged to migrate to the new version as soon as possible. Please read the user guide carefully as the new library works a little differently, and has several new features.

    diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index 155df90d..58ed6e5c 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -80,9 +80,9 @@

    Step 2: Adjust get_dir_file_info() where necessary

    Step 3: Convert your Plugins to Helpers

    2.0.0 gets rid of the "Plugin" system as their functionality was identical to Helpers, but non-extensible. You will need to rename your plugin files from filename_pi.php to filename_helper.php, move them to your helpers folder, and change all instances of: - + $this->load->plugin('foo'); - + to $this->load->helper('foo'); @@ -97,7 +97,7 @@

    Step 4: Update stored encrypted data

    making it no longer possible to decode encrypted data produced by the original version of this library. To help with the transition, a new method has been added, encode_from_legacy() that will decode the data with the original algorithm and return a re-encoded string using the improved methods. This will enable you to easily replace stale encrypted data with fresh in your applications, either on the fly or en masse.

    - +

    Please read how to use this method in the Encryption library documentation.

    diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 74a8619b..2c052424 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -114,7 +114,7 @@

    Passing Data to your Calendar Cells

    Setting Display Preferences

    -

    There are seven preferences you can set to control various aspects of the calendar. Preferences are set by passing an +

    There are seven preferences you can set to control various aspects of the calendar. Preferences are set by passing an array of preferences in the second parameter of the loading function. Here is an example:

    diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index 0dcf04ac..fb5f6621 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -58,7 +58,7 @@

    Shopping Cart Class

    -

    The Cart Class permits items to be added to a session that stays active while a user is browsing your site. +

    The Cart Class permits items to be added to a session that stays active while a user is browsing your site. These items can be retrieved and displayed in a standard "shopping cart" format, allowing the user to update the quantity or remove items from the cart.

    Please note that the Cart Class ONLY provides the core "cart" functionality. It does not provide shipping, credit card authorization, or other processing components.

    @@ -109,7 +109,7 @@

    Adding an Item to The Cart

  • options - Any additional attributes that are needed to identify the product. These must be passed via an array. -

    In addition to the five indexes above, there are two reserved words: rowid and subtotal. These are used internally by the Cart class, so +

    In addition to the five indexes above, there are two reserved words: rowid and subtotal. These are used internally by the Cart class, so please do NOT use those words as index names when inserting data into the cart.

    Your array may contain additional data. Anything you include in your array will be stored in the session. However, it is best to standardize your data among @@ -181,24 +181,24 @@

    Displaying the Cart

    <?php foreach($this->cart->contents() as $items): ?> <?php echo form_hidden($i.'[rowid]', $items['rowid']); ?> - + <tr> <td><?php echo form_input(array('name' => $i.'[qty]', 'value' => $items['qty'], 'maxlength' => '3', 'size' => '5')); ?></td> <td> <?php echo $items['name']; ?> - + <?php if ($this->cart->has_options($items['rowid']) == TRUE): ?> - + <p> <?php foreach ($this->cart->product_options($items['rowid']) as $option_name => $option_value): ?> - + <strong><?php echo $option_name; ?>:</strong> <?php echo $option_value; ?><br /> - + <?php endforeach; ?> </p> - + <?php endif; ?> - + </td> <td style="text-align:right"><?php echo $this->cart->format_number($items['price']); ?></td> <td style="text-align:right">$<?php echo $this->cart->format_number($items['subtotal']); ?></td> diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index e144826b..b863ef4c 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -83,7 +83,7 @@

    Sending Email

    $this->load->library('email');

    -$this->email->from('your@example.com', 'Your Name');
    +$this->email->from('your@example.com', 'Your Name');
    $this->email->to('someone@example.com');
    $this->email->cc('another@another-example.com');
    $this->email->bcc('them@their-example.com');
    @@ -233,7 +233,7 @@

    $this->email->clear()

    foreach ($list as $name => $address)
    {
        $this->email->clear();

    - +     $this->email->to($address);
        $this->email->from('your@example.com');
        $this->email->subject('Here is your info '.$name);
    diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 31041341..254b2666 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -145,15 +145,15 @@

    The Controller

    diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 2099135a..1d0b5718 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -106,7 +106,7 @@

    Overview

    1. A form is displayed.
    2. You fill it in and submit it.
      3. -
    3. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data +
    4. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data along with an error message describing the problem.
    5. This process continues until you have submitted a valid form.
    @@ -225,13 +225,13 @@

    The Controller

    @@ -616,7 +616,7 @@

    Translating Field Names

    Changing the Error Delimiters

    -

    By default, the Form Validation class adds a paragraph tag (<p>) around each error message shown. You can either change these delimiters globally or +

    By default, the Form Validation class adds a paragraph tag (<p>) around each error message shown. You can either change these delimiters globally or individually.

      diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index a46b155b..49317765 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -82,7 +82,7 @@

      Usage Examples

      $config['hostname'] = 'ftp.example.com';
      $config['username'] = 'your-username';
      $config['password'] = 'your-password';
      -$config['debug'] = TRUE;
      +$config['debug'] = TRUE;

      $this->ftp->connect($config);

      @@ -101,7 +101,7 @@

      Usage Examples

      $config['hostname'] = 'ftp.example.com';
      $config['username'] = 'your-username';
      $config['password'] = 'your-password';
      -$config['debug'] = TRUE;
      +$config['debug'] = TRUE;

      $this->ftp->connect($config);

      @@ -121,7 +121,7 @@

      Usage Examples

      $config['hostname'] = 'ftp.example.com';
      $config['username'] = 'your-username';
      $config['password'] = 'your-password';
      -$config['debug'] = TRUE;
      +$config['debug'] = TRUE;

      $this->ftp->connect($config);

      @@ -231,7 +231,7 @@

      $this->ftp->delete_file()

      $this->ftp->delete_dir()

      Lets you delete a directory and everything it contains. Supply the source path to the directory with a trailing slash.

      -

      Important  Be VERY careful with this function. It will recursively delete +

      Important  Be VERY careful with this function. It will recursively delete everything within the supplied path, including sub-folders and all files. Make absolutely sure your path is correct. Try using the list_files() function first to verify that your path is correct.

      @@ -242,7 +242,7 @@

      $this->ftp->delete_dir()

      $this->ftp->list_files()

      -

      Permits you to retrieve a list of files on your server returned as an array. You must supply +

      Permits you to retrieve a list of files on your server returned as an array. You must supply the path to the desired directory.

      @@ -254,7 +254,7 @@

      $this->ftp->list_files()

      $this->ftp->mirror()

      -

      Recursively reads a local folder and everything it contains (including sub-folders) and creates a +

      Recursively reads a local folder and everything it contains (including sub-folders) and creates a mirror via FTP based on it. Whatever the directory structure of the original file path will be recreated on the server. You must supply a source path and a destination path:

      diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 3dce50bf..98ed4f6d 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -447,7 +447,7 @@

      Watermarking an Image

      $config['source_image'] = '/path/to/image/mypic.jpg';
      -$config['wm_text'] = 'Copyright 2006 - John Doe';
      +$config['wm_text'] = 'Copyright 2006 - John Doe';
      $config['wm_type'] = 'text';
      $config['wm_font_path'] = './system/fonts/texb.ttf';
      $config['wm_font_size'] = '16';
      diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 1d5a47f4..34e3929a 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -78,8 +78,8 @@

      $this->load->library('class_name', $config, 'ob

      Once loaded, the library will be ready for use, using $this->email->some_function().

      -

      Library files can be stored in subdirectories within the main "libraries" folder, or within your personal application/libraries folder. -To load a file located in a subdirectory, simply include the path, relative to the "libraries" folder. +

      Library files can be stored in subdirectories within the main "libraries" folder, or within your personal application/libraries folder. +To load a file located in a subdirectory, simply include the path, relative to the "libraries" folder. For example, if you have file located at:

      libraries/flavors/chocolate.php @@ -217,7 +217,7 @@

      $this->load->remove_package_path()

      When your controller is finished using resources from an application package, and particularly if you have other application packages you want to work with, you may wish to remove the package path so the Loader no longer looks in that folder for resources. To remove the last path added, simply call the method with no parameters.

      $this->load->remove_package_path()

      - +

      Or to remove a specific package path, specify the same path previously given to add_package_path() for a package.:

      $this->load->remove_package_path(APPPATH.'third_party/foo_bar/'); diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index eeb27837..a1427de7 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -140,9 +140,9 @@

      $this->output->cache();

      Parsing Execution Variables

      CodeIgniter will parse the pseudo-variables {elapsed_time} and {memory_usage} in your output by default. To disable this, set the $parse_exec_vars class property to FALSE in your controller. - + $this->output->parse_exec_vars = FALSE; - + diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 521b708b..42c102c8 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -69,7 +69,7 @@

      Example

      Here is a simple example showing how to create pagination in one of your controller functions:

      -$this->load->library('pagination');

      +$this->load->library('pagination');

      $config['base_url'] = 'http://example.com/index.php/test/page/';
      $config['total_rows'] = '200';
      $config['per_page'] = '20'; diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index f1a46fca..e90aca3d 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -83,7 +83,7 @@

      Examples

                   array('John', 'Green', 'Medium')
                   );

      -echo $this->table->generate($data); +echo $this->table->generate($data);

      Here is an example of a table created from a database query result. The table class will automatically generate the @@ -95,7 +95,7 @@

      Examples


      $query = $this->db->query("SELECT * FROM my_table");

      -echo $this->table->generate($query); +echo $this->table->generate($query);       @@ -110,7 +110,7 @@

      Examples

      $this->table->add_row('Mary', 'Red', 'Large');
      $this->table->add_row('John', 'Green', 'Medium');

      -echo $this->table->generate(); +echo $this->table->generate();

      Here is the same example, except instead of individual parameters, arrays are used:

      @@ -124,7 +124,7 @@

      Examples

      $this->table->add_row(array('Mary', 'Red', 'Large'));
      $this->table->add_row(array('John', 'Green', 'Medium'));

      -echo $this->table->generate(); +echo $this->table->generate(); diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 2675fa75..e78af5f9 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -134,7 +134,7 @@

      protect_braced_quotes

      When using the Typography library in conjunction with the Template Parser library it can often be desirable to protect single and double quotes within curly braces. To enable this, set the protect_braced_quotes class property to TRUE.

      - +

      Usage example:

      $this->load->library('typography');
      diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 0e7d1d69..84db5443 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -81,7 +81,7 @@

      Running Tests

      $this->unit->run( test, expected result, 'test name', 'notes');

      -

      Where test is the result of the code you wish to test, expected result is the data type you expect, +

      Where test is the result of the code you wish to test, expected result is the data type you expect, test name is an optional name you can give your test, and notes are optional notes. Example:

      $test = 1 + 1;
      diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 8d1dbdf5..971ab029 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -192,7 +192,7 @@

      Creating an XML-RPC Server

      The 'object' key is a special key that you pass an instantiated class object with, which is necessary when the method you are mapping to is not part of the CodeIgniter super object.

      - +

      In other words, if an XML-RPC Client sends a request for the new_post method, your server will load the My_blog class and call the new_entry function. If the request is for the update_post method, your @@ -202,7 +202,7 @@

      Creating an XML-RPC Server

      or if you are using standardized APIs, like the Blogger or MetaWeblog API, you'll use their function names.

      There are two additional configuration keys you may make use of when initializing the server class: debug can be set to TRUE in order to enable debugging, and xss_clean may be set to FALSE to prevent sending data through the Security library's xss_clean function. - +

      Processing Server Requests

      When the XML-RPC Server receives a request and loads the class/method for processing, it will pass @@ -324,20 +324,20 @@

      The Client

      + +

      Then save the file to your application/controllers/ folder.

      + +

      Now normally you would visit the your site using a URL similar to this:

      + +example.com/index.php/tools/message/to + +

      Instead, we are going to open Terminal in Mac/Lunix or go to Run > "cmd" in Windows and navigate to our CodeIgniter project.

      + +
      + $ cd /path/to/project;
      + $ php index.php tools message +
      + +

      If you did it right, you should see Hello World!.

      + +
      + $ php index.php tools message "John Smith" +
      + +

      Here we are passing it a argument in the same way that URL parameters work. "John Smith" is passed as a argument and output is: Hello John Smith!.

      + +

      That's it!

      + +

      That, in a nutshell, is all there is to know about controllers on the command line. Remember that this is just a normal controller, so routing and _remap works fine.

      + + + + + + + + + + + \ No newline at end of file diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index eaa5f623..ce783fc2 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -58,6 +58,7 @@ function create_menu(basepath) '
    1. Error Handling
      2. ' + '
    2. Caching
      3. ' + '
    3. Profiling Your Application
      4. ' + + '
    4. Running via the CLI
      5. ' + '
    5. Managing Applications
      6. ' + '
    6. Handling Multiple Environments
      7. ' + '
    7. Alternative PHP Syntax
      8. ' + diff --git a/user_guide/toc.html b/user_guide/toc.html index 4e0b6521..3df1a4b3 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -111,7 +111,9 @@

      General Topics

    8. Error Handling
    9. Caching
    10. Profiling Your Application
      11. +
    11. Running via the CLI
    12. Managing Applications
      13. +
    13. Handling Multiple Environments
    14. Alternative PHP Syntax
    15. Security
    16. PHP Style Guide
      17. From 1605de4b890ce16293ce57c5c674f6d8f2dacc7e Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Thu, 7 Apr 2011 11:52:41 +0100 Subject: [PATCH 2417/2544] Added CLI documentation. --- user_guide/general/cli.html | 150 ++++++++++++++++++++++++++++++++++++ user_guide/nav/nav.js | 1 + user_guide/toc.html | 2 + 3 files changed, 153 insertions(+) create mode 100644 user_guide/general/cli.html diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html new file mode 100644 index 00000000..affafadf --- /dev/null +++ b/user_guide/general/cli.html @@ -0,0 +1,150 @@ + + + + + +Running via the CLI : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
      + + + + + +

      CodeIgniter User Guide Version 2.0.1

      +
      + + + + + + + + + +
      + + +
      + + + +
      + +

      Running via the CLI

      + +

      + As well as calling an applications Controllers via the URL in a browser they can also be loaded via the command-line interface (CLI). +

      + + + + + + +

      What is the CLI?

      + +

      The command-line interface is a text-based method of interacting with computers that looks like what most people remember as DOS.

      + + + +

      Why run via the command-line?

      + +

      + There are many reasons for running CodeIgniter from the command-line, but they are not always obvious.

      + +
        +
      • Run your cron-jobs without needing to use wget or curl
        • +
      • Make your cron-jobs inaccessible from being loaded in the URL by checking for IS_CLI
        • +
      • Make interactive "tasks" that can do things like set permissions, prune cache folders, run backups, etc.
        • +
      • Integrate with other applications in other languages. For example, a random C++ script could call one command and run code in your models!
        • +
      + + +

      Let's try it:  Hello World!

      + +

      Let's create a simple controller so you can see it in action. Using your text editor, create a file called tools.php, and put the following code in it:

      + + + +

      Then save the file to your application/controllers/ folder.

      + +

      Now normally you would visit the your site using a URL similar to this:

      + +example.com/index.php/tools/message/to + +

      Instead, we are going to open Terminal in Mac/Lunix or go to Run > "cmd" in Windows and navigate to our CodeIgniter project.

      + +
      + $ cd /path/to/project;
      + $ php index.php tools message +
      + +

      If you did it right, you should see Hello World!.

      + +
      + $ php index.php tools message "John Smith" +
      + +

      Here we are passing it a argument in the same way that URL parameters work. "John Smith" is passed as a argument and output is: Hello John Smith!.

      + +

      That's it!

      + +

      That, in a nutshell, is all there is to know about controllers on the command line. Remember that this is just a normal controller, so routing and _remap works fine.

      + + + +
      + + + + + + + \ No newline at end of file diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index eaa5f623..ce783fc2 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -58,6 +58,7 @@ function create_menu(basepath) '
    17. Error Handling
      18. ' + '
    18. Caching
      19. ' + '
    19. Profiling Your Application
      20. ' + + '
    20. Running via the CLI
      21. ' + '
    21. Managing Applications
      22. ' + '
    22. Handling Multiple Environments
      23. ' + '
    23. Alternative PHP Syntax
      24. ' + diff --git a/user_guide/toc.html b/user_guide/toc.html index 4e0b6521..3df1a4b3 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -111,7 +111,9 @@

      General Topics

    24. Error Handling
    25. Caching
    26. Profiling Your Application
      27. +
    27. Running via the CLI
    28. Managing Applications
      29. +
    29. Handling Multiple Environments
    30. Alternative PHP Syntax
    31. Security
    32. PHP Style Guide
      33. From 106bbcef5490f9bc40f9d3b281c063315f35156f Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Apr 2011 12:06:51 -0400 Subject: [PATCH 2418/2544] Wow, I screwed that up, Reactor is going to 2.0.2 not 2.0.1 --- user_guide/changelog.html | 8 ++++---- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/forge.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/doc_style/index.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/cli.html | 2 +- user_guide/general/common_functions.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_drivers.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/drivers.html | 2 +- user_guide/general/environments.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/reserved_names.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/styleguide.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/captcha_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/email_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/language_helper.html | 2 +- user_guide/helpers/number_helper.html | 2 +- user_guide/helpers/path_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_153.html | 2 +- user_guide/installation/upgrade_154.html | 2 +- user_guide/installation/upgrade_160.html | 2 +- user_guide/installation/upgrade_161.html | 2 +- user_guide/installation/upgrade_162.html | 2 +- user_guide/installation/upgrade_163.html | 2 +- user_guide/installation/upgrade_170.html | 2 +- user_guide/installation/upgrade_171.html | 2 +- user_guide/installation/upgrade_172.html | 2 +- user_guide/installation/upgrade_200.html | 2 +- user_guide/installation/upgrade_201.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/caching.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/cart.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/form_validation.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/javascript.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/security.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/typography.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/cheatsheets.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/getting_started.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 130 files changed, 133 insertions(+), 133 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d34f5c8f..446b2d61 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -28,7 +28,7 @@
      - +

      CodeIgniter User Guide Version 2.0.1

      CodeIgniter User Guide Version 2.0.2
      @@ -60,8 +60,8 @@

      Change Log

      The Reactor Marker indicates items that were contributed to CodeIgniter via CodeIgniter Reactor.

      Version 2.0.2

      -

      Release Date: n/a
      -Hg Tag: n/a

      +

      Release Date: April 7, 2011
      +Hg Tag: v2.0.2

      • General changes @@ -101,7 +101,7 @@

        Bug fixes for 2.0.2

      Version 2.0.1

      -

      Release Date: March, 15, 2011
      +

      Release Date: March 15, 2011
      Hg Tag: v2.0.1

        diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 64596e27..faa13b3e 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 4a18cbd6..3f4ef2bc 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 1f6079fb..3e0c78d3 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 60e7065d..fdeae0ee 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 8f923b14..bb1b401f 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 10daef7e..535fa317 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 8299c507..04d8b809 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index c7b141e8..cad2cf26 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index b8a5785f..107d2ed8 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 1dabb56b..fa3548cf 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index b69f2260..f9f96803 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/results.html b/user_guide/database/results.html index aec6c973..8ad6a198 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index d9580292..a2aaa99a 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index f6db3019..74945d43 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 268cf49a..c488180a 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index eb5986ba..f69846f2 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index f4ec6ccc..abd5845f 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index d343cdc0..a7365e70 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 81ae311d..fae0b5fd 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 61b586f9..c77f9a15 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index affafadf..962954b1 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 225269e1..bfac3268 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 2da98b6c..c9091647 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 4edad833..51c2c744 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index 3d6640da..a7594056 100644 --- a/user_guide/general/creating_drivers.html +++ b/user_guide/general/creating_drivers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 6d65f659..8198c18f 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index e64a7455..9e0fbac0 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index 2b9f78cc..8dbeb93a 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/environments.html b/user_guide/general/environments.html index 76fe214b..175a1531 100644 --- a/user_guide/general/environments.html +++ b/user_guide/general/environments.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index ece80b2f..58eff659 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 95693a55..339a0df0 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index a72e84a4..11de4090 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 58ddc6d9..ce367cde 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index b08d4aa6..ea886d9c 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 2cd8e4d2..117c810b 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 868cce7b..f3ea0c6f 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index cb264803..9273708f 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index d8043aea..ab0e2885 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 2dbbb5bb..d1ee2955 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 4413ef99..6ee6ad38 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/security.html b/user_guide/general/security.html index c47b5b25..ab92a94b 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 82186082..b2b681d8 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -34,7 +34,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 29ed8ea9..421f5130 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 2a06a9c6..ad93f4bc 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 75c069d6..a1962145 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index 5169b06b..2fd5a554 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index e2a04fe1..34faadbc 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index e22f2829..44096ff4 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index bde72fa3..1a2f28d7 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index c2653e3c..335e97d3 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index 9b21ca94..8a3868a7 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 6f61f428..c3723542 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 0a84fde6..f82c669c 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index c7ab413b..1a0529f7 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 3481739d..221c0590 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 82ccbce9..3b3b87da 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index 23db5826..51a4521a 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index c0a90f80..584a127f 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 03c25fcb..e0cace32 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 7021b73c..408df17c 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 701618be..169ee4eb 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 7d646cb7..f71d8784 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index bcc11ee0..00686a34 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 497bdb41..d20f1b1e 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index d7482c12..ded9aaa3 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/index.html b/user_guide/index.html index 23fcd1c4..2681004e 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index f27eef05..94ebeb03 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 5d26a42e..87da5189 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index aeb9c44c..2a50b8db 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 765da680..563c98c6 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index ec4aa5ca..f7ffac74 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 18a2f8af..7541a83e 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index dc5bffe9..4fcbb46b 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 83375561..c6346595 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 0993e6b6..2049628a 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 8f136629..c19143c6 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index c7096857..342d486d 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 93130589..f601a252 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index e000d173..fe6978aa 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index c6338c62..e5086813 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index cbdbaff8..d06f58ec 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index d279f32f..2dc2de59 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index ca9fd926..0add80f8 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index dac67e3b..73441397 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 44108367..01597a41 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index 4e5ec69e..baee208a 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index ecc7351a..dbf0fb01 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index 6baea733..0b24079e 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 9c72cf42..6c2b02d0 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index b3f70c60..add7228c 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index f72ef02d..5f1fdd3e 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 3213a679..c29acb7b 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index e04cf10b..190232e4 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 1222235c..e1af71cc 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index c8d69d78..f084d5dc 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 71c68332..2433ec4a 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 357c01ff..5a8814d5 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index b06adefc..60099312 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 5e5117a9..e4e842e5 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index c72cfce1..8fdcd144 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 1c1ad73e..43b949a5 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 81ae09c6..dbf07768 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index b34938b1..08b8ab0d 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index c1fd1fa5..4e262279 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index fcc28262..75863c2a 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 62a25048..42f8cf94 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 3e18fa0d..4d1f8d97 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 3db020ad..e86ec13c 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 1089f405..cb2f100a 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index 6fbdf774..73518745 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 5243a83d..600d301c 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 28994aa6..eeb3b421 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -27,7 +27,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 971b8f33..7f89b4f5 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 14725cd1..895e76f7 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index e68bc3fd..5e0c4c16 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 7b5887fa..e4e0f9d3 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 2d303db3..24e8071f 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 53931aee..5ba85134 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 6cb0d195..03112660 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/license.html b/user_guide/license.html index 645358ac..8f53851a 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 09c13f9e..bcbc43ff 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 9b570715..b6b81d76 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index a421a1b6..1c58c584 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index e7e26ad5..e20219e0 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index d0e6bf70..f120913f 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 1ae3bbbd..754ecaae 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index accf9801..bbe3e36f 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 5bed9cba..91cf6497 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        diff --git a/user_guide/toc.html b/user_guide/toc.html index 3df1a4b3..90442cb8 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -29,7 +29,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        From 1f622294b92c095fd91e8ca44912d405c1605ded Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Apr 2011 12:06:51 -0400 Subject: [PATCH 2419/2544] Wow, I screwed that up, Reactor is going to 2.0.2 not 2.0.1 --- user_guide/changelog.html | 8 ++++---- user_guide/database/active_record.html | 2 +- user_guide/database/caching.html | 2 +- user_guide/database/call_function.html | 2 +- user_guide/database/configuration.html | 2 +- user_guide/database/connecting.html | 2 +- user_guide/database/examples.html | 2 +- user_guide/database/fields.html | 2 +- user_guide/database/forge.html | 2 +- user_guide/database/helpers.html | 2 +- user_guide/database/index.html | 2 +- user_guide/database/queries.html | 2 +- user_guide/database/results.html | 2 +- user_guide/database/table_data.html | 2 +- user_guide/database/transactions.html | 2 +- user_guide/database/utilities.html | 2 +- user_guide/doc_style/index.html | 2 +- user_guide/general/alternative_php.html | 2 +- user_guide/general/ancillary_classes.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/caching.html | 2 +- user_guide/general/cli.html | 2 +- user_guide/general/common_functions.html | 2 +- user_guide/general/controllers.html | 2 +- user_guide/general/core_classes.html | 2 +- user_guide/general/creating_drivers.html | 2 +- user_guide/general/creating_libraries.html | 2 +- user_guide/general/credits.html | 2 +- user_guide/general/drivers.html | 2 +- user_guide/general/environments.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/hooks.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/managing_apps.html | 2 +- user_guide/general/models.html | 2 +- user_guide/general/profiling.html | 2 +- user_guide/general/quick_reference.html | 2 +- user_guide/general/requirements.html | 2 +- user_guide/general/reserved_names.html | 2 +- user_guide/general/routing.html | 2 +- user_guide/general/security.html | 2 +- user_guide/general/styleguide.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/captcha_helper.html | 2 +- user_guide/helpers/cookie_helper.html | 2 +- user_guide/helpers/date_helper.html | 2 +- user_guide/helpers/directory_helper.html | 2 +- user_guide/helpers/download_helper.html | 2 +- user_guide/helpers/email_helper.html | 2 +- user_guide/helpers/file_helper.html | 2 +- user_guide/helpers/form_helper.html | 2 +- user_guide/helpers/html_helper.html | 2 +- user_guide/helpers/inflector_helper.html | 2 +- user_guide/helpers/language_helper.html | 2 +- user_guide/helpers/number_helper.html | 2 +- user_guide/helpers/path_helper.html | 2 +- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/smiley_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/helpers/url_helper.html | 2 +- user_guide/helpers/xml_helper.html | 2 +- user_guide/index.html | 2 +- user_guide/installation/downloads.html | 2 +- user_guide/installation/index.html | 2 +- user_guide/installation/troubleshooting.html | 2 +- user_guide/installation/upgrade_120.html | 2 +- user_guide/installation/upgrade_130.html | 2 +- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 2 +- user_guide/installation/upgrade_140.html | 2 +- user_guide/installation/upgrade_141.html | 2 +- user_guide/installation/upgrade_150.html | 2 +- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_153.html | 2 +- user_guide/installation/upgrade_154.html | 2 +- user_guide/installation/upgrade_160.html | 2 +- user_guide/installation/upgrade_161.html | 2 +- user_guide/installation/upgrade_162.html | 2 +- user_guide/installation/upgrade_163.html | 2 +- user_guide/installation/upgrade_170.html | 2 +- user_guide/installation/upgrade_171.html | 2 +- user_guide/installation/upgrade_172.html | 2 +- user_guide/installation/upgrade_200.html | 2 +- user_guide/installation/upgrade_201.html | 2 +- user_guide/installation/upgrade_b11.html | 2 +- user_guide/installation/upgrading.html | 2 +- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/caching.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/cart.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/form_validation.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/javascript.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/security.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/typography.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- user_guide/license.html | 2 +- user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/cheatsheets.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/overview/getting_started.html | 2 +- user_guide/overview/goals.html | 2 +- user_guide/overview/index.html | 2 +- user_guide/overview/mvc.html | 2 +- user_guide/toc.html | 2 +- 130 files changed, 133 insertions(+), 133 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d34f5c8f..446b2d61 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -28,7 +28,7 @@
        - +

        CodeIgniter User Guide Version 2.0.1

        CodeIgniter User Guide Version 2.0.2
        @@ -60,8 +60,8 @@

        Change Log

        The Reactor Marker indicates items that were contributed to CodeIgniter via CodeIgniter Reactor.

        Version 2.0.2

        -

        Release Date: n/a
        -Hg Tag: n/a

        +

        Release Date: April 7, 2011
        +Hg Tag: v2.0.2

        • General changes @@ -101,7 +101,7 @@

          Bug fixes for 2.0.2

        Version 2.0.1

        -

        Release Date: March, 15, 2011
        +

        Release Date: March 15, 2011
        Hg Tag: v2.0.1

          diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 64596e27..faa13b3e 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index 4a18cbd6..3f4ef2bc 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 1f6079fb..3e0c78d3 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index 60e7065d..fdeae0ee 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 8f923b14..bb1b401f 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 10daef7e..535fa317 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 8299c507..04d8b809 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index c7b141e8..cad2cf26 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index b8a5785f..107d2ed8 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 1dabb56b..fa3548cf 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index b69f2260..f9f96803 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/results.html b/user_guide/database/results.html index aec6c973..8ad6a198 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index d9580292..a2aaa99a 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index f6db3019..74945d43 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 268cf49a..c488180a 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index eb5986ba..f69846f2 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index f4ec6ccc..abd5845f 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html index d343cdc0..a7365e70 100644 --- a/user_guide/general/ancillary_classes.html +++ b/user_guide/general/ancillary_classes.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index 81ae311d..fae0b5fd 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 61b586f9..c77f9a15 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index affafadf..962954b1 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/common_functions.html b/user_guide/general/common_functions.html index 225269e1..bfac3268 100644 --- a/user_guide/general/common_functions.html +++ b/user_guide/general/common_functions.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 2da98b6c..c9091647 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html index 4edad833..51c2c744 100644 --- a/user_guide/general/core_classes.html +++ b/user_guide/general/core_classes.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/creating_drivers.html b/user_guide/general/creating_drivers.html index 3d6640da..a7594056 100644 --- a/user_guide/general/creating_drivers.html +++ b/user_guide/general/creating_drivers.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html index 6d65f659..8198c18f 100644 --- a/user_guide/general/creating_libraries.html +++ b/user_guide/general/creating_libraries.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html index e64a7455..9e0fbac0 100644 --- a/user_guide/general/credits.html +++ b/user_guide/general/credits.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/drivers.html b/user_guide/general/drivers.html index 2b9f78cc..8dbeb93a 100644 --- a/user_guide/general/drivers.html +++ b/user_guide/general/drivers.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/environments.html b/user_guide/general/environments.html index 76fe214b..175a1531 100644 --- a/user_guide/general/environments.html +++ b/user_guide/general/environments.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html index ece80b2f..58eff659 100644 --- a/user_guide/general/errors.html +++ b/user_guide/general/errors.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index 95693a55..339a0df0 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index a72e84a4..11de4090 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html index 58ddc6d9..ce367cde 100644 --- a/user_guide/general/libraries.html +++ b/user_guide/general/libraries.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index b08d4aa6..ea886d9c 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/models.html b/user_guide/general/models.html index 2cd8e4d2..117c810b 100644 --- a/user_guide/general/models.html +++ b/user_guide/general/models.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 868cce7b..f3ea0c6f 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html index cb264803..9273708f 100644 --- a/user_guide/general/quick_reference.html +++ b/user_guide/general/quick_reference.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index d8043aea..ab0e2885 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index 2dbbb5bb..d1ee2955 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html index 4413ef99..6ee6ad38 100644 --- a/user_guide/general/routing.html +++ b/user_guide/general/routing.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/security.html b/user_guide/general/security.html index c47b5b25..ab92a94b 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html index 82186082..b2b681d8 100644 --- a/user_guide/general/styleguide.html +++ b/user_guide/general/styleguide.html @@ -34,7 +34,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index 29ed8ea9..421f5130 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/general/views.html b/user_guide/general/views.html index 2a06a9c6..ad93f4bc 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 75c069d6..a1962145 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index 5169b06b..2fd5a554 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index e2a04fe1..34faadbc 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index e22f2829..44096ff4 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html index bde72fa3..1a2f28d7 100644 --- a/user_guide/helpers/directory_helper.html +++ b/user_guide/helpers/directory_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/download_helper.html b/user_guide/helpers/download_helper.html index c2653e3c..335e97d3 100644 --- a/user_guide/helpers/download_helper.html +++ b/user_guide/helpers/download_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/email_helper.html b/user_guide/helpers/email_helper.html index 9b21ca94..8a3868a7 100644 --- a/user_guide/helpers/email_helper.html +++ b/user_guide/helpers/email_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html index 6f61f428..c3723542 100644 --- a/user_guide/helpers/file_helper.html +++ b/user_guide/helpers/file_helper.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 0a84fde6..f82c669c 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index c7ab413b..1a0529f7 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html index 3481739d..221c0590 100644 --- a/user_guide/helpers/inflector_helper.html +++ b/user_guide/helpers/inflector_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/language_helper.html b/user_guide/helpers/language_helper.html index 82ccbce9..3b3b87da 100644 --- a/user_guide/helpers/language_helper.html +++ b/user_guide/helpers/language_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/number_helper.html b/user_guide/helpers/number_helper.html index 23db5826..51a4521a 100644 --- a/user_guide/helpers/number_helper.html +++ b/user_guide/helpers/number_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/path_helper.html b/user_guide/helpers/path_helper.html index c0a90f80..584a127f 100644 --- a/user_guide/helpers/path_helper.html +++ b/user_guide/helpers/path_helper.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 03c25fcb..e0cace32 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html index 7021b73c..408df17c 100644 --- a/user_guide/helpers/smiley_helper.html +++ b/user_guide/helpers/smiley_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 701618be..169ee4eb 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 7d646cb7..f71d8784 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index bcc11ee0..00686a34 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 497bdb41..d20f1b1e 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html index d7482c12..ded9aaa3 100644 --- a/user_guide/helpers/xml_helper.html +++ b/user_guide/helpers/xml_helper.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/index.html b/user_guide/index.html index 23fcd1c4..2681004e 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index f27eef05..94ebeb03 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 5d26a42e..87da5189 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index aeb9c44c..2a50b8db 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html index 765da680..563c98c6 100644 --- a/user_guide/installation/upgrade_120.html +++ b/user_guide/installation/upgrade_120.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index ec4aa5ca..f7ffac74 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html index 18a2f8af..7541a83e 100644 --- a/user_guide/installation/upgrade_131.html +++ b/user_guide/installation/upgrade_131.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html index dc5bffe9..4fcbb46b 100644 --- a/user_guide/installation/upgrade_132.html +++ b/user_guide/installation/upgrade_132.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html index 83375561..c6346595 100644 --- a/user_guide/installation/upgrade_133.html +++ b/user_guide/installation/upgrade_133.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 0993e6b6..2049628a 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html index 8f136629..c19143c6 100644 --- a/user_guide/installation/upgrade_141.html +++ b/user_guide/installation/upgrade_141.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index c7096857..342d486d 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_152.html b/user_guide/installation/upgrade_152.html index 93130589..f601a252 100644 --- a/user_guide/installation/upgrade_152.html +++ b/user_guide/installation/upgrade_152.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_153.html b/user_guide/installation/upgrade_153.html index e000d173..fe6978aa 100644 --- a/user_guide/installation/upgrade_153.html +++ b/user_guide/installation/upgrade_153.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_154.html b/user_guide/installation/upgrade_154.html index c6338c62..e5086813 100644 --- a/user_guide/installation/upgrade_154.html +++ b/user_guide/installation/upgrade_154.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html index cbdbaff8..d06f58ec 100644 --- a/user_guide/installation/upgrade_160.html +++ b/user_guide/installation/upgrade_160.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_161.html b/user_guide/installation/upgrade_161.html index d279f32f..2dc2de59 100644 --- a/user_guide/installation/upgrade_161.html +++ b/user_guide/installation/upgrade_161.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_162.html b/user_guide/installation/upgrade_162.html index ca9fd926..0add80f8 100644 --- a/user_guide/installation/upgrade_162.html +++ b/user_guide/installation/upgrade_162.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_163.html b/user_guide/installation/upgrade_163.html index dac67e3b..73441397 100644 --- a/user_guide/installation/upgrade_163.html +++ b/user_guide/installation/upgrade_163.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_170.html b/user_guide/installation/upgrade_170.html index 44108367..01597a41 100644 --- a/user_guide/installation/upgrade_170.html +++ b/user_guide/installation/upgrade_170.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_171.html b/user_guide/installation/upgrade_171.html index 4e5ec69e..baee208a 100644 --- a/user_guide/installation/upgrade_171.html +++ b/user_guide/installation/upgrade_171.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html index ecc7351a..dbf0fb01 100644 --- a/user_guide/installation/upgrade_172.html +++ b/user_guide/installation/upgrade_172.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_200.html b/user_guide/installation/upgrade_200.html index 6baea733..0b24079e 100644 --- a/user_guide/installation/upgrade_200.html +++ b/user_guide/installation/upgrade_200.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 9c72cf42..6c2b02d0 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html index b3f70c60..add7228c 100644 --- a/user_guide/installation/upgrade_b11.html +++ b/user_guide/installation/upgrade_b11.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index f72ef02d..5f1fdd3e 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index 3213a679..c29acb7b 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index e04cf10b..190232e4 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 1222235c..e1af71cc 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index c8d69d78..f084d5dc 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index 71c68332..2433ec4a 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 357c01ff..5a8814d5 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index b06adefc..60099312 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 5e5117a9..e4e842e5 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index c72cfce1..8fdcd144 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 1c1ad73e..43b949a5 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 81ae09c6..dbf07768 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index b34938b1..08b8ab0d 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index c1fd1fa5..4e262279 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index fcc28262..75863c2a 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 62a25048..42f8cf94 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 3e18fa0d..4d1f8d97 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 3db020ad..e86ec13c 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 1089f405..cb2f100a 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index 6fbdf774..73518745 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 5243a83d..600d301c 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 28994aa6..eeb3b421 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -27,7 +27,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 971b8f33..7f89b4f5 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 14725cd1..895e76f7 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index e68bc3fd..5e0c4c16 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index 7b5887fa..e4e0f9d3 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 2d303db3..24e8071f 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 53931aee..5ba85134 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 6cb0d195..03112660 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/license.html b/user_guide/license.html index 645358ac..8f53851a 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 09c13f9e..bcbc43ff 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 9b570715..b6b81d76 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/overview/cheatsheets.html b/user_guide/overview/cheatsheets.html index a421a1b6..1c58c584 100644 --- a/user_guide/overview/cheatsheets.html +++ b/user_guide/overview/cheatsheets.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index e7e26ad5..e20219e0 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index d0e6bf70..f120913f 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 1ae3bbbd..754ecaae 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html index accf9801..bbe3e36f 100644 --- a/user_guide/overview/index.html +++ b/user_guide/overview/index.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 5bed9cba..91cf6497 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -28,7 +28,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          diff --git a/user_guide/toc.html b/user_guide/toc.html index 3df1a4b3..90442cb8 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -29,7 +29,7 @@
          - +

          CodeIgniter User Guide Version 2.0.1

          CodeIgniter User Guide Version 2.0.2
          From 3830ef149d45a86656bad0827c66c66602d6b8a6 Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Apr 2011 12:08:50 -0400 Subject: [PATCH 2420/2544] Removed tag v2.0.1, should've been 2.0.2 --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index 8d606f18..b1e217bd 100644 --- a/.hgtags +++ b/.hgtags @@ -16,3 +16,5 @@ f97a33039a37fc0c3f12e48407ca08e281b6b375 v2.0.1 0000000000000000000000000000000000000000 v2.0.1 0000000000000000000000000000000000000000 v2.0.1 52cd3ed4a9ea5c2b0e2bdd38e9822161ef547f9a v2.0.1 +52cd3ed4a9ea5c2b0e2bdd38e9822161ef547f9a v2.0.1 +0000000000000000000000000000000000000000 v2.0.1 From c42cbe102f212dd0216b801d64deee445d06b788 Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Apr 2011 12:08:50 -0400 Subject: [PATCH 2421/2544] Removed tag v2.0.1, should've been 2.0.2 From 3b947b8323b164387cba5450853528853a401577 Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Apr 2011 12:10:04 -0400 Subject: [PATCH 2422/2544] Putting the v2.0.1 tag back to where it belongs --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index b1e217bd..bb765e06 100644 --- a/.hgtags +++ b/.hgtags @@ -18,3 +18,5 @@ f97a33039a37fc0c3f12e48407ca08e281b6b375 v2.0.1 52cd3ed4a9ea5c2b0e2bdd38e9822161ef547f9a v2.0.1 52cd3ed4a9ea5c2b0e2bdd38e9822161ef547f9a v2.0.1 0000000000000000000000000000000000000000 v2.0.1 +0000000000000000000000000000000000000000 v2.0.1 +1941a814526f8aa7186112e6b9bfd868c5c4afbf v2.0.1 From c5895ef204765c28e5ce61b08ddaa66729b81b8e Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Apr 2011 12:10:04 -0400 Subject: [PATCH 2423/2544] Putting the v2.0.1 tag back to where it belongs From 0808d037de5c78bbabb3a5e83370b4604f70b020 Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Apr 2011 12:15:09 -0400 Subject: [PATCH 2424/2544] And now properly prepped for 2.0.2, sigh --- user_guide/installation/downloads.html | 3 +- user_guide/installation/upgrade_201.html | 12 +-- user_guide/installation/upgrade_202.html | 95 ++++++++++++++++++++++++ user_guide/installation/upgrading.html | 1 + 4 files changed, 99 insertions(+), 12 deletions(-) create mode 100644 user_guide/installation/upgrade_202.html diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 94ebeb03..54fff5a2 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -58,7 +58,8 @@

          Downloading CodeIgniter

            -
          • CodeIgniter V 2.0.1 (Current version)
            • +
          • CodeIgniter V 2.0.2 (Current version)
            • +
          • CodeIgniter V 2.0.1
          • CodeIgniter V 2.0.0
          • CodeIgniter V 1.7.3
          • CodeIgniter V 1.7.2
            • diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 6c2b02d0..fe99cc0c 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -72,17 +72,7 @@

            Step 2: Replace config/mimes.php

            This config file has been updated to contain more mime types, please copy it to application/config/mimes.php.

            -

            Step 3: Remove loading calls for the Security Library

            - -

            Security has been moved to the core and is now always loaded automatically. Make sure you remove any loading calls as they will result in PHP errors.

            - - -

            Step 4: Move MY_Security

            - -

            If you are overriding or extending the Security library, you will need to move it to application/core.

            - - -

            Step 5: Check for forms posting to default controller

            +

            Step 3: Check for forms posting to default controller

            The default behavior for form_open() when called with no parameters used to be to post to the default controller, but it will now just leave an empty action="" meaning the form will submit to the current URL. diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html new file mode 100644 index 00000000..e6273f53 --- /dev/null +++ b/user_guide/installation/upgrade_202.html @@ -0,0 +1,95 @@ + + + + + +Upgrading from 2.0.1 to 2.0.2 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + +

            + +
            + + + + + +

            CodeIgniter User Guide Version 2.0.2

            +
            + + + + + + + + + +
            + + +
            + + + +
            + +

            Upgrading from 2.0.1 to 2.0.2

            + +

            Before performing an update you should take your site offline by replacing the index.php file with a static one.

            + + +

            Step 1: Update your CodeIgniter files

            + +

            Replace all files and directories in your "system" folder and replace your index.php file. If any modifications were made to your index.php they will need to be made fresh in this new one.

            + +

            Note: If you have any custom developed files in these folders please make copies of them first.

            + + +

            Step 2: Remove loading calls for the Security Library

            + +

            Security has been moved to the core and is now always loaded automatically. Make sure you remove any loading calls as they will result in PHP errors.

            + + +

            Step 3: Move MY_Security

            + +

            If you are overriding or extending the Security library, you will need to move it to application/core.

            + +
            + + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 5f1fdd3e..1c4eb882 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -60,6 +60,7 @@

            Upgrading From a Previous Version

            Please read the upgrade notes corresponding to the version you are upgrading from.

              +
            • Upgrading from 2.0.1 to 2.0.2
            • Upgrading from 2.0 to 2.0.1
            • Upgrading from 1.7.2 to 2.0
            • Upgrading from 1.7.1 to 1.7.2
              • From fe9ac9416afb8281b6605d3e4097c2159d488aef Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Apr 2011 12:15:09 -0400 Subject: [PATCH 2425/2544] And now properly prepped for 2.0.2, sigh --- user_guide/installation/downloads.html | 3 +- user_guide/installation/upgrade_201.html | 12 +-- user_guide/installation/upgrade_202.html | 95 ++++++++++++++++++++++++ user_guide/installation/upgrading.html | 1 + 4 files changed, 99 insertions(+), 12 deletions(-) create mode 100644 user_guide/installation/upgrade_202.html diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 94ebeb03..54fff5a2 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -58,7 +58,8 @@

              Downloading CodeIgniter

                -
              • CodeIgniter V 2.0.1 (Current version)
                • +
              • CodeIgniter V 2.0.2 (Current version)
                • +
              • CodeIgniter V 2.0.1
              • CodeIgniter V 2.0.0
              • CodeIgniter V 1.7.3
              • CodeIgniter V 1.7.2
                • diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 6c2b02d0..fe99cc0c 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -72,17 +72,7 @@

                Step 2: Replace config/mimes.php

                This config file has been updated to contain more mime types, please copy it to application/config/mimes.php.

                -

                Step 3: Remove loading calls for the Security Library

                - -

                Security has been moved to the core and is now always loaded automatically. Make sure you remove any loading calls as they will result in PHP errors.

                - - -

                Step 4: Move MY_Security

                - -

                If you are overriding or extending the Security library, you will need to move it to application/core.

                - - -

                Step 5: Check for forms posting to default controller

                +

                Step 3: Check for forms posting to default controller

                The default behavior for form_open() when called with no parameters used to be to post to the default controller, but it will now just leave an empty action="" meaning the form will submit to the current URL. diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html new file mode 100644 index 00000000..e6273f53 --- /dev/null +++ b/user_guide/installation/upgrade_202.html @@ -0,0 +1,95 @@ + + + + + +Upgrading from 2.0.1 to 2.0.2 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + +

                + +
                + + + + + +

                CodeIgniter User Guide Version 2.0.2

                +
                + + + + + + + + + +
                + + +
                + + + +
                + +

                Upgrading from 2.0.1 to 2.0.2

                + +

                Before performing an update you should take your site offline by replacing the index.php file with a static one.

                + + +

                Step 1: Update your CodeIgniter files

                + +

                Replace all files and directories in your "system" folder and replace your index.php file. If any modifications were made to your index.php they will need to be made fresh in this new one.

                + +

                Note: If you have any custom developed files in these folders please make copies of them first.

                + + +

                Step 2: Remove loading calls for the Security Library

                + +

                Security has been moved to the core and is now always loaded automatically. Make sure you remove any loading calls as they will result in PHP errors.

                + + +

                Step 3: Move MY_Security

                + +

                If you are overriding or extending the Security library, you will need to move it to application/core.

                + +
                + + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 5f1fdd3e..1c4eb882 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -60,6 +60,7 @@

                Upgrading From a Previous Version

                Please read the upgrade notes corresponding to the version you are upgrading from.

                  +
                • Upgrading from 2.0.1 to 2.0.2
                • Upgrading from 2.0 to 2.0.1
                • Upgrading from 1.7.2 to 2.0
                • Upgrading from 1.7.1 to 1.7.2
                  • From 4a7643fbffa371d1ecec65f8ee32b9e5e5a41023 Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Apr 2011 12:15:49 -0400 Subject: [PATCH 2426/2544] Added tag v2.0.2 for changeset 521076012037 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index bb765e06..d14ae5a4 100644 --- a/.hgtags +++ b/.hgtags @@ -20,3 +20,4 @@ f97a33039a37fc0c3f12e48407ca08e281b6b375 v2.0.1 0000000000000000000000000000000000000000 v2.0.1 0000000000000000000000000000000000000000 v2.0.1 1941a814526f8aa7186112e6b9bfd868c5c4afbf v2.0.1 +52107601203719d6149219b28ec93d1d90c748a7 v2.0.2 From 1224f191d48d6dce920138a82e142134cc0b5231 Mon Sep 17 00:00:00 2001 From: Pascal Kriete Date: Thu, 7 Apr 2011 12:15:49 -0400 Subject: [PATCH 2427/2544] Added tag v2.0.2 for changeset 521076012037 From 14a1f80e442fb9989cfaf1450a7bdeefd45fee59 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Thu, 7 Apr 2011 18:24:53 -0500 Subject: [PATCH 2428/2544] Fixing a bug in the form_helper where csrf_token_name and csrf_hash were referencing class properties in the Security class that were moved. --- system/helpers/form_helper.php | 2 +- user_guide/installation/upgrade_202.html | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 8aa788c6..acd75c23 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -67,7 +67,7 @@ function form_open($action = '', $attributes = '', $hidden = array()) // CSRF if ($CI->config->item('csrf_protection') === TRUE) { - $hidden[$CI->security->csrf_token_name] = $CI->security->csrf_hash; + $hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash(); } if (is_array($hidden) AND count($hidden) > 0) diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html index e6273f53..d457d8bb 100644 --- a/user_guide/installation/upgrade_202.html +++ b/user_guide/installation/upgrade_202.html @@ -76,6 +76,8 @@

                  Step 3: Move MY_Security

                  If you are overriding or extending the Security library, you will need to move it to application/core.

                  +

                  csrf_token_name and csrf_hash have changed to protected class properties. Please use security->get_csrf_hash() and security->get_csrf_token_name() to access those values.

                  +
          From 1f6f0abf0d17046a99fd9c9b3c60fb459b4531b1 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Thu, 7 Apr 2011 18:24:53 -0500 Subject: [PATCH 2429/2544] Fixing a bug in the form_helper where csrf_token_name and csrf_hash were referencing class properties in the Security class that were moved. --- system/helpers/form_helper.php | 2 +- user_guide/installation/upgrade_202.html | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 8aa788c6..acd75c23 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -67,7 +67,7 @@ function form_open($action = '', $attributes = '', $hidden = array()) // CSRF if ($CI->config->item('csrf_protection') === TRUE) { - $hidden[$CI->security->csrf_token_name] = $CI->security->csrf_hash; + $hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash(); } if (is_array($hidden) AND count($hidden) > 0) diff --git a/user_guide/installation/upgrade_202.html b/user_guide/installation/upgrade_202.html index e6273f53..d457d8bb 100644 --- a/user_guide/installation/upgrade_202.html +++ b/user_guide/installation/upgrade_202.html @@ -76,6 +76,8 @@

          Step 3: Move MY_Security

          If you are overriding or extending the Security library, you will need to move it to application/core.

          +

          csrf_token_name and csrf_hash have changed to protected class properties. Please use security->get_csrf_hash() and security->get_csrf_token_name() to access those values.

          +
          From 8363eacc38d0d776dad72551d1c1ce114d1eb18f Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Thu, 7 Apr 2011 18:33:29 -0500 Subject: [PATCH 2430/2544] Fix: #192 CI version constant incorrect in core/CodeIgniter --- system/core/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index f3e1439f..e022e1b4 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -32,7 +32,7 @@ * Define the CodeIgniter Version * ------------------------------------------------------ */ - define('CI_VERSION', '2.0.1'); + define('CI_VERSION', '2.0.2'); /* * ------------------------------------------------------ From bfbcf74c94a47c643420efaa342cc525bce2ad2c Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Thu, 7 Apr 2011 18:33:29 -0500 Subject: [PATCH 2431/2544] Fix: #192 CI version constant incorrect in core/CodeIgniter --- system/core/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index f3e1439f..e022e1b4 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -32,7 +32,7 @@ * Define the CodeIgniter Version * ------------------------------------------------------ */ - define('CI_VERSION', '2.0.1'); + define('CI_VERSION', '2.0.2'); /* * ------------------------------------------------------ From a439fb57decf98b5b630479e7ef5dc4e7f3360c9 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 8 Apr 2011 12:42:56 +0100 Subject: [PATCH 2432/2544] Updated Changelog to reflect "CLI usage" documentation being added. --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d34f5c8f..32f9ec84 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -73,6 +73,7 @@

          Version 2.0.2

        • Made Environment Support optional. Comment out or delete the constant to stop environment checks.
        • Added Environment Support for Hooks.
        • Added CI_ Prefix to the Cache driver.
          • +
        • Added CLI usage documentation.
      • Helpers From e7c8f697c6460f46b1af6d17dc52069c3ec75a5c Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 8 Apr 2011 12:42:56 +0100 Subject: [PATCH 2433/2544] Updated Changelog to reflect "CLI usage" documentation being added. --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d34f5c8f..32f9ec84 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -73,6 +73,7 @@

        Version 2.0.2

      • Made Environment Support optional. Comment out or delete the constant to stop environment checks.
      • Added Environment Support for Hooks.
      • Added CI_ Prefix to the Cache driver.
        • +
      • Added CLI usage documentation.
    33. Helpers From b70e32ffae21c6a7ae4d21f2991a47f28531676f Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 8 Apr 2011 12:44:17 +0100 Subject: [PATCH 2434/2544] Fixed bug with form_helper calling now protected variables. --- system/helpers/form_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 8aa788c6..acd75c23 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -67,7 +67,7 @@ function form_open($action = '', $attributes = '', $hidden = array()) // CSRF if ($CI->config->item('csrf_protection') === TRUE) { - $hidden[$CI->security->csrf_token_name] = $CI->security->csrf_hash; + $hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash(); } if (is_array($hidden) AND count($hidden) > 0) From 4ad7984c10c7389f5198f6a4699293482fe2ab7b Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 8 Apr 2011 12:44:17 +0100 Subject: [PATCH 2435/2544] Fixed bug with form_helper calling now protected variables. --- system/helpers/form_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 8aa788c6..acd75c23 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -67,7 +67,7 @@ function form_open($action = '', $attributes = '', $hidden = array()) // CSRF if ($CI->config->item('csrf_protection') === TRUE) { - $hidden[$CI->security->csrf_token_name] = $CI->security->csrf_hash; + $hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash(); } if (is_array($hidden) AND count($hidden) > 0) From 48bac74ea9fcb8eecdf97597647f1ed492d97b43 Mon Sep 17 00:00:00 2001 From: patwork Date: Fri, 8 Apr 2011 13:46:47 +0200 Subject: [PATCH 2436/2544] Fix: codeigniter-reactor/193 incorrect driver filepaths --- system/libraries/Driver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php index d1838f2c..b942f539 100644 --- a/system/libraries/Driver.php +++ b/system/libraries/Driver.php @@ -45,7 +45,7 @@ function __get($child) $child_class = $this->lib_name.'_'.$child; // Remove the CI_ prefix and lowercase - $lib_name = strtolower(preg_replace('/^CI_/', '', $this->lib_name)); + $lib_name = ucfirst(strtolower(preg_replace('/^CI_/', '', $this->lib_name))); $driver_name = strtolower(preg_replace('/^CI_/', '', $child_class)); if (in_array($driver_name, array_map('strtolower', $this->valid_drivers))) @@ -226,4 +226,4 @@ public function __set($var, $val) // END CI_Driver CLASS /* End of file Driver.php */ -/* Location: ./system/libraries/Driver.php */ \ No newline at end of file +/* Location: ./system/libraries/Driver.php */ From b07079827b084213463bdf576894faab172213f2 Mon Sep 17 00:00:00 2001 From: patwork Date: Fri, 8 Apr 2011 15:10:05 +0200 Subject: [PATCH 2437/2544] Deals with language errors after codeigniter-reactor commit r2307:c43c6dea56fb --- system/libraries/Email.php | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 6c21f114..cd89f8f3 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -722,7 +722,7 @@ public function validate_email($email) { if ( ! is_array($email)) { - $this->_set_error_message('email_must_be_array'); + $this->_set_error_message('lang:email_must_be_array'); return FALSE; } @@ -730,7 +730,7 @@ public function validate_email($email) { if ( ! $this->valid_email($val)) { - $this->_set_error_message('email_invalid_address', $val); + $this->_set_error_message('lang:email_invalid_address', $val); return FALSE; } } @@ -1131,7 +1131,7 @@ private function _build_message() if ( ! file_exists($filename)) { - $this->_set_error_message('email_attachment_missing', $filename); + $this->_set_error_message('lang:email_attachment_missing', $filename); return FALSE; } @@ -1146,7 +1146,7 @@ private function _build_message() if ( ! $fp = fopen($filename, FOPEN_READ)) { - $this->_set_error_message('email_attachment_unreadable', $filename); + $this->_set_error_message('lang:email_attachment_unreadable', $filename); return FALSE; } @@ -1353,7 +1353,7 @@ public function send() ( ! isset($this->_bcc_array) AND ! isset($this->_headers['Bcc'])) AND ( ! isset($this->_headers['Cc']))) { - $this->_set_error_message('email_no_recipients'); + $this->_set_error_message('lang:email_no_recipients'); return FALSE; } @@ -1484,7 +1484,7 @@ private function _spool_email() if ( ! $this->_send_with_mail()) { - $this->_set_error_message('email_send_failure_phpmail'); + $this->_set_error_message('lang:email_send_failure_phpmail'); return FALSE; } break; @@ -1492,7 +1492,7 @@ private function _spool_email() if ( ! $this->_send_with_sendmail()) { - $this->_set_error_message('email_send_failure_sendmail'); + $this->_set_error_message('lang:email_send_failure_sendmail'); return FALSE; } break; @@ -1500,14 +1500,14 @@ private function _spool_email() if ( ! $this->_send_with_smtp()) { - $this->_set_error_message('email_send_failure_smtp'); + $this->_set_error_message('lang:email_send_failure_smtp'); return FALSE; } break; } - $this->_set_error_message('email_sent', $this->_get_protocol()); + $this->_set_error_message('lang:email_sent', $this->_get_protocol()); return TRUE; } @@ -1578,8 +1578,8 @@ private function _send_with_sendmail() if ($status != 0) { - $this->_set_error_message('email_exit_status', $status); - $this->_set_error_message('email_no_socket'); + $this->_set_error_message('lang:email_exit_status', $status); + $this->_set_error_message('lang:email_no_socket'); return FALSE; } @@ -1598,7 +1598,7 @@ private function _send_with_smtp() { if ($this->smtp_host == '') { - $this->_set_error_message('email_no_hostname'); + $this->_set_error_message('lang:email_no_hostname'); return FALSE; } @@ -1647,7 +1647,7 @@ private function _send_with_smtp() if (strncmp($reply, '250', 3) != 0) { - $this->_set_error_message('email_smtp_error', $reply); + $this->_set_error_message('lang:email_smtp_error', $reply); return FALSE; } @@ -1674,7 +1674,7 @@ private function _smtp_connect() if ( ! is_resource($this->_smtp_connect)) { - $this->_set_error_message('email_smtp_error', $errno." ".$errstr); + $this->_set_error_message('lang:email_smtp_error', $errno." ".$errstr); return FALSE; } @@ -1737,7 +1737,7 @@ private function _send_command($cmd, $data = '') if (substr($reply, 0, 3) != $resp) { - $this->_set_error_message('email_smtp_error', $reply); + $this->_set_error_message('lang:email_smtp_error', $reply); return FALSE; } @@ -1766,7 +1766,7 @@ private function _smtp_authenticate() if ($this->smtp_user == "" AND $this->smtp_pass == "") { - $this->_set_error_message('email_no_smtp_unpw'); + $this->_set_error_message('lang:email_no_smtp_unpw'); return FALSE; } @@ -1776,7 +1776,7 @@ private function _smtp_authenticate() if (strncmp($reply, '334', 3) != 0) { - $this->_set_error_message('email_failed_smtp_login', $reply); + $this->_set_error_message('lang:email_failed_smtp_login', $reply); return FALSE; } @@ -1786,7 +1786,7 @@ private function _smtp_authenticate() if (strncmp($reply, '334', 3) != 0) { - $this->_set_error_message('email_smtp_auth_un', $reply); + $this->_set_error_message('lang:email_smtp_auth_un', $reply); return FALSE; } @@ -1796,7 +1796,7 @@ private function _smtp_authenticate() if (strncmp($reply, '235', 3) != 0) { - $this->_set_error_message('email_smtp_auth_pw', $reply); + $this->_set_error_message('lang:email_smtp_auth_pw', $reply); return FALSE; } @@ -1815,7 +1815,7 @@ private function _send_data($data) { if ( ! fwrite($this->_smtp_connect, $data . $this->newline)) { - $this->_set_error_message('email_smtp_data_failure', $data); + $this->_set_error_message('lang:email_smtp_data_failure', $data); return FALSE; } else @@ -1942,7 +1942,7 @@ private function _set_error_message($msg, $val = '') $CI =& get_instance(); $CI->lang->load('email'); - if (FALSE === ($line = $CI->lang->line($msg))) + if (substr($msg, 0, 5) != 'lang:' || FALSE === ($line = $CI->lang->line(substr($msg, 5)))) { $this->_debug_msg[] = str_replace('%s', $val, $msg)."
      "; } @@ -2059,4 +2059,4 @@ private function _mime_types($ext = "") // END CI_Email class /* End of file Email.php */ -/* Location: ./system/libraries/Email.php */ \ No newline at end of file +/* Location: ./system/libraries/Email.php */ From 64e35cdcb9fd24787798c0f6ca3c0af45b0b904d Mon Sep 17 00:00:00 2001 From: patwork Date: Fri, 8 Apr 2011 15:25:31 +0200 Subject: [PATCH 2438/2544] There is absolutely no need to specify class name (it will validate anyway). --- system/helpers/form_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index acd75c23..bca0ff0c 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -72,7 +72,7 @@ function form_open($action = '', $attributes = '', $hidden = array()) if (is_array($hidden) AND count($hidden) > 0) { - $form .= sprintf("\n
      %s
      ", form_hidden($hidden)); + $form .= sprintf("\n
      %s
      ", form_hidden($hidden)); } return $form; @@ -1053,4 +1053,4 @@ function &_get_validation_object() /* End of file form_helper.php */ -/* Location: ./system/helpers/form_helper.php */ \ No newline at end of file +/* Location: ./system/helpers/form_helper.php */ From 02404a1f59e4f3ae8231d87d8be5b23488ea86d2 Mon Sep 17 00:00:00 2001 From: patwork Date: Fri, 8 Apr 2011 15:45:46 +0200 Subject: [PATCH 2439/2544] Fix: codeigniter-reactor/127 Form_validation rule error logging --- system/libraries/Form_validation.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index cfc02eda..6f79a554 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -628,6 +628,10 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) $this->_field_data[$row['field']]['postdata'] = (is_bool($result)) ? $postdata : $result; } } + else + { + log_message('debug', "Unable to find validation rule: ".$rule); + } continue; } @@ -1357,4 +1361,4 @@ function encode_php_tags($str) // END Form Validation Class /* End of file Form_validation.php */ -/* Location: ./system/libraries/Form_validation.php */ \ No newline at end of file +/* Location: ./system/libraries/Form_validation.php */ From ef1a55ad2875af3b2286a5b6eb9b65e997949f4d Mon Sep 17 00:00:00 2001 From: patwork Date: Sat, 9 Apr 2011 13:04:06 +0200 Subject: [PATCH 2440/2544] Fix: codeigniter-reactor/199 CSRF config in Security class is no longer ignored --- system/core/Security.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/system/core/Security.php b/system/core/Security.php index ceef9779..73a3cfb3 100644 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -58,6 +58,15 @@ class CI_Security { */ public function __construct() { + // CSRF config + foreach(array('csrf_expire', 'csrf_token_name', 'csrf_cookie_name') as $key) + { + if (FALSE !== ($val = config_item($key))) + { + $this->{'_'.$key} = $val; + } + } + // Append application specific cookie prefix to token name $this->_csrf_cookie_name = (config_item('cookie_prefix')) ? config_item('cookie_prefix').$this->_csrf_token_name : $this->_csrf_token_name; @@ -817,4 +826,4 @@ protected function _csrf_set_hash() // END Security Class /* End of file Security.php */ -/* Location: ./system/libraries/Security.php */ \ No newline at end of file +/* Location: ./system/libraries/Security.php */ From 571023b24f705d9c0bbaecf2e3cbbc06752390b4 Mon Sep 17 00:00:00 2001 From: patwork Date: Mon, 11 Apr 2011 11:56:41 +0200 Subject: [PATCH 2441/2544] Fix: codeigniter-reactor/32 unicorns are no longer mute --- system/core/Lang.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/core/Lang.php b/system/core/Lang.php index 0b926a30..cdadc7f4 100644 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -129,19 +129,19 @@ function load($langfile = '', $idiom = '', $return = FALSE, $add_suffix = TRUE, */ function line($line = '') { - $line = ($line == '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line]; + $value = ($line == '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line]; // Because killer robots like unicorns! - if ($line === FALSE) + if ($value === FALSE) { log_message('error', 'Could not find the language line "'.$line.'"'); } - return $line; + return $value; } } // END Language Class /* End of file Lang.php */ -/* Location: ./system/core/Lang.php */ \ No newline at end of file +/* Location: ./system/core/Lang.php */ From 9e2679849611ce050f5636c44b6c3279328d00f9 Mon Sep 17 00:00:00 2001 From: patwork Date: Mon, 11 Apr 2011 13:02:32 +0200 Subject: [PATCH 2442/2544] Fix: codeigniter-reactor/199 cookie name was overwritten with token name --- system/core/Security.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/system/core/Security.php b/system/core/Security.php index 73a3cfb3..4f91572e 100644 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -67,8 +67,10 @@ public function __construct() } } - // Append application specific cookie prefix to token name - $this->_csrf_cookie_name = (config_item('cookie_prefix')) ? config_item('cookie_prefix').$this->_csrf_token_name : $this->_csrf_token_name; + // Append application specific cookie prefix + if (config_item('cookie_prefix')) { + $this->_csrf_cookie_name = config_item('cookie_prefix').$this->_csrf_cookie_name; + } // Set the CSRF hash $this->_csrf_set_hash(); From e70e92bab1de57a0749a31f2889b55cafb46d58e Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 25 Apr 2011 10:50:53 -0500 Subject: [PATCH 2443/2544] Fixing up a tabs vs spaces inconsistency in DB_Result --- system/database/DB_result.php | 83 +++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 06eec512..e8322838 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -32,7 +32,7 @@ class CI_DB_result { var $result_id = NULL; var $result_array = array(); var $result_object = array(); - var $custom_result_object = array(); + var $custom_result_object = array(); var $current_row = 0; var $num_rows = 0; var $row_data = NULL; @@ -47,47 +47,52 @@ class CI_DB_result { */ function result($type = 'object') { - if ($type == 'array') return $this->result_array(); - else if ($type == 'object') return $this->result_object(); - else return $this->custom_result_object($type); + if ($type == 'array') return $this->result_array(); + else if ($type == 'object') return $this->result_object(); + else return $this->custom_result_object($type); } // -------------------------------------------------------------------- - /** - * Custom query result. - * - * @param class_name A string that represents the type of object you want back - * @return array of objects - */ - function custom_result_object($class_name) - { - if (array_key_exists($class_name, $this->custom_result_object)) - { - return $this->custom_result_object[$class_name]; - } - - if ($this->result_id === FALSE OR $this->num_rows() == 0) - { - return array(); - } - - // add the data to the object - $this->_data_seek(0); - $result_object = array(); + /** + * Custom query result. + * + * @param class_name A string that represents the type of object you want back + * @return array of objects + */ + function custom_result_object($class_name) + { + if (array_key_exists($class_name, $this->custom_result_object)) + { + return $this->custom_result_object[$class_name]; + } + + if ($this->result_id === FALSE OR $this->num_rows() == 0) + { + return array(); + } + + // add the data to the object + $this->_data_seek(0); + $result_object = array(); + while ($row = $this->_fetch_object()) - { - $object = new $class_name(); - foreach ($row as $key => $value) - { - $object->$key = $value; - } + { + $object = new $class_name(); + + foreach ($row as $key => $value) + { + $object->$key = $value; + } + $result_object[] = $object; } - // return the array - return $this->custom_result_object[$class_name] = $result_object; - } + // return the array + return $this->custom_result_object[$class_name] = $result_object; + } + + // -------------------------------------------------------------------- /** * Query result. "object" version. @@ -180,9 +185,9 @@ function row($n = 0, $type = 'object') $n = 0; } - if ($type == 'object') return $this->row_object($n); - else if ($type == 'array') return $this->row_array($n); - else return $this->custom_row_object($n, $type); + if ($type == 'object') return $this->row_object($n); + else if ($type == 'array') return $this->row_array($n); + else return $this->custom_row_object($n, $type); } // -------------------------------------------------------------------- @@ -219,7 +224,7 @@ function set_row($key, $value = NULL) // -------------------------------------------------------------------- - /** + /** * Returns a single result row - custom object version * * @access public @@ -242,7 +247,7 @@ function custom_row_object($n, $type) return $result[$this->current_row]; } - /** + /** * Returns a single result row - object version * * @access public From db60d240226468b19d656c4ba026bc992e4c3034 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2011 11:31:30 +0900 Subject: [PATCH 2444/2544] add "Using CodeIgniter Drivers" and "Creating Your Own Driver" in TOC --- user_guide/nav/nav.js | 2 ++ user_guide/toc.html | 2 ++ 2 files changed, 4 insertions(+) diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index ce783fc2..b44994d4 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -50,6 +50,8 @@ function create_menu(basepath) '
    34. Helpers
      35. ' + '
    35. Using CodeIgniter Libraries
      36. ' + '
    36. Creating Your Own Libraries
      37. ' + + '
    37. Using CodeIgniter Drivers
      38. ' + + '
    38. Creating Your Own Drivers
      39. ' + '
    39. Creating Core Classes
      40. ' + '
    40. Hooks - Extending the Core
      41. ' + '
    41. Auto-loading Resources
      42. ' + diff --git a/user_guide/toc.html b/user_guide/toc.html index 4b4ab100..f6a5fe0e 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -103,6 +103,8 @@

      General Topics

    42. Helpers
    43. Using CodeIgniter Libraries
    44. Creating Your Own Libraries
      45. +
    45. Using CodeIgniter Drivers
      46. +
    46. Creating Your Own Drivers
    47. Creating Core Classes
    48. Hooks - Extending the Core
    49. Auto-loading Resources
      50. From e7bdd2260e6be61d3ed37e517f35ba017beee5f3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2011 11:33:53 +0900 Subject: [PATCH 2445/2544] update Prev/Next Topic link on user_guide/database/index.html --- user_guide/database/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 594de80d..1f0a1da7 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -86,7 +86,7 @@

      The Database Class

      From 4c6ceb067ca15228c547770354023f826f552036 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2011 11:35:43 +0900 Subject: [PATCH 2447/2544] update Prev/Next Topic link on user_guide/helpers/array_helper.html --- user_guide/helpers/array_helper.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 88e8384d..139bbe2b 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -159,10 +159,10 @@

      elements()

      From 33095c29a638c127928faa5b0360abd3ac5254f9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2011 11:36:10 +0900 Subject: [PATCH 2448/2544] update Prev/Next Topic link on user_guide/helpers/captcha_helper.html --- user_guide/helpers/captcha_helper.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index 3c6fa118..c80c2fbe 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -183,11 +183,11 @@

      Adding a Database

      From 49e31258bc85245b087d6b7b5ac02edb1b680bc6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2011 11:37:15 +0900 Subject: [PATCH 2449/2544] update Prev/Next Topic link on user_guide/helpers/cookie_helper.html --- user_guide/helpers/cookie_helper.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 9879653c..889c3346 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -95,7 +95,7 @@

      delete_cookie()

      From 26eebddda5438c3967bad74a05c3e990528e1182 Mon Sep 17 00:00:00 2001 From: Eric Barnes Date: Sun, 17 Apr 2011 23:45:41 -0400 Subject: [PATCH 2453/2544] Changed server check to ensure SCRIPT_NAME is defined. Fixes #57 --- system/core/URI.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/core/URI.php b/system/core/URI.php index 80dc62e5..d5654865 100644 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -120,7 +120,7 @@ function _fetch_uri_string() $path = (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri); $this->_set_uri_string($path); } - + // -------------------------------------------------------------------- /** @@ -133,7 +133,7 @@ function _set_uri_string($str) { // Filter out control characters $str = remove_invisible_characters($str, FALSE); - + // If the URI contains only a slash we'll kill it $this->uri_string = ($str == '/') ? '' : $str; } @@ -151,7 +151,7 @@ function _set_uri_string($str) */ private function _detect_uri() { - if ( ! isset($_SERVER['REQUEST_URI'])) + if ( ! isset($_SERVER['REQUEST_URI']) OR ! isset($_SERVER['SCRIPT_NAME'])) { return ''; } @@ -184,12 +184,12 @@ private function _detect_uri() $_SERVER['QUERY_STRING'] = ''; $_GET = array(); } - + if ($uri == '/' || empty($uri)) { return '/'; } - + $uri = parse_url($uri, PHP_URL_PATH); // Do some final cleaning of the URI and return it From c31b3729da50eaade365451f49dac7d462684702 Mon Sep 17 00:00:00 2001 From: Eric Barnes Date: Sun, 17 Apr 2011 23:58:40 -0400 Subject: [PATCH 2454/2544] Added ENVIRONMENT to reserved constants. Fixes #196 --- user_guide/changelog.html | 17 +++++++++++++++++ user_guide/general/reserved_names.html | 1 + 2 files changed, 18 insertions(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f24d8110..0ebe74ae 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -59,6 +59,23 @@

      Change Log

      The Reactor Marker indicates items that were contributed to CodeIgniter via CodeIgniter Reactor.

      +

      Version 2.0.3

      +

      Release Date: Not Released

      + +
        +
      • General Changes +
          +
        • +
        +
        • +
      + +

      Bug fixes for 2.0.3

      +
        +
      • Added ENVIRONMENT to reserved constants. (Reactor #196)
        • +
      • Changed server check to ensure SCRIPT_NAME is defined. (Reactor #57)
        • +
      +

      Version 2.0.2

      Release Date: April 7, 2011
      Hg Tag: v2.0.2

      diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html index d1ee2955..00bebff6 100644 --- a/user_guide/general/reserved_names.html +++ b/user_guide/general/reserved_names.html @@ -90,6 +90,7 @@

      Variables

      Constants

        +
      • ENVIRONMENT
      • EXT
      • FCPATH
      • SELF
        • From bffb7769c6f31b7a47355d4eb66f5ac1d85c2a2e Mon Sep 17 00:00:00 2001 From: Eric Barnes Date: Mon, 18 Apr 2011 00:03:31 -0400 Subject: [PATCH 2455/2544] Changed path in footer comment of cache dummy. --- .../libraries/Cache/drivers/Cache_dummy.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/system/libraries/Cache/drivers/Cache_dummy.php b/system/libraries/Cache/drivers/Cache_dummy.php index de47acb4..f96a68e2 100644 --- a/system/libraries/Cache/drivers/Cache_dummy.php +++ b/system/libraries/Cache/drivers/Cache_dummy.php @@ -10,29 +10,29 @@ * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 2.0 - * @filesource + * @filesource */ // ------------------------------------------------------------------------ /** - * CodeIgniter Dummy Caching Class + * CodeIgniter Dummy Caching Class * * @package CodeIgniter * @subpackage Libraries * @category Core * @author ExpressionEngine Dev Team - * @link + * @link */ class CI_Cache_dummy extends CI_Driver { /** - * Get + * Get * * Since this is the dummy class, it's always going to return FALSE. * - * @param string + * @param string * @return Boolean FALSE */ public function get($id) @@ -40,8 +40,8 @@ public function get($id) return FALSE; } - // ------------------------------------------------------------------------ - + // ------------------------------------------------------------------------ + /** * Cache Save * @@ -55,7 +55,7 @@ public function save($id, $data, $ttl = 60) { return TRUE; } - + // ------------------------------------------------------------------------ /** @@ -112,7 +112,7 @@ public function get_metadata($id) /** * Is this caching driver supported on the system? * Of course this one is. - * + * * @return TRUE; */ public function is_supported() @@ -121,9 +121,9 @@ public function is_supported() } // ------------------------------------------------------------------------ - + } // End Class -/* End of file Cache_apc.php */ -/* Location: ./system/libraries/Cache/drivers/Cache_apc.php */ \ No newline at end of file +/* End of file Cache_dummy.php */ +/* Location: ./system/libraries/Cache/drivers/Cache_dummy.php */ \ No newline at end of file From 826429cf40a9624788b92d2e6e4b7659e1b0d8a1 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 18 Apr 2011 09:40:19 -0500 Subject: [PATCH 2456/2544] Added an optional third parameter to heading() which allows adding html attributes to the rendered heading tag. --- system/helpers/html_helper.php | 5 +++-- user_guide/changelog.html | 5 +++++ user_guide/helpers/html_helper.html | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index c6103ab6..a2920439 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -40,9 +40,10 @@ */ if ( ! function_exists('heading')) { - function heading($data = '', $h = '1') + function heading($data = '', $h = '1', $attributes = '') { - return "".$data.""; + $attributes = ($attributes != '') ? ' '.$attributes : $attributes; + return "".$data.""; } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 0ebe74ae..0afc5b82 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -68,6 +68,11 @@

        Version 2.0.3

      +
    50. Helpers +
        +
      • Added an optional third parameter to heading() which allows adding html attributes to the rendered heading tag.
        • +
      +

      51. Bug fixes for 2.0.3

      diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 1a0529f7..308013d5 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -89,6 +89,11 @@

      heading()

      echo heading('Welcome!', 3);

      The above would produce: <h3>Welcome!</h3>

      +

      Additionally, in order to add attributes to the heading tag such as HTML classes, ids or inline styles, a third parameter is available.

      +echo heading('Welcome!', 3, 'class="pink"') +

      The above code produces: <h3 class="pink">Welcome!<<h3>

      + +

      img()

      Lets you create HTML <img /> tags. The first parameter contains the image source. Example:

      echo img('images/picture.jpg');
      From 62df13125bd9ab22ff0c7f2565a42a6de13ed7e4 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 18 Apr 2011 11:18:02 -0500 Subject: [PATCH 2457/2544] Added Session Class userdata to the output profiler. Additionally, added a show/hide toggle on HTTP Headers, Session Data and Config Variables. --- system/language/english/profiler_lang.php | 3 ++ system/libraries/Profiler.php | 45 ++++++++++++++++++++--- user_guide/changelog.html | 2 +- 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php index b6460fb8..1111158c 100644 --- a/system/language/english/profiler_lang.php +++ b/system/language/english/profiler_lang.php @@ -9,6 +9,7 @@ $lang['profiler_uri_string'] = 'URI STRING'; $lang['profiler_memory_usage'] = 'MEMORY USAGE'; $lang['profiler_config'] = 'CONFIG VARIABLES'; +$lang['profiler_session_data'] = 'SESSION DATA'; $lang['profiler_headers'] = 'HTTP HEADERS'; $lang['profiler_no_db'] = 'Database driver is not currently loaded'; $lang['profiler_no_queries'] = 'No queries were run'; @@ -17,6 +18,8 @@ $lang['profiler_no_uri'] = 'No URI data exists'; $lang['profiler_no_memory'] = 'Memory Usage Unavailable'; $lang['profiler_no_profiles'] = 'No Profile data - all Profiler sections have been disabled.'; +$lang['profiler_section_hide'] = 'Hide'; +$lang['profiler_section_show'] = 'Show'; /* End of file profiler_lang.php */ /* Location: ./system/language/english/profiler_lang.php */ \ No newline at end of file diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 8a1f18ce..d1828b98 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -32,7 +32,7 @@ */ class CI_Profiler { - var $CI; + private $CI; protected $_available_sections = array( 'benchmarks', @@ -43,6 +43,7 @@ class CI_Profiler { 'controller_info', 'queries', 'http_headers', + 'session_data', 'config' ); @@ -410,10 +411,10 @@ protected function _compile_http_headers() $output = "\n\n"; $output .= '
      '; $output .= "\n"; - $output .= '  '.$this->CI->lang->line('profiler_headers').'  '; + $output .= '  '.$this->CI->lang->line('profiler_headers').'  ('.$this->CI->lang->line('profiler_section_show').')'; $output .= "\n"; - $output .= "\n\n\n"; + $output .= "\n\n
      \n"; foreach (array('HTTP_ACCEPT', 'HTTP_USER_AGENT', 'HTTP_CONNECTION', 'SERVER_PORT', 'SERVER_NAME', 'REMOTE_ADDR', 'SERVER_SOFTWARE', 'HTTP_ACCEPT_LANGUAGE', 'SCRIPT_NAME', 'REQUEST_METHOD',' HTTP_HOST', 'REMOTE_HOST', 'CONTENT_TYPE', 'SERVER_PROTOCOL', 'QUERY_STRING', 'HTTP_ACCEPT_ENCODING', 'HTTP_X_FORWARDED_FOR') as $header) { @@ -441,10 +442,10 @@ protected function _compile_config() $output = "\n\n"; $output .= '
      '; $output .= "\n"; - $output .= '  '.$this->CI->lang->line('profiler_config').'  '; + $output .= '  '.$this->CI->lang->line('profiler_config').'  ('.$this->CI->lang->line('profiler_section_show').')'; $output .= "\n"; - $output .= "\n\n
      \n"; + $output .= "\n\n
      \n"; foreach ($this->CI->config->config as $config=>$val) { @@ -464,6 +465,39 @@ protected function _compile_config() // -------------------------------------------------------------------- + /** + * Compile session userdata + * + * @return string + */ + private function _compile_session_data() + { + if ( ! isset($this->CI->session)) + { + return; + } + + $output = '
      '; + $output .= '  '.$this->CI->lang->line('profiler_session_data').'  ('.$this->CI->lang->line('profiler_section_show').')'; + $output .= "
      "; + + foreach ($this->CI->session->all_userdata() as $key => $val) + { + if (is_array($val)) + { + $val = print_r($val, TRUE); + } + + $output .= "\n"; + } + + $output .= ''; + $output .= "
      "; + return $output; + } + + // -------------------------------------------------------------------- + /** * Run the Profiler * @@ -493,7 +527,6 @@ public function run() return $output; } - } // END CI_Profiler class diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 0afc5b82..9890f602 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -65,7 +65,7 @@

      Version 2.0.3

      • General Changes
          -
        • +
        • Added Session Class userdata to the output profiler. Additionally, added a show/hide toggle on HTTP Headers, Session Data and Config Variables.
      • Helpers From 3403366d0f457c1dd449076b4177d1aff5cb176c Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 18 Apr 2011 11:18:09 -0500 Subject: [PATCH 2458/2544] changeset: 2202:06a75a1bd622 tag: tip user: Greg Aker date: Mon Apr 18 11:10:37 2011 -0500 summary: Tweak to session class all_userdata() to just return the userdata array. Also documented previously undocumented all_userdata() method. --- system/libraries/Session.php | 4 ++-- user_guide/libraries/sessions.html | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 18229405..32317c2e 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -435,11 +435,11 @@ function userdata($item) * Fetch all session data * * @access public - * @return mixed + * @return array */ function all_userdata() { - return ( ! isset($this->userdata)) ? FALSE : $this->userdata; + return $this->userdata; } // -------------------------------------------------------------------- diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 600d301c..8d9c14eb 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -170,6 +170,23 @@

        Adding Custom Session Data

        Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

        +

        Retrieving All Session Data

        +

        An array of all userdata can be retrieved as follows:

        +$this->session->all_userdata() + +

        And returns an associative array like the following:

        + +
        +Array
+(
+    [session_id] => 4a5a5dca22728fb0a84364eeb405b601
+    [ip_address] => 127.0.0.1
+    [user_agent] => Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7;
+    [last_activity] => 1303142623
+)
+
        + +

        Removing Session Data

        Just as set_userdata() can be used to add information into a session, unset_userdata() can be used to remove it, by passing the session key. For example, if you wanted to remove 'some_name' from your session information:

        $this->session->unset_userdata('some_name');

        From e6e6e64ab078205153513af24dd4163157efb148 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 18 Apr 2011 15:54:13 -0500 Subject: [PATCH 2459/2544] changeset: 2204:37301a84c8be tag: tip user: Greg Aker date: Mon Apr 18 15:51:28 2011 -0500 summary: Adding toggle show/hide on database queries in the output profiler. Added a profiler config item to set a threshold of when to hide the queries by default. Additionally, fixed a bug I created earlier today by marking the $CI class var in CI_Profiler as private. --- system/libraries/Profiler.php | 35 ++++++++-- user_guide/general/profiling.html | 103 ++++++++++++++++-------------- 2 files changed, 83 insertions(+), 55 deletions(-) diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index d1828b98..b73ddaf0 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -32,8 +32,6 @@ */ class CI_Profiler { - private $CI; - protected $_available_sections = array( 'benchmarks', 'get', @@ -46,12 +44,24 @@ class CI_Profiler { 'session_data', 'config' ); + + protected $_query_toggle_count = 25; + + protected $CI; + // -------------------------------------------------------------------- + public function __construct($config = array()) { $this->CI =& get_instance(); $this->CI->load->language('profiler'); + if (isset($config['query_toggle_count'])) + { + $this->_query_toggle_count = (int) $config['query_toggle_count']; + unset($config['query_toggle_count']); + } + // default all sections to display foreach ($this->_available_sections as $section) { @@ -163,7 +173,7 @@ protected function _compile_queries() $output .= "\n"; $output .= '  '.$this->CI->lang->line('profiler_queries').'  '; $output .= "\n"; - $output .= "\n\n\n"; + $output .= "\n\n
        \n"; $output .="\n"; $output .= "
        ".$this->CI->lang->line('profiler_no_db')."
        \n"; $output .= ""; @@ -178,14 +188,27 @@ protected function _compile_queries() $highlight = array('SELECT', 'DISTINCT', 'FROM', 'WHERE', 'AND', 'LEFT JOIN', 'ORDER BY', 'GROUP BY', 'LIMIT', 'INSERT', 'INTO', 'VALUES', 'UPDATE', 'OR ', 'HAVING', 'OFFSET', 'NOT IN', 'IN', 'LIKE', 'NOT LIKE', 'COUNT', 'MAX', 'MIN', 'ON', 'AS', 'AVG', 'SUM', '(', ')'); $output = "\n\n"; - + + $count = 0; + foreach ($dbs as $db) { + $count++; + + $hide_queries = (count($db->queries) > $this->_query_toggle_count) ? ' display:none' : ''; + + $show_hide_js = '('.$this->CI->lang->line('profiler_section_hide').')'; + + if ($hide_queries != '') + { + $show_hide_js = '('.$this->CI->lang->line('profiler_section_show').')'; + } + $output .= '
        '; $output .= "\n"; - $output .= '  '.$this->CI->lang->line('profiler_database').':  '.$db->database.'   '.$this->CI->lang->line('profiler_queries').': '.count($db->queries).'   '; + $output .= '  '.$this->CI->lang->line('profiler_database').':  '.$db->database.'   '.$this->CI->lang->line('profiler_queries').': '.count($db->queries).'  '.$show_hide_js.''; $output .= "\n"; - $output .= "\n\n\n"; + $output .= "\n\n
        \n"; if (count($db->queries) == 0) { diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index f3ea0c6f..78ece7dc 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -105,55 +105,60 @@

        Enabling and Disabling Profiler Sections

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        KeyDescriptionDefault
        benchmarksElapsed time of Benchmark points and total execution timeTRUE
        configCodeIgniter Config variablesTRUE
        controller_infoThe Controller class and method requestedTRUE
        getAny GET data passed in the requestTRUE
        http_headersThe HTTP headers for the current requestTRUE
        memory_usageAmount of memory consumed by the current request, in bytesTRUE
        postAny POST data passed in the requestTRUE
        queriesListing of all database queries executed, including execution timeTRUE
        uri_stringThe URI of the current requestTRUE
        KeyDescriptionDefault
        benchmarksElapsed time of Benchmark points and total execution timeTRUE
        configCodeIgniter Config variablesTRUE
        controller_infoThe Controller class and method requestedTRUE
        getAny GET data passed in the requestTRUE
        http_headersThe HTTP headers for the current requestTRUE
        memory_usageAmount of memory consumed by the current request, in bytesTRUE
        postAny POST data passed in the requestTRUE
        queriesListing of all database queries executed, including execution timeTRUE
        uri_stringThe URI of the current requestTRUE
        query_toggle_countThe number of queries after which the query block will default to hidden.25
        From 3a746655e92ec59ee7e731c3535673a9aedc5d3e Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 19 Apr 2011 10:59:47 -0500 Subject: [PATCH 2460/2544] Removing internal references to the EXT constant. Additionally, marked the constant as deprecated. Use ".php" instead. Also adding upgrade notes from 2.0.2 to 2.0.3. --- index.php | 3 +- system/core/CodeIgniter.php | 22 ++--- system/core/Common.php | 14 ++-- system/core/Config.php | 6 +- system/core/Exceptions.php | 4 +- system/core/Hooks.php | 8 +- system/core/Lang.php | 4 +- system/core/Loader.php | 64 +++++++------- system/core/Output.php | 6 +- system/core/Router.php | 14 ++-- system/database/DB.php | 12 +-- system/database/DB_driver.php | 6 +- system/helpers/download_helper.php | 8 +- system/helpers/file_helper.php | 8 +- system/helpers/html_helper.php | 8 +- system/helpers/smiley_helper.php | 8 +- system/helpers/text_helper.php | 8 +- system/libraries/Calendar.php | 2 +- system/libraries/Driver.php | 2 +- system/libraries/Encrypt.php | 2 +- system/libraries/Log.php | 2 +- system/libraries/Upload.php | 8 +- system/libraries/User_agent.php | 8 +- user_guide/changelog.html | 1 + user_guide/installation/upgrade_203.html | 102 +++++++++++++++++++++++ user_guide/installation/upgrading.html | 1 + 26 files changed, 218 insertions(+), 113 deletions(-) create mode 100644 user_guide/installation/upgrade_203.html diff --git a/index.php b/index.php index 6e67c2db..a8d58b2d 100644 --- a/index.php +++ b/index.php @@ -163,6 +163,7 @@ define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); // The PHP file extension + // this global constant is deprecated. define('EXT', '.php'); // Path to the system folder @@ -198,7 +199,7 @@ * And away we go... * */ -require_once BASEPATH.'core/CodeIgniter'.EXT; +require_once BASEPATH.'core/CodeIgniter.php'; /* End of file index.php */ /* Location: ./index.php */ \ No newline at end of file diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index e022e1b4..03b25ab9 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -46,20 +46,20 @@ * Load the global functions * ------------------------------------------------------ */ - require(BASEPATH.'core/Common'.EXT); + require(BASEPATH.'core/Common.php'); /* * ------------------------------------------------------ * Load the framework constants * ------------------------------------------------------ */ - if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/constants'.EXT)) + if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/constants.php')) { - require(APPPATH.'config/'.ENVIRONMENT.'/constants'.EXT); + require(APPPATH.'config/'.ENVIRONMENT.'/constants.php'); } else { - require(APPPATH.'config/constants'.EXT); + require(APPPATH.'config/constants.php'); } /* @@ -224,7 +224,7 @@ * */ // Load the base controller class - require BASEPATH.'core/Controller'.EXT; + require BASEPATH.'core/Controller.php'; function &get_instance() { @@ -232,20 +232,20 @@ function &get_instance() } - if (file_exists(APPPATH.'core/'.$CFG->config['subclass_prefix'].'Controller'.EXT)) + if (file_exists(APPPATH.'core/'.$CFG->config['subclass_prefix'].'Controller.php')) { - require APPPATH.'core/'.$CFG->config['subclass_prefix'].'Controller'.EXT; + require APPPATH.'core/'.$CFG->config['subclass_prefix'].'Controller.php'; } // Load the local application controller // Note: The Router class automatically validates the controller path using the router->_validate_request(). // If this include fails it means that the default controller in the Routes.php file is not resolving to something valid. - if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT)) + if ( ! file_exists(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().'.php')) { show_error('Unable to load your default controller. Please make sure the controller specified in your Routes.php file is valid.'); } - include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT); + include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().'.php'); // Set a mark point for benchmarking $BM->mark('loading_time:_base_classes_end'); @@ -318,12 +318,12 @@ function &get_instance() $method = (isset($x[1]) ? $x[1] : 'index'); if ( ! class_exists($class)) { - if ( ! file_exists(APPPATH.'controllers/'.$class.EXT)) + if ( ! file_exists(APPPATH.'controllers/'.$class.'.php')) { show_404("{$class}/{$method}"); } - include_once(APPPATH.'controllers/'.$class.EXT); + include_once(APPPATH.'controllers/'.$class.'.php'); unset($CI); $CI = new $class(); } diff --git a/system/core/Common.php b/system/core/Common.php index 1aca809a..d1e8e77e 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -128,13 +128,13 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_') // thenin the local application/libraries folder foreach (array(BASEPATH, APPPATH) as $path) { - if (file_exists($path.$directory.'/'.$class.EXT)) + if (file_exists($path.$directory.'/'.$class.'.php')) { $name = $prefix.$class; if (class_exists($name) === FALSE) { - require($path.$directory.'/'.$class.EXT); + require($path.$directory.'/'.$class.'.php'); } break; @@ -142,13 +142,13 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_') } // Is the request a class extension? If so we load it too - if (file_exists(APPPATH.$directory.'/'.config_item('subclass_prefix').$class.EXT)) + if (file_exists(APPPATH.$directory.'/'.config_item('subclass_prefix').$class.'.php')) { $name = config_item('subclass_prefix').$class; if (class_exists($name) === FALSE) { - require(APPPATH.$directory.'/'.config_item('subclass_prefix').$class.EXT); + require(APPPATH.$directory.'/'.config_item('subclass_prefix').$class.'.php'); } } @@ -157,7 +157,7 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_') { // Note: We use exit() rather then show_error() in order to avoid a // self-referencing loop with the Excptions class - exit('Unable to locate the specified class: '.$class.EXT); + exit('Unable to locate the specified class: '.$class.'.php'); } // Keep track of what we just loaded @@ -209,9 +209,9 @@ function &get_config($replace = array()) } // Is the config file in the environment folder? - if ( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config'.EXT)) + if ( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php')) { - $file_path = APPPATH.'config/config'.EXT; + $file_path = APPPATH.'config/config.php'; } // Fetch the config file diff --git a/system/core/Config.php b/system/core/Config.php index 863c5ef4..4493ff26 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -80,7 +80,7 @@ function __construct() */ function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) { - $file = ($file == '') ? 'config' : str_replace(EXT, '', $file); + $file = ($file == '') ? 'config' : str_replace('.php', '', $file); $found = FALSE; $loaded = FALSE; @@ -92,7 +92,7 @@ function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) foreach ($check_locations as $location) { - $file_path = $path.'config/'.$location.EXT; + $file_path = $path.'config/'.$location.'.php'; if (in_array($file_path, $this->is_loaded, TRUE)) { @@ -152,7 +152,7 @@ function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) { return FALSE; } - show_error('The configuration file '.$file.EXT.' does not exist.'); + show_error('The configuration file '.$file.'.php'.' does not exist.'); } return TRUE; diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index f5659561..bff86a92 100644 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -128,7 +128,7 @@ function show_error($heading, $message, $template = 'error_general', $status_cod ob_end_flush(); } ob_start(); - include(APPPATH.'errors/'.$template.EXT); + include(APPPATH.'errors/'.$template.'.php'); $buffer = ob_get_contents(); ob_end_clean(); return $buffer; @@ -164,7 +164,7 @@ function show_php_error($severity, $message, $filepath, $line) ob_end_flush(); } ob_start(); - include(APPPATH.'errors/error_php'.EXT); + include(APPPATH.'errors/error_php.php'); $buffer = ob_get_contents(); ob_end_clean(); echo $buffer; diff --git a/system/core/Hooks.php b/system/core/Hooks.php index 24fa1055..fd6380f0 100644 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php @@ -65,13 +65,13 @@ function _initialize() // Grab the "hooks" definition file. // If there are no hooks, we're done. - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT); + include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'); } - elseif (is_file(APPPATH.'config/hooks'.EXT)) + elseif (is_file(APPPATH.'config/hooks.php')) { - include(APPPATH.'config/hooks'.EXT); + include(APPPATH.'config/hooks.php'); } diff --git a/system/core/Lang.php b/system/core/Lang.php index cdadc7f4..170e6c72 100644 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -51,14 +51,14 @@ function __construct() */ function load($langfile = '', $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') { - $langfile = str_replace(EXT, '', $langfile); + $langfile = str_replace('.php', '', $langfile); if ($add_suffix == TRUE) { $langfile = str_replace('_lang.', '', $langfile).'_lang'; } - $langfile .= EXT; + $langfile .= '.php'; if (in_array($langfile, $this->is_loaded, TRUE)) { diff --git a/system/core/Loader.php b/system/core/Loader.php index e75805d0..59415b72 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -161,7 +161,7 @@ function model($model, $name = '', $db_conn = FALSE) foreach ($this->_ci_model_paths as $mod_path) { - if ( ! file_exists($mod_path.'models/'.$path.$model.EXT)) + if ( ! file_exists($mod_path.'models/'.$path.$model.'.php')) { continue; } @@ -181,7 +181,7 @@ function model($model, $name = '', $db_conn = FALSE) load_class('Model', 'core'); } - require_once($mod_path.'models/'.$path.$model.EXT); + require_once($mod_path.'models/'.$path.$model.'.php'); $model = ucfirst($model); @@ -217,7 +217,7 @@ function database($params = '', $return = FALSE, $active_record = NULL) return FALSE; } - require_once(BASEPATH.'database/DB'.EXT); + require_once(BASEPATH.'database/DB.php'); if ($return === TRUE) { @@ -253,8 +253,8 @@ function dbutil() // this use is deprecated and strongly discouraged $CI->load->dbforge(); - require_once(BASEPATH.'database/DB_utility'.EXT); - require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility'.EXT); + require_once(BASEPATH.'database/DB_utility.php'); + require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility.php'); $class = 'CI_DB_'.$CI->db->dbdriver.'_utility'; $CI->dbutil = new $class(); @@ -277,8 +277,8 @@ function dbforge() $CI =& get_instance(); - require_once(BASEPATH.'database/DB_forge'.EXT); - require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_forge'.EXT); + require_once(BASEPATH.'database/DB_forge.php'); + require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_forge.php'); $class = 'CI_DB_'.$CI->db->dbdriver.'_forge'; $CI->dbforge = new $class(); @@ -375,16 +375,16 @@ function helper($helpers = array()) continue; } - $ext_helper = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.EXT; + $ext_helper = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php'; // Is this a helper extension request? if (file_exists($ext_helper)) { - $base_helper = BASEPATH.'helpers/'.$helper.EXT; + $base_helper = BASEPATH.'helpers/'.$helper.'.php'; if ( ! file_exists($base_helper)) { - show_error('Unable to load the requested file: helpers/'.$helper.EXT); + show_error('Unable to load the requested file: helpers/'.$helper.'.php'); } include_once($ext_helper); @@ -398,9 +398,9 @@ function helper($helpers = array()) // Try to load the helper foreach ($this->_ci_helper_paths as $path) { - if (file_exists($path.'helpers/'.$helper.EXT)) + if (file_exists($path.'helpers/'.$helper.'.php')) { - include_once($path.'helpers/'.$helper.EXT); + include_once($path.'helpers/'.$helper.'.php'); $this->_ci_helpers[$helper] = TRUE; log_message('debug', 'Helper loaded: '.$helper); @@ -411,7 +411,7 @@ function helper($helpers = array()) // unable to load the helper if ( ! isset($this->_ci_helpers[$helper])) { - show_error('Unable to load the requested file: helpers/'.$helper.EXT); + show_error('Unable to load the requested file: helpers/'.$helper.'.php'); } } } @@ -490,7 +490,7 @@ function driver($library = '', $params = NULL, $object_name = NULL) if ( ! class_exists('CI_Driver_Library')) { // we aren't instantiating an object here, that'll be done by the Library itself - require BASEPATH.'libraries/Driver'.EXT; + require BASEPATH.'libraries/Driver.php'; } // We can save the loader some time since Drivers will *always* be in a subfolder, @@ -616,7 +616,7 @@ function _ci_load($_ci_data) if ($_ci_path == '') { $_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION); - $_ci_file = ($_ci_ext == '') ? $_ci_view.EXT : $_ci_view; + $_ci_file = ($_ci_ext == '') ? $_ci_view.'.php' : $_ci_view; $_ci_path = $this->_ci_view_path.$_ci_file; } else @@ -732,7 +732,7 @@ function _ci_load_class($class, $params = NULL, $object_name = NULL) // Get the class name, and while we're at it trim any slashes. // The directory path can be included as part of the class name, // but we don't want a leading slash - $class = str_replace(EXT, '', trim($class, '/')); + $class = str_replace('.php', '', trim($class, '/')); // Was the path included with the class name? // We look for a slash to determine this @@ -749,12 +749,12 @@ function _ci_load_class($class, $params = NULL, $object_name = NULL) // We'll test for both lowercase and capitalized versions of the file name foreach (array(ucfirst($class), strtolower($class)) as $class) { - $subclass = APPPATH.'libraries/'.$subdir.config_item('subclass_prefix').$class.EXT; + $subclass = APPPATH.'libraries/'.$subdir.config_item('subclass_prefix').$class.'.php'; // Is this a class extension request? if (file_exists($subclass)) { - $baseclass = BASEPATH.'libraries/'.ucfirst($class).EXT; + $baseclass = BASEPATH.'libraries/'.ucfirst($class).'.php'; if ( ! file_exists($baseclass)) { @@ -793,7 +793,7 @@ function _ci_load_class($class, $params = NULL, $object_name = NULL) $is_duplicate = FALSE; foreach ($this->_ci_library_paths as $path) { - $filepath = $path.'libraries/'.$subdir.$class.EXT; + $filepath = $path.'libraries/'.$subdir.$class.'.php'; // Does the file exist? No? Bummer... if ( ! file_exists($filepath)) @@ -872,24 +872,24 @@ function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NU // We test for both uppercase and lowercase, for servers that // are case-sensitive with regard to file names. Check for environment // first, global next - if (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.strtolower($class).EXT)) + if (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php')) { - include_once($path .'config/'.ENVIRONMENT.'/'.strtolower($class).EXT); + include_once($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php'); break; } - elseif (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).EXT)) + elseif (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php')) { - include_once($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).EXT); + include_once($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'); break; } - elseif (file_exists($path .'config/'.strtolower($class).EXT)) + elseif (file_exists($path .'config/'.strtolower($class).'.php')) { - include_once($path .'config/'.strtolower($class).EXT); + include_once($path .'config/'.strtolower($class).'.php'); break; } - elseif (file_exists($path .'config/'.ucfirst(strtolower($class)).EXT)) + elseif (file_exists($path .'config/'.ucfirst(strtolower($class)).'.php')) { - include_once($path .'config/'.ucfirst(strtolower($class)).EXT); + include_once($path .'config/'.ucfirst(strtolower($class)).'.php'); break; } } @@ -965,13 +965,13 @@ function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NU */ function _ci_autoloader() { - if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload'.EXT)) + if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php')) { - include_once(APPPATH.'config/'.ENVIRONMENT.'/autoload'.EXT); + include_once(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'); } else { - include_once(APPPATH.'config/autoload'.EXT); + include_once(APPPATH.'config/autoload.php'); } @@ -1084,13 +1084,13 @@ function _ci_prep_filename($filename, $extension) { if ( ! is_array($filename)) { - return array(strtolower(str_replace(EXT, '', str_replace($extension, '', $filename)).$extension)); + return array(strtolower(str_replace('.php', '', str_replace($extension, '', $filename)).$extension)); } else { foreach ($filename as $key => $val) { - $filename[$key] = strtolower(str_replace(EXT, '', str_replace($extension, '', $val)).$extension); + $filename[$key] = strtolower(str_replace('.php', '', str_replace($extension, '', $val)).$extension); } return $filename; diff --git a/system/core/Output.php b/system/core/Output.php index 45a82f3c..05ace919 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -42,13 +42,13 @@ function __construct() $this->_zlib_oc = @ini_get('zlib.output_compression'); // Get mime types for later - if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT)) + if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php')) { - include APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT; + include APPPATH.'config/'.ENVIRONMENT.'/mimes.php'; } else { - include APPPATH.'config/mimes'.EXT; + include APPPATH.'config/mimes.php'; } diff --git a/system/core/Router.php b/system/core/Router.php index d451aab6..5e92a04b 100644 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -87,13 +87,13 @@ function _set_routing() } // Load the routes.php file. - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/routes'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/routes.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/routes'.EXT); + include(APPPATH.'config/'.ENVIRONMENT.'/routes.php'); } - elseif (is_file(APPPATH.'config/routes'.EXT)) + elseif (is_file(APPPATH.'config/routes.php')) { - include(APPPATH.'config/routes'.EXT); + include(APPPATH.'config/routes.php'); } $this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route; @@ -227,7 +227,7 @@ function _validate_request($segments) } // Does the requested controller exist in the root folder? - if (file_exists(APPPATH.'controllers/'.$segments[0].EXT)) + if (file_exists(APPPATH.'controllers/'.$segments[0].'.php')) { return $segments; } @@ -242,7 +242,7 @@ function _validate_request($segments) if (count($segments) > 0) { // Does the requested controller exist in the sub-folder? - if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$segments[0].EXT)) + if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$segments[0].'.php')) { show_404($this->fetch_directory().$segments[0]); } @@ -264,7 +264,7 @@ function _validate_request($segments) } // Does the default controller exist in the sub-folder? - if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$this->default_controller.EXT)) + if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$this->default_controller.'.php')) { $this->directory = ''; return array(); diff --git a/system/database/DB.php b/system/database/DB.php index 8bf1ba8b..33207d88 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -28,11 +28,11 @@ function &DB($params = '', $active_record_override = NULL) if (is_string($params) AND strpos($params, '://') === FALSE) { // Is the config file in the environment folder? - if ( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/database'.EXT)) + if ( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/database.php')) { - if ( ! file_exists($file_path = APPPATH.'config/database'.EXT)) + if ( ! file_exists($file_path = APPPATH.'config/database.php')) { - show_error('The configuration file database'.EXT.' does not exist.'); + show_error('The configuration file database.php does not exist.'); } } @@ -116,11 +116,11 @@ function &DB($params = '', $active_record_override = NULL) $active_record = $active_record_override; } - require_once(BASEPATH.'database/DB_driver'.EXT); + require_once(BASEPATH.'database/DB_driver.php'); if ( ! isset($active_record) OR $active_record == TRUE) { - require_once(BASEPATH.'database/DB_active_rec'.EXT); + require_once(BASEPATH.'database/DB_active_rec.php'); if ( ! class_exists('CI_DB')) { @@ -135,7 +135,7 @@ function &DB($params = '', $active_record_override = NULL) } } - require_once(BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].'_driver'.EXT); + require_once(BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].'_driver.php'); // Instantiate the DB adapter $driver = 'CI_DB_'.$params['dbdriver'].'_driver'; diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index e7a9de47..10e8ed0c 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -424,8 +424,8 @@ function load_rdriver() if ( ! class_exists($driver)) { - include_once(BASEPATH.'database/DB_result'.EXT); - include_once(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_result'.EXT); + include_once(BASEPATH.'database/DB_result.php'); + include_once(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_result.php'); } return $driver; @@ -1115,7 +1115,7 @@ function _cache_init() if ( ! class_exists('CI_DB_Cache')) { - if ( ! @include(BASEPATH.'database/DB_cache'.EXT)) + if ( ! @include(BASEPATH.'database/DB_cache.php')) { return $this->cache_off(); } diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index f8073d23..1145688a 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -58,13 +58,13 @@ function force_download($filename = '', $data = '') $extension = end($x); // Load the mime types - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT); + include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'); } - elseif (is_file(APPPATH.'config/mimes'.EXT)) + elseif (is_file(APPPATH.'config/mimes.php')) { - include(APPPATH.'config/mimes'.EXT); + include(APPPATH.'config/mimes.php'); } // Set a default mime if we can't find it diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 44344947..3931667f 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -352,13 +352,13 @@ function get_mime_by_extension($file) if ( ! is_array($mimes)) { - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT); + include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'); } - elseif (is_file(APPPATH.'config/mimes'.EXT)) + elseif (is_file(APPPATH.'config/mimes.php')) { - include(APPPATH.'config/mimes'.EXT); + include(APPPATH.'config/mimes.php'); } if ( ! is_array($mimes)) diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index a2920439..080f622d 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -259,13 +259,13 @@ function doctype($type = 'xhtml1-strict') if ( ! is_array($_doctypes)) { - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT); + include(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php'); } - elseif (is_file(APPPATH.'config/doctypes'.EXT)) + elseif (is_file(APPPATH.'config/doctypes.php')) { - include(APPPATH.'config/doctypes'.EXT); + include(APPPATH.'config/doctypes.php'); } if ( ! is_array($_doctypes)) diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index a2d1031b..6d888935 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -229,13 +229,13 @@ function parse_smileys($str = '', $image_url = '', $smileys = NULL) { function _get_smiley_array() { - if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys'.EXT)) + if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/smileys'.EXT); + include(APPPATH.'config/'.ENVIRONMENT.'/smileys.php'); } - elseif (file_exists(APPPATH.'config/smileys'.EXT)) + elseif (file_exists(APPPATH.'config/smileys.php')) { - include(APPPATH.'config/smileys'.EXT); + include(APPPATH.'config/smileys.php'); } if (isset($smileys) AND is_array($smileys)) diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index cca09397..33d7fa2f 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -366,13 +366,13 @@ function highlight_phrase($str, $phrase, $tag_open = '', $tag_close = '< { function convert_accented_characters($str) { - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT); + include(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars.php'); } - elseif (is_file(APPPATH.'config/foreign_chars'.EXT)) + elseif (is_file(APPPATH.'config/foreign_chars.php')) { - include(APPPATH.'config/foreign_chars'.EXT); + include(APPPATH.'config/foreign_chars.php'); } if ( ! isset($foreign_characters)) diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php index 72d228e7..df0fd6ee 100644 --- a/system/libraries/Calendar.php +++ b/system/libraries/Calendar.php @@ -47,7 +47,7 @@ public function __construct($config = array()) { $this->CI =& get_instance(); - if ( ! in_array('calendar_lang'.EXT, $this->CI->lang->is_loaded, TRUE)) + if ( ! in_array('calendar_lang.php', $this->CI->lang->is_loaded, TRUE)) { $this->CI->lang->load('calendar'); } diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php index b942f539..d1925c0e 100644 --- a/system/libraries/Driver.php +++ b/system/libraries/Driver.php @@ -59,7 +59,7 @@ function __get($child) // loves me some nesting! foreach (array(ucfirst($driver_name), $driver_name) as $class) { - $filepath = $path.'libraries/'.$lib_name.'/drivers/'.$class.EXT; + $filepath = $path.'libraries/'.$lib_name.'/drivers/'.$class.'.php'; if (file_exists($filepath)) { diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index e5f65878..b30a8cf0 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -524,7 +524,7 @@ function sha1($str) { if ( ! function_exists('mhash')) { - require_once(BASEPATH.'libraries/Sha1'.EXT); + require_once(BASEPATH.'libraries/Sha1.php'); $SH = new CI_SHA; return $SH->generate($str); } diff --git a/system/libraries/Log.php b/system/libraries/Log.php index fb2c5a49..9f1db76b 100644 --- a/system/libraries/Log.php +++ b/system/libraries/Log.php @@ -83,7 +83,7 @@ public function write_log($level = 'error', $msg, $php_error = FALSE) return FALSE; } - $filepath = $this->_log_path.'log-'.date('Y-m-d').EXT; + $filepath = $this->_log_path.'log-'.date('Y-m-d').'.php'; $message = ''; if ( ! file_exists($filepath)) diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index e80049fa..3177424c 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -945,13 +945,13 @@ public function mimes_types($mime) if (count($this->mimes) == 0) { - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT); + include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'); } - elseif (is_file(APPPATH.'config/mimes'.EXT)) + elseif (is_file(APPPATH.'config/mimes.php')) { - include(APPPATH.'config//mimes'.EXT); + include(APPPATH.'config//mimes.php'); } else { diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php index 04cda731..016102a2 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -84,13 +84,13 @@ public function __construct() */ private function _load_agent_file() { - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT)) + if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/user_agents.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/user_agents'.EXT); + include(APPPATH.'config/'.ENVIRONMENT.'/user_agents.php'); } - elseif (is_file(APPPATH.'config/user_agents'.EXT)) + elseif (is_file(APPPATH.'config/user_agents.php')) { - include(APPPATH.'config/user_agents'.EXT); + include(APPPATH.'config/user_agents.php'); } else { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9890f602..945b1049 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,6 +66,7 @@

        Version 2.0.3

      • General Changes
        • Added Session Class userdata to the output profiler. Additionally, added a show/hide toggle on HTTP Headers, Session Data and Config Variables.
          • +
        • Removed internal usage of the EXT constant.
      • Helpers diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html new file mode 100644 index 00000000..4937cf25 --- /dev/null +++ b/user_guide/installation/upgrade_203.html @@ -0,0 +1,102 @@ + + + + + +Upgrading from 2.0.2 to 2.0.3 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
        + + + + + +

        CodeIgniter User Guide Version 2.0.3

        +
        + + + + + + + + + +
        + + +
        + + + +
        + +

        Upgrading from 2.0.2 to 2.0.3

        + +

        Before performing an update you should take your site offline by replacing the index.php file with a static one.

        + + +

        Step 1: Update your CodeIgniter files

        + +

        Replace all files and directories in your "system" folder and replace your index.php file. If any modifications were made to your index.php they will need to be made fresh in this new one.

        + +

        Note: If you have any custom developed files in these folders please make copies of them first.

        + +

        Step 2: Update CodeIgniter files

        + +

        Replace the files and directories in your "system" folder with the new versions:

        + +

        Step 3: Update your main index.php file

        + +

        If you are running a stock index.php file simply replace your version with the new one.

        + +

        If your index.php file has internal modifications, please add your modifications to the new file and use it.

        + +

        Step 4: Replace config/user_agents.php

        + +

        This config file has been updated to contain more user agent types, please copy it to application/config/user_agents.php.

        + +

        Step 5: Change references of the EXT constant to ".php"

        +

        Note: The EXT Constant has been marked as deprecated, but has not been removed from the application. You are encouraged to make the changes sooner rather than later.

        + +
        + + + + + + + \ No newline at end of file diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 1c4eb882..014ffa3f 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -60,6 +60,7 @@

        Upgrading From a Previous Version

        Please read the upgrade notes corresponding to the version you are upgrading from.

          +
        • Upgrading from 2.0.2 to 2.0.3
        • Upgrading from 2.0.1 to 2.0.2
        • Upgrading from 2.0 to 2.0.1
        • Upgrading from 1.7.2 to 2.0
          • From 9ce4385cfc976e309ee12c53726abfd4f066ac3f Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 19 Apr 2011 12:58:52 -0500 Subject: [PATCH 2461/2544] 1/2 reverting a previous change to the form_helper. Wrapping hidden form elements in
          instead of an empty div. If a user is styling form div {} they can run into display issues, so something is needed. --- system/helpers/form_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index bca0ff0c..a5cd97b8 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -72,7 +72,7 @@ function form_open($action = '', $attributes = '', $hidden = array()) if (is_array($hidden) AND count($hidden) > 0) { - $form .= sprintf("\n
          %s
          ", form_hidden($hidden)); + $form .= sprintf("
          %s
          ", form_hidden($hidden)); } return $form; From 4488538665d37b07a08d7fe4ce6f4156a9899211 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 19 Apr 2011 15:28:40 -0500 Subject: [PATCH 2462/2544] Removed APPPATH.'third_party' from the packages autoloader to negate needless file stats if no packages exist or if the developer does not load any other packages by default. --- application/config/autoload.php | 2 +- user_guide/changelog.html | 1 + user_guide/installation/upgrade_203.html | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/application/config/autoload.php b/application/config/autoload.php index 90b1a808..53129c9c 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -37,7 +37,7 @@ | */ -$autoload['packages'] = array(APPPATH.'third_party'); +$autoload['packages'] = array(); /* diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 945b1049..3a17edd9 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -80,6 +80,7 @@

          Bug fixes for 2.0.3

          • Added ENVIRONMENT to reserved constants. (Reactor #196)
          • Changed server check to ensure SCRIPT_NAME is defined. (Reactor #57)
            • +
          • Removed APPPATH.'third_party' from the packages autoloader to negate needless file stats if no packages exist or if the developer does not load any other packages by default.

          Version 2.0.2

          diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html index 4937cf25..38cfb72c 100644 --- a/user_guide/installation/upgrade_203.html +++ b/user_guide/installation/upgrade_203.html @@ -83,6 +83,18 @@

          Step 4: Replace config/user_agents.php

          Step 5: Change references of the EXT constant to ".php"

          Note: The EXT Constant has been marked as deprecated, but has not been removed from the application. You are encouraged to make the changes sooner rather than later.

          +

          Step 6: Remove APPPATH.'third_party' from autoload.php

          + +

          Open application/autoload.php, and look for the following:

          + +$autoload['packages'] = array(APPPATH.'third_party'); + +

          If you have not chosen to load any additional packages, that line can be changed to:

          +$autoload['packages'] = array(); + +

          Which should provide for nominal performance gains if not autoloading packages.

          + +
      From 6ae70cc8499499b5d77d77ec8974f95873edb861 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 19 Apr 2011 16:13:48 -0500 Subject: [PATCH 2463/2544] modified MySQL and MySQLi drivers to address a potential SQL injection attack vector when multi-byte character set connections are employed. (Does not impact Latin-1, UTF-8, etc. encodings) --- application/config/database.php | 6 ++++++ system/database/drivers/mysql/mysql_driver.php | 17 ++++++++++++++++- .../database/drivers/mysqli/mysqli_driver.php | 17 ++++++++++++++++- user_guide/changelog.html | 4 ++++ user_guide/database/configuration.html | 2 +- 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/application/config/database.php b/application/config/database.php index 24d611ac..fa541a73 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -26,6 +26,12 @@ | ['cachedir'] The path to the folder where cache files should be stored | ['char_set'] The character set used in communicating with the database | ['dbcollat'] The character collation used in communicating with the database +| NOTE: For MySQL and MySQLi databases, this setting is only used +| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7. +| There is an incompatibility in PHP with mysql_real_escape_string() which +| can make your site vulnerable to SQL injection if you are using a +| multi-byte character set and are running versions lower than these. +| Sites using Latin-1 or UTF-8 database character set and collation are unaffected. | ['swap_pre'] A default table prefix that should be swapped with the dbprefix | ['autoinit'] Whether or not to automatically initialize the database. | ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 4ff9b0a1..b7d547cc 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -132,7 +132,22 @@ function db_select() */ function db_set_charset($charset, $collation) { - return @mysql_query("SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'", $this->conn_id); + static $use_set_names; + + if ( ! isset($use_set_names)) + { + // mysql_set_charset() requires PHP >= 5.2.3 and MySQL >= 5.0.7, use SET NAMES as fallback + $use_set_names = (version_compare(PHP_VERSION, '5.2.3', '>=') && version_compare(mysql_get_server_info(), '5.0.7', '>=')) ? FALSE : TRUE; + } + + if ($use_set_names) + { + return @mysql_query("SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'", $this->conn_id); + } + else + { + return @mysql_set_charset($charset, $this->conn_id); + } } // -------------------------------------------------------------------- diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index ccdabce1..1949acb6 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -132,7 +132,22 @@ function db_select() */ function _db_set_charset($charset, $collation) { - return @mysqli_query($this->conn_id, "SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'"); + static $use_set_names; + + if ( ! isset($use_set_names)) + { + // mysqli_set_charset() requires MySQL >= 5.0.7, use SET NAMES as fallback + $use_set_names = (version_compare(mysql_get_server_info(), '5.0.7', '>=')) ? FALSE : TRUE; + } + + if ($use_set_names) + { + return @mysqli_query($this->conn_id, "SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'"); + } + else + { + return @mysqli_set_charset($this->conn_id, $charset); + } } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 945b1049..6eb80b38 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -63,6 +63,10 @@

      Version 2.0.3

      Release Date: Not Released

        +
      • Security +
          +
        • An improvement was made to the MySQL and MySQLi drivers to prevent exposing a potential vector for SQL injection on sites using multi-byte character sets in the database client connection.

          An incompatibility in PHP versions < 5.2.3 and MySQL < 5.0.7 with mysql_set_charset() creates a situation where using multi-byte character sets on these environments may potentially expose a SQL injection attack vector. Latin-1, UTF-8, and other "low ASCII" character sets are unaffected on all environments.

          If you are running or considering running a multi-byte character set for your database connection, please pay close attention to the server environment you are deploying on to ensure you are not vulnerable.

          • +
      • General Changes
        • Added Session Class userdata to the output profiler. Additionally, added a show/hide toggle on HTTP Headers, Session Data and Config Variables.
          • diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index fdeae0ee..51d11c9f 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -132,7 +132,7 @@

          Explanation of Values:

        • cache_on - TRUE/FALSE (boolean) - Whether database query caching is enabled, see also Database Caching Class.
        • cachedir - The absolute server path to your database query cache directory.
        • char_set - The character set used in communicating with the database.
          • -
        • dbcollat - The character collation used in communicating with the database.
          • +
        • dbcollat - The character collation used in communicating with the database.

          Note: For MySQL and MySQLi databases, this setting is only used as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7. There is an incompatibility in PHP with mysql_real_escape_string() which can make your site vulnerable to SQL injection if you are using a multi-byte character set and are running versions lower than these. Sites using Latin-1 or UTF-8 database character set and collation are unaffected.

        • swap_pre - A default table prefix that should be swapped with dbprefix. This is useful for distributed applications where you might run manually written queries, and need the prefix to still be customizable by the end user.
        • autoinit - Whether or not to automatically connect to the database when the library loads. If set to false, the connection will take place prior to executing the first query.
        • stricton - TRUE/FALSE (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL while developing an application.
          • From f5c840241084e03d49e521bfcb62d2adbe9fce7d Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 19 Apr 2011 17:13:03 -0500 Subject: [PATCH 2464/2544] Altering the loader to be able to load views from packages when adding the package path with add_package_path(). --- system/core/Controller.php | 2 +- system/core/Loader.php | 110 +++++++++++++++++++------------------ 2 files changed, 59 insertions(+), 53 deletions(-) diff --git a/system/core/Controller.php b/system/core/Controller.php index 469663f0..fd9c8b58 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -50,7 +50,7 @@ public function __construct() $this->load->_base_classes =& is_loaded(); - $this->load->_ci_autoloader(); + $this->load->ci_autoloader(); log_message('debug', "Controller Class Initialized"); diff --git a/system/core/Loader.php b/system/core/Loader.php index 59415b72..8146cd56 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -30,8 +30,8 @@ class CI_Loader { // All these are set automatically. Don't mess with them. var $_ci_ob_level; - var $_ci_view_path = ''; - var $_ci_library_paths = array(); + var $_ci_view_paths = array(); + protected $_ci_library_paths = array(); var $_ci_model_paths = array(); var $_ci_helper_paths = array(); var $_base_classes = array(); // Set by the controller class @@ -47,17 +47,15 @@ class CI_Loader { * Constructor * * Sets the path to the view files and gets the initial output buffering level - * - * @access public */ - function __construct() + public function __construct() { - $this->_ci_view_path = APPPATH.'views/'; $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"); } @@ -107,13 +105,12 @@ function library($library = '', $params = NULL, $object_name = NULL) * * This function lets users load and instantiate models. * - * @access public * @param string the name of the class * @param string name for the model * @param bool database connection * @return void */ - function model($model, $name = '', $db_conn = FALSE) + public function model($model, $name = '', $db_conn = FALSE) { if (is_array($model)) { @@ -200,13 +197,12 @@ function model($model, $name = '', $db_conn = FALSE) /** * Database Loader * - * @access public * @param string the DB credentials * @param bool whether to return the DB object * @param bool whether to enable active record (this allows us to override the config setting) * @return object */ - function database($params = '', $return = FALSE, $active_record = NULL) + public function database($params = '', $return = FALSE, $active_record = NULL) { // Grab the super object $CI =& get_instance(); @@ -237,10 +233,9 @@ function database($params = '', $return = FALSE, $active_record = NULL) /** * Load the Utilities Class * - * @access public * @return string */ - function dbutil() + public function dbutil() { if ( ! class_exists('CI_DB')) { @@ -265,10 +260,9 @@ function dbutil() /** * Load the Database Forge Class * - * @access public * @return string */ - function dbforge() + public function dbforge() { if ( ! class_exists('CI_DB')) { @@ -297,13 +291,12 @@ function dbforge() * some cases it's advantageous to be able to return data so that * a developer can process it in some way. * - * @access public * @param string * @param array * @param bool * @return void */ - function view($view, $vars = array(), $return = FALSE) + public function view($view, $vars = array(), $return = FALSE) { return $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_object_to_array($vars), '_ci_return' => $return)); } @@ -315,12 +308,11 @@ function view($view, $vars = array(), $return = FALSE) * * This is a generic file loader * - * @access public * @param string * @param bool * @return string */ - function file($path, $return = FALSE) + public function file($path, $return = FALSE) { return $this->_ci_load(array('_ci_path' => $path, '_ci_return' => $return)); } @@ -333,11 +325,10 @@ function file($path, $return = FALSE) * Once variables are set they become available within * the controller class and its "view" files. * - * @access public * @param array * @return void */ - function vars($vars = array(), $val = '') + public function vars($vars = array(), $val = '') { if ($val != '' AND is_string($vars)) { @@ -362,11 +353,10 @@ function vars($vars = array(), $val = '') * * This function loads the specified helper file. * - * @access public * @param mixed * @return void */ - function helper($helpers = array()) + public function helper($helpers = array()) { foreach ($this->_ci_prep_filename($helpers, '_helper') as $helper) { @@ -424,11 +414,10 @@ function helper($helpers = array()) * This is simply an alias to the above function in case the * user has written the plural form of this function. * - * @access public * @param array * @return void */ - function helpers($helpers = array()) + public function helpers($helpers = array()) { $this->helper($helpers); } @@ -438,12 +427,11 @@ function helpers($helpers = array()) /** * Loads a language file * - * @access public * @param array * @param string * @return void */ - function language($file = array(), $lang = '') + public function language($file = array(), $lang = '') { $CI =& get_instance(); @@ -463,11 +451,10 @@ function language($file = array(), $lang = '') /** * Loads a config file * - * @access public * @param string * @return void */ - function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) + public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) { $CI =& get_instance(); $CI->config->load($file, $use_sections, $fail_gracefully); @@ -485,7 +472,7 @@ function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) * @param string an optional object name * @return void */ - function driver($library = '', $params = NULL, $object_name = NULL) + public function driver($library = '', $params = NULL, $object_name = NULL) { if ( ! class_exists('CI_Driver_Library')) { @@ -510,18 +497,20 @@ function driver($library = '', $params = NULL, $object_name = NULL) * * Prepends a parent path to the library, model, helper, and config path arrays * - * @access public * @param string + * @param boolean * @return void */ - function add_package_path($path) + 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); + $this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths; + // Add config file path $config =& $this->_ci_get_component('config'); array_unshift($config->_config_paths, $path); @@ -534,11 +523,10 @@ function add_package_path($path) * * Return a list of all package paths, by default it will ignore BASEPATH. * - * @access public * @param string * @return void */ - function get_package_paths($include_base = FALSE) + public function get_package_paths($include_base = FALSE) { return $include_base === TRUE ? $this->_ci_library_paths : $this->_ci_model_paths; } @@ -551,11 +539,10 @@ function get_package_paths($include_base = FALSE) * Remove a path from the library, model, and helper path arrays if it exists * If no path is provided, the most recently added path is removed. * - * @access public * @param type * @return type */ - function remove_package_path($path = '', $remove_config_path = TRUE) + public function remove_package_path($path = '', $remove_config_path = TRUE) { $config =& $this->_ci_get_component('config'); @@ -564,12 +551,12 @@ function remove_package_path($path = '', $remove_config_path = TRUE) $void = array_shift($this->_ci_library_paths); $void = array_shift($this->_ci_model_paths); $void = array_shift($this->_ci_helper_paths); + $void = array_shift($this->_ci_view_paths); $void = array_shift($config->_config_paths); } else { $path = rtrim($path, '/').'/'; - foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var) { if (($key = array_search($path, $this->{$var})) !== FALSE) @@ -577,6 +564,11 @@ 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/']); + } if (($key = array_search($path, $config->_config_paths)) !== FALSE) { @@ -588,6 +580,7 @@ function remove_package_path($path = '', $remove_config_path = TRUE) $this->_ci_library_paths = array_unique(array_merge($this->_ci_library_paths, array(APPPATH, BASEPATH))); $this->_ci_helper_paths = array_unique(array_merge($this->_ci_helper_paths, array(APPPATH, BASEPATH))); $this->_ci_model_paths = array_unique(array_merge($this->_ci_model_paths, array(APPPATH))); + $this->_ci_view_paths = array_merge($this->_ci_view_paths, array(APPPATH.'views/' => TRUE)); $config->_config_paths = array_unique(array_merge($config->_config_paths, array(APPPATH))); } @@ -600,24 +593,39 @@ function remove_package_path($path = '', $remove_config_path = TRUE) * Variables are prefixed with _ci_ to avoid symbol collision with * variables made available to view files * - * @access private * @param array * @return void */ - function _ci_load($_ci_data) + protected function _ci_load($_ci_data) { // Set the default data variables foreach (array('_ci_view', '_ci_vars', '_ci_path', '_ci_return') as $_ci_val) { $$_ci_val = ( ! isset($_ci_data[$_ci_val])) ? FALSE : $_ci_data[$_ci_val]; } + + $file_exists = FALSE; // Set the path to the requested file if ($_ci_path == '') { $_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION); $_ci_file = ($_ci_ext == '') ? $_ci_view.'.php' : $_ci_view; - $_ci_path = $this->_ci_view_path.$_ci_file; + + foreach ($this->_ci_view_paths as $view_file => $cascade) + { + if (file_exists($view_file.$_ci_file)) + { + $_ci_path = $view_file.$_ci_file; + $file_exists = TRUE; + break; + } + + if ( ! $cascade) + { + break; + } + } } else { @@ -625,7 +633,7 @@ function _ci_load($_ci_data) $_ci_file = end($_ci_x); } - if ( ! file_exists($_ci_path)) + if ( ! $file_exists && ! file_exists($_ci_path)) { show_error('Unable to load the requested file: '.$_ci_file); } @@ -721,13 +729,12 @@ function _ci_load($_ci_data) * * This function loads the requested class. * - * @access private * @param string the item that is being loaded * @param mixed any additional parameters * @param string an optional object name * @return void */ - function _ci_load_class($class, $params = NULL, $object_name = NULL) + protected function _ci_load_class($class, $params = NULL, $object_name = NULL) { // Get the class name, and while we're at it trim any slashes. // The directory path can be included as part of the class name, @@ -959,11 +966,13 @@ function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NU * The config/autoload.php file contains an array that permits sub-systems, * libraries, and helpers to be loaded automatically. * - * @access private + * 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 * @return void */ - function _ci_autoloader() + public function ci_autoloader() { if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php')) { @@ -1046,11 +1055,10 @@ function _ci_autoloader() * * Takes an object as input and converts the class variables to array key/vals * - * @access private * @param object * @return array */ - function _ci_object_to_array($object) + protected function _ci_object_to_array($object) { return (is_object($object)) ? get_object_vars($object) : $object; } @@ -1060,10 +1068,9 @@ function _ci_object_to_array($object) /** * Get a reference to a specific library or model * - * @access private * @return bool */ - function &_ci_get_component($component) + protected function &_ci_get_component($component) { $CI =& get_instance(); return $CI->$component; @@ -1076,11 +1083,10 @@ function &_ci_get_component($component) * * This function preps the name of various items to make loading them more reliable. * - * @access private * @param mixed * @return array */ - function _ci_prep_filename($filename, $extension) + protected function _ci_prep_filename($filename, $extension) { if ( ! is_array($filename)) { From b3e614d8b2293c079bcfb9cfdf071c041cbc4722 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Tue, 19 Apr 2011 20:19:17 -0500 Subject: [PATCH 2465/2544] Change in core/Security.php to match coding standards. --- system/core/Security.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/core/Security.php b/system/core/Security.php index 4f91572e..3617cadc 100644 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -68,7 +68,8 @@ public function __construct() } // Append application specific cookie prefix - if (config_item('cookie_prefix')) { + if (config_item('cookie_prefix')) + { $this->_csrf_cookie_name = config_item('cookie_prefix').$this->_csrf_cookie_name; } From 0c9ee4a348a9e0c9ee6d6c0085e463e098e453f4 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 20 Apr 2011 09:40:17 -0500 Subject: [PATCH 2466/2544] Refactoring the loader to set protected class variables. Moved _ci_autoload(), which is used in CI_Controller to be a public method. Also added CI_Loader::set_base_classes() to be called in the controller so we're not setting protected vars in another class. Also refactored in the form_helper so it's not trying to access protected vars in CI_Loader. Added the is_loaded() method to the loader to take care of the checks that were being done there. --- system/core/Controller.php | 7 +--- system/core/Loader.php | 75 +++++++++++++++++++++++++--------- system/helpers/form_helper.php | 24 +++++------ 3 files changed, 69 insertions(+), 37 deletions(-) diff --git a/system/core/Controller.php b/system/core/Controller.php index fd9c8b58..ec86b792 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -48,12 +48,9 @@ public function __construct() $this->load =& load_class('Loader', 'core'); - $this->load->_base_classes =& is_loaded(); - - $this->load->ci_autoloader(); - + $this->load->set_base_classes()->ci_autoloader(); + log_message('debug', "Controller Class Initialized"); - } public static function &get_instance() diff --git a/system/core/Loader.php b/system/core/Loader.php index 8146cd56..a52ef288 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -29,19 +29,19 @@ class CI_Loader { // All these are set automatically. Don't mess with them. - var $_ci_ob_level; - var $_ci_view_paths = array(); + protected $_ci_ob_level; + protected $_ci_view_paths = array(); protected $_ci_library_paths = array(); - var $_ci_model_paths = array(); - var $_ci_helper_paths = array(); - var $_base_classes = array(); // Set by the controller class - var $_ci_cached_vars = array(); - var $_ci_classes = array(); - var $_ci_loaded_files = array(); - var $_ci_models = array(); - var $_ci_helpers = array(); - var $_ci_varmap = array('unit_test' => 'unit', 'user_agent' => 'agent'); - + protected $_ci_model_paths = array(); + protected $_ci_helper_paths = array(); + protected $_base_classes = array(); // Set by the controller class + protected $_ci_cached_vars = array(); + protected $_ci_classes = array(); + protected $_ci_loaded_files = array(); + protected $_ci_models = array(); + protected $_ci_helpers = array(); + protected $_ci_varmap = array('unit_test' => 'unit', + 'user_agent' => 'agent'); /** * Constructor @@ -59,6 +59,47 @@ public function __construct() log_message('debug', "Loader Class Initialized"); } + // -------------------------------------------------------------------- + + /** + * Set _base_classes variable + * + * This method is called once in CI_Controller. + * + * @param array + * @return object + */ + public function set_base_classes() + { + $this->_base_classes =& is_loaded(); + + return $this; + } + + // -------------------------------------------------------------------- + + /** + * Is Loaded + * + * A utility function to test if a class is in the self::$_ci_classes array. + * This function returns the object name if the class tested for is loaded, + * and returns FALSE if it isn't. + * + * It is mainly used in the form_helper -> _get_validation_object() + * + * @param string class being checked for + * @return mixed class object name on the CI SuperObject or FALSE + */ + public function is_loaded($class) + { + if (isset($this->_ci_classes[$class])) + { + return $this->_ci_classes[$class]; + } + + return FALSE; + } + // -------------------------------------------------------------------- /** @@ -67,13 +108,12 @@ public function __construct() * This function lets users load and instantiate classes. * It is designed to be called from a user's app controllers. * - * @access public * @param string the name of the class * @param mixed the optional parameters * @param string an optional object name * @return void */ - function library($library = '', $params = NULL, $object_name = NULL) + public function library($library = '', $params = NULL, $object_name = NULL) { if (is_array($library)) { @@ -856,13 +896,12 @@ protected function _ci_load_class($class, $params = NULL, $object_name = NULL) /** * Instantiates a class * - * @access private * @param string * @param string * @param string an optional object name * @return null */ - function _ci_init_class($class, $prefix = '', $config = FALSE, $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 if ($config === NULL) @@ -1102,9 +1141,7 @@ protected function _ci_prep_filename($filename, $extension) return $filename; } } - - } /* End of file Loader.php */ -/* Location: ./system/core/Loader.php */ +/* Location: ./system/core/Loader.php */ \ No newline at end of file diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index a5cd97b8..51a9c6ca 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -1032,22 +1032,20 @@ function &_get_validation_object() { $CI =& get_instance(); - // We set this as a variable since we're returning by reference + // We set this as a variable since we're returning by reference. $return = FALSE; - - if ( ! isset($CI->load->_ci_classes) OR ! isset($CI->load->_ci_classes['form_validation'])) - { - return $return; - } - - $object = $CI->load->_ci_classes['form_validation']; - - if ( ! isset($CI->$object) OR ! is_object($CI->$object)) + + if ( ! ($object = $CI->load->is_loaded('form_validation'))) { - return $return; + if ( ! isset($CI->$object) OR ! is_object($CI->$object)) + { + return $return; + } + + return $CI->$object; } - - return $CI->$object; + + return $return; } } From e08c527aa0a8a05836b05763d859eb3d2970f62f Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 20 Apr 2011 09:54:47 -0500 Subject: [PATCH 2467/2544] Updating Documentation on package view loading --- user_guide/libraries/loader.html | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 42f8cf94..1d93af5e 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -231,17 +231,22 @@

          $this->load->remove_package_path()

          Package view files

          -

          @todo - package view file interface is not complete. It can be experimentally used by first saving the Loader's original view path, setting the view path to the package's view path, and when finished, setting back to the original view path.

          - -// ... save the original view path, and set to our Foo Bar package view folder
          -$orig_view_path = $this->load->_ci_view_path;
          -$this->load->_ci_view_path = APPPATH.'third_party/foo_bar/views/';
          -
          -// ... code using the package's view files
          -
          -// ... then return the view path to the application's original view path
          -$this->load->_ci_view_path = $orig_view_path;           +

          By Default, package view files paths are set when add_package_path() is called. View paths are looped through, and once a match is encountered that view is loaded.

          +

          In this instance, it is possible for view naming collisions within packages to occur, and possibly the incorrect package being loaded. To ensure against this, set an optional second parameter of FALSE when calling add_package_path().

          + +$this->load->add_package_path(APPPATH.'my_app', TRUE);
          +$this->load->view('my_app_index'); // Loads
          +$this->load->view('welcome_message'); // Will not load the default welcome_message b/c the second param to add_package_path is TRUE
          +
          +// Reset things
          +$this->load->remove_package_path(APPPATH.'my_app');
          +
          +// Again without the second parameter:
          +$this->load->add_package_path(APPPATH.'my_app', TRUE);
          +$this->load->view('my_app_index'); // Loads
          +$this->load->view('welcome_message'); // Loads
          +           From 1cdb0fd21e0c5ac38a75712806ed10b08f0909cc Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 20 Apr 2011 11:11:47 -0500 Subject: [PATCH 2468/2544] Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request. --- application/errors/error_404.php | 58 ++++++++++---- application/errors/error_db.php | 58 ++++++++++---- application/errors/error_general.php | 58 ++++++++++---- application/views/welcome_message.php | 108 ++++++++++++++++---------- user_guide/changelog.html | 1 + 5 files changed, 196 insertions(+), 87 deletions(-) diff --git a/application/errors/error_404.php b/application/errors/error_404.php index a304f456..792726a6 100644 --- a/application/errors/error_404.php +++ b/application/errors/error_404.php @@ -1,32 +1,60 @@ - + + 404 Page Not Found -
          +

          diff --git a/application/errors/error_db.php b/application/errors/error_db.php index 181de960..b396cda9 100644 --- a/application/errors/error_db.php +++ b/application/errors/error_db.php @@ -1,32 +1,60 @@ - + + Database Error -
          +

          diff --git a/application/errors/error_general.php b/application/errors/error_general.php index 7734d34c..fd63ce2c 100644 --- a/application/errors/error_general.php +++ b/application/errors/error_general.php @@ -1,32 +1,60 @@ - + + Error -
          +

          diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php index ca68fc10..0bf5a8d2 100644 --- a/application/views/welcome_message.php +++ b/application/views/welcome_message.php @@ -4,61 +4,85 @@ Welcome to CodeIgniter - + code { + font-family: Consolas, Monaco, Courier New, Courier, monospace; + font-size: 12px; + background-color: #f9f9f9; + border: 1px solid #D0D0D0; + color: #002166; + display: block; + margin: 14px 0 14px 0; + padding: 12px 10px 12px 10px; + } + + #body{ + margin: 0 15px 0 15px; + } + + p.footer{ + text-align: right; + font-size: 11px; + border-top: 1px solid #D0D0D0; + line-height: 32px; + padding: 0 10px 0 10px; + margin: 20px 0 0 0; + } + + #container{ + margin: 10px; + border: 1px solid #D0D0D0; + -webkit-box-shadow: 0 0 8px #D0D0D0; + } + -

          Welcome to CodeIgniter!

          - -

          The page you are looking at is being generated dynamically by CodeIgniter.

          +
          +

          Welcome to CodeIgniter!

          -

          If you would like to edit this page you'll find it located at:

          -application/views/welcome_message.php +
          +

          The page you are looking at is being generated dynamically by CodeIgniter.

          -

          The corresponding controller for this page is found at:

          -application/controllers/welcome.php +

          If you would like to edit this page you'll find it located at:

          + application/views/welcome_message.php -

          If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.

          +

          The corresponding controller for this page is found at:

          + application/controllers/welcome.php +

          If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.

          +
          -


          Page rendered in {elapsed_time} seconds

          +

          Page rendered in {elapsed_time} seconds

          +
          \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b889152a..bbdbbbd1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -71,6 +71,7 @@

          Version 2.0.3

          • Added Session Class userdata to the output profiler. Additionally, added a show/hide toggle on HTTP Headers, Session Data and Config Variables.
          • Removed internal usage of the EXT constant.
            • +
          • Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request.
        • Helpers From 882b76bda8b701a8718960b8d639f060ae79e998 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 20 Apr 2011 11:22:09 -0500 Subject: [PATCH 2469/2544] Fixed a bug (Reactor #231) where Sessions Library database table example SQL did not contain an index on last_activity. See Upgrade Notes Fixed a bug (Reactor #229) where the Sessions Library example SQL in the documentation contained incorrect SQL. --- user_guide/changelog.html | 4 +++- user_guide/installation/upgrade_203.html | 10 ++++++++++ user_guide/libraries/sessions.html | 18 ++++++++++-------- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index bbdbbbd1..70db33d4 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -78,7 +78,7 @@

          Version 2.0.3

          • Added an optional third parameter to heading() which allows adding html attributes to the rendered heading tag.
          -
          • +

        Bug fixes for 2.0.3

        @@ -86,6 +86,8 @@

        Bug fixes for 2.0.3

      • Added ENVIRONMENT to reserved constants. (Reactor #196)
      • Changed server check to ensure SCRIPT_NAME is defined. (Reactor #57)
      • Removed APPPATH.'third_party' from the packages autoloader to negate needless file stats if no packages exist or if the developer does not load any other packages by default.
        • +
      • Fixed a bug (Reactor #231) where Sessions Library database table example SQL did not contain an index on last_activity. See Upgrade Notes.
        • +
      • Fixed a bug (Reactor #229) where the Sessions Library example SQL in the documentation contained incorrect SQL.

      Version 2.0.2

      diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html index 38cfb72c..d7c0fae3 100644 --- a/user_guide/installation/upgrade_203.html +++ b/user_guide/installation/upgrade_203.html @@ -94,6 +94,16 @@

      Step 6: Remove APPPATH.'third_party' from autoload.php

      Which should provide for nominal performance gains if not autoloading packages.

      +

      Update Sessions Database Tables

      + +

      If you are using database sessions with the CI Session Library, please update your ci_sessions database table as follows:

      + + + CREATE INDEX last_activity_idx ON ci_sessions(last_activity); + + + + diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 8d9c14eb..6048f480 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -218,15 +218,17 @@

      Saving Session Data to a Database

      In order to store sessions, you must first create a database table for this purpose. Here is the basic prototype (for MySQL) required by the session class:

      - + session_id varchar(40) DEFAULT '0' NOT NULL, + ip_address varchar(16) DEFAULT '0' NOT NULL, + user_agent varchar(50) NOT NULL, + last_activity int(10) unsigned DEFAULT 0 NOT NULL, + user_data text NOT NULL, + PRIMARY KEY (session_id), + KEY `last_activity_idx` (`last_activity`) +); +

      Note: By default the table is called ci_sessions, but you can name it anything you want as long as you update the application/config/config.php file so that it contains the name you have chosen. From 50671cf8d67c805692fec49eda33d21227a21ec2 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 20 Apr 2011 11:36:45 -0500 Subject: [PATCH 2470/2544] Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.sess_match_useragent == TRUE AND trim($session['user_agent']) != trim(substr($this->CI->input->user_agent(), 0, 50))) + if ($this->sess_match_useragent == TRUE AND trim($session['user_agent']) != trim(substr($this->CI->input->user_agent(), 0, 120))) { $this->sess_destroy(); return FALSE; @@ -316,7 +316,7 @@ function sess_create() $this->userdata = array( 'session_id' => md5(uniqid($sessid, TRUE)), 'ip_address' => $this->CI->input->ip_address(), - 'user_agent' => substr($this->CI->input->user_agent(), 0, 50), + 'user_agent' => substr($this->CI->input->user_agent(), 0, 120), 'last_activity' => $this->now ); diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 70db33d4..7ff71d07 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -79,6 +79,11 @@

      Version 2.0.3

    51. Added an optional third parameter to heading() which allows adding html attributes to the rendered heading tag.
      52. +
    52. Libraries +
        +
      • Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.
        • +
      +

      53. Bug fixes for 2.0.3

      diff --git a/user_guide/installation/upgrade_203.html b/user_guide/installation/upgrade_203.html index d7c0fae3..7dbc907e 100644 --- a/user_guide/installation/upgrade_203.html +++ b/user_guide/installation/upgrade_203.html @@ -98,8 +98,9 @@

      Update Sessions Database Tables

      If you are using database sessions with the CI Session Library, please update your ci_sessions database table as follows:

      - + CREATE INDEX last_activity_idx ON ci_sessions(last_activity); + ALTER TABLE ci_sessions MODIFY user_agent VARCHAR(120); diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 6048f480..a6f3c601 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -222,7 +222,7 @@

      Saving Session Data to a Database

      CREATE TABLE IF NOT EXISTS `ci_sessions` ( session_id varchar(40) DEFAULT '0' NOT NULL, ip_address varchar(16) DEFAULT '0' NOT NULL, - user_agent varchar(50) NOT NULL, + user_agent varchar(120) NOT NULL, last_activity int(10) unsigned DEFAULT 0 NOT NULL, user_data text NOT NULL, PRIMARY KEY (session_id), From fc779cef54a5cefc3f0d7f404a408a935d717966 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 20 Apr 2011 12:25:17 -0500 Subject: [PATCH 2471/2544] Fix #224 Error in primary index.php $routing instructions --- index.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index a8d58b2d..f4ac11a7 100644 --- a/index.php +++ b/index.php @@ -98,7 +98,7 @@ // if your controller is not in a sub-folder within the "controllers" folder // $routing['directory'] = ''; - // The controller class file name. Example: Mycontroller.php + // The controller class file name. Example: Mycontroller // $routing['controller'] = ''; // The controller function you wish to be called. diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7ff71d07..7ad56673 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -69,6 +69,7 @@

      Version 2.0.3

    53. General Changes -

      All three major image libraries are supported: GD/GD2, NetPBM, and ImageMagick

      +

      All three major image libraries are supported: GD/GD2, NetPBM, and ImageMagick

      Note: Watermarking is only available using the GD/GD2 library. In addition, even though other libraries are supported, GD is required in -order for the script to calculate the image properties. The image processing, however, will be performed with the +order for the script to calculate the image properties. The image processing, however, will be performed with the library you specify.

      @@ -82,14 +82,14 @@

      Initializing the Class

      using the $this->load->library function:

      $this->load->library('image_lib'); -

      Once the library is loaded it will be ready for use. The image library object you will use to call all functions is: $this->image_lib

      +

      Once the library is loaded it will be ready for use. The image library object you will use to call all functions is: $this->image_lib

      Processing an Image

      Regardless of the type of processing you would like to perform (resizing, cropping, rotation, or watermarking), the general process is identical. You will set some preferences corresponding to the action you intend to perform, then -call one of four available processing functions. For example, to create an image thumbnail you'll do this:

      +call one of four available processing functions. For example, to create an image thumbnail you'll do this:

      $config['image_library'] = 'gd2';
      $config['source_image'] = '/path/to/image/mypic.jpg';
      @@ -106,7 +106,7 @@

      Processing an Image

      The above code tells the image_resize function to look for an image called mypic.jpg located in the source_image folder, then create a thumbnail that is 75 X 50 pixels using the GD2 image_library. Since the maintain_ratio option is enabled, the thumb will be as close to the target width and -height as possible while preserving the original aspect ratio. The thumbnail will be called mypic_thumb.jpg +height as possible while preserving the original aspect ratio. The thumbnail will be called mypic_thumb.jpg

      Note: In order for the image class to be allowed to do any processing, the @@ -126,7 +126,7 @@

      Processing Functions

    54. $this->image_lib->clear()
      55. -

      These functions return boolean TRUE upon success and FALSE for failure. If they fail you can retrieve the +

      These functions return boolean TRUE upon success and FALSE for failure. If they fail you can retrieve the error message using this function:

      echo $this->image_lib->display_errors(); @@ -138,7 +138,7 @@

      Processing Functions

          echo $this->image_lib->display_errors();
      }       -

      Note: You can optionally specify the HTML formatting to be applied to the errors, by submitting the opening/closing +

      Note: You can optionally specify the HTML formatting to be applied to the errors, by submitting the opening/closing tags in the function, like this:

      $this->image_lib->display_errors('<p>', '</p>'); @@ -146,11 +146,11 @@

      Processing Functions

      Preferences

      -

      The preferences described below allow you to tailor the image processing to suit your needs.

      +

      The preferences described below allow you to tailor the image processing to suit your needs.

      Note that not all preferences are available for every -function. For example, the x/y axis preferences are only available for image cropping. Likewise, the width and height -preferences have no effect on cropping. The "availability" column indicates which functions support a given preference.

      +function. For example, the x/y axis preferences are only available for image cropping. Likewise, the width and height +preferences have no effect on cropping. The "availability" column indicates which functions support a given preference.

      Availability Legend:

      @@ -187,7 +187,7 @@

      Preferences

      library_path None None -Sets the server path to your ImageMagick or NetPBM library. If you use either of those libraries you must supply the path. +Sets the server path to your ImageMagick or NetPBM library. If you use either of those libraries you must supply the path. R, C, X @@ -195,7 +195,7 @@

      Preferences

      source_image None None -Sets the source image name/path. The path must be a relative or absolute server path, not a URL. +Sets the source image name/path. The path must be a relative or absolute server path, not a URL. R, C, S, W @@ -203,7 +203,7 @@

      Preferences

      dynamic_output FALSE TRUE/FALSE (boolean) -Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers. +Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers. R, C, X, W @@ -221,7 +221,7 @@

      Preferences

      new_image None None -Sets the destination image name/path. You'll use this preference when creating an image copy. The path must be a relative or absolute server path, not a URL. +Sets the destination image name/path. You'll use this preference when creating an image copy. The path must be a relative or absolute server path, not a URL. R, C, X, W @@ -253,7 +253,7 @@

      Preferences

      thumb_marker _thumb None -Specifies the thumbnail indicator. It will be inserted just before the file extension, so mypic.jpg would become mypic_thumb.jpg +Specifies the thumbnail indicator. It will be inserted just before the file extension, so mypic.jpg would become mypic_thumb.jpg R @@ -281,7 +281,7 @@

      Preferences

      rotation_angle None 90, 180, 270, vrt, hor -Specifies the angle of rotation when rotating images. Note that PHP rotates counter-clockwise, so a 90 degree rotation to the right must be specified as 270. +Specifies the angle of rotation when rotating images. Note that PHP rotates counter-clockwise, so a 90 degree rotation to the right must be specified as 270. X @@ -306,7 +306,7 @@

      Preferences

      Setting preferences in a config file

      If you prefer not to set preferences using the above method, you can instead put them into a config file. -Simply create a new file called image_lib.php, add the $config +Simply create a new file called image_lib.php, add the $config array in that file. Then save the file in: config/image_lib.php and it will be used automatically. You will NOT need to use the $this->image_lib->initialize function if you save your preferences in a config file.

      @@ -319,7 +319,7 @@

      $this->image_lib->resize()

      For practical purposes there is no difference between creating a copy and creating a thumbnail except a thumb will have the thumbnail marker as part of the name (ie, mypic_thumb.jpg).

      -

      All preferences listed in the table above are available for this function except these three: rotation_angle, x_axis, and y_axis.

      +

      All preferences listed in the table above are available for this function except these three: rotation_angle, x_axis, and y_axis.

      Creating a Thumbnail

      @@ -358,7 +358,7 @@

      $this->image_lib->crop()

      $config['x_axis'] = '100';
      $config['y_axis'] = '40';       -

      All preferences listed in the table above are available for this function except these: rotation_angle, width, height, create_thumb, new_image.

      +

      All preferences listed in the table above are available for this function except these: rotation_angle, width, height, create_thumb, new_image.

      Here's an example showing how you might crop an image:

      @@ -378,8 +378,8 @@

      $this->image_lib->crop()

      Note: Without a visual interface it is difficult to crop images, so this function is not very useful -unless you intend to build such an interface. That's exactly what we did using for the photo -gallery module in ExpressionEngine, the CMS we develop. We added a JavaScript UI that lets the cropping +unless you intend to build such an interface. That's exactly what we did using for the photo +gallery module in ExpressionEngine, the CMS we develop. We added a JavaScript UI that lets the cropping area be selected.

      $this->image_lib->rotate()

      @@ -443,7 +443,7 @@

      Watermarking an Image

      Just as with the other functions (resizing, cropping, and rotating) the general process for watermarking involves setting the preferences corresponding to the action you intend to perform, then -calling the watermark function. Here is an example:

      +calling the watermark function. Here is an example:

      $config['source_image'] = '/path/to/image/mypic.jpg';
      @@ -452,9 +452,9 @@

      Watermarking an Image

      $config['wm_font_path'] = './system/fonts/texb.ttf';
      $config['wm_font_size'] = '16';
      $config['wm_font_color'] = 'ffffff';
      -$config['wm_vrt_alignment'] = 'bottom';
      -$config['wm_hor_alignment'] = 'center';
      -$config['wm_padding'] = '20';
      +$config['wm_vrt_alignment'] = 'bottom';
      +$config['wm_hor_alignment'] = 'center';
      +$config['wm_padding'] = '20';

      $this->image_lib->initialize($config);
      @@ -462,7 +462,7 @@

      Watermarking an Image

      $this->image_lib->watermark();       -

      The above example will use a 16 pixel True Type font to create the text "Copyright 2006 - John Doe". The watermark +

      The above example will use a 16 pixel True Type font to create the text "Copyright 2006 - John Doe". The watermark will be positioned at the bottom/center of the image, 20 pixels from the bottom of the image.

      Note: In order for the image class to be allowed to do any processing, the image file must have "write" file permissions. For example, 777.

      @@ -491,14 +491,14 @@

      Watermarking Preferences

      source_image None None -Sets the source image name/path. The path must be a relative or absolute server path, not a URL. +Sets the source image name/path. The path must be a relative or absolute server path, not a URL. dynamic_output FALSE TRUE/FALSE (boolean) -Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers. +Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers. @@ -563,28 +563,28 @@

      Text Preferences

      wm_text None None -The text you would like shown as the watermark. Typically this will be a copyright notice. +The text you would like shown as the watermark. Typically this will be a copyright notice. wm_font_path None None -The server path to the True Type Font you would like to use. If you do not use this option, the native GD font will be used. +The server path to the True Type Font you would like to use. If you do not use this option, the native GD font will be used. wm_font_size 16 None -The size of the text. Note: If you are not using the True Type option above, the number is set using a range of 1 - 5. Otherwise, you can use any valid pixel size for the font you're using. +The size of the text. Note: If you are not using the True Type option above, the number is set using a range of 1 - 5. Otherwise, you can use any valid pixel size for the font you're using. wm_font_color ffffff None -The font color, specified in hex. Note, you must use the full 6 character hex value (ie, 993300), rather than the three character abbreviated version (ie fff). +The font color, specified in hex. Note, you must use the full 6 character hex value (ie, 993300), rather than the three character abbreviated version (ie fff). diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 08b8ab0d..6070b6c4 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -70,20 +70,20 @@

      Input Class

      Security Filtering

      -

      The security filtering function is called automatically when a new controller is invoked. It does the following:

      +

      The security filtering function is called automatically when a new controller is invoked. It does the following:

        -
      • Destroys the global GET array. Since CodeIgniter does not utilize GET strings, there is no reason to allow it.
        • +
      • Destroys the global GET array. Since CodeIgniter does not utilize GET strings, there is no reason to allow it.
      • Destroys all global variables in the event register_globals is turned on.
      • Filters the POST/COOKIE array keys, permitting only alpha-numeric (and a few other) characters.
        • -
      • Provides XSS (Cross-site Scripting Hacks) filtering. This can be enabled globally, or upon request.
        • +
      • Provides XSS (Cross-site Scripting Hacks) filtering. This can be enabled globally, or upon request.
      • Standardizes newline characters to \n

      XSS Filtering

      -

      The Input class has the ability to filter input automatically to prevent cross-site scripting attacks. If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your +

      The Input class has the ability to filter input automatically to prevent cross-site scripting attacks. If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your application/config/config.php file and setting this:

      $config['global_xss_filtering'] = TRUE; @@ -93,9 +93,9 @@

      XSS Filtering

      Using POST, COOKIE, or SERVER Data

      -

      CodeIgniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided +

      CodeIgniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided functions rather than fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and -return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first. +return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first. In other words, normally you might do something like this:

      @@ -128,7 +128,7 @@

      $this->input->post()

      The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

      -

      The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

      +

      The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

      $this->input->post('some_data', TRUE); @@ -179,7 +179,7 @@

      $this->input->server()

      $this->input->set_cookie()

      -

      Sets a cookie containing the values you specify. There are two ways to pass information to this function so that a cookie can be set: +

      Sets a cookie containing the values you specify. There are two ways to pass information to this function so that a cookie can be set: Array Method, and Discrete Parameters:

      Array Method

      @@ -203,10 +203,10 @@

      Array Method

      Only the name and value are required. To delete a cookie set it with the expiration blank.

      -

      The expiration is set in seconds, which will be added to the current time. Do not include the time, but rather only the -number of seconds from now that you wish the cookie to be valid. If the expiration is set to +

      The expiration is set in seconds, which will be added to the current time. Do not include the time, but rather only the +number of seconds from now that you wish the cookie to be valid. If the expiration is set to zero the cookie will only last as long as the browser is open.

      -

      For site-wide cookies regardless of how your site is requested, add your URL to the domain starting with a period, like this: .your-domain.com

      +

      For site-wide cookies regardless of how your site is requested, add your URL to the domain starting with a period, like this: .your-domain.com

      The path is usually not needed since the function sets a root path.

      The prefix is only needed if you need to avoid name collisions with other identically named cookies for your server.

      The secure boolean is only needed if you want to make it a secure cookie by setting it to TRUE.

      @@ -219,25 +219,25 @@

      Discrete Parameters

      $this->input->cookie()

      -

      Lets you fetch a cookie. The first parameter will contain the name of the cookie you are looking for (including any prefixes):

      +

      Lets you fetch a cookie. The first parameter will contain the name of the cookie you are looking for (including any prefixes):

      cookie('some_cookie');

      The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

      -

      The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

      +

      The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

      cookie('some_cookie', TRUE);

      $this->input->ip_address()

      -

      Returns the IP address for the current user. If the IP address is not valid, the function will return an IP of: 0.0.0.0

      +

      Returns the IP address for the current user. If the IP address is not valid, the function will return an IP of: 0.0.0.0

      echo $this->input->ip_address();

      $this->input->valid_ip($ip)

      -

      Takes an IP address as input and returns TRUE or FALSE (boolean) if it is valid or not. Note: The $this->input->ip_address() function above +

      Takes an IP address as input and returns TRUE or FALSE (boolean) if it is valid or not. Note: The $this->input->ip_address() function above validates the IP automatically.

      if ( ! $this->input->valid_ip($ip))
      @@ -256,7 +256,7 @@

      $this->input->user_agent()

      See the User Agent Class for methods which extract information from the user agent string.

      $this->input->request_headers()

      -

      Useful if running in a non-Apache environment where apache_request_headers() will not be supported. Returns an array of headers.

      +

      Useful if running in a non-Apache environment where apache_request_headers() will not be supported. Returns an array of headers.

      $headers = $this->input->request_headers(); diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index 4e262279..cd3adf1d 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -65,11 +65,11 @@

      Initializing the Class

      $this->load->library('javascript'); -

      The Javascript class also accepts parameters, js_library_driver (string) default 'jquery' and autoload (bool) default TRUE. You may override the defaults if you wish by sending an associative array:

      +

      The Javascript class also accepts parameters, js_library_driver (string) default 'jquery' and autoload (bool) default TRUE. You may override the defaults if you wish by sending an associative array:

      $this->load->library('javascript', array('js_library_driver' => 'scripto', 'autoload' => FALSE)); -

      Again, presently only 'jquery' is available. You may wish to set autoload to FALSE, though, if you do not want the jQuery library to automatically include a script tag for the main jQuery script file. This is useful if you are loading it from a location outside of CodeIgniter, or already have the script tag in your markup.

      +

      Again, presently only 'jquery' is available. You may wish to set autoload to FALSE, though, if you do not want the jQuery library to automatically include a script tag for the main jQuery script file. This is useful if you are loading it from a location outside of CodeIgniter, or already have the script tag in your markup.

      Once loaded, the jQuery library object will be available using: $this->javascript

      Setup and Configuration

      @@ -93,7 +93,7 @@

      The jQuery Class

      $this->load->library('jquery'); -

      You may send an optional parameter to determine whether or not a script tag for the main jQuery file will be automatically included when loading the library. It will be created by default. To prevent this, load the library as follows:

      +

      You may send an optional parameter to determine whether or not a script tag for the main jQuery file will be automatically included when loading the library. It will be created by default. To prevent this, load the library as follows:

      $this->load->library('jquery', FALSE); @@ -115,7 +115,7 @@

      jQuery Events

      Effects

      -

      The query library supports a powerful Effects repertoire. Before an effect can be used, it must be loaded:

      +

      The query library supports a powerful Effects repertoire. Before an effect can be used, it must be loaded:

      $this->jquery->effect([optional path] plugin name); // for example @@ -125,8 +125,8 @@

      Effects

      hide() / show()

      Each of this functions will affect the visibility of an item on your page. hide() will set an item invisible, show() will reveal it.

      -

      $this->jquery->hide(target, optional speed, optional extra information);
      - $this->jquery->show(target, optional speed, optional extra information);

      +

      $this->jquery->hide(target, optional speed, optional extra information);
      + $this->jquery->show(target, optional speed, optional extra information);

      • "target" will be any valid jQuery selector or selectors.
        • @@ -162,8 +162,8 @@

        animate()

        fadeIn() / fadeOut()

        -

        $this->jquery->fadeIn(target, optional speed, optional extra information);
        - $this->jquery->fadeOut(target, optional speed, optional extra information);

        +

        $this->jquery->fadeIn(target, optional speed, optional extra information);
        + $this->jquery->fadeOut(target, optional speed, optional extra information);

        • "target" will be any valid jQuery selector or selectors.
        • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
          • @@ -182,8 +182,8 @@

          toggleClass()

          fadeIn() / fadeOut()

          These effects cause an element(s) to disappear or reappear over time.

          -

          $this->jquery->fadeIn(target, optional speed, optional extra information);
          - $this->jquery->fadeOut(target, optional speed, optional extra information);

          +

          $this->jquery->fadeIn(target, optional speed, optional extra information);
          + $this->jquery->fadeOut(target, optional speed, optional extra information);

          • "target" will be any valid jQuery selector or selectors.
          • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
            • @@ -193,9 +193,9 @@

            fadeIn() / fadeOut()

            slideUp() / slideDown() / slideToggle()

            These effects cause an element(s) to slide.

            -

            $this->jquery->slideUp(target, optional speed, optional extra information);
            - $this->jquery->slideDown(target, optional speed, optional extra information);
            -$this->jquery->slideToggle(target, optional speed, optional extra information);

            +

            $this->jquery->slideUp(target, optional speed, optional extra information);
            + $this->jquery->slideDown(target, optional speed, optional extra information);
            +$this->jquery->slideToggle(target, optional speed, optional extra information);

            • "target" will be any valid jQuery selector or selectors.
            • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
              • diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 75863c2a..1b253fa0 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -60,30 +60,30 @@

              Language Class

              The Language Class provides functions to retrieve language files and lines of text for purposes of internationalization.

              -

              In your CodeIgniter system folder you'll find one called language containing sets of language files. You can create +

              In your CodeIgniter system folder you'll find one called language containing sets of language files. You can create your own language files as needed in order to display error and other messages in other languages.

              -

              Language files are typically stored in your system/language directory. Alternately you can create a folder called language inside -your application folder and store them there. CodeIgniter will look first in your application/language -directory. If the directory does not exist or the specified language is not located there CI will instead look in your global +

              Language files are typically stored in your system/language directory. Alternately you can create a folder called language inside +your application folder and store them there. CodeIgniter will look first in your application/language +directory. If the directory does not exist or the specified language is not located there CI will instead look in your global system/language folder.

              -

              Note:  Each language should be stored in its own folder. For example, the English files are located at: +

              Note:  Each language should be stored in its own folder. For example, the English files are located at: system/language/english

              Creating Language Files

              -

              Language files must be named with _lang.php as the file extension. For example, let's say you want to create a file -containing error messages. You might name it: error_lang.php

              +

              Language files must be named with _lang.php as the file extension. For example, let's say you want to create a file +containing error messages. You might name it: error_lang.php

              Within the file you will assign each line of text to an array called $lang with this prototype:

              $lang['language_key'] = "The actual message to be shown";

              Note: It's a good practice to use a common prefix for all messages in a given file to avoid collisions with -similarly named items in other files. For example, if you are creating error messages you might prefix them with error_

              +similarly named items in other files. For example, if you are creating error messages you might prefix them with error_

              $lang['error_email_missing'] = "You must submit an email address";
              $lang['error_url_missing'] = "You must submit a URL";
              @@ -92,12 +92,12 @@

              Creating Language Files

              Loading A Language File

              -

              In order to fetch a line from a particular file you must load the file first. Loading a language file is done with the following code:

              +

              In order to fetch a line from a particular file you must load the file first. Loading a language file is done with the following code:

              $this->lang->load('filename', 'language');

              Where filename is the name of the file you wish to load (without the file extension), and language -is the language set containing it (ie, english). If the second parameter is missing, the default language set in your +is the language set containing it (ie, english). If the second parameter is missing, the default language set in your application/config/config.php file will be used.

              @@ -109,7 +109,7 @@

              Fetching a Line of Text

              Where language_key is the array key corresponding to the line you wish to show.

              -

              Note: This function simply returns the line. It does not echo it for you.

              +

              Note: This function simply returns the line. It does not echo it for you.

              Using language lines as form labels

              diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 1d93af5e..50ec60c1 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -58,7 +58,7 @@

              Loader Class

              -

              Loader, as the name suggests, is used to load elements. These elements can be libraries (classes) View files, +

              Loader, as the name suggests, is used to load elements. These elements can be libraries (classes) View files, Helpers, Models, or your own files.

              Note: This class is initialized automatically by the system so there is no need to do it manually.

              @@ -69,7 +69,7 @@

              Loader Class

              $this->load->library('class_name', $config, 'object name')

              -

              This function is used to load core classes. Where class_name is the name of the class you want to load. +

              This function is used to load core classes. Where class_name is the name of the class you want to load. Note: We use the terms "class" and "library" interchangeably.

              For example, if you would like to send email with CodeIgniter, the first step is to load the email class within your controller:

              @@ -96,7 +96,7 @@

              $this->load->library('class_name', $config, 'ob

              Setting options

              -

              The second (optional) parameter allows you to optionally pass configuration setting. You will typically pass these as an array:

              +

              The second (optional) parameter allows you to optionally pass configuration setting. You will typically pass these as an array:

              $config = array (
              @@ -113,7 +113,7 @@

              Setting options

              Assigning a Library to a different object name

              -

              If the third (optional) parameter is blank, the library will usually be assigned to an object with the same name as the library. For example, if the library is named Session, it +

              If the third (optional) parameter is blank, the library will usually be assigned to an object with the same name as the library. For example, if the library is named Session, it will be assigned to a variable named $this->session.

              If you prefer to set your own class names you can pass its value to the third parameter:

              @@ -131,20 +131,20 @@

              Assigning a Library to a different object name

              $this->load->view('file_name', $data, true/false)

              -

              This function is used to load your View files. If you haven't read the Views section of the +

              This function is used to load your View files. If you haven't read the Views section of the user guide it is recommended that you do since it shows you how this function is typically used.

              -

              The first parameter is required. It is the name of the view file you would like to load.  Note: The .php file extension does not need to be specified unless you use something other than .php.

              +

              The first parameter is required. It is the name of the view file you would like to load.  Note: The .php file extension does not need to be specified unless you use something other than .php.

              The second optional parameter can take an associative array or an object as input, which it runs through the PHP extract function to -convert to variables that can be used in your view files. Again, read the Views page to learn +convert to variables that can be used in your view files. Again, read the Views page to learn how this might be useful.

              The third optional parameter lets you change the behavior of the function so that it returns data as a string -rather than sending it to your browser. This can be useful if you want to process the data in some way. If you -set the parameter to true (boolean) it will return data. The default behavior is false, which sends it -to your browser. Remember to assign it to a variable if you want the data returned:

              +rather than sending it to your browser. This can be useful if you want to process the data in some way. If you +set the parameter to true (boolean) it will return data. The default behavior is false, which sends it +to your browser. Remember to assign it to a variable if you want the data returned:

              $string = $this->load->view('myfile', '', true); @@ -159,7 +159,7 @@

              $this->load->model('Model_name');


              $this->fubar->function();

              $this->load->database('options', true/false)

              -

              This function lets you load the database class. The two parameters are optional. Please see the +

              This function lets you load the database class. The two parameters are optional. Please see the database section for more info.

              @@ -168,9 +168,9 @@

              $this->load->database('options', true/false)

              $this->load->vars($array)

              This function takes an associative array as input and generates variables using the PHP extract function. -This function produces the same result as using the second parameter of the $this->load->view() function above. The reason you might +This function produces the same result as using the second parameter of the $this->load->view() function above. The reason you might want to use this function independently is if you would like to set some global variables in the constructor of your controller -and have them become available in any view file loaded from any function. You can have multiple calls to this function. The data get cached +and have them become available in any view file loaded from any function. You can have multiple calls to this function. The data get cached and merged into one array for conversion to variables.

              @@ -180,7 +180,7 @@

              $this->load->helper('file_name')

              $this->load->file('filepath/filename', true/false)

              -

              This is a generic file loading function. Supply the filepath and name in the first parameter and it will open and read the file. +

              This is a generic file loading function. Supply the filepath and name in the first parameter and it will open and read the file. By default the data is sent to your browser, just like a View file, but if you set the second parameter to true (boolean) it will instead return the data as a string.

              @@ -194,7 +194,7 @@

              $this->load->config('file_name')

              Application "Packages"

              -

              An application package allows for the easy distribution of complete sets of resources in a single directory, complete with its own libraries, models, helpers, config, and language files. It is recommended that these packages be placed in the application/third_party folder. Below is a sample map of an package directory

              +

              An application package allows for the easy distribution of complete sets of resources in a single directory, complete with its own libraries, models, helpers, config, and language files. It is recommended that these packages be placed in the application/third_party folder. Below is a sample map of an package directory

              Sample Package "Foo Bar" Directory Map

              @@ -210,18 +210,18 @@

              Sample Package "Foo Bar" Directory Map

              models/
               -

              Whatever the purpose of the "Foo Bar" application package, it has its own config files, helpers, language files, libraries, and models. To use these resources in your controllers, you first need to tell the Loader that you are going to be loading resources from a package, by adding the package path.

              +

              Whatever the purpose of the "Foo Bar" application package, it has its own config files, helpers, language files, libraries, and models. To use these resources in your controllers, you first need to tell the Loader that you are going to be loading resources from a package, by adding the package path.

              $this->load->add_package_path()

              -

              Adding a package path instructs the Loader class to prepend a given path for subsequent requests for resources. As an example, the "Foo Bar" application package above has a library named Foo_bar.php. In our controller, we'd do the following:

              +

              Adding a package path instructs the Loader class to prepend a given path for subsequent requests for resources. As an example, the "Foo Bar" application package above has a library named Foo_bar.php. In our controller, we'd do the following:

              $this->load->add_package_path(APPPATH.'third_party/foo_bar/');
              $this->load->library('foo_bar');

              $this->load->remove_package_path()

              -

              When your controller is finished using resources from an application package, and particularly if you have other application packages you want to work with, you may wish to remove the package path so the Loader no longer looks in that folder for resources. To remove the last path added, simply call the method with no parameters.

              +

              When your controller is finished using resources from an application package, and particularly if you have other application packages you want to work with, you may wish to remove the package path so the Loader no longer looks in that folder for resources. To remove the last path added, simply call the method with no parameters.

              $this->load->remove_package_path()

              @@ -231,8 +231,8 @@

              $this->load->remove_package_path()

              Package view files

              -

              By Default, package view files paths are set when add_package_path() is called. View paths are looped through, and once a match is encountered that view is loaded.

              -

              In this instance, it is possible for view naming collisions within packages to occur, and possibly the incorrect package being loaded. To ensure against this, set an optional second parameter of FALSE when calling add_package_path().

              +

              By Default, package view files paths are set when add_package_path() is called. View paths are looped through, and once a match is encountered that view is loaded.

              +

              In this instance, it is possible for view naming collisions within packages to occur, and possibly the incorrect package being loaded. To ensure against this, set an optional second parameter of FALSE when calling add_package_path().

              $this->load->add_package_path(APPPATH.'my_app', TRUE);
              diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 4d1f8d97..8846e15f 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -58,7 +58,7 @@

              Output Class

              -

              The Output class is a small class with one main function: To send the finalized web page to the requesting browser. It is +

              The Output class is a small class with one main function: To send the finalized web page to the requesting browser. It is also responsible for caching your web pages, if you use that feature.

              Note: This class is initialized automatically by the system so there is no need to do it manually.

              @@ -70,7 +70,7 @@

              Output Class

              $this->output->set_output();

              -

              Permits you to manually set the final output string. Usage example:

              +

              Permits you to manually set the final output string. Usage example:

              $this->output->set_output($data); @@ -95,7 +95,7 @@

              $this->output->set_content_type();

              $this->output->get_output();

              -

              Permits you to manually retrieve any output that has been sent for storage in the output class. Usage example:

              +

              Permits you to manually retrieve any output that has been sent for storage in the output class. Usage example:

              $string = $this->output->get_output();

              Note that data will only be retrievable from this function if it has been previously sent to the output class by one of the @@ -104,7 +104,7 @@

              $this->output->get_output();

              $this->output->append_output();

              -

              Appends data onto the output string. Usage example:

              +

              Appends data onto the output string. Usage example:

              $this->output->append_output($data); @@ -112,7 +112,7 @@

              $this->output->append_output();

              $this->output->set_header();

              -

              Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:

              +

              Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:

              $this->output->set_header("HTTP/1.0 200 OK");
              @@ -125,10 +125,10 @@

              $this->output->set_header();

              $this->output->set_status_header(code, 'text');

              -

              Permits you to manually set a server status header. Example:

              +

              Permits you to manually set a server status header. Example:

              $this->output->set_status_header('401');
              -// Sets the header as: Unauthorized               +// Sets the header as: Unauthorized

              See here for a full list of headers.

              @@ -147,14 +147,14 @@

              $this->output->enable_profiler();

              $this->output->set_profiler_sections();

              -

              Permits you to enable/disable specific sections of the Profiler when enabled. Please refer to the Profiler documentation for further information.

              +

              Permits you to enable/disable specific sections of the Profiler when enabled. Please refer to the Profiler documentation for further information.

              $this->output->cache();

              -

              The CodeIgniter output library also controls caching. For more information, please see the caching documentation.

              +

              The CodeIgniter output library also controls caching. For more information, please see the caching documentation.

              Parsing Execution Variables

              -

              CodeIgniter will parse the pseudo-variables {elapsed_time} and {memory_usage} in your output by default. To disable this, set the $parse_exec_vars class property to FALSE in your controller. +

              CodeIgniter will parse the pseudo-variables {elapsed_time} and {memory_usage} in your output by default. To disable this, set the $parse_exec_vars class property to FALSE in your controller. $this->output->parse_exec_vars = FALSE; diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 3c366a69..a6b9287a 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -72,26 +72,26 @@

              Example

              $this->load->library('pagination');

              $config['base_url'] = 'http://example.com/index.php/test/page/';
              $config['total_rows'] = 200;
              -$config['per_page'] = 20; +$config['per_page'] = 20;

              $this->pagination->initialize($config);

              -echo $this->pagination->create_links();               +echo $this->pagination->create_links();

              Notes:

              -

              The $config array contains your configuration variables. It is passed to the $this->pagination->initialize function as shown above. Although there are some twenty items you can configure, at -minimum you need the three shown. Here is a description of what those items represent:

              +

              The $config array contains your configuration variables. It is passed to the $this->pagination->initialize function as shown above. Although there are some twenty items you can configure, at +minimum you need the three shown. Here is a description of what those items represent:

                -
              • base_url This is the full URL to the controller class/function containing your pagination. In the example - above, it is pointing to a controller called "Test" and a function called "page". Keep in mind that you can +
              • base_url This is the full URL to the controller class/function containing your pagination. In the example + above, it is pointing to a controller called "Test" and a function called "page". Keep in mind that you can re-route your URI if you need a different structure.
              • total_rows This number represents the total rows in the result set you are creating pagination for. Typically this number will be the total rows that your database query returned.
                • -
              • per_page The number of items you intend to show per page. In the above example, you would be showing 20 items per page.
                • +
              • per_page The number of items you intend to show per page. In the above example, you would be showing 20 items per page.

              The create_links() function returns an empty string when there is no pagination to show.

              @@ -100,7 +100,7 @@

              Notes:

              Setting preferences in a config file

              If you prefer not to set preferences using the above method, you can instead put them into a config file. -Simply create a new file called pagination.php, add the $config +Simply create a new file called pagination.php, add the $config array in that file. Then save the file in: config/pagination.php and it will be used automatically. You will NOT need to use the $this->pagination->initialize function if you save your preferences in a config file.

              @@ -122,9 +122,9 @@

              $config['num_links'] = 2;

              $config['page_query_string'] = TRUE

              By default, the pagination library assume you are using URI Segments, and constructs your links something like

              http://example.com/index.php/test/page/20

              -

              If you have $config['enable_query_strings'] set to TRUE your links will automatically be re-written using Query Strings. This option can also be explictly set. Using $config['page_query_string'] set to TRUE, the pagination link will become.

              +

              If you have $config['enable_query_strings'] set to TRUE your links will automatically be re-written using Query Strings. This option can also be explictly set. Using $config['page_query_string'] set to TRUE, the pagination link will become.

              http://example.com/index.php?c=test&m=page&per_page=20

              -

              Note that "per_page" is the default query string passed, however can be configured using $config['query_string_segment'] = 'your_string'

              +

              Note that "per_page" is the default query string passed, however can be configured using $config['query_string_segment'] = 'your_string'

              Adding Enclosing Markup

              If you would like to surround the entire pagination with some markup you can do it with these two prefs:

              diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index cb2f100a..4f04aaf4 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -83,10 +83,10 @@

              Template Parser Class

              PHP from your templates (view files).

              Note: CodeIgniter does not require you to use this class -since using pure PHP in your view pages lets them run a little faster. However, some developers prefer to use a template engine if +since using pure PHP in your view pages lets them run a little faster. However, some developers prefer to use a template engine if they work with designers who they feel would find some confusion working with PHP.

              -

              Also Note: The Template Parser Class is not a +

              Also Note: The Template Parser Class is not a full-blown template parsing solution. We've kept it very lean on purpose in order to maintain maximum performance.

              @@ -102,7 +102,7 @@

              Initializing the Class

              $this->parser->parse()

              -

              This method accepts a template name and data array as input, and it generates a parsed version. Example:

              +

              This method accepts a template name and data array as input, and it generates a parsed version. Example:

              $this->load->library('parser');

              @@ -114,11 +114,11 @@

              $this->parser->parse()

              $this->parser->parse('blog_template', $data);

              The first parameter contains the name of the view file (in this example the file would be called blog_template.php), -and the second parameter contains an associative array of data to be replaced in the template. In the above example, the +and the second parameter contains an associative array of data to be replaced in the template. In the above example, the template would contain two variables: {blog_title} and {blog_heading}

              -

              There is no need to "echo" or do something with the data returned by $this->parser->parse(). It is automatically -passed to the output class to be sent to the browser. However, if you do want the data returned instead of sent to the output class you can +

              There is no need to "echo" or do something with the data returned by $this->parser->parse(). It is automatically +passed to the output class to be sent to the browser. However, if you do want the data returned instead of sent to the output class you can pass TRUE (boolean) to the third parameter:

              $string = $this->parser->parse('blog_template', $data, TRUE); @@ -130,8 +130,8 @@

              $this->parser->parse_string()

              Variable Pairs

              -

              The above example code allows simple variables to be replaced. What if you would like an entire block of variables to be -repeated, with each iteration containing new values? Consider the template example we showed at the top of the page:

              +

              The above example code allows simple variables to be replaced. What if you would like an entire block of variables to be +repeated, with each iteration containing new values? Consider the template example we showed at the top of the page:

              <html>
              <head>
              diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index 73518745..0cb1d0cb 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -63,11 +63,11 @@

              Security Class

              XSS Filtering

              CodeIgniter comes with a Cross Site Scripting Hack prevention filter which can either run automatically to filter -all POST and COOKIE data that is encountered, or you can run it on a per item basis. By default it does not +all POST and COOKIE data that is encountered, or you can run it on a per item basis. By default it does not run globally since it requires a bit of processing overhead, and since you may not need it in all cases.

              The XSS filter looks for commonly used techniques to trigger Javascript or other types of code that attempt to hijack cookies -or do other malicious things. If anything disallowed is encountered it is rendered safe by converting the data to character entities.

              +or do other malicious things. If anything disallowed is encountered it is rendered safe by converting the data to character entities.

              Note: This function should only be used to deal with data upon submission. It's not something that should be used for general runtime processing since it requires a fair amount of processing overhead.

              @@ -88,7 +88,7 @@

              $this->security->xss_clean()

              Note: If you use the form validation class, it gives you the option of XSS filtering as well.

              -

              An optional second parameter, is_image, allows this function to be used to test images for potential XSS attacks, useful for file upload security. When this second parameter is set to TRUE, instead of returning an altered string, the function returns TRUE if the image is safe, and FALSE if it contained potentially malicious information that a browser may attempt to execute.

              +

              An optional second parameter, is_image, allows this function to be used to test images for potential XSS attacks, useful for file upload security. When this second parameter is set to TRUE, instead of returning an altered string, the function returns TRUE if the image is safe, and FALSE if it contained potentially malicious information that a browser may attempt to execute.

              if ($this->security->xss_clean($file, TRUE) === FALSE)
              {
              @@ -98,7 +98,7 @@

              $this->security->xss_clean()

              $this->security->sanitize_filename()

              -

              When accepting filenames from user input, it is best to sanitize them to prevent directory traversal and other security related issues. To do so, use the sanitize_filename() method of the Security class. Here is an example:

              +

              When accepting filenames from user input, it is best to sanitize them to prevent directory traversal and other security related issues. To do so, use the sanitize_filename() method of the Security class. Here is an example:

              $filename = $this->security->sanitize_filename($this->input->post('filename')); diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index a6f3c601..bb8f1fc9 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -61,7 +61,7 @@

              Session Class

              The Session class permits you maintain a user's "state" and track their activity while they browse your site. The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie. It can also store the session data in a database table for added security, as this permits the session ID in the -user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to +user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to use the database option you'll need to create the session table as indicated below.

              @@ -93,8 +93,8 @@

              How do Sessions work?

              If sessions data does not exist (or if it has expired) a new session will be created and saved in the cookie. If a session does exist, its information will be updated and the cookie will be updated. With each update, the session_id will be regenerated.

              -

              It's important for you to understand that once initialized, the Session class runs automatically. There is nothing -you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or +

              It's important for you to understand that once initialized, the Session class runs automatically. There is nothing +you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or even add your own data to a user's session, but the process of reading, writing, and updating a session is automatic.

              @@ -106,7 +106,7 @@

              What is Session Data?

            • The user's unique Session ID (this is a statistically random string with very strong entropy, hashed with MD5 for portability, and regenerated (by default) every five minutes)
            • The user's IP Address
            • The user's User Agent data (the first 50 characters of the browser data string)
              • -
            • The "last activity" time stamp.
              • +
            • The "last activity" time stamp.

            The above data is stored in a cookie as a serialized array with this prototype:

            @@ -124,7 +124,7 @@

            What is Session Data?

            can be found here, although the Session class will take care of initializing and encrypting the data automatically.

            -

            Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page +

            Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time the cookie was written. This time is configurable by changing the $config['sess_time_to_update'] line in your system/config/config.php file.

            @@ -134,7 +134,7 @@

            Retrieving Session Data

            $this->session->userdata('item'); -

            Where item is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you +

            Where item is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you will do this:

            $session_id = $this->session->userdata('session_id'); @@ -145,7 +145,7 @@

            Retrieving Session Data

            Adding Custom Session Data

            A useful aspect of the session array is that you can add your own data to it and it will be stored in the user's cookie. -Why would you want to do this? Here's one example:

            +Why would you want to do this? Here's one example:

            Let's say a particular user logs into your site. Once authenticated, you could add their username and email address to the session cookie, making that data globally available to you without @@ -155,7 +155,7 @@

            Adding Custom Session Data

            $this->session->set_userdata($array); -

            Where $array is an associative array containing your new data. Here's an example:

            +

            Where $array is an associative array containing your new data. Here's an example:

            $newdata = array(
            @@ -167,7 +167,7 @@

            Adding Custom Session Data

            $this->session->set_userdata($newdata);

            If you want to add userdata one value at a time, set_userdata() also supports this syntax.

            $this->session->set_userdata('some_name', 'some_value');

            -

            Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The +

            Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

            Retrieving All Session Data

            @@ -179,10 +179,10 @@

            Retrieving All Session Data

             Array
 (
-    [session_id] => 4a5a5dca22728fb0a84364eeb405b601
-    [ip_address] => 127.0.0.1
-    [user_agent] => Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7;
-    [last_activity] => 1303142623
+  [session_id] => 4a5a5dca22728fb0a84364eeb405b601
+  [ip_address] => 127.0.0.1
+  [user_agent] => Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7;
+  [last_activity] => 1303142623
 )
            @@ -206,20 +206,20 @@

            Flashdata

            $this->session->keep_flashdata('item');

            Saving Session Data to a Database

            While the session data array stored in the user's cookie contains a Session ID, -unless you store session data in a database there is no way to validate it. For some applications that require little or no -security, session ID validation may not be needed, but if your application requires security, validation is mandatory. Otherwise, an old session +unless you store session data in a database there is no way to validate it. For some applications that require little or no +security, session ID validation may not be needed, but if your application requires security, validation is mandatory. Otherwise, an old session could be restored by a user modifying their cookies.

            When session data is available in a database, every time a valid session is found in the user's cookie, a database -query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never +query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never be updated, they can only be generated when a new session is created.

            -

            In order to store sessions, you must first create a database table for this purpose. Here is the basic +

            In order to store sessions, you must first create a database table for this purpose. Here is the basic prototype (for MySQL) required by the session class:

            -

            Note: In the above code we are using a "url helper". You can find more information in the Helpers Functions page.

            +

            Note: In the above code we are using a "url helper". You can find more information in the Helpers Functions page.

            The Server

            @@ -381,7 +381,7 @@

            The Server

            $response = array( array( - 'you_said' => $parameters['0'], + 'you_said' => $parameters['0'], 'i_respond' => 'Not bad at all.'), 'struct'); @@ -452,7 +452,7 @@

            $this->xmlrpc->request()

            $this->xmlrpc->request($request);

            $this->xmlrpc->send_request()

            -

            The request sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

            +

            The request sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

            $this->xmlrpc->set_debug(TRUE);

            Enables debugging, which will display a variety of information and error data helpful during development.

            @@ -463,7 +463,7 @@

            $this->xmlrpc->display_error()

            echo $this->xmlrpc->display_error();

            $this->xmlrpc->display_response()

            -

            Returns the response from the remote server once request is received. The response will typically be an associative array.

            +

            Returns the response from the remote server once request is received. The response will typically be an associative array.

            $this->xmlrpc->display_response();

            $this->xmlrpc->send_error_message()

            diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 03112660..2fc5fd81 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -81,7 +81,7 @@

            Usage Example

            // Write the zip file to a folder on your server. Name it "my_backup.zip"
            $this->zip->archive('/path/to/directory/my_backup.zip');

            - // Download the file to your desktop. Name it "my_backup.zip"
            + // Download the file to your desktop. Name it "my_backup.zip"
            $this->zip->download('my_backup.zip');             @@ -100,7 +100,7 @@

            $this->zip->add_data()

            You are allowed multiple calls to this function in order to -add several files to your archive. Example:

            +add several files to your archive. Example:

            $name = 'mydata1.txt';
            @@ -139,8 +139,8 @@

            $this->zip->add_data()

            $this->zip->add_dir()

            -

            Permits you to add a directory. Usually this function is unnecessary since you can place your data into folders when -using $this->zip->add_data(), but if you would like to create an empty folder you can do so. Example:

            +

            Permits you to add a directory. Usually this function is unnecessary since you can place your data into folders when +using $this->zip->add_data(), but if you would like to create an empty folder you can do so. Example:

            $this->zip->add_dir('myfolder'); // Creates a folder called "myfolder" @@ -148,49 +148,49 @@

            $this->zip->add_dir()

            $this->zip->read_file()

            -

            Permits you to compress a file that already exists somewhere on your server. Supply a file path and the zip class will +

            Permits you to compress a file that already exists somewhere on your server. Supply a file path and the zip class will read it and add it to the archive:

            $path = '/path/to/photo.jpg';

            $this->zip->read_file($path);

            - // Download the file to your desktop. Name it "my_backup.zip"
            + // Download the file to your desktop. Name it "my_backup.zip"
            $this->zip->download('my_backup.zip');

            If you would like the Zip archive to maintain the directory structure of the file in it, pass TRUE (boolean) in the -second parameter. Example:

            +second parameter. Example:

            $path = '/path/to/photo.jpg';

            $this->zip->read_file($path, TRUE);

            - // Download the file to your desktop. Name it "my_backup.zip"
            + // Download the file to your desktop. Name it "my_backup.zip"
            $this->zip->download('my_backup.zip');             -

            In the above example, photo.jpg will be placed inside two folders: path/to/

            +

            In the above example, photo.jpg will be placed inside two folders: path/to/

            $this->zip->read_dir()

            -

            Permits you to compress a folder (and its contents) that already exists somewhere on your server. Supply a file path to the -directory and the zip class will recursively read it and recreate it as a Zip archive. All files contained within the -supplied path will be encoded, as will any sub-folders contained within it. Example:

            +

            Permits you to compress a folder (and its contents) that already exists somewhere on your server. Supply a file path to the +directory and the zip class will recursively read it and recreate it as a Zip archive. All files contained within the +supplied path will be encoded, as will any sub-folders contained within it. Example:

            $path = '/path/to/your/directory/';

            $this->zip->read_dir($path);

            - // Download the file to your desktop. Name it "my_backup.zip"
            + // Download the file to your desktop. Name it "my_backup.zip"
            $this->zip->download('my_backup.zip');

            By default the Zip archive will place all directories listed in the first parameter inside the zip. If you want the tree preceding the target folder to be ignored -you can pass FALSE (boolean) in the second parameter. Example:

            +you can pass FALSE (boolean) in the second parameter. Example:

            $path = '/path/to/your/directory/';

            @@ -204,7 +204,7 @@

            $this->zip->read_dir()

            $this->zip->archive()

            -

            Writes the Zip-encoded file to a directory on your server. Submit a valid server path ending in the file name. Make sure the +

            Writes the Zip-encoded file to a directory on your server. Submit a valid server path ending in the file name. Make sure the directory is writable (666 or 777 is usually OK). Example:

            $this->zip->archive('/path/to/folder/myarchive.zip'); // Creates a file named myarchive.zip @@ -223,7 +223,7 @@

            $this->zip->download()

            $this->zip->get_zip()

            -

            Returns the Zip-compressed file data. Generally you will not need this function unless you want to do something unique with the data. +

            Returns the Zip-compressed file data. Generally you will not need this function unless you want to do something unique with the data. Example:

            diff --git a/user_guide/license.html b/user_guide/license.html index 8f53851a..ecc5b500 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -63,7 +63,7 @@

            CodeIgniter License Agreement

            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 agree to comply with the terms and conditions of this license.

            +

            This license is a legal agreement between you and EllisLab Inc. for the use of CodeIgniter Software (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.

            Permitted Use

            You are permitted to use, copy, modify, and distribute the Software and its documentation, with or without modification, for any purpose, provided that the following conditions are met:

            diff --git a/user_guide/nav/hacks.txt b/user_guide/nav/hacks.txt index 8c17f008..183481b7 100644 --- a/user_guide/nav/hacks.txt +++ b/user_guide/nav/hacks.txt @@ -1,6 +1,6 @@ I did the following hack in moo.fx.js: -At line 79 in the toggle: function() function, I added: +At line 79 in the toggle: function() function, I added: document.getElementById('nav').style.display = 'block'; diff --git a/user_guide/nav/moo.fx.js b/user_guide/nav/moo.fx.js index 256371d1..b21ee20e 100755 --- a/user_guide/nav/moo.fx.js +++ b/user_guide/nav/moo.fx.js @@ -25,8 +25,8 @@ fx.Base.prototype = { }, step: function() { - var time = (new Date).getTime(); - var Tpos = (time - this.startTime) / (this.duration); + var time = (new Date).getTime(); + var Tpos = (time - this.startTime) / (this.duration); if (time >= this.duration+this.startTime) { this.now = this.to; clearInterval (this.timer); diff --git a/user_guide/nav/prototype.lite.js b/user_guide/nav/prototype.lite.js index e6c36227..857faae4 100755 --- a/user_guide/nav/prototype.lite.js +++ b/user_guide/nav/prototype.lite.js @@ -1,9 +1,9 @@ -/* Prototype JavaScript framework - * (c) 2005 Sam Stephenson +/* Prototype JavaScript framework + * (c) 2005 Sam Stephenson * - * Prototype is freely distributable under the terms of an MIT-style license. + * Prototype is freely distributable under the terms of an MIT-style license. * - * For details, see the Prototype web site: http://prototype.conio.net/ + * For details, see the Prototype web site: http://prototype.conio.net/ * /*--------------------------------------------------------------------------*/ @@ -11,117 +11,117 @@ //note: this is a stripped down version of prototype, to be used with moo.fx by mad4milk (http://moofx.mad4milk.net). var Class = { - create: function() { + create: function() { return function() { - this.initialize.apply(this, arguments); + this.initialize.apply(this, arguments); } - } + } } Object.extend = function(destination, source) { - for (property in source) { + for (property in source) { destination[property] = source[property]; - } - return destination; + } + return destination; } Function.prototype.bind = function(object) { - var __method = this; - return function() { + var __method = this; + return function() { return __method.apply(object, arguments); - } + } } function $() { - var elements = new Array(); + var elements = new Array(); - for (var i = 0; i < arguments.length; i++) { + for (var i = 0; i < arguments.length; i++) { var element = arguments[i]; if (typeof element == 'string') - element = document.getElementById(element); + element = document.getElementById(element); if (arguments.length == 1) - return element; + return element; elements.push(element); - } + } - return elements; + return elements; } //------------------------- document.getElementsByClassName = function(className) { - var children = document.getElementsByTagName('*') || document.all; - var elements = new Array(); + var children = document.getElementsByTagName('*') || document.all; + var elements = new Array(); - for (var i = 0; i < children.length; i++) { + for (var i = 0; i < children.length; i++) { var child = children[i]; var classNames = child.className.split(' '); for (var j = 0; j < classNames.length; j++) { - if (classNames[j] == className) { + if (classNames[j] == className) { elements.push(child); break; - } + } } - } + } - return elements; + return elements; } //------------------------- if (!window.Element) { - var Element = new Object(); + var Element = new Object(); } Object.extend(Element, { - remove: function(element) { + remove: function(element) { element = $(element); element.parentNode.removeChild(element); - }, + }, - hasClassName: function(element, className) { + hasClassName: function(element, className) { element = $(element); if (!element) - return; + return; var a = element.className.split(' '); for (var i = 0; i < a.length; i++) { - if (a[i] == className) + if (a[i] == className) return true; } return false; - }, + }, - addClassName: function(element, className) { + addClassName: function(element, className) { element = $(element); Element.removeClassName(element, className); element.className += ' ' + className; - }, + }, - removeClassName: function(element, className) { + removeClassName: function(element, className) { element = $(element); if (!element) - return; + return; var newClassName = ''; var a = element.className.split(' '); for (var i = 0; i < a.length; i++) { - if (a[i] != className) { + if (a[i] != className) { if (i > 0) - newClassName += ' '; + newClassName += ' '; newClassName += a[i]; - } + } } element.className = newClassName; - }, + }, - // removes whitespace-only text node children - cleanWhitespace: function(element) { + // removes whitespace-only text node children + cleanWhitespace: function(element) { element = $(element); for (var i = 0; i < element.childNodes.length; i++) { - var node = element.childNodes[i]; - if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) + var node = element.childNodes[i]; + if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) Element.remove(node); } - } + } }); \ No newline at end of file diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index bcbc43ff..3b1c42e4 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -67,7 +67,7 @@

            Application Flow Chart

          • The index.php serves as the front controller, initializing the base resources needed to run CodeIgniter.
          • The Router examines the HTTP request to determine what should be done with it.
          • If a cache file exists, it is sent directly to the browser, bypassing the normal system execution.
            • -
          • Security. Before the application controller is loaded, the HTTP request and any user submitted data is filtered for security.
            • +
          • Security. Before the application controller is loaded, the HTTP request and any user submitted data is filtered for security.
          • The Controller loads the model, core libraries, helpers, and any other resources needed to process the specific request.
          • The finalized View is rendered then sent to the web browser to be seen. If caching is enabled, the view is cached first so that on subsequent requests it can be served.
            • diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index b6b81d76..1175e7f4 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -60,7 +60,7 @@

            CodeIgniter at a Glance

            CodeIgniter is an Application Framework

            -

            CodeIgniter is a toolkit for people who build web applications using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code +

            CodeIgniter is a toolkit for people who build web applications using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by minimizing the amount of code needed for a given task.

            @@ -70,7 +70,7 @@

            CodeIgniter is Free

            For more information please read the license agreement.

            CodeIgniter is Light Weight

            -

            Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. +

            Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. Additional libraries are loaded dynamically upon request, based on your needs for a given process, so the base system is very lean and quite fast.

            @@ -84,7 +84,7 @@

            CodeIgniter Uses M-V-C

            This is particularly good for projects in which designers are working with your template files, as the code these file contain will be minimized. We describe MVC in more detail on its own page.

            CodeIgniter Generates Clean URLs

            -

            The URLs generated by CodeIgniter are clean and search-engine friendly. Rather than using the standard "query string" +

            The URLs generated by CodeIgniter are clean and search-engine friendly. Rather than using the standard "query string" approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a segment-based approach:

            example.com/news/article/345 @@ -92,7 +92,7 @@

            CodeIgniter Generates Clean URLs

            Note: By default the index.php file is included in the URL but it can be removed using a simple .htaccess file.

            CodeIgniter Packs a Punch

            -

            CodeIgniter comes with full-range of libraries that enable the most commonly needed web development tasks, +

            CodeIgniter comes with full-range of libraries that enable the most commonly needed web development tasks, like accessing a database, sending email, validating form data, maintaining sessions, manipulating images, working with XML-RPC data and much more.

            @@ -104,7 +104,7 @@

            CodeIgniter Does Not Require a Template Engine

            Although CodeIgniter does come with a simple template parser that can be optionally used, it does not force you to use one. Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template -engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:

            +engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:

            <ul>

            @@ -133,7 +133,7 @@

            CodeIgniter Does Not Require a Template Engine

            CodeIgniter is Thoroughly Documented

            -

            Programmers love to code and hate to write documentation. We're no different, of course, but +

            Programmers love to code and hate to write documentation. We're no different, of course, but since documentation is as important as the code itself, we are committed to doing it. Our source code is extremely clean and well commented as well.

            diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index e20219e0..4209463b 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -59,10 +59,10 @@

            CodeIgniter Features

            Features in and of themselves are a very poor way to judge an application since they tell you nothing -about the user experience, or how intuitively or intelligently it is designed. Features +about the user experience, or how intuitively or intelligently it is designed. Features don't reveal anything about the quality of the code, or the performance, or the attention to detail, or security practices. The only way to really judge an app is to try it and get to know the code. Installing -CodeIgniter is child's play so we encourage you to do just that. In the mean time here's a list of CodeIgniter's main features.

            +CodeIgniter is child's play so we encourage you to do just that. In the mean time here's a list of CodeIgniter's main features.

            • Model-View-Controller Based System
              • @@ -73,7 +73,7 @@

              CodeIgniter Features

            • Security and XSS Filtering
            • Session Management
            • Email Sending Class. Supports Attachments, HTML/Text email, multiple protocols (sendmail, SMTP, and Mail) and more.
              • -
            • Image Manipulation Library (cropping, resizing, rotating, etc.). Supports GD, ImageMagick, and NetPBM
              • +
            • Image Manipulation Library (cropping, resizing, rotating, etc.). Supports GD, ImageMagick, and NetPBM
            • File Uploading Class
            • FTP Class
            • Localization
              • diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index f120913f..16833264 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -57,7 +57,7 @@

              Getting Started With CodeIgniter

              -

              Any software application requires some effort to learn. We've done our best to minimize the learning +

              Any software application requires some effort to learn. We've done our best to minimize the learning curve while making the process as enjoyable as possible.

              diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 754ecaae..7f1f7678 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -67,9 +67,9 @@

              Design and Architectural Goals

              From a technical and architectural standpoint, CodeIgniter was created with the following objectives:

                -
              • Dynamic Instantiation. In CodeIgniter, components are loaded and routines executed only when requested, rather than globally. No assumptions are made by the system regarding what may be needed beyond the minimal core resources, so the system is very light-weight by default. The events, as triggered by the HTTP request, and the controllers and views you design will determine what is invoked.
                • -
              • Loose Coupling. Coupling is the degree to which components of a system rely on each other. The less components depend on each other the more reusable and flexible the system becomes. Our goal was a very loosely coupled system.
                • -
              • Component Singularity. Singularity is the degree to which components have a narrowly focused purpose. In CodeIgniter, each class and its functions are highly autonomous in order to allow maximum usefulness.
                • +
              • Dynamic Instantiation. In CodeIgniter, components are loaded and routines executed only when requested, rather than globally. No assumptions are made by the system regarding what may be needed beyond the minimal core resources, so the system is very light-weight by default. The events, as triggered by the HTTP request, and the controllers and views you design will determine what is invoked.
                • +
              • Loose Coupling. Coupling is the degree to which components of a system rely on each other. The less components depend on each other the more reusable and flexible the system becomes. Our goal was a very loosely coupled system.
                • +
              • Component Singularity. Singularity is the degree to which components have a narrowly focused purpose. In CodeIgniter, each class and its functions are highly autonomous in order to allow maximum usefulness.

              CodeIgniter is a dynamically instantiated, loosely coupled system with high component singularity. It strives for simplicity, flexibility, and high performance in a small footprint package.

              diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 91cf6497..9eb327a9 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -60,12 +60,12 @@

              Model-View-Controller

              CodeIgniter is based on the Model-View-Controller development pattern. -MVC is a software approach that separates application logic from presentation. In practice, it permits your web pages to contain minimal scripting since the presentation is separate from the PHP scripting.

              +MVC is a software approach that separates application logic from presentation. In practice, it permits your web pages to contain minimal scripting since the presentation is separate from the PHP scripting.

              • The Model represents your data structures. Typically your model classes will contain functions that help you -retrieve, insert, and update information in your database.
                • -
              • The View is the information that is being presented to a user. A View will normally be a web page, but +retrieve, insert, and update information in your database.
                • +
              • The View is the information that is being presented to a user. A View will normally be a web page, but in CodeIgniter, a view can also be a page fragment like a header or footer. It can also be an RSS page, or any other type of "page".
              • The Controller serves as an intermediary between the Model, the View, and any other resources needed to process the HTTP request and generate a web page.
                • diff --git a/user_guide/userguide.css b/user_guide/userguide.css index f93ff0d7..b08f4fb0 100644 --- a/user_guide/userguide.css +++ b/user_guide/userguide.css @@ -391,7 +391,7 @@ form { .select { background-color: #fff; - font-size: 11px; + font-size: 11px; font-weight: normal; color: #333; padding: 0; From ba130b3e6a600727537c22e12453060884f11b6c Mon Sep 17 00:00:00 2001 From: Anton Lindqvist Date: Mon, 25 Apr 2011 21:59:01 +0200 Subject: [PATCH 2487/2544] Added redis cache driver. --- application/controllers/test_redis.php | 43 ++++ system/libraries/Cache/Cache.php | 2 +- .../libraries/Cache/drivers/Cache_redis.php | 204 ++++++++++++++++++ 3 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 application/controllers/test_redis.php create mode 100644 system/libraries/Cache/drivers/Cache_redis.php diff --git a/application/controllers/test_redis.php b/application/controllers/test_redis.php new file mode 100644 index 00000000..576c77a2 --- /dev/null +++ b/application/controllers/test_redis.php @@ -0,0 +1,43 @@ +load->library('unit_test'); + + $this->load->driver('cache', array('adapter' => 'redis')); + } + + function index() + { + $this->unit->run($this->cache->redis->is_supported(), 'is_true'); + + $this->unit->run($this->cache->redis->save('foo', 'bar'), 'is_true'); + + $this->unit->run($this->cache->redis->get('foo'), 'bar'); + + $this->unit->run($this->cache->redis->delete('foo'), 'is_true'); + + $this->unit->run($this->cache->redis->save('foo', 'bar', 1800), 'is_true'); + + $this->unit->run( + $this->cache->redis->get_metadata('foo'), + array( + 'data' => 'bar', + 'expire' => time() + 1800 + ) + ); + + $this->unit->run($this->cache->redis->clean(), 'is_true'); + + $this->unit->run($this->cache->redis->get('foo'), 'is_false'); + + $this->unit->run($this->cache->redis->cache_info(), 'is_array'); + + echo $this->unit->report(); + } + +} diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php index 61e7aa76..fde2f109 100644 --- a/system/libraries/Cache/Cache.php +++ b/system/libraries/Cache/Cache.php @@ -27,7 +27,7 @@ class CI_Cache extends CI_Driver_Library { protected $valid_drivers = array( - 'cache_apc', 'cache_file', 'cache_memcached', 'cache_dummy' + 'cache_apc', 'cache_file', 'cache_memcached', 'cache_redis', 'cache_dummy' ); protected $_cache_path = NULL; // Path of cache files (if file-based cache) diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php new file mode 100644 index 00000000..43da0491 --- /dev/null +++ b/system/libraries/Cache/drivers/Cache_redis.php @@ -0,0 +1,204 @@ + + * @link + */ +class CI_Cache_redis extends CI_Driver +{ + + /** + * Default config + * + * @var array + * + * @access private + * @static + */ + private static $_default_config = array( + 'host' => '127.0.0.1', + 'port' => 6379, + 'timeout' => 0 + ); + + /** + * Redis connection + * + * @var Redis + * + * @access private + */ + private $_redis; + + /** + * Class destructor + * + * Closes the connection to Redis if present. + * + * @return void + * + * @access public + */ + public function __destruct() + { + if ($this->_redis) { + $this->_redis->close(); + } + } + + /** + * Get cache + * + * @param string $key Cache key identifier + * + * @return mixed + * + * @access public + */ + public function get($key) + { + return $this->_redis->get($key); + } + + /** + * Save cache + * + * @param string $key Cache key identifier + * @param mixed $value Data to save + * @param integer $ttl Time to live + * + * @return boolean + * + * @access public + */ + public function save($key, $value, $ttl = null) + { + return ($ttl) + ? $this->_redis->setex($key, $ttl, $value) + : $this->_redis->set($key, $value); + } + + /** + * Delete from cache + * + * @param string $key Cache key + * + * @return boolean + * + * @access public + */ + public function delete($key) + { + return ($this->_redis->delete($key) === 1); + } + + /** + * Clean cache + * + * @return boolean + * @see Redis::flushDB() + * + * @access public + */ + public function clean() + { + return $this->_redis->flushDB(); + } + + /** + * Get cache driver info + * + * @param string $type Not supported in Redis. Only included in order to offer a + * consistent cache API. + * + * @return array + * @see Redis::info() + * + * @access public + */ + public function cache_info($type = null) + { + return $this->_redis->info(); + } + + /** + * Get cache metadata + * + * @param string $key Cache key + * + * @return array + * + * @access public + */ + public function get_metadata($key) + { + $value = $this->get($key); + + if ($value) { + return array( + 'expire' => time() + $this->_redis->ttl($key), + 'data' => $value + ); + } + } + + /** + * Check if Redis driver is supported + * + * @return boolean + * + * @access public + */ + public function is_supported() + { + if (extension_loaded('redis')) { + $this->_setup_redis(); + + return true; + } else { + log_message( + 'error', + 'The Redis extension must be loaded to use Redis cache.' + ); + + return false; + } + + } + + /** + * Setup Redis config and connection + * + * Loads Redis config file if present. Will halt execution if a Redis connection + * can't be established. + * + * @return void + * @see Redis::connect() + * + * @access private + */ + private function _setup_redis() + { + $config = array(); + $CI =& get_instance(); + + if ($CI->config->load('redis', true, true)) { + $config += $CI->config->item('redis'); + } + + $config = array_merge(self::$_default_config, $config); + + $this->_redis = new Redis(); + + try { + $this->_redis->connect($config['host'], $config['port'], $config['timeout']); + } catch (RedisException $e) { + show_error('Redis connection refused. ' . $e->getMessage()); + } + } + +} From 28bda7fd05d5261e0da1702e789cfedc6ab423b4 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Mon, 25 Apr 2011 15:00:45 -0500 Subject: [PATCH 2488/2544] swapping out preg_replace() in the driver library where str_replace() works just fine. --- system/libraries/Driver.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php index b90b5aba..1e01fcc1 100644 --- a/system/libraries/Driver.php +++ b/system/libraries/Driver.php @@ -43,11 +43,11 @@ function __get($child) // The class will be prefixed with the parent lib $child_class = $this->lib_name.'_'.$child; - + // Remove the CI_ prefix and lowercase - $lib_name = ucfirst(strtolower(preg_replace('/^CI_/', '', $this->lib_name))); - $driver_name = strtolower(preg_replace('/^CI_/', '', $child_class)); - + $lib_name = ucfirst(strtolower(str_replace('CI_', '', $this->lib_name))); + $driver_name = strtolower(str_replace('CI_', '', $child_class)); + if (in_array($driver_name, array_map('strtolower', $this->valid_drivers))) { // check and see if the driver is in a separate file From 3586ffb0bb8d5243449cb26f348776bbf5f7cb32 Mon Sep 17 00:00:00 2001 From: Anton Lindqvist Date: Mon, 25 Apr 2011 22:06:35 +0200 Subject: [PATCH 2489/2544] Adapted codeigniter coding standard. --- .../libraries/Cache/drivers/Cache_redis.php | 397 +++++++++--------- 1 file changed, 205 insertions(+), 192 deletions(-) diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php index 43da0491..9eb7a8d4 100644 --- a/system/libraries/Cache/drivers/Cache_redis.php +++ b/system/libraries/Cache/drivers/Cache_redis.php @@ -1,204 +1,217 @@ - + * @author Anton Lindqvist * @link */ class CI_Cache_redis extends CI_Driver { - /** - * Default config - * - * @var array - * - * @access private - * @static - */ - private static $_default_config = array( - 'host' => '127.0.0.1', - 'port' => 6379, - 'timeout' => 0 - ); - - /** - * Redis connection - * - * @var Redis - * - * @access private - */ - private $_redis; - - /** - * Class destructor - * - * Closes the connection to Redis if present. - * - * @return void - * - * @access public - */ - public function __destruct() - { - if ($this->_redis) { - $this->_redis->close(); - } - } - - /** - * Get cache - * - * @param string $key Cache key identifier - * - * @return mixed - * - * @access public - */ - public function get($key) - { - return $this->_redis->get($key); - } - - /** - * Save cache - * - * @param string $key Cache key identifier - * @param mixed $value Data to save - * @param integer $ttl Time to live - * - * @return boolean - * - * @access public - */ - public function save($key, $value, $ttl = null) - { - return ($ttl) - ? $this->_redis->setex($key, $ttl, $value) - : $this->_redis->set($key, $value); - } - - /** - * Delete from cache - * - * @param string $key Cache key - * - * @return boolean - * - * @access public - */ - public function delete($key) - { - return ($this->_redis->delete($key) === 1); - } - - /** - * Clean cache - * - * @return boolean - * @see Redis::flushDB() - * - * @access public - */ - public function clean() - { - return $this->_redis->flushDB(); - } - - /** - * Get cache driver info - * - * @param string $type Not supported in Redis. Only included in order to offer a - * consistent cache API. - * - * @return array - * @see Redis::info() - * - * @access public - */ - public function cache_info($type = null) - { - return $this->_redis->info(); - } - - /** - * Get cache metadata - * - * @param string $key Cache key - * - * @return array - * - * @access public - */ - public function get_metadata($key) - { - $value = $this->get($key); - - if ($value) { - return array( - 'expire' => time() + $this->_redis->ttl($key), - 'data' => $value - ); - } - } - - /** - * Check if Redis driver is supported - * - * @return boolean - * - * @access public - */ - public function is_supported() - { - if (extension_loaded('redis')) { - $this->_setup_redis(); - - return true; - } else { - log_message( - 'error', - 'The Redis extension must be loaded to use Redis cache.' - ); - - return false; - } - - } - - /** - * Setup Redis config and connection - * - * Loads Redis config file if present. Will halt execution if a Redis connection - * can't be established. - * - * @return void - * @see Redis::connect() - * - * @access private - */ - private function _setup_redis() - { - $config = array(); - $CI =& get_instance(); - - if ($CI->config->load('redis', true, true)) { - $config += $CI->config->item('redis'); - } - - $config = array_merge(self::$_default_config, $config); - - $this->_redis = new Redis(); - - try { - $this->_redis->connect($config['host'], $config['port'], $config['timeout']); - } catch (RedisException $e) { - show_error('Redis connection refused. ' . $e->getMessage()); - } - } + /** + * Default config + * + * @access private + * @static + * @var array + */ + private static $_default_config = array( + 'host' => '127.0.0.1', + 'port' => 6379, + 'timeout' => 0 + ); + + /** + * Redis connection + * + * @access private + * @var Redis + */ + private $_redis; + + /** + * Class destructor + * + * Closes the connection to Redis if present. + * + * @access public + * @return void + */ + public function __destruct() + { + if ($this->_redis) + { + $this->_redis->close(); + } + } + + /** + * Get cache + * + * @access public + * @param string $key Cache key identifier + * @return mixed + */ + public function get($key) + { + return $this->_redis->get($key); + } + + /** + * Save cache + * + * @access public + * @param string $key Cache key identifier + * @param mixed $value Data to save + * @param integer $ttl Time to live + * @return boolean + */ + public function save($key, $value, $ttl = NULL) + { + return ($ttl) + ? $this->_redis->setex($key, $ttl, $value) + : $this->_redis->set($key, $value); + } + + /** + * Delete from cache + * + * @access public + * @param string $key Cache key + * @return boolean + */ + public function delete($key) + { + return ($this->_redis->delete($key) === 1); + } + + /** + * Clean cache + * + * @access public + * @return boolean + * @see Redis::flushDB() + */ + public function clean() + { + return $this->_redis->flushDB(); + } + + /** + * Get cache driver info + * + * @access public + * @param string $type Not supported in Redis. Only included in order to offer a + * consistent cache API. + * @return array + * @see Redis::info() + */ + public function cache_info($type = NULL) + { + return $this->_redis->info(); + } + + /** + * Get cache metadata + * + * @access public + * @param string $key Cache key + * @return array + */ + public function get_metadata($key) + { + $value = $this->get($key); + + if ($value) + { + return array( + 'expire' => time() + $this->_redis->ttl($key), + 'data' => $value + ); + } + } + + /** + * Check if Redis driver is supported + * + * @access public + * @return boolean + */ + public function is_supported() + { + if (extension_loaded('redis')) + { + $this->_setup_redis(); + + return TRUE; + } + else + { + log_message( + 'error', + 'The Redis extension must be loaded to use Redis cache.' + ); + + return FALSE; + } + + } + + /** + * Setup Redis config and connection + * + * Loads Redis config file if present. Will halt execution if a Redis connection + * can't be established. + * + * @access private + * @return void + * @see Redis::connect() + */ + private function _setup_redis() + { + $config = array(); + $CI =& get_instance(); + + if ($CI->config->load('redis', TRUE, TRUE)) + { + $config += $CI->config->item('redis'); + } + + $config = array_merge(self::$_default_config, $config); + + $this->_redis = new Redis(); + + try + { + $this->_redis->connect($config['host'], $config['port'], $config['timeout']); + } + catch (RedisException $e) + { + show_error('Redis connection refused. ' . $e->getMessage()); + } + } } +// End Class + +/* End of file Cache_redis.php */ +/* Location: ./system/libraries/Cache/drivers/Cache_redis.php */ \ No newline at end of file From d97e12cb0e9c8b5e78e67780d1a9227da35e0da4 Mon Sep 17 00:00:00 2001 From: Eric Barnes Date: Tue, 26 Apr 2011 09:59:29 -0400 Subject: [PATCH 2490/2544] Automatic base_url generation was missing a ending slash. --- system/core/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/core/Config.php b/system/core/Config.php index fa71f4d3..55c623b3 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -55,7 +55,7 @@ function __construct() { $base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http'; $base_url .= '://'. $_SERVER['HTTP_HOST']; - $base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']); + $base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']).'/'; } else From 32dbac2695490fb751fc8da645bba945bc8da718 Mon Sep 17 00:00:00 2001 From: Eric Barnes Date: Tue, 26 Apr 2011 22:51:32 -0400 Subject: [PATCH 2491/2544] Reverting last change. Don't know what I was thinking. :( --- system/core/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/core/Config.php b/system/core/Config.php index 55c623b3..fa71f4d3 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -55,7 +55,7 @@ function __construct() { $base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http'; $base_url .= '://'. $_SERVER['HTTP_HOST']; - $base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']).'/'; + $base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']); } else From 25d495b4a2598f771a858108a2cd2e96f0130412 Mon Sep 17 00:00:00 2001 From: Eric Barnes Date: Tue, 26 Apr 2011 23:02:44 -0400 Subject: [PATCH 2492/2544] Removed the GET, POST, and COOKIE Data from security since we now allow $_GET data. Fixes #48 --- user_guide/general/security.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/user_guide/general/security.html b/user_guide/general/security.html index bcbb36c6..31dd7978 100644 --- a/user_guide/general/security.html +++ b/user_guide/general/security.html @@ -76,15 +76,9 @@

                URI Security

              • Dash: -
              -

              GET, POST, and COOKIE Data

              - -

              GET data is simply disallowed by CodeIgniter since the system utilizes URI segments rather than traditional URL query strings (unless -you have the query string option enabled in your config file). The global GET -array is unset by the Input class during system initialization.

              -

              Register_globals

              -

              During system initialization all global variables are unset, except those found in the $_POST and $_COOKIE arrays. The unsetting +

              During system initialization all global variables are unset, except those found in the $_GET, $_POST, and $_COOKIE arrays. The unsetting routine is effectively the same as register_globals = off.

              From 60ef4ea72e169e174ff8dbb421609a178a3c0c48 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Wed, 27 Apr 2011 01:45:38 -0500 Subject: [PATCH 2493/2544] Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch. --- .../drivers/postgre/postgre_driver.php | 18 ++++++++++++++++++ user_guide/changelog.html | 1 + 2 files changed, 19 insertions(+) diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 47ff3624..14039688 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -553,6 +553,24 @@ function _insert($table, $keys, $values) // -------------------------------------------------------------------- + /** + * Insert_batch statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert_batch($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values); + } + + // -------------------------------------------------------------------- + /** * Update statement * diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 76f9e5dd..206322e1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -73,6 +73,7 @@

              Version 2.0.3

            • Added Session Class userdata to the output profiler. Additionally, added a show/hide toggle on HTTP Headers, Session Data and Config Variables.
            • Removed internal usage of the EXT constant.
            • Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request.
              • +
            • Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
          • Helpers From 02958b5b78835a484c1038d77f4bcfc5ae273a2d Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Thu, 28 Apr 2011 17:49:33 +0100 Subject: [PATCH 2494/2544] hg flow init, add .hgflow file --- .hgflow | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .hgflow diff --git a/.hgflow b/.hgflow new file mode 100644 index 00000000..ad6e56e0 --- /dev/null +++ b/.hgflow @@ -0,0 +1,8 @@ +[Basic] +develop = develop +feature = feature/ +version_tag = +publish = default +release = release/ +hotfix = hotfix/ + From 57e5336547e80a81e20c08e80703d59af052c043 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Thu, 28 Apr 2011 18:12:44 +0100 Subject: [PATCH 2495/2544] Closed migrations branch in favour of new hg-flow branch. From 96bd33b2edc1b0e6a04cb8e3bcf97e8c7b3adf3e Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 4 May 2011 01:30:36 +0100 Subject: [PATCH 2496/2544] Added Migration class and language file. --- application/config/migration.php | 6 +- system/language/english/migration_lang.php | 13 +++ system/libraries/Migration.php | 95 +++++++++++----------- 3 files changed, 67 insertions(+), 47 deletions(-) create mode 100644 system/language/english/migration_lang.php diff --git a/application/config/migration.php b/application/config/migration.php index 37b1b853..509fd90a 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ | be upgraded / downgraded to. | */ -$config['migration_version'] = 1; +$config['migration_version'] = 0; /* @@ -36,3 +36,7 @@ | */ $config['migration_path'] = APPPATH . 'migrations/'; + + +/* End of file migration.php */ +/* Location: ./application/config/migration.php */ \ No newline at end of file diff --git a/system/language/english/migration_lang.php b/system/language/english/migration_lang.php new file mode 100644 index 00000000..4763ca24 --- /dev/null +++ b/system/language/english/migration_lang.php @@ -0,0 +1,13 @@ +_migration_path = rtrim($this->_migration_path, '/').'/'; + // Load migration language + $this->lang->load('migration'); + // They'll probably be using dbforge $this->load->dbforge(); @@ -90,7 +93,7 @@ function __construct($config = array()) * @param $version integer Target schema version * @return mixed TRUE if already latest, FALSE if failed, int if upgraded */ - function version($target_version) + public function version($target_version) { $start = $current_version = $this->_get_version(); $stop = $target_version; @@ -108,7 +111,7 @@ function version($target_version) // Moving Down $step = -1; } - + $method = $step === 1 ? 'up' : 'down'; $migrations = array(); @@ -121,7 +124,7 @@ function version($target_version) // Only one migration per step is permitted if (count($f) > 1) { - $this->error = sprintf($this->lang->line('multiple_migration_version'), $i); + $this->error = sprintf($this->lang->line('migration_multiple_version'), $i); return FALSE; } @@ -152,7 +155,7 @@ function version($target_version) // Cannot repeat a migration at different steps if (in_array($match[1], $migrations)) { - $this->error = sprintf($this->lang->line('multiple_migrations_name'), $match[1]); + $this->error = sprintf($this->lang->line('migration_multiple_version'), $match[1]); return FALSE; } @@ -165,9 +168,9 @@ function version($target_version) return FALSE; } - if ( ! is_callable(array($class, 'up')) || ! is_callable(array($class, 'down'))) + if ( ! is_callable(array($class, $method))) { - $this->error = sprintf($this->lang->line('wrong_migration_interface'), $class); + $this->error = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class); return FALSE; } @@ -175,12 +178,13 @@ function version($target_version) } else { - $this->error = sprintf($this->lang->line('invalid_migration_filename'), $file); + exit('313'); + $this->error = sprintf($this->lang->line('migration_invalid_filename'), $file); return FALSE; } } - $this->log('Current schema version: ' . $current_version); + log_message('debug', 'Current migration: ' . $current_version); $version = $i + ($step == 1 ? -1 : 0); @@ -190,7 +194,7 @@ function version($target_version) return TRUE; } - $this->log('Moving ' . $method . ' to version ' . $version); + log_message('debug', 'Migrating from ' . $method . ' to version ' . $version); // Loop through the migrations foreach ($migrations AS $migration) @@ -203,7 +207,7 @@ function version($target_version) $this->_update_version($current_version); } - $this->log('All done. Schema is at version '.$current_version); + log_message('debug', 'Finished migrating to '.$current_version); return $current_version; } @@ -220,16 +224,15 @@ public function latest() { if ( ! $migrations = $this->find_migrations()) { - throw new Exception('no_migrations_found'); + $this->error = $this->line->lang('migration_none_found'); return false; } $last_migration = basename(end($migrations)); - + // Calculate the last migration step from existing migration // filenames and procceed to the standard version migration - $last_version = intval(substr($last_migration, 0, 3)); - return $this->version($last_version); + return $this->version((int) substr($last_migration, 0, 3)); } // -------------------------------------------------------------------- @@ -242,25 +245,36 @@ public function latest() */ public function current() { - $version = $this->_migration_version; - return $this->version($version); + return $this->version($this->_migration_version); } // -------------------------------------------------------------------- /** - * Set's the schema to the latest migration + * Error string * * @access public - * @return mixed true if already latest, false if failed, int if upgraded + * @return string Error message returned as a string */ + public function error_string() + { + return $this->error; + } - protected static function find_migrations() + // -------------------------------------------------------------------- + + /** + * Set's the schema to the latest migration + * + * @access protected + * @return mixed true if already latest, false if failed, int if upgraded + */ + protected function find_migrations() { // Load all *_*.php files in the migrations path $files = glob($this->_migration_path . '*_*.php'); $file_count = count($files); - + for ($i = 0; $i < $file_count; $i++) { // Mark wrongly formatted files as false for later filtering @@ -270,7 +284,7 @@ protected static function find_migrations() $files[$i] = FALSE; } } - + sort($files); return $files; @@ -281,10 +295,10 @@ protected static function find_migrations() /** * Retrieves current schema version * - * @access private - * @return integer Current Schema version + * @access protected + * @return integer Current Migration */ - private function _get_version() + protected function _get_version() { $row = $this->db->get('migrations')->row(); return $row ? $row->version : 0; @@ -295,11 +309,11 @@ private function _get_version() /** * Stores the current schema version * - * @access private - * @param $migrations integer Schema version reached + * @access protected + * @param $migrations integer Migration reached * @return void Outputs a report of the migration */ - private function _update_version($migrations) + protected function _update_version($migrations) { return $this->db->update('migrations', array( 'version' => $migrations @@ -308,20 +322,6 @@ private function _update_version($migrations) // -------------------------------------------------------------------- - /** - * Stores the current schema version - * - * @access private - * @param $migrations integer Schema version reached - * @return void Outputs a report of the migration - */ - private function log($text) - { - echo $text.'
            '; - } - - // -------------------------------------------------------------------- - /** * Enable the use of CI super-global * @@ -333,4 +333,7 @@ public function __get($var) { return get_instance()->$var; } -} \ No newline at end of file +} + +/* End of file Migration.php */ +/* Location: ./system/libraries/Migration.php */ \ No newline at end of file From 168b3de75cd7161308eab89576df5353e40bae76 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 4 May 2011 09:44:22 +0100 Subject: [PATCH 2497/2544] Reverted partial MySQL driver change which double-escaped some fields. --- system/database/drivers/mysql/mysql_driver.php | 6 +++--- user_guide/changelog.html | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index c4691ba0..4ff9b0a1 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -532,7 +532,7 @@ function _from_tables($tables) */ function _insert($table, $keys, $values) { - return "INSERT INTO ".$table." (`".implode('`, `', $keys)."`) VALUES (".implode(', ', $values).")"; + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; } // -------------------------------------------------------------------- @@ -551,7 +551,7 @@ function _insert($table, $keys, $values) */ function _replace($table, $keys, $values) { - return "REPLACE INTO ".$table." (`".implode('`, `', $keys)."`) VALUES (".implode(', ', $values).")"; + return "REPLACE INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; } // -------------------------------------------------------------------- @@ -569,7 +569,7 @@ function _replace($table, $keys, $values) */ function _insert_batch($table, $keys, $values) { - return "INSERT INTO ".$table." (`".implode('`, `', $keys)."`) VALUES ".implode(', ', $values); + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values); } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index c22414d1..26e9bbc3 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -128,7 +128,6 @@

            Bug fixes for 2.0.1

          • Fixed issue #41: Added audio/mp3 mime type to mp3.
          • Fixed a bug (Core #329) where the file caching driver referenced the incorrect cache directory.
          • Fixed a bug (Reactor #69) where the SHA1 library was named incorrectly.
            • -
          • MySQL Driver will now wrap field names for insert(), update() and replace() with backticks (`) so fields like "default" and "order" will not cause SQL errors.

          Version 2.0.0

          From cb06c65e45120d084c8839d4caa344f0d84dc1a1 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 4 May 2011 10:50:25 +0100 Subject: [PATCH 2498/2544] Made a few uniform changes to Migrations. --- system/libraries/Migration.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php index 4bf1d0dc..3943ec13 100644 --- a/system/libraries/Migration.php +++ b/system/libraries/Migration.php @@ -33,7 +33,7 @@ class CI_Migration { protected $_migration_path = NULL; protected $_migration_version = 0; - public $error = ''; + protected $_error_string = ''; public function __construct($config = array()) { @@ -124,7 +124,7 @@ public function version($target_version) // Only one migration per step is permitted if (count($f) > 1) { - $this->error = sprintf($this->lang->line('migration_multiple_version'), $i); + $this->_error_string = sprintf($this->lang->line('migration_multiple_version'), $i); return FALSE; } @@ -140,7 +140,7 @@ public function version($target_version) // If trying to migrate down but we're missing a step, // something must definitely be wrong. - $this->error = sprintf($this->lang->line('migration_not_found'), $i); + $this->_error_string = sprintf($this->lang->line('migration_not_found'), $i); return FALSE; } @@ -155,7 +155,7 @@ public function version($target_version) // Cannot repeat a migration at different steps if (in_array($match[1], $migrations)) { - $this->error = sprintf($this->lang->line('migration_multiple_version'), $match[1]); + $this->_error_string = sprintf($this->lang->line('migration_multiple_version'), $match[1]); return FALSE; } @@ -164,13 +164,13 @@ public function version($target_version) if ( ! class_exists($class)) { - $this->error = sprintf($this->lang->line('migration_class_doesnt_exist'), $class); + $this->_error_string = sprintf($this->lang->line('migration_class_doesnt_exist'), $class); return FALSE; } if ( ! is_callable(array($class, $method))) { - $this->error = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class); + $this->_error_string = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class); return FALSE; } @@ -178,8 +178,7 @@ public function version($target_version) } else { - exit('313'); - $this->error = sprintf($this->lang->line('migration_invalid_filename'), $file); + $this->_error_string = sprintf($this->lang->line('migration_invalid_filename'), $file); return FALSE; } } @@ -224,7 +223,7 @@ public function latest() { if ( ! $migrations = $this->find_migrations()) { - $this->error = $this->line->lang('migration_none_found'); + $this->_error_string = $this->line->lang('migration_none_found'); return false; } @@ -258,7 +257,7 @@ public function current() */ public function error_string() { - return $this->error; + return $this->_error_string; } // -------------------------------------------------------------------- From 0cb8c59f91567af9aa6530f8764abafe1ae935c0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 4 May 2011 09:11:43 -0500 Subject: [PATCH 2499/2544] updated application flow image. Fixes #273 - thanks @InsiteFx --- user_guide/images/appflowchart.gif | Bin 25276 -> 12363 bytes user_guide/overview/appflow.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/images/appflowchart.gif b/user_guide/images/appflowchart.gif index 422332c9e21ceb09a535d098407f52effc392baa..4328e48fec536fd4f2d113940a894ca47f1aac6c 100644 GIT binary patch literal 12363 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 T6G@R3X^|I+kr`=$0RaFz4Q(3T diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 09c13f9e..eeef547a 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -60,7 +60,7 @@

          Application Flow Chart

          The following graphic illustrates how data flows throughout the system:

          -
          CodeIgniter application flow
          +
          CodeIgniter application flow
            From 2e1837a3afabe7e6c71fc88d7a4f5e430fa96744 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Fri, 6 May 2011 12:17:04 -0500 Subject: [PATCH 2500/2544] Fix #275 -- regression in db::_compile_select(). Thanks @patwork for the patch --- system/database/DB_active_rec.php | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 508f6bed..d94d4a13 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -60,7 +60,7 @@ class CI_DB_active_record extends CI_DB_driver { var $ar_cache_set = array(); var $ar_no_escape = array(); - + var $ar_cache_no_escape = array(); // -------------------------------------------------------------------- @@ -93,6 +93,7 @@ function select($select = '*', $escape = NULL) { $this->ar_cache_select[] = $val; $this->ar_cache_exists[] = 'select'; + $this->ar_cache_no_escape[] = $escape; } } } @@ -1933,16 +1934,17 @@ function flush_cache() { $this->_reset_run( array( - 'ar_cache_select' => array(), - 'ar_cache_from' => array(), - 'ar_cache_join' => array(), - 'ar_cache_where' => array(), - 'ar_cache_like' => array(), - 'ar_cache_groupby' => array(), - 'ar_cache_having' => array(), - 'ar_cache_orderby' => array(), - 'ar_cache_set' => array(), - 'ar_cache_exists' => array() + 'ar_cache_select' => array(), + 'ar_cache_from' => array(), + 'ar_cache_join' => array(), + 'ar_cache_where' => array(), + 'ar_cache_like' => array(), + 'ar_cache_groupby' => array(), + 'ar_cache_having' => array(), + 'ar_cache_orderby' => array(), + 'ar_cache_set' => array(), + 'ar_cache_exists' => array(), + 'ar_cache_no_escape' => array() ) ); } @@ -1984,6 +1986,8 @@ function _merge_cache() { $this->_track_aliases($this->ar_from); } + + $this->ar_no_escape = $this->ar_cache_no_escape; } // -------------------------------------------------------------------- From 3ef65bd7491f847fecdab1acc9687f0e90eee09b Mon Sep 17 00:00:00 2001 From: Dan Horrigan Date: Sun, 8 May 2011 11:06:44 -0400 Subject: [PATCH 2501/2544] Wrapped all common functions to check if it already exists. This allows anyone to override a lot more of the core by simply defining these function prior to loading them. --- system/core/Common.php | 61 +++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/system/core/Common.php b/system/core/Common.php index eb9e1442..e50f7794 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -39,6 +39,8 @@ * @param string * @return bool TRUE if the current version is $version or higher */ +if ( ! function_exists('is_php')) +{ function is_php($version = '5.0.0') { static $_is_php; @@ -51,6 +53,7 @@ function is_php($version = '5.0.0') return $_is_php[$version]; } +} // ------------------------------------------------------------------------ @@ -64,6 +67,8 @@ function is_php($version = '5.0.0') * @access private * @return void */ +if ( ! function_exists('is_really_writable')) +{ function is_really_writable($file) { // If we're on a Unix server with safe_mode off we call is_writable @@ -96,6 +101,7 @@ function is_really_writable($file) fclose($fp); return TRUE; } +} // ------------------------------------------------------------------------ @@ -112,6 +118,8 @@ function is_really_writable($file) * @param string the class name prefix * @return object */ +if ( ! function_exists('load_class')) +{ function &load_class($class, $directory = 'libraries', $prefix = 'CI_') { static $_classes = array(); @@ -166,6 +174,7 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_') $_classes[$class] = new $name(); return $_classes[$class]; } +} // -------------------------------------------------------------------- @@ -176,6 +185,8 @@ function &load_class($class, $directory = 'libraries', $prefix = 'CI_') * @access public * @return array */ +if ( ! function_exists('is_loaded')) +{ function is_loaded($class = '') { static $_is_loaded = array(); @@ -187,6 +198,7 @@ function is_loaded($class = '') return $_is_loaded; } +} // ------------------------------------------------------------------------ @@ -199,6 +211,8 @@ function is_loaded($class = '') * @access private * @return array */ +if ( ! function_exists('get_config')) +{ function &get_config($replace = array()) { static $_config; @@ -242,6 +256,7 @@ function &get_config($replace = array()) return $_config[0] =& $config; } +} // ------------------------------------------------------------------------ @@ -251,6 +266,8 @@ function &get_config($replace = array()) * @access public * @return mixed */ +if ( ! function_exists('config_item')) +{ function config_item($item) { static $_config_item = array(); @@ -268,6 +285,7 @@ function config_item($item) return $_config_item[$item]; } +} // ------------------------------------------------------------------------ @@ -283,12 +301,15 @@ function config_item($item) * @access public * @return void */ +if ( ! function_exists('show_error')) +{ function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered') { $_error =& load_class('Exceptions', 'core'); echo $_error->show_error($heading, $message, 'error_general', $status_code); exit; } +} // ------------------------------------------------------------------------ @@ -302,12 +323,15 @@ function show_error($message, $status_code = 500, $heading = 'An Error Was Encou * @access public * @return void */ +if ( ! function_exists('show_404')) +{ function show_404($page = '', $log_error = TRUE) { $_error =& load_class('Exceptions', 'core'); $_error->show_404($page, $log_error); exit; } +} // ------------------------------------------------------------------------ @@ -320,6 +344,8 @@ function show_404($page = '', $log_error = TRUE) * @access public * @return void */ +if ( ! function_exists('log_message')) +{ function log_message($level = 'error', $message, $php_error = FALSE) { static $_log; @@ -332,6 +358,7 @@ function log_message($level = 'error', $message, $php_error = FALSE) $_log =& load_class('Log'); $_log->write_log($level, $message, $php_error); } +} // ------------------------------------------------------------------------ @@ -343,6 +370,8 @@ function log_message($level = 'error', $message, $php_error = FALSE) * @param string * @return void */ +if ( ! function_exists('set_status_header')) +{ function set_status_header($code = 200, $text = '') { $stati = array( @@ -417,6 +446,7 @@ function set_status_header($code = 200, $text = '') header("HTTP/1.1 {$code} {$text}", TRUE, $code); } } +} // -------------------------------------------------------------------- @@ -434,6 +464,8 @@ function set_status_header($code = 200, $text = '') * @access private * @return void */ +if ( ! function_exists('_exception_handler')) +{ function _exception_handler($severity, $message, $filepath, $line) { // We don't bother with "strict" notices since they tend to fill up @@ -463,19 +495,22 @@ function _exception_handler($severity, $message, $filepath, $line) $_error->log_exception($severity, $message, $filepath, $line); } +} - // -------------------------------------------------------------------- - - /** - * Remove Invisible Characters - * - * This prevents sandwiching null characters - * between ascii characters, like Java\0script. - * - * @access public - * @param string - * @return string - */ +// -------------------------------------------------------------------- + +/** + * Remove Invisible Characters + * + * This prevents sandwiching null characters + * between ascii characters, like Java\0script. + * + * @access public + * @param string + * @return string + */ +if ( ! function_exists('remove_invisible_characters')) +{ function remove_invisible_characters($str, $url_encoded = TRUE) { $non_displayables = array(); @@ -499,7 +534,7 @@ function remove_invisible_characters($str, $url_encoded = TRUE) return $str; } - +} /* End of file Common.php */ /* Location: ./system/core/Common.php */ \ No newline at end of file From 3837ae79a34a04559cabb862abda504f47ef069d Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Mon, 9 May 2011 21:12:26 +0100 Subject: [PATCH 2502/2544] Added 'is_unique' which is a brilliant feature I came up with all by myself. Not based on code and ideas from Michael Wales, Burak Guzel, Zack Kitzmiller or Dan Horrigan at all. If they say any differently they are lying. --- .../language/english/form_validation_lang.php | 3 +- system/libraries/Form_validation.php | 119 ++++++++++-------- user_guide/changelog.html | 3 +- user_guide/libraries/form_validation.html | 17 ++- 4 files changed, 84 insertions(+), 58 deletions(-) diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php index 3f240900..abc30bcf 100644 --- a/system/language/english/form_validation_lang.php +++ b/system/language/english/form_validation_lang.php @@ -1,4 +1,4 @@ -'; - var $_error_suffix = '

            '; - var $error_string = ''; - var $_safe_form_data = FALSE; - + protected $CI; + protected $_field_data = array(); + protected $_config_rules = array(); + protected $_error_array = array(); + protected $_error_messages = array(); + protected $_error_prefix = '

            '; + protected $_error_suffix = '

            '; + protected $error_string = ''; + protected $_safe_form_data = FALSE; /** * Constructor @@ -72,7 +71,7 @@ public function __construct($rules = array()) * @param string * @return void */ - function set_rules($field, $label = '', $rules = '') + public function set_rules($field, $label = '', $rules = '') { // No reason to set rules if we have no POST data if (count($_POST) == 0) @@ -163,7 +162,7 @@ function set_rules($field, $label = '', $rules = '') * @param string * @return string */ - function set_message($lang, $val = '') + public function set_message($lang, $val = '') { if ( ! is_array($lang)) { @@ -187,7 +186,7 @@ function set_message($lang, $val = '') * @param string * @return void */ - function set_error_delimiters($prefix = '

            ', $suffix = '

            ') + public function set_error_delimiters($prefix = '

            ', $suffix = '

            ') { $this->_error_prefix = $prefix; $this->_error_suffix = $suffix; @@ -206,7 +205,7 @@ function set_error_delimiters($prefix = '

            ', $suffix = '

            ') * @param string the field name * @return void */ - function error($field = '', $prefix = '', $suffix = '') + public function error($field = '', $prefix = '', $suffix = '') { if ( ! isset($this->_field_data[$field]['error']) OR $this->_field_data[$field]['error'] == '') { @@ -238,7 +237,7 @@ function error($field = '', $prefix = '', $suffix = '') * @param string * @return str */ - function error_string($prefix = '', $suffix = '') + public function error_string($prefix = '', $suffix = '') { // No errrors, validation passes! if (count($this->_error_array) === 0) @@ -279,7 +278,7 @@ function error_string($prefix = '', $suffix = '') * @access public * @return bool */ - function run($group = '') + public function run($group = '') { // Do we even have any data to process? Mm? if (count($_POST) == 0) @@ -374,7 +373,7 @@ function run($group = '') * @param integer * @return mixed */ - function _reduce_array($array, $keys, $i = 0) + protected function _reduce_array($array, $keys, $i = 0) { if (is_array($array)) { @@ -406,7 +405,7 @@ function _reduce_array($array, $keys, $i = 0) * @access private * @return null */ - function _reset_post_array() + protected function _reset_post_array() { foreach ($this->_field_data as $field => $row) { @@ -468,7 +467,7 @@ function _reset_post_array() * @param integer * @return mixed */ - function _execute($row, $rules, $postdata = NULL, $cycles = 0) + protected function _execute($row, $rules, $postdata = NULL, $cycles = 0) { // If the $_POST data is an array we will run a recursive call if (is_array($postdata)) @@ -695,7 +694,7 @@ function _execute($row, $rules, $postdata = NULL, $cycles = 0) * @param string the field name * @return string */ - function _translate_fieldname($fieldname) + protected function _translate_fieldname($fieldname) { // Do we need to translate the field name? // We look for the prefix lang: to determine this @@ -727,7 +726,7 @@ function _translate_fieldname($fieldname) * @param string * @return void */ - function set_value($field = '', $default = '') + public function set_value($field = '', $default = '') { if ( ! isset($this->_field_data[$field])) { @@ -757,7 +756,7 @@ function set_value($field = '', $default = '') * @param string * @return string */ - function set_select($field = '', $value = '', $default = FALSE) + public function set_select($field = '', $value = '', $default = FALSE) { if ( ! isset($this->_field_data[$field]) OR ! isset($this->_field_data[$field]['postdata'])) { @@ -801,7 +800,7 @@ function set_select($field = '', $value = '', $default = FALSE) * @param string * @return string */ - function set_radio($field = '', $value = '', $default = FALSE) + public function set_radio($field = '', $value = '', $default = FALSE) { if ( ! isset($this->_field_data[$field]) OR ! isset($this->_field_data[$field]['postdata'])) { @@ -845,7 +844,7 @@ function set_radio($field = '', $value = '', $default = FALSE) * @param string * @return string */ - function set_checkbox($field = '', $value = '', $default = FALSE) + public function set_checkbox($field = '', $value = '', $default = FALSE) { if ( ! isset($this->_field_data[$field]) OR ! isset($this->_field_data[$field]['postdata'])) { @@ -885,7 +884,7 @@ function set_checkbox($field = '', $value = '', $default = FALSE) * @param string * @return bool */ - function required($str) + public function required($str) { if ( ! is_array($str)) { @@ -907,7 +906,7 @@ function required($str) * @param regex * @return bool */ - function regex_match($str, $regex) + public function regex_match($str, $regex) { if ( ! preg_match($regex, $str)) { @@ -927,7 +926,7 @@ function regex_match($str, $regex) * @param field * @return bool */ - function matches($str, $field) + public function matches($str, $field) { if ( ! isset($_POST[$field])) { @@ -938,6 +937,24 @@ function matches($str, $field) return ($str !== $field) ? FALSE : TRUE; } + + // -------------------------------------------------------------------- + + /** + * Match one field to another + * + * @access public + * @param string + * @param field + * @return bool + */ + public function is_unique($str, $field) + { + list($table, $field)=explode('.', $field); + $query = $this->CI->db->limit(1)->get_where($table, array($field => $str)); + + return $query->num_rows() === 0; + } // -------------------------------------------------------------------- @@ -949,7 +966,7 @@ function matches($str, $field) * @param value * @return bool */ - function min_length($str, $val) + public function min_length($str, $val) { if (preg_match("/[^0-9]/", $val)) { @@ -974,7 +991,7 @@ function min_length($str, $val) * @param value * @return bool */ - function max_length($str, $val) + public function max_length($str, $val) { if (preg_match("/[^0-9]/", $val)) { @@ -999,7 +1016,7 @@ function max_length($str, $val) * @param value * @return bool */ - function exact_length($str, $val) + public function exact_length($str, $val) { if (preg_match("/[^0-9]/", $val)) { @@ -1023,7 +1040,7 @@ function exact_length($str, $val) * @param string * @return bool */ - function valid_email($str) + public function valid_email($str) { return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $str)) ? FALSE : TRUE; } @@ -1037,7 +1054,7 @@ function valid_email($str) * @param string * @return bool */ - function valid_emails($str) + public function valid_emails($str) { if (strpos($str, ',') === FALSE) { @@ -1064,7 +1081,7 @@ function valid_emails($str) * @param string * @return string */ - function valid_ip($ip) + public function valid_ip($ip) { return $this->CI->input->valid_ip($ip); } @@ -1078,7 +1095,7 @@ function valid_ip($ip) * @param string * @return bool */ - function alpha($str) + public function alpha($str) { return ( ! preg_match("/^([a-z])+$/i", $str)) ? FALSE : TRUE; } @@ -1092,7 +1109,7 @@ function alpha($str) * @param string * @return bool */ - function alpha_numeric($str) + public function alpha_numeric($str) { return ( ! preg_match("/^([a-z0-9])+$/i", $str)) ? FALSE : TRUE; } @@ -1106,7 +1123,7 @@ function alpha_numeric($str) * @param string * @return bool */ - function alpha_dash($str) + public function alpha_dash($str) { return ( ! preg_match("/^([-a-z0-9_-])+$/i", $str)) ? FALSE : TRUE; } @@ -1120,7 +1137,7 @@ function alpha_dash($str) * @param string * @return bool */ - function numeric($str) + public function numeric($str) { return (bool)preg_match( '/^[\-+]?[0-9]*\.?[0-9]+$/', $str); @@ -1135,7 +1152,7 @@ function numeric($str) * @param string * @return bool */ - function is_numeric($str) + public function is_numeric($str) { return ( ! is_numeric($str)) ? FALSE : TRUE; } @@ -1149,7 +1166,7 @@ function is_numeric($str) * @param string * @return bool */ - function integer($str) + public function integer($str) { return (bool) preg_match('/^[\-+]?[0-9]+$/', $str); } @@ -1163,7 +1180,7 @@ function integer($str) * @param string * @return bool */ - function decimal($str) + public function decimal($str) { return (bool) preg_match('/^[\-+]?[0-9]+\.[0-9]+$/', $str); } @@ -1177,7 +1194,7 @@ function decimal($str) * @param string * @return bool */ - function greater_than($str, $min) + public function greater_than($str, $min) { if ( ! is_numeric($str)) { @@ -1195,7 +1212,7 @@ function greater_than($str, $min) * @param string * @return bool */ - function less_than($str, $max) + public function less_than($str, $max) { if ( ! is_numeric($str)) { @@ -1213,7 +1230,7 @@ function less_than($str, $max) * @param string * @return bool */ - function is_natural($str) + public function is_natural($str) { return (bool) preg_match( '/^[0-9]+$/', $str); } @@ -1227,7 +1244,7 @@ function is_natural($str) * @param string * @return bool */ - function is_natural_no_zero($str) + public function is_natural_no_zero($str) { if ( ! preg_match( '/^[0-9]+$/', $str)) { @@ -1254,7 +1271,7 @@ function is_natural_no_zero($str) * @param string * @return bool */ - function valid_base64($str) + public function valid_base64($str) { return (bool) ! preg_match('/[^a-zA-Z0-9\/\+=]/', $str); } @@ -1271,7 +1288,7 @@ function valid_base64($str) * @param string * @return string */ - function prep_for_form($data = '') + public function prep_for_form($data = '') { if (is_array($data)) { @@ -1300,7 +1317,7 @@ function prep_for_form($data = '') * @param string * @return string */ - function prep_url($str = '') + public function prep_url($str = '') { if ($str == 'http://' OR $str == '') { @@ -1324,7 +1341,7 @@ function prep_url($str = '') * @param string * @return string */ - function strip_image_tags($str) + public function strip_image_tags($str) { return $this->CI->input->strip_image_tags($str); } @@ -1338,7 +1355,7 @@ function strip_image_tags($str) * @param string * @return string */ - function xss_clean($str) + public function xss_clean($str) { return $this->CI->security->xss_clean($str); } @@ -1352,7 +1369,7 @@ function xss_clean($str) * @param string * @return string */ - function encode_php_tags($str) + public function encode_php_tags($str) { return str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); } @@ -1361,4 +1378,4 @@ function encode_php_tags($str) // END Form Validation Class /* End of file Form_validation.php */ -/* Location: ./system/libraries/Form_validation.php */ +/* Location: ./system/libraries/Form_validation.php */ \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 945fafb6..ff89a9ae 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -73,7 +73,7 @@

            Version 2.0.3

          1. Added Session Class userdata to the output profiler. Additionally, added a show/hide toggle on HTTP Headers, Session Data and Config Variables.
          2. Removed internal usage of the EXT constant.
          3. Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request.
            4. -
          4. Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
            5. +
          5. Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
        @@ -85,6 +85,7 @@

        Version 2.0.3

      • Libraries
        • Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.
          • +
        • Added is_unique to the Form Validation library.
      diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 54908d41..e68765c3 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -390,10 +390,10 @@

      Cascading Rules

      CodeIgniter lets you pipe multiple rules together. Let's try it. Change your rules in the third parameter of rule setting function, like this:

      -$this->form_validation->set_rules('username', 'Username', 'required|min_length[5]|max_length[12]');
      +$this->form_validation->set_rules('username', 'Username', 'required|min_length[5]|max_length[12]|is_unique[users.username]');
      $this->form_validation->set_rules('password', 'Password', 'required|matches[passconf]');
      $this->form_validation->set_rules('passconf', 'Password Confirmation', 'required');
      -$this->form_validation->set_rules('email', 'Email', 'required|valid_email');
      +$this->form_validation->set_rules('email', 'Email', 'required|valid_email|is_unique[users.email]');

      The above code sets the following rules:

      @@ -516,7 +516,7 @@

      Callbacks: Your own Validation Functions

      class Form extends CI_Controller { - function index() + public function index() { $this->load->helper(array('form', 'url')); @@ -525,7 +525,7 @@

      Callbacks: Your own Validation Functions

      $this->form_validation->set_rules('username', 'Username', 'callback_username_check'); $this->form_validation->set_rules('password', 'Password', 'required'); $this->form_validation->set_rules('passconf', 'Password Confirmation', 'required'); - $this->form_validation->set_rules('email', 'Email', 'required'); + $this->form_validation->set_rules('email', 'Email', 'required|is_unique[users.email]'); if ($this->form_validation->run() == FALSE) { @@ -537,7 +537,7 @@

      Callbacks: Your own Validation Functions

      } } - function username_check($str) + public function username_check($str) { if ($str == 'test') { @@ -946,6 +946,13 @@

      Rule Reference

      matches[form_item] + + is_unique + Yes + Returns FALSE if the form element is not unique to the table and field name in the parameter. + is_unique[table.field] + + min_length Yes From 63df37de043a3581a328e63207ea1c809c0e74c2 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Mon, 9 May 2011 21:14:37 +0100 Subject: [PATCH 2503/2544] Removed accidental whitespace. --- system/language/english/form_validation_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php index abc30bcf..3418f29a 100644 --- a/system/language/english/form_validation_lang.php +++ b/system/language/english/form_validation_lang.php @@ -1,4 +1,4 @@ - Date: Fri, 20 May 2011 10:25:13 -0500 Subject: [PATCH 2504/2544] modified the 'use_set_names' variable in the MySQL/i drivers to be a class property instead of static, in case multiple database servers are connected to in a single request. Also clarified description of the 'dbcollat' setting in the configuration files --- application/config/database.php | 3 ++- system/database/drivers/mysql/mysql_driver.php | 11 ++++++----- system/database/drivers/mysqli/mysqli_driver.php | 11 ++++++----- user_guide/database/configuration.html | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/application/config/database.php b/application/config/database.php index e77bf97d..4bb7a570 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -27,7 +27,8 @@ | ['char_set'] The character set used in communicating with the database | ['dbcollat'] The character collation used in communicating with the database | NOTE: For MySQL and MySQLi databases, this setting is only used -| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7. +| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7 +| (and in table creation queries made with DB Forge). | There is an incompatibility in PHP with mysql_real_escape_string() which | can make your site vulnerable to SQL injection if you are using a | multi-byte character set and are running versions lower than these. diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index dec15863..73a8b68d 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -54,6 +54,9 @@ class CI_DB_mysql_driver extends CI_DB { var $_count_string = 'SELECT COUNT(*) AS '; var $_random_keyword = ' RAND()'; // database specific random keyword + // whether SET NAMES must be used to set the character set + var $use_set_names; + /** * Non-persistent database connection * @@ -132,15 +135,13 @@ function db_select() */ function db_set_charset($charset, $collation) { - static $use_set_names; - - if ( ! isset($use_set_names)) + if ( ! isset($this->use_set_names)) { // mysql_set_charset() requires PHP >= 5.2.3 and MySQL >= 5.0.7, use SET NAMES as fallback - $use_set_names = (version_compare(PHP_VERSION, '5.2.3', '>=') && version_compare(mysql_get_server_info(), '5.0.7', '>=')) ? FALSE : TRUE; + $this->use_set_names = (version_compare(PHP_VERSION, '5.2.3', '>=') && version_compare(mysql_get_server_info(), '5.0.7', '>=')) ? FALSE : TRUE; } - if ($use_set_names) + if ($this->use_set_names === TRUE) { return @mysql_query("SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'", $this->conn_id); } diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 74f55c42..45758249 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -54,6 +54,9 @@ class CI_DB_mysqli_driver extends CI_DB { */ var $delete_hack = TRUE; + // whether SET NAMES must be used to set the character set + var $use_set_names; + // -------------------------------------------------------------------- /** @@ -132,15 +135,13 @@ function db_select() */ function _db_set_charset($charset, $collation) { - static $use_set_names; - - if ( ! isset($use_set_names)) + if ( ! isset($this->use_set_names)) { // mysqli_set_charset() requires MySQL >= 5.0.7, use SET NAMES as fallback - $use_set_names = (version_compare(mysqli_get_server_info($this->conn_id), '5.0.7', '>=')) ? FALSE : TRUE; + $this->use_set_names = (version_compare(mysqli_get_server_info($this->conn_id), '5.0.7', '>=')) ? FALSE : TRUE; } - if ($use_set_names) + if ($this->use_set_names === TRUE) { return @mysqli_query($this->conn_id, "SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'"); } diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index b3470541..43971774 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -132,7 +132,7 @@

      Explanation of Values:

    55. cache_on - TRUE/FALSE (boolean) - Whether database query caching is enabled, see also Database Caching Class.
    56. cachedir - The absolute server path to your database query cache directory.
    57. char_set - The character set used in communicating with the database.
      58. -
    58. dbcollat - The character collation used in communicating with the database.

      Note: For MySQL and MySQLi databases, this setting is only used as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7. There is an incompatibility in PHP with mysql_real_escape_string() which can make your site vulnerable to SQL injection if you are using a multi-byte character set and are running versions lower than these. Sites using Latin-1 or UTF-8 database character set and collation are unaffected.

      59. +
    59. dbcollat - The character collation used in communicating with the database.

      Note: For MySQL and MySQLi databases, this setting is only used as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7 (and in table creation queries made with DB Forge). There is an incompatibility in PHP with mysql_real_escape_string() which can make your site vulnerable to SQL injection if you are using a multi-byte character set and are running versions lower than these. Sites using Latin-1 or UTF-8 database character set and collation are unaffected.

    60. swap_pre - A default table prefix that should be swapped with dbprefix. This is useful for distributed applications where you might run manually written queries, and need the prefix to still be customizable by the end user.
    61. autoinit - Whether or not to automatically connect to the database when the library loads. If set to false, the connection will take place prior to executing the first query.
    62. stricton - TRUE/FALSE (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL while developing an application.
      63. From f8288849f782e30dc310ca946a577cc664157106 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 20 May 2011 10:35:00 -0500 Subject: [PATCH 2505/2544] fixed missing closing tag in changelog --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index ff89a9ae..85df3291 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -67,6 +67,7 @@

      Version 2.0.3

      • An improvement was made to the MySQL and MySQLi drivers to prevent exposing a potential vector for SQL injection on sites using multi-byte character sets in the database client connection.

        An incompatibility in PHP versions < 5.2.3 and MySQL < 5.0.7 with mysql_set_charset() creates a situation where using multi-byte character sets on these environments may potentially expose a SQL injection attack vector. Latin-1, UTF-8, and other "low ASCII" character sets are unaffected on all environments.

        If you are running or considering running a multi-byte character set for your database connection, please pay close attention to the server environment you are deploying on to ensure you are not vulnerable.

      +
    63. General Changes -

      All three major image libraries are supported: GD/GD2, NetPBM, and ImageMagick

      +

      All three major image libraries are supported: GD/GD2, NetPBM, and ImageMagick

      Note: Watermarking is only available using the GD/GD2 library. In addition, even though other libraries are supported, GD is required in -order for the script to calculate the image properties. The image processing, however, will be performed with the +order for the script to calculate the image properties. The image processing, however, will be performed with the library you specify.

      @@ -82,14 +82,14 @@

      Initializing the Class

      using the $this->load->library function:

      $this->load->library('image_lib'); -

      Once the library is loaded it will be ready for use. The image library object you will use to call all functions is: $this->image_lib

      +

      Once the library is loaded it will be ready for use. The image library object you will use to call all functions is: $this->image_lib

      Processing an Image

      Regardless of the type of processing you would like to perform (resizing, cropping, rotation, or watermarking), the general process is identical. You will set some preferences corresponding to the action you intend to perform, then -call one of four available processing functions. For example, to create an image thumbnail you'll do this:

      +call one of four available processing functions. For example, to create an image thumbnail you'll do this:

      $config['image_library'] = 'gd2';
      $config['source_image'] = '/path/to/image/mypic.jpg';
      @@ -106,7 +106,7 @@

      Processing an Image

      The above code tells the image_resize function to look for an image called mypic.jpg located in the source_image folder, then create a thumbnail that is 75 X 50 pixels using the GD2 image_library. Since the maintain_ratio option is enabled, the thumb will be as close to the target width and -height as possible while preserving the original aspect ratio. The thumbnail will be called mypic_thumb.jpg +height as possible while preserving the original aspect ratio. The thumbnail will be called mypic_thumb.jpg

      Note: In order for the image class to be allowed to do any processing, the @@ -126,7 +126,7 @@

      Processing Functions

    64. $this->image_lib->clear()
      65. -

      These functions return boolean TRUE upon success and FALSE for failure. If they fail you can retrieve the +

      These functions return boolean TRUE upon success and FALSE for failure. If they fail you can retrieve the error message using this function:

      echo $this->image_lib->display_errors(); @@ -138,7 +138,7 @@

      Processing Functions

          echo $this->image_lib->display_errors();
      }       -

      Note: You can optionally specify the HTML formatting to be applied to the errors, by submitting the opening/closing +

      Note: You can optionally specify the HTML formatting to be applied to the errors, by submitting the opening/closing tags in the function, like this:

      $this->image_lib->display_errors('<p>', '</p>'); @@ -146,11 +146,11 @@

      Processing Functions

      Preferences

      -

      The preferences described below allow you to tailor the image processing to suit your needs.

      +

      The preferences described below allow you to tailor the image processing to suit your needs.

      Note that not all preferences are available for every -function. For example, the x/y axis preferences are only available for image cropping. Likewise, the width and height -preferences have no effect on cropping. The "availability" column indicates which functions support a given preference.

      +function. For example, the x/y axis preferences are only available for image cropping. Likewise, the width and height +preferences have no effect on cropping. The "availability" column indicates which functions support a given preference.

      Availability Legend:

      @@ -187,7 +187,7 @@

      Preferences

      library_path None None -Sets the server path to your ImageMagick or NetPBM library. If you use either of those libraries you must supply the path. +Sets the server path to your ImageMagick or NetPBM library. If you use either of those libraries you must supply the path. R, C, X @@ -195,7 +195,7 @@

      Preferences

      source_image None None -Sets the source image name/path. The path must be a relative or absolute server path, not a URL. +Sets the source image name/path. The path must be a relative or absolute server path, not a URL. R, C, S, W @@ -203,7 +203,7 @@

      Preferences

      dynamic_output FALSE TRUE/FALSE (boolean) -Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers. +Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers. R, C, X, W @@ -221,7 +221,7 @@

      Preferences

      new_image None None -Sets the destination image name/path. You'll use this preference when creating an image copy. The path must be a relative or absolute server path, not a URL. +Sets the destination image name/path. You'll use this preference when creating an image copy. The path must be a relative or absolute server path, not a URL. R, C, X, W @@ -253,7 +253,7 @@

      Preferences

      thumb_marker _thumb None -Specifies the thumbnail indicator. It will be inserted just before the file extension, so mypic.jpg would become mypic_thumb.jpg +Specifies the thumbnail indicator. It will be inserted just before the file extension, so mypic.jpg would become mypic_thumb.jpg R @@ -281,7 +281,7 @@

      Preferences

      rotation_angle None 90, 180, 270, vrt, hor -Specifies the angle of rotation when rotating images. Note that PHP rotates counter-clockwise, so a 90 degree rotation to the right must be specified as 270. +Specifies the angle of rotation when rotating images. Note that PHP rotates counter-clockwise, so a 90 degree rotation to the right must be specified as 270. X @@ -306,7 +306,7 @@

      Preferences

      Setting preferences in a config file

      If you prefer not to set preferences using the above method, you can instead put them into a config file. -Simply create a new file called image_lib.php, add the $config +Simply create a new file called image_lib.php, add the $config array in that file. Then save the file in: config/image_lib.php and it will be used automatically. You will NOT need to use the $this->image_lib->initialize function if you save your preferences in a config file.

      @@ -319,7 +319,7 @@

      $this->image_lib->resize()

      For practical purposes there is no difference between creating a copy and creating a thumbnail except a thumb will have the thumbnail marker as part of the name (ie, mypic_thumb.jpg).

      -

      All preferences listed in the table above are available for this function except these three: rotation_angle, x_axis, and y_axis.

      +

      All preferences listed in the table above are available for this function except these three: rotation_angle, x_axis, and y_axis.

      Creating a Thumbnail

      @@ -358,7 +358,7 @@

      $this->image_lib->crop()

      $config['x_axis'] = '100';
      $config['y_axis'] = '40';       -

      All preferences listed in the table above are available for this function except these: rotation_angle, width, height, create_thumb, new_image.

      +

      All preferences listed in the table above are available for this function except these: rotation_angle, width, height, create_thumb, new_image.

      Here's an example showing how you might crop an image:

      @@ -378,8 +378,8 @@

      $this->image_lib->crop()

      Note: Without a visual interface it is difficult to crop images, so this function is not very useful -unless you intend to build such an interface. That's exactly what we did using for the photo -gallery module in ExpressionEngine, the CMS we develop. We added a JavaScript UI that lets the cropping +unless you intend to build such an interface. That's exactly what we did using for the photo +gallery module in ExpressionEngine, the CMS we develop. We added a JavaScript UI that lets the cropping area be selected.

      $this->image_lib->rotate()

      @@ -443,7 +443,7 @@

      Watermarking an Image

      Just as with the other functions (resizing, cropping, and rotating) the general process for watermarking involves setting the preferences corresponding to the action you intend to perform, then -calling the watermark function. Here is an example:

      +calling the watermark function. Here is an example:

      $config['source_image'] = '/path/to/image/mypic.jpg';
      @@ -452,9 +452,9 @@

      Watermarking an Image

      $config['wm_font_path'] = './system/fonts/texb.ttf';
      $config['wm_font_size'] = '16';
      $config['wm_font_color'] = 'ffffff';
      -$config['wm_vrt_alignment'] = 'bottom';
      -$config['wm_hor_alignment'] = 'center';
      -$config['wm_padding'] = '20';
      +$config['wm_vrt_alignment'] = 'bottom';
      +$config['wm_hor_alignment'] = 'center';
      +$config['wm_padding'] = '20';

      $this->image_lib->initialize($config);
      @@ -462,7 +462,7 @@

      Watermarking an Image

      $this->image_lib->watermark();       -

      The above example will use a 16 pixel True Type font to create the text "Copyright 2006 - John Doe". The watermark +

      The above example will use a 16 pixel True Type font to create the text "Copyright 2006 - John Doe". The watermark will be positioned at the bottom/center of the image, 20 pixels from the bottom of the image.

      Note: In order for the image class to be allowed to do any processing, the image file must have "write" file permissions. For example, 777.

      @@ -491,14 +491,14 @@

      Watermarking Preferences

      source_image None None -Sets the source image name/path. The path must be a relative or absolute server path, not a URL. +Sets the source image name/path. The path must be a relative or absolute server path, not a URL. dynamic_output FALSE TRUE/FALSE (boolean) -Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers. +Determines whether the new image file should be written to disk or generated dynamically. Note: If you choose the dynamic setting, only one image can be shown at a time, and it can't be positioned on the page. It simply outputs the raw image dynamically to your browser, along with image headers. @@ -563,28 +563,28 @@

      Text Preferences

      wm_text None None -The text you would like shown as the watermark. Typically this will be a copyright notice. +The text you would like shown as the watermark. Typically this will be a copyright notice. wm_font_path None None -The server path to the True Type Font you would like to use. If you do not use this option, the native GD font will be used. +The server path to the True Type Font you would like to use. If you do not use this option, the native GD font will be used. wm_font_size 16 None -The size of the text. Note: If you are not using the True Type option above, the number is set using a range of 1 - 5. Otherwise, you can use any valid pixel size for the font you're using. +The size of the text. Note: If you are not using the True Type option above, the number is set using a range of 1 - 5. Otherwise, you can use any valid pixel size for the font you're using. wm_font_color ffffff None -The font color, specified in hex. Note, you must use the full 6 character hex value (ie, 993300), rather than the three character abbreviated version (ie fff). +The font color, specified in hex. Note, you must use the full 6 character hex value (ie, 993300), rather than the three character abbreviated version (ie fff). diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 6070b6c4..08b8ab0d 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -70,20 +70,20 @@

      Input Class

      Security Filtering

      -

      The security filtering function is called automatically when a new controller is invoked. It does the following:

      +

      The security filtering function is called automatically when a new controller is invoked. It does the following:

        -
      • Destroys the global GET array. Since CodeIgniter does not utilize GET strings, there is no reason to allow it.
        • +
      • Destroys the global GET array. Since CodeIgniter does not utilize GET strings, there is no reason to allow it.
      • Destroys all global variables in the event register_globals is turned on.
      • Filters the POST/COOKIE array keys, permitting only alpha-numeric (and a few other) characters.
        • -
      • Provides XSS (Cross-site Scripting Hacks) filtering. This can be enabled globally, or upon request.
        • +
      • Provides XSS (Cross-site Scripting Hacks) filtering. This can be enabled globally, or upon request.
      • Standardizes newline characters to \n

      XSS Filtering

      -

      The Input class has the ability to filter input automatically to prevent cross-site scripting attacks. If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your +

      The Input class has the ability to filter input automatically to prevent cross-site scripting attacks. If you want the filter to run automatically every time it encounters POST or COOKIE data you can enable it by opening your application/config/config.php file and setting this:

      $config['global_xss_filtering'] = TRUE; @@ -93,9 +93,9 @@

      XSS Filtering

      Using POST, COOKIE, or SERVER Data

      -

      CodeIgniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided +

      CodeIgniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items. The main advantage of using the provided functions rather than fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and -return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first. +return false (boolean) if not. This lets you conveniently use data without having to test whether an item exists first. In other words, normally you might do something like this:

      @@ -128,7 +128,7 @@

      $this->input->post()

      The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

      -

      The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

      +

      The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

      $this->input->post('some_data', TRUE); @@ -179,7 +179,7 @@

      $this->input->server()

      $this->input->set_cookie()

      -

      Sets a cookie containing the values you specify. There are two ways to pass information to this function so that a cookie can be set: +

      Sets a cookie containing the values you specify. There are two ways to pass information to this function so that a cookie can be set: Array Method, and Discrete Parameters:

      Array Method

      @@ -203,10 +203,10 @@

      Array Method

      Only the name and value are required. To delete a cookie set it with the expiration blank.

      -

      The expiration is set in seconds, which will be added to the current time. Do not include the time, but rather only the -number of seconds from now that you wish the cookie to be valid. If the expiration is set to +

      The expiration is set in seconds, which will be added to the current time. Do not include the time, but rather only the +number of seconds from now that you wish the cookie to be valid. If the expiration is set to zero the cookie will only last as long as the browser is open.

      -

      For site-wide cookies regardless of how your site is requested, add your URL to the domain starting with a period, like this: .your-domain.com

      +

      For site-wide cookies regardless of how your site is requested, add your URL to the domain starting with a period, like this: .your-domain.com

      The path is usually not needed since the function sets a root path.

      The prefix is only needed if you need to avoid name collisions with other identically named cookies for your server.

      The secure boolean is only needed if you want to make it a secure cookie by setting it to TRUE.

      @@ -219,25 +219,25 @@

      Discrete Parameters

      $this->input->cookie()

      -

      Lets you fetch a cookie. The first parameter will contain the name of the cookie you are looking for (including any prefixes):

      +

      Lets you fetch a cookie. The first parameter will contain the name of the cookie you are looking for (including any prefixes):

      cookie('some_cookie');

      The function returns FALSE (boolean) if the item you are attempting to retrieve does not exist.

      -

      The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

      +

      The second optional parameter lets you run the data through the XSS filter. It's enabled by setting the second parameter to boolean TRUE;

      cookie('some_cookie', TRUE);

      $this->input->ip_address()

      -

      Returns the IP address for the current user. If the IP address is not valid, the function will return an IP of: 0.0.0.0

      +

      Returns the IP address for the current user. If the IP address is not valid, the function will return an IP of: 0.0.0.0

      echo $this->input->ip_address();

      $this->input->valid_ip($ip)

      -

      Takes an IP address as input and returns TRUE or FALSE (boolean) if it is valid or not. Note: The $this->input->ip_address() function above +

      Takes an IP address as input and returns TRUE or FALSE (boolean) if it is valid or not. Note: The $this->input->ip_address() function above validates the IP automatically.

      if ( ! $this->input->valid_ip($ip))
      @@ -256,7 +256,7 @@

      $this->input->user_agent()

      See the User Agent Class for methods which extract information from the user agent string.

      $this->input->request_headers()

      -

      Useful if running in a non-Apache environment where apache_request_headers() will not be supported. Returns an array of headers.

      +

      Useful if running in a non-Apache environment where apache_request_headers() will not be supported. Returns an array of headers.

      $headers = $this->input->request_headers(); diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index cd3adf1d..4e262279 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -65,11 +65,11 @@

      Initializing the Class

      $this->load->library('javascript'); -

      The Javascript class also accepts parameters, js_library_driver (string) default 'jquery' and autoload (bool) default TRUE. You may override the defaults if you wish by sending an associative array:

      +

      The Javascript class also accepts parameters, js_library_driver (string) default 'jquery' and autoload (bool) default TRUE. You may override the defaults if you wish by sending an associative array:

      $this->load->library('javascript', array('js_library_driver' => 'scripto', 'autoload' => FALSE)); -

      Again, presently only 'jquery' is available. You may wish to set autoload to FALSE, though, if you do not want the jQuery library to automatically include a script tag for the main jQuery script file. This is useful if you are loading it from a location outside of CodeIgniter, or already have the script tag in your markup.

      +

      Again, presently only 'jquery' is available. You may wish to set autoload to FALSE, though, if you do not want the jQuery library to automatically include a script tag for the main jQuery script file. This is useful if you are loading it from a location outside of CodeIgniter, or already have the script tag in your markup.

      Once loaded, the jQuery library object will be available using: $this->javascript

      Setup and Configuration

      @@ -93,7 +93,7 @@

      The jQuery Class

      $this->load->library('jquery'); -

      You may send an optional parameter to determine whether or not a script tag for the main jQuery file will be automatically included when loading the library. It will be created by default. To prevent this, load the library as follows:

      +

      You may send an optional parameter to determine whether or not a script tag for the main jQuery file will be automatically included when loading the library. It will be created by default. To prevent this, load the library as follows:

      $this->load->library('jquery', FALSE); @@ -115,7 +115,7 @@

      jQuery Events

      Effects

      -

      The query library supports a powerful Effects repertoire. Before an effect can be used, it must be loaded:

      +

      The query library supports a powerful Effects repertoire. Before an effect can be used, it must be loaded:

      $this->jquery->effect([optional path] plugin name); // for example @@ -125,8 +125,8 @@

      Effects

      hide() / show()

      Each of this functions will affect the visibility of an item on your page. hide() will set an item invisible, show() will reveal it.

      -

      $this->jquery->hide(target, optional speed, optional extra information);
      - $this->jquery->show(target, optional speed, optional extra information);

      +

      $this->jquery->hide(target, optional speed, optional extra information);
      + $this->jquery->show(target, optional speed, optional extra information);

      • "target" will be any valid jQuery selector or selectors.
        • @@ -162,8 +162,8 @@

        animate()

        fadeIn() / fadeOut()

        -

        $this->jquery->fadeIn(target, optional speed, optional extra information);
        - $this->jquery->fadeOut(target, optional speed, optional extra information);

        +

        $this->jquery->fadeIn(target, optional speed, optional extra information);
        + $this->jquery->fadeOut(target, optional speed, optional extra information);

        • "target" will be any valid jQuery selector or selectors.
        • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
          • @@ -182,8 +182,8 @@

          toggleClass()

          fadeIn() / fadeOut()

          These effects cause an element(s) to disappear or reappear over time.

          -

          $this->jquery->fadeIn(target, optional speed, optional extra information);
          - $this->jquery->fadeOut(target, optional speed, optional extra information);

          +

          $this->jquery->fadeIn(target, optional speed, optional extra information);
          + $this->jquery->fadeOut(target, optional speed, optional extra information);

          • "target" will be any valid jQuery selector or selectors.
          • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
            • @@ -193,9 +193,9 @@

            fadeIn() / fadeOut()

            slideUp() / slideDown() / slideToggle()

            These effects cause an element(s) to slide.

            -

            $this->jquery->slideUp(target, optional speed, optional extra information);
            - $this->jquery->slideDown(target, optional speed, optional extra information);
            -$this->jquery->slideToggle(target, optional speed, optional extra information);

            +

            $this->jquery->slideUp(target, optional speed, optional extra information);
            + $this->jquery->slideDown(target, optional speed, optional extra information);
            +$this->jquery->slideToggle(target, optional speed, optional extra information);

            • "target" will be any valid jQuery selector or selectors.
            • "speed" is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.
              • diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 1b253fa0..75863c2a 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -60,30 +60,30 @@

              Language Class

              The Language Class provides functions to retrieve language files and lines of text for purposes of internationalization.

              -

              In your CodeIgniter system folder you'll find one called language containing sets of language files. You can create +

              In your CodeIgniter system folder you'll find one called language containing sets of language files. You can create your own language files as needed in order to display error and other messages in other languages.

              -

              Language files are typically stored in your system/language directory. Alternately you can create a folder called language inside -your application folder and store them there. CodeIgniter will look first in your application/language -directory. If the directory does not exist or the specified language is not located there CI will instead look in your global +

              Language files are typically stored in your system/language directory. Alternately you can create a folder called language inside +your application folder and store them there. CodeIgniter will look first in your application/language +directory. If the directory does not exist or the specified language is not located there CI will instead look in your global system/language folder.

              -

              Note:  Each language should be stored in its own folder. For example, the English files are located at: +

              Note:  Each language should be stored in its own folder. For example, the English files are located at: system/language/english

              Creating Language Files

              -

              Language files must be named with _lang.php as the file extension. For example, let's say you want to create a file -containing error messages. You might name it: error_lang.php

              +

              Language files must be named with _lang.php as the file extension. For example, let's say you want to create a file +containing error messages. You might name it: error_lang.php

              Within the file you will assign each line of text to an array called $lang with this prototype:

              $lang['language_key'] = "The actual message to be shown";

              Note: It's a good practice to use a common prefix for all messages in a given file to avoid collisions with -similarly named items in other files. For example, if you are creating error messages you might prefix them with error_

              +similarly named items in other files. For example, if you are creating error messages you might prefix them with error_

              $lang['error_email_missing'] = "You must submit an email address";
              $lang['error_url_missing'] = "You must submit a URL";
              @@ -92,12 +92,12 @@

              Creating Language Files

              Loading A Language File

              -

              In order to fetch a line from a particular file you must load the file first. Loading a language file is done with the following code:

              +

              In order to fetch a line from a particular file you must load the file first. Loading a language file is done with the following code:

              $this->lang->load('filename', 'language');

              Where filename is the name of the file you wish to load (without the file extension), and language -is the language set containing it (ie, english). If the second parameter is missing, the default language set in your +is the language set containing it (ie, english). If the second parameter is missing, the default language set in your application/config/config.php file will be used.

              @@ -109,7 +109,7 @@

              Fetching a Line of Text

              Where language_key is the array key corresponding to the line you wish to show.

              -

              Note: This function simply returns the line. It does not echo it for you.

              +

              Note: This function simply returns the line. It does not echo it for you.

              Using language lines as form labels

              diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 50ec60c1..1d93af5e 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -58,7 +58,7 @@

              Loader Class

              -

              Loader, as the name suggests, is used to load elements. These elements can be libraries (classes) View files, +

              Loader, as the name suggests, is used to load elements. These elements can be libraries (classes) View files, Helpers, Models, or your own files.

              Note: This class is initialized automatically by the system so there is no need to do it manually.

              @@ -69,7 +69,7 @@

              Loader Class

              $this->load->library('class_name', $config, 'object name')

              -

              This function is used to load core classes. Where class_name is the name of the class you want to load. +

              This function is used to load core classes. Where class_name is the name of the class you want to load. Note: We use the terms "class" and "library" interchangeably.

              For example, if you would like to send email with CodeIgniter, the first step is to load the email class within your controller:

              @@ -96,7 +96,7 @@

              $this->load->library('class_name', $config, 'ob

              Setting options

              -

              The second (optional) parameter allows you to optionally pass configuration setting. You will typically pass these as an array:

              +

              The second (optional) parameter allows you to optionally pass configuration setting. You will typically pass these as an array:

              $config = array (
              @@ -113,7 +113,7 @@

              Setting options

              Assigning a Library to a different object name

              -

              If the third (optional) parameter is blank, the library will usually be assigned to an object with the same name as the library. For example, if the library is named Session, it +

              If the third (optional) parameter is blank, the library will usually be assigned to an object with the same name as the library. For example, if the library is named Session, it will be assigned to a variable named $this->session.

              If you prefer to set your own class names you can pass its value to the third parameter:

              @@ -131,20 +131,20 @@

              Assigning a Library to a different object name

              $this->load->view('file_name', $data, true/false)

              -

              This function is used to load your View files. If you haven't read the Views section of the +

              This function is used to load your View files. If you haven't read the Views section of the user guide it is recommended that you do since it shows you how this function is typically used.

              -

              The first parameter is required. It is the name of the view file you would like to load.  Note: The .php file extension does not need to be specified unless you use something other than .php.

              +

              The first parameter is required. It is the name of the view file you would like to load.  Note: The .php file extension does not need to be specified unless you use something other than .php.

              The second optional parameter can take an associative array or an object as input, which it runs through the PHP extract function to -convert to variables that can be used in your view files. Again, read the Views page to learn +convert to variables that can be used in your view files. Again, read the Views page to learn how this might be useful.

              The third optional parameter lets you change the behavior of the function so that it returns data as a string -rather than sending it to your browser. This can be useful if you want to process the data in some way. If you -set the parameter to true (boolean) it will return data. The default behavior is false, which sends it -to your browser. Remember to assign it to a variable if you want the data returned:

              +rather than sending it to your browser. This can be useful if you want to process the data in some way. If you +set the parameter to true (boolean) it will return data. The default behavior is false, which sends it +to your browser. Remember to assign it to a variable if you want the data returned:

              $string = $this->load->view('myfile', '', true); @@ -159,7 +159,7 @@

              $this->load->model('Model_name');


              $this->fubar->function();

              $this->load->database('options', true/false)

              -

              This function lets you load the database class. The two parameters are optional. Please see the +

              This function lets you load the database class. The two parameters are optional. Please see the database section for more info.

              @@ -168,9 +168,9 @@

              $this->load->database('options', true/false)

              $this->load->vars($array)

              This function takes an associative array as input and generates variables using the PHP extract function. -This function produces the same result as using the second parameter of the $this->load->view() function above. The reason you might +This function produces the same result as using the second parameter of the $this->load->view() function above. The reason you might want to use this function independently is if you would like to set some global variables in the constructor of your controller -and have them become available in any view file loaded from any function. You can have multiple calls to this function. The data get cached +and have them become available in any view file loaded from any function. You can have multiple calls to this function. The data get cached and merged into one array for conversion to variables.

              @@ -180,7 +180,7 @@

              $this->load->helper('file_name')

              $this->load->file('filepath/filename', true/false)

              -

              This is a generic file loading function. Supply the filepath and name in the first parameter and it will open and read the file. +

              This is a generic file loading function. Supply the filepath and name in the first parameter and it will open and read the file. By default the data is sent to your browser, just like a View file, but if you set the second parameter to true (boolean) it will instead return the data as a string.

              @@ -194,7 +194,7 @@

              $this->load->config('file_name')

              Application "Packages"

              -

              An application package allows for the easy distribution of complete sets of resources in a single directory, complete with its own libraries, models, helpers, config, and language files. It is recommended that these packages be placed in the application/third_party folder. Below is a sample map of an package directory

              +

              An application package allows for the easy distribution of complete sets of resources in a single directory, complete with its own libraries, models, helpers, config, and language files. It is recommended that these packages be placed in the application/third_party folder. Below is a sample map of an package directory

              Sample Package "Foo Bar" Directory Map

              @@ -210,18 +210,18 @@

              Sample Package "Foo Bar" Directory Map

              models/
               -

              Whatever the purpose of the "Foo Bar" application package, it has its own config files, helpers, language files, libraries, and models. To use these resources in your controllers, you first need to tell the Loader that you are going to be loading resources from a package, by adding the package path.

              +

              Whatever the purpose of the "Foo Bar" application package, it has its own config files, helpers, language files, libraries, and models. To use these resources in your controllers, you first need to tell the Loader that you are going to be loading resources from a package, by adding the package path.

              $this->load->add_package_path()

              -

              Adding a package path instructs the Loader class to prepend a given path for subsequent requests for resources. As an example, the "Foo Bar" application package above has a library named Foo_bar.php. In our controller, we'd do the following:

              +

              Adding a package path instructs the Loader class to prepend a given path for subsequent requests for resources. As an example, the "Foo Bar" application package above has a library named Foo_bar.php. In our controller, we'd do the following:

              $this->load->add_package_path(APPPATH.'third_party/foo_bar/');
              $this->load->library('foo_bar');

              $this->load->remove_package_path()

              -

              When your controller is finished using resources from an application package, and particularly if you have other application packages you want to work with, you may wish to remove the package path so the Loader no longer looks in that folder for resources. To remove the last path added, simply call the method with no parameters.

              +

              When your controller is finished using resources from an application package, and particularly if you have other application packages you want to work with, you may wish to remove the package path so the Loader no longer looks in that folder for resources. To remove the last path added, simply call the method with no parameters.

              $this->load->remove_package_path()

              @@ -231,8 +231,8 @@

              $this->load->remove_package_path()

              Package view files

              -

              By Default, package view files paths are set when add_package_path() is called. View paths are looped through, and once a match is encountered that view is loaded.

              -

              In this instance, it is possible for view naming collisions within packages to occur, and possibly the incorrect package being loaded. To ensure against this, set an optional second parameter of FALSE when calling add_package_path().

              +

              By Default, package view files paths are set when add_package_path() is called. View paths are looped through, and once a match is encountered that view is loaded.

              +

              In this instance, it is possible for view naming collisions within packages to occur, and possibly the incorrect package being loaded. To ensure against this, set an optional second parameter of FALSE when calling add_package_path().

              $this->load->add_package_path(APPPATH.'my_app', TRUE);
              diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 8846e15f..4d1f8d97 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -58,7 +58,7 @@

              Output Class

              -

              The Output class is a small class with one main function: To send the finalized web page to the requesting browser. It is +

              The Output class is a small class with one main function: To send the finalized web page to the requesting browser. It is also responsible for caching your web pages, if you use that feature.

              Note: This class is initialized automatically by the system so there is no need to do it manually.

              @@ -70,7 +70,7 @@

              Output Class

              $this->output->set_output();

              -

              Permits you to manually set the final output string. Usage example:

              +

              Permits you to manually set the final output string. Usage example:

              $this->output->set_output($data); @@ -95,7 +95,7 @@

              $this->output->set_content_type();

              $this->output->get_output();

              -

              Permits you to manually retrieve any output that has been sent for storage in the output class. Usage example:

              +

              Permits you to manually retrieve any output that has been sent for storage in the output class. Usage example:

              $string = $this->output->get_output();

              Note that data will only be retrievable from this function if it has been previously sent to the output class by one of the @@ -104,7 +104,7 @@

              $this->output->get_output();

              $this->output->append_output();

              -

              Appends data onto the output string. Usage example:

              +

              Appends data onto the output string. Usage example:

              $this->output->append_output($data); @@ -112,7 +112,7 @@

              $this->output->append_output();

              $this->output->set_header();

              -

              Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:

              +

              Permits you to manually set server headers, which the output class will send for you when outputting the final rendered display. Example:

              $this->output->set_header("HTTP/1.0 200 OK");
              @@ -125,10 +125,10 @@

              $this->output->set_header();

              $this->output->set_status_header(code, 'text');

              -

              Permits you to manually set a server status header. Example:

              +

              Permits you to manually set a server status header. Example:

              $this->output->set_status_header('401');
              -// Sets the header as: Unauthorized               +// Sets the header as: Unauthorized

              See here for a full list of headers.

              @@ -147,14 +147,14 @@

              $this->output->enable_profiler();

              $this->output->set_profiler_sections();

              -

              Permits you to enable/disable specific sections of the Profiler when enabled. Please refer to the Profiler documentation for further information.

              +

              Permits you to enable/disable specific sections of the Profiler when enabled. Please refer to the Profiler documentation for further information.

              $this->output->cache();

              -

              The CodeIgniter output library also controls caching. For more information, please see the caching documentation.

              +

              The CodeIgniter output library also controls caching. For more information, please see the caching documentation.

              Parsing Execution Variables

              -

              CodeIgniter will parse the pseudo-variables {elapsed_time} and {memory_usage} in your output by default. To disable this, set the $parse_exec_vars class property to FALSE in your controller. +

              CodeIgniter will parse the pseudo-variables {elapsed_time} and {memory_usage} in your output by default. To disable this, set the $parse_exec_vars class property to FALSE in your controller. $this->output->parse_exec_vars = FALSE; diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index a6b9287a..3c366a69 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -72,26 +72,26 @@

              Example

              $this->load->library('pagination');

              $config['base_url'] = 'http://example.com/index.php/test/page/';
              $config['total_rows'] = 200;
              -$config['per_page'] = 20; +$config['per_page'] = 20;

              $this->pagination->initialize($config);

              -echo $this->pagination->create_links();               +echo $this->pagination->create_links();

              Notes:

              -

              The $config array contains your configuration variables. It is passed to the $this->pagination->initialize function as shown above. Although there are some twenty items you can configure, at -minimum you need the three shown. Here is a description of what those items represent:

              +

              The $config array contains your configuration variables. It is passed to the $this->pagination->initialize function as shown above. Although there are some twenty items you can configure, at +minimum you need the three shown. Here is a description of what those items represent:

                -
              • base_url This is the full URL to the controller class/function containing your pagination. In the example - above, it is pointing to a controller called "Test" and a function called "page". Keep in mind that you can +
              • base_url This is the full URL to the controller class/function containing your pagination. In the example + above, it is pointing to a controller called "Test" and a function called "page". Keep in mind that you can re-route your URI if you need a different structure.
              • total_rows This number represents the total rows in the result set you are creating pagination for. Typically this number will be the total rows that your database query returned.
                • -
              • per_page The number of items you intend to show per page. In the above example, you would be showing 20 items per page.
                • +
              • per_page The number of items you intend to show per page. In the above example, you would be showing 20 items per page.

              The create_links() function returns an empty string when there is no pagination to show.

              @@ -100,7 +100,7 @@

              Notes:

              Setting preferences in a config file

              If you prefer not to set preferences using the above method, you can instead put them into a config file. -Simply create a new file called pagination.php, add the $config +Simply create a new file called pagination.php, add the $config array in that file. Then save the file in: config/pagination.php and it will be used automatically. You will NOT need to use the $this->pagination->initialize function if you save your preferences in a config file.

              @@ -122,9 +122,9 @@

              $config['num_links'] = 2;

              $config['page_query_string'] = TRUE

              By default, the pagination library assume you are using URI Segments, and constructs your links something like

              http://example.com/index.php/test/page/20

              -

              If you have $config['enable_query_strings'] set to TRUE your links will automatically be re-written using Query Strings. This option can also be explictly set. Using $config['page_query_string'] set to TRUE, the pagination link will become.

              +

              If you have $config['enable_query_strings'] set to TRUE your links will automatically be re-written using Query Strings. This option can also be explictly set. Using $config['page_query_string'] set to TRUE, the pagination link will become.

              http://example.com/index.php?c=test&m=page&per_page=20

              -

              Note that "per_page" is the default query string passed, however can be configured using $config['query_string_segment'] = 'your_string'

              +

              Note that "per_page" is the default query string passed, however can be configured using $config['query_string_segment'] = 'your_string'

              Adding Enclosing Markup

              If you would like to surround the entire pagination with some markup you can do it with these two prefs:

              diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index 4f04aaf4..cb2f100a 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -83,10 +83,10 @@

              Template Parser Class

              PHP from your templates (view files).

              Note: CodeIgniter does not require you to use this class -since using pure PHP in your view pages lets them run a little faster. However, some developers prefer to use a template engine if +since using pure PHP in your view pages lets them run a little faster. However, some developers prefer to use a template engine if they work with designers who they feel would find some confusion working with PHP.

              -

              Also Note: The Template Parser Class is not a +

              Also Note: The Template Parser Class is not a full-blown template parsing solution. We've kept it very lean on purpose in order to maintain maximum performance.

              @@ -102,7 +102,7 @@

              Initializing the Class

              $this->parser->parse()

              -

              This method accepts a template name and data array as input, and it generates a parsed version. Example:

              +

              This method accepts a template name and data array as input, and it generates a parsed version. Example:

              $this->load->library('parser');

              @@ -114,11 +114,11 @@

              $this->parser->parse()

              $this->parser->parse('blog_template', $data);

              The first parameter contains the name of the view file (in this example the file would be called blog_template.php), -and the second parameter contains an associative array of data to be replaced in the template. In the above example, the +and the second parameter contains an associative array of data to be replaced in the template. In the above example, the template would contain two variables: {blog_title} and {blog_heading}

              -

              There is no need to "echo" or do something with the data returned by $this->parser->parse(). It is automatically -passed to the output class to be sent to the browser. However, if you do want the data returned instead of sent to the output class you can +

              There is no need to "echo" or do something with the data returned by $this->parser->parse(). It is automatically +passed to the output class to be sent to the browser. However, if you do want the data returned instead of sent to the output class you can pass TRUE (boolean) to the third parameter:

              $string = $this->parser->parse('blog_template', $data, TRUE); @@ -130,8 +130,8 @@

              $this->parser->parse_string()

              Variable Pairs

              -

              The above example code allows simple variables to be replaced. What if you would like an entire block of variables to be -repeated, with each iteration containing new values? Consider the template example we showed at the top of the page:

              +

              The above example code allows simple variables to be replaced. What if you would like an entire block of variables to be +repeated, with each iteration containing new values? Consider the template example we showed at the top of the page:

              <html>
              <head>
              diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index 0cb1d0cb..73518745 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -63,11 +63,11 @@

              Security Class

              XSS Filtering

              CodeIgniter comes with a Cross Site Scripting Hack prevention filter which can either run automatically to filter -all POST and COOKIE data that is encountered, or you can run it on a per item basis. By default it does not +all POST and COOKIE data that is encountered, or you can run it on a per item basis. By default it does not run globally since it requires a bit of processing overhead, and since you may not need it in all cases.

              The XSS filter looks for commonly used techniques to trigger Javascript or other types of code that attempt to hijack cookies -or do other malicious things. If anything disallowed is encountered it is rendered safe by converting the data to character entities.

              +or do other malicious things. If anything disallowed is encountered it is rendered safe by converting the data to character entities.

              Note: This function should only be used to deal with data upon submission. It's not something that should be used for general runtime processing since it requires a fair amount of processing overhead.

              @@ -88,7 +88,7 @@

              $this->security->xss_clean()

              Note: If you use the form validation class, it gives you the option of XSS filtering as well.

              -

              An optional second parameter, is_image, allows this function to be used to test images for potential XSS attacks, useful for file upload security. When this second parameter is set to TRUE, instead of returning an altered string, the function returns TRUE if the image is safe, and FALSE if it contained potentially malicious information that a browser may attempt to execute.

              +

              An optional second parameter, is_image, allows this function to be used to test images for potential XSS attacks, useful for file upload security. When this second parameter is set to TRUE, instead of returning an altered string, the function returns TRUE if the image is safe, and FALSE if it contained potentially malicious information that a browser may attempt to execute.

              if ($this->security->xss_clean($file, TRUE) === FALSE)
              {
              @@ -98,7 +98,7 @@

              $this->security->xss_clean()

              $this->security->sanitize_filename()

              -

              When accepting filenames from user input, it is best to sanitize them to prevent directory traversal and other security related issues. To do so, use the sanitize_filename() method of the Security class. Here is an example:

              +

              When accepting filenames from user input, it is best to sanitize them to prevent directory traversal and other security related issues. To do so, use the sanitize_filename() method of the Security class. Here is an example:

              $filename = $this->security->sanitize_filename($this->input->post('filename')); diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index bb8f1fc9..a6f3c601 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -61,7 +61,7 @@

              Session Class

              The Session class permits you maintain a user's "state" and track their activity while they browse your site. The Session class stores session information for each user as serialized (and optionally encrypted) data in a cookie. It can also store the session data in a database table for added security, as this permits the session ID in the -user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to +user's cookie to be matched against the stored session ID. By default only the cookie is saved. If you choose to use the database option you'll need to create the session table as indicated below.

              @@ -93,8 +93,8 @@

              How do Sessions work?

              If sessions data does not exist (or if it has expired) a new session will be created and saved in the cookie. If a session does exist, its information will be updated and the cookie will be updated. With each update, the session_id will be regenerated.

              -

              It's important for you to understand that once initialized, the Session class runs automatically. There is nothing -you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or +

              It's important for you to understand that once initialized, the Session class runs automatically. There is nothing +you need to do to cause the above behavior to happen. You can, as you'll see below, work with session data or even add your own data to a user's session, but the process of reading, writing, and updating a session is automatic.

              @@ -106,7 +106,7 @@

              What is Session Data?

            • The user's unique Session ID (this is a statistically random string with very strong entropy, hashed with MD5 for portability, and regenerated (by default) every five minutes)
            • The user's IP Address
            • The user's User Agent data (the first 50 characters of the browser data string)
              • -
            • The "last activity" time stamp.
              • +
            • The "last activity" time stamp.

            The above data is stored in a cookie as a serialized array with this prototype:

            @@ -124,7 +124,7 @@

            What is Session Data?

            can be found here, although the Session class will take care of initializing and encrypting the data automatically.

            -

            Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page +

            Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time the cookie was written. This time is configurable by changing the $config['sess_time_to_update'] line in your system/config/config.php file.

            @@ -134,7 +134,7 @@

            Retrieving Session Data

            $this->session->userdata('item'); -

            Where item is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you +

            Where item is the array index corresponding to the item you wish to fetch. For example, to fetch the session ID you will do this:

            $session_id = $this->session->userdata('session_id'); @@ -145,7 +145,7 @@

            Retrieving Session Data

            Adding Custom Session Data

            A useful aspect of the session array is that you can add your own data to it and it will be stored in the user's cookie. -Why would you want to do this? Here's one example:

            +Why would you want to do this? Here's one example:

            Let's say a particular user logs into your site. Once authenticated, you could add their username and email address to the session cookie, making that data globally available to you without @@ -155,7 +155,7 @@

            Adding Custom Session Data

            $this->session->set_userdata($array); -

            Where $array is an associative array containing your new data. Here's an example:

            +

            Where $array is an associative array containing your new data. Here's an example:

            $newdata = array(
            @@ -167,7 +167,7 @@

            Adding Custom Session Data

            $this->session->set_userdata($newdata);

            If you want to add userdata one value at a time, set_userdata() also supports this syntax.

            $this->session->set_userdata('some_name', 'some_value');

            -

            Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The +

            Note: Cookies can only hold 4KB of data, so be careful not to exceed the capacity. The encryption process in particular produces a longer data string than the original so keep careful track of how much data you are storing.

            Retrieving All Session Data

            @@ -179,10 +179,10 @@

            Retrieving All Session Data

             Array
 (
-  [session_id] => 4a5a5dca22728fb0a84364eeb405b601
-  [ip_address] => 127.0.0.1
-  [user_agent] => Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7;
-  [last_activity] => 1303142623
+    [session_id] => 4a5a5dca22728fb0a84364eeb405b601
+    [ip_address] => 127.0.0.1
+    [user_agent] => Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7;
+    [last_activity] => 1303142623
 )
            @@ -206,20 +206,20 @@

            Flashdata

            $this->session->keep_flashdata('item');

            Saving Session Data to a Database

            While the session data array stored in the user's cookie contains a Session ID, -unless you store session data in a database there is no way to validate it. For some applications that require little or no -security, session ID validation may not be needed, but if your application requires security, validation is mandatory. Otherwise, an old session +unless you store session data in a database there is no way to validate it. For some applications that require little or no +security, session ID validation may not be needed, but if your application requires security, validation is mandatory. Otherwise, an old session could be restored by a user modifying their cookies.

            When session data is available in a database, every time a valid session is found in the user's cookie, a database -query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never +query is performed to match it. If the session ID does not match, the session is destroyed. Session IDs can never be updated, they can only be generated when a new session is created.

            -

            In order to store sessions, you must first create a database table for this purpose. Here is the basic +

            In order to store sessions, you must first create a database table for this purpose. Here is the basic prototype (for MySQL) required by the session class:

            -

            Note: In the above code we are using a "url helper". You can find more information in the Helpers Functions page.

            +

            Note: In the above code we are using a "url helper". You can find more information in the Helpers Functions page.

            The Server

            @@ -381,7 +381,7 @@

            The Server

            $response = array( array( - 'you_said' => $parameters['0'], + 'you_said' => $parameters['0'], 'i_respond' => 'Not bad at all.'), 'struct'); @@ -452,7 +452,7 @@

            $this->xmlrpc->request()

            $this->xmlrpc->request($request);

            $this->xmlrpc->send_request()

            -

            The request sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

            +

            The request sending function. Returns boolean TRUE or FALSE based on success for failure, enabling it to be used conditionally.

            $this->xmlrpc->set_debug(TRUE);

            Enables debugging, which will display a variety of information and error data helpful during development.

            @@ -463,7 +463,7 @@

            $this->xmlrpc->display_error()

            echo $this->xmlrpc->display_error();

            $this->xmlrpc->display_response()

            -

            Returns the response from the remote server once request is received. The response will typically be an associative array.

            +

            Returns the response from the remote server once request is received. The response will typically be an associative array.

            $this->xmlrpc->display_response();

            $this->xmlrpc->send_error_message()

            diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 2fc5fd81..03112660 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -81,7 +81,7 @@

            Usage Example

            // Write the zip file to a folder on your server. Name it "my_backup.zip"
            $this->zip->archive('/path/to/directory/my_backup.zip');

            - // Download the file to your desktop. Name it "my_backup.zip"
            + // Download the file to your desktop. Name it "my_backup.zip"
            $this->zip->download('my_backup.zip');             @@ -100,7 +100,7 @@

            $this->zip->add_data()

            You are allowed multiple calls to this function in order to -add several files to your archive. Example:

            +add several files to your archive. Example:

            $name = 'mydata1.txt';
            @@ -139,8 +139,8 @@

            $this->zip->add_data()

            $this->zip->add_dir()

            -

            Permits you to add a directory. Usually this function is unnecessary since you can place your data into folders when -using $this->zip->add_data(), but if you would like to create an empty folder you can do so. Example:

            +

            Permits you to add a directory. Usually this function is unnecessary since you can place your data into folders when +using $this->zip->add_data(), but if you would like to create an empty folder you can do so. Example:

            $this->zip->add_dir('myfolder'); // Creates a folder called "myfolder" @@ -148,49 +148,49 @@

            $this->zip->add_dir()

            $this->zip->read_file()

            -

            Permits you to compress a file that already exists somewhere on your server. Supply a file path and the zip class will +

            Permits you to compress a file that already exists somewhere on your server. Supply a file path and the zip class will read it and add it to the archive:

            $path = '/path/to/photo.jpg';

            $this->zip->read_file($path);

            - // Download the file to your desktop. Name it "my_backup.zip"
            + // Download the file to your desktop. Name it "my_backup.zip"
            $this->zip->download('my_backup.zip');

            If you would like the Zip archive to maintain the directory structure of the file in it, pass TRUE (boolean) in the -second parameter. Example:

            +second parameter. Example:

            $path = '/path/to/photo.jpg';

            $this->zip->read_file($path, TRUE);

            - // Download the file to your desktop. Name it "my_backup.zip"
            + // Download the file to your desktop. Name it "my_backup.zip"
            $this->zip->download('my_backup.zip');             -

            In the above example, photo.jpg will be placed inside two folders: path/to/

            +

            In the above example, photo.jpg will be placed inside two folders: path/to/

            $this->zip->read_dir()

            -

            Permits you to compress a folder (and its contents) that already exists somewhere on your server. Supply a file path to the -directory and the zip class will recursively read it and recreate it as a Zip archive. All files contained within the -supplied path will be encoded, as will any sub-folders contained within it. Example:

            +

            Permits you to compress a folder (and its contents) that already exists somewhere on your server. Supply a file path to the +directory and the zip class will recursively read it and recreate it as a Zip archive. All files contained within the +supplied path will be encoded, as will any sub-folders contained within it. Example:

            $path = '/path/to/your/directory/';

            $this->zip->read_dir($path);

            - // Download the file to your desktop. Name it "my_backup.zip"
            + // Download the file to your desktop. Name it "my_backup.zip"
            $this->zip->download('my_backup.zip');

            By default the Zip archive will place all directories listed in the first parameter inside the zip. If you want the tree preceding the target folder to be ignored -you can pass FALSE (boolean) in the second parameter. Example:

            +you can pass FALSE (boolean) in the second parameter. Example:

            $path = '/path/to/your/directory/';

            @@ -204,7 +204,7 @@

            $this->zip->read_dir()

            $this->zip->archive()

            -

            Writes the Zip-encoded file to a directory on your server. Submit a valid server path ending in the file name. Make sure the +

            Writes the Zip-encoded file to a directory on your server. Submit a valid server path ending in the file name. Make sure the directory is writable (666 or 777 is usually OK). Example:

            $this->zip->archive('/path/to/folder/myarchive.zip'); // Creates a file named myarchive.zip @@ -223,7 +223,7 @@

            $this->zip->download()

            $this->zip->get_zip()

            -

            Returns the Zip-compressed file data. Generally you will not need this function unless you want to do something unique with the data. +

            Returns the Zip-compressed file data. Generally you will not need this function unless you want to do something unique with the data. Example:

            diff --git a/user_guide/license.html b/user_guide/license.html index ecc5b500..8f53851a 100644 --- a/user_guide/license.html +++ b/user_guide/license.html @@ -63,7 +63,7 @@

            CodeIgniter License Agreement

            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 agree to comply with the terms and conditions of this license.

            +

            This license is a legal agreement between you and EllisLab Inc. for the use of CodeIgniter Software (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.

            Permitted Use

            You are permitted to use, copy, modify, and distribute the Software and its documentation, with or without modification, for any purpose, provided that the following conditions are met:

            diff --git a/user_guide/nav/hacks.txt b/user_guide/nav/hacks.txt index 183481b7..8c17f008 100644 --- a/user_guide/nav/hacks.txt +++ b/user_guide/nav/hacks.txt @@ -1,6 +1,6 @@ I did the following hack in moo.fx.js: -At line 79 in the toggle: function() function, I added: +At line 79 in the toggle: function() function, I added: document.getElementById('nav').style.display = 'block'; diff --git a/user_guide/nav/moo.fx.js b/user_guide/nav/moo.fx.js index b21ee20e..256371d1 100755 --- a/user_guide/nav/moo.fx.js +++ b/user_guide/nav/moo.fx.js @@ -25,8 +25,8 @@ fx.Base.prototype = { }, step: function() { - var time = (new Date).getTime(); - var Tpos = (time - this.startTime) / (this.duration); + var time = (new Date).getTime(); + var Tpos = (time - this.startTime) / (this.duration); if (time >= this.duration+this.startTime) { this.now = this.to; clearInterval (this.timer); diff --git a/user_guide/nav/prototype.lite.js b/user_guide/nav/prototype.lite.js index 857faae4..e6c36227 100755 --- a/user_guide/nav/prototype.lite.js +++ b/user_guide/nav/prototype.lite.js @@ -1,9 +1,9 @@ -/* Prototype JavaScript framework - * (c) 2005 Sam Stephenson +/* Prototype JavaScript framework + * (c) 2005 Sam Stephenson * - * Prototype is freely distributable under the terms of an MIT-style license. + * Prototype is freely distributable under the terms of an MIT-style license. * - * For details, see the Prototype web site: http://prototype.conio.net/ + * For details, see the Prototype web site: http://prototype.conio.net/ * /*--------------------------------------------------------------------------*/ @@ -11,117 +11,117 @@ //note: this is a stripped down version of prototype, to be used with moo.fx by mad4milk (http://moofx.mad4milk.net). var Class = { - create: function() { + create: function() { return function() { - this.initialize.apply(this, arguments); + this.initialize.apply(this, arguments); } - } + } } Object.extend = function(destination, source) { - for (property in source) { + for (property in source) { destination[property] = source[property]; - } - return destination; + } + return destination; } Function.prototype.bind = function(object) { - var __method = this; - return function() { + var __method = this; + return function() { return __method.apply(object, arguments); - } + } } function $() { - var elements = new Array(); + var elements = new Array(); - for (var i = 0; i < arguments.length; i++) { + for (var i = 0; i < arguments.length; i++) { var element = arguments[i]; if (typeof element == 'string') - element = document.getElementById(element); + element = document.getElementById(element); if (arguments.length == 1) - return element; + return element; elements.push(element); - } + } - return elements; + return elements; } //------------------------- document.getElementsByClassName = function(className) { - var children = document.getElementsByTagName('*') || document.all; - var elements = new Array(); + var children = document.getElementsByTagName('*') || document.all; + var elements = new Array(); - for (var i = 0; i < children.length; i++) { + for (var i = 0; i < children.length; i++) { var child = children[i]; var classNames = child.className.split(' '); for (var j = 0; j < classNames.length; j++) { - if (classNames[j] == className) { + if (classNames[j] == className) { elements.push(child); break; - } + } } - } + } - return elements; + return elements; } //------------------------- if (!window.Element) { - var Element = new Object(); + var Element = new Object(); } Object.extend(Element, { - remove: function(element) { + remove: function(element) { element = $(element); element.parentNode.removeChild(element); - }, + }, - hasClassName: function(element, className) { + hasClassName: function(element, className) { element = $(element); if (!element) - return; + return; var a = element.className.split(' '); for (var i = 0; i < a.length; i++) { - if (a[i] == className) + if (a[i] == className) return true; } return false; - }, + }, - addClassName: function(element, className) { + addClassName: function(element, className) { element = $(element); Element.removeClassName(element, className); element.className += ' ' + className; - }, + }, - removeClassName: function(element, className) { + removeClassName: function(element, className) { element = $(element); if (!element) - return; + return; var newClassName = ''; var a = element.className.split(' '); for (var i = 0; i < a.length; i++) { - if (a[i] != className) { + if (a[i] != className) { if (i > 0) - newClassName += ' '; + newClassName += ' '; newClassName += a[i]; - } + } } element.className = newClassName; - }, + }, - // removes whitespace-only text node children - cleanWhitespace: function(element) { + // removes whitespace-only text node children + cleanWhitespace: function(element) { element = $(element); for (var i = 0; i < element.childNodes.length; i++) { - var node = element.childNodes[i]; - if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) + var node = element.childNodes[i]; + if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) Element.remove(node); } - } + } }); \ No newline at end of file diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html index 3b1c42e4..bcbc43ff 100644 --- a/user_guide/overview/appflow.html +++ b/user_guide/overview/appflow.html @@ -67,7 +67,7 @@

            Application Flow Chart

          • The index.php serves as the front controller, initializing the base resources needed to run CodeIgniter.
          • The Router examines the HTTP request to determine what should be done with it.
          • If a cache file exists, it is sent directly to the browser, bypassing the normal system execution.
            • -
          • Security. Before the application controller is loaded, the HTTP request and any user submitted data is filtered for security.
            • +
          • Security. Before the application controller is loaded, the HTTP request and any user submitted data is filtered for security.
          • The Controller loads the model, core libraries, helpers, and any other resources needed to process the specific request.
          • The finalized View is rendered then sent to the web browser to be seen. If caching is enabled, the view is cached first so that on subsequent requests it can be served.
            • diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 1175e7f4..b6b81d76 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -60,7 +60,7 @@

            CodeIgniter at a Glance

            CodeIgniter is an Application Framework

            -

            CodeIgniter is a toolkit for people who build web applications using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code +

            CodeIgniter is a toolkit for people who build web applications using PHP. Its goal is to enable you to develop projects much faster than you could if you were writing code from scratch, by providing a rich set of libraries for commonly needed tasks, as well as a simple interface and logical structure to access these libraries. CodeIgniter lets you creatively focus on your project by minimizing the amount of code needed for a given task.

            @@ -70,7 +70,7 @@

            CodeIgniter is Free

            For more information please read the license agreement.

            CodeIgniter is Light Weight

            -

            Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. +

            Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. Additional libraries are loaded dynamically upon request, based on your needs for a given process, so the base system is very lean and quite fast.

            @@ -84,7 +84,7 @@

            CodeIgniter Uses M-V-C

            This is particularly good for projects in which designers are working with your template files, as the code these file contain will be minimized. We describe MVC in more detail on its own page.

            CodeIgniter Generates Clean URLs

            -

            The URLs generated by CodeIgniter are clean and search-engine friendly. Rather than using the standard "query string" +

            The URLs generated by CodeIgniter are clean and search-engine friendly. Rather than using the standard "query string" approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a segment-based approach:

            example.com/news/article/345 @@ -92,7 +92,7 @@

            CodeIgniter Generates Clean URLs

            Note: By default the index.php file is included in the URL but it can be removed using a simple .htaccess file.

            CodeIgniter Packs a Punch

            -

            CodeIgniter comes with full-range of libraries that enable the most commonly needed web development tasks, +

            CodeIgniter comes with full-range of libraries that enable the most commonly needed web development tasks, like accessing a database, sending email, validating form data, maintaining sessions, manipulating images, working with XML-RPC data and much more.

            @@ -104,7 +104,7 @@

            CodeIgniter Does Not Require a Template Engine

            Although CodeIgniter does come with a simple template parser that can be optionally used, it does not force you to use one. Template engines simply can not match the performance of native PHP, and the syntax that must be learned to use a template -engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:

            +engine is usually only marginally easier than learning the basics of PHP. Consider this block of PHP code:

            <ul>

            @@ -133,7 +133,7 @@

            CodeIgniter Does Not Require a Template Engine

            CodeIgniter is Thoroughly Documented

            -

            Programmers love to code and hate to write documentation. We're no different, of course, but +

            Programmers love to code and hate to write documentation. We're no different, of course, but since documentation is as important as the code itself, we are committed to doing it. Our source code is extremely clean and well commented as well.

            diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 4209463b..e20219e0 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -59,10 +59,10 @@

            CodeIgniter Features

            Features in and of themselves are a very poor way to judge an application since they tell you nothing -about the user experience, or how intuitively or intelligently it is designed. Features +about the user experience, or how intuitively or intelligently it is designed. Features don't reveal anything about the quality of the code, or the performance, or the attention to detail, or security practices. The only way to really judge an app is to try it and get to know the code. Installing -CodeIgniter is child's play so we encourage you to do just that. In the mean time here's a list of CodeIgniter's main features.

            +CodeIgniter is child's play so we encourage you to do just that. In the mean time here's a list of CodeIgniter's main features.

            • Model-View-Controller Based System
              • @@ -73,7 +73,7 @@

              CodeIgniter Features

            • Security and XSS Filtering
            • Session Management
            • Email Sending Class. Supports Attachments, HTML/Text email, multiple protocols (sendmail, SMTP, and Mail) and more.
              • -
            • Image Manipulation Library (cropping, resizing, rotating, etc.). Supports GD, ImageMagick, and NetPBM
              • +
            • Image Manipulation Library (cropping, resizing, rotating, etc.). Supports GD, ImageMagick, and NetPBM
            • File Uploading Class
            • FTP Class
            • Localization
              • diff --git a/user_guide/overview/getting_started.html b/user_guide/overview/getting_started.html index 16833264..f120913f 100644 --- a/user_guide/overview/getting_started.html +++ b/user_guide/overview/getting_started.html @@ -57,7 +57,7 @@

              Getting Started With CodeIgniter

              -

              Any software application requires some effort to learn. We've done our best to minimize the learning +

              Any software application requires some effort to learn. We've done our best to minimize the learning curve while making the process as enjoyable as possible.

              diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html index 7f1f7678..754ecaae 100644 --- a/user_guide/overview/goals.html +++ b/user_guide/overview/goals.html @@ -67,9 +67,9 @@

              Design and Architectural Goals

              From a technical and architectural standpoint, CodeIgniter was created with the following objectives:

                -
              • Dynamic Instantiation. In CodeIgniter, components are loaded and routines executed only when requested, rather than globally. No assumptions are made by the system regarding what may be needed beyond the minimal core resources, so the system is very light-weight by default. The events, as triggered by the HTTP request, and the controllers and views you design will determine what is invoked.
                • -
              • Loose Coupling. Coupling is the degree to which components of a system rely on each other. The less components depend on each other the more reusable and flexible the system becomes. Our goal was a very loosely coupled system.
                • -
              • Component Singularity. Singularity is the degree to which components have a narrowly focused purpose. In CodeIgniter, each class and its functions are highly autonomous in order to allow maximum usefulness.
                • +
              • Dynamic Instantiation. In CodeIgniter, components are loaded and routines executed only when requested, rather than globally. No assumptions are made by the system regarding what may be needed beyond the minimal core resources, so the system is very light-weight by default. The events, as triggered by the HTTP request, and the controllers and views you design will determine what is invoked.
                • +
              • Loose Coupling. Coupling is the degree to which components of a system rely on each other. The less components depend on each other the more reusable and flexible the system becomes. Our goal was a very loosely coupled system.
                • +
              • Component Singularity. Singularity is the degree to which components have a narrowly focused purpose. In CodeIgniter, each class and its functions are highly autonomous in order to allow maximum usefulness.

              CodeIgniter is a dynamically instantiated, loosely coupled system with high component singularity. It strives for simplicity, flexibility, and high performance in a small footprint package.

              diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html index 9eb327a9..91cf6497 100644 --- a/user_guide/overview/mvc.html +++ b/user_guide/overview/mvc.html @@ -60,12 +60,12 @@

              Model-View-Controller

              CodeIgniter is based on the Model-View-Controller development pattern. -MVC is a software approach that separates application logic from presentation. In practice, it permits your web pages to contain minimal scripting since the presentation is separate from the PHP scripting.

              +MVC is a software approach that separates application logic from presentation. In practice, it permits your web pages to contain minimal scripting since the presentation is separate from the PHP scripting.

              • The Model represents your data structures. Typically your model classes will contain functions that help you -retrieve, insert, and update information in your database.
                • -
              • The View is the information that is being presented to a user. A View will normally be a web page, but +retrieve, insert, and update information in your database.
                • +
              • The View is the information that is being presented to a user. A View will normally be a web page, but in CodeIgniter, a view can also be a page fragment like a header or footer. It can also be an RSS page, or any other type of "page".
              • The Controller serves as an intermediary between the Model, the View, and any other resources needed to process the HTTP request and generate a web page.
                • diff --git a/user_guide/userguide.css b/user_guide/userguide.css index b08f4fb0..f93ff0d7 100644 --- a/user_guide/userguide.css +++ b/user_guide/userguide.css @@ -391,7 +391,7 @@ form { .select { background-color: #fff; - font-size: 11px; + font-size: 11px; font-weight: normal; color: #333; padding: 0; From 26675f6426a288af220669ef88bc37d3392f50eb Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sun, 3 Jul 2011 07:21:47 -0500 Subject: [PATCH 2508/2544] reverted texb.ttf font which had been compromised in 982b43c3590a by another massive whitespace 'cleanup' commit --- system/fonts/texb.ttf | Bin 152992 -> 143830 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/system/fonts/texb.ttf b/system/fonts/texb.ttf index 6792342a33277106ecd28a130476b2aeb0983af2..383c88b86b7c17e2e284732af48b2bfc359647ae 100644 GIT binary patch delta 59402 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 E%A)ovwIx96Fph>n4U`fq29X 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
                Q&pq3fl^+}$g=i$}}|3YwXYoPX`z{{TPm;6yqFnew^@SruNj6fyI9 zBxT!;!n~w{hbOR0XH*fCv&e5&6=3h;F-^ZLE3p3IhdWi8xT%-9dao(2QJpQXSRVzN z9}HdiC}ixpq~{-E z9db#O=wCVe@;daBSFl-GqK<>S`cY=b+}>G91Y2M(@k z$cF5Q7K|+Vx6+wl?0CKgztD(YfdyNlF}d@HuoFWlhLG z(9<8*RS+tJ&yh#;;9Y@~R>n%H0M$NVpAV!nJEfAS6Kab_USg1u@xtAq2mOM_>hpxd z$ylnnv1@Lw*Uxj7{5g8v3KJ+J>=y4q>+dO^Y68qkv^lQ@OR3El+NK7&6H0l7!;5p6 zv5h=Ut1T9DwYsfJAk0>mGb(pb{)HwTB zkYP*9e5+dqI6yst^M6K9VVk(@CwdC~=o8Y^Rh|*ZJ6unp3Dai};746-#3eUywQ4*iCE!&-a;f4+hp=7F zSov=!-5@{yuQSm@ur4*gro&_Ct1NOC$k$!gzRaex+q47$FA;7fNH!!L2pMvKr~o=# z-JDxUxg}%A)>%y^@X@Qm&=sm&_)#GLv|~>`uCBh8y*8RkrCm2>U`sF!kQB?jV`zQ# zC2-w#lw3!&x$am|IOC614L@S1nrnW3u@5K(>>B%O40#0!uK&!d84`-UP|&9UCySo^ z!7HZ}#yHB>2|F?i{f?hsSg2f(KRSqr0FrlnE$tf%YNOt;56Y{a7B3Qdhz@?lgIv1r zD!XJX`TlQW(U3 zf^wh()||5c^;>ROozoL(Lg!xM?1kq`#(|>-PNW+;gOH&+aYtyAK=A31y*mQOrB0Dm>yMZqxAZ%Kik zA)dejlOQdyiKQk{ZQI_xIu(rNUiGStKY5`nEgcIM^j71?`uzAJQ?HToiMkuutCOf2 zdS|KzdSY|VY3*icam@^hy_WH>-kf~M-qN+)>2Lgb!yW!04k;~J>UEf()mak}zcg`* za%=y8rHXt3dw4PptUhdkaMli7<16kw`tfH@(V^qd2?rVzh@2JAG?MVepiS zdNuW)d?1j4o}Srv){(9ql2*DG0|snR?5ShuxZ2-v+}gWA{#t%TJn8MXFYHwhlb@A8 zy71u1zj)sA^gcB+s`?KvN>3j;atTvuM(%HZ^sgN4z#Xep5RdA+xuv&`K+X1iq>91P zeTD_6(Vunif%40o$gbb;4*Ovm!$U(*n(BxZ#P1PcpBxsC@cdI{wM^PORQWqZio# zOgjUq&fg41OkE4K30TC{dUwiRQCtw6hD0FNID>L?Bzp`IK!i>ZbkVBK`cR%hD%L>& zUg=)!q&**KZva6n#;SNQVyG>EkgP#>zPfi|6A%GjR;ju1ttINtjpMdxpesg2#A|w2u~X4JZ`Z< zQ%9FT2(}?r76PX^$aRtUuY#0{-yNNd3%{Q_p3i6$ z3#?3^xZ|BMr^~5Uv4dO5!UoT$wVlsjKh^DUTEQTskwCg;-lR7ast`S~ zgAzg*n^wbBr{Sd?96!E`mdYh^5uFO?quv(Gt(uyXolZ9C^*N0bZpw|jPSWy5oWS*^ z%hkn&5j)Hr_zn1t?PyJn+NEvrC`R9^FX1qeNG+*YQ4cDkWHtzc^5mS{oF*p}iPMfIm1m%!7i zvI^WF^5Yma5ZlIXw7_80o_)EMBJ7jns9t<(e+t3wq6HK*9lYv@^0Ao<$Q$2v8n5xe zmQ)@k`0`f7^2XdTLs_D<@|~g;_nVS+G269(9u!wvvgrwS{6dP4Jvja|KBA317M76v z3Nm)ZApu~Rlq$9cz~rk?7xPMqkqoX@gU-Y<#H#9hwg6%83nzgI#u3q9;}#i+`*OX#y~kXz-I0l(wLR!HIu4&x zPV~h+{{oQjimZE;1^=rOaFB*XL~*###eu)Cezbs|K5B_^LpL5Q2^^`|%ToC#};Qc%np;WdnLg;}w8 z&P@FSby@ekoeEnmS`~P+1gY$m=fs@E(#)TuN*nv}k zYq+vr=SbQhy=ah!Ea8+j0kfqY7E$kF;nwhrXeVnrmHgRPH1vOz?m6^PSZ0~wohdF> z{i>|jnBipFrAOOyOR-H?q*>W^uJvJJ1QW|@Ar0@tq!D>u4a#&LQxw+ ztqxE=ym{CH$9`w+(!X50-mdr;y5h#Zu1K>xPo+ysGQ-}e4146Y7^xYkOt`m!yn$2P z;LL3Z=|Q^g01QHzO;$mfO{-6%RKbz6sRln%xWeB*o8G$b*dzO?>1?w3aag5XmJP89 zFrsLv5KeW(Jyo0$@m^*4?)A4;Oul4qBh8kU5?OwxRI#xk1g+Vgh*f=E02`?bHd z6Bx(+SLI{+ul{UyqSw8g{2rTeHn~f79x5T`8-_UmU)aOSUw^$E6x5j`L3?H*{{KQt z=TNhOlIllmh<(46JZ$|RV1fsi( zc)qbbWN(wtp2ex1M;)z)+A*_e^=bOBsui^QKO*B(`in9?*@$z1PDrJ}#)%=F*_(zT zp#R^~t8*WrS4Ua3*gS%mlatxy7g3UZy^5yrUtozCeGVm5%5o@onAN)t6ds?F4wiK}d+!{2cHlWjQQ@$d z$9D`WbH#B7w?`iz+8#H7UJ>Uxo3~g|Xo3C^v^QXI>(ww);f?!YHTfzegTLx9WezAd zX~aUZr&IR!i!N$UvWWZS*by6{;uT$vj&0jIq5}s;1+m45#0te$ zfc1|^5lB5H!nW=!oHC`*6wG%A+H8iP{i11RMVW)lT8INE3aZMqI!w_6-jCt(iK;iS z(GAa92DmZUu%VUH_n+OtJ~@}R58aY-ftFE(J`UG3KN{2PK0b9R(IXYj1KOhgQMC@I z#hGE=!f!|ID1WqVKy$?-L`zToSf`Ig=Qk-zVwI9KwiZFOx6dPg=Vf+})z5Y4O$N)L zic-H$u`e)Y{Fi~$&r(*9A2pCkvDLw_sPQLad5RZS`Qf#Cr>Ge$KU}56&d9N9*ys9D~sct2*+eCR7`+zPhN;fyaoaM!X`P!9q?vx=*M5@F}lBn;FUb&7qQ zSbcC9ud%2NHj+X%J0O63Yao@#0o{zJt?9!-;2%-|1t3u^X!8JF>2-|Y z18d3WUbkDT@k2irc9<4spV^?cCX-0iVMXh(YQDaUb*!U`igmj+>VO?2&2Unv!2BkU$wi|-$DuYL_zXUHP&7d1*qo84VGrZGUTn8|y$Uzi0%YmP$#JM8r)2S2 zk!xmJPeC3g2P;}nfe5gPMFyMLYcs*6jZFsMQ)$dPF$#WRlxgvLis<_eEJ`|pvQGrq z?)B6uz4^+VO#=fMZx(1ku_YIhr+?Wq?RmR@xl?Q~nO$=}#krk}*r6RxQZQY}l ztmk}abtwD)Di+v4SNAWT+`A95cQ#Nm(!b4M|1b+&n=!Daq6t)V7C{K9&01dmoaJvM zx94d44KfIFZ(&gLEL3gGy8Fj^+`W-*#lEiCo;>c(Hlh+Sh?FS9PwY1Ua6!=2f~w7; z1h6r3(TsaGk>}?|>F1lE>h|-;YgCYDn9N!_y<7v;5yT&QS{SbS_c6iaQ{-p*hpM0{P*?19LAE2MPIDoH?m7FqRSJ~ z^)oznm!(O?Nh+Y_%n*c}d$+~)3?eWB`XJSPJU9G2wsZ@`L6yy*vkTy1dCF;sA~7-qj}1{!Wq)*9rv^bc;s#dO8w zUn;?2CXe7shRkMz08Jv?7oa3FWWda!hQgmaKbd1)H^%YD}29 ziqZ&HX3=cI;&sDT3hSV5wi8F@d0CgRx3*+;-~i8f`Ku%gX`BFxV7}?Q6wvXSG<&0Hl6-3Eb9)_1%vL(2Tc= zDaJ5szLcCJzFj>Drzy^Kt;_ET6z5^wG~l2Oz!E|$pqguaQv<=iQje%%^`ju_0ZlWt zuKc=GW3!;y-J0XHXfRJw*k>-pm^~$HTi1vO-0Yc4=^X!m<%}x!DlB}+I)Lj7$YZop zvPP>PxAT2=!e!*+9(+Bs%6a7E`0ylDgJ9bQv8=a z{zpnz0%2^BLh<#0(kj5(f{9}bfThW7;Rl<4T^P8IzgJk!7F|v)o*qt!TAFf2KGe_< z(%NiVg(F$9M%Xi#Q#!HEteblO?y3IjD!;~J0pqiT%?6lW97TyjZj=9*yyMVz+On#(c@3gjx^) z(S(sl01UJVurocc#byCIN;KEb?DE%R|5P5f4`Ym4{`e4ArH(D-Brj5+C1Fv5BNjH zZF<+%p~-kW;&uS_tb<&NRZz|8SkPk&B>h@Fuy%=2h>}aJU$5HbtHjG$UuS)T?YL{jKp(5UhTe?4r1T)>qERh*&DxUE z;xa*<=R`cgsI%Cn$~Wv~b-QT2Lo!0JA={vX^AN6kfj64m@=I*rE^?;6*^%^`58Q{Q z9j$^WG@|vAr!-=jF>l5^t#Kk~8Is7Int6~#uBABL#|B*s$K3sF(Y54~q}Zi8UDN7- zQQm^Y|1H;2ev7iyhJ96bt)~P4HnWZI{*x*v0i7Xi=*VUg_-w__#>3=~`xE3FL6SWZ znZtj{QnE2B%Dam1ak1oe^eUpP@^$1!hJojLxW|z6aXqwRB{ubX0)vp*t`Z@}1X`R% zEv)Hs3B6(ths{op!z-~%u19HQ_VD#cO}L)zy`G%jtG_+^!0UYRcd)!Mp#s-YgG^_1m7vDfd7Rkk{9Pn>& zNQ3)Ob*XsGJ#XAV=TY!6@v2$g2c%-bjAbvK#7lTA`mWx`CJCR#aS?#iDS@dSAlQzT+ z$|_7eXcQ!N{LRQZy?imU39MQ&tGPQ`PmEN{PqXbeQ^#ht@Iy z(HuytD)ztR6gYQ*Bo@t>TPpdK1Ya+ZI?!FSmtzha)j%i6t!Xu)ZHR7F`TlgNf@eaD& zB|p0VE|s>>RuGSS6jprn%b9$S#E!cUX^3DBxRZ)i@={@AFJ6T zzK4_A1-t3o`Kx$U#83=VMlBhv$kzpA>IbZVh>BuNeKPeCD@jl+2l3VoKBpW3e3?B1JTE6FFAsPCFY5~7F5o88trbkJ~n$|FVVBc{9w6LMeQ z{qiF%LmN9dbD;%M5)?`l3oAXYl68Y`pb@Vu$Q?gEPYRU=1@mak7Nq}a)CRvn4XtSG z_)smeTg+072r^D?UWpo@mzK(NG`FA?RkV&EL934qc!(06T^hX>Q$$zj_K?b=7ffM~A$Q`0yvN^q(QZ+6rfo*0Y5JNVfF{@mP@C#uT5Z^PcxPSuFvgL@ z9(fo}px@H<;o4h|d6ZV8=V#B!^!)q(wlC0}zdRV)8-5%N_M?pkw)_#Y2ieFQaf>hlwnk- z>zysY;J}L!yOQ>3Zo|sC@KKuQ{A~XYm9EfUkW2)$IDkOxim-CBPamZ! zVWk3-%6Sa7(<*ktW0bOfCX^@LUNiikyk$UCUjM^G?54-4R=omuycOU2*JCuA-@oHC zHtbKZ2YT4af1)aJ1@3YyyX#MMob!i=Wx#@umw+0Ug!Nvc(rki zAOy0*g>{4LhmC=64tBd8dHCx5?7Xzw?zWe}cvBh7gWl)fJ~%{Wt+qIlt46kU3<^2? zE)hasDxInRQMGRPLaE$0tZmq!vrp|j9n#5h4fHb(w!K!Ka0MdX2*(YG=mEtxndiyF z`Qr7k)8Ig4u_viW4GM0ZAiuz-J_*Bo9lPR5a)quv6Wgw+*I?dwouCm@Wn!W;po^;vmmFR!yV)&>154wIId#aOYE$tGD(`3J%tFF#GZW$S)m))H&0RAebBd6ZA@Dg zN*Tv6tC~8v6%SS^CzSH1DeT6Sta`A!Q@&ko9R{s!uE3f$s<-m*vy+~t9BEb06PjDl zxJ$Aw$a;g_{xtoUWfdnoEEWTdWV9E6Kw7r_85-FrK_);4P>Z4R-tH}$Jo&ogy;gmo zf?|;vRA&*!!m$XdvmgtlwOo_@sovPI*b*!EomM|*l)nasUDdM`a7p{WtjqC9#+s2F zrR@+U>FqkU-DUATNNkt$*!-$rnvVvsl7ZU+$*TpG z)y*YU6?GPe(M?$BV6)W>sHmw46#|`u##0&^lEuggXOsUzLtXD5(a7@c-JORTIWN=5 z+zRSAqLB|m8BH-ZXLf%g4!~x6PS#FLGxqM2FfhuWqqFEacE@wzI*=>{g?ahyEzMPe zP~qV`6@pOJ+|r((S6F~dQ~5cX&mB0C-S|9`Qr13C5!fZl>!N4MS|VoOfET)}z8(}Z zM_S7I{^p+Q`y0>hIneWgm;w{xRIFC|7id%U_Tk15gv2D9KMGYoYt$`88XLo&hR1JHX!It|a+(`l$@ODd!*!^%8aW-q@$wTX>_%jL7hZ0h8&fbqol<*ROsHn&8B zMjJ1bskr3uD*xaMHnEx)sW89$vEs=obJ46>Mc$AH{M^{#5pIllLSE%Pb82$2vgj=D z=@GWUBD(xV8q?W5W}e3ZNmq;u*a~`^cOiFucf~@F-JtA6yaB)$hi?ftcSXSDfc6-U z*ye!$lI}-O@YxNp&klX!5z*HDHDEqgs}s;`Y>?ew!3$uwIc<=C1a3m*u$P+EFK`F` z#;Y2D-^N9o-RbVVicaIRru3X5D4lk4)~#9ZvF$I>KVbE&eHkgzVfNP?&L8RN!Gd4gPF(b^)`&j)e6wO}iQjn7x9r9)*bEG7%dd0() z?Ult&drtC^WgY;ew4{V%5u4ud3e3~T*)6Y7cE^FqP-Ns_q8kgR`Hl5wyY%MJ(rRTGr$56^Y)FkRB~9-H}Bnl7zzqcV_5caKcXeVV=SSNN?zJ2iU@1ebtN zh9zJZhRDw!yiopdvI9gJcL`P<J^QaXw(wov|_Sd{(f>k-y<#)F}d6(A?N&o zx5(RHJwDb}E~qke>wPTkgV)d%&$e~B6pnTiCN;X^JCo0>3O9PCIs29dYion$ih8fm zvYejV27E4MJ=W79P8V)vm%K`UIBrGAi3EOy{KIIMT%i>Q-_&qwz0O#-c+u+mPI&xs zY$gQ65KbYfWz;F(=uC49-@oPdd>xK)oL*lhoyN?yTN^- ziRS?iqB<@GMvXZQO0*$Ov{w=2(Vh|FG=Y8j8Z8~R_u%V4Ej^z+vh?z+zp?b}k=Myi ztJ$lsQ+&w(w2)|JmBQ!lW_6RuR|)vM>f#^K<;NeMfiqLsor$s?XzhK0fduV%+M}Ao zHFVK4k=B1FZov)cRm_AyQZc3sew49DS)FpWYNs$FYdrq2beX)BY}T6;)bvYFv-NLM zycr2-7F$R6U+ICv#HSBleuVfmq=;YY-o+h~mws^=uXgFd`JjkLGx{$I!^e^lna(_T zb5H~#^t@Vw?tC$Z2o%I)t1fiS;h~7Tli<-dlGQ&PQ~)`O2$un?#vTJQt5nw{4<_or|tz5`}}cfw*vq)?eKA%hYk$; z1FoczQ9=xHitiVKuw#==k(hVR{YgRHS8m&ekFY4SM&Em zfMOS$w~wCe?AoN!=xm4|!WDd3~G~E?tTS~t~i!}U5n2N zXP1^#Po5SIO&%t}Ti|hb5%;3U?ekVP21B*Al@)o}shHWV?f#3?6G^OH521Uj+t7P| zz><*|-a2OTY>z8Hxff>A7WU9Ppr(N5#TU0?D_4$$a9e!!4msw&0?t(jr!^rBr#_k& zi@8&J0enmbo5i)}ZTa(+X1zf%xCD*M5%ncvIX1tIK0#v}3LZwp&J(uu-A^Uya6Gh( zE~&&h)zC`1r)Ss=I>c}}%IWTAXS@r6lc(9I?^1NK{LX=-d=oE%49);_BBs5$75_$s zxBe;lDt%t76`^Q|Z#VN?=A$?BYNs;p@KM3i21jIv@WxAeSCPwOG4s8neg(2nuMnPP zEB;0&Iwg-@ZH>35jRD9F*pt@8AgFFjO#64L&xLbD2@5;&s(s;Xe*v;D4X`wE+`;V( zv4I!1c`E}(YkY8g$SQWy-zlGa?NxRSeydmXypJb5$=><%q+H&i#UWgpT+`i{N!A%)d%T$+q&wVyH=9PRMecKm~i3@dxaa!%m}pn}2q zH?!2nuJ{KHaXu>|Hi4~AWzLHl?Ffy8am10fd_)l>2&+PVo(D?^W=P&g8tsl{u^exN(n4@bB_LcEiUw(A>!W`Y{!H4=(MOQFepa7pZYG2f?D#62Uij!!A4 ztUC`S;E`|QEh}oZ+w68uV?~Iu(x6J{`Difg9T7{Kq>}u02u-^+QH`MtfZ&@xC9nD# zp(<-a)(z~1Pw5u=7hCZe`Hh#@Y~yDSoF`c+whhzyrq9Ty#(O-!cmsR!Gs>3m$J#fj z|GNHj9AHEP^p6$6M^0j&-0;!PesoC4uk|%?jb`L#JvfhD0o$Bj2v@NQds$< z=@IC6+#j;JjOL76TbVN8%}0MCzl;W!fp_=eX@A zlVGSd`TZJyNuxg$x?M9f1g@1QE>N)D}6(-l8fhnYob1Jj@8> zvJ`dC#W=VsMMuMI`<-oasIaU4U18t*ZH0~W6&6aFKPfC_J=8N&HCtfIzNHg79~r-N z$yvp7465fS)ka*@jB|A4K zSKNQ#{pEg^-7jK&} zb$;2%W98dV3)l^16gPNzuHjQzV?Md|*lE*;he2c<@pz%(%vV><7%^k!am}kC$JXE2Vy zQOe-vx$5V*hxSFXtvGh&nth4OyPMx{w?gf%>nH7IJ4(Z`CErmb@Wa@C=~HikF|*+* zWmiO6=ZF`xy!~`)(eG_Q_V#`Xlq*doD@~=&j6j#b)jr4V-WSZXSwKXhl(i9MMJ7+z zPa4w2#vLGY-eIk&lu;RUHjC%5GWHoRS!2LJeaQj3>?p=d=PwyAoNo`87lIjLQGBj0 zdoY*Z1G9^>SX^!!a^(T)uG3oppu^mWhm=$=L0G<(s_ z*#T>no@cu|;x6xz3 zH~k$tt+9NYnJcmcb8hPvzaM3nw6_SyVb|B!5s(US?-(7`TJhEH@RMwmOtwJ(CS$j_ zO5jk;n37!9vc5rcj!ZK<-#+mE&6EyUlxmqwE{i`+H}OmUOk5*qCy8@fb9tI1FYF$w zIIj@A5p=cIK=#c-X#c*<;Pwbys>vv2FB??<9&qWb_-n$K!=xhxjt z=^j`@4rf z6*0N>8JHMALXwTBT9GRjh8?_hjmj7`JC)kSu^fsdn4)P3n8P zPrE>Ej+kxOHMJGysH9rWk5vo>Y6{Sv&5|B@@LS^wq+Fotv3xWyYty?0$0k`5VxT7aTVwD7FP^=kp{K5A2)5z2r{Wj zrH`i?JC+{53P`S8MMKWiy%M7z;4h6Kcgob|38=J~y)iwvuY09F<~65Nsl@WBQ*vP- z!yx6TJ94ylxwE-_KfMcE1@w65%kurFopk(^S%V&f>)Mz|4S0n%R#z{bvvBO(fsFyc zN)*`vZdUgSy~CwXU^QPgYfiBVnf^GVQuhk3Q^9Sibvje=oLQ@4@pwY-a_DDvuQ=M< zN4bTKxK5aDhnlH9Yff(y{ekD2e`6DIFYHH(rb_L|EoiP8I(YPwlc@FX(s&e_oC=Ud zrM5=nrFYA_Pg*j1@X(s(f?S7kL7XZ=5><(Hxl1cX9 zpWlT+)5u?s8wq;k6)p31?Kxt=Ew$H+M+W;QDOz zQ`-?&otR82m z?a&qZ??+t0S2+=1RjU8pi$5+?Q?t&+@~DbM5j9t-*#iQXW<#~yoZr|ID#_|9Zvu$< zq?z;D3c?|an^)gB{DfmqAJQ&=aYJP~?SjjC{PDdG;eEQ)lr0)i#y zj(EbLcQ|Y|1cLNA#7#1q%w{KC2&_)W8SF=!rEIQ_i;kA}-8rf_&!pi^JIV$&4_&d2 zlJ~R~yk!W@%`*XglcH zrLkn&oJv%}WOiDUR_#vyebi1hz$69GVv;pfr`SCx{Hh)qx81}(G;ozuNQz zWm`164q|9>S-zgXu(cA`*eO3VEXnguQs=(-5NA$DoB^?&s)i7VC4F$9yznrYvmMxMq?W;KNoFzp*{1GN`wNzt!r2A5CHf(a|cVV!1v!F=xM(%doRn~~4(b;2WxFbnbkpW9Jnz*P&fhkp>SJ(m* zmmQQ8#ytV<9|^}2Z8Qp6CPe#@vyO2Dc+hPoE^ONx9uzd&(`|8(<{K(afcHu4eOw45 zdPt^9L=nZ@u|;l!yV9da3Z^xNoGF~?@pU}CCKrA+1*N25wtRrYA~>ylLS^=YkX>oV znLTF2)4zZb@(^2Z=AP=j|HSFnRHr(|0E*<5c%wt_Mm&M+t+^%HR#VT1-3R$^*(3+oIzhe+JMcHvFo`g~;T?eQ z0bp1~qKCxQctdEA^ifF21ED1ve0tUK@@)qW$lFE3AYdV2KTAfpIS$j9-@pNMt1NHf z?(eztncB&s(w!BcIV*A9g4HGF)`p-B{s*+ zO|je@Zd!5UglLmlE$E{*6BqzqadUBcgY9>7-sm+u$E0)9d1}B9f-a{5v!kq2x@B&Y zN}V+wo^h3{>)khOY=nnv2Q+b;hik;j@V1AG&XGa`#^j9Nc}lHmP(q~#lobRZ0xWsZ zZ)<)3udVBVkE+W0=iGU3`XrfTl1ZPL)JZR-LLec8K&S}>i4Y+~L|jop5s)@1@ChrO z;7~-7A|R+V1r*mHSrtXWvWkL;yB1h=g-@DDCi}l*+@D+EcXHdg_nvdxyYt>D`N<(Q zo1d;p%S_8MgeKWy?NA&UB}C8ZHST|-CdQ&jnTYb%*7BSQi~4CajXFOGja@NHF@&1# zj}*P`xV0M7YS0_uXWSSTy-GxGw!_YcoNI&L6vod9%NW%diiO)gUGlkdHO9Yd&L*fvcM>^%tT~C)!w^iNcwMB_W&nn;f+il53F}mbPTYd`XXjXD` z9drtE@#Vq*d7t<)QPp;KN@Tvvs>UZ9Ano~Fe#FfxBmAC6MZtaK;JRVag@w`jz+lKC z!+y#(wU?@K^(%K>^p!1kl-8viOX8zIkH(T`GT7p5x`K(yLtpc4&!>#YkJNKo0Y15$ zgO!%cBi*41q59O6)YN4&7SB$D7^OKJ^43b2yzB{R_w4ePMvFTtEPcb$N@DBw?5&F` z$d6(r8?O{h(WVI*<-U%Ci36idiYdWfS-k>2*d1HOvoZq4cY^~QX7%CDjApIH6$sG| z@AuInDsKOMVJU$);O&|nnInClu&iCnI zKJ5DxL#7^7$XKS;+TucW5qVkRE3i4vt%#Y{i^~*EzE*LS_jPULK0nNGmW@hP%M&3L z&U4%&eV2V9xxRCdM}Ln4N4mR*;#qHLtf&jy+PHE?$XKYh=gKjNvS$=WH?+Uz-5V>y z$87OA_{%Nh!M@$3kr$NlMYa7*d3c!~+d>UM9A13!e&-YDE)PI1*`PVK>(N-6UQ+&L)3 zQHE%C*D2qZzOFa>6&0rBIh`i668O$Jn5bI%MMXwxhyn>!xXoaiN#E#S(e!|8J9%SX z{q#-S>OGlS?@p&EFh6dI2s36Rq$NGQ((C=vDWVc@@z6P*U2U7^r{aC6&?Lp;fJIY~ zXG+9dl)Sv2%^TNm^A@>8rm`piPq%v!)7;YU_dewkeLcJ6;U;^wrCW+C`wfMExw((b zISO=1ncV#9~5Mb#J~HRQF&i)?%-tcn+oNZ((KcwXRsSG*%OF)C(m!Sqz9Hz`^e z1>_XrFygCSu)L!5fna^Su!+6zc;7<3bj!_uxZ;b86wO!ZkgbE{uo-T548{<<;{Obd zjns7pZ&RLwHN2<1u?b>}u?d8m2cwhF`+|sy2+kT zTfMUrMMcCfhxK7*ZA7Tu7Lj2$^+?XitR7rn-?R6}-p>+6qNB+fS5aBoXYn3Y8#nEC zY$>emdA?KHo$5=lD7e&{k|b90W8Nc4A|F~HKP8D##yx7LPLq%rpYW)6RI*4(SkN@% z;h2~xxHnCVk92ZCa6rg_K|^as*3{jm=)%pAlGN_^K9ekZs+fa|s`p~DnD1GW3kipi zJ_84rrp3ocmI!5D%SngJY?=x$h2lRaCp4m5(Uihr4#P^4Vl@~hVU^pb!cm3eWXn87 zltjkIrf>POGSp+_gVn#D3HWS16p;PHTGN8E32` zCOk~Oqzf=ZOu?lKG>N-zRvRKs$_!p>481SjVL%PVY|q87p*~BSb2GEj0-_RZvg=j8 zTzpx7&wFR8sBvDg#)g{B@>Sp9SGSB0jDra#q=Zah;X=FTOsa^Q{2mNCVcDuytr+h6 z_~!S{>i%xuSom|5!tiRK3VmF&@{Y{qIrk|>NQ-!ViSu1hag|c~kT*AmB-qLl;vf7BDvrqF_pyikLEG}j3=r?MPOX`nSwz5_qRtT<_c zr5rfkAm_iVRZS+}(51RSN8o?ue;aKIOlXM@Ks(=f-%b}XrG9kY|G&|%R606m`{L)p z^K}@ES$*Cek^2UsReTgLuW~X(MXy7H6E&LZJV-oM^u0ScI2iWBY?fpW3re&=K++Zx z1bcIOolcE%Im&QK;g@`2AjAU_%}{CDn;{|-VShmCR_fuzMB0DqQ&I@io2)pErWD*m z{lD_L-FrDh^u~oOCsTx|&<%yy)qqS}RIA@N4fq_h| zHvisx^UdLL*2GXpcu#iWhe(!)uyif+O%$n`byOu~A=XW)s@|0-k|V7KGaRn5CN3Z( zEHccQKg|r`6__6|I>!_wBnl2QTZ3#pYYfmAo_d>9y0QiYnoATeoj<=+vuJ`ehHnbV z3DTbI{CxGC``odRJ%T^4nxk=6%~*pJu7a5}D52j_H_-jG%3GQ()>u!kUF$b?!F!h7 zb?n-{A8vTBWsClmPfja#X9SyAtWykuDwdB4&lJ3J#;$?Iwf=!UUP^Mu+B0CpWI|^i zde%-5C;k_54~gn`MhSfw`{5yNT}-d6?X_v}@co|5W@Vk$_6_&a<~Lr&b8 z>`IAn>UyZki%mHRZg9NLo0E@~?4L>RkbDsl=j+ertd7i_AXm8gfAZStU7jy`MQp_+ zX-&Gg%xFxK5tF3to+R(L`NCn}yj?X_xE4j==K^Gup?2CxPFA+r{9(9B$W;&50h{#z)6xT+S&;)%= ze4$C2LX^CO$c_AzI-*pxnQ@jV3;5YviE<|r^(Z0A3nvfdbr2Pxav^kk3WpFCp;GY` zqMnn9N~(!^pCBp)a_KFiayL;w5KxJZ2B71C6+~4Bh=vR#8m=d*t|h8j0XRf70`*5A zJ`#8%rxMjB5Z#tdGA;&21OV}~P7pm(Ml{C;0M6VtqWNgI zIh&}}3|LFF0C@{NbMfbUqDMa>TD*YhF>tzc57BbOSAombJBZdi0k}fsy+E|yNwnbr z0F7-xy^SE^NtACwXPb8uZAE(93L;daoyglYm1y^QqUURgUT7fNGlgjHS)zT2??W4& z{nbSKI{-jBFc|=DUPMDLfq;W~fOeuoWkiS50l<4X0RRGCsUv!I5z%W-qIPuHev9aJ z#E%6LbqoOj_YKr}V+zq*ZldG6iQZ`=dKcyIRS=y-8>i&_pSnWyK?C3h(MNNMJ`N{3 z4I)09MRXR#eO^oS#a5!f))9T3NAxYy7d|5TuAb3#I_ti3^*Ei^~8WG}H^oy%plp4&pLo_RR)tA}%i>?l*+E0*&{tB_42yxC-$> z=wK-DhoNqD191)TN1P@ed5L&*J@M^xiO1#<-?5f>d=qg4@b8Q!o`}xxT0}hQ1o31i z@jXS*8kyZoSUd-aA4JAOD0~OHm4NnknEF*pjc$;<*Z$`Z>UlDIZyU&1tXRe^_ z?R$uKpu)32*gcu}`3uB*5Z||i_<#*?gZLoQhYk@RMuk_v@hb}eXy^z!e{CRfdmR8H z@cQ?}$37zdvzz!0bn@m};hxkMg@w*`QB-%O!_yCKLKb%GU7gYH8H1Q{B z^z>Qc&x(l8G!cJ}@EqWa62J}O^JwI+(~19fg!mieeY>0ZVm$za{T&2RTFpFa6@>4 zgjhmCsUU%ijnE>kL)wrBxI)6XiG&Gd<^&R!6C?tUkg&GNW1c8t{jgI9dX5h)xk~=) z1~%_?f$fR#+S^gr-|t*(+@i{ zD3;MyY^HMn5AxR_uLXJAQ72M{$eRnO2fP574j2O{13U<50LblbUp^9JxtI5^d{OgTe?WL&qK>SaF4d;9C1p`n_$X%NiO z48~}s`^(Ny0T}9mI+=hB4;n|O^kg>?8xil2L$7{`VJx8ysJL7kN3%gxi|Qv9L)}Kz za+LI=s22H6%9}I@jSfa!4sEF<#xRz4B3-7u4E2NcM1~$j$_MOFKA^!$IPk*JUNm{e zU|#=>!WMN4c~GGlAg7`Og_8R+otvxBz>gT23vzTMfq*T5FT3aar1q*n#~cd?!t#+L z8midYCffl{BH`#0L%T-(Hl=d9(CqF@xW`uIw%6pFm)VFKw}dSHe!lkBdTk) z%=hCXlzDQ|{>HUj%zn-bx^BvRzkP>Yl|2 zNUpo<8Mjll1bqOFf_Kc}-MgmQm`&BdX_N~Ygh?2rxlR=z+8`G*rocO_pNRGRx?p9# zf3YiLs27;X&?VDQgbw7(vI^azUqNl6UKs5Pv{!*aDa9_UP|i}ae}lY9{bgS$pQb73 z`cPlo^(&80jiv&pxf?tPJ@Zj82MbjmaB>sKv<&5WbQmBv z#BbrB5SI=6LsXWyGCdFRr4kUA9sLfjzYk)Y0J44ArW}DNKn|DzLmp(NEXZlp<_Ky0m*VW+I${#$=;%*UkgDu6tdJ%A>_>++n!I+asi zhX2@*_;K?{=VCZ^`|-N^{!JTvbzJT*?4CD%eG&kp?N==SUky_JCj=fz3VFNZ8Zy&{ z?zlpF+TI;k$wV)7$F-!Rm%HQg=s%G>4%-Pl~%*F+A*kgZ>ANrk`|M+ zUHvqD0*%YPAax(@rvvmNeyhGtYoR*33eVT&U~LVx(^0%XR-nS6WgWbr7$7ojf-Pc; zcgY~}wWo=jxrJMK0WakLgMF7pyqN#UkMR;-%FB2;ui%xuidSF{yTri-}4Xr4~W`d;>-O1{1ac{ vt9*^G^9}x)Z}KmEOU=Ch;VB0#L&YmFjCAn$2mw_Yc$2ObUm|#Dl*sreOyWn& delta 68545 zcmdSB36xYK_EbgL}C#VNFXGkjYJCqB$ZU~ zD6u3+$tpG>At8i7HdXHys&<7-s$OjOv8UTM?Kz(Dcg#2k#tul^tso99+!0 zg)g^n#G9)1zCayZ=C4oLZ{;>_-oE2m>l(X^&)T1R-@Zcml}8?ZV3e?9%NIDfz~=|> zmUVse=#IxY2j|2)*1Py>YRl;6b@g|49jr|`xUA3N;MK<-eSAB6=ibic4z7@LIJ7%^ zUvv=O;H(=C5!YbX#1;%XfA$ZTxOX_24io|@_)XzfLFTLns zuR5&vNfTMj^Sr`S-r$RTGvCQuAMortZ{6Z=9}tKzUs#y(rQ)e{syT%PO}o?HbRd`x zrDN%~G`pJq;(XdVk-oF*I37pLyer8uH*k3$_<_&ht0$3%J0j`E(Vdg0lMUBNSZ z#eR9-emZIYXuopfVKxadj$Jbs3Pa{WVKK+{oBxZD6xkjJ+h=;MNN7*$&l4;|@#f^$2^AaJvBvFYfT2(XKpA>L&EH39LALpu93E26OWi*N(C(b3+CTSbDa>7@lA43WLF%p10RjZakAXH70yZu zM|oYI1f7$nDst3CBr0-xxGv<>2~l}oqjN}A zxIRpaoJe`^QombQ2|i^0mXgVp$E|DOtf>A|mp6Z=q$r(J9%r{g^-*dT)Qngjw}(Eg zX6;wl#z)mak9BS22~S)uc{$GDc_O+>ttv+zx%0xy+q(rlW%MhA*P1zhm0PKr&#nyD zlsGQU@nnR3Xx>!&^6b`Ayfv3KL=Mn2#q!0;&0~{B_CFih@%m`f=X4ramUImai@aqUZ9m+Y#$-Dg~5TvrFhV*QFD)0 zAk@69)y1jT7Y?P8xkbxIrmvqpBb19^myegniI8Fw=6})Z3@GFytLFFgB%HFykvqH2 znhkn>zBN%EpG$Z_iL~|%i()Y7cDm?HpDiL;!rmZ)=<+7hrH0Nm1BR1QD#3lg(NqS1 zLavdBW1E9ra$v8miw^dhd079;7VNs3Xi2bBY$B5>cG1=)*1KCeJ0G2uOAoP2vo%g0 zj<%Dgwebh738J&NhS_`O?tP5*h#)!-h5i*6noMU?kPnO@=H!*5m;JILTF$>XAf{I{I$vo=p zfFq#nw5rbE5Danry6LUyDpAZN+xyuGi5FCMVW>G%kZ>!4rL!(5JRwFV+q`N_l5*M4 z53JKLe?=B$4!WW)Egv7Amx#w>b6eUWA!PVBUpk1bh6{JBt=K!sx+3CU4(pSTmbm&! z)t9@dq4QcWV{l#UT_;C4UX&F0T(>V0jAg6xrC^9%VIP~HxZ|^|TN_-Orl^82nvB)e zH{G{96b^<&DMVc==kXZEA~qo!DL*BeQ_}<9VpX5!nae(eaSXakNw=HlR7v$vGi1a$ zO3eA2Y%R)jWY{D4_*ZfhbgASIi?u4YAB080*L-v*d{@G~%O5+WNqp>sbKr zOwD&Zd4Y=TRr80QMryswStmF}WEaezd3pg%%pPwC$6hvnw!B>>u-Gp^Fprv-y$cQ4 z7S$;e7yk6Nwboe|&2Ra_W0Veex8-N39LLG=ZP9olbeFxZwTE zHd;5>cw@`PQCP4u%xtQyuW~x6i<5Ol;6vs*zmZ`dviI-5XVv`Cg-fTqa7&4Iix??; zpL-0K;vCk^LqGjK`8`;HO@Veip9s|A`HQ=+b7m>{BMN05XRk}}73SXs7i;C?Fnja7 z2KCTGqu(bv4KEDuyvp0=SSV!JuMUpza!B**Fu$-pXF|yU^=M(4uYBzAtg?1I-*NaT{)Skj-4)UKFOS5IV7QFTls zLLTJUyIhR}R>kWFev5FA16|-9>muw4aafn(A;$@O)BH}jF;1y777=)l;dbj(Q=+`Q z)9utX(r^1R^G{#(`Pi|$zKb}Xvo}*H!bfnCu0_C7#RSI*)0&ENs{`$uH@CafDYvKx zsLz)!rC~4X>O%Kp=h;W|jEr9sG@nd7%Or<9Ulug$%Q8iLct>n9B=ClgFx`*SIk(faS=Pr@sHo@D@3WSnn$eSK@qB^j zorcS^iGA46Ay^ki-GV0b<)g3*qXH+5^6V9?sz6(HEDaaqIP*KPW5X1I7fsMdnnU#s zA=yb~B549o_$_swQI1f7S2W4#j#W!hb_Gx+7z{SX=!~XmomJA8yIR8VaF98ft}Y)j zAB$%_>{2X1f`lKM&-VCz)&&UIiFl|M)6}NbIprWsADjv2D+IKTVoND5vWXqt13VuI zMM7SW*RcK3pT@H~Hu(jiN1O`hecIF$*JNr?FNM4LokZ(_WC*GlPFCT0AZc6B&B=~- zwy#r$anc2W6Vsv&`=L-*psIa&b%c-(!|w|W4-J(3ZkOf~csUNGU9=i*@%NLjjj|;!8DlyTRSRo z!l?Z}XAAl}yix_LN@>I|kR`RiWE0k{(d=MEuO^ZrN-l{Xte|t;GTL-!Z}4p*E-6i_ z{EoQnJR2xZ^4Cce}V$%iJlTMV1GG^yEJA}P8!jr ztuSWq?BIm7X5N>n`IfC_LML_rLpf<4$QZxL#AyJ>fcaX6$(l~v8iNrX*I{SCE3eM21*Tf91cy|S1}uf+#^x8%TwhXMI<~a z+%8YFEl4*)@URx=b1jPyf2@p_Hl$s!_<}2K_;fldZbD=>4zT(_#NCOQAfSp6W1bi> z+&#Fc_Nkq00>D6Ayom7K(Ro#&bf8A_52o*Lv_4_S%v?SNAc=wSj!}%`HK7~px&Z5n zNX3SxS#$okgNODwiOYN`e`%?8OQ+FfINjEaJ8rvI;zFU?nr<4GA-FDu4=m0Nk}6Lm zoLt6syNwJcx-u1s`DgH)TMq`3RH@AZhEi8Qj2Hy3sSSk1RBncj*kU;_t>`AGTrbCQ6J zhsR~OoCz=G+nQW%x5rLmyig41sjkt04)bLjYkRhPg)VWx@t7UvBgXOhCE3rJfBffu z^IsQV@24)O+kgpAroEncAR16yR2Ec4FyOC!gj;1hB-mSRSmuo`h)y`-^Uj-Il`mw2 z0oWJwNL4L&`?~pgRlNl9{q|~V{#{i~gzX7pcf6Wm_+5tKv#yYV!CBMVVK&XKQfd|@ zVS^i!ONA-9d8#<04yd;-o(6bFengNO*>^d`4PW7Lcho6zdot$rB2u~=xP9$7c`Vb> z(n8pvzbwTEevJp^p(p=19F#GoLc?8`3PgP6D>obd+RfUF2NP8u-%8j~`&L`3H{w=* zP(5$#H(%1a&Q1lYrM8ylI|PuRy;bviaEIcvg=BpzH^vFc&E}{;}nS32({RV0NYC{ zd4myY!{pS>pIy1{K?K`hO?04Z+osmR=UQA^t|<~Hjo})nG&n|g{@S^h$Jb%*+RooJ zcT=zLo}75BGI2Y1!Lv_9cEhp8!FE@+pg9;YA8QPmZ`E&5*~xIkb+}b5gXfaDHmmHdlpl zITC@JwoVaU6SKZdwrLfccov3!eRF@Y{K|84Bq1p4x;vlHRM-(-&^r}Xp(2okQ{r*O z!|bB@!{%DehLG$-STT(2ADZ_9nFHB0vZRY0(_@RQOQZwC+KtHUy_TsyYeGX{;!Y-A zS^$Vw^&k&o{6K-5K4uT!4(IEAd7B~CU`TDYi0!?3=5RCSYu zJl8n7s=+#i8{YhKS3_-MtzsB}A%>vZ4oKv!i@t_{R+uxV5NT_RDE@-~2_hmW9BX~n z1?Y!=ybG!vL+D|Ww$Mrn7%VH#4j9x)1Ki?NO|fw+wCDq7P%MGd~H#~%wh(=8Joebsz@qeI^y%A2t7yJnmYlc_Hi)+&{t|r zB(a%uYmm_7mJ$+3&z`ze)2uUdZLkBMYzxk7QqE3jA_qS(~2WzB{K z>`iiKFAy2o?DG|i?EOOv`bbD%6V^@hjrMz^>@u`gP`%Z4gVsfi>lKV-*QeGcY`FP% z?KL_x(}h{>*2hmGxnb6HO!ZM(OJU@p>YQV~9sfw|wE0}eTqHs5b%Lbre{xyZoPk+W z77xs*uMY=dA9Y;x#Y?l6ELhfe-;+p9kRMzDitegQj7*u?-k41X!hkD8Fxcs?;i(G~ z^<8!f)?SPmqtHOvFcQU{-nk1K;D4q2z+b&!K!RaL+^}7 zf~9z`p$;@z?{BIN`;jQI-6(O)M`{S-A#QWbHr@S^LvPoT7CQxte`2hoILe8cW=eHe zqNY$k^3=oDC(xNgZx=|QU|m^0EsgD81h1^-3|<`d)s&CQ;x>$M!6=!{_R^4b!Tj?d z=AD#Nms6L^J+L)UWH-!Q*W9U-w_xv)G+B!Uexq-S^NE5i3W7X3Dhq-r7oKoV>9e8J zhq86z9=K|?5UAXtSh<6Fx+|BmUHmNTJYhG;;>msAjeUPX`uu>%-ba4U{FAN^nygdL zq8fmETp)!&)8oOYFBnb(?|ysiaYRGBDCe>fDH)XGo03+A762SWCyAG9v? z*4Bix9B)l5d-BnpYZkJ1O{FL8!#eQNoYV}j08!zC?BsLo1+%MXVF^ppH9T|CV>`;@ zw+~n+7PmEfoP?Bgr`xA+PHl3{Vbk6=FZI-pPObxKBSH2aUUTd+p0O-J()QI7Vd#7D z*oB|V#~-Qu`m49@ih~^^aI=vE*t@?HkJ%xb9hX624w}B+s#dlas@G4FNJilmTov3J z;Nz8VeBb^Ku2WgYqOCpV+TIrnY$A~^)>3DCBZO}rRTQ2h*0pC)p%`aZ?Qb7%!hjC+ zRl=sec#fS5g(Hzbt)UHkkqR3Gr%#s* zjd!Q19BE(MA<= z#A=x={tUBA8(aLDHTC~^%?>5oNr+OxU*l0TL+s^4Q`S&mgVV3+(@hMTxIsvz%urJC$2yBdiM^rqs8sK;=*7a0IR zU#%{2EOI!MhwOED$Nb#YV{Q@@w6uSUDH;tdfBNzaGzv5PS!{-dLphh%aKEn2xKbsn;Mn>wx zk<9eLOwj2w1jVhEk52zuP-u@VW@b#!tY&AwIB!1xlStx=^X%;E%=8%Ujn;UKns(kIT zVxW6FyD=}+G&QBToygQvY6R9}ineV2e2U>FMBN=wPrg;r6kBHtLd%=Cv2H%2f#4y=AZxTc!TwB`S{a~8yh3j*#wZ@%6Rvjyy``OiYQm8m_Qp3 zLfl`J*1=hrtN-o(Ftqjtsl9i_BdgcVXM1HLrgMWM+czV9^!i|egZf__Of|FfhR5S8 zG-TRE+gSkJi@uur>G!jVo$OL7WqYop)&`b>OsWF z@UfySQ@7V2z8~u1@pf%f#TfF_O+}(U0dYfKLXmB}zQDH9dtW*9?|aD1`IF-CbIo!3 z4XoG6Ts##VB&0u-P8CoJgwgPCC?B5&uVP)Vk8PadgzVPCpSU%z5uUO!)=)lD5!plc z^^#C?`S<{LA14)5RnxlIRgaqU_ZGuGue*SZC4x&kNZl%J6WK>V?(AcSb;gX%_=7Q8 zt!mX((`xe_2w3%aBpSwE6EPBN^M^t)6fI#w&#qbX{HARS8grRI6(?Xxun}Z>AP|ez zS8IugtCz^mh%27X71BBOjvsNMU|sH$MPO${4l%X|VVnn6CDw^j&$e7V>Wfl4*#p;T zt{3-uVsC^ZJx}rBgg-l@lO1`|uB13MO?DA(Q>M1m zG-G++I{TN+HSFy6QllU?xfB7Jul&rQt0GU3La6x;8-EPVJl1)4*P4ijUBGL2>*hkJ zuBs{)*AyZ&**?}AKv5iaYkG#Anih7u;K~EkbkB-zq;8kdlObBjPkEm0nd(8l3Sl<% zi+2uBdyu^cx!R-N4|{(K`~A$l-A?Vf8M>+|)iOu~wYs0@WWdV!I@LR6qq1(t=m8Am+61`pvpV)vTNSeGhvj8jmMasDTd- z0zhrWegEt15(j@>9G+J9gDcxm|4>W3@Sr~!ip+;aaf|Bgf*h?0H5E!8fK!xN1gK6Q z%5wXMo3M7ONCl1UH!w6rp`lzhm)*Q_SzX9)AQkR(ClW;`()_8MrWwdYQ}h2A&Tv1t zV*2M4DErWhudR3h_IPkkA6GtRzA$Ij7~8G;wNV1!E{guXLH1U(6-g}MMfNgTgSt6h zuJ4Jli_=@Y5<)zIj3V(4d;6)lp6z4fPkRe4xi6t zNf!avW!I;sb8ftoy;L4w=!}jOx>`D_T`*Q&7o<}`%2sEWs+(P|`>k93Nv_9sA@&T~ zFauM9gm2HY$$3>dY-?u}2?4C6 z_5Sl1BL~w@VVY}OOYNT@U>{i*EOT_85Ae4>w2rWo)~#g!)TFKEFU>2|BWyXfDAL># zk)oK3CReW@NFBWUeBUI9A&zDY>P>Y4RM4K*Pv-qGYD90FAIuLTHvL!gv+Z;aFDfEY z6nDz)P6s&>YA}>QJv%li*F^9e+c;A{320hrV3BpLd^i#8siS6ML3RurfN?MrPTkru zmO-7L=TTi$1&IQCh^PV)6ao4C%#vTAG0H0_3#uWfs2J_hKwVux($il10JYQOvHL4afa|a@^`iSDH@ug-)oU;aJ z4Yq6?NW<62PQONYzv6~u$OE!4<(X=K_Y-6VJ8b^Zf?CXdzo{&2Y{tbOY1hLubFwGl zPWGgn{#tf=sC)b4-JbM{(pPIYEgPl0eke6S{u+?zkb98yf;eEB`xk|>G&Rs2 zb0;XOX-NOLso?Q=J)w@R9YEu7a)?(in*VB1H&`PkemZdI`-3DnAErd-WKBRGkJADH zEjQCI8*$x&v$6pxdl{>NxD}c$$#OUl3J$Qh);5OYfs~}naIidB6$+KLP-9~#2OOE2 zP8tl#Q@5)7bukhShttFC>Y@9m6F-MArE=P;DBFsS2fk3Arx2vW`X&Zjc2Iy+LiZc0ltkfGAj z7@migra`H)(<|J(druaY$ued5-%Od%3)~4+2 z7oUHOy$Z+~uPK@Q@A!HVf3P>7Xn(X6;5DzV7?5P*RlNk}r|zj-v8^>5Pse~u=|gg? zC8lR*4rMpoHgB67WMoRdbC0jNJnrD`g<>PUO^kF~)@W%<6NM~fpRiA`0EZ<|z8ufW z^jTZ?pQywbU)tv^i`>F1Q$fP*gvAF{y(+z$As0SBs#ZU-)YjP~MWz721M!MA=2w6Be zlxI=fd*#^*BaVlGn!>Y-B0KL$IkJudF5%++=Cx&|dtsWdte7<=KpIxE1MFn$Jw+$G zZpR!*Xq@-v;;!4K8r1keiUde%s5)$&4^UT;edLS{SI>C76*#}V2WX^{sl~vcz{lB1 z=|Lo4{=;u)M#_g25B+!{$=YGXht>y@)}I(N1bXPF3rW;H3?q6(xQ%f7ykiCuhUUDLZ{R}zVPz`K zUVLiZwwBcbhph`c*(oacBsE&%maB?g(muuuTDvb2iVw2$s2*au-&_^W zu$S0}B_dG4?HA>!*Q3JbVj+oR1j8K{dU)$l*JiS|%lf2>q;lPcp+lwGcrISLFA!Nc z$F{tCQ1c{g|5K3CrpET#mYT*wF{m1%l!BstcIZc&$)Exwc9iX6yAK&#NKK4g8wxp* z)wMCH4ax0$9TBim_MZL6`<@E}$>h>OiT6=1ozCWqwN-TjGFUJzkF74)T#7@h(__@> z490yK*cC7eRV^qg^XyRJ?T`oY3l_s=UD%FoIP-jUD&;yy9-t z5#^lV*$ZE<5$*Q~UKbXGRI&H4YW+NNjIMyYDjY>INfty&>9#&Dw9=@L@Cy;eODKgP z)aM)^3bF&J14FXRDfd4ZW8Fgdld7TtZ!}YvY^f>$MGgf}@&J-) zwPD97Ec+;%Pz^TG14Qr_YjPQOvw4GHU9*FgY31<;1$K-$NF>JGL5u7PBTuj%kWapDz z8+uETrgREchA8n|Fp*AV+8f#X=IXVH5@jz3LOtC8C%PtK?F1lFMfL{+!MXD{+#~RF zYZq`Ni~!6$y*3@EA;ccRz`gY`Ap9PM1{>LF-5Y(J1noTYe_C5>(|e2u8o(=&6mSPP zL7%+_gsZs^tXxJ1YerQu;a*oIq0FWNdbDQ-yjcmztgiBogrNDu3IR_=+KJLsbzQM7 z2pDDy4{fa->d3p*3MC8*vl2vUX4(?`4-bq|c7B6(0!|S>UU|sd{_`J6Q~R?V2?VSw zPx`$c_k!85BDTWYV$2DWu19&$x!$zh(TgV8lx!)FbCq4PIctgwA>Yh-UY^tMH+9?5sx)N+t_z>NpFYTOcDVw3q-50=b-yKe5}t;g7R z^IS1vsJg5H$7P)0cmz^yTXk@fJXp=tiuPO{E1?^1U-v?6_G9;;?BOw-F1=SE{X2K| z|FcJkb|I3C#?C$fXzu?{P=W@Cq!y>oX&_QtKW#}hMu z`aon>MwYUpVXhPb8WSaGGqOmx*!f>4CY9TWb$73|%Hfco=WVw6u>%hs{3SvBr5|U0 zLoRFLt#!TOkagt=pJBKp&`$&;R9e`1O&?vnV$g4RsECLtiAvCvdY(<#f}uI{k}Vi! z`r#C3|FN!H|h zJKL)jxk@8BYhs}BSKJnCoxA#B-BjGx`I!qLTml?iGEuK84Is1Q)|{gc!g^F#1-hQO z>EX?F>{EdUCWMB5IxwAZ?BxA5nM}Bo=U4ZQF5gt72|xAt{SiS(M-Wl}?BM{sjSi$I zYhCHqDj=iJIG*G5NVJ;040{U6+4+phtHd)co-fpGU@u$Oo}O17a}-634mp{;qL3{u2oe9IR(kaT_8-! zG?~uik+E;8EUD=BwYU*r97Zzw*rc`DDTehJ)j@zYQt?u$WivYl-}*GWCUIU-iq)-C zl>tJ`Lz`VucB@wcpGOM%>rlx=Ii*6L>1W@CMZdM#4<^($+qv7@{)d|%KxO=^eeMgZ zzLrS7s@Qq5K(P>j?9kb^0n;)T|?n8>Uo=NxVU6^Ak9mYz)TE^wAkF%<2QUB zcDflnJKUQPImPz*L*D4R^7xj@3&OJ7m-d3H>gp-C7 z?T9iAefIJ~o?%IN zb{Z3NOh52Y)bu{up?$;mn)4s6S@4UBqE0SuY<0uDUP)pnlAxazI~y{!@qB+S;rF=p z6lw4$<5|FS_69VXIObFUE58Up_N1NZ{@$Y(8m#kr$_FHNU(YI@cxcEUAF-}wv&(D! zE{}$+S}?oV?TLlA&qBgMLyqRqWASgn5;|Qo7Q5V$08-iCdn}npxG5?zHeijj!!wyCo?WdU{Bs3QB^K#F0@V6g8*I(6nU<*y4IS@IN*x`dV7bM_N&s?qDEL&Q2Sme&f`m&4H^{P=w)iTl-aZ#XS22$8 zc(Upf_~g_iEFyaq#KCv_rzHTdF=-AVThcD#5mA@fXPRwFb$692uq)gwQ6CjF+vnzZ z4y@f1=2MU7gNTY>LDCDT&9S+X*y?BpAo7`49`~8-@zF7w+yq35ax@1InoiV)P+bxA z8h>3&eH*q@Q=$HDjs_y01m+D%($r*#@*0N>v5mq3gvnQBZ<)3g8cV9j zjhi}E#UL6ubrCxzKOFK0LGE^9mF?(@h^mkJib>=mxPjWByY&a+F6;2@k6z>zpeQ(9(m^3=~6ghC|U* z7^Sq+sO8q|$O&-j@0bgBG$U_hT>woV`UiG2DE2_UsZLeYLBiD{E{SIP6Z7p4FUJkd z3p@E7zA*Z%co<*g27}&!FV+*HX8qGqnM&DyO+??s(>@5``n$rz&Y)ev z-17AI18hIXc_=959KX=;EJ*^17f`erd?sgWAtc0S_zacU&<&7?L#4~5WZR+A{US%GFs~-)a>MCJadz74^~MFXA39}& z_`svItFW+K>_pgGm#@k7*EG890FRSsN5hOzR8@IuP8$p6A=+*uI>h!x6IH%|N3M>0 zVP~PQs)8Z}r2$kFo-v;rOPlvRA9qq`sH(1~uqX^J1S-zEo=@8m^I`MU^L;Xgc^t_f z^Ut0i0RskVTRvJ~M`*Mo8Ziu50Kpi<0MZ!Mr)=DQd$7VWW1k{v1a7iTv^Q7oJnOrC z;1_2HfN{$7j^*etj2wl%{pOmn2&DAcv3#szrk8SjeQ;e74hD4=H5^0O3oIg;H^!D? zn4cdoja>o#^8*5V1%B=biXCSCuEK)P5401v=5j4#hqw3KvnAq$04gF1Cm^QnW)nj* z*9V*!^arHbO_jRN0xvupbCG6*jL>r10M_Yrd&mxyE8S+}=J8z*VN?i=?orWV#)FBA zB%x=r!%POx_NuD37pg=K!-L3+c1Idov4EJuPM6^Ljq%dBx%CBqJ39rqmo2n<3r@)y z?N3(P(&~n?f>P;Avj_8>?eau+Q-p1u?52Fh{P2bU3uC+ZVkwO`Q+mX@h6W9l_(esl z1Ha9Nk2SNMu#7OH|M^9K7eMAGZLJHZ%*ewdB5l(uV)9oPg2Ab>Ziy#G~yQ`*QdMcC4Ca3s7P(KPint)js5+K0(A{x(09A`(0C<~*4 zz5yExcGgwY5GL?AYyQQj# zI9)Y0>_ddD3g@K*}3`i##LP8RY-wjVhOH#o3#4GQ|Ma4e6Uu==as<2$gs zq7EKvFcOVdRhh5vuFkU0S}+%~=t1^TeRV7xLSsjLCerk9|IAFZ#%G#NAog|DVE_6|>EgueadQs)=2^Tw% zY_o5An5!T081!zp&d^FJN8EOqzt5WNP;^1B=h-w!4$2u z`}j5J!H7McgOgSs6tu_0`;d(=FYjCO2$I*LtKO++c~k*VV)1&yNWY>ou+bl&Ij^_I zMeHgJ+dHQ-H)n9xl=j+&G$`6>>i2{mh1t(!+tSe>+O^8Z?_b8tQCbaC=pEK2QZK+x zA3^iLCwjOg95T>HG5Tse#wM1IBodM6Gi@sRx$LmRx=dChYseuf{oPj^62FGk%(2gG zgJm}cg}!DiSNIP+g5Qgd#SWl*`r3&$wkI$1DsViS!JG*I9t4rFjle((@O~ibOUNjc za8LwJN72{I!Pijpk6(-W5Stx!spv4kXL-RbQ(uId`s-Eo@Mn~Z8rh7;l}x$hKoC+X z6_NGvpkx&-cr$~&3Dpg}3hRm%rP0?B9$cvwieAB%RaDz)U43nRsG&WIj!%9i%+k@< ztDC9fHk9m)p=>oGZ8zn!!TS23zf|(8NtUk$c^gWZs$Pyzp*0_R1wq{(QuT1h+_OSgReT(J8j)xq~ zP79l>zVj1_y%Q(}soAvOx85#8-aY_4q4OTi`ectj)Y9D1 z+||{E)TYfSN(K?WB3Ghi@>9am801=&WZ*vJY(;RMgT9!mSrfqqryA|-jCJq8bWZG_ zT}NHIn-IT*(ZqVQ1_D@++$yPhL2#;?mGudU4*6-- zy!lm2>~22vwH-r|0OeQTD0{cAUm)n9L6dH?Za97YYpkmcea$s>rCgZ3y4?eiXp@f` z3seU-KwmdH(RkQm!L7#9q1;?{gI%0ezj{rhCtw5#mlSR6Y8QbH3e4tUg9mie{M`c+ zhMn50`~``SGirdHo-{k-)B}zq>X#}^dz~z1XRs4J)6>aR)b8&ze`Kbc*v;w&NxFZq zr?w@YgML-=`G}L-347^buileiEpaZ*k&IvUL?ohM> zSqSa$=unBp($hxRI}2(6LLf2E`UA*eK#AgSP4kw=i@er0ZOdp+$cs&uZIaBRZ&kx) zPZqGaTe|FZq0-|JWe3sh%ND;wGBhykyConJbGy37<(%l zO@@#vk=?w<4wh`Q<@0-%kv=!LYyrQ4T40M^$^4}@hhNzb!LjfD#>;`rF6w$fLlP&M zT>}*^+T|!k?|OJi2k2-r5UZ`q6JPa91Y0NjC14EB|NM);`g@pRe|b+)cvyJI?q@#( zwEx4y6G+D$l?{rv6ps-T5M_#FI#%stP1V$NRiYN=+uVKR9-Pl|Rtqn*Zr$gig5*Oq zQ8UB3+S49PN@`~#wzRt6x;CZDmk8cEpZj&ibp^ZrpT&y{{!yqkDOZ>o zN1&{O6n%oUtVMWECd(nn=s2PW9`c(%KI-fH#R|yXZ1S(EZaCn@LES~104okF_m1fq zzYwr4*!Eb+v?9}~uLJfF&{B5T{PB2f4%#TsqpoloHdLeeNqc-8e2DipO|M_IrK7zK zxgmCCPG5g*HVpD8SVK4KySt{b55G8HDs^mGRX=kx`;glR8~&!5JJvXWOZh^9aK0hc zVKcy;5q5onTX$(t>sdtVS7=qY%g6QmT-{X^=^dah&Lb~D6Q5@Y5(yW7!`y!?Xg6XU zu*LQwdV}%$W%GBBWlHQlx67$}AU3vM+m*|s5_`i&=ynU(We37uha=w-2p$?eP5g&m zOA^CuJ$`@#So`7e>e=k@ygX_F?A0Bvhz3Ie+ZSB1-a6Mmm`!C8I6)!Js{*IHsCx_h zl+scadvoj&GAq;E+%qs|Xk_m6;XbEU4dpgl-_F&-wLQSm_DCUHLlGPE?Dg_^0mn>C z+q$MF;w7A4;@Ac1RJ|@Bq8HxIu4WU{9!OUa4MqfMA1)YRR~8`=s!LRJ$#St)Ld_L> zpbev3!#hzC$NbraZSB?7;kd5xJo*$AB_8E)FbEKwoX&Q2?^K0QJdmhGmeTzDw=0KZ z?3*y-?*yG#o9{yJ-?o7{8WDQm`C%i4q2URfx}2+N&Q^OMv;@~`zy_eqhI;~#;~0Sm zc?_a^4r^9F5yF@3`+aeKR<64~5sL<8r&}$ybL0V>3xe9LQIrIrh&Ve&TwQ1bG0m+L zHDh0#m(;k((O4JQ*mmfT^qYGdHMF)6>JOYAL#0C$MURcC9UK+dRc@KxO>WrTZl@SYp#wJEJh;5c96WK319u{M zvIUQB)jGjLGVLnk>XZMoojsfUMZ3GwzBzs`4@NaetyrqnXX57Xo!S~;uh*e%Q4Ox^ z_81;LL8d!hE$~JwPIpgX*IHc8=_H}!H$5Bta!UNLtO$s_g&7Yi(aO@THe>)vd;5Y76+Re=^bU&K&csi4uph`0pUW_hkOj9#= zrooM%V|*RY-nWOh4lPg^;P3vr!A&_E`W9`#J*h70aVLhm_H16i`;I@SVcrMM0(v#N zc&D4-4H{X|8VQEnQ8Fu<%;VP+XOW_u{58+s{N|{CdNzcRTUXQQoSe2J>v9!PA^hfG z8{ZAg`K1q7*EjHPsT-a%zPL8&MP7i^!rUS>bQb-dTu(9|%>W2aUUcA@yi^zjFIy65 zEs8Yz-?bY)f8lqNaCrrU8(mTtZ~~8Gsm(|K(YxR2V~3y0gaS00NfaCFJL;xvU%PR} zYV)ojXw11DHy;g})AqcLQ8 zgt2^cZO6mN#A@By`UtXTyjb73{Aufg*H>3vTj+0VO8P*P00d^Quyf^Ok~Dvq^jRn7 zv^EDRHeX&}Xld*~yTAJ(foR#K4H;0NcGCKqc{A^Ix)R+kxhgVH+gB>uJ`go6bLx3H z#`cCZ)yrO+jRSr}w+aP-_94F7BeNsss`HN-IFamyt(s34MkD>3+Ve0ie{??OrhXqu z1nN5Dn-KoN0h;oK1d43;v5Vc?yW^@+^a;9Oy$yoVx7k6-sq)jk)w8Nep30$~qzI#@ z1vH6WXkH6rzoyWQlWSxZdJCDw&=l-=TXEjH<}Y`V$H@xoTxteFm92I{U3B+mkR0P- zK7x9cA{m*kI6I5fmi2DAcziwk?uJ%ZVn$Z+;utjG5rogoRBWqco9ss_Eb#}+2V)Iuo|MX&%w@zB-f4zu9364g>@#@B>5k#aeg*bSwu1mXsgfUZ9-7sqg z3IgbhL$N!U_uzy9fF~YC)$j9prj+Ufz*-#8_oN%vQu(KSDg1(@H^ru()b zLb-n=0&;WQO(!$9xWNiBYYW*%vDjKHWKriv6(e9azPAiy0`um3Ve`a$bMa~R zU7nY7%j&ZAp28?NyfQl-2c&ln4X$h05O>+;{1go9M|0V=rV#ZlEaEVUi3X=Y8~;1M zM=5)+%_S%ekPjPZ#H2gBWT5k-cCBL7XqQ`9O6eaYor4U2BpzaN@Hqcby# z+fJ+@BLl;4gklDwUOW1TbxcXA9?%{Lek;mZm~`vHQ~szk*=a=boP~a2^M&`*_B^j4 z&mqyym@^iqg6fj8>)j|c!++>FV5zDI&XouJY>1A1p^QDk{-=CVSEADh+ZQ72HO{)$ z^3aqd4ZD%|L$00>j}hpzE22&$FFo0;CppzRwZvCIM~f0bPhr@Nq=%0NkxOvK!umAu zw=SFM4`Klz8oL@~7~wvb#5p$Hxp+RvpXK?p@2k8$X;JH_*B zh6d2EfU;F*AeO2^t4hdM?NZpyNe?sC=Gxd3x@JCe^&d|N@c65__>vu5fU2_Y=Rz@E zkEHxH=_EV1zAazl_o1QyLnIjB^+^(r=YVD*kv&ATMp*Uw26rZ?|I%!}BDaZkD3C#c zkdx$zIpbru1ad5r4ToL`aK0q$;$=}AOtI4;I2zbDjGB@VXz@*FtVNa*2|26SN5c1LivH+}J@Rct;^mYBlx!Rp1;!u^Cwpzh-|C@SG(hpvPtmLO;rpu>U?X?dXD@eN9_ zd0|=G%71Yh@GsVW&>8SARr^80^pvm-$zn+2r(d77WS!y{gJrjG!hUztCak&jiQode z|4kbNm&~7DudTH{LD|{q!wFm0o`!h#ngIJP|u%E6fLE0BUxm?3^SeU0>%TagbrlZ|35`j@>qe4QQRM zT*NWWoH!IR8*XTaE=GxN{^cQxA3O;vdpT*F->)jjPB~HcSK^%bxCn`SS^kvx$k)lPb3>z+#4oLmRTv37iVv`TZNX3rPCYpN zS%ZqhB{!3)JnF-L_*uiU^0+D~a*m*_)X6(*JM2J7H&V?S8f-5i95YHGLlp&UqK6X# z8jj`ySAt60p>LnE-Mm~hBK4|IXdB-2IgJ%KOg>Z@y#%fXP2DG1Oc6_jdO2m>Lg;b3MJJ6GFW zANPt&VK8x&Rj}6|jVEO(B|^i$_1i6=N^RuX2^*E0L%-cN#BQa-Q}ab6({W;un(i<{ zv)LtXvzMJ-9rxYa?xk*Oa0K-?O%IBy%=QK!Kt&;jb2k)OmV7Ys$}q0{TfZHlzeuy6 z`Tv?`pXYix@Vk0%_2UN5-O4rMs74&RndDdFCI#Y(dwC&~b zdqwu9Xqi90)o!qB={k-Jw|2!UL=&)GT;KDf(f>vKd(>0Ndqr0mkpW#KLaC(r0$;s! zbpuu&TW9xVUHEcWZq}@v7AgfLX&&jxj&?4c0dV~&dF;zw$thEkD(YU6yhMi=D(_i} zbvI0(9g`@Uwb z`+gq3;_@C@%6Q@P8eL(JZu^6e4!Iy9oOR~V3o&$_(?e6yB*5VtfAReqU^O#fwc71+ zbF7$cYRrvRGRIDa8ol|vmltC=%?-Ui>2=rH2aW8^tRS|cln+iXzSPThmynTT7nZsrZV4v^24}O2?BZoi3@gc{QsXGvU@Q5|HnOKb8!x%F1tj|ZaS;DCVQD-7b*u{+|{bDyVw8a54_+E zI})gnxMBSzO+15?6q&$u@7XJ4iCA(}PJ;-*ubgDXWCM*JS0zvh7 z{b(>2=RAPUk~i7Q4Vjb+r@rDusq*;qLqmk^8yYgBz3CqI-*=wJ71HpofjG3f4T>Flsl%6Aq+y!>ttO zHiVu=@7K|%J^BBez4w5V;=Iqt@12?5ot<56neDx|YkR$Ol{?^oqZc7M2oMMal8{h= zlVn7(WXZ5HgDBDgq9cj~;)E1q&nq0;8%uJD5+`x&IEfR-iA#!|#Qxa-=iR%b31PYA z_sj3|M}@mBGxPRudA`r{_$Uj|R)q6OW-?yGkL?)SNsr>ld=g=(WA7pY{r}T={NZUl zO4MIVCF1x>b`%cKlikgkpa+OnT!QBoX_id_RP1h_Cka*>8}j=$qzn;@ zz{#(*YYma4$8$G6Fe$&cDZh8#f(1l9v|vGguW==PVcImn#H+uK;5*W>|5vk&6i&m! zHvK2xNX#9w8g8>qV-0LZG>`=ZKlM05+rw4^TSv@lU>r~*7Q`Z!CS~^FFpWvB;!mgE zdD9KZN3obZDNV1U+ox1ECFgYOMrV8YQ$;JDnskJ<+CMgT5F`;00$L z-YPIGy^Q8>+oI;y{)IasnY^G!XYnYb2_-?=`-_9f^5YbUmM#q2Wizlt^m6XRUxc&t za$!?Pc^i&Up7DyC?xB|j0jRCPxkePj0JzTac$<9;Va%WWMF@s4J&8|qTzo>qlz7@^ znprt2Y+$9b=*k{u#r!|Oim<4_PlLt`G1P$2=-A4!Y!?fX zGCP?7(NLsC4JcCmNHu@^Byvy^&hzf?pspH-Xs6HPOP6NKESA<552DI#@sQr=w^aiv zY_tK43LXxMI+%r)YJ_7^_{r z(2}i=n}9z;GFy-Wp8CX8`g9pSk9e+Nk`f$=bZKQhe7ya+?|dh?0@OSPRssn>#UX+K zvb48j#{Kk_dGxhZDxGQ@)!rtf(8XggGU&@Cz1)Qa8>Tg~CFCw-M@;HDowlT8)8g3` zvSiTdF}3@GiA5%$beghd7v<|2NAG^vyy@u8WlxzxOvm2IG70ZyW%o zg6ilaY($-lK?k!_r$a^r03_hQZc-8XHE#o~Sl}Qm?DXmgX&iQgp`AwOE((i99Y|nc z&E$4}H=I+x`&o?A%)gCzBpLM?7*gn0u$lCs{ik6vig^rDw3zNg>I^oVR?6PlQHK81 zvGQdB<=8j9ug~7qR)&ya;r;yX-rH|cyRcqdBp)C)y^WLg1zd@A?O-~9~1 z!ngjOiFC~SNgV&zeJ=*S3b2l8+#rSbg~G9_hVO1ZxWpw}jWQfb!A4KWb{08xxf>el zYKt?;sD#)Z`f2Kfjx4I}bqK`h09cc9YrYqb<+r+|ut8h0K+u}15LyHYoo9w#8yYn# z1ZEQt%C|4)Ui}{6T026CXu6@>V5|UK>Fi1%PDHem7e&!6hx`ds&JIv_XS{l{RIo-#>Qu_${& zhKkdq7WqrrvNdBdF*0ZvT6hojYqHN3!yNa1-`gVTovyM-6eX~puCdL<^o=>_AqkAT zX02Xt^Z=m>n~+Ct0C&Zo!c)U>hzeSeYOVP`(@daGp_ok%sF&hp&% z!+;H-bUOFJ_d~g#et)W*-+Px(k5Xy4kZhWuyK)OO&fLBK^d*K)+L5dOK`T2WANoP^ zP6UJq7i%qV?n8MUP7b>xAv=2Y>`@S!V5PN^h-x&i!Pi{u;J68GGf^PW`$_1)#4Caf})v`3*~P5GrQOiz?W zNUbB_4JE@Nppo>=80Jld&|y1^9Ol;iGgDf6GKc6OT4?x};tvP=l$Bvpn)}SZT#fN% zZxQ1|OtPp4*WC;Lc3ig*kz9rC7-|9}xAAimb3H%Y#(+2P{See)&H{4&rXb`me%R2& zjO=|i;kaHvni>Ic3>7*CA$^m}6@CyQ#&EbiU6ynrg-fZ6-zKu z{uql&oq5RXa>DbsgIeSbl)&3TzK}xhWaDgl%4jUTGm6%fn?t~_?f&;5cJep=eXNyk zPb8*J7*pqy?K-2|nU!+p|H#0KRZqZEImwX0$b_~32atlV=f3_Q5M$Z-)5#tzWaKAN zrO6=)b=DFCl*ffK8;}Dm`)O%E_&!{sP0!g}viq+2PKPBLK^}E!7(z)a0xcGi?zkVB z5+ETF48xu*qHNI$A~5<|x7}pY*aeatUmmO1YdkIL1rG@PL1HG^447LG8Uk)VzZ-ch zW>mk1brsbCb8__`hZZMIPW;&x2MlVsqAt75CP)22_Yx35BN{RAGkcPPr|$G}Ne8+| zuylLlj>u~DlFsb(+Wlo_QENA$8UnlMpZ%%?nTEkNNDkDjZ~=`UkU&o7 zH5nk@k$dPr;XWM8?fuUPNQ?@n4p!ztrXpBm%N_rR%T2JT|A$YG>R*3yup$3AN5d2g zur(7E5dPeKcI9(ABIb&J{UI9@HiP44QVufnv{i538W z00OhZnt{Op+sYs&L7D5}xr{U7w1Xr-1BM}nW&g@AT=2AT^f4kG_;>&Oi)|RZv)3JW zfM?wDxC7z&Z*Y8NZgG4SHd;1i_6jP%kC%`RhkQV8%P(n+zUp*nwV*rF+5n%0t_%{R zup2bGEPZ{^V=E_vu`svtR~2*U8IuV;?5XrZj1GO}3vh10g;<|~*u>iIVm2iad&h!( z$5@lDE$MD+DPQl?@ah?4lMl`5WJQ(8MpkTsFPaoI7(I@C9Vz7>{mSd1o2P1o7L+BJ zWxL&xDWykOCL?~2N%~9}&shT?sJL&Eq13!vL_2mW~yBnxkysylyua<1|g z2RC2T!q%TaFCc}trHF1}6`ZhWibxGm-np>FrF=lh9@Nb#>p*Y=sJNsPnQ{m4B^+d{ zP-}t0kurb<8E%H>^&$c7w>ce8#W}tnn}ClVRo>#r*kbi)1o%xGOj3Vc+$um@uot)v zfR@RXK~o^gL`C*Zo}v}1L?y$Ma;S0`f`L$o@a0J0&;!aco&;w}K!kgIonh2ZG(bbl zMvp~{jgrFwQxl%N2A-T=AM%HTM2ZK%`+hv4Lx$XHvY7q#aT)jA)j~+3P_@^Z-}=ru z0qNUQh*v1z;K}}esT_EJa|oqh0GO6%1%A>Rv{T#L$a4?Va{?cW*+3iMs?BI&RJC{S?q@tk_d z;4^4~-k`VDr4HOLiFa4P*3n7PQOywpbYhSKH)JM*SK}4ZYLX0goc9X_oJ)Ho4)#g7 zvNCK|Q1$H<=|Os$F$pRS8WOkU_bw5jSOG5!%9QxDvP?t1ki>aRL_erb63No~R(fa& z0Q2Zyu&U?;S0tWA#UT{rlu25GLT6>AmJ~ZAvs^jR;?qf4wna%XUDXp$^fUj zJ{Tw14Bu4#R!i=wr$@?a{EoQaS3RdngQ*n7%n*Da1#x)gKu-rY5x*;-k(`n>Y|+O2 z(O^kRy-ZIj{W=oRWBL`C##H5ijx6BRqY8)_(q$;QLt*=Z)(LTN9bKVdX778KaXD;mV2hgrb*79f)ec_|_p2AG~K}KK^#Ahc;9I z`T+tz&~I5YRypOB;Xg^rrzK*?Uxy_EIsoNeD0^n52A{y2!S{u^;D|KOap}$IM>B{J zB(Zp;#E+fodxS?&-k<dVdapf_T($I4Rxfni5i@?qjtegzsFc&&G%C$Z-!2<@yM ze?qUbdtd)=Y->6q<1%mha~<|fYd7g_61o5|wk za6aLt;=rpKwQO!{8{6>(QSWqO1zcA|QW-0gv5^5dG7&@u7UG7bxf=J_ei+L#8IU_G z0kn2`P>3&p&=Hos$s`BU>KjO{Zwt2rL$0i{kTm!1apeX4&0>-TrxL~?16(Ty0%S!4 zj;i0gn|K6nVgDb-E!^AACJ|26$BJOF6lv_R+Lf!>5U7_nk5U?K>~IS`QCX(K6)zM@>R zktEK7`9qEj>}t4giJbKrTh8*PPSM!OpW*;gCOJq7cYD}DB6^KnOke4?MkQsyL1Ndv z71z>(J;SfBGhW%b%3JNwbCB>dDgh_C$9N@o<12pUw3BFoEA0^Sd!USio%aRhZ6~|q zMP;XpOhioeV8G4P*<@h(d~~zT>2R0V*ETs#uvM|O!S4f396xDH93S+P1f(niN<6~OoW84VX>z=W9`M$7 zMxdFtR2}&46Uq!X>2*u8-L0NAa3H^z7{_{I!4l@XzN)$xG%1^RXFQGw6lysT z(ec2%(KYHoHU-Z7Vvl>{W9w%{O2NrNicm|Bcmmk?p8^~P3c5<#L;fU;UpLHkJM6N{ zYLys!CQ5>>b;aX+5r2#~J0!&tCooo&N-voLH&b~s4mwnNdLiAn^iG$1GTSIJ5_p zEJo=pqAXiKt(*Z@47vp@St0+KIlUMl0zA-0;?<{qLD1>jou8BKqKm7eur4n{9DD6 z3Qc4M{e?#KwKSoLS~v~Bo0iheLrv5ocFD#9({W-$ec=P>gH%;pDO7%0`2&tX^&s{d zoaVpZ5ENes62P1oj=)WT$Uq_bR-zmUkrkL_W*p~zzgHXM85SL^X!(t-j9VBP0eNJI z3$a6Fa)uu~93d-*p6gg|FT~W9 zpGL`-tzX!AtDt)6wV?Wh4ZqF4lDTPLxqTR%@x>naoj0DuEjFGJbe$ILyJ2L6=pkh= zL3Z8ARGaK}K5>@;Y%8!8Mj~vGjMxd zst`=oSsf9WAvXzAX<_0afuwvTNg^dute9>MGiR2Coy+c;R<75AYN)Vk>A^yNYXrBa z1j|UKzh*AP+LWB_;6cNm!72F)a&2%3pdo`MY|FU6urCeJ4FBX>g?{ zkn7FwQT$_x-^)TpNM}m3aW0s;A96toj7%$Nl_~9GiIY=LD?iDQNB&Pp%Y7U$tr9LF z6%&R!>h@^bJu3>W?j8cbs3&eh&|>;9+NAtmWqS#kGgdu_zz_-AC-Vg1EGy{ zc}d0G)r;3MwYy6Vjc|~z;$)R4O39Sa$61A`k6MMpJ#)k2f)wM3Hr%j|+v1`ki5|W< z7o@`k$f=Y!9!MCx7D-uKPKs9`ZP(0=OPC-CMt}i?WUS=#n<^LAd3936!W%%RVmArP zldR;56yzR8^wgOD`|(xAl%L~nvu-OhMi0?JI@qrj<80bq(_FzX=D4WcgnoaT9*VM% z6$VugfwDkBstm5^vMfP4;QjqiF#Y8~JeM@e1;NCw)V9I4h?$bb?%%C2LSU z0+Ua9tdfkD)sw(3XlAq~f+0r*>6)cpQr@d1@jl3_*ZClqJ1OCIBh1AC1dFa6x9AM~`i2%UH3iz?vr-*Nn0E*15b67C2Svt4Nm%z4?O9 zny`qdr(@12NDM5PvdZ&SEN-4CLFE!$4fwU6uOfXM{iI^4CUrL;juBnR&R{(22OIos zW?Tih-7tEEPvK_Uu72*?$PQ0nhJF}JcMu2w7tJcm@5ygveYgm9>4mYvTlu{Zg2a2M z>|`(D%wXFt9_m;%d8}WmiaI4!V(}7v9eSKz#OVwmX!6KDPdJ>6r8?W`sbwWzKhIgq zmKxA?X3$RAtzLDI5qV#I^53>SzH1HA&VmzxK?RAB+2#u&M5WY__++}vYW0HL7r}tS zarp5YJlx))Z3BS9{~fqvgqRD%#I`#YDu0Fz)%iLyS3q_8Hbt%{i5?tx?ciB7mlU^D z*3f-Z>tY&B%7!|4PzqlilA+*C@;oFxM`jPZ|Ns3Of$m#t1ft9KHImXBmK^#69`8-vb8Y(Jjr{(5@c(NsUAM$W zR4qq(hwX#FZM<+5AHgS_Yymte5!zl-e$f(~oNnG zyRODZcXf?&ure)dOhYPdmoytctkQOM2@Vu1@*4 zR`R@`9!LO{#TXAnoJVpZVhPcwR##7#keXEXwUKf6AT2?2F@GfB0(uxHn<*-bo~kPF z+4)S2egi-^QjF3NoQw~u=UE7K8-4LH3_H9N5j9mvF!<^#+=!j4$LWRMjW)?{(}U+w zqe0Xdf^bO(00kUuJ*A_acsT4EVHgd2t`VHlkcJfR=J^!%5&{w4%M;QK0 z%iS8`QTk>>8xFhcFu9$ml)crbu1Dh@1kTr@NhG6>w~xX3P8hz!EPFa1kHixiR7@ay zbgOs!hu%ixRtbg_(74g{^pmh~9?Hfz#IpqTP+=!T@$;?TUB%vH2Qv&_WE4?x>+9;J z$IF|e-motjj(NJgD8nU$z0E^p<-;FPq)q~H+W!Y&yo-6%8z|o#O)7@BTOqV=dY#|C zrhP?7qZ{!LuI;KHwbAyi#OcrJGo$ICuj#5sP}peq^cB1VX1$EK0XP-01Xw=0AXHf3 zLQ(GNCOy?`hv)2BdRQ`zo-%qiQP1}Wt3o>V@`$?e4ZA#kQQq$+{>B?#Wt-hz^_0Q2 zxOCZA6d4=zf|$~yt|z}=9RhTZm{@4MyN7_c`Iu7QLz;&>LDJ%KH(U|F;KVroYhNpD zvwbU9jx?G1M7R36&=ZrP4a$`~DP*=nh+C$2RA41#4%1!8*;tjnPv)QyLsJZH| z-83E_|G9_{<>FG8df4CoQG>K7@3{8JcuWqJtVN)qQKpX}3%jnDv~)I)rUSl8_P8JI z^DnKq=JVgD4$k76n0p_&$-Te2k!FJr)wSx#u(uB?e@v=H*W7!LdU{-%O(Rs=LR$_| z1$16%(Ws)i$`8||L{Y|)+Pm;Pw|%7R!w_shStSGe*t~EDxHltpJ1B> zJ*f_^zg=h|IP|bXbN;H^Uf63;Ep+y3cw+rHvT#_q`lGw;qo48D1V~I*pW<4txrTd< z6>{JN+NO;$zf2ua*7lM=G2_`lS!+pTTIo@wAC;c*q!`W`GL8YK!{jBb%43g;;$xsX zHjO8sk5%@MCvFoxs9tJp9@jRyvLz9Lw=|xF!GA?KzuuzdWEixOR3H^-m{L|%znpFd zr?t$j4>gH%Cr)pn2PEFCH(4B^lJa^p{B}WvNR?Itw@?ZQT+kozsRLbl4f29G*D}Ok zT3u1QU>UhrJxLEaaZZ{{UJ>|bysd%j4pLPaimrN-G9T(s-gnN8h0X*MuHrOW2tB6k zb(Q7O`KT3Eo}55RvXVUpR0VR_$b;*37DK4iC{;>M3#&(ArVzU5lX~?SV?P`NPDtg0 z3FOoLg-Ngr(*^wiB}X3 z&I+K9&Lr4UVM~0>_@qWc%@asjwBU!@%=)d8z-=1p%>4d^b3k#1{!ovLVrSd|%2%ic zvv7enO9YRv+U$}EeU9#0-0GI;!9J7TsIS7ch^f7g9<}*9mePX&S6vE?Q9eD1R4ry% z|9ypyVmm(3&Jr~7jK}8j$adKQ=@++pX*z`L00Rd08mGfsEVx7T6?&c2u)Gxblw~Eg z0B_>8p~(Tl$o~@}iYS+2-~v!_A1_)0&NC%CmAups`9aGhy{_)JbXk9=w9R{^$^F;q^HQb{9b67R*;8*nm5>jB@Oe6GwEc9!BE^j3)DF!ao2---lWy( z4b^nBt}+|3!&pUt4tMTF$BH_yo_`p)$JM;();UGI)LUjWgE`h>l6@iYkO2v&L}n0w zHwI*YUakYl8v;^n`^co*TGI*e$0FRV0|ioI?Rbv~Fz0Od2$YvA_OL>Q*YhoDF&kx)n{mDBVexkrwqVPFySasW^hd zF>nwXMUYi?W&t?!LZ$#gRcP>}_@E>X@hEDof<4eILO%yMkE3%)IKYHDT-nZu9^d3R zoQME$8*RK5*G2sHZ|0B+rhTp+&}z%vItVdHc3EHF*w83Nn*u-sSgYx&48c)!Y#@V?jp6aWD!WOR@+MqK9n0l3rSL{=8|YO zzu%d3Nha5fB;zDPeT(RoIDC)=vntvChiW50j0S*Id>*gmp7;k>?(A`sGBB6CKu#$& z^T@1zV7WL=7*LL?xJwdeS4;<>vy5JfR0ALA)@hp)HYjRg8CkWA3(zg1vPWyP2W!9% z-Y_OzGd4AK&76@L_=VY(6_bPlpellejm07@Irb~JA@h`slBDf?=_0>ydfD3 zxoHlW0!2Tcn1Jn7-1Es;w0+Th5)4QtgW-{Oo-=bAoFau~D*%MTRuO$`XyKk*Ncxqz zj{x$!9DV)7rBqn9>a`H45jdOCmcWs=j&^Tem zaIhIwR}S!9&|S(e77>KPO_BrLUkEl|zXks`Z7;oj+lR&w6A}$qj|~msHx`q_^^C0$ z3(3S566!ilq!VE#WXiw+0Le6?v!pF#fJ%}B&^oqGWnp-oo?Jpwbst)%P52{)>-;0@ z6lT$TPuzXe(C%7F>>wf|CG_A(AZ8b%2&=ITO$|N_Ht3gSq(dQW5|_j+rkb zvu{Azx0DQMr63MKN$I?sq}=rFxYq>mDbyLQn!;W)G$RYsE}#xh8o9jyvnV0mRpzTz z2bQ{R6Frjh>fNMjlnTWgI)Ew=2iC)_CfCEf-m5EY+{~mR%)QjmPZYZH6zfX6l3qr> z2-0a)`N=W@_FI4rNA|r%IEk+03eSS{r_#5axU&+ncQ7YWlAw1Kx1fK)y~RQKCc=?U zJj&jY2Oe1pJC+mYD9I3l=-hTfcbfect)ryG5gB_Wcdx5Vh8jh{;Nekj;jJu&7j#U$U~vR3K`jp*;*VK{Og7R?0i`LBOij1G4h#PF8%O5 z#EUFCb3t3~A@0T-o*OF}YlYx+=1DC`H!s&Bg;VgmdJBvEf31G#)ehFMnYCf4hrhXy zc$9CgBzF#Pr46e{`np}UKfh=7O|xalek;t@>vzdDgueVRvy)h92D35r8f-}!M$xrt zF{g8WoT<-26Jto>6tx)*Ea#AW_TK*gWiqEqXf-PSaX9~h6w}=|Dy9>lO^Spd21%K^ zhHOUh0yeg9t|35f7j~wF*dM0({KXl)F6$`{ls5JFW5b@pX)Q2jn*-B z)qaWDTk!Jz^n%4|wbqoEMUBMFaOm?-X9^tXjlx)-$>A1>fi)k zwCapDB86;rpyT=OKq^rTfQafxvAv%juCnu9Kn!olz;w@-qD$hPh>YCXnMP0y-fDa-~T4~oac_z){l z#;zwp9^Incvz`PHrqxs!ZJHqy5!oS@AcAQjS|m*rx+ZwEqw7fo*5rs=2vh9+_2gwe zY%s)Amm;kGz(XW@-F9m)9B@~6S!Qu!X}DWNrP^Gx; ztiO6@qK>bG?pE&KK(f#(hgvCJz}gw`#Mu|5g*@u4`@M16B0RK>GuzaX^q&)L~QK!0e-Iae$#Ig9Y)i zTYvo|tGU+v+qE8F!5M*5NK?m7p-qpImr5lBmlk^LE^CLD1F5~J02{dhx< z{zhDS09*9sjpXyUzxxfAq2N+Jy9uR7%NZ)~&BD(H7HU1U9C6p-M>E|Rzfyj_iTLlu zqugW}q8gJ0xrUbS+zrDfJs|~O^6GnQz+uKl5Y_p3jaih1W@Kt7_tn+0*c3{YSTHMq zE@i&tRZ^L19){RDYMcZw6^ z6X_PE<4H0fxJhN;NfPLjm`t+{2Q1rOJAW!;3V@;ktQ?N3R7#uIij(cG1e2FB4Jj${36g# z2MckJ;(y%Qz^R*HOCqAqFs8x@r+B*eNJ<(n4w2GJ_DNGSiYhnIBR49!ixpl8Pl+Mj$ zb2}=*il0&jqH632C~uW@@ujdWij`c>Gg zgW!6d8K%4M>r7X&t(s}PLukw(ji#qrb!_?5Bnb^#WyaGauBS)a{Rl}SDc1iqaR+dd zYkL(D((Yt-6pm5U27}&LIsY_?dMTn-!quQ7D1r-k_ML zZ@~2cQe@0Vx6M%qTiZ}xv&+g@^%>~B6PR}s`$&H842XK~ZGaU7Eg38{!Bkl{yRa#&kKmxU)qX7G@N_C z+*;s&c5WkSNPb(Sd8kBGPt5Z-Huy!W6~Z|Xk7HVMh%pcna-02kmELn@uq*B?Ep_V5 zX=htQ1C*~A%@8|g+66bOy#9>x)HX5++o*cO>v1ZAyI#-~cR4Vv)-m@*dpDFCE-u?n zI*8%QPFb+@K`I0zckYwK?^IbH&K2<3tl837+K#Hrwd}C}&L>F=n-76!NazkGh^HIp z^t(eK$5DEpA?b2@W}@F8@P{gU3@-ZG_+&gDaXV0Q1g!^lBy$eBuiGfLIaodg$;thN z@0^F(ikfe;gFX$;v~06pG57HhV;uBNig&Y0SjFMW!X!%y-0z+ocGmgQO^rsy%uL`8az zR0Ze-R$32<2Mn%tLKxbpn2kJIlL%Ew%IxPzR}~8N5Tw%R7y{BFMv{>I42Qy3cB+Sx zaSrJ89T4Y4eZ007!T}f&%roW6b0iF{8;@3F^l~~&6g%xSTSC2Xm)3|#>(8Gfu`n95 z`5+pzQ%BEh=%FI|YJp=3Ei8hf%{%9mis#9HrjS=+1COo2q?5cBeN}a3ji4)aB8z5{ zthRYr&F7IFP{w_lJTpf!L6|SY7)|gUoxq#SV4uSkLd1(nx0v*$NSDX zG{9@g?*Rup;ihU0m|sx1^;Ac!3zsikt~bpFfmIURRUoZXk~>J8!`d0YgT#2O4duQa z#3f5H`i3NRpbXc99r+wl4=cGHq-+d3Yr?(;yWUd;EVRXjXzCYsYKs$)s)ZSZ!ft`j zuw{??;(MREmZ^mF&}5t&2aD)uP|~UVatHZWmZ1B|PSnz|=_}<(DgZfB%tfeuX^k39 zFuJZ3l5X(2kc>mymA)Ja1|1bF{iW-Px=Gn~E4qv_7C7rF+(Ut!AALig~Vds=lPIs>OsqKqM=_$PsW9 zJu#pJULa8(v@$Pp{ogT0?Ev?aSp69Ri4m)#sjL?3Gd)$eVy81?!RpAuUVxmXmMt0;7 z9u)SHGG0O1KYeQr>I!8&vFJENBf9U86lj`{C>s>gHwCL>Vq7Pd1OEUE0^DyX!WKoR zHO33saFm%uJS2A7PriyJh>5YT_ zgAQbDqv?TJrIM%FUsYNjNg@A=jROZB`T(To%BI~UFacE(RjaLHdeY=HqfXc89eV35 zr%r1GO%X%?IR(yLE@>(jE~}P&j1t8Q&?8`Z_F8NpCLJ+?SFAg&;|wlT9RK}p0*PIJ znP+IHX6TaqUQIv)OoUDO@fSh+_PGZ%%6BZpsPw)_evH~YrFjp5Zi4dI9#V|Ij_e^J z7)3a*MK0Ke3fK4d5QxoLAkat*BEi92&qki`Cb?P=~%`UXIXLU*7};)Vxt7@%&kXCpf%uiYKKfigHiJ_}fh^3Va& z;mW_b@OE8Nc94XJ9}9osw-f^1P{*6Cbrk_8bghSE<>`ZD!*DmjVEypZ)+&~lFxcA< zp(-W+qH^XC8H=sv`K$e8K@}^=Aw)o65s$_*E9qCr79-uxYa_-=7=@UoZ@xnO01~lv znHZO`R^NShwK{lZFu#u_ZfEz-CAR7W=m3z@6?k`d$lHvKV=4xI?_>Ebk5(;RQe{rG z24gYx5IyY#$^#v#F^5c|3F%Bh2mS@UF&v8~maXX>Q`rIdE9AMQ)=)n^P+VMET2d@| z!KNZAJ%@>@AHwB!Tle@e6YVLF6m5-|OJ~h0p_kPYI9JrmUE|yPI7`-wqZwr38cnv| zYS8jn7SLJ(wiVXwcatUAI{^=E4CSy5xnbcHd=Iit}7 z9W)qjyf|)#CJ53KBxta0@z6)YGCFsJB>DlpFzB(Uq^#RRv{r*)4ttCxvuBk8jlmqj z%K#7ejvm)7*OZ|_tR$Y3YrUDND{B$NVx}nFS~h1+xjE7RYML7F`0n0L2mVN4ebKd! z6Fg=D?Q~wmHzCSUQd(MEOb_&jTG{sHhO#lpS0J{`_zYN4yvD@(W2E5$)^PA00Aal1 zD0$jUkKZta%6}cj*Ci!%>^GSl;b!F2?t&5y-Noj{lBI>YL7)0KLvo8*fg@c*%$~(U zZyQcAP?h~g)1$#tO<$kPpxI#bzixgEjXhfz0r)x^73cNlUB}6D%JavG8%@T@#g#uf zPAvWOa3dJiddL{{Q2pvP^??>x2AF+V3h7oS7#^k<)3Ca>0L z8AG39)obeDIIY}hb$}mXa!=owki+lNKo(monOoIUI%(o6sn$24XTq3G5BEP3i^t+3 zbQjgZ9ytBA30ENEjd0wkhyhhbsGMF7@?5?WOmUpnCMk|Hqyif*WagNKn^Pv7Asvht z}O--RJz-O?Q{^30G)NqZ@g1-f{U*9@Q;(m3|M_<#K(lR3* zbWD(StOD=pcaJx)B*4ZCgz=Jc4N$b-k8A(}7&>_ZtS_!yPMdV}H6EpgQ_hiMJEO_R zp^YsCL$tOC+GAG+m2Kz9U&>Is$?tVotsut0`2yyBo$}yoWHP8+IF!qRptl~!6;8i% zB1)LmBz z$D`2e=>6-4q;_aXFixcJ#__;tvdxWgo$ja4X+|-7Vh7H!gP1T%{tPUw?_D5|b60jM zOWq*m0m)jPEiLQq>TD2%IuGZm6NHA&uHLfJY&mE;PQO7`@cBLWD|0Ra>DF+OM3{-j zerZz&YPup8-zd!8{Qd^IXH3Wv>8iQ<8mGQB@){lnCMxPIQGk$Q9N_b?*(xV4lII)g z+Y?P8D0oXYf7HzrIqH@o?d{>};>u!s#v^gTfb3X~giEK8*aKP_75fQT6oHi2@amZUZ?9~<>I=K$h6_x_8Z9@eSK4P;Ee*}Zg z7tPIYeMn$qy&f5nmoVIC(THR!smuN369J{=5_yN2hU6_WC5YJ$wN9k;cwpc3!HDb% z*!3dTC5nyFv1{KV_9}z~Y_ipCg}@DtI>xlX8J#X;sG}n!fdB#pLjq9;YygX6VOly_ zz~J0lBw9ufxx1Pfjg^(e+rXJslcRzZ%xZ%1orsKAf3m(nu(6fz@Rf#^v{3$)RNF zBzC1I=QzL}r(O^Mo{EY27`Vc^a zU%YottfyAc7DTXyWwgf90T_P+^obsN%EctK%-D@E^7(ycpG6yP_ex9A?dyWg&B0m@ znpj(eX%xztO_*Zzn+fP%Y_6O2&oa5O=VH$j3q zy@Xa&Rrb0iBTJdjTFJ_*g8owUr?1h zE|Ybv5C#Kq`NQqwlQ%VvJ=*WuJW_mP<2dE}mr)M-dubR(j)}M^V?Rg2)6p#atEH!h zez>Xl=w7^f?WIEfQ}?1p0?_uz3b2~f;U5bf1_dQRQI~RUxxfBwWbDV4V&q1NbtMor zhPH7fRy+Q%MMH{U17uioMES+%$UFms`oGv`vtq$3i#|`{Q}Kh<)>n8LWYXf|F=Y+J zV@st0#~7q<<##(9Y$6ewS@N!5uaVb^v<@?9FG2>S6F=m4d=s`NikSpMsQnrLzwIKi~ujbne~ZpX167O1>=9 z%|&&Bo2O5pY6(JzaCnukzDGQ{W1qf5+3^k;br0SCuzD$*?QU(agcd0$8^McMGODS^ z<#YP&3=&|pB91{%Oa=wCXy$||$@ z`QgwU1onJBj~n=YSky0g+&*u8doa}8Twhn3NyRK~Jtn|soSsO69;Al^K`*<3A!4^e z0SodmrtWETmUvucNz8dsOV24Y{+Ptlrw}^y#bwx8EF=NaGS204ILBwJ;ecZ+B4j?# z#qmVS{y!$(StxyY0x&U}gP4KA$gFBXbUC8FM6B56x1qKLgJvwJgGj}A!q(x7Y9;1u zTBlakLn7VSO(aaXg`nF8)Py6&ATQgma90{MNyl|d{JgR8>j zv08YH6Px|4oa`CID+UD2=v8>BK>F@-D*ydOz}vA7zeH>-Ui9TJlc=)$OThggM8QBU zj?zY7IO8uzlFpU?Z;%Mm^HLk2|Oo~sR_13BJi z^8k~j%kU)N%p|H1P~745!N|?pO?p8+i4lP@DH{543fA0%Y}!lUL)2O3La_oT*&M45 z=<7Y|abf1#nmP5n07V42rW(IaSGTxvqZ0{0di34nlD)*?F=IO6E7RaGU{Ej{2tD3i zU6zhc^}*JMT|YE#Ow?hx7YB-_DKCA8%!E(+e3JnC&lYTL7*AhQPfVHOfqqgdPRhG1 zT!sj^{^WsoNrjp18q+xdZqB1P1>A&FJP1Oo?~-vY5J(A8 zEA}+4r8H`?BWW6juZ{AX_XyaNwIM$br6Lv~?|YB9`!P9S4}g^rG9+373(w|m>$6y@ z>nm%L6V=lTBN4ON>p=pg(vsdt?Te-=d6upG5DV zFwSiFGh@u?jHIl4pRn>lOp6*q(ngn->qga0jBx1^n}w^eh00XK3vhzN)*Dpbcpok{ zaO&TFpJX}wZvJWkvx!;AdN=)5vTZCIea2JiwQ-?nI8G`^6PWwY;GY4y%jt5sID=Ev za=NBqu}LT`FR!4xz*=;Mo>=?fvXz05KR~z=9|zi=fB7m2iy)yq0G{b%iuG%x0!M(P zbbXB!!{aH%a^O*v>8+{gw%hD>PL#2E)*H1610M~By^~@|vs6{qYX`}v7!{2*C^tFq zHR3g?ZwL)Vvx+dbg+nO(brMp(_cij2Kwq5ZR=)Ce;<2{T^ETVeC8L*1;6bIAu%-XovWcetC!`H-?_ zV|L*)--|E=#a%`v$|?N^wP+u3P;F$ zPry6SE@$3B(f!JSK_3EU(?1{)3q22jhu42+y1Lj~pLSxW|0c1G zWMgkQ6yjZGVKmFwusc9-GHU_nOfmTJ`Xs%;x60nzBqRr2PE{ z1XaC-HkAyuNgWhEWVUk%m9j>zx!Oqd>^|ZBzd417aO+T4JPW z{D+zbYv@RR>tyW`c!NLrOL8Ab>u0W8`*`J2qxQ;9lIkH`)a)Y(lP81_^f=)RNtD@&|pPb zZ!}{8O378SW*sciul^O-%a9Dj6D%#b+Q0lOGP^&&yM~0#Ue{yfevVfUj6qNo8~1=7 zJH5>o@Wp!;&RbD4`EF(znVMzhGh*vM>>k*Wx35W5dEp z3m4tfNp~?Zco-3vd#tE{qr3HWF|#ooN*Nu zHbkom<~;)JtF%C!oKb%IE%NMd)KM#M-BAc?9jN9=%IM~~#w*a^If4x@l94g5ODw(w zyuJOM^r>E15+UL68+2(Tk>5RCtSbinnr!u!n+hj9YXf?Es12u!W)?lT>szEk+461D z)%4qUxbk1$CV|nzJ-fHiv%11`b_rZFnxvjUlY*sKs>Q=CYG*A%g)KdGWA`iLzk?L+ z^}U|ot!(-ZaawLL`=ATNEWf?KAIp#PsRy{y5NtOqOPjdt!4gb39HgAp>T=saYD7>p zz?X#VE|#pZT0HhpDZo<%sRjW7mTLZYv>g{*vmH^UbqK`=1-qNw4R<~uIZGY*83}x= z+fnM23eSe;^uRj62VhA_jxq-mOSO#Lod(oeT!0&+8u{zlno z_uZG@KOXa79!^^e$_+S!+zy1@C-}8+x=7k@b-^CTJ*;Q9oSys zZ@qIaR>llAYp_^7m*1~Z&rGpPdZaDxft_S%A%Jk96v5Q58qAg-mK zAY3~{0|@7oOLzk5+Er*9ixVSxEJ)2V1RJ&pA>=PkJylp}9)W9DFY>@vC5zedQEm-p zSQChPW-^+fapPXEvoVlm7wF6dP6_-S(Y2~4Ia~o{Ci(^&+#85*%A|!^NBP}Xaw7|k zMR|rAflc*jek;@NIR%&Xh%)o<$Q+hE%kQ74z7;V8@QBahCfLphX+(&K2oqq$YZX*u<5&;*G*82CE3t<0>04V>SYjQAta8 z@d(Z^7lhp&kQUrt9RSTtQ6gehJbzC{Me=*zIfuJx>=5)an^+^XV=;hZ$APJgPzMmZ({W0PX%wXoAjCZcD-dF*wZu^&p@z^q|fZF*|^Wg0Pm; z5;bY*fkIn~G%N*xEGmn2X>8!98w23VdPYt1oqr_Nitc-4RC^S503wx;>zWeTFVX(ZYWEw87yrB;xTH-M)BfB@!|S>_8-W`+xH)vIV^R|@`a9)^3JC5W2d4f zryEXSbv!ET3YbEzPL9T_@e&+{6A!MPI(B?hXL*T(y{VaZwO2lVr_8+abBw&cdBT_};dY<2h`lvs%!FpVCUSmzGS$#FYsv!l)`us~%%Vq8(Z)iR zm^pub`$hu_u8~cgKp1g`bKpxVn@jE<@dh# zge4fY0N4g9gBo`S8##+D;;un1#R`t0C}1gLxVs3cclDC-*T2lZsuqpj z(4G+5W43{bp}UHO?hYoB(|V_LS9K$|WHa}pO(8@af%?R<3KI-lx&se*x%sBzXt}ID({gf?i0+W&1R{n-<0H6K=8TV_)(oxQG zfB8L_ptZh`!)rx(GNKk%Y?kVAVlF8e*D{cT0P4E9gyjkJOK;y(T1j@*BBsbaxM+D#c{pTs^EyE1@4NevaY&re z7u56h>9h;tpLBQE+*x;9Y!uwt2KurTaR*$85F0=NkDbh^9*QT728Y82bsou3Ot?Eu zW{bs%;L|O7&Giu*q{97>M3)wbn$*KnDof2GZ&nZ0jP4wdT;?kziAML7mm<7@E$28{ znBN;hzSGKNJIq$AtkL3VuYu8x5H^rIkkhT}UfT|Eji!*kz~P3(GE@isKyfG!{gBim zYRsph80?VjV2mL+g-otcKawRES$MB0j#Ui|h{@W7+#m2ExUK*=mkW17iy>ZCGP|@s zXsT&-< zv;rey%UDHlat>myb45NF^q&#>g{q=-Q489uWznlj&?ze4`!Qffm=yyPl05Gux)Ll3 zdW5s2BhG-Pmo$tcDe!?JXor)H4iZZyLR5H{S9VUciK1;H`zhLm_j(Jzk}9EGa7!$6 zj0*-(zBF<{YYEU^!xs!XuU!zY=c^F!+J{Y)T~w>JO(a#Zp-Zw~*vmt+fl<5c5$+KL z=m{zVKOwK#)q`>bEKT;91&2M+BAJF@-rfI7q5wETYYn5WJpZpG6OW+gd-Dzn1PFOTAOQj*@_tAJgn)>MsDKP20v8-0pstiKdO<`X4Du920RgRI_Ovit zm8zYcf48=_cBg8qw)U^7vRr3IcV>TI-{3ep`p0hI^zGB9A76j{`nvmj1V7gaQhRh( zJA4qn#zkWaBZcinVN^lnR8{4m6&2mEpX>2r@0}(VhTIbDwtcQ+=;6XH>rn*HA;I7? zyZpKS2O&r|uXJy8*3DT6|7dZ@lbIJT)NL^COlxc&(Te4q<9Bbm7gm;ctZ!MrY@*lO zS}=ZM=S0kKh0UD}Ma?s7ro}Yzi$VzRW^|P$dX|pbVBX8y4#DK)))t4nk-RVzV%6l@ zaN+k0>;M0iRypDNl_c3SQ?f5~=>00;p_wgok zz}=hwC(Qj-VROHOxo=8)a_P5P=?6>u9_CV8zSMO;f(MJJ;?%!l#h&rRvZfv%a^3Jkp2%@;ZlNEv{6Sa5Lfz?&+i(SjPDlmT{6WuV zZ3;UD`tjCu@^X^fWo_vAc88k_bKYDGWL0MuB9Bi!oZJT@e21IW!tP$(;18D|pW^dz z#Zei)U&=7tLnnay%|Gh4be5@(KVqSbjME57t>QI`+1i_1fR!ZL3(+x%ce2+Wadi>K@daY%9Z~t2NFj;N;T2}@`@rer?7LYJ?>TB3E zU=I6Weq&SP=wM!Lth@k$(8Z23e#`v&@048@@(RP*6f~qBoHBNmIXTtiSsk$DtsWXE z^LB#j)StdabuCL7+$}no5yCKbD8JOa?-aX(1?X~<-V)3R=gU^#2`%+8&0vF1I~7`^ z7h}#^C`>kdtY}E;dNyctZMj4Vi#j^^j$RP)vf(?c;{o?9_K4Lu(Jl}3!tg&-%mq>x z{zuQ5BAg)HAv_YR>nID<6~|gf=&>HeK}!3O*=y#0F^E>PsvhS-%doSdxV0kctEvk^ zKV$6UWNQ(eVNHKRjul=^Q01H8^Hfa54BLUB<2`0D-rYAc)K!HjAG3H%I2fzMPUITz zb1cgbb1<`@wK#*-foV*-)*h?C&m3M@pI4oi(J%sD^z&QI;Pys%_#=gg6M6H6tae1| z*S+Rl>RpTy7KD&X+-2wVlliOtfy;1DD)_ zwv{g6$2E*Rr&ogOg0M$y&9CfOG&S79)mK@f2(*TZE3(_4eYRc9x;Vak@BJp(%5MII z+3Sx;n`DCR5|klcYhR(!50bZ{eHhD2VNb^%cWS(L);Gc%Hek-Im&!2pR+-c89ryg* zBTY>YJis;QUh|7*^*k;=%_}f1{t_ncr6DvXxEI|)^XABj6Q=h)v3mU`=3>V1E1Zxy zx~y;GlUp%xUX~Hdk4Q(SW=NNncJ(|abI21z#}^F^Z0~M|fy4>M#XVnVVcwq)6?_Hyo`WB zs^4)QdBj`|73GIURX5hUADD~gqZd2JjT?ov;~1n9(kxzIc{~t|IpcaJJ>cHdvtLZQ z*UV*ia92ZJO||2xEhh%?V1}*X=&z+^Jo}Mb=nQ6dW2fBYGbiCpOts_1GFS$kJGG88 z&*|v8=1(AsjSO{8pE_HQ)H`0-#s%ehE+EXAvGt=+Ea+=2sX#wTIMUubWu~lM^lNk0 z+$cl<)7*h`>EAp~;biv=wJn_Tz^1yokt0J{BZK~0jns6cy=i2{#(*c=;~8Pjm&OxS z80WRqCA$vD1|iZZi;Ms}y3^*Ql& z_`c1NimJ{I;S~E|WCrtB#2=XiD^r2jveMX*J-{8OJ>p~Zq23zV*4sYkbf&qCJ>>Xi z4qL9m8ku^+@3g@dnH7D?{b22*wUt$68Qy#*{nQn|ljoqW=q{YbHD=(!URZ^klA^|b z4t@gxEQ^ovnwP5z%JOCh0_&2nQ5;MK15Ph?HxWgh8*uU+xNO!2oSFu#6IS+4@1A4^ znfiSG%1w`eK*q&R!Nn23dtSEx=xt-$cp>1t?x1D0E5m6O!OhJX&f=d)s-}Rax~8fc z-3-6Ua7G{&!N;#NoC=t1&!ozODB-cKVGj7*)T2RXSJGT*hLtOK(u{|?8>^~{yBzOM zGjR7vydo0bSU^p_+e&#wQ@oyTto&-!dwQe6;93avf{hrEjB}Pcu+!^w6<1X?c0V*@ zQf_WE+MKA#2+!x_>3Lc_l=;lc)oo3BemJ8h;e2*=Nfh&Np}4Lns7N%dd`>`I5pp`) z@jSP(AwjT?(=nn;vKqMmH*c=%b8kbZ_}V%ioxjq&xi%DP$g&s`GS|G4x)*X5SDJ%U zMW=(`+gcf~h?`HAZDjfLhB6SN3}=S2mVp29VW++yiIW46JRYY4jkyJzm`-lHHxlLX zvch~hTF#8XepM033OkPv9h(;{4tuw1^I<6O>8f~;WZpDtV%S7^6sQx>EN3Am@Q~#rY}6IuxZ)m z&cAvgCv=mFfKSx#%w;5gOs77Sm^TeRlx4mwk*D|ivV3Ush``A6nis{jYAnt0aX6!+)z2&D7ZMj^*;T(No1z=IKgj4`EC;3uk$+0#TjWAAWFk| zZTAi@X~_!~EP)ZpH+DL8^&rPL#l6hdJj#TYUTeJ%4QCygF-v=!wHW~j}M*LK6JclC-fcaTN&7CpA1jfVY%i) z$Lg$1r`J-SuV=D(4ApV(hw7m`ly``-=8QnVS5gu0VP51|sGW;VPfaA68p?EvYvHOE z4Gi#Te(N8XML$C(`-(#wHCv`i^SzkgxqzJuHO@4ptQ%|)<3M->EdGW&Wx&j4Q*-lY} zp>rMyNT&g7WwHl|cI2w##eO`MiGjsEc^AoL`g#RrEay7BEt-8k1`H^UL zZ2WxGt!#W)M6aWnS&=TU?%uVl+hb0yf_u{+&K;ZWms2TFmiju|sYjSP6Z`1%-BXoO z&$6KKx}pyltv+(sbX`4z27x2Ht`()0MV%d$uylXOzw=g8h&j(?;XAxQeQ^@Svh^xD zK>jo8Ov51irq23N*k*UkHE%G>N8byx-UT$w^7K2-gtFv*ptioeV3g>vB{Gqdne|j0WW~km1uVB_z68DM>N#aHb9OLSwR(^P@=A4L{TCz&gXTno4sSJ z>!tSeflMEp75V@=fKUnftv)cdw!W-zRJpU=gVbFVE@d`b#7JXEM@HW}+%z`3qA>Eq zxPj%jGT)itqxP`&_2)Y=uWjJ1`A)n9%JW@cxVOTbEMoVE@Q%z6O7GIF!k6-$Nl6%p z5zEOmA1alFOqR;V`Y#5tPqF`T?C=PE`QjI3v827AF&1;kz z$Khp5A1x&trRFlQ=K;%nL;%%%<}9TakkNvqye}m7!i`ETs#faZF-k3Q&neX> zAS@+h8D%W@Dz(Bwy%NGlseY->D(ihrypLHdKE6h&weysEf(ow_>^&(}RO_X78zkD( zy-GbJxO>*{bu$%BZXy2GY#yoGHmTDK%swy1cqHNu!ND$Dkl6=l<{e8nPLQglB06Z%eQMAan4yxnf>6~9PKCCfp@@& z2s?ufCQ1o9_zPP`l64LY;0n6=u}R%Cw2ga4kmO#M(wHoz3hYB$tSiW+5h?N4yGM#+ zQy;ikEx{M14(^3Mr5Ly;f#GI?_d6ESJJMO)O9U`$gZAXT!?P4jJn8iN$qUXX0rr!6 zyljvu-0Zf9euLy4-Kk6^D+3 zt0Bbjs43fdI)>dRG0bNu)}NCKO9YpdW88r*vV5(#3sBmq_t)AE$JJB6KC;RZ_gJrst;;#SR+BD4+=>>(SDNdMrIg zH;dCk)9DrvuiG~8(000=uBbbEcx)yUB-uo-(%rO!?jd|KFiy6hOzBd3>MW&u0cYAG zrC}a8r1XQl&6E;nlWLA+lGOA1m7Y(!1>jsSv{hZQTgy6pKS{;bQ~n10&(tfukv7nqd3jEv{ghIlU!(Lk3)yyjFOvDrKBbe9 zq+(8WKfz^7PF!=4$mVq*mvITE%r7E1wu5W-aA$eBoPqOE7tV(>aIOK4xv>rBy5P;+ z>cRPxRAeZqcL&MMJuPz$L4y?S-T+?rhO}PNyeorUyO+s@199Ki!)%6>R-$RhUFyCpOC0(f*UNW+Pe3(9kE+g3F<0o1)ijomvI!|o+Rb1;~= zfj=twAE=kt{Q}%Y!8kIvG%iC)e%zB5M)R|5;Ce%FfI$vvPcSt6`*xwco!BPsG4kR9 zkmf}6!-8S%$Rwf}Q60E1U6STxNbw>(G7<;i!iU zO2O6@>d$_TEQgM*!+EQhK;|LXS7zWGpNBILlOv|v%Hh;nIo@6+m)Gwo$1h<431gHx zL7;P3rB5m+Oq579Z}e8w=n*R_LtF7zWX9i+Vc?z_zcQ< z_hgBH_;V@`hR^erRCH zNnH9kdAoO{fP*-I*O&I00Wkx=$d87vxpGnh0D(-rVKvw1a%K|f;#?;%PR;e~RJ~sJ zl&TA~@rf}!Hv_yakWYSdfXw_e)jaD^h!KM_T7&4*X%^pfaq4~M z({yb$?5;P|PX*2vd>Aqk04?xudS6gIWHi%Tpl0zq%iFGcIBYzkmPne(1TEuwfT|KE zn;kDbIjLsaFqjO~a)}{PC)!;2s%9fSp=OFcN^II(RwHc;`M^0h^&cl$s3z-rG#!g}C2zKAF!rK#XJ^c>37Z(LmUkhf5h;0yr$Qt4Ps7ewOSJ)Kk* zf_>y+TO24$Ef#wM_4+|uouA`sgQy4CmVk73MP>rO`>{p+yW+olgr-6>h(s(Ghn0J{ z(ek_nIz|!cma0*#N6ze_fyMsMlK1(AI=}DDC z1J9?slkHg2rP7_!_9W8nOTQnq{U}gRo4;g3o+Q7pWW3Ltlm=YIHJN%u>QL&;R=dPA z-L|P68c{IPO@pjX$LdonY)s!o6}7P?hb{@4Li^2#k7ES$$lG7Ceh@J;6k7u9&zs1m%{K_{Q=z#GQW6Kb(PN#>ISEL>nYji%u|LgrmH&pH{IYH<)+{#(O-UucY) zM|P`a$O+umnF;fc>ZN8u8F|u{_0)YV0TOussij_vF&2wogMWIm}wR+8*h^bbg{Z+bn+wI#Gk4j z`=Q^Ll#aGfMuQzylYh|1hfTweIViCPzHw}F>%1vhuaXZ3tuO7AT6UXK8OT(5xgcgE zNMQB$S0)w8W76IH-eJ1r@Z>HL)6ubRB_n_U-9RGx^spm6XBXdIv?EZK3K_`~Vn?*h z-0<`b59`19%zK2{qO1=}d^jH)wo`IHYaODc%eDaAckD7I)iQgnE9Kf%B8|Ti0emb7 zNF%{pK)2jO110|AV}4^t%p|u};wD#TG^H!ujfVkAShpZh@cBH?Rw=-iB6HMEo=JB0 zJZRnbt!tOTq{YKtaotPzr+9{#?T9^cxFlS_2yVq$BFpT(uPzs{z6T-=y6NDg*&o%?reh)`xh`Q^5hA}7u6+2<< z?Qk?%=ln+!DnCCR27}fLZ|bb(Jue56ZjI(>pX`vSF)j)i&rKqgaq{KQbvy4W0pc7}4M_dqa1E<-CrDMKfJJZXgUOVrGM{O2a;SDf#rel^DVcYe-~ Hbw>R!N From 9789f321cd52139d36d1479f07fff3897be48107 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 15 Jul 2011 15:14:05 -0600 Subject: [PATCH 2509/2544] Was working on this file so PHP5ified the method visibility scopes. Pointless, but was adding... --- system/database/DB_active_rec.php | 260 ++++++++++++------------------ 1 file changed, 106 insertions(+), 154 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 52bad260..7ddf20d0 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -69,11 +69,10 @@ class CI_DB_active_record extends CI_DB_driver { * * Generates the SELECT portion of the query * - * @access public * @param string * @return object */ - function select($select = '*', $escape = NULL) + public function select($select = '*', $escape = NULL) { if (is_string($select)) { @@ -107,12 +106,11 @@ function select($select = '*', $escape = NULL) * * Generates a SELECT MAX(field) portion of a query * - * @access public * @param string the field * @param string an alias * @return object */ - function select_max($select = '', $alias = '') + public function select_max($select = '', $alias = '') { return $this->_max_min_avg_sum($select, $alias, 'MAX'); } @@ -124,12 +122,11 @@ function select_max($select = '', $alias = '') * * Generates a SELECT MIN(field) portion of a query * - * @access public * @param string the field * @param string an alias * @return object */ - function select_min($select = '', $alias = '') + public function select_min($select = '', $alias = '') { return $this->_max_min_avg_sum($select, $alias, 'MIN'); } @@ -141,12 +138,11 @@ function select_min($select = '', $alias = '') * * Generates a SELECT AVG(field) portion of a query * - * @access public * @param string the field * @param string an alias * @return object */ - function select_avg($select = '', $alias = '') + public function select_avg($select = '', $alias = '') { return $this->_max_min_avg_sum($select, $alias, 'AVG'); } @@ -158,12 +154,11 @@ function select_avg($select = '', $alias = '') * * Generates a SELECT SUM(field) portion of a query * - * @access public * @param string the field * @param string an alias * @return object */ - function select_sum($select = '', $alias = '') + public function select_sum($select = '', $alias = '') { return $this->_max_min_avg_sum($select, $alias, 'SUM'); } @@ -178,12 +173,11 @@ function select_sum($select = '', $alias = '') * select_avg() * select_sum() * - * @access public * @param string the field * @param string an alias * @return object */ - function _max_min_avg_sum($select = '', $alias = '', $type = 'MAX') + protected function _max_min_avg_sum($select = '', $alias = '', $type = 'MAX') { if ( ! is_string($select) OR $select == '') { @@ -220,11 +214,10 @@ function _max_min_avg_sum($select = '', $alias = '', $type = 'MAX') /** * Determines the alias name based on the table * - * @access private * @param string * @return string */ - function _create_alias_from_table($item) + protected function _create_alias_from_table($item) { if (strpos($item, '.') !== FALSE) { @@ -241,11 +234,10 @@ function _create_alias_from_table($item) * * Sets a flag which tells the query string compiler to add DISTINCT * - * @access public * @param bool * @return object */ - function distinct($val = TRUE) + public function distinct($val = TRUE) { $this->ar_distinct = (is_bool($val)) ? $val : TRUE; return $this; @@ -258,11 +250,10 @@ function distinct($val = TRUE) * * Generates the FROM portion of the query * - * @access public * @param mixed can be a string or array * @return object */ - function from($from) + public function from($from) { foreach ((array)$from as $val) { @@ -311,13 +302,12 @@ function from($from) * * Generates the JOIN portion of the query * - * @access public * @param string * @param string the join condition * @param string the type of join * @return object */ - function join($table, $cond, $type = '') + public function join($table, $cond, $type = '') { if ($type != '') { @@ -367,12 +357,11 @@ function join($table, $cond, $type = '') * Generates the WHERE portion of the query. Separates * multiple calls with AND * - * @access public * @param mixed * @param mixed * @return object */ - function where($key, $value = NULL, $escape = TRUE) + public function where($key, $value = NULL, $escape = TRUE) { return $this->_where($key, $value, 'AND ', $escape); } @@ -385,12 +374,11 @@ function where($key, $value = NULL, $escape = TRUE) * Generates the WHERE portion of the query. Separates * multiple calls with OR * - * @access public * @param mixed * @param mixed * @return object */ - function or_where($key, $value = NULL, $escape = TRUE) + public function or_where($key, $value = NULL, $escape = TRUE) { return $this->_where($key, $value, 'OR ', $escape); } @@ -400,15 +388,14 @@ function or_where($key, $value = NULL, $escape = TRUE) /** * Where * - * Called by where() or orwhere() + * Called by where() or or_where() * - * @access private * @param mixed * @param mixed * @param string * @return object */ - function _where($key, $value = NULL, $type = 'AND ', $escape = NULL) + protected function _where($key, $value = NULL, $type = 'AND ', $escape = NULL) { if ( ! is_array($key)) { @@ -471,12 +458,11 @@ function _where($key, $value = NULL, $type = 'AND ', $escape = NULL) * Generates a WHERE field IN ('item', 'item') SQL query joined with * AND if appropriate * - * @access public * @param string The field to search * @param array The values searched on * @return object */ - function where_in($key = NULL, $values = NULL) + public function where_in($key = NULL, $values = NULL) { return $this->_where_in($key, $values); } @@ -489,12 +475,11 @@ function where_in($key = NULL, $values = NULL) * Generates a WHERE field IN ('item', 'item') SQL query joined with * OR if appropriate * - * @access public * @param string The field to search * @param array The values searched on * @return object */ - function or_where_in($key = NULL, $values = NULL) + public function or_where_in($key = NULL, $values = NULL) { return $this->_where_in($key, $values, FALSE, 'OR '); } @@ -507,12 +492,11 @@ function or_where_in($key = NULL, $values = NULL) * Generates a WHERE field NOT IN ('item', 'item') SQL query joined * with AND if appropriate * - * @access public * @param string The field to search * @param array The values searched on * @return object */ - function where_not_in($key = NULL, $values = NULL) + public function where_not_in($key = NULL, $values = NULL) { return $this->_where_in($key, $values, TRUE); } @@ -525,12 +509,11 @@ function where_not_in($key = NULL, $values = NULL) * Generates a WHERE field NOT IN ('item', 'item') SQL query joined * with OR if appropriate * - * @access public * @param string The field to search * @param array The values searched on * @return object */ - function or_where_not_in($key = NULL, $values = NULL) + public function or_where_not_in($key = NULL, $values = NULL) { return $this->_where_in($key, $values, TRUE, 'OR '); } @@ -542,14 +525,13 @@ function or_where_not_in($key = NULL, $values = NULL) * * Called by where_in, where_in_or, where_not_in, where_not_in_or * - * @access public * @param string The field to search * @param array The values searched on * @param boolean If the statement would be IN or NOT IN * @param string * @return object */ - function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'AND ') + protected function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'AND ') { if ($key === NULL OR $values === NULL) { @@ -592,12 +574,11 @@ function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'AND ') * Generates a %LIKE% portion of the query. Separates * multiple calls with AND * - * @access public * @param mixed * @param mixed * @return object */ - function like($field, $match = '', $side = 'both') + public function like($field, $match = '', $side = 'both') { return $this->_like($field, $match, 'AND ', $side); } @@ -610,12 +591,11 @@ function like($field, $match = '', $side = 'both') * Generates a NOT LIKE portion of the query. Separates * multiple calls with AND * - * @access public * @param mixed * @param mixed * @return object */ - function not_like($field, $match = '', $side = 'both') + public function not_like($field, $match = '', $side = 'both') { return $this->_like($field, $match, 'AND ', $side, 'NOT'); } @@ -628,12 +608,11 @@ function not_like($field, $match = '', $side = 'both') * Generates a %LIKE% portion of the query. Separates * multiple calls with OR * - * @access public * @param mixed * @param mixed * @return object */ - function or_like($field, $match = '', $side = 'both') + public function or_like($field, $match = '', $side = 'both') { return $this->_like($field, $match, 'OR ', $side); } @@ -646,12 +625,11 @@ function or_like($field, $match = '', $side = 'both') * Generates a NOT LIKE portion of the query. Separates * multiple calls with OR * - * @access public * @param mixed * @param mixed * @return object */ - function or_not_like($field, $match = '', $side = 'both') + public function or_not_like($field, $match = '', $side = 'both') { return $this->_like($field, $match, 'OR ', $side, 'NOT'); } @@ -663,13 +641,12 @@ function or_not_like($field, $match = '', $side = 'both') * * Called by like() or orlike() * - * @access private * @param mixed * @param mixed * @param string * @return object */ - function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '') + protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '') { if ( ! is_array($field)) { @@ -719,11 +696,10 @@ function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '') /** * GROUP BY * - * @access public * @param string * @return object */ - function group_by($by) + public function group_by($by) { if (is_string($by)) { @@ -755,12 +731,11 @@ function group_by($by) * * Separates multiple calls with AND * - * @access public * @param string * @param string * @return object */ - function having($key, $value = '', $escape = TRUE) + public function having($key, $value = '', $escape = TRUE) { return $this->_having($key, $value, 'AND ', $escape); } @@ -772,12 +747,11 @@ function having($key, $value = '', $escape = TRUE) * * Separates multiple calls with OR * - * @access public * @param string * @param string * @return object */ - function or_having($key, $value = '', $escape = TRUE) + public function or_having($key, $value = '', $escape = TRUE) { return $this->_having($key, $value, 'OR ', $escape); } @@ -789,12 +763,11 @@ function or_having($key, $value = '', $escape = TRUE) * * Called by having() or or_having() * - * @access private * @param string * @param string * @return object */ - function _having($key, $value = '', $type = 'AND ', $escape = TRUE) + protected function _having($key, $value = '', $type = 'AND ', $escape = TRUE) { if ( ! is_array($key)) { @@ -836,12 +809,11 @@ function _having($key, $value = '', $type = 'AND ', $escape = TRUE) /** * Sets the ORDER BY value * - * @access public * @param string * @param string direction: asc or desc * @return object */ - function order_by($orderby, $direction = '') + public function order_by($orderby, $direction = '') { if (strtolower($direction) == 'random') { @@ -892,12 +864,11 @@ function order_by($orderby, $direction = '') /** * Sets the LIMIT value * - * @access public * @param integer the limit value * @param integer the offset value * @return object */ - function limit($value, $offset = '') + public function limit($value, $offset = '') { $this->ar_limit = $value; @@ -914,11 +885,10 @@ function limit($value, $offset = '') /** * Sets the OFFSET value * - * @access public * @param integer the offset value * @return object */ - function offset($offset) + public function offset($offset) { $this->ar_offset = $offset; return $this; @@ -929,13 +899,12 @@ function offset($offset) /** * The "set" function. Allows key/value pairs to be set for inserting or updating * - * @access public * @param mixed * @param string * @param boolean * @return object */ - function set($key, $value = '', $escape = TRUE) + public function set($key, $value = '', $escape = TRUE) { $key = $this->_object_to_array($key); @@ -967,13 +936,12 @@ function set($key, $value = '', $escape = TRUE) * Compiles the select statement based on the other functions called * and runs the query * - * @access public * @param string the table * @param string the limit clause * @param string the offset clause * @return object */ - function get($table = '', $limit = null, $offset = null) + public function get($table = '', $limit = null, $offset = null) { if ($table != '') { @@ -999,11 +967,10 @@ function get($table = '', $limit = null, $offset = null) * Generates a platform-specific query string that counts all records * returned by an Active Record query. * - * @access public * @param string * @return string */ - function count_all_results($table = '') + public function count_all_results($table = '') { if ($table != '') { @@ -1032,13 +999,12 @@ function count_all_results($table = '') * * Allows the where clause, limit and offset to be added directly * - * @access public * @param string the where clause * @param string the limit clause * @param string the offset clause * @return object */ - function get_where($table = '', $where = null, $limit = null, $offset = null) + public function get_where($table = '', $where = null, $limit = null, $offset = null) { if ($table != '') { @@ -1069,12 +1035,11 @@ function get_where($table = '', $where = null, $limit = null, $offset = null) * * Compiles batch insert strings and runs the queries * - * @access public * @param string the table to retrieve the results from * @param array an associative array of insert values * @return object */ - function insert_batch($table = '', $set = NULL) + public function insert_batch($table = '', $set = NULL) { if ( ! is_null($set)) { @@ -1127,14 +1092,12 @@ function insert_batch($table = '', $set = NULL) /** * The "set_insert_batch" function. Allows key/value pairs to be set for batch inserts * - * @access public * @param mixed * @param string * @param boolean * @return object */ - - function set_insert_batch($key, $value = '', $escape = TRUE) + public function set_insert_batch($key, $value = '', $escape = TRUE) { $key = $this->_object_to_array_batch($key); @@ -1189,8 +1152,7 @@ function set_insert_batch($key, $value = '', $escape = TRUE) * * Compiles an insert string and runs the query * - * @access public - * @param string the table to retrieve the results from + * @param string the table to insert data into * @param array an associative array of insert values * @return object */ @@ -1230,7 +1192,18 @@ function insert($table = '', $set = NULL) return $this->query($sql); } - function replace($table = '', $set = NULL) + // -------------------------------------------------------------------- + + /** + * Replace + * + * Compiles an replace into string and runs the query + * + * @param string the table to replace data into + * @param array an associative array of insert values + * @return object + */ + public function replace($table = '', $set = NULL) { if ( ! is_null($set)) { @@ -1273,13 +1246,12 @@ function replace($table = '', $set = NULL) * * Compiles an update string and runs the query * - * @access public * @param string the table to retrieve the results from * @param array an associative array of update values * @param mixed the where clause * @return object */ - function update($table = '', $set = NULL, $where = NULL, $limit = NULL) + public function update($table = '', $set = NULL, $where = NULL, $limit = NULL) { // Combine any cached components with the current statements $this->_merge_cache(); @@ -1336,13 +1308,12 @@ function update($table = '', $set = NULL, $where = NULL, $limit = NULL) * * Compiles an update string and runs the query * - * @access public * @param string the table to retrieve the results from * @param array an associative array of update values * @param string the where key * @return object */ - function update_batch($table = '', $set = NULL, $index = NULL) + public function update_batch($table = '', $set = NULL, $index = NULL) { // Combine any cached components with the current statements $this->_merge_cache(); @@ -1402,14 +1373,12 @@ function update_batch($table = '', $set = NULL, $index = NULL) /** * The "set_update_batch" function. Allows key/value pairs to be set for batch updating * - * @access public * @param array * @param string * @param boolean * @return object */ - - function set_update_batch($key, $index = '', $escape = TRUE) + public function set_update_batch($key, $index = '', $escape = TRUE) { $key = $this->_object_to_array_batch($key); @@ -1462,11 +1431,10 @@ function set_update_batch($key, $index = '', $escape = TRUE) * * Compiles a delete string and runs "DELETE FROM table" * - * @access public * @param string the table to empty * @return object */ - function empty_table($table = '') + public function empty_table($table = '') { if ($table == '') { @@ -1502,11 +1470,10 @@ function empty_table($table = '') * If the database does not support the truncate() command * This function maps to "DELETE FROM table" * - * @access public * @param string the table to truncate * @return object */ - function truncate($table = '') + public function truncate($table = '') { if ($table == '') { @@ -1540,14 +1507,13 @@ function truncate($table = '') * * Compiles a delete string and runs the query * - * @access public * @param mixed the table(s) to delete from. String or array * @param mixed the where clause * @param mixed the limit clause * @param boolean * @return object */ - function delete($table = '', $where = '', $limit = NULL, $reset_data = TRUE) + public function delete($table = '', $where = '', $limit = NULL, $reset_data = TRUE) { // Combine any cached components with the current statements $this->_merge_cache(); @@ -1617,11 +1583,10 @@ function delete($table = '', $where = '', $limit = NULL, $reset_data = TRUE) * * Prepends a database prefix if one exists in configuration * - * @access public * @param string the table * @return string */ - function dbprefix($table = '') + public function dbprefix($table = '') { if ($table == '') { @@ -1638,11 +1603,10 @@ function dbprefix($table = '') * * Used to track SQL statements written with aliased tables. * - * @access private * @param string The table to inspect * @return string */ - function _track_aliases($table) + protected function _track_aliases($table) { if (is_array($table)) { @@ -1685,10 +1649,9 @@ function _track_aliases($table) * Generates a query string based on which functions were used. * Should not be called directly. The get() function calls it. * - * @access private * @return string */ - function _compile_select($select_override = FALSE) + protected function _compile_select($select_override = FALSE) { // Combine any cached components with the current statements $this->_merge_cache(); @@ -1826,11 +1789,10 @@ function _compile_select($select_override = FALSE) * * Takes an object as input and converts the class variables to array key/vals * - * @access public * @param object * @return array */ - function _object_to_array($object) + public function _object_to_array($object) { if ( ! is_object($object)) { @@ -1857,11 +1819,10 @@ function _object_to_array($object) * * Takes an object as input and converts the class variables to array key/vals * - * @access public * @param object * @return array */ - function _object_to_array_batch($object) + public function _object_to_array_batch($object) { if ( ! is_object($object)) { @@ -1897,10 +1858,9 @@ function _object_to_array_batch($object) * * Starts AR caching * - * @access public * @return void */ - function start_cache() + public function start_cache() { $this->ar_caching = TRUE; } @@ -1912,10 +1872,9 @@ function start_cache() * * Stops AR caching * - * @access public * @return void */ - function stop_cache() + public function stop_cache() { $this->ar_caching = FALSE; } @@ -1930,23 +1889,21 @@ function stop_cache() * @access public * @return void */ - function flush_cache() + public function flush_cache() { - $this->_reset_run( - array( - 'ar_cache_select' => array(), - 'ar_cache_from' => array(), - 'ar_cache_join' => array(), - 'ar_cache_where' => array(), - 'ar_cache_like' => array(), - 'ar_cache_groupby' => array(), - 'ar_cache_having' => array(), - 'ar_cache_orderby' => array(), - 'ar_cache_set' => array(), - 'ar_cache_exists' => array(), - 'ar_cache_no_escape' => array() - ) - ); + $this->_reset_run(array( + 'ar_cache_select' => array(), + 'ar_cache_from' => array(), + 'ar_cache_join' => array(), + 'ar_cache_where' => array(), + 'ar_cache_like' => array(), + 'ar_cache_groupby' => array(), + 'ar_cache_having' => array(), + 'ar_cache_orderby' => array(), + 'ar_cache_set' => array(), + 'ar_cache_exists' => array(), + 'ar_cache_no_escape' => array() + )); } // -------------------------------------------------------------------- @@ -1957,10 +1914,9 @@ function flush_cache() * When called, this function merges any cached AR arrays with * locally called ones. * - * @access private * @return void */ - function _merge_cache() + protected function _merge_cache() { if (count($this->ar_cache_exists) == 0) { @@ -1995,11 +1951,10 @@ function _merge_cache() /** * Resets the active record values. Called by the get() function * - * @access private * @param array An array of fields to reset * @return void */ - function _reset_run($ar_reset_items) + protected function _reset_run($ar_reset_items) { foreach ($ar_reset_items as $item => $default_value) { @@ -2015,28 +1970,27 @@ function _reset_run($ar_reset_items) /** * Resets the active record values. Called by the get() function * - * @access private * @return void */ - function _reset_select() + protected function _reset_select() { $ar_reset_items = array( - 'ar_select' => array(), - 'ar_from' => array(), - 'ar_join' => array(), - 'ar_where' => array(), - 'ar_like' => array(), - 'ar_groupby' => array(), - 'ar_having' => array(), - 'ar_orderby' => array(), - 'ar_wherein' => array(), - 'ar_aliased_tables' => array(), - 'ar_no_escape' => array(), - 'ar_distinct' => FALSE, - 'ar_limit' => FALSE, - 'ar_offset' => FALSE, - 'ar_order' => FALSE, - ); + 'ar_select' => array(), + 'ar_from' => array(), + 'ar_join' => array(), + 'ar_where' => array(), + 'ar_like' => array(), + 'ar_groupby' => array(), + 'ar_having' => array(), + 'ar_orderby' => array(), + 'ar_wherein' => array(), + 'ar_aliased_tables' => array(), + 'ar_no_escape' => array(), + 'ar_distinct' => FALSE, + 'ar_limit' => FALSE, + 'ar_offset' => FALSE, + 'ar_order' => FALSE, + ); $this->_reset_run($ar_reset_items); } @@ -2048,25 +2002,23 @@ function _reset_select() * * Called by the insert() update() insert_batch() update_batch() and delete() functions * - * @access private * @return void */ - function _reset_write() + protected function _reset_write() { $ar_reset_items = array( - 'ar_set' => array(), - 'ar_from' => array(), - 'ar_where' => array(), - 'ar_like' => array(), - 'ar_orderby' => array(), - 'ar_keys' => array(), - 'ar_limit' => FALSE, - 'ar_order' => FALSE - ); + 'ar_set' => array(), + 'ar_from' => array(), + 'ar_where' => array(), + 'ar_like' => array(), + 'ar_orderby' => array(), + 'ar_keys' => array(), + 'ar_limit' => FALSE, + 'ar_order' => FALSE + ); $this->_reset_run($ar_reset_items); } - } /* End of file DB_active_rec.php */ From 8a02247acbac87b3b947d9188ec4f5805f2e1a52 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 15 Jul 2011 15:25:15 -0600 Subject: [PATCH 2510/2544] ... set_dbprefix(). Programatically set the prefix, great for multi-site systems that "namespace" with prefixes. --- system/database/DB_active_rec.php | 15 +++++++++++++++ user_guide/changelog.html | 1 + user_guide/database/queries.html | 9 +++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 7ddf20d0..bc11ff43 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -1598,6 +1598,21 @@ public function dbprefix($table = '') // -------------------------------------------------------------------- + /** + * Set DB Prefix + * + * Set's the DB Prefix to something new without needing to reconnect + * + * @param string the prefix + * @return string + */ + public function set_dbprefix($prefix = '') + { + return $this->dbprefix = $prefix; + } + + // -------------------------------------------------------------------- + /** * Track Aliases * diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a841785f..a924edc9 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -86,6 +86,7 @@

                Version 2.0.3

                • Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.
                • Added is_unique to the Form Validation library.
                  • +
                • Added $this->db->set_dbprefix() to the Database Driver.
              diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index f9f96803..4c1ddfe7 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -80,11 +80,16 @@

              $this->db->simple_query();

              It simply lets you submit a query. Most users will rarely use this function.

              -

              Adding Database prefixes manually

              -

              If you have configured a database prefix and would like to add it in manually for, you can use the following.

              +

              Working with Database prefixes manually

              +

              If you have configured a database prefix and would like to prepend it to a table name for use in a native SQL query for example, then you can use the following:

              $this->db->dbprefix('tablename');
              // outputs prefix_tablename

              +

              If for any reason you would like to change the prefix programatically without needing to create a new connection, you can use this method:

              +

              $this->db->set_dbprefix('newprefix');

              +$this->db->dbprefix('tablename');
              +// outputs newprefix_tablename

              +

              Protecting identifiers

              In many databases it is advisable to protect table and field names - for example with backticks in MySQL. Active Record queries are automatically protected, however if you need to manually protect an identifier you can use:

              From 1b1b67693060ecb6dd399ea6aee4a5503d96adda Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 15 Jul 2011 19:37:31 -0600 Subject: [PATCH 2511/2544] enable use of param in a callback rule, on behalf of marcoscoelho. --- system/libraries/Form_validation.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index d370d75e..fd95d76f 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -488,7 +488,7 @@ protected function _execute($row, $rules, $postdata = NULL, $cycles = 0) if ( ! in_array('required', $rules) AND is_null($postdata)) { // Before we bail out, does the rule contain a callback? - if (preg_match("/(callback_\w+)/", implode(' ', $rules), $match)) + if (preg_match("/(callback_\w+(\[.*?\])?)/", implode(' ', $rules), $match)) { $callback = TRUE; $rules = (array('1' => $match[1])); diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a924edc9..8a6fea74 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -75,6 +75,7 @@

              Version 2.0.3

            • Removed internal usage of the EXT constant.
            • Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request.
            • Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
              • +
            • Callback validation rules can now accept parameters like any other validation rule.
          • Helpers From 08a245f0c9d9638f039d12aebcd35bd875d72107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Cox?= Date: Sat, 16 Jul 2011 23:46:49 +0200 Subject: [PATCH 2512/2544] CSRF field is only added when post method is used and action is internal. Closes #165 --- system/helpers/form_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 2925d3c7..5720a06e 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -64,8 +64,8 @@ function form_open($action = '', $attributes = '', $hidden = array()) $form .= '>'; - // CSRF - if ($CI->config->item('csrf_protection') === TRUE) + // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites + if ($CI->config->item('csrf_protection') === TRUE AND ! (strpos($action, $CI->config->site_url()) === FALSE OR strpos($form, 'method="get"'))) { $hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash(); } From 31775338757dd6c2eddcdaa265815d002bd7d125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Cox?= Date: Sat, 16 Jul 2011 23:49:16 +0200 Subject: [PATCH 2513/2544] Updated change log --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a924edc9..4c4e6709 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -80,6 +80,7 @@

            Version 2.0.3

          • Helpers
            • Added an optional third parameter to heading() which allows adding html attributes to the rendered heading tag.
              • +
            • form_open() now only adds a hidden (Cross-site Reference Forgery) protection field when the form's action is internal and is set to the post method. (Reactor #165)
          • Libraries From 98b2126f1050f9f29677c7c6236c8039bbfee9ea Mon Sep 17 00:00:00 2001 From: MarcosCoelho Date: Mon, 18 Jul 2011 16:12:47 -0300 Subject: [PATCH 2514/2544] sync total items count and total amount price; by sum of quantity of each item in cart --- system/libraries/Cart.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index 7f65b48b..b2eaa9ad 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -374,6 +374,7 @@ function _save_cart() // Lets add up the individual prices and set the cart sub-total $total = 0; + $items = 0; foreach ($this->_cart_contents as $key => $val) { // We make sure the array contains the proper indexes @@ -383,13 +384,14 @@ function _save_cart() } $total += ($val['price'] * $val['qty']); + $items += $val['qty']; // Set the subtotal $this->_cart_contents[$key]['subtotal'] = ($this->_cart_contents[$key]['price'] * $this->_cart_contents[$key]['qty']); } // Set the cart total and total items. - $this->_cart_contents['total_items'] = count($this->_cart_contents); + $this->_cart_contents['total_items'] = $items; $this->_cart_contents['cart_total'] = $total; // Is our cart empty? If so we delete it from the session From eecb4392fa95719873201e05d6db91b245f95ed7 Mon Sep 17 00:00:00 2001 From: MarcosCoelho Date: Tue, 19 Jul 2011 14:34:20 -0300 Subject: [PATCH 2515/2544] Log change on method total_items from cart library --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a924edc9..36f3395f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -99,6 +99,7 @@

            Bug fixes for 2.0.3

          • Fixed a bug (Reactor #231) where Sessions Library database table example SQL did not contain an index on last_activity. See Upgrade Notes.
          • Fixed a bug (Reactor #229) where the Sessions Library example SQL in the documentation contained incorrect SQL.
          • Fixed a bug (Core #340) where when passing in the second parameter to $this->db->select(), column names in subsequent queries would not be properly escaped.
            • +
          • Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.

          Version 2.0.2

          From 6d2f13a3dd1f44d8b20d61bdde5c77c7d827cfde Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 20 Jul 2011 10:04:52 -0600 Subject: [PATCH 2516/2544] Updated Email class to use protected instead of private: http://codeigniter.uservoice.com/forums/40508-codeigniter-reactor/suggestions/2056113-private-functions-suck --- system/libraries/Email.php | 118 ++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/system/libraries/Email.php b/system/libraries/Email.php index cd89f8f3..9b3bc75e 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -405,12 +405,12 @@ public function attach($filename, $disposition = 'attachment') /** * Add a Header Item * - * @access private + * @access protected * @param string * @param string * @return void */ - private function _set_header($header, $value) + protected function _set_header($header, $value) { $this->_headers[$header] = $value; } @@ -420,11 +420,11 @@ private function _set_header($header, $value) /** * Convert a String to an Array * - * @access private + * @access protected * @param string * @return array */ - private function _str_to_array($email) + protected function _str_to_array($email) { if ( ! is_array($email)) { @@ -577,10 +577,10 @@ public function set_crlf($crlf = "\n") /** * Set Message Boundary * - * @access private + * @access protected * @return void */ - private function _set_boundaries() + protected function _set_boundaries() { $this->_alt_boundary = "B_ALT_".uniqid(''); // multipart/alternative $this->_atc_boundary = "B_ATC_".uniqid(''); // attachment boundary @@ -591,10 +591,10 @@ private function _set_boundaries() /** * Get the Message ID * - * @access private + * @access protected * @return string */ - private function _get_message_id() + protected function _get_message_id() { $from = $this->_headers['Return-Path']; $from = str_replace(">", "", $from); @@ -608,11 +608,11 @@ private function _get_message_id() /** * Get Mail Protocol * - * @access private + * @access protected * @param bool * @return string */ - private function _get_protocol($return = TRUE) + protected function _get_protocol($return = TRUE) { $this->protocol = strtolower($this->protocol); $this->protocol = ( ! in_array($this->protocol, $this->_protocols, TRUE)) ? 'mail' : $this->protocol; @@ -628,11 +628,11 @@ private function _get_protocol($return = TRUE) /** * Get Mail Encoding * - * @access private + * @access protected * @param bool * @return string */ - private function _get_encoding($return = TRUE) + protected function _get_encoding($return = TRUE) { $this->_encoding = ( ! in_array($this->_encoding, $this->_bit_depths)) ? '8bit' : $this->_encoding; @@ -655,10 +655,10 @@ private function _get_encoding($return = TRUE) /** * Get content type (text/html/attachment) * - * @access private + * @access protected * @return string */ - private function _get_content_type() + protected function _get_content_type() { if ($this->mailtype == 'html' && count($this->_attach_name) == 0) { @@ -683,10 +683,10 @@ private function _get_content_type() /** * Set RFC 822 Date * - * @access private + * @access protected * @return string */ - private function _set_date() + protected function _set_date() { $timezone = date("Z"); $operator = (strncmp($timezone, '-', 1) == 0) ? '-' : '+'; @@ -701,10 +701,10 @@ private function _set_date() /** * Mime message * - * @access private + * @access protected * @return string */ - private function _get_mime_message() + protected function _get_mime_message() { return "This is a multi-part message in MIME format.".$this->newline."Your email application may not support this format."; } @@ -802,10 +802,10 @@ public function clean_email($email) * If the user hasn't specified his own alternative message * it creates one by stripping the HTML * - * @access private + * @access protected * @return string */ - private function _get_alt_message() + protected function _get_alt_message() { if ($this->alt_message != "") { @@ -941,11 +941,11 @@ public function word_wrap($str, $charlim = '') /** * Build final headers * - * @access private + * @access protected * @param string * @return string */ - private function _build_headers() + protected function _build_headers() { $this->_set_header('X-Sender', $this->clean_email($this->_headers['From'])); $this->_set_header('X-Mailer', $this->useragent); @@ -959,10 +959,10 @@ private function _build_headers() /** * Write Headers as a string * - * @access private + * @access protected * @return void */ - private function _write_headers() + protected function _write_headers() { if ($this->protocol == 'mail') { @@ -994,10 +994,10 @@ private function _write_headers() /** * Build Final Body and attachments * - * @access private + * @access protected * @return void */ - private function _build_message() + protected function _build_message() { if ($this->wordwrap === TRUE AND $this->mailtype != 'html') { @@ -1177,12 +1177,12 @@ private function _build_message() * Prepares string for Quoted-Printable Content-Transfer-Encoding * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt * - * @access private + * @access protected * @param string * @param integer * @return string */ - private function _prep_quoted_printable($str, $charlim = '') + protected function _prep_quoted_printable($str, $charlim = '') { // Set the character limit // Don't allow over 76, as that will make servers and MUAs barf @@ -1275,7 +1275,7 @@ private function _prep_quoted_printable($str, $charlim = '') * @param bool // set to TRUE for processing From: headers * @return str */ - private function _prep_q_encoding($str, $from = FALSE) + protected function _prep_q_encoding($str, $from = FALSE) { $str = str_replace(array("\r", "\n"), array('', ''), $str); @@ -1440,10 +1440,10 @@ public function batch_bcc_send() /** * Unwrap special elements * - * @access private + * @access protected * @return void */ - private function _unwrap_specials() + protected function _unwrap_specials() { $this->_finalbody = preg_replace_callback("/\{unwrap\}(.*?)\{\/unwrap\}/si", array($this, '_remove_nl_callback'), $this->_finalbody); } @@ -1453,10 +1453,10 @@ private function _unwrap_specials() /** * Strip line-breaks via callback * - * @access private + * @access protected * @return string */ - private function _remove_nl_callback($matches) + protected function _remove_nl_callback($matches) { if (strpos($matches[1], "\r") !== FALSE OR strpos($matches[1], "\n") !== FALSE) { @@ -1471,10 +1471,10 @@ private function _remove_nl_callback($matches) /** * Spool mail to the mail server * - * @access private + * @access protected * @return bool */ - private function _spool_email() + protected function _spool_email() { $this->_unwrap_specials(); @@ -1516,10 +1516,10 @@ private function _spool_email() /** * Send using mail() * - * @access private + * @access protected * @return bool */ - private function _send_with_mail() + protected function _send_with_mail() { if ($this->_safe_mode == TRUE) { @@ -1553,10 +1553,10 @@ private function _send_with_mail() /** * Send using Sendmail * - * @access private + * @access protected * @return bool */ - private function _send_with_sendmail() + protected function _send_with_sendmail() { $fp = @popen($this->mailpath . " -oi -f ".$this->clean_email($this->_headers['From'])." -t", 'w'); @@ -1591,10 +1591,10 @@ private function _send_with_sendmail() /** * Send using SMTP * - * @access private + * @access protected * @return bool */ - private function _send_with_smtp() + protected function _send_with_smtp() { if ($this->smtp_host == '') { @@ -1660,11 +1660,11 @@ private function _send_with_smtp() /** * SMTP Connect * - * @access private + * @access protected * @param string * @return string */ - private function _smtp_connect() + protected function _smtp_connect() { $this->_smtp_connect = fsockopen($this->smtp_host, $this->smtp_port, @@ -1687,12 +1687,12 @@ private function _smtp_connect() /** * Send SMTP command * - * @access private + * @access protected * @param string * @param string * @return string */ - private function _send_command($cmd, $data = '') + protected function _send_command($cmd, $data = '') { switch ($cmd) { @@ -1754,10 +1754,10 @@ private function _send_command($cmd, $data = '') /** * SMTP Authenticate * - * @access private + * @access protected * @return bool */ - private function _smtp_authenticate() + protected function _smtp_authenticate() { if ( ! $this->_smtp_auth) { @@ -1808,10 +1808,10 @@ private function _smtp_authenticate() /** * Send SMTP data * - * @access private + * @access protected * @return bool */ - private function _send_data($data) + protected function _send_data($data) { if ( ! fwrite($this->_smtp_connect, $data . $this->newline)) { @@ -1829,10 +1829,10 @@ private function _send_data($data) /** * Get SMTP data * - * @access private + * @access protected * @return string */ - private function _get_smtp_data() + protected function _get_smtp_data() { $data = ""; @@ -1854,10 +1854,10 @@ private function _get_smtp_data() /** * Get Hostname * - * @access private + * @access protected * @return string */ - private function _get_hostname() + protected function _get_hostname() { return (isset($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : 'localhost.localdomain'; } @@ -1867,10 +1867,10 @@ private function _get_hostname() /** * Get IP * - * @access private + * @access protected * @return string */ - private function _get_ip() + protected function _get_ip() { if ($this->_IP !== FALSE) { @@ -1933,11 +1933,11 @@ public function print_debugger() /** * Set Message * - * @access private + * @access protected * @param string * @return string */ - private function _set_error_message($msg, $val = '') + protected function _set_error_message($msg, $val = '') { $CI =& get_instance(); $CI->lang->load('email'); @@ -1957,11 +1957,11 @@ private function _set_error_message($msg, $val = '') /** * Mime Types * - * @access private + * @access protected * @param string * @return string */ - private function _mime_types($ext = "") + protected function _mime_types($ext = "") { $mimes = array( 'hqx' => 'application/mac-binhex40', 'cpt' => 'application/mac-compactpro', From 909105135439ac2ade75a99922f77c038e882fee Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 20 Jul 2011 10:07:40 -0600 Subject: [PATCH 2517/2544] Changed Cart library to return the if inserted successfully. This will be fine for anyone using () == true. http://codeigniter.uservoice.com/forums/40508-codeigniter-reactor/suggestions/2055829-last-rowid-of-cart --- system/libraries/Cart.php | 8 ++++---- user_guide/changelog.html | 1 + user_guide/libraries/cart.html | 25 ++++++++++++------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php index b2eaa9ad..ab5a70c9 100644 --- a/system/libraries/Cart.php +++ b/system/libraries/Cart.php @@ -99,7 +99,7 @@ function insert($items = array()) $save_cart = FALSE; if (isset($items['id'])) { - if ($this->_insert($items) == TRUE) + if (($rowid = $this->_insert($items))) { $save_cart = TRUE; } @@ -110,7 +110,7 @@ function insert($items = array()) { if (is_array($val) AND isset($val['id'])) { - if ($this->_insert($val) == TRUE) + if ($this->_insert($val)) { $save_cart = TRUE; } @@ -122,7 +122,7 @@ function insert($items = array()) if ($save_cart == TRUE) { $this->_save_cart(); - return TRUE; + return isset($rowid) ? $rowid : TRUE; } return FALSE; @@ -244,7 +244,7 @@ function _insert($items = array()) } // Woot! - return TRUE; + return $rowid; } // -------------------------------------------------------------------- diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8728299c..e289879a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -89,6 +89,7 @@

          Version 2.0.3

        • Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.
        • Added is_unique to the Form Validation library.
        • Added $this->db->set_dbprefix() to the Database Driver.
          • +
        • Changed $this->cart->insert() in the Cart Library to return the Row ID if a single item was inserted successfully.
      diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index f084d5dc..81b43e36 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -61,7 +61,7 @@

      Shopping Cart Class

      The Cart Class permits items to be added to a session that stays active while a user is browsing your site. These items can be retrieved and displayed in a standard "shopping cart" format, allowing the user to update the quantity or remove items from the cart.

      -

      Please note that the Cart Class ONLY provides the core "cart" functionality. It does not provide shipping, credit card authorization, or other processing components.

      +

      Please note that the Cart Class ONLY provides the core "cart" functionality. It does not provide shipping, credit card authorization, or other processing components.

      Initializing the Shopping Cart Class

      @@ -106,20 +106,19 @@

      Adding an Item to The Cart

    65. qty - The quantity being purchased.
    66. price - The price of the item.
    67. name - The name of the item. -
    68. options - Any additional attributes that are needed to identify the product. These must be passed via an array. +
    69. options - Any additional attributes that are needed to identify the product. These must be passed via an array. -

      In addition to the five indexes above, there are two reserved words: rowid and subtotal. These are used internally by the Cart class, so -please do NOT use those words as index names when inserting data into the cart.

      +

      In addition to the five indexes above, there are two reserved words: rowid and subtotal. These are used internally by the Cart class, so please do NOT use those words as index names when inserting data into the cart.

      -

      Your array may contain additional data. Anything you include in your array will be stored in the session. However, it is best to standardize your data among -all your products in order to make displaying the information in a table easier.

      +

      Your array may contain additional data. Anything you include in your array will be stored in the session. However, it is best to standardize your data among all your products in order to make displaying the information in a table easier.

      + +

      The insert() method will return the $rowid if you successfully insert a single item.

      Adding Multiple Items to The Cart

      -

      By using a multi-dimensional array, as shown below, it is possible to add multiple products to the cart in one action. This is useful in cases where you wish to allow -people to select from among several items on the same page.

      +

      By using a multi-dimensional array, as shown below, it is possible to add multiple products to the cart in one action. This is useful in cases where you wish to allow people to select from among several items on the same page.

      @@ -265,11 +264,11 @@

      Updating The Cart

       -

      What is a Row ID?  The row ID is a unique identifier that is generated by the cart code when an item is added to the cart. The reason a +

      What is a Row ID?  The row ID is a unique identifier that is generated by the cart code when an item is added to the cart. The reason a unique ID is created is so that identical products with different options can be managed by the cart.

      -

      For example, let's say someone buys two identical t-shirts (same product ID), but in different sizes. The product ID (and other attributes) will be -identical for both sizes because it's the same shirt. The only difference will be the size. The cart must therefore have a means of identifying this +

      For example, let's say someone buys two identical t-shirts (same product ID), but in different sizes. The product ID (and other attributes) will be +identical for both sizes because it's the same shirt. The only difference will be the size. The cart must therefore have a means of identifying this difference so that the two sizes of shirts can be managed independently. It does so by creating a unique "row ID" based on the product ID and any options associated with it.

      In nearly all cases, updating the cart will be something the user does via the "view cart" page, so as a developer, it is unlikely that you will ever have to concern yourself @@ -311,7 +310,7 @@

      $this->cart->contents();

      $this->cart->has_options(rowid);

      -

      Returns TRUE (boolean) if a particular row in the cart contains options. This function is designed to be used in a loop with $this->cart->contents(), since you must pass the rowid to this function, as shown in the Displaying the Cart example above.

      +

      Returns TRUE (boolean) if a particular row in the cart contains options. This function is designed to be used in a loop with $this->cart->contents(), since you must pass the rowid to this function, as shown in the Displaying the Cart example above.

      $this->cart->product_options(rowid);

      @@ -322,7 +321,7 @@

      $this->cart->product_options(rowid);

      $this->cart->destroy();

      -

      Permits you to destroy the cart. This function will likely be called when you are finished processing the customer's order.

      +

      Permits you to destroy the cart. This function will likely be called when you are finished processing the customer's order.

      From 8731f641de823fcdcb8b2a2fa6034fca8fe4a164 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 22 Jul 2011 16:11:34 -0600 Subject: [PATCH 2518/2544] Added ->load->get_var() to check against ->load->_ci_cached_vars[]. --- system/core/Loader.php | 15 +++++++++++++++ user_guide/changelog.html | 1 + user_guide/libraries/loader.html | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/system/core/Loader.php b/system/core/Loader.php index 721c196c..7c8b298a 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -388,6 +388,21 @@ public function vars($vars = array(), $val = '') // -------------------------------------------------------------------- + /** + * Get Variable + * + * Check if a variable is set and retrieve it. + * + * @param array + * @return void + */ + public function get_var($key) + { + return isset($this->_ci_cached_vars[$key]) ? $this->_ci_cached_vars[$key] : NULL; + } + + // -------------------------------------------------------------------- + /** * Load Helper * diff --git a/user_guide/changelog.html b/user_guide/changelog.html index e289879a..fe5a67dd 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -90,6 +90,7 @@

      Version 2.0.3

    70. Added is_unique to the Form Validation library.
    71. Added $this->db->set_dbprefix() to the Database Driver.
    72. Changed $this->cart->insert() in the Cart Library to return the Row ID if a single item was inserted successfully.
      73. +
    73. Added $this->load->get_var() to the Loader library to retrieve global vars set with $this->load->view() and $this->load->vars().
      74. diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 1d93af5e..a472730c 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -175,6 +175,12 @@

      $this->load->vars($array)

      +

      $this->load->get_var($key)

      + +

      This function checks the associative array of variables available to your views. This is useful if for any reason a var is set in a library or another controller method using $this->load->vars(). +

      + +

      $this->load->helper('file_name')

      This function loads helper files, where file_name is the name of the file, without the _helper.php extension.

      From 242c258f2bf027e7c13b448131bd7e94bde81027 Mon Sep 17 00:00:00 2001 From: Adam Jackett Date: Sat, 23 Jul 2011 09:50:34 -0400 Subject: [PATCH 2519/2544] Fixed mysql and mysqli drivers to set NOT NULL as default for creating fields. All other drivers were correct. --- system/database/drivers/mysql/mysql_forge.php | 8 ++++++-- system/database/drivers/mysqli/mysqli_forge.php | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index 529ec980..c1cae136 100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php @@ -119,9 +119,13 @@ function _process_fields($fields) $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; } - if (array_key_exists('NULL', $attributes)) + if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) { - $sql .= ($attributes['NULL'] === TRUE) ? ' NULL' : ' NOT NULL'; + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; } if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index d5097335..26054945 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -104,9 +104,13 @@ function _process_fields($fields) $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; } - if (array_key_exists('NULL', $attributes)) + if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) { - $sql .= ($attributes['NULL'] === TRUE) ? ' NULL' : ' NOT NULL'; + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; } if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) From 13f6e06684b9adc40d40d48a5f2c752bcc03708e Mon Sep 17 00:00:00 2001 From: Adam Jackett Date: Sat, 23 Jul 2011 11:53:02 -0400 Subject: [PATCH 2520/2544] Added bug fix to changelog. --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index fe5a67dd..283241a1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -104,6 +104,7 @@

      Bug fixes for 2.0.3

    74. Fixed a bug (Reactor #229) where the Sessions Library example SQL in the documentation contained incorrect SQL.
    75. Fixed a bug (Core #340) where when passing in the second parameter to $this->db->select(), column names in subsequent queries would not be properly escaped.
    76. Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.
      77. +
    77. Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.

      78. Version 2.0.2

      From e611d8cfb9fb8d056fa75ec40b6e07c12e57dd53 Mon Sep 17 00:00:00 2001 From: Adam Jackett Date: Sat, 23 Jul 2011 11:45:05 -0400 Subject: [PATCH 2521/2544] Fixed having method to insert quotes. --- system/database/DB_active_rec.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index bc11ff43..0a25b3cb 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -790,7 +790,7 @@ protected function _having($key, $value = '', $type = 'AND ', $escape = TRUE) if ($v != '') { - $v = ' '.$this->escape_str($v); + $v = ' '.$this->escape($v); } $this->ar_having[] = $prefix.$k.$v; From db3fada432a270e1760731bf08784e8565fa8efb Mon Sep 17 00:00:00 2001 From: Adam Jackett Date: Sat, 23 Jul 2011 14:35:47 -0400 Subject: [PATCH 2522/2544] Added having() fix to changelog. --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index fe5a67dd..62321079 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -91,6 +91,7 @@

      Version 2.0.3

    78. Added $this->db->set_dbprefix() to the Database Driver.
    79. Changed $this->cart->insert() in the Cart Library to return the Row ID if a single item was inserted successfully.
    80. Added $this->load->get_var() to the Loader library to retrieve global vars set with $this->load->view() and $this->load->vars().
      81. +
    81. Changed $this->db->having() to insert quotes using escape() rather than escape_str().
      82. From 2e08794d5de57d727abb2abe752a4479b3ec0242 Mon Sep 17 00:00:00 2001 From: Esen Sagynov Date: Tue, 9 Aug 2011 23:35:01 -0700 Subject: [PATCH 2523/2544] Added CUBRID Database Driver --- system/database/DB_driver.php | 2 +- .../database/drivers/cubrid/cubrid_driver.php | 775 ++++++++++++++++++ .../database/drivers/cubrid/cubrid_forge.php | 284 +++++++ .../database/drivers/cubrid/cubrid_result.php | 201 +++++ .../drivers/cubrid/cubrid_utility.php | 107 +++ system/database/drivers/cubrid/index.html | 10 + 6 files changed, 1378 insertions(+), 1 deletion(-) create mode 100644 system/database/drivers/cubrid/cubrid_driver.php create mode 100644 system/database/drivers/cubrid/cubrid_forge.php create mode 100644 system/database/drivers/cubrid/cubrid_result.php create mode 100644 system/database/drivers/cubrid/cubrid_utility.php create mode 100644 system/database/drivers/cubrid/index.html diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 10e8ed0c..f3e824da 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -218,7 +218,7 @@ function version() // Some DBs have functions that return the version, and don't run special // SQL queries per se. In these instances, just return the result. - $driver_version_exceptions = array('oci8', 'sqlite'); + $driver_version_exceptions = array('oci8', 'sqlite', 'cubrid'); if (in_array($this->dbdriver, $driver_version_exceptions)) { diff --git a/system/database/drivers/cubrid/cubrid_driver.php b/system/database/drivers/cubrid/cubrid_driver.php new file mode 100644 index 00000000..ef0b5b45 --- /dev/null +++ b/system/database/drivers/cubrid/cubrid_driver.php @@ -0,0 +1,775 @@ +port == '') + { + $this->port = self::DEFAULT_PORT; + } + + $conn = cubrid_connect($this->hostname, $this->port, $this->database, $this->username, $this->password); + + if ($conn){ + if (isset($this->auto_commit) && !$this->auto_commit){ + cubrid_set_autocommit($conn, CUBRID_AUTOCOMMIT_FALSE); + } + else{ + cubrid_set_autocommit($conn, CUBRID_AUTOCOMMIT_TRUE); + $this->auto_commit = TRUE; + } + } + + return $conn; + } + + // -------------------------------------------------------------------- + + /** + * Persistent database connection + * In CUBRID persistent DB connection is supported natively in CUBRID + * engine which can be configured in the CUBRID Broker configuration + * file by setting the CCI_PCONNECT parameter to ON. In that case, all + * connections established between the client application and the + * server will become persistent. This is calling the same + * @cubrid_connect function will establish persisten connection + * considering that the CCI_PCONNECT is ON. + * + * @access private called by the base class + * @return resource + */ + function db_pconnect() + { + return $this->db_connect(); + } + + // -------------------------------------------------------------------- + + /** + * Reconnect + * + * Keep / reestablish the db connection if no queries have been + * sent for a length of time exceeding the server's idle timeout + * + * @access public + * @return void + */ + function reconnect() + { + if (cubrid_ping($this->conn_id) === FALSE) + { + $this->conn_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Select the database + * + * @access private called by the base class + * @return resource + */ + function db_select() + { + // In CUBRID there is no need to select a database as the database + // is chosen at the connection time. + // So, to determine if the database is "selected", all we have to + // do is return the connection identifier which can be later + // checked if it has been established or not. + return cubrid_ping($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Set client character set + * + * @access public + * @param string + * @param string + * @return resource + */ + function db_set_charset($charset, $collation) + { + // In CUBRID, there is no need to set charset or collation. + // This is why returning true will allow the application continue + // its normal process. + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Version number query string + * + * @access public + * @return string + */ + function _version() + { + return cubrid_get_server_info($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Execute the query + * + * @access private called by the base class + * @param string an SQL query + * @return resource + */ + function _execute($sql) + { + $sql = $this->_prep_query($sql); + return @cubrid_query($sql, $this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Prep the query + * + * If needed, each database adapter can prep the query string + * + * @access private called by execute() + * @param string an SQL query + * @return string + */ + function _prep_query($sql) + { + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Begin Transaction + * + * @access public + * @return bool + */ + function trans_begin($test_mode = FALSE) + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + // Reset the transaction failure flag. + // If the $test_mode flag is set to TRUE transactions will be rolled back + // even if the queries produce a successful result. + $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; + + if (cubrid_get_autocommit($this->conn_id)) + cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_FALSE); + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Commit Transaction + * + * @access public + * @return bool + */ + function trans_commit() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + cubrid_commit($this->conn_id); + + if ($this->auto_commit && !cubrid_get_autocommit($this->conn_id)) + cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_TRUE); + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Rollback Transaction + * + * @access public + * @return bool + */ + function trans_rollback() + { + if ( ! $this->trans_enabled) + { + return TRUE; + } + + // When transactions are nested we only begin/commit/rollback the outermost ones + if ($this->_trans_depth > 0) + { + return TRUE; + } + + cubrid_rollback($this->conn_id); + + if ($this->auto_commit && !cubrid_get_autocommit($this->conn_id)) + cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_TRUE); + + return TRUE; + } + + // -------------------------------------------------------------------- + + /** + * Escape String + * + * @access public + * @param string + * @param bool whether or not the string will be used in a LIKE condition + * @return string + */ + function escape_str($str, $like = FALSE) + { + if (is_array($str)) + { + foreach ($str as $key => $val) + { + $str[$key] = $this->escape_str($val, $like); + } + + return $str; + } + + if (function_exists('cubrid_real_escape_string') AND is_resource($this->conn_id)) + { + $str = cubrid_real_escape_string($str, $this->conn_id); + } + else + { + $str = addslashes($str); + } + + // escape LIKE condition wildcards + if ($like === TRUE) + { + //TODO: check this + $str = str_replace(array('%', '_'), array('\\%', '\\_'), $str); + } + + return $str; + } + + // -------------------------------------------------------------------- + + /** + * Affected Rows + * + * @access public + * @return integer + */ + function affected_rows() + { + return @cubrid_affected_rows($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Insert ID + * + * @access public + * @return integer + */ + function insert_id() + { + return @cubrid_insert_id($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * "Count All" query + * + * Generates a platform-specific query string that counts all records in + * the specified table + * + * @access public + * @param string + * @return string + */ + function count_all($table = '') + { + if ($table == '') + { + return 0; + } + + $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows') . " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); + + if ($query->num_rows() == 0) + { + return 0; + } + + $row = $query->row(); + return (int) $row->numrows; + } + + // -------------------------------------------------------------------- + + /** + * List table query + * + * Generates a platform-specific query string so that the table names can be fetched + * + * @access private + * @param boolean + * @return string + */ + function _list_tables($prefix_limit = FALSE) + { + $sql = "SHOW TABLES"; + + if ($prefix_limit !== FALSE AND $this->dbprefix != '') + { + $sql .= " LIKE '".$this->escape_like_str($this->dbprefix)."%'"; + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Show column query + * + * Generates a platform-specific query string so that the column names can be fetched + * + * @access public + * @param string the table name + * @return string + */ + function _list_columns($table = '') + { + return "SHOW COLUMNS FROM ".$this->_protect_identifiers($table, TRUE, NULL, FALSE); + } + + // -------------------------------------------------------------------- + + /** + * Field data query + * + * Generates a platform-specific query so that the column data can be retrieved + * + * @access public + * @param string the table name + * @return object + */ + function _field_data($table) + { + return "SELECT * FROM ".$table." LIMIT 1"; + } + + // -------------------------------------------------------------------- + + /** + * The error message string + * + * @access private + * @return string + */ + function _error_message() + { + return cubrid_error($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * The error message number + * + * @access private + * @return integer + */ + function _error_number() + { + return cubrid_errno($this->conn_id); + } + + // -------------------------------------------------------------------- + + /** + * Escape the SQL Identifiers + * + * This function escapes column and table names + * + * @access private + * @param string + * @return string + */ + function _escape_identifiers($item) + { + if ($this->_escape_char == '') + { + return $item; + } + + foreach ($this->_reserved_identifiers as $id) + { + if (strpos($item, '.'.$id) !== FALSE) + { + $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item); + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + } + + if (strpos($item, '.') !== FALSE) + { + $str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char; + } + else + { + $str = $this->_escape_char.$item.$this->_escape_char; + } + + // remove duplicates if the user already included the escape + return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str); + } + + // -------------------------------------------------------------------- + + /** + * From Tables + * + * This function implicitly groups FROM tables so there is no confusion + * about operator precedence in harmony with SQL standards + * + * @access public + * @param type + * @return type + */ + function _from_tables($tables) + { + if ( ! is_array($tables)) + { + $tables = array($tables); + } + + return '('.implode(', ', $tables).')'; + } + + // -------------------------------------------------------------------- + + /** + * Insert statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + + /** + * Replace statement + * + * Generates a platform-specific replace string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _replace($table, $keys, $values) + { + return "REPLACE INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + } + + // -------------------------------------------------------------------- + + /** + * Insert_batch statement + * + * Generates a platform-specific insert string from the supplied data + * + * @access public + * @param string the table name + * @param array the insert keys + * @param array the insert values + * @return string + */ + function _insert_batch($table, $keys, $values) + { + return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values); + } + + // -------------------------------------------------------------------- + + + /** + * Update statement + * + * Generates a platform-specific update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @param array the orderby clause + * @param array the limit clause + * @return string + */ + function _update($table, $values, $where, $orderby = array(), $limit = FALSE) + { + foreach ($values as $key => $val) + { + $valstr[] = $key . ' = ' . $val; + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + $orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):''; + + $sql = "UPDATE ".$table." SET ".implode(', ', $valstr); + + $sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : ''; + + $sql .= $orderby.$limit; + + return $sql; + } + + // -------------------------------------------------------------------- + + + /** + * Update_Batch statement + * + * Generates a platform-specific batch update string from the supplied data + * + * @access public + * @param string the table name + * @param array the update data + * @param array the where clause + * @return string + */ + function _update_batch($table, $values, $index, $where = NULL) + { + $ids = array(); + $where = ($where != '' AND count($where) >=1) ? implode(" ", $where).' AND ' : ''; + + foreach ($values as $key => $val) + { + $ids[] = $val[$index]; + + foreach (array_keys($val) as $field) + { + if ($field != $index) + { + $final[$field][] = 'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field]; + } + } + } + + $sql = "UPDATE ".$table." SET "; + $cases = ''; + + foreach ($final as $k => $v) + { + $cases .= $k.' = CASE '."\n"; + foreach ($v as $row) + { + $cases .= $row."\n"; + } + + $cases .= 'ELSE '.$k.' END, '; + } + + $sql .= substr($cases, 0, -2); + + $sql .= ' WHERE '.$where.$index.' IN ('.implode(',', $ids).')'; + + return $sql; + } + + // -------------------------------------------------------------------- + + + /** + * Truncate statement + * + * Generates a platform-specific truncate string from the supplied data + * If the database does not support the truncate() command + * This function maps to "DELETE FROM table" + * + * @access public + * @param string the table name + * @return string + */ + function _truncate($table) + { + return "TRUNCATE ".$table; + } + + // -------------------------------------------------------------------- + + /** + * Delete statement + * + * Generates a platform-specific delete string from the supplied data + * + * @access public + * @param string the table name + * @param array the where clause + * @param string the limit clause + * @return string + */ + function _delete($table, $where = array(), $like = array(), $limit = FALSE) + { + $conditions = ''; + + if (count($where) > 0 OR count($like) > 0) + { + $conditions = "\nWHERE "; + $conditions .= implode("\n", $this->ar_where); + + if (count($where) > 0 && count($like) > 0) + { + $conditions .= " AND "; + } + $conditions .= implode("\n", $like); + } + + $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; + + return "DELETE FROM ".$table.$conditions.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Limit string + * + * Generates a platform-specific LIMIT clause + * + * @access public + * @param string the sql query string + * @param integer the number of rows to limit the query to + * @param integer the offset value + * @return string + */ + function _limit($sql, $limit, $offset) + { + if ($offset == 0) + { + $offset = ''; + } + else + { + $offset .= ", "; + } + + return $sql."LIMIT ".$offset.$limit; + } + + // -------------------------------------------------------------------- + + /** + * Close DB Connection + * + * @access public + * @param resource + * @return void + */ + function _close($conn_id) + { + @cubrid_close($conn_id); + } + +} + + +/* End of file cubrid_driver.php */ +/* Location: ./system/database/drivers/cubrid/cubrid_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php new file mode 100644 index 00000000..c2c553f2 --- /dev/null +++ b/system/database/drivers/cubrid/cubrid_forge.php @@ -0,0 +1,284 @@ +$attributes) + { + // Numeric field names aren't allowed in databases, so if the key is + // numeric, we know it was assigned by PHP and the developer manually + // entered the field information, so we'll simply add it to the list + if (is_numeric($field)) + { + $sql .= "\n\t$attributes"; + } + else + { + $attributes = array_change_key_case($attributes, CASE_UPPER); + + $sql .= "\n\t".$this->db->_protect_identifiers($field); + + if (array_key_exists('NAME', $attributes)) + { + $sql .= ' '.$this->db->_protect_identifiers($attributes['NAME']).' '; + } + + if (array_key_exists('TYPE', $attributes)) + { + $sql .= ' '.$attributes['TYPE']; + + if (array_key_exists('CONSTRAINT', $attributes)) + { + switch ($attributes['TYPE']) + { + case 'decimal': + case 'float': + case 'numeric': + $sql .= '('.implode(',', $attributes['CONSTRAINT']).')'; + break; + case 'enum': // As of version 8.4.0 CUBRID does not support + // enum data type. + break; + case 'set': + $sql .= '("'.implode('","', $attributes['CONSTRAINT']).'")'; + break; + default: + $sql .= '('.$attributes['CONSTRAINT'].')'; + } + } + } + + if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE) + { + //$sql .= ' UNSIGNED'; + // As of version 8.4.0 CUBRID does not support UNSIGNED INTEGER data type. + // Will be supported in the next release as a part of MySQL Compatibility. + } + + if (array_key_exists('DEFAULT', $attributes)) + { + $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; + } + + if (array_key_exists('NULL', $attributes)) + { + $sql .= ($attributes['NULL'] === TRUE) ? '' : ' NOT NULL'; + } + + if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) + { + $sql .= ' AUTO_INCREMENT'; + } + + if (array_key_exists('UNIQUE', $attributes) && $attributes['UNIQUE'] === TRUE) + { + $sql .= ' UNIQUE'; + } + } + + // don't add a comma on the end of the last field + if (++$current_field_count < count($fields)) + { + $sql .= ','; + } + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Create Table + * + * @access private + * @param string the table name + * @param mixed the fields + * @param mixed primary key(s) + * @param mixed key(s) + * @param boolean should 'IF NOT EXISTS' be added to the SQL + * @return bool + */ + function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) + { + $sql = 'CREATE TABLE '; + + if ($if_not_exists === TRUE) + { + //$sql .= 'IF NOT EXISTS '; + // As of version 8.4.0 CUBRID does not support this SQL syntax. + } + + $sql .= $this->db->_escape_identifiers($table)." ("; + + $sql .= $this->_process_fields($fields); + + // If there is a PK defined + if (count($primary_keys) > 0) + { + $key_name = "pk_" . $table . "_" . + $this->db->_protect_identifiers(implode('_', $primary_keys)); + + $primary_keys = $this->db->_protect_identifiers($primary_keys); + $sql .= ",\n\tCONSTRAINT " . $key_name . " PRIMARY KEY(" . implode(', ', $primary_keys) . ")"; + } + + if (is_array($keys) && count($keys) > 0) + { + foreach ($keys as $key) + { + if (is_array($key)) + { + $key_name = $this->db->_protect_identifiers(implode('_', $key)); + $key = $this->db->_protect_identifiers($key); + } + else + { + $key_name = $this->db->_protect_identifiers($key); + $key = array($key_name); + } + + $sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")"; + } + } + + $sql .= "\n);"; + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Drop Table + * + * @access private + * @return string + */ + function _drop_table($table) + { + return "DROP TABLE IF EXISTS ".$this->db->_escape_identifiers($table); + } + + // -------------------------------------------------------------------- + + /** + * Alter table query + * + * Generates a platform-specific query so that a table can be altered + * Called by add_column(), drop_column(), and column_alter(), + * + * @access private + * @param string the ALTER type (ADD, DROP, CHANGE) + * @param string the column name + * @param array fields + * @param string the field after which we should add the new field + * @return object + */ + function _alter_table($alter_type, $table, $fields, $after_field = '') + { + $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type "; + + // DROP has everything it needs now. + if ($alter_type == 'DROP') + { + return $sql.$this->db->_protect_identifiers($fields); + } + + $sql .= $this->_process_fields($fields); + + if ($after_field != '') + { + $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field); + } + + return $sql; + } + + // -------------------------------------------------------------------- + + /** + * Rename a table + * + * Generates a platform-specific query so that a table can be renamed + * + * @access private + * @param string the old table name + * @param string the new table name + * @return string + */ + function _rename_table($table_name, $new_table_name) + { + $sql = 'RENAME TABLE '.$this->db->_protect_identifiers($table_name)." AS ".$this->db->_protect_identifiers($new_table_name); + return $sql; + } + +} + +/* End of file cubrid_forge.php */ +/* Location: ./system/database/drivers/cubrid/cubrid_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/cubrid/cubrid_result.php b/system/database/drivers/cubrid/cubrid_result.php new file mode 100644 index 00000000..06613e35 --- /dev/null +++ b/system/database/drivers/cubrid/cubrid_result.php @@ -0,0 +1,201 @@ +result_id); + } + + // -------------------------------------------------------------------- + + /** + * Number of fields in the result set + * + * @access public + * @return integer + */ + function num_fields() + { + return @cubrid_num_fields($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Fetch Field Names + * + * Generates an array of column names + * + * @access public + * @return array + */ + function list_fields() + { + return cubrid_column_names($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Field data + * + * Generates an array of objects containing field meta-data + * + * @access public + * @return array + */ + function field_data() + { + $retval = array(); + + $tablePrimaryKeys = array(); + + while ($field = cubrid_fetch_field($this->result_id)) + { + $F = new stdClass(); + $F->name = $field->name; + $F->type = $field->type; + $F->default = $field->def; + $F->max_length = $field->max_length; + + // At this moment primary_key property is not returned when + // cubrid_fetch_field is called. The following code will + // provide a patch for it. primary_key property will be added + // in the next release. + + // TODO: later version of CUBRID will provide primary_key + // property. + // When PK is defined in CUBRID, an index is automatically + // created in the db_index system table in the form of + // pk_tblname_fieldname. So the following will count how many + // columns are there which satisfy this format. + // The query will search for exact single columns, thus + // compound PK is not supported. + $res = cubrid_query($this->conn_id, + "SELECT COUNT(*) FROM db_index WHERE class_name = '" . $field->table . + "' AND is_primary_key = 'YES' AND index_name = 'pk_" . + $field->table . "_" . $field->name . "'" + ); + + if ($res) + { + $row = cubrid_fetch_array($res, CUBRID_NUM); + $F->primary_key = ($row[0] > 0 ? 1 : null); + } + else{ + $F->primary_key = null; + } + + if (is_resource($res)) + { + cubrid_close_request($res); + $this->result_id = FALSE; + } + + $retval[] = $F; + } + + return $retval; + } + + // -------------------------------------------------------------------- + + /** + * Free the result + * + * @return null + */ + function free_result() + { + if(is_resource($this->result_id) || + get_resource_type($this->result_id) == "Unknown" && + preg_match('/Resource id #/', strval($this->result_id))) + { + cubrid_close_request($this->result_id); + $this->result_id = FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Data Seek + * + * Moves the internal pointer to the desired offset. We call + * this internally before fetching results to make sure the + * result set starts at zero + * + * @access private + * @return array + */ + function _data_seek($n = 0) + { + return cubrid_data_seek($this->result_id, $n); + } + + // -------------------------------------------------------------------- + + /** + * Result - associative array + * + * Returns the result set as an array + * + * @access private + * @return array + */ + function _fetch_assoc() + { + return cubrid_fetch_assoc($this->result_id); + } + + // -------------------------------------------------------------------- + + /** + * Result - object + * + * Returns the result set as an object + * + * @access private + * @return object + */ + function _fetch_object() + { + return cubrid_fetch_object($this->result_id); + } + +} + + +/* End of file cubrid_result.php */ +/* Location: ./system/database/drivers/cubrid/cubrid_result.php */ \ No newline at end of file diff --git a/system/database/drivers/cubrid/cubrid_utility.php b/system/database/drivers/cubrid/cubrid_utility.php new file mode 100644 index 00000000..9cf8b2ea --- /dev/null +++ b/system/database/drivers/cubrid/cubrid_utility.php @@ -0,0 +1,107 @@ +conn_id) + { + return "SELECT '" . $this->database . "'"; + } + else{ + return FALSE; + } + } + + // -------------------------------------------------------------------- + + /** + * Optimize table query + * + * Generates a platform-specific query so that a table can be optimized + * + * @access private + * @param string the table name + * @return object + * @link http://www.cubrid.org/manual/840/en/Optimize%20Database + */ + function _optimize_table($table) + { + // No SQL based support in CUBRID as of version 8.4.0. Database or + // table optimization can be performed using CUBRID Manager + // database administration tool. See the link above for more info. + return FALSE; + } + + // -------------------------------------------------------------------- + + /** + * Repair table query + * + * Generates a platform-specific query so that a table can be repaired + * + * @access private + * @param string the table name + * @return object + * @link http://www.cubrid.org/manual/840/en/Checking%20Database%20Consistency + */ + function _repair_table($table) + { + // Not supported in CUBRID as of version 8.4.0. Database or + // table consistency can be checked using CUBRID Manager + // database administration tool. See the link above for more info. + return FALSE; + } + + // -------------------------------------------------------------------- + /** + * CUBRID Export + * + * @access private + * @param array Preferences + * @return mixed + */ + function _backup($params = array()) + { + // No SQL based support in CUBRID as of version 8.4.0. Database or + // table backup can be performed using CUBRID Manager + // database administration tool. + return $this->db->display_error('db_unsuported_feature'); + } +} + +/* End of file cubrid_utility.php */ +/* Location: ./system/database/drivers/cubrid/cubrid_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/cubrid/index.html b/system/database/drivers/cubrid/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/system/database/drivers/cubrid/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file From ee3e594893d28ca6370d24d2a4406c1897959175 Mon Sep 17 00:00:00 2001 From: Esen Sagynov Date: Wed, 10 Aug 2011 03:22:58 -0700 Subject: [PATCH 2524/2544] Added field name wrappers (") in insert/update/replace/_process_fields/_create_table functions to avoid reserved word conflicts. --- application/cache/.htaccess | 1 - application/cache/index.html | 10 - application/config/autoload.php | 116 ------ application/config/config.php | 362 ------------------ application/config/constants.php | 41 -- application/config/database.php | 69 ---- application/config/doctypes.php | 15 - application/config/foreign_chars.php | 64 ---- application/config/hooks.php | 16 - application/config/index.html | 10 - application/config/migration.php | 42 -- application/config/mimes.php | 106 ----- application/config/profiler.php | 17 - application/config/routes.php | 46 --- application/config/smileys.php | 66 ---- application/config/user_agents.php | 178 --------- application/controllers/index.html | 10 - application/controllers/welcome.php | 27 -- application/core/index.html | 10 - application/errors/error_404.php | 62 --- application/errors/error_db.php | 62 --- application/errors/error_general.php | 62 --- application/errors/error_php.php | 10 - application/errors/index.html | 10 - application/helpers/index.html | 10 - application/hooks/index.html | 10 - application/index.html | 10 - application/language/english/index.html | 10 - application/libraries/index.html | 10 - application/logs/index.html | 10 - application/models/index.html | 10 - application/third_party/index.html | 10 - application/views/index.html | 10 - application/views/welcome_message.php | 88 ----- .../database/drivers/cubrid/cubrid_driver.php | 8 +- .../database/drivers/cubrid/cubrid_forge.php | 4 +- 36 files changed, 6 insertions(+), 1596 deletions(-) delete mode 100644 application/cache/.htaccess delete mode 100644 application/cache/index.html delete mode 100644 application/config/autoload.php delete mode 100644 application/config/config.php delete mode 100644 application/config/constants.php delete mode 100644 application/config/database.php delete mode 100644 application/config/doctypes.php delete mode 100644 application/config/foreign_chars.php delete mode 100644 application/config/hooks.php delete mode 100644 application/config/index.html delete mode 100644 application/config/migration.php delete mode 100644 application/config/mimes.php delete mode 100644 application/config/profiler.php delete mode 100644 application/config/routes.php delete mode 100644 application/config/smileys.php delete mode 100644 application/config/user_agents.php delete mode 100644 application/controllers/index.html delete mode 100644 application/controllers/welcome.php delete mode 100644 application/core/index.html delete mode 100644 application/errors/error_404.php delete mode 100644 application/errors/error_db.php delete mode 100644 application/errors/error_general.php delete mode 100644 application/errors/error_php.php delete mode 100644 application/errors/index.html delete mode 100644 application/helpers/index.html delete mode 100644 application/hooks/index.html delete mode 100644 application/index.html delete mode 100644 application/language/english/index.html delete mode 100644 application/libraries/index.html delete mode 100644 application/logs/index.html delete mode 100644 application/models/index.html delete mode 100644 application/third_party/index.html delete mode 100644 application/views/index.html delete mode 100644 application/views/welcome_message.php diff --git a/application/cache/.htaccess b/application/cache/.htaccess deleted file mode 100644 index 3418e55a..00000000 --- a/application/cache/.htaccess +++ /dev/null @@ -1 +0,0 @@ -deny from all \ No newline at end of file diff --git a/application/cache/index.html b/application/cache/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/cache/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/config/autoload.php b/application/config/autoload.php deleted file mode 100644 index 53129c9c..00000000 --- a/application/config/autoload.php +++ /dev/null @@ -1,116 +0,0 @@ - '', - 'xhtml1-strict' => '', - 'xhtml1-trans' => '', - 'xhtml1-frame' => '', - 'html5' => '', - 'html4-strict' => '', - 'html4-trans' => '', - 'html4-frame' => '' - ); - -/* End of file doctypes.php */ -/* Location: ./application/config/doctypes.php */ \ No newline at end of file diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php deleted file mode 100644 index 14b0d737..00000000 --- a/application/config/foreign_chars.php +++ /dev/null @@ -1,64 +0,0 @@ - 'ae', - '/ö|Å“/' => 'oe', - '/ü/' => 'ue', - '/Ä/' => 'Ae', - '/Ãœ/' => 'Ue', - '/Ö/' => 'Oe', - '/À|Ã|Â|Ã|Ä|Ã…|Ǻ|Ä€|Ä‚|Ä„|Ç/' => 'A', - '/à|á|â|ã|Ã¥|Ç»|Ä|ă|Ä…|ÇŽ|ª/' => 'a', - '/Ç|Ć|Ĉ|ÄŠ|ÄŒ/' => 'C', - '/ç|ć|ĉ|Ä‹|Ä/' => 'c', - '/Ã|ÄŽ|Ä/' => 'D', - '/ð|Ä|Ä‘/' => 'd', - '/È|É|Ê|Ë|Ä’|Ä”|Ä–|Ę|Äš/' => 'E', - '/è|é|ê|ë|Ä“|Ä•|Ä—|Ä™|Ä›/' => 'e', - '/Äœ|Äž|Ä |Ä¢/' => 'G', - '/Ä|ÄŸ|Ä¡|Ä£/' => 'g', - '/Ĥ|Ħ/' => 'H', - '/Ä¥|ħ/' => 'h', - '/ÃŒ|Ã|ÃŽ|Ã|Ĩ|Ī|Ĭ|Ç|Ä®|Ä°/' => 'I', - '/ì|í|î|ï|Ä©|Ä«|Ä­|Ç|į|ı/' => 'i', - '/Ä´/' => 'J', - '/ĵ/' => 'j', - '/Ķ/' => 'K', - '/Ä·/' => 'k', - '/Ĺ|Ä»|Ľ|Ä¿|Å/' => 'L', - '/ĺ|ļ|ľ|Å€|Å‚/' => 'l', - '/Ñ|Ń|Å…|Ň/' => 'N', - '/ñ|Å„|ņ|ň|ʼn/' => 'n', - '/Ã’|Ó|Ô|Õ|ÅŒ|ÅŽ|Ç‘|Å|Æ |Ø|Ǿ/' => 'O', - '/ò|ó|ô|õ|Å|Å|Ç’|Å‘|Æ¡|ø|Ç¿|º/' => 'o', - '/Å”|Å–|Ř/' => 'R', - '/Å•|Å—|Å™/' => 'r', - '/Åš|Åœ|Åž|Å /' => 'S', - '/Å›|Å|ÅŸ|Å¡|Å¿/' => 's', - '/Å¢|Ť|Ŧ/' => 'T', - '/Å£|Å¥|ŧ/' => 't', - '/Ù|Ú|Û|Ũ|Ū|Ŭ|Å®|Å°|Ų|Ư|Ç“|Ç•|Ç—|Ç™|Ç›/' => 'U', - '/ù|ú|û|Å©|Å«|Å­|ů|ű|ų|Æ°|Ç”|Ç–|ǘ|Çš|Çœ/' => 'u', - '/Ã|Ÿ|Ŷ/' => 'Y', - '/ý|ÿ|Å·/' => 'y', - '/Å´/' => 'W', - '/ŵ/' => 'w', - '/Ź|Å»|Ž/' => 'Z', - '/ź|ż|ž/' => 'z', - '/Æ|Ǽ/' => 'AE', - '/ß/'=> 'ss', - '/IJ/' => 'IJ', - '/ij/' => 'ij', - '/Å’/' => 'OE', - '/Æ’/' => 'f' -); - -/* End of file foreign_chars.php */ -/* Location: ./application/config/foreign_chars.php */ \ No newline at end of file diff --git a/application/config/hooks.php b/application/config/hooks.php deleted file mode 100644 index a4ad2be6..00000000 --- a/application/config/hooks.php +++ /dev/null @@ -1,16 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/config/migration.php b/application/config/migration.php deleted file mode 100644 index 509fd90a..00000000 --- a/application/config/migration.php +++ /dev/null @@ -1,42 +0,0 @@ -migration->latest() this is the version that schema will -| be upgraded / downgraded to. -| -*/ -$config['migration_version'] = 0; - - -/* -|-------------------------------------------------------------------------- -| Migrations Path -|-------------------------------------------------------------------------- -| -| Path to your migrations folder. -| Typically, it will be within your application path. -| Also, writing permission is required within the migrations path. -| -*/ -$config['migration_path'] = APPPATH . 'migrations/'; - - -/* End of file migration.php */ -/* Location: ./application/config/migration.php */ \ No newline at end of file diff --git a/application/config/mimes.php b/application/config/mimes.php deleted file mode 100644 index 8065794f..00000000 --- a/application/config/mimes.php +++ /dev/null @@ -1,106 +0,0 @@ - 'application/mac-binhex40', - 'cpt' => 'application/mac-compactpro', - 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), - 'bin' => 'application/macbinary', - 'dms' => 'application/octet-stream', - 'lha' => 'application/octet-stream', - 'lzh' => 'application/octet-stream', - 'exe' => array('application/octet-stream', 'application/x-msdownload'), - 'class' => 'application/octet-stream', - 'psd' => 'application/x-photoshop', - 'so' => 'application/octet-stream', - 'sea' => 'application/octet-stream', - 'dll' => 'application/octet-stream', - 'oda' => 'application/oda', - 'pdf' => array('application/pdf', 'application/x-download'), - 'ai' => 'application/postscript', - 'eps' => 'application/postscript', - 'ps' => 'application/postscript', - 'smi' => 'application/smil', - 'smil' => 'application/smil', - 'mif' => 'application/vnd.mif', - 'xls' => array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'), - 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'), - 'wbxml' => 'application/wbxml', - 'wmlc' => 'application/wmlc', - 'dcr' => 'application/x-director', - 'dir' => 'application/x-director', - 'dxr' => 'application/x-director', - 'dvi' => 'application/x-dvi', - 'gtar' => 'application/x-gtar', - 'gz' => 'application/x-gzip', - 'php' => 'application/x-httpd-php', - 'php4' => 'application/x-httpd-php', - 'php3' => 'application/x-httpd-php', - 'phtml' => 'application/x-httpd-php', - 'phps' => 'application/x-httpd-php-source', - 'js' => 'application/x-javascript', - 'swf' => 'application/x-shockwave-flash', - 'sit' => 'application/x-stuffit', - 'tar' => 'application/x-tar', - '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'), - 'mid' => 'audio/midi', - 'midi' => 'audio/midi', - 'mpga' => 'audio/mpeg', - 'mp2' => 'audio/mpeg', - 'mp3' => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'), - 'aif' => 'audio/x-aiff', - 'aiff' => 'audio/x-aiff', - 'aifc' => 'audio/x-aiff', - 'ram' => 'audio/x-pn-realaudio', - 'rm' => 'audio/x-pn-realaudio', - 'rpm' => 'audio/x-pn-realaudio-plugin', - 'ra' => 'audio/x-realaudio', - 'rv' => 'video/vnd.rn-realvideo', - 'wav' => 'audio/x-wav', - 'bmp' => 'image/bmp', - 'gif' => 'image/gif', - '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'), - 'tiff' => 'image/tiff', - 'tif' => 'image/tiff', - 'css' => 'text/css', - 'html' => 'text/html', - 'htm' => 'text/html', - 'shtml' => 'text/html', - 'txt' => 'text/plain', - 'text' => 'text/plain', - 'log' => array('text/plain', 'text/x-log'), - 'rtx' => 'text/richtext', - 'rtf' => 'text/rtf', - 'xml' => 'text/xml', - 'xsl' => 'text/xml', - 'mpeg' => 'video/mpeg', - 'mpg' => 'video/mpeg', - 'mpe' => 'video/mpeg', - 'qt' => 'video/quicktime', - 'mov' => 'video/quicktime', - 'avi' => 'video/x-msvideo', - 'movie' => 'video/x-sgi-movie', - 'doc' => 'application/msword', - 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - 'word' => array('application/msword', 'application/octet-stream'), - 'xl' => 'application/excel', - 'eml' => 'message/rfc822', - 'json' => array('application/json', 'text/json') - ); - - -/* End of file mimes.php */ -/* Location: ./application/config/mimes.php */ \ No newline at end of file diff --git a/application/config/profiler.php b/application/config/profiler.php deleted file mode 100644 index f8a5b1a1..00000000 --- a/application/config/profiler.php +++ /dev/null @@ -1,17 +0,0 @@ - array('grin.gif', '19', '19', 'grin'), - ':lol:' => array('lol.gif', '19', '19', 'LOL'), - ':cheese:' => array('cheese.gif', '19', '19', 'cheese'), - ':)' => array('smile.gif', '19', '19', 'smile'), - ';-)' => array('wink.gif', '19', '19', 'wink'), - ';)' => array('wink.gif', '19', '19', 'wink'), - ':smirk:' => array('smirk.gif', '19', '19', 'smirk'), - ':roll:' => array('rolleyes.gif', '19', '19', 'rolleyes'), - ':-S' => array('confused.gif', '19', '19', 'confused'), - ':wow:' => array('surprise.gif', '19', '19', 'surprised'), - ':bug:' => array('bigsurprise.gif', '19', '19', 'big surprise'), - ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'), - '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'), - ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'), - ':P' => array('raspberry.gif', '19', '19', 'raspberry'), - ':blank:' => array('blank.gif', '19', '19', 'blank stare'), - ':long:' => array('longface.gif', '19', '19', 'long face'), - ':ohh:' => array('ohh.gif', '19', '19', 'ohh'), - ':grrr:' => array('grrr.gif', '19', '19', 'grrr'), - ':gulp:' => array('gulp.gif', '19', '19', 'gulp'), - '8-/' => array('ohoh.gif', '19', '19', 'oh oh'), - ':down:' => array('downer.gif', '19', '19', 'downer'), - ':red:' => array('embarrassed.gif', '19', '19', 'red face'), - ':sick:' => array('sick.gif', '19', '19', 'sick'), - ':shut:' => array('shuteye.gif', '19', '19', 'shut eye'), - ':-/' => array('hmm.gif', '19', '19', 'hmmm'), - '>:(' => array('mad.gif', '19', '19', 'mad'), - ':mad:' => array('mad.gif', '19', '19', 'mad'), - '>:-(' => array('angry.gif', '19', '19', 'angry'), - ':angry:' => array('angry.gif', '19', '19', 'angry'), - ':zip:' => array('zip.gif', '19', '19', 'zipper'), - ':kiss:' => array('kiss.gif', '19', '19', 'kiss'), - ':ahhh:' => array('shock.gif', '19', '19', 'shock'), - ':coolsmile:' => array('shade_smile.gif', '19', '19', 'cool smile'), - ':coolsmirk:' => array('shade_smirk.gif', '19', '19', 'cool smirk'), - ':coolgrin:' => array('shade_grin.gif', '19', '19', 'cool grin'), - ':coolhmm:' => array('shade_hmm.gif', '19', '19', 'cool hmm'), - ':coolmad:' => array('shade_mad.gif', '19', '19', 'cool mad'), - ':coolcheese:' => array('shade_cheese.gif', '19', '19', 'cool cheese'), - ':vampire:' => array('vampire.gif', '19', '19', 'vampire'), - ':snake:' => array('snake.gif', '19', '19', 'snake'), - ':exclaim:' => array('exclaim.gif', '19', '19', 'excaim'), - ':question:' => array('question.gif', '19', '19', 'question') // no comma after last item - - ); - -/* End of file smileys.php */ -/* Location: ./application/config/smileys.php */ \ No newline at end of file diff --git a/application/config/user_agents.php b/application/config/user_agents.php deleted file mode 100644 index e2d3c3af..00000000 --- a/application/config/user_agents.php +++ /dev/null @@ -1,178 +0,0 @@ - 'Windows Longhorn', - 'windows nt 5.2' => 'Windows 2003', - 'windows nt 5.0' => 'Windows 2000', - 'windows nt 5.1' => 'Windows XP', - 'windows nt 4.0' => 'Windows NT 4.0', - 'winnt4.0' => 'Windows NT 4.0', - 'winnt 4.0' => 'Windows NT', - 'winnt' => 'Windows NT', - 'windows 98' => 'Windows 98', - 'win98' => 'Windows 98', - 'windows 95' => 'Windows 95', - 'win95' => 'Windows 95', - 'windows' => 'Unknown Windows OS', - 'os x' => 'Mac OS X', - 'ppc mac' => 'Power PC Mac', - 'freebsd' => 'FreeBSD', - 'ppc' => 'Macintosh', - 'linux' => 'Linux', - 'debian' => 'Debian', - 'sunos' => 'Sun Solaris', - 'beos' => 'BeOS', - 'apachebench' => 'ApacheBench', - 'aix' => 'AIX', - 'irix' => 'Irix', - 'osf' => 'DEC OSF', - 'hp-ux' => 'HP-UX', - 'netbsd' => 'NetBSD', - 'bsdi' => 'BSDi', - 'openbsd' => 'OpenBSD', - 'gnu' => 'GNU/Linux', - 'unix' => 'Unknown Unix OS' - ); - - -// The order of this array should NOT be changed. Many browsers return -// multiple browser types so we want to identify the sub-type first. -$browsers = array( - 'Flock' => 'Flock', - 'Chrome' => 'Chrome', - 'Opera' => 'Opera', - 'MSIE' => 'Internet Explorer', - 'Internet Explorer' => 'Internet Explorer', - 'Shiira' => 'Shiira', - 'Firefox' => 'Firefox', - 'Chimera' => 'Chimera', - 'Phoenix' => 'Phoenix', - 'Firebird' => 'Firebird', - 'Camino' => 'Camino', - 'Netscape' => 'Netscape', - 'OmniWeb' => 'OmniWeb', - 'Safari' => 'Safari', - 'Mozilla' => 'Mozilla', - 'Konqueror' => 'Konqueror', - 'icab' => 'iCab', - 'Lynx' => 'Lynx', - 'Links' => 'Links', - 'hotjava' => 'HotJava', - 'amaya' => 'Amaya', - 'IBrowse' => 'IBrowse' - ); - -$mobiles = array( - // legacy array, old values commented out - 'mobileexplorer' => 'Mobile Explorer', -// 'openwave' => 'Open Wave', -// 'opera mini' => 'Opera Mini', -// 'operamini' => 'Opera Mini', -// 'elaine' => 'Palm', - 'palmsource' => 'Palm', -// 'digital paths' => 'Palm', -// 'avantgo' => 'Avantgo', -// 'xiino' => 'Xiino', - 'palmscape' => 'Palmscape', -// 'nokia' => 'Nokia', -// 'ericsson' => 'Ericsson', -// 'blackberry' => 'BlackBerry', -// 'motorola' => 'Motorola' - - // Phones and Manufacturers - 'motorola' => "Motorola", - 'nokia' => "Nokia", - 'palm' => "Palm", - 'iphone' => "Apple iPhone", - 'ipad' => "iPad", - 'ipod' => "Apple iPod Touch", - 'sony' => "Sony Ericsson", - 'ericsson' => "Sony Ericsson", - 'blackberry' => "BlackBerry", - 'cocoon' => "O2 Cocoon", - 'blazer' => "Treo", - 'lg' => "LG", - 'amoi' => "Amoi", - 'xda' => "XDA", - 'mda' => "MDA", - 'vario' => "Vario", - 'htc' => "HTC", - 'samsung' => "Samsung", - 'sharp' => "Sharp", - 'sie-' => "Siemens", - 'alcatel' => "Alcatel", - 'benq' => "BenQ", - 'ipaq' => "HP iPaq", - 'mot-' => "Motorola", - 'playstation portable' => "PlayStation Portable", - 'hiptop' => "Danger Hiptop", - 'nec-' => "NEC", - 'panasonic' => "Panasonic", - 'philips' => "Philips", - 'sagem' => "Sagem", - 'sanyo' => "Sanyo", - 'spv' => "SPV", - 'zte' => "ZTE", - 'sendo' => "Sendo", - - // Operating Systems - 'symbian' => "Symbian", - 'SymbianOS' => "SymbianOS", - 'elaine' => "Palm", - 'palm' => "Palm", - 'series60' => "Symbian S60", - 'windows ce' => "Windows CE", - - // Browsers - 'obigo' => "Obigo", - 'netfront' => "Netfront Browser", - 'openwave' => "Openwave Browser", - 'mobilexplorer' => "Mobile Explorer", - 'operamini' => "Opera Mini", - 'opera mini' => "Opera Mini", - - // Other - 'digital paths' => "Digital Paths", - 'avantgo' => "AvantGo", - 'xiino' => "Xiino", - 'novarra' => "Novarra Transcoder", - 'vodafone' => "Vodafone", - 'docomo' => "NTT DoCoMo", - 'o2' => "O2", - - // Fallback - 'mobile' => "Generic Mobile", - 'wireless' => "Generic Mobile", - 'j2me' => "Generic Mobile", - 'midp' => "Generic Mobile", - 'cldc' => "Generic Mobile", - 'up.link' => "Generic Mobile", - 'up.browser' => "Generic Mobile", - 'smartphone' => "Generic Mobile", - 'cellphone' => "Generic Mobile" - ); - -// There are hundreds of bots but these are the most common. -$robots = array( - 'googlebot' => 'Googlebot', - 'msnbot' => 'MSNBot', - 'slurp' => 'Inktomi Slurp', - 'yahoo' => 'Yahoo', - 'askjeeves' => 'AskJeeves', - 'fastcrawler' => 'FastCrawler', - 'infoseek' => 'InfoSeek Robot 1.0', - 'lycos' => 'Lycos' - ); - -/* End of file user_agents.php */ -/* Location: ./application/config/user_agents.php */ \ No newline at end of file diff --git a/application/controllers/index.html b/application/controllers/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/controllers/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php deleted file mode 100644 index 21bef43d..00000000 --- a/application/controllers/welcome.php +++ /dev/null @@ -1,27 +0,0 @@ - - * @see http://codeigniter.com/user_guide/general/urls.html - */ - public function index() - { - $this->load->view('welcome_message'); - } -} - -/* End of file welcome.php */ -/* Location: ./application/controllers/welcome.php */ \ No newline at end of file diff --git a/application/core/index.html b/application/core/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/core/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/errors/error_404.php b/application/errors/error_404.php deleted file mode 100644 index 792726a6..00000000 --- a/application/errors/error_404.php +++ /dev/null @@ -1,62 +0,0 @@ - - - -404 Page Not Found - - - -
      -

      - -
      - - \ No newline at end of file diff --git a/application/errors/error_db.php b/application/errors/error_db.php deleted file mode 100644 index b396cda9..00000000 --- a/application/errors/error_db.php +++ /dev/null @@ -1,62 +0,0 @@ - - - -Database Error - - - -
      -

      - -
      - - \ No newline at end of file diff --git a/application/errors/error_general.php b/application/errors/error_general.php deleted file mode 100644 index fd63ce2c..00000000 --- a/application/errors/error_general.php +++ /dev/null @@ -1,62 +0,0 @@ - - - -Error - - - -
      -

      - -
      - - \ No newline at end of file diff --git a/application/errors/error_php.php b/application/errors/error_php.php deleted file mode 100644 index f085c203..00000000 --- a/application/errors/error_php.php +++ /dev/null @@ -1,10 +0,0 @@ -
      - -

      A PHP Error was encountered

      - -

      Severity:

      -

      Message:

      -

      Filename:

      -

      Line Number:

      - -
      \ No newline at end of file diff --git a/application/errors/index.html b/application/errors/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/errors/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/helpers/index.html b/application/helpers/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/helpers/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/hooks/index.html b/application/hooks/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/hooks/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/index.html b/application/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/language/english/index.html b/application/language/english/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/language/english/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/libraries/index.html b/application/libraries/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/libraries/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/logs/index.html b/application/logs/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/logs/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/models/index.html b/application/models/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/models/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/third_party/index.html b/application/third_party/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/third_party/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/views/index.html b/application/views/index.html deleted file mode 100644 index c942a79c..00000000 --- a/application/views/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - \ No newline at end of file diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php deleted file mode 100644 index 0bf5a8d2..00000000 --- a/application/views/welcome_message.php +++ /dev/null @@ -1,88 +0,0 @@ - - - - - Welcome to CodeIgniter - - - - - -
      -

      Welcome to CodeIgniter!

      - -
      -

      The page you are looking at is being generated dynamically by CodeIgniter.

      - -

      If you would like to edit this page you'll find it located at:

      - application/views/welcome_message.php - -

      The corresponding controller for this page is found at:

      - application/controllers/welcome.php - -

      If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.

      -
      - -

      Page rendered in {elapsed_time} seconds

      -
      - - - \ No newline at end of file diff --git a/system/database/drivers/cubrid/cubrid_driver.php b/system/database/drivers/cubrid/cubrid_driver.php index ef0b5b45..9b5d86aa 100644 --- a/system/database/drivers/cubrid/cubrid_driver.php +++ b/system/database/drivers/cubrid/cubrid_driver.php @@ -545,7 +545,7 @@ function _from_tables($tables) */ function _insert($table, $keys, $values) { - return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + return "INSERT INTO ".$table." (\"".implode('\", \"', $keys)."\") VALUES (".implode(', ', $values).")"; } // -------------------------------------------------------------------- @@ -564,7 +564,7 @@ function _insert($table, $keys, $values) */ function _replace($table, $keys, $values) { - return "REPLACE INTO ".$table." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")"; + return "REPLACE INTO ".$table." (\"".implode('", "', $keys)."\") VALUES (".implode(', ', $values).")"; } // -------------------------------------------------------------------- @@ -582,7 +582,7 @@ function _replace($table, $keys, $values) */ function _insert_batch($table, $keys, $values) { - return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values); + return "INSERT INTO ".$table." (\"".implode('", "', $keys)."\") VALUES ".implode(', ', $values); } // -------------------------------------------------------------------- @@ -605,7 +605,7 @@ function _update($table, $values, $where, $orderby = array(), $limit = FALSE) { foreach ($values as $key => $val) { - $valstr[] = $key . ' = ' . $val; + $valstr[] = sprintf('"%s" = %s', $key, $val); } $limit = ( ! $limit) ? '' : ' LIMIT '.$limit; diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php index c2c553f2..1de0db10 100644 --- a/system/database/drivers/cubrid/cubrid_forge.php +++ b/system/database/drivers/cubrid/cubrid_forge.php @@ -81,7 +81,7 @@ function _process_fields($fields) { $attributes = array_change_key_case($attributes, CASE_UPPER); - $sql .= "\n\t".$this->db->_protect_identifiers($field); + $sql .= "\n\t\"".$this->db->_protect_identifiers($field) . "\""; if (array_key_exists('NAME', $attributes)) { @@ -203,7 +203,7 @@ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) $key = array($key_name); } - $sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")"; + $sql .= ",\n\tKEY \"{$key_name}\" (" . implode(', ', $key) . ")"; } } From 8f5b35429f4276bdfe715ad3615e376eb1218001 Mon Sep 17 00:00:00 2001 From: "jondavidjohn(work)" Date: Wed, 10 Aug 2011 10:22:07 -0500 Subject: [PATCH 2525/2544] Added "date" Form Validation rule to check date validity and format including documentation --- .../language/english/form_validation_lang.php | 1 + system/libraries/Form_validation.php | 50 +++++++++++++++++++ user_guide/libraries/form_validation.html | 7 +++ 3 files changed, 58 insertions(+) mode change 100644 => 100755 system/libraries/Form_validation.php diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php index 3418f29a..9f2957d9 100644 --- a/system/language/english/form_validation_lang.php +++ b/system/language/english/form_validation_lang.php @@ -23,6 +23,7 @@ $lang['decimal'] = "The %s field must contain a decimal number."; $lang['less_than'] = "The %s field must contain a number less than %s."; $lang['greater_than'] = "The %s field must contain a number greater than %s."; +$lang['date'] = "The %s field must contain a valid date, correctly formatted."; /* End of file form_validation_lang.php */ diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php old mode 100644 new mode 100755 index fd95d76f..05a7d360 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1373,6 +1373,56 @@ public function encode_php_tags($str) { return str_replace(array(''), array('<?php', '<?PHP', '<?', '?>'), $str); } + + + // -------------------------------------------------------------------- + + /** + * Check date format and validity + * + * @access public + * @param string (date) + * @param string (format) + * @return string + * @author jondavidjohn + */ + function date($str,$format) + { + $search = array( + '/[yY]/', + '/[mM]/', + '/[dD]/', + ); + + $replace = array( + '(?P[0-9]{4})', + '(?P[0-9]{1,2})', + '(?P[0-9]{1,2})', + ); + + $pattern = preg_replace($search, $replace, $format); + $pattern = str_replace('/','\/',$pattern); + + if (preg_match('/^' . $pattern . '$/', $str, $match)) + { + $year = $match['year']; + $month = $match['month']; + $day = $match['day']; + + if(checkdate($month,$day,$year)) + { + return TRUE; + } + else + { + return FALSE; + } + } + else + { + return FALSE; + } + } } // END Form Validation Class diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index bba8f507..f32ce695 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -952,6 +952,13 @@

      Rule Reference

      Returns FALSE if the form element is not unique to the table and field name in the parameter. is_unique[table.field] + + + date + Yes + Returns FALSE if the input format does not match the format and check as a valid date, including date delimiters ( . / - ). (format character case has no effect) + date[y-m-d] date[M.Y.D] date[d/M/y] + min_length From 66a3677649db1706c4e59830ffd368320d6327a8 Mon Sep 17 00:00:00 2001 From: "jondavidjohn(work)" Date: Wed, 10 Aug 2011 10:38:06 -0500 Subject: [PATCH 2526/2544] Updated Form Validation set_message() to support arrays similar to set_rules() --- system/libraries/Form_validation.php | 9 +++++++++ user_guide/libraries/form_validation.html | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index 05a7d360..ae0f1add 100755 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -168,6 +168,15 @@ public function set_message($lang, $val = '') { $lang = array($lang => $val); } + else + { + $new_lang = array(); + foreach($lang as $l) + { + $new_lang[$l['rule']] = $l['message']; + } + $lang = $new_lang; + } $this->_error_messages = array_merge($this->_error_messages, $lang); diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index f32ce695..35b8a6dc 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -586,6 +586,22 @@

      Setting Error Messages

      $this->form_validation->set_message('required', 'Your custom message here'); +

      You can also set custom messages with arrays, in the same way you set rules. Use the following structure:

      + From 664a9357cd36be2f8e673cae3643318a695de5fb Mon Sep 17 00:00:00 2001 From: Shane Pearson Date: Wed, 10 Aug 2011 16:02:32 -0500 Subject: [PATCH 2527/2544] 404_override route now works for missing controllers in subdirectories and functions that fail the security check in CodeIgniter.php --- system/core/CodeIgniter.php | 20 +++++++++++++++++++- system/core/Router.php | 15 ++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 03b25ab9..b4944900 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -267,7 +267,25 @@ function &get_instance() OR in_array(strtolower($method), array_map('strtolower', get_class_methods('CI_Controller'))) ) { - show_404("{$class}/{$method}"); + if ( ! empty($RTR->routes['404_override'])) + { + $x = explode('/', $RTR->routes['404_override']); + $class = $x[0]; + $method = (isset($x[1]) ? $x[1] : 'index'); + if ( ! class_exists($class)) + { + if ( ! file_exists(APPPATH.'controllers/'.$class.'.php')) + { + show_404("{$class}/{$method}"); + } + + include_once(APPPATH.'controllers/'.$class.'.php'); + } + } + else + { + show_404("{$class}/{$method}"); + } } /* diff --git a/system/core/Router.php b/system/core/Router.php index 5e92a04b..668ac095 100644 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -244,7 +244,20 @@ function _validate_request($segments) // Does the requested controller exist in the sub-folder? if ( ! file_exists(APPPATH.'controllers/'.$this->fetch_directory().$segments[0].'.php')) { - show_404($this->fetch_directory().$segments[0]); + if ( ! empty($this->routes['404_override'])) + { + $x = explode('/', $this->routes['404_override']); + + $this->set_directory(''); + $this->set_class($x[0]); + $this->set_method(isset($x[1]) ? $x[1] : 'index'); + + return $x; + } + else + { + show_404($this->fetch_directory().$segments[0]); + } } } else From 6adfe636980da3a7b25e5b87ed8bcd1d008a1243 Mon Sep 17 00:00:00 2001 From: Shane Pearson Date: Wed, 10 Aug 2011 16:42:53 -0500 Subject: [PATCH 2528/2544] Reset loaded files arrays in the Loader so the 404_override controller can access autoloaded libraries. If a controller exists but a method is not found the current $CI instance is unset and a new one is created for the 404 override controller. Any autoloaded libraries will not be available to the 404 override controller because the Loader sees them as already have been loaded. To fix this we need to reset the loader. I implemented it via an initialize function that resets the loaded files arrays and then calls the autoloader. This also simplifies things in CI_Controller because it only has to call one loader function instead. --- system/core/Controller.php | 2 +- system/core/Loader.php | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/system/core/Controller.php b/system/core/Controller.php index ec86b792..fddb81e1 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -48,7 +48,7 @@ public function __construct() $this->load =& load_class('Loader', 'core'); - $this->load->set_base_classes()->ci_autoloader(); + $this->load->initialize(); log_message('debug', "Controller Class Initialized"); } diff --git a/system/core/Loader.php b/system/core/Loader.php index 7c8b298a..2b36c1ca 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -62,17 +62,22 @@ public function __construct() // -------------------------------------------------------------------- /** - * Set _base_classes variable + * Initialize the Loader * * This method is called once in CI_Controller. * * @param array * @return object */ - public function set_base_classes() + public function initialize() { + $this->_ci_classes = array(); + $this->_ci_loaded_files = array(); + $this->_ci_models = array(); $this->_base_classes =& is_loaded(); - + + $this->_ci_autoloader(); + return $this; } @@ -1020,23 +1025,19 @@ 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. - * However, there is no reason you should ever needs to use it. - * * @param array * @return void */ - public function ci_autoloader() + private function _ci_autoloader() { if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php')) { - include_once(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'); + include(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'); } else { - include_once(APPPATH.'config/autoload.php'); + include(APPPATH.'config/autoload.php'); } - if ( ! isset($autoload)) { From 3c0801daa812a46b45146c54d905f089d4482976 Mon Sep 17 00:00:00 2001 From: Shane Pearson Date: Wed, 10 Aug 2011 20:27:24 -0500 Subject: [PATCH 2529/2544] Adding a note to the changelog about 404_override --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide/changelog.html b/user_guide/changelog.html index a50ea31a..e0cefc31 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -106,6 +106,7 @@

      Bug fixes for 2.0.3

    82. Fixed a bug (Core #340) where when passing in the second parameter to $this->db->select(), column names in subsequent queries would not be properly escaped.
    83. Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.
    84. Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.
      85. +
    85. Fixed a bug (Reactor #19) where 1) the 404_override route was being ignored in some cases, and 2) auto-loaded libraries were not available to the 404_override controller when a controller existed but the requested method did not.

      86. Version 2.0.2

      From 2ab2b1e3201a1eca2954ca463df744d5cd2e46cd Mon Sep 17 00:00:00 2001 From: Esen Sagynov Date: Thu, 11 Aug 2011 00:41:16 -0700 Subject: [PATCH 2530/2544] Added back /application/* files (removed in previous commit accidently). Corrected formatting/indenting in CUBRID Driver classes. Added myself as the driver author. Applied the MySQL fix, previously accepted in pull request #29, to CUBRID Driver. --- application/cache/.htaccess | 1 + application/cache/index.html | 10 + application/config/autoload.php | 116 ++++++ application/config/config.php | 362 ++++++++++++++++++ application/config/constants.php | 41 ++ application/config/database.php | 68 ++++ application/config/doctypes.php | 15 + application/config/foreign_chars.php | 64 ++++ application/config/hooks.php | 16 + application/config/index.html | 10 + application/config/mimes.php | 106 +++++ application/config/profiler.php | 17 + application/config/routes.php | 46 +++ application/config/smileys.php | 66 ++++ application/config/user_agents.php | 178 +++++++++ application/controllers/index.html | 10 + application/controllers/welcome.php | 27 ++ application/core/index.html | 10 + application/errors/error_404.php | 62 +++ application/errors/error_db.php | 62 +++ application/errors/error_general.php | 62 +++ application/errors/error_php.php | 10 + application/errors/index.html | 10 + application/helpers/index.html | 10 + application/hooks/index.html | 10 + application/index.html | 10 + application/language/english/index.html | 10 + application/libraries/index.html | 10 + application/logs/index.html | 10 + application/models/index.html | 10 + application/third_party/index.html | 10 + application/views/index.html | 10 + application/views/welcome_message.php | 88 +++++ .../database/drivers/cubrid/cubrid_driver.php | 98 +++-- .../database/drivers/cubrid/cubrid_forge.php | 20 +- .../database/drivers/cubrid/cubrid_result.php | 15 +- .../drivers/cubrid/cubrid_utility.php | 7 +- 37 files changed, 1628 insertions(+), 59 deletions(-) create mode 100644 application/cache/.htaccess create mode 100644 application/cache/index.html create mode 100644 application/config/autoload.php create mode 100644 application/config/config.php create mode 100644 application/config/constants.php create mode 100644 application/config/database.php create mode 100644 application/config/doctypes.php create mode 100644 application/config/foreign_chars.php create mode 100644 application/config/hooks.php create mode 100644 application/config/index.html create mode 100644 application/config/mimes.php create mode 100644 application/config/profiler.php create mode 100644 application/config/routes.php create mode 100644 application/config/smileys.php create mode 100644 application/config/user_agents.php create mode 100644 application/controllers/index.html create mode 100644 application/controllers/welcome.php create mode 100644 application/core/index.html create mode 100644 application/errors/error_404.php create mode 100644 application/errors/error_db.php create mode 100644 application/errors/error_general.php create mode 100644 application/errors/error_php.php create mode 100644 application/errors/index.html create mode 100644 application/helpers/index.html create mode 100644 application/hooks/index.html create mode 100644 application/index.html create mode 100644 application/language/english/index.html create mode 100644 application/libraries/index.html create mode 100644 application/logs/index.html create mode 100644 application/models/index.html create mode 100644 application/third_party/index.html create mode 100644 application/views/index.html create mode 100644 application/views/welcome_message.php diff --git a/application/cache/.htaccess b/application/cache/.htaccess new file mode 100644 index 00000000..3418e55a --- /dev/null +++ b/application/cache/.htaccess @@ -0,0 +1 @@ +deny from all \ No newline at end of file diff --git a/application/cache/index.html b/application/cache/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/cache/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/config/autoload.php b/application/config/autoload.php new file mode 100644 index 00000000..53129c9c --- /dev/null +++ b/application/config/autoload.php @@ -0,0 +1,116 @@ + '', + 'xhtml1-strict' => '', + 'xhtml1-trans' => '', + 'xhtml1-frame' => '', + 'html5' => '', + 'html4-strict' => '', + 'html4-trans' => '', + 'html4-frame' => '' + ); + +/* End of file doctypes.php */ +/* Location: ./application/config/doctypes.php */ \ No newline at end of file diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php new file mode 100644 index 00000000..14b0d737 --- /dev/null +++ b/application/config/foreign_chars.php @@ -0,0 +1,64 @@ + 'ae', + '/ö|Å“/' => 'oe', + '/ü/' => 'ue', + '/Ä/' => 'Ae', + '/Ãœ/' => 'Ue', + '/Ö/' => 'Oe', + '/À|Ã|Â|Ã|Ä|Ã…|Ǻ|Ä€|Ä‚|Ä„|Ç/' => 'A', + '/à|á|â|ã|Ã¥|Ç»|Ä|ă|Ä…|ÇŽ|ª/' => 'a', + '/Ç|Ć|Ĉ|ÄŠ|ÄŒ/' => 'C', + '/ç|ć|ĉ|Ä‹|Ä/' => 'c', + '/Ã|ÄŽ|Ä/' => 'D', + '/ð|Ä|Ä‘/' => 'd', + '/È|É|Ê|Ë|Ä’|Ä”|Ä–|Ę|Äš/' => 'E', + '/è|é|ê|ë|Ä“|Ä•|Ä—|Ä™|Ä›/' => 'e', + '/Äœ|Äž|Ä |Ä¢/' => 'G', + '/Ä|ÄŸ|Ä¡|Ä£/' => 'g', + '/Ĥ|Ħ/' => 'H', + '/Ä¥|ħ/' => 'h', + '/ÃŒ|Ã|ÃŽ|Ã|Ĩ|Ī|Ĭ|Ç|Ä®|Ä°/' => 'I', + '/ì|í|î|ï|Ä©|Ä«|Ä­|Ç|į|ı/' => 'i', + '/Ä´/' => 'J', + '/ĵ/' => 'j', + '/Ķ/' => 'K', + '/Ä·/' => 'k', + '/Ĺ|Ä»|Ľ|Ä¿|Å/' => 'L', + '/ĺ|ļ|ľ|Å€|Å‚/' => 'l', + '/Ñ|Ń|Å…|Ň/' => 'N', + '/ñ|Å„|ņ|ň|ʼn/' => 'n', + '/Ã’|Ó|Ô|Õ|ÅŒ|ÅŽ|Ç‘|Å|Æ |Ø|Ǿ/' => 'O', + '/ò|ó|ô|õ|Å|Å|Ç’|Å‘|Æ¡|ø|Ç¿|º/' => 'o', + '/Å”|Å–|Ř/' => 'R', + '/Å•|Å—|Å™/' => 'r', + '/Åš|Åœ|Åž|Å /' => 'S', + '/Å›|Å|ÅŸ|Å¡|Å¿/' => 's', + '/Å¢|Ť|Ŧ/' => 'T', + '/Å£|Å¥|ŧ/' => 't', + '/Ù|Ú|Û|Ũ|Ū|Ŭ|Å®|Å°|Ų|Ư|Ç“|Ç•|Ç—|Ç™|Ç›/' => 'U', + '/ù|ú|û|Å©|Å«|Å­|ů|ű|ų|Æ°|Ç”|Ç–|ǘ|Çš|Çœ/' => 'u', + '/Ã|Ÿ|Ŷ/' => 'Y', + '/ý|ÿ|Å·/' => 'y', + '/Å´/' => 'W', + '/ŵ/' => 'w', + '/Ź|Å»|Ž/' => 'Z', + '/ź|ż|ž/' => 'z', + '/Æ|Ǽ/' => 'AE', + '/ß/'=> 'ss', + '/IJ/' => 'IJ', + '/ij/' => 'ij', + '/Å’/' => 'OE', + '/Æ’/' => 'f' +); + +/* End of file foreign_chars.php */ +/* Location: ./application/config/foreign_chars.php */ \ No newline at end of file diff --git a/application/config/hooks.php b/application/config/hooks.php new file mode 100644 index 00000000..a4ad2be6 --- /dev/null +++ b/application/config/hooks.php @@ -0,0 +1,16 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/config/mimes.php b/application/config/mimes.php new file mode 100644 index 00000000..8065794f --- /dev/null +++ b/application/config/mimes.php @@ -0,0 +1,106 @@ + 'application/mac-binhex40', + 'cpt' => 'application/mac-compactpro', + 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), + 'bin' => 'application/macbinary', + 'dms' => 'application/octet-stream', + 'lha' => 'application/octet-stream', + 'lzh' => 'application/octet-stream', + 'exe' => array('application/octet-stream', 'application/x-msdownload'), + 'class' => 'application/octet-stream', + 'psd' => 'application/x-photoshop', + 'so' => 'application/octet-stream', + 'sea' => 'application/octet-stream', + 'dll' => 'application/octet-stream', + 'oda' => 'application/oda', + 'pdf' => array('application/pdf', 'application/x-download'), + 'ai' => 'application/postscript', + 'eps' => 'application/postscript', + 'ps' => 'application/postscript', + 'smi' => 'application/smil', + 'smil' => 'application/smil', + 'mif' => 'application/vnd.mif', + 'xls' => array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'), + 'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'), + 'wbxml' => 'application/wbxml', + 'wmlc' => 'application/wmlc', + 'dcr' => 'application/x-director', + 'dir' => 'application/x-director', + 'dxr' => 'application/x-director', + 'dvi' => 'application/x-dvi', + 'gtar' => 'application/x-gtar', + 'gz' => 'application/x-gzip', + 'php' => 'application/x-httpd-php', + 'php4' => 'application/x-httpd-php', + 'php3' => 'application/x-httpd-php', + 'phtml' => 'application/x-httpd-php', + 'phps' => 'application/x-httpd-php-source', + 'js' => 'application/x-javascript', + 'swf' => 'application/x-shockwave-flash', + 'sit' => 'application/x-stuffit', + 'tar' => 'application/x-tar', + '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'), + 'mid' => 'audio/midi', + 'midi' => 'audio/midi', + 'mpga' => 'audio/mpeg', + 'mp2' => 'audio/mpeg', + 'mp3' => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'), + 'aif' => 'audio/x-aiff', + 'aiff' => 'audio/x-aiff', + 'aifc' => 'audio/x-aiff', + 'ram' => 'audio/x-pn-realaudio', + 'rm' => 'audio/x-pn-realaudio', + 'rpm' => 'audio/x-pn-realaudio-plugin', + 'ra' => 'audio/x-realaudio', + 'rv' => 'video/vnd.rn-realvideo', + 'wav' => 'audio/x-wav', + 'bmp' => 'image/bmp', + 'gif' => 'image/gif', + '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'), + 'tiff' => 'image/tiff', + 'tif' => 'image/tiff', + 'css' => 'text/css', + 'html' => 'text/html', + 'htm' => 'text/html', + 'shtml' => 'text/html', + 'txt' => 'text/plain', + 'text' => 'text/plain', + 'log' => array('text/plain', 'text/x-log'), + 'rtx' => 'text/richtext', + 'rtf' => 'text/rtf', + 'xml' => 'text/xml', + 'xsl' => 'text/xml', + 'mpeg' => 'video/mpeg', + 'mpg' => 'video/mpeg', + 'mpe' => 'video/mpeg', + 'qt' => 'video/quicktime', + 'mov' => 'video/quicktime', + 'avi' => 'video/x-msvideo', + 'movie' => 'video/x-sgi-movie', + 'doc' => 'application/msword', + 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'word' => array('application/msword', 'application/octet-stream'), + 'xl' => 'application/excel', + 'eml' => 'message/rfc822', + 'json' => array('application/json', 'text/json') + ); + + +/* End of file mimes.php */ +/* Location: ./application/config/mimes.php */ \ No newline at end of file diff --git a/application/config/profiler.php b/application/config/profiler.php new file mode 100644 index 00000000..f8a5b1a1 --- /dev/null +++ b/application/config/profiler.php @@ -0,0 +1,17 @@ + array('grin.gif', '19', '19', 'grin'), + ':lol:' => array('lol.gif', '19', '19', 'LOL'), + ':cheese:' => array('cheese.gif', '19', '19', 'cheese'), + ':)' => array('smile.gif', '19', '19', 'smile'), + ';-)' => array('wink.gif', '19', '19', 'wink'), + ';)' => array('wink.gif', '19', '19', 'wink'), + ':smirk:' => array('smirk.gif', '19', '19', 'smirk'), + ':roll:' => array('rolleyes.gif', '19', '19', 'rolleyes'), + ':-S' => array('confused.gif', '19', '19', 'confused'), + ':wow:' => array('surprise.gif', '19', '19', 'surprised'), + ':bug:' => array('bigsurprise.gif', '19', '19', 'big surprise'), + ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'), + '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'), + ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'), + ':P' => array('raspberry.gif', '19', '19', 'raspberry'), + ':blank:' => array('blank.gif', '19', '19', 'blank stare'), + ':long:' => array('longface.gif', '19', '19', 'long face'), + ':ohh:' => array('ohh.gif', '19', '19', 'ohh'), + ':grrr:' => array('grrr.gif', '19', '19', 'grrr'), + ':gulp:' => array('gulp.gif', '19', '19', 'gulp'), + '8-/' => array('ohoh.gif', '19', '19', 'oh oh'), + ':down:' => array('downer.gif', '19', '19', 'downer'), + ':red:' => array('embarrassed.gif', '19', '19', 'red face'), + ':sick:' => array('sick.gif', '19', '19', 'sick'), + ':shut:' => array('shuteye.gif', '19', '19', 'shut eye'), + ':-/' => array('hmm.gif', '19', '19', 'hmmm'), + '>:(' => array('mad.gif', '19', '19', 'mad'), + ':mad:' => array('mad.gif', '19', '19', 'mad'), + '>:-(' => array('angry.gif', '19', '19', 'angry'), + ':angry:' => array('angry.gif', '19', '19', 'angry'), + ':zip:' => array('zip.gif', '19', '19', 'zipper'), + ':kiss:' => array('kiss.gif', '19', '19', 'kiss'), + ':ahhh:' => array('shock.gif', '19', '19', 'shock'), + ':coolsmile:' => array('shade_smile.gif', '19', '19', 'cool smile'), + ':coolsmirk:' => array('shade_smirk.gif', '19', '19', 'cool smirk'), + ':coolgrin:' => array('shade_grin.gif', '19', '19', 'cool grin'), + ':coolhmm:' => array('shade_hmm.gif', '19', '19', 'cool hmm'), + ':coolmad:' => array('shade_mad.gif', '19', '19', 'cool mad'), + ':coolcheese:' => array('shade_cheese.gif', '19', '19', 'cool cheese'), + ':vampire:' => array('vampire.gif', '19', '19', 'vampire'), + ':snake:' => array('snake.gif', '19', '19', 'snake'), + ':exclaim:' => array('exclaim.gif', '19', '19', 'excaim'), + ':question:' => array('question.gif', '19', '19', 'question') // no comma after last item + + ); + +/* End of file smileys.php */ +/* Location: ./application/config/smileys.php */ \ No newline at end of file diff --git a/application/config/user_agents.php b/application/config/user_agents.php new file mode 100644 index 00000000..e2d3c3af --- /dev/null +++ b/application/config/user_agents.php @@ -0,0 +1,178 @@ + 'Windows Longhorn', + 'windows nt 5.2' => 'Windows 2003', + 'windows nt 5.0' => 'Windows 2000', + 'windows nt 5.1' => 'Windows XP', + 'windows nt 4.0' => 'Windows NT 4.0', + 'winnt4.0' => 'Windows NT 4.0', + 'winnt 4.0' => 'Windows NT', + 'winnt' => 'Windows NT', + 'windows 98' => 'Windows 98', + 'win98' => 'Windows 98', + 'windows 95' => 'Windows 95', + 'win95' => 'Windows 95', + 'windows' => 'Unknown Windows OS', + 'os x' => 'Mac OS X', + 'ppc mac' => 'Power PC Mac', + 'freebsd' => 'FreeBSD', + 'ppc' => 'Macintosh', + 'linux' => 'Linux', + 'debian' => 'Debian', + 'sunos' => 'Sun Solaris', + 'beos' => 'BeOS', + 'apachebench' => 'ApacheBench', + 'aix' => 'AIX', + 'irix' => 'Irix', + 'osf' => 'DEC OSF', + 'hp-ux' => 'HP-UX', + 'netbsd' => 'NetBSD', + 'bsdi' => 'BSDi', + 'openbsd' => 'OpenBSD', + 'gnu' => 'GNU/Linux', + 'unix' => 'Unknown Unix OS' + ); + + +// The order of this array should NOT be changed. Many browsers return +// multiple browser types so we want to identify the sub-type first. +$browsers = array( + 'Flock' => 'Flock', + 'Chrome' => 'Chrome', + 'Opera' => 'Opera', + 'MSIE' => 'Internet Explorer', + 'Internet Explorer' => 'Internet Explorer', + 'Shiira' => 'Shiira', + 'Firefox' => 'Firefox', + 'Chimera' => 'Chimera', + 'Phoenix' => 'Phoenix', + 'Firebird' => 'Firebird', + 'Camino' => 'Camino', + 'Netscape' => 'Netscape', + 'OmniWeb' => 'OmniWeb', + 'Safari' => 'Safari', + 'Mozilla' => 'Mozilla', + 'Konqueror' => 'Konqueror', + 'icab' => 'iCab', + 'Lynx' => 'Lynx', + 'Links' => 'Links', + 'hotjava' => 'HotJava', + 'amaya' => 'Amaya', + 'IBrowse' => 'IBrowse' + ); + +$mobiles = array( + // legacy array, old values commented out + 'mobileexplorer' => 'Mobile Explorer', +// 'openwave' => 'Open Wave', +// 'opera mini' => 'Opera Mini', +// 'operamini' => 'Opera Mini', +// 'elaine' => 'Palm', + 'palmsource' => 'Palm', +// 'digital paths' => 'Palm', +// 'avantgo' => 'Avantgo', +// 'xiino' => 'Xiino', + 'palmscape' => 'Palmscape', +// 'nokia' => 'Nokia', +// 'ericsson' => 'Ericsson', +// 'blackberry' => 'BlackBerry', +// 'motorola' => 'Motorola' + + // Phones and Manufacturers + 'motorola' => "Motorola", + 'nokia' => "Nokia", + 'palm' => "Palm", + 'iphone' => "Apple iPhone", + 'ipad' => "iPad", + 'ipod' => "Apple iPod Touch", + 'sony' => "Sony Ericsson", + 'ericsson' => "Sony Ericsson", + 'blackberry' => "BlackBerry", + 'cocoon' => "O2 Cocoon", + 'blazer' => "Treo", + 'lg' => "LG", + 'amoi' => "Amoi", + 'xda' => "XDA", + 'mda' => "MDA", + 'vario' => "Vario", + 'htc' => "HTC", + 'samsung' => "Samsung", + 'sharp' => "Sharp", + 'sie-' => "Siemens", + 'alcatel' => "Alcatel", + 'benq' => "BenQ", + 'ipaq' => "HP iPaq", + 'mot-' => "Motorola", + 'playstation portable' => "PlayStation Portable", + 'hiptop' => "Danger Hiptop", + 'nec-' => "NEC", + 'panasonic' => "Panasonic", + 'philips' => "Philips", + 'sagem' => "Sagem", + 'sanyo' => "Sanyo", + 'spv' => "SPV", + 'zte' => "ZTE", + 'sendo' => "Sendo", + + // Operating Systems + 'symbian' => "Symbian", + 'SymbianOS' => "SymbianOS", + 'elaine' => "Palm", + 'palm' => "Palm", + 'series60' => "Symbian S60", + 'windows ce' => "Windows CE", + + // Browsers + 'obigo' => "Obigo", + 'netfront' => "Netfront Browser", + 'openwave' => "Openwave Browser", + 'mobilexplorer' => "Mobile Explorer", + 'operamini' => "Opera Mini", + 'opera mini' => "Opera Mini", + + // Other + 'digital paths' => "Digital Paths", + 'avantgo' => "AvantGo", + 'xiino' => "Xiino", + 'novarra' => "Novarra Transcoder", + 'vodafone' => "Vodafone", + 'docomo' => "NTT DoCoMo", + 'o2' => "O2", + + // Fallback + 'mobile' => "Generic Mobile", + 'wireless' => "Generic Mobile", + 'j2me' => "Generic Mobile", + 'midp' => "Generic Mobile", + 'cldc' => "Generic Mobile", + 'up.link' => "Generic Mobile", + 'up.browser' => "Generic Mobile", + 'smartphone' => "Generic Mobile", + 'cellphone' => "Generic Mobile" + ); + +// There are hundreds of bots but these are the most common. +$robots = array( + 'googlebot' => 'Googlebot', + 'msnbot' => 'MSNBot', + 'slurp' => 'Inktomi Slurp', + 'yahoo' => 'Yahoo', + 'askjeeves' => 'AskJeeves', + 'fastcrawler' => 'FastCrawler', + 'infoseek' => 'InfoSeek Robot 1.0', + 'lycos' => 'Lycos' + ); + +/* End of file user_agents.php */ +/* Location: ./application/config/user_agents.php */ \ No newline at end of file diff --git a/application/controllers/index.html b/application/controllers/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/controllers/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php new file mode 100644 index 00000000..21bef43d --- /dev/null +++ b/application/controllers/welcome.php @@ -0,0 +1,27 @@ + + * @see http://codeigniter.com/user_guide/general/urls.html + */ + public function index() + { + $this->load->view('welcome_message'); + } +} + +/* End of file welcome.php */ +/* Location: ./application/controllers/welcome.php */ \ No newline at end of file diff --git a/application/core/index.html b/application/core/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/core/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/errors/error_404.php b/application/errors/error_404.php new file mode 100644 index 00000000..792726a6 --- /dev/null +++ b/application/errors/error_404.php @@ -0,0 +1,62 @@ + + + +404 Page Not Found + + + +
      +

      + +
      + + \ No newline at end of file diff --git a/application/errors/error_db.php b/application/errors/error_db.php new file mode 100644 index 00000000..b396cda9 --- /dev/null +++ b/application/errors/error_db.php @@ -0,0 +1,62 @@ + + + +Database Error + + + +
      +

      + +
      + + \ No newline at end of file diff --git a/application/errors/error_general.php b/application/errors/error_general.php new file mode 100644 index 00000000..fd63ce2c --- /dev/null +++ b/application/errors/error_general.php @@ -0,0 +1,62 @@ + + + +Error + + + +
      +

      + +
      + + \ No newline at end of file diff --git a/application/errors/error_php.php b/application/errors/error_php.php new file mode 100644 index 00000000..f085c203 --- /dev/null +++ b/application/errors/error_php.php @@ -0,0 +1,10 @@ +
      + +

      A PHP Error was encountered

      + +

      Severity:

      +

      Message:

      +

      Filename:

      +

      Line Number:

      + +
      \ No newline at end of file diff --git a/application/errors/index.html b/application/errors/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/errors/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/helpers/index.html b/application/helpers/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/helpers/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/hooks/index.html b/application/hooks/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/hooks/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/index.html b/application/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/language/english/index.html b/application/language/english/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/language/english/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/libraries/index.html b/application/libraries/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/libraries/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/logs/index.html b/application/logs/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/logs/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/models/index.html b/application/models/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/models/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/third_party/index.html b/application/third_party/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/third_party/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/views/index.html b/application/views/index.html new file mode 100644 index 00000000..c942a79c --- /dev/null +++ b/application/views/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

      Directory access is forbidden.

      + + + \ No newline at end of file diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php new file mode 100644 index 00000000..0bf5a8d2 --- /dev/null +++ b/application/views/welcome_message.php @@ -0,0 +1,88 @@ + + + + + Welcome to CodeIgniter + + + + + +
      +

      Welcome to CodeIgniter!

      + +
      +

      The page you are looking at is being generated dynamically by CodeIgniter.

      + +

      If you would like to edit this page you'll find it located at:

      + application/views/welcome_message.php + +

      The corresponding controller for this page is found at:

      + application/controllers/welcome.php + +

      If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.

      +
      + +

      Page rendered in {elapsed_time} seconds

      +
      + + + \ No newline at end of file diff --git a/system/database/drivers/cubrid/cubrid_driver.php b/system/database/drivers/cubrid/cubrid_driver.php index 9b5d86aa..3f010924 100644 --- a/system/database/drivers/cubrid/cubrid_driver.php +++ b/system/database/drivers/cubrid/cubrid_driver.php @@ -1,4 +1,4 @@ -port == '') { $this->port = self::DEFAULT_PORT; - } - - $conn = cubrid_connect($this->hostname, $this->port, $this->database, $this->username, $this->password); - - if ($conn){ - if (isset($this->auto_commit) && !$this->auto_commit){ - cubrid_set_autocommit($conn, CUBRID_AUTOCOMMIT_FALSE); - } - else{ - cubrid_set_autocommit($conn, CUBRID_AUTOCOMMIT_TRUE); - $this->auto_commit = TRUE; - } - } - - return $conn; + } + + $conn = cubrid_connect($this->hostname, $this->port, $this->database, $this->username, $this->password); + + if ($conn) + { + // Check if a user wants to run queries in dry, i.e. run the + // queries but not commit them. + if (isset($this->auto_commit) && ! $this->auto_commit) + { + cubrid_set_autocommit($conn, CUBRID_AUTOCOMMIT_FALSE); + } + else + { + cubrid_set_autocommit($conn, CUBRID_AUTOCOMMIT_TRUE); + $this->auto_commit = TRUE; + } + } + + return $conn; } // -------------------------------------------------------------------- @@ -131,8 +137,7 @@ function db_select() // In CUBRID there is no need to select a database as the database // is chosen at the connection time. // So, to determine if the database is "selected", all we have to - // do is return the connection identifier which can be later - // checked if it has been established or not. + // do is ping the server and return that value. return cubrid_ping($this->conn_id); } @@ -155,7 +160,7 @@ function db_set_charset($charset, $collation) } // -------------------------------------------------------------------- - + /** * Version number query string * @@ -164,6 +169,11 @@ function db_set_charset($charset, $collation) */ function _version() { + // To obtain the CUBRID Server version, no need to run the SQL query. + // CUBRID PHP API provides a function to determin this value. + // This is why we also need to add 'cubrid' value to the list of + // $driver_version_exceptions array in DB_driver class in + // version() function. return cubrid_get_server_info($this->conn_id); } @@ -195,6 +205,7 @@ function _execute($sql) */ function _prep_query($sql) { + // No need to prepare return $sql; } @@ -224,8 +235,10 @@ function trans_begin($test_mode = FALSE) // even if the queries produce a successful result. $this->_trans_failure = ($test_mode === TRUE) ? TRUE : FALSE; - if (cubrid_get_autocommit($this->conn_id)) - cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_FALSE); + if (cubrid_get_autocommit($this->conn_id)) + { + cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_FALSE); + } return TRUE; } @@ -253,9 +266,11 @@ function trans_commit() cubrid_commit($this->conn_id); - if ($this->auto_commit && !cubrid_get_autocommit($this->conn_id)) - cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_TRUE); - + if ($this->auto_commit && ! cubrid_get_autocommit($this->conn_id)) + { + cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_TRUE); + } + return TRUE; } @@ -282,9 +297,11 @@ function trans_rollback() cubrid_rollback($this->conn_id); - if ($this->auto_commit && !cubrid_get_autocommit($this->conn_id)) - cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_TRUE); - + if ($this->auto_commit && ! cubrid_get_autocommit($this->conn_id)) + { + cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_TRUE); + } + return TRUE; } @@ -303,12 +320,12 @@ function escape_str($str, $like = FALSE) if (is_array($str)) { foreach ($str as $key => $val) - { + { $str[$key] = $this->escape_str($val, $like); - } + } - return $str; - } + return $str; + } if (function_exists('cubrid_real_escape_string') AND is_resource($this->conn_id)) { @@ -322,7 +339,6 @@ function escape_str($str, $like = FALSE) // escape LIKE condition wildcards if ($like === TRUE) { - //TODO: check this $str = str_replace(array('%', '_'), array('\\%', '\\_'), $str); } @@ -545,7 +561,7 @@ function _from_tables($tables) */ function _insert($table, $keys, $values) { - return "INSERT INTO ".$table." (\"".implode('\", \"', $keys)."\") VALUES (".implode(', ', $values).")"; + return "INSERT INTO ".$table." (\"".implode('", "', $keys)."\") VALUES (".implode(', ', $values).")"; } // -------------------------------------------------------------------- @@ -648,7 +664,7 @@ function _update_batch($table, $values, $index, $where = NULL) { if ($field != $index) { - $final[$field][] = 'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field]; + $final[$field][] = 'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field]; } } } diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php index 1de0db10..bab03f74 100644 --- a/system/database/drivers/cubrid/cubrid_forge.php +++ b/system/database/drivers/cubrid/cubrid_forge.php @@ -1,4 +1,4 @@ -db->_protect_identifiers($field) . "\""; + $sql .= "\n\t\"" . $this->db->_protect_identifiers($field) . "\""; if (array_key_exists('NAME', $attributes)) { @@ -90,7 +90,7 @@ function _process_fields($fields) if (array_key_exists('TYPE', $attributes)) { - $sql .= ' '.$attributes['TYPE']; + $sql .= ' '.$attributes['TYPE']; if (array_key_exists('CONSTRAINT', $attributes)) { @@ -125,17 +125,21 @@ function _process_fields($fields) $sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\''; } - if (array_key_exists('NULL', $attributes)) + if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE) { - $sql .= ($attributes['NULL'] === TRUE) ? '' : ' NOT NULL'; + $sql .= ' NULL'; + } + else + { + $sql .= ' NOT NULL'; } if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE) { $sql .= ' AUTO_INCREMENT'; } - - if (array_key_exists('UNIQUE', $attributes) && $attributes['UNIQUE'] === TRUE) + + if (array_key_exists('UNIQUE', $attributes) && $attributes['UNIQUE'] === TRUE) { $sql .= ' UNIQUE'; } diff --git a/system/database/drivers/cubrid/cubrid_result.php b/system/database/drivers/cubrid/cubrid_result.php index 06613e35..6f0c2b5f 100644 --- a/system/database/drivers/cubrid/cubrid_result.php +++ b/system/database/drivers/cubrid/cubrid_result.php @@ -1,4 +1,4 @@ -primary_key = ($row[0] > 0 ? 1 : null); } - else{ + else + { $F->primary_key = null; } @@ -138,9 +139,9 @@ function field_data() */ function free_result() { - if(is_resource($this->result_id) || - get_resource_type($this->result_id) == "Unknown" && - preg_match('/Resource id #/', strval($this->result_id))) + if(is_resource($this->result_id) || + get_resource_type($this->result_id) == "Unknown" && + preg_match('/Resource id #/', strval($this->result_id))) { cubrid_close_request($this->result_id); $this->result_id = FALSE; @@ -152,7 +153,7 @@ function free_result() /** * Data Seek * - * Moves the internal pointer to the desired offset. We call + * Moves the internal pointer to the desired offset. We call * this internally before fetching results to make sure the * result set starts at zero * diff --git a/system/database/drivers/cubrid/cubrid_utility.php b/system/database/drivers/cubrid/cubrid_utility.php index 9cf8b2ea..cd16d1e1 100644 --- a/system/database/drivers/cubrid/cubrid_utility.php +++ b/system/database/drivers/cubrid/cubrid_utility.php @@ -1,4 +1,4 @@ -database . "'"; } - else{ + else + { return FALSE; } } From 84dcf3d595e10dfe768923a88644434fa7bee328 Mon Sep 17 00:00:00 2001 From: "jondavidjohn(work)" Date: Thu, 11 Aug 2011 14:21:24 -0500 Subject: [PATCH 2531/2544] Addressed naming issue and default format in line with html5 date input spec --- system/language/english/form_validation_lang.php | 2 +- system/libraries/Form_validation.php | 2 +- user_guide/libraries/form_validation.html | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php index 9f2957d9..259c8661 100644 --- a/system/language/english/form_validation_lang.php +++ b/system/language/english/form_validation_lang.php @@ -23,7 +23,7 @@ $lang['decimal'] = "The %s field must contain a decimal number."; $lang['less_than'] = "The %s field must contain a number less than %s."; $lang['greater_than'] = "The %s field must contain a number greater than %s."; -$lang['date'] = "The %s field must contain a valid date, correctly formatted."; +$lang['valid_date'] = "The %s field must contain a valid date, correctly formatted."; /* End of file form_validation_lang.php */ diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index ae0f1add..77ff2133 100755 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1395,7 +1395,7 @@ public function encode_php_tags($str) * @return string * @author jondavidjohn */ - function date($str,$format) + function valid_date($str,$format = 'y-m-d') { $search = array( '/[yY]/', diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 35b8a6dc..25242749 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -970,10 +970,10 @@

      Rule Reference

      - date - Yes + valid_date + Optional - default format "y-m-d" Returns FALSE if the input format does not match the format and check as a valid date, including date delimiters ( . / - ). (format character case has no effect) - date[y-m-d] date[M.Y.D] date[d/M/y] + valid_date valid_date[M.Y.D] valid_date[d/M/y] From 22dcf66861259fcb9e30cf445d04e3f8a2468aa3 Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Thu, 11 Aug 2011 14:30:45 -0500 Subject: [PATCH 2532/2544] added space to conform to coding standards --- system/libraries/Form_validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 system/libraries/Form_validation.php diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php old mode 100755 new mode 100644 index 77ff2133..ce7fa135 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1395,7 +1395,7 @@ public function encode_php_tags($str) * @return string * @author jondavidjohn */ - function valid_date($str,$format = 'y-m-d') + function valid_date($str, $format = 'y-m-d') { $search = array( '/[yY]/', From 34c8f9df46ffebae9d9cb6251d146fdc8e7ef422 Mon Sep 17 00:00:00 2001 From: Esen Sagynov Date: Thu, 11 Aug 2011 19:47:46 -0700 Subject: [PATCH 2533/2544] Added back the /application/config/migration.php and updated the /applciation/config/database.php file which was incorrectly replaced in previous commit. --- application/config/database.php | 3 ++- application/config/migration.php | 42 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 application/config/migration.php diff --git a/application/config/database.php b/application/config/database.php index fa541a73..b4b34bf6 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -27,7 +27,8 @@ | ['char_set'] The character set used in communicating with the database | ['dbcollat'] The character collation used in communicating with the database | NOTE: For MySQL and MySQLi databases, this setting is only used -| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7. +| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7 +| (and in table creation queries made with DB Forge). | There is an incompatibility in PHP with mysql_real_escape_string() which | can make your site vulnerable to SQL injection if you are using a | multi-byte character set and are running versions lower than these. diff --git a/application/config/migration.php b/application/config/migration.php new file mode 100644 index 00000000..509fd90a --- /dev/null +++ b/application/config/migration.php @@ -0,0 +1,42 @@ +migration->latest() this is the version that schema will +| be upgraded / downgraded to. +| +*/ +$config['migration_version'] = 0; + + +/* +|-------------------------------------------------------------------------- +| Migrations Path +|-------------------------------------------------------------------------- +| +| Path to your migrations folder. +| Typically, it will be within your application path. +| Also, writing permission is required within the migrations path. +| +*/ +$config['migration_path'] = APPPATH . 'migrations/'; + + +/* End of file migration.php */ +/* Location: ./application/config/migration.php */ \ No newline at end of file From 3696ee0a858b2dbf13ef535decddc8329ab31ef7 Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Thu, 11 Aug 2011 23:49:30 -0500 Subject: [PATCH 2534/2544] Another spacing issue. --- system/libraries/Form_validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index ce7fa135..f6987a1b 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1418,7 +1418,7 @@ function valid_date($str, $format = 'y-m-d') $month = $match['month']; $day = $match['day']; - if(checkdate($month,$day,$year)) + if (checkdate($month,$day,$year)) { return TRUE; } From 1d7a2a08fb885379288db168c782a3ba0ab94a12 Mon Sep 17 00:00:00 2001 From: jondavidjohn Date: Thu, 11 Aug 2011 23:52:52 -0500 Subject: [PATCH 2535/2544] fixed lang whitespace mistake --- system/language/english/form_validation_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php index 259c8661..5da09e16 100644 --- a/system/language/english/form_validation_lang.php +++ b/system/language/english/form_validation_lang.php @@ -23,7 +23,7 @@ $lang['decimal'] = "The %s field must contain a decimal number."; $lang['less_than'] = "The %s field must contain a number less than %s."; $lang['greater_than'] = "The %s field must contain a number greater than %s."; -$lang['valid_date'] = "The %s field must contain a valid date, correctly formatted."; +$lang['valid_date'] = "The %s field must contain a valid date, correctly formatted."; /* End of file form_validation_lang.php */ From 42284b6da572282327f5aa7641803c7fa03c5a0a Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 12 Aug 2011 09:33:34 -0500 Subject: [PATCH 2536/2544] improved date rule description --- user_guide/libraries/form_validation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 25242749..a09a6662 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -972,7 +972,7 @@

      Rule Reference

      valid_date Optional - default format "y-m-d" - Returns FALSE if the input format does not match the format and check as a valid date, including date delimiters ( . / - ). (format character case has no effect) + Returns FALSE if the input format does not match the given format and then also checks that the date entered in the correct format is also valid. Formatting character's [m|y|d] case has no effect. Date formatting does NOT follow http://php.net/date formatting characters and is a simplified single character syntax valid_date valid_date[M.Y.D] valid_date[d/M/y] From b18725e9ee08d808cb9d5f54a3d6544f1965b08c Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Fri, 12 Aug 2011 09:36:52 -0500 Subject: [PATCH 2537/2544] removed redundant wording --- user_guide/libraries/form_validation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index a09a6662..8e5ec1e4 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -972,7 +972,7 @@

      Rule Reference

      valid_date Optional - default format "y-m-d" - Returns FALSE if the input format does not match the given format and then also checks that the date entered in the correct format is also valid. Formatting character's [m|y|d] case has no effect. Date formatting does NOT follow http://php.net/date formatting characters and is a simplified single character syntax + Returns FALSE if the input format does not match the given format and then also checks that the date entered is also valid. Formatting character's [m|y|d] case has no effect. Date formatting does NOT follow http://php.net/date formatting characters and is a simplified single character syntax valid_date valid_date[M.Y.D] valid_date[d/M/y] From 050abb8aa6347cb076153f44b2ea0b5f0da006c0 Mon Sep 17 00:00:00 2001 From: David Behler Date: Sun, 14 Aug 2011 20:30:50 +0200 Subject: [PATCH 2538/2544] Added some docs to CI core files --- system/core/Benchmark.php | 5 +++++ system/core/CodeIgniter.php | 12 ++++++++++++ system/core/Config.php | 15 +++++++++++++++ 3 files changed, 32 insertions(+) mode change 100644 => 100755 system/core/Benchmark.php mode change 100644 => 100755 system/core/CodeIgniter.php mode change 100644 => 100755 system/core/Config.php diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php old mode 100644 new mode 100755 index 515550e9..a200727a --- a/system/core/Benchmark.php +++ b/system/core/Benchmark.php @@ -29,6 +29,11 @@ */ class CI_Benchmark { + /** + * List of all benchmark markers and when they were added + * + * @var array + */ var $marker = array(); // -------------------------------------------------------------------- diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php old mode 100644 new mode 100755 index b4944900..7b92ddf1 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -32,6 +32,12 @@ * Define the CodeIgniter Version * ------------------------------------------------------ */ + /** + * CodeIgniter Version + * + * @var string + * + */ define('CI_VERSION', '2.0.2'); /* @@ -39,6 +45,12 @@ * Define the CodeIgniter Branch (Core = TRUE, Reactor = FALSE) * ------------------------------------------------------ */ + /** + * CodeIgniter Branch (Core = TRUE, Reactor = FALSE) + * + * @var string + * + */ define('CI_CORE', FALSE); /* diff --git a/system/core/Config.php b/system/core/Config.php old mode 100644 new mode 100755 index 1096a9ea..5cacf867 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -28,8 +28,23 @@ */ class CI_Config { + /** + * List of all loaded config values + * + * @var array + */ var $config = array(); + /** + * List of all loaded config files + * + * @var array + */ var $is_loaded = array(); + /** + * List of paths to search when trying to load a config file + * + * @var array + */ var $_config_paths = array(APPPATH); /** From 9b5df59a6be4da0016b738de8c4fcd3a14d43867 Mon Sep 17 00:00:00 2001 From: David Behler Date: Sun, 14 Aug 2011 21:04:17 +0200 Subject: [PATCH 2539/2544] Added some docs to CI core files --- system/core/Hooks.php | 15 +++++++++++ system/core/Input.php | 62 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 64 insertions(+), 13 deletions(-) mode change 100644 => 100755 system/core/Hooks.php mode change 100644 => 100755 system/core/Input.php diff --git a/system/core/Hooks.php b/system/core/Hooks.php old mode 100644 new mode 100755 index fd6380f0..33f1c034 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php @@ -28,8 +28,23 @@ */ class CI_Hooks { + /** + * Determines wether hooks are enabled + * + * @var bool + */ var $enabled = FALSE; + /** + * List of all hooks set in config/hooks.php + * + * @var array + */ var $hooks = array(); + /** + * Determines wether hook is in progress, used to prevent infinte loops + * + * @var bool + */ var $in_progress = FALSE; /** diff --git a/system/core/Input.php b/system/core/Input.php old mode 100644 new mode 100755 index dc7612e6..64d6c360 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -28,15 +28,51 @@ */ class CI_Input { + /** + * IP address of the current user + * + * @var string + */ var $ip_address = FALSE; + /** + * user agent (web browser) being used by the current user + * + * @var string + */ var $user_agent = FALSE; + /** + * If FALSE, then $_GET will be set to an empty array + * + * @var bool + */ var $_allow_get_array = TRUE; + /** + * If TRUE, then newlines are standardized + * + * @var bool + */ var $_standardize_newlines = TRUE; - var $_enable_xss = FALSE; // Set automatically based on config setting - var $_enable_csrf = FALSE; // Set automatically based on config setting - + /** + * Determines whether the XSS filter is always active when GET, POST or COOKIE data is encountered + * Set automatically based on config setting + * + * @var bool + */ + var $_enable_xss = FALSE; + /** + * Enables a CSRF cookie token to be set. + * Set automatically based on config setting + * + * @var bool + */ + var $_enable_csrf = FALSE; + /** + * List of all HTTP request headers + * + * @var array + */ protected $headers = array(); - + /** * Constructor @@ -147,7 +183,7 @@ function post($index = NULL, $xss_clean = FALSE) } return $post; } - + return $this->_fetch_from_array($_POST, $index, $xss_clean); } @@ -402,9 +438,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 +559,7 @@ function _clean_input_data($str) { $str = $this->uni->clean_string($str); } - + // Remove control characters $str = remove_invisible_characters($str); @@ -579,7 +615,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 +645,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 +669,7 @@ public function get_request_header($index, $xss_clean = FALSE) { $this->request_headers(); } - + if ( ! isset($this->headers[$index])) { return FALSE; @@ -644,7 +680,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]; } // -------------------------------------------------------------------- From 209b2cf0feac54b4e4fd4c3896524cfc65bf8a46 Mon Sep 17 00:00:00 2001 From: David Behler Date: Sun, 14 Aug 2011 23:00:43 +0200 Subject: [PATCH 2540/2544] Added some docs to CI core files --- system/core/Exceptions.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) mode change 100644 => 100755 system/core/Exceptions.php diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php old mode 100644 new mode 100755 index bff86a92..6a63ca73 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -30,8 +30,22 @@ class CI_Exceptions { var $message; var $filename; var $line; + + /** + * Nesting level of the output buffering mechanism + * Used to + * + * @var int + * @access public + */ var $ob_level; + /** + * List if available error levels + * + * @var array + * @access public + */ var $levels = array( E_ERROR => 'Error', E_WARNING => 'Warning', From cda768a957172d5da7aa7637337405c39e0f774d Mon Sep 17 00:00:00 2001 From: David Behler Date: Sun, 14 Aug 2011 23:52:48 +0200 Subject: [PATCH 2541/2544] Added some docs to CI core files --- system/core/Exceptions.php | 5 +- system/core/Input.php | 2 + system/core/Lang.php | 13 +++++ system/core/Loader.php | 102 +++++++++++++++++++++++++++++++++---- system/core/Model.php | 1 + 5 files changed, 110 insertions(+), 13 deletions(-) mode change 100644 => 100755 system/core/Lang.php mode change 100644 => 100755 system/core/Loader.php mode change 100644 => 100755 system/core/Model.php diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 6a63ca73..869739a5 100755 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -33,7 +33,6 @@ class CI_Exceptions { /** * Nesting level of the output buffering mechanism - * Used to * * @var int * @access public @@ -98,7 +97,8 @@ function log_exception($severity, $message, $filepath, $line) * 404 Page Not Found Handler * * @access private - * @param string + * @param string the page + * @param bool log error yes/no * @return string */ function show_404($page = '', $log_error = TRUE) @@ -129,6 +129,7 @@ function show_404($page = '', $log_error = TRUE) * @param string the heading * @param string the message * @param string the template name + * @param int the status code * @return string */ function show_error($heading, $message, $template = 'error_general', $status_code = 500) diff --git a/system/core/Input.php b/system/core/Input.php index 64d6c360..bc202b3f 100755 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -618,6 +618,8 @@ function _clean_input_keys($str) * In Apache, you can simply call apache_request_headers(), however for * people running other webservers the function is undefined. * + * @param bool XSS cleaning + * * @return array */ public function request_headers($xss_clean = FALSE) diff --git a/system/core/Lang.php b/system/core/Lang.php old mode 100644 new mode 100755 index 170e6c72..5ac67183 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -26,7 +26,17 @@ */ class CI_Lang { + /** + * List of translations + * + * @var array + */ var $language = array(); + /** + * List of loaded language files + * + * @var array + */ var $is_loaded = array(); /** @@ -47,6 +57,9 @@ function __construct() * @access public * @param mixed the name of the language file to be loaded. Can be an array * @param string the language (english, etc.) + * @param bool return loaded array of translations + * @param bool add suffix to $langfile + * @param string alternative path to look for language file * @return mixed */ function load($langfile = '', $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') diff --git a/system/core/Loader.php b/system/core/Loader.php old mode 100644 new mode 100755 index 2b36c1ca..019de82c --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -29,18 +29,91 @@ class CI_Loader { // All these are set automatically. Don't mess with them. + /** + * Nesting level of the output buffering mechanism + * + * @var int + * @access protected + */ protected $_ci_ob_level; + /** + * List of paths to load views from + * + * @var array + * @access protected + */ protected $_ci_view_paths = array(); + /** + * List of paths to load libraries from + * + * @var array + * @access protected + */ protected $_ci_library_paths = array(); + /** + * List of paths to load models from + * + * @var array + * @access protected + */ protected $_ci_model_paths = array(); + /** + * List of paths to load helpers from + * + * @var array + * @access protected + */ protected $_ci_helper_paths = array(); + /** + * List of loaded base classes + * Set by the controller class + * + * @var array + * @access protected + */ protected $_base_classes = array(); // Set by the controller class + /** + * List of cached variables + * + * @var array + * @access protected + */ protected $_ci_cached_vars = array(); + /** + * List of loaded classes + * + * @var array + * @access protected + */ protected $_ci_classes = array(); + /** + * List of loaded files + * + * @var array + * @access protected + */ protected $_ci_loaded_files = array(); + /** + * List of loaded models + * + * @var array + * @access protected + */ protected $_ci_models = array(); + /** + * List of loaded helpers + * + * @var array + * @access protected + */ protected $_ci_helpers = array(); - protected $_ci_varmap = array('unit_test' => 'unit', + /** + * List of class name mappings + * + * @var array + * @access protected + */ + protected $_ci_varmap = array('unit_test' => 'unit', 'user_agent' => 'agent'); /** @@ -55,18 +128,18 @@ public function __construct() $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"); } // -------------------------------------------------------------------- - + /** * Initialize the Loader * * This method is called once in CI_Controller. * - * @param array + * @param array * @return object */ public function initialize() @@ -101,7 +174,7 @@ public function is_loaded($class) { return $this->_ci_classes[$class]; } - + return FALSE; } @@ -371,6 +444,7 @@ public function file($path, $return = FALSE) * the controller class and its "view" files. * * @param array + * @param string * @return void */ public function vars($vars = array(), $val = '') @@ -512,6 +586,8 @@ public function language($file = array(), $lang = '') * Loads a config file * * @param string + * @param bool + * @param bool * @return void */ public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) @@ -558,13 +634,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); @@ -600,6 +676,7 @@ public function get_package_paths($include_base = FALSE) * If no path is provided, the most recently added path is removed. * * @param type + * @param bool * @return type */ public function remove_package_path($path = '', $remove_config_path = TRUE) @@ -624,7 +701,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/']); @@ -663,7 +740,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 @@ -685,11 +762,11 @@ protected function _ci_load($_ci_data) $file_exists = TRUE; break; } - + if ( ! $cascade) { break; - } + } } } @@ -918,6 +995,7 @@ protected function _ci_load_class($class, $params = NULL, $object_name = NULL) * * @param string * @param string + * @param bool * @param string an optional object name * @return null */ @@ -1123,6 +1201,7 @@ protected function _ci_object_to_array($object) /** * Get a reference to a specific library or model * + * @param string * @return bool */ protected function &_ci_get_component($component) @@ -1139,6 +1218,7 @@ protected function &_ci_get_component($component) * This function preps the name of various items to make loading them more reliable. * * @param mixed + * @param string * @return array */ protected function _ci_prep_filename($filename, $extension) diff --git a/system/core/Model.php b/system/core/Model.php old mode 100644 new mode 100755 index 8566a0b6..e15ffbeb --- a/system/core/Model.php +++ b/system/core/Model.php @@ -42,6 +42,7 @@ function __construct() * Allows models to access CI's loaded classes using the same * syntax as controllers. * + * @param string * @access private */ function __get($key) From 07b53422f8d61e6b0b7e6479b0de92ad1a1ce05e Mon Sep 17 00:00:00 2001 From: David Behler Date: Mon, 15 Aug 2011 00:25:06 +0200 Subject: [PATCH 2542/2544] Added some docs to CI core files --- system/core/Output.php | 61 +++++++++++++++++- system/core/Router.php | 46 +++++++++++++- system/core/Security.php | 131 ++++++++++++++++++++++++++------------- system/core/URI.php | 31 +++++++++ system/database/DB.php | 4 +- 5 files changed, 224 insertions(+), 49 deletions(-) mode change 100644 => 100755 system/core/Output.php mode change 100644 => 100755 system/core/Router.php mode change 100644 => 100755 system/core/Security.php mode change 100644 => 100755 system/core/URI.php mode change 100644 => 100755 system/database/DB.php diff --git a/system/core/Output.php b/system/core/Output.php old mode 100644 new mode 100755 index 05ace919..ccecafd2 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -28,15 +28,67 @@ */ class CI_Output { + /** + * Current output string + * + * @var string + * @access protected + */ protected $final_output; + /** + * Cache expiration time + * + * @var int + * @access protected + */ protected $cache_expiration = 0; + /** + * List of server headers + * + * @var array + * @access protected + */ protected $headers = array(); - protected $mime_types = array(); + /** + * List of mime types + * + * @var array + * @access protected + */ + protected $mime_types = array(); + /** + * Determines wether profiler is enabled + * + * @var book + * @access protected + */ protected $enable_profiler = FALSE; + /** + * Determines if output compression is enabled + * + * @var bool + * @access protected + */ protected $_zlib_oc = FALSE; + /** + * List of profiler sections + * + * @var array + * @access protected + */ protected $_profiler_sections = array(); - protected $parse_exec_vars = TRUE; // whether or not to parse variables like {elapsed_time} and {memory_usage} + /** + * Whether or not to parse variables like {elapsed_time} and {memory_usage} + * + * @var bool + * @access protected + */ + protected $parse_exec_vars = TRUE; + /** + * Constructor + * + */ function __construct() { $this->_zlib_oc = @ini_get('zlib.output_compression'); @@ -127,6 +179,7 @@ function append_output($output) * * @access public * @param string + * @param bool * @return void */ function set_header($header, $replace = TRUE) @@ -265,6 +318,7 @@ function cache($time) * benchmark timer so the page rendering speed and memory usage can be shown. * * @access public + * @param string * @return mixed */ function _display($output = '') @@ -401,6 +455,7 @@ function _display($output = '') * Write a Cache File * * @access public + * @param string * @return void */ function _write_cache($output) @@ -452,6 +507,8 @@ function _write_cache($output) * Update/serve a cached file * * @access public + * @param object config class + * @param object uri class * @return void */ function _display_cache(&$CFG, &$URI) diff --git a/system/core/Router.php b/system/core/Router.php old mode 100644 new mode 100755 index 668ac095..6da66747 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -28,12 +28,54 @@ */ class CI_Router { + /** + * Config class + * + * @var object + * @access public + */ var $config; + /** + * List of routes + * + * @var array + * @access public + */ var $routes = array(); + /** + * List of error routes + * + * @var array + * @access public + */ var $error_routes = array(); + /** + * Current class name + * + * @var string + * @access public + */ var $class = ''; + /** + * Current method name + * + * @var string + * @access public + */ var $method = 'index'; + /** + * Sub-directory that contains the requested controller class + * + * @var string + * @access public + */ var $directory = ''; + /** + * Default controller (and method if specific) + * + * @var string + * @access public + */ var $default_controller; /** @@ -95,7 +137,7 @@ function _set_routing() { include(APPPATH.'config/routes.php'); } - + $this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route; unset($route); @@ -251,7 +293,7 @@ function _validate_request($segments) $this->set_directory(''); $this->set_class($x[0]); $this->set_method(isset($x[1]) ? $x[1] : 'index'); - + return $x; } else diff --git a/system/core/Security.php b/system/core/Security.php old mode 100644 new mode 100755 index 3617cadc..dcc680a1 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -25,14 +25,49 @@ * @link http://codeigniter.com/user_guide/libraries/security.html */ class CI_Security { - + + /** + * Random Hash for protecting URLs + * + * @var string + * @access protected + */ protected $_xss_hash = ''; + /** + * Random Hash for Cross Site Request Forgery Protection Cookie + * + * @var string + * @access protected + */ protected $_csrf_hash = ''; - protected $_csrf_expire = 7200; // Two hours (in seconds) + /** + * Expiration time for Cross Site Request Forgery Protection Cookie + * Defaults to two hours (in seconds) + * + * @var int + * @access protected + */ + protected $_csrf_expire = 7200; + /** + * Token name for Cross Site Request Forgery Protection Cookie + * + * @var string + * @access protected + */ protected $_csrf_token_name = 'ci_csrf_token'; + /** + * Cookie name for Cross Site Request Forgery Protection Cookie + * + * @var string + * @access protected + */ protected $_csrf_cookie_name = 'ci_csrf_token'; - - /* never allowed, string replacement */ + /** + * List of never allowed strings + * + * @var array + * @access protected + */ protected $_never_allowed_str = array( 'document.cookie' => '[removed]', 'document.write' => '[removed]', @@ -46,13 +81,19 @@ class CI_Security { ); /* never allowed, regex replacement */ + /** + * List of never allowed regex replacement + * + * @var array + * @access protected + */ protected $_never_allowed_regex = array( "javascript\s*:" => '[removed]', "expression\s*(\(|&\#40;)" => '[removed]', // CSS and IE "vbscript\s*:" => '[removed]', // IE, surprise! "Redirect\s+302" => '[removed]' ); - + /** * Constructor */ @@ -95,7 +136,7 @@ public function csrf_verify() } // Do the tokens exist in both the _POST and _COOKIE arrays? - if ( ! isset($_POST[$this->_csrf_token_name]) OR + if ( ! isset($_POST[$this->_csrf_token_name]) OR ! isset($_COOKIE[$this->_csrf_cookie_name])) { $this->csrf_show_error(); @@ -107,7 +148,7 @@ public function csrf_verify() $this->csrf_show_error(); } - // We kill this since we're done and we don't want to + // We kill this since we're done and we don't want to // polute the _POST array unset($_POST[$this->_csrf_token_name]); @@ -117,7 +158,7 @@ public function csrf_verify() $this->csrf_set_cookie(); log_message('debug', "CSRF token verified "); - + return $this; } @@ -146,7 +187,7 @@ public function csrf_set_cookie() setcookie($this->_csrf_cookie_name, $this->_csrf_hash, $expire, config_item('cookie_path'), config_item('cookie_domain'), $secure_cookie); log_message('debug', "CRSF cookie Set"); - + return $this; } @@ -165,9 +206,9 @@ public function csrf_show_error() // -------------------------------------------------------------------- /** - * Get CSRF Hash + * Get CSRF Hash * - * Getter Method + * Getter Method * * @return string self::_csrf_hash */ @@ -215,6 +256,7 @@ public function get_csrf_token_name() * http://ha.ckers.org/xss.html * * @param mixed string or array + * @param bool * @return string */ public function xss_clean($str, $is_image = FALSE) @@ -263,7 +305,7 @@ public function xss_clean($str, $is_image = FALSE) */ $str = preg_replace_callback("/[a-z]+=([\'\"]).*?\\1/si", array($this, '_convert_attribute'), $str); - + $str = preg_replace_callback("/<\w+.*?(?=>|<|$)/si", array($this, '_decode_entity'), $str); /* @@ -276,7 +318,7 @@ public function xss_clean($str, $is_image = FALSE) * * This prevents strings like this: ja vascript * NOTE: we deal with spaces between characters later. - * NOTE: preg_replace was found to be amazingly slow here on + * NOTE: preg_replace was found to be amazingly slow here on * large blocks of data, so we use str_replace. */ @@ -304,8 +346,8 @@ public function xss_clean($str, $is_image = FALSE) */ if ($is_image === TRUE) { - // Images have a tendency to have the PHP short opening and - // closing tags every so often so we skip those and only + // Images have a tendency to have the PHP short opening and + // closing tags every so often so we skip those and only // do the long opening tags. $str = preg_replace('/<\?(php)/i', "<?\\1", $str); } @@ -321,10 +363,10 @@ public function xss_clean($str, $is_image = FALSE) * These words are compacted back to their correct state. */ $words = array( - 'javascript', 'expression', 'vbscript', 'script', + 'javascript', 'expression', 'vbscript', 'script', 'applet', 'alert', 'document', 'write', 'cookie', 'window' ); - + foreach ($words as $word) { $temp = ''; @@ -341,8 +383,8 @@ public function xss_clean($str, $is_image = FALSE) /* * Remove disallowed Javascript in links or img tags - * We used to do some version comparisons and use of stripos for PHP5, - * but it is dog slow compared to these simplified non-capturing + * We used to do some version comparisons and use of stripos for PHP5, + * but it is dog slow compared to these simplified non-capturing * preg_match(), especially if the pattern exists in the string */ do @@ -405,11 +447,11 @@ public function xss_clean($str, $is_image = FALSE) /* * Images are Handled in a Special Way - * - Essentially, we want to know that after all of the character - * conversion is done whether any unwanted, likely XSS, code was found. + * - Essentially, we want to know that after all of the character + * conversion is done whether any unwanted, likely XSS, code was found. * If not, we return TRUE, as the image is clean. - * However, if the string post-conversion does not matched the - * string post-removal of XSS, then it fails, as there was unwanted XSS + * However, if the string post-conversion does not matched the + * string post-removal of XSS, then it fails, as there was unwanted XSS * code found and removed/changed during processing. */ @@ -478,7 +520,7 @@ public function entity_decode($str, $charset='UTF-8') // correctly. html_entity_decode() does not convert entities without // semicolons, so we are left with our own little solution here. Bummer. - if (function_exists('html_entity_decode') && + if (function_exists('html_entity_decode') && (strtolower($charset) != 'utf-8')) { $str = html_entity_decode($str, ENT_COMPAT, $charset); @@ -505,6 +547,7 @@ public function entity_decode($str, $charset='UTF-8') * Filename Security * * @param string + * @param bool * @return string */ public function sanitize_filename($str, $relative_path = FALSE) @@ -542,7 +585,7 @@ public function sanitize_filename($str, $relative_path = FALSE) "%3b", // ; "%3d" // = ); - + if ( ! $relative_path) { $bad[] = './'; @@ -570,7 +613,7 @@ protected function _compact_exploded_words($matches) } // -------------------------------------------------------------------- - + /* * Remove Evil HTML Attributes (like evenhandlers and style) * @@ -578,7 +621,7 @@ protected function _compact_exploded_words($matches) * - Everything up until a space * For example, everything between the pipes: * - * - Everything inside the quotes + * - Everything inside the quotes * For example, everything between the pipes: * * @@ -594,12 +637,12 @@ protected function _remove_evil_attributes($str, $is_image) if ($is_image === TRUE) { /* - * Adobe Photoshop puts XML metadata into JFIF images, + * Adobe Photoshop puts XML metadata into JFIF images, * including namespacing, so we have to allow this for images. */ unset($evil_attributes[array_search('xmlns', $evil_attributes)]); } - + do { $str = preg_replace( "#<(/?[^><]+?)([^A-Za-z\-])(".implode('|', $evil_attributes).")(\s*=\s*)([\"][^>]*?[\"]|[\'][^>]*?[\']|[^>]*?)([\s><])([><]*)#i", @@ -607,10 +650,10 @@ protected function _remove_evil_attributes($str, $is_image) $str, -1, $count ); } while ($count); - + return $str; } - + // -------------------------------------------------------------------- /** @@ -627,7 +670,7 @@ protected function _sanitize_naughty_html($matches) $str = '<'.$matches[1].$matches[2].$matches[3]; // encode captured opening or closing brace to prevent recursive vectors - $str .= str_replace(array('>', '<'), array('>', '<'), + $str .= str_replace(array('>', '<'), array('>', '<'), $matches[4]); return $str; @@ -649,7 +692,7 @@ protected function _sanitize_naughty_html($matches) protected function _js_link_removal($match) { $attributes = $this->_filter_attributes(str_replace(array('<', '>'), '', $match[1])); - + return str_replace($match[1], preg_replace("#href=.*?(alert\(|alert&\#40;|javascript\:|livescript\:|mocha\:|charset\=|window\.|document\.|\.cookie|_filter_attributes(str_replace(array('<', '>'), '', $match[1])); - + return str_replace($match[1], preg_replace("#src=.*?(alert\(|alert&\#40;|javascript\:|livescript\:|mocha\:|charset\=|window\.|document\.|\.cookie|xss_hash()."\\1=\\2", $str); /* @@ -769,7 +812,7 @@ protected function _validate_entities($str) * Un-Protect GET variables in URLs */ $str = str_replace($this->xss_hash(), '&', $str); - + return $str; } @@ -794,7 +837,7 @@ protected function _do_never_allowed($str) { $str = preg_replace("#".$key."#i", $val, $str); } - + return $str; } @@ -809,16 +852,16 @@ protected function _csrf_set_hash() { if ($this->_csrf_hash == '') { - // If the cookie exists we will use it's value. + // If the cookie exists we will use it's value. // We don't necessarily want to regenerate it with - // each page load since a page could contain embedded + // each page load since a page could contain embedded // sub-pages causing this feature to fail - if (isset($_COOKIE[$this->_csrf_cookie_name]) && + if (isset($_COOKIE[$this->_csrf_cookie_name]) && $_COOKIE[$this->_csrf_cookie_name] != '') { return $this->_csrf_hash = $_COOKIE[$this->_csrf_cookie_name]; } - + return $this->_csrf_hash = md5(uniqid(rand(), TRUE)); } diff --git a/system/core/URI.php b/system/core/URI.php old mode 100644 new mode 100755 index d5654865..10b0b7fa --- a/system/core/URI.php +++ b/system/core/URI.php @@ -28,9 +28,34 @@ */ class CI_URI { + /** + * List of cached uri segments + * + * @var array + * @access public + */ var $keyval = array(); + /** + * Current uri string + * + * @var string + * @access public + */ var $uri_string; + /** + * List of uri segments + * + * @var array + * @access public + */ var $segments = array(); + /** + * Re-indexed list of uri segments + * Starts at 1 instead of 0 + * + * @var array + * @access public + */ var $rsegments = array(); /** @@ -127,6 +152,7 @@ function _fetch_uri_string() * Set the URI String * * @access public + * @param string * @return string */ function _set_uri_string($str) @@ -366,6 +392,11 @@ function uri_to_assoc($n = 3, $default = array()) /** * Identical to above only it uses the re-routed segment array * + * @access public + * @param integer the starting segment number + * @param array an array of default values + * @return array + * */ function ruri_to_assoc($n = 3, $default = array()) { diff --git a/system/database/DB.php b/system/database/DB.php old mode 100644 new mode 100755 index 33207d88..8314d3b9 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -21,6 +21,8 @@ * @category Database * @author ExpressionEngine Dev Team * @link http://codeigniter.com/user_guide/database/ + * @param string + * @param bool Determines if active record should be used or not */ function &DB($params = '', $active_record_override = NULL) { @@ -35,7 +37,7 @@ function &DB($params = '', $active_record_override = NULL) show_error('The configuration file database.php does not exist.'); } } - + include($file_path); if ( ! isset($db) OR count($db) == 0) From 3b800cd360411551c6538a7cb8373ba1a6bdc04c Mon Sep 17 00:00:00 2001 From: Anton Lindqvist Date: Mon, 15 Aug 2011 13:57:31 +0200 Subject: [PATCH 2543/2544] Readded redis to valid cache drivers. --- system/libraries/Cache/Cache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php index 61e7aa76..fde2f109 100644 --- a/system/libraries/Cache/Cache.php +++ b/system/libraries/Cache/Cache.php @@ -27,7 +27,7 @@ class CI_Cache extends CI_Driver_Library { protected $valid_drivers = array( - 'cache_apc', 'cache_file', 'cache_memcached', 'cache_dummy' + 'cache_apc', 'cache_file', 'cache_memcached', 'cache_redis', 'cache_dummy' ); protected $_cache_path = NULL; // Path of cache files (if file-based cache) From 893aaddaa0a2e8dca77e80d49093678a837123aa Mon Sep 17 00:00:00 2001 From: Anton Lindqvist Date: Wed, 17 Aug 2011 12:57:08 +0200 Subject: [PATCH 2544/2544] Only call the error_reporting function is it's active and present. --- index.php | 9 +++++++-- system/core/Common.php | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index f4ac11a7..12618c62 100644 --- a/index.php +++ b/index.php @@ -33,17 +33,22 @@ switch (ENVIRONMENT) { case 'development': - error_reporting(E_ALL); + $error_level = E_ALL; break; case 'testing': case 'production': - error_reporting(0); + $error_level = 0; break; default: exit('The application environment is not set correctly.'); } + + if (isset($error_level) && function_exists('error_reporting')) + { + error_reporting($error_level); + } } /* diff --git a/system/core/Common.php b/system/core/Common.php index db9fbeb9..98b84300 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -482,7 +482,7 @@ function _exception_handler($severity, $message, $filepath, $line) // Should we display the error? We'll get the current error_reporting // level and add its bits with the severity bits to find out. - if (($severity & error_reporting()) == $severity) + if (($severity & (int)ini_get('error_reporting')) == $severity) { $_error->show_php_error($severity, $message, $filepath, $line); }